diff --git a/packages/api-derive/src/contracts/fees.ts b/packages/api-derive/src/contracts/fees.ts index f93e098882..31baf9c20f 100644 --- a/packages/api-derive/src/contracts/fees.ts +++ b/packages/api-derive/src/contracts/fees.ts @@ -11,23 +11,24 @@ import { map } from 'rxjs/operators'; import { memo } from '../util'; -type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN]; +type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN, BN]; // query via constants (current applicable path) function queryConstants (api: ApiInterfaceRx): Observable { return of([ // deprecated + api.consts.contracts.callBaseFee || api.registry.createType('Balance'), + api.consts.contracts.contractFee || api.registry.createType('Balance'), api.consts.contracts.creationFee || api.registry.createType('Balance'), + api.consts.contracts.transactionBaseFee || api.registry.createType('Balance'), + api.consts.contracts.transactionByteFee || api.registry.createType('Balance'), api.consts.contracts.transferFee || api.registry.createType('Balance'), // current - api.consts.contracts.callBaseFee, - api.consts.contracts.contractFee, api.consts.contracts.rentByteFee, api.consts.contracts.rentDepositOffset, - api.consts.contracts.tombstoneDeposit, - api.consts.contracts.transactionBaseFee, - api.consts.contracts.transactionByteFee + api.consts.contracts.surchargeReward, + api.consts.contracts.tombstoneDeposit ]) as unknown as Observable; } @@ -47,12 +48,13 @@ function queryConstants (api: ApiInterfaceRx): Observable { export function fees (api: ApiInterfaceRx): () => Observable { return memo((): Observable => { return queryConstants(api).pipe( - map(([creationFee, transferFee, callBaseFee, contractFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee]): DeriveContractFees => ({ + map(([callBaseFee, contractFee, creationFee, transactionBaseFee, transactionByteFee, transferFee, rentByteFee, rentDepositOffset, surchargeReward, tombstoneDeposit]): DeriveContractFees => ({ callBaseFee, contractFee, creationFee, rentByteFee, rentDepositOffset, + surchargeReward, tombstoneDeposit, transactionBaseFee, transactionByteFee, diff --git a/packages/api-derive/src/types.ts b/packages/api-derive/src/types.ts index d919fc94b9..7315a6f93f 100644 --- a/packages/api-derive/src/types.ts +++ b/packages/api-derive/src/types.ts @@ -42,6 +42,7 @@ export interface DeriveContractFees { creationFee: BN; rentByteFee: BN; rentDepositOffset: BN; + surchargeReward: BN; tombstoneDeposit: BN; transactionBaseFee: BN; transactionByteFee: BN;