Support TransactionPayment.{TransactionBaseFee, TransactionByteFee} (#1493)

* Support TransactionPayment.{TransactionBaseFee, TransactionByteFee}

* Dedup

* Ordering

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

@@ -14,14 +14,16 @@ import { drr } from '../util/drr';
 type Result = [Balance, Balance, Balance, Balance, Balance];
 
 function queryV2 (api: ApiInterfaceRx): Observable<Result> {
+  const paymentBase = api.consts.transactionPayment || api.consts.balances;
+
   return of([
     // get values from api.const for substrate versions post spec_version: 101
     // https://github.com/paritytech/substrate/pull/2883/files#diff-5e5e1c3aec9ddfde0a9054d062ab3db9R131
     api.consts.balances.creationFee as Balance,
     api.consts.balances.existentialDeposit as Balance,
-    api.consts.balances.transactionBaseFee as Balance,
-    api.consts.balances.transactionByteFee as Balance,
-    api.consts.balances.transferFee as Balance
+    api.consts.balances.transferFee as Balance,
+    paymentBase.transactionBaseFee as Balance,
+    paymentBase.transactionByteFee as Balance
   ]);
 }
 
@@ -30,9 +32,9 @@ function queryV1 (api: ApiInterfaceRx): Observable<Result> {
     // Support older versions and get values from storage
     api.query.balances.creationFee,
     api.query.balances.existentialDeposit,
+    api.query.balances.transferFee,
     api.query.balances.transactionBaseFee,
-    api.query.balances.transactionByteFee,
-    api.query.balances.transferFee
+    api.query.balances.transactionByteFee
   ]);
 }
 
@@ -56,7 +58,7 @@ export function fees (api: ApiInterfaceRx): () => Observable<DerivedFees> {
         ? queryV2(api)
         : queryV1(api)
     ).pipe(
-      map(([creationFee, existentialDeposit, transactionBaseFee, transactionByteFee, transferFee]): DerivedFees => ({
+      map(([creationFee, existentialDeposit, transferFee, transactionBaseFee, transactionByteFee]): DerivedFees => ({
         creationFee,
         existentialDeposit,
         transactionBaseFee,