Make indices module optional (#1812)

* Make indices optional

* Updtae contracts with optional creation

* Flatten contract fees

packages/api-derive/src/accounts/indexToId.ts

@@ -4,7 +4,7 @@
 
 import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
@@ -26,18 +26,18 @@ import { memo } from '../util';
  * ```
  */
 export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable<AccountId | undefined> {
-  const querySection = api.query.indices || api.query.balances;
-
   return memo((_accountIndex: AccountIndex | string): Observable<AccountId | undefined> => {
     const accountIndex = _accountIndex instanceof ClassOf(api.registry, 'AccountIndex')
       ? _accountIndex
       : createType(api.registry, 'AccountIndex', _accountIndex);
 
-    return querySection.enumSet<Vec<AccountId>>(accountIndex.div(ENUMSET_SIZE)).pipe(
-      startWith([]),
-      map((accounts): AccountId | undefined =>
-        (accounts || [])[accountIndex.mod(ENUMSET_SIZE).toNumber()]
+    return api.query.indices.enumSet
+      ? api.query.indices.enumSet<Vec<AccountId>>(accountIndex.div(ENUMSET_SIZE)).pipe(
+        startWith([]),
+        map((accounts): AccountId | undefined =>
+          (accounts || [])[accountIndex.mod(ENUMSET_SIZE).toNumber()]
+        )
       )
-    );
+      : of(undefined);
   });
 }

packages/api-derive/src/accounts/indexes.ts

@@ -6,7 +6,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 import { AccountIndexes } from '../types';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
 import { Vec, createType } from '@polkadot/types';
@@ -32,14 +32,18 @@ const enumsetSize = ENUMSET_SIZE.toNumber();
  */
 export function indexes (api: ApiInterfaceRx): () => Observable<AccountIndexes> {
   return memo((): Observable<AccountIndexes> =>
-    api.query.indices.nextEnumSet<AccountIndex>().pipe(
-      // use the nextEnumSet (which is a counter of the number of sets) to construct
-      // a range of values to query [0, 1, 2, ...]. Retrieve the full enum set for the
-      // specific index - each query can return up to ENUMSET_SIZE (64) records, each
-      // containing an AccountId
-      switchMap((next: AccountIndex): Observable<Vec<AccountId>[]> =>
-        api.query.indices.enumSet.multi<Vec<AccountId>>([...Array(next.toNumber() + 1).keys()])
-      ),
+    (api.query.indices.nextEnumSet
+      ? api.query.indices.nextEnumSet<AccountIndex>().pipe(
+        // use the nextEnumSet (which is a counter of the number of sets) to construct
+        // a range of values to query [0, 1, 2, ...]. Retrieve the full enum set for the
+        // specific index - each query can return up to ENUMSET_SIZE (64) records, each
+        // containing an AccountId
+        switchMap((next: AccountIndex): Observable<Vec<AccountId>[]> =>
+          api.query.indices.enumSet.multi<Vec<AccountId>>([...Array(next.toNumber() + 1).keys()])
+        )
+      )
+      : of([] as AccountId[][])
+    ).pipe(
       map((all: AccountId[][]): AccountIndexes =>
         all.reduce((result: AccountIndexes, list, outerIndex): AccountIndexes => {
           (list || []).forEach((accountId, innerIndex): void => {

packages/api-derive/src/balances/fees.ts

@@ -16,10 +16,12 @@ type Result = [Balance, Balance, Balance, Balance, Balance];
 
 function query (api: ApiInterfaceRx): Observable<Result> {
   return of([
-    api.consts.balances.creationFee,
-    api.consts.balances.existentialDeposit,
     // deprecated - remove
+    (api.consts.balances.creationFee as Balance) || createType(api.registry, 'Balance'),
     (api.consts.balances.transferFee as Balance) || createType(api.registry, 'Balance'),
+
+    // current
+    api.consts.balances.existentialDeposit,
     api.consts.transactionPayment.transactionBaseFee,
     api.consts.transactionPayment.transactionByteFee
   ]);
@@ -41,7 +43,7 @@ function query (api: ApiInterfaceRx): Observable<Result> {
 export function fees (api: ApiInterfaceRx): () => Observable<DerivedFees> {
   return memo((): Observable<DerivedFees> =>
     query(api).pipe(
-      map(([creationFee, existentialDeposit, transferFee, transactionBaseFee, transactionByteFee]): DerivedFees => ({
+      map(([creationFee, transferFee, existentialDeposit, transactionBaseFee, transactionByteFee]): DerivedFees => ({
         creationFee,
         existentialDeposit,
         transactionBaseFee,

packages/api-derive/src/contracts/fees.ts

@@ -14,33 +14,21 @@ import { memo } from '../util';
 
 type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN];
 
-// parse the result
-function parseResult ([callBaseFee, contractFee, creationFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee, transferFee]: ResultV2): DerivedContractFees {
-  return {
-    callBaseFee,
-    contractFee,
-    creationFee,
-    rentByteFee,
-    rentDepositOffset,
-    tombstoneDeposit,
-    transactionBaseFee,
-    transactionByteFee,
-    transferFee
-  };
-}
-
 // query via constants (current applicable path)
 function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
   return of([
+    // deprecated
+    api.consts.contracts.creationFee || createType(api.registry, 'Balance'),
+    api.consts.contracts.transferFee || createType(api.registry, 'Balance'),
+
+    // current
     api.consts.contracts.callBaseFee,
     api.consts.contracts.contractFee,
-    api.consts.contracts.creationFee,
     api.consts.contracts.rentByteFee,
     api.consts.contracts.rentDepositOffset,
     api.consts.contracts.tombstoneDeposit,
     api.consts.contracts.transactionBaseFee,
-    api.consts.contracts.transactionByteFee,
-    api.consts.contracts.transferFee || createType(api.registry, 'Balance')
+    api.consts.contracts.transactionByteFee
   ]) as unknown as Observable<ResultV2>;
 }
 
@@ -60,12 +48,17 @@ function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
 export function fees (api: ApiInterfaceRx): () => Observable<DerivedContractFees> {
   return memo((): Observable<DerivedContractFees> => {
     return queryConstants(api).pipe(
-      map(([callBaseFee, contractFee, creationFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee, transferFee]): DerivedContractFees =>
-        // We've done this on purpose, i.e. so we can  just copy the name/order from the parse above and see gaps
-        parseResult([
-          callBaseFee, contractFee, creationFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee, transferFee
-        ])
-      )
+      map(([creationFee, transferFee, callBaseFee, contractFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee]): DerivedContractFees => ({
+        callBaseFee,
+        contractFee,
+        creationFee,
+        rentByteFee,
+        rentDepositOffset,
+        tombstoneDeposit,
+        transactionBaseFee,
+        transactionByteFee,
+        transferFee
+      }))
     );
   });
 }