@subwallet/extension-base 1.1.40-1 → 1.1.42-0

package/koni/background/handlers/State.js

@@ -16,6 +16,8 @@ import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _PREDEFINED_SINGLE_MODE
 import { _getEvmChainId, _getSubstrateGenesisHash, _getTokenOnChainAssetId, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import EarningService from '@subwallet/extension-base/services/earning-service/service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
+import FeeService from '@subwallet/extension-base/services/fee-service/service';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import MigrationService from '@subwallet/extension-base/services/migration-service';
@@ -31,7 +33,6 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { addLazy, isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -104,6 +105,7 @@ export default class KoniState {
     this.buyService = new BuyService(this);
     this.transactionService = new TransactionService(this);
     this.earningService = new EarningService(this);
+    this.feeService = new FeeService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -808,7 +810,7 @@ export default class KoniState {
     return this.chainService.getMultiChainAssetMap();
   }
   getXcmRefMap() {
-    return this.chainService.getXcmRefMap();
+    return this.chainService.xcmRefMap;
   }
   getAssetByChainAndAsset(chain, assetTypes) {
     return this.chainService.getAssetByChainAndType(chain, assetTypes);
@@ -1206,6 +1208,35 @@ export default class KoniState {
       }
     });
   }
+  async calculateAllGasFeeOnChain(activeEvmChains, timeout = 10000) {
+    const promiseList = [];
+    activeEvmChains.forEach(slug => {
+      const timeoutPromise = new Promise(resolve => {
+        setTimeout(() => resolve(null), timeout);
+      });
+      const promise = (async () => {
+        try {
+          const web3Api = this.chainService.getEvmApi(slug);
+          await web3Api.isReady;
+          return await calculateGasFeeParams(web3Api, slug, false, false);
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      })();
+      promiseList.push(Promise.race([promise, timeoutPromise]).then(result => {
+        var _result$gasPrice, _result$maxFeePerGas, _result$maxPriorityFe, _result$baseGasFee;
+        return [slug, result ? {
+          ...result,
+          gasPrice: (_result$gasPrice = result.gasPrice) === null || _result$gasPrice === void 0 ? void 0 : _result$gasPrice.toString(),
+          maxFeePerGas: (_result$maxFeePerGas = result.maxFeePerGas) === null || _result$maxFeePerGas === void 0 ? void 0 : _result$maxFeePerGas.toString(),
+          maxPriorityFeePerGas: (_result$maxPriorityFe = result.maxPriorityFeePerGas) === null || _result$maxPriorityFe === void 0 ? void 0 : _result$maxPriorityFe.toString(),
+          baseGasFee: (_result$baseGasFee = result.baseGasFee) === null || _result$baseGasFee === void 0 ? void 0 : _result$baseGasFee.toString()
+        } : null];
+      }));
+    });
+    return Object.fromEntries(await Promise.all(promiseList));
+  }
   async evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams) {
     const evmApi = this.getEvmApi(networkKey);
     const evmNetwork = this.getChainInfo(networkKey);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.40-1",
+  "version": "1.1.42-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -865,6 +865,16 @@
       "require": "./cjs/services/event-service/types.js",
       "default": "./services/event-service/types.js"
     },
+    "./services/fee-service/service": {
+      "types": "./services/fee-service/service.d.ts",
+      "require": "./cjs/services/fee-service/service.js",
+      "default": "./services/fee-service/service.js"
+    },
+    "./services/fee-service/utils": {
+      "types": "./services/fee-service/utils/index.d.ts",
+      "require": "./cjs/services/fee-service/utils/index.js",
+      "default": "./services/fee-service/utils/index.js"
+    },
     "./services/history-service": {
       "types": "./services/history-service/index.d.ts",
       "require": "./cjs/services/history-service/index.js",
@@ -930,6 +940,11 @@
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
       "default": "./services/migration-service/scripts/ClearOldStorage.js"
     },
+    "./services/migration-service/scripts/databases/MigrateAssetSetting": {
+      "types": "./services/migration-service/scripts/databases/MigrateAssetSetting.d.ts",
+      "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js",
+      "default": "./services/migration-service/scripts/databases/MigrateAssetSetting.js"
+    },
     "./services/migration-service/scripts/databases/MigrateEarningHistory": {
       "types": "./services/migration-service/scripts/databases/MigrateEarningHistory.d.ts",
       "require": "./cjs/services/migration-service/scripts/databases/MigrateEarningHistory.js",
@@ -945,6 +960,11 @@
       "require": "./cjs/services/migration-service/scripts/DeleteChain.js",
       "default": "./services/migration-service/scripts/DeleteChain.js"
     },
+    "./services/migration-service/scripts/DeleteChainStaking": {
+      "types": "./services/migration-service/scripts/DeleteChainStaking.d.ts",
+      "require": "./cjs/services/migration-service/scripts/DeleteChainStaking.js",
+      "default": "./services/migration-service/scripts/DeleteChainStaking.js"
+    },
     "./services/migration-service/scripts/DeleteEarningData": {
       "types": "./services/migration-service/scripts/DeleteEarningData.d.ts",
       "require": "./cjs/services/migration-service/scripts/DeleteEarningData.js",
@@ -1515,6 +1535,11 @@
       "require": "./cjs/types/campaigns/unlock-dot.js",
       "default": "./types/campaigns/unlock-dot.js"
     },
+    "./types/fee": {
+      "types": "./types/fee/index.d.ts",
+      "require": "./cjs/types/fee/index.js",
+      "default": "./types/fee/index.js"
+    },
     "./types/ordinal": {
       "types": "./types/ordinal.d.ts",
       "require": "./cjs/types/ordinal.js",
@@ -1710,6 +1735,11 @@
       "require": "./cjs/utils/registry.js",
       "default": "./utils/registry.js"
     },
+    "./utils/reportError": {
+      "types": "./utils/reportError.d.ts",
+      "require": "./cjs/utils/reportError.js",
+      "default": "./utils/reportError.js"
+    },
     "./utils/request": {
       "types": "./utils/request.d.ts",
       "require": "./cjs/utils/request.js",
@@ -1761,11 +1791,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.42-beta.0",
-    "@subwallet/extension-base": "^1.1.40-1",
-    "@subwallet/extension-chains": "^1.1.40-1",
-    "@subwallet/extension-dapp": "^1.1.40-1",
-    "@subwallet/extension-inject": "^1.1.40-1",
+    "@subwallet/chain-list": "0.2.43",
+    "@subwallet/extension-base": "^1.1.42-0",
+    "@subwallet/extension-chains": "^1.1.42-0",
+    "@subwallet/extension-dapp": "^1.1.42-0",
+    "@subwallet/extension-inject": "^1.1.42-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.40-1'
+  version: '1.1.42-0'
 };

package/page/SubWalleEvmProvider.d.ts

@@ -12,7 +12,6 @@ export declare class SubWalletEvmProvider extends SafeEventEmitter implements Ev
     readonly version: string;
     protected sendMessage: SendRequest;
     protected _connected: boolean;
-    private _isEnable;
     constructor(sendMessage: SendRequest, version: string);
     get connected(): boolean;
     isConnected(): boolean;

package/page/SubWalleEvmProvider.js

@@ -7,7 +7,6 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _isEnable = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -67,13 +66,11 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
     method,
     params
   }) {
-    if (!this._isEnable) {
-      if (method === 'eth_accounts') {
-        return this.request({
-          method: 'eth_requestAccounts'
-        });
-      }
-    }
+    // if (!this._isEnable) {
+    //   if (method === 'eth_accounts') {
+    //     return this.request<T>({ method: 'eth_requestAccounts' });
+    //   }
+    // }
 
     // Subscribe events
     switch (method) {
@@ -84,7 +81,6 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            this._isEnable = true;
             // Return account list
             this.request({
               method: 'eth_accounts'

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -9,7 +9,7 @@ import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wa
 import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { subscribeERC20Interval } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/evm';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { subscribeEquilibriumTokenBalance } from "./equilibrium.js";
 export async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI, evmApiMap, callBack) {
@@ -20,6 +20,7 @@ export async function subscribeSubstrateBalance(addresses, chainInfo, chain, net
   let unsubLocalToken;
   let unsubEvmContractToken;
   let unsubWasmContractToken;
+  let unsubBridgedToken;
   try {
     if (_BALANCE_CHAIN_GROUP.bifrost.includes(chain)) {
       unsubLocalToken = await subscribeTokensAccountsPallet(addresses, chain, networkAPI.api, callBack);
@@ -32,6 +33,9 @@ export async function subscribeSubstrateBalance(addresses, chainInfo, chain, net
     } else if (_BALANCE_CHAIN_GROUP.centrifuge.includes(chain)) {
       unsubLocalToken = await subscribeOrmlTokensPallet(addresses, chain, networkAPI.api, callBack);
     }
+    if (_BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
+      unsubBridgedToken = await subscribeBridgedBalance(addresses, chain, networkAPI.api, callBack);
+    }
     if (_isChainEvmCompatible(chainInfo)) {
       unsubEvmContractToken = subscribeERC20Interval(addresses, chain, evmApiMap, callBack);
     }
@@ -47,6 +51,7 @@ export async function subscribeSubstrateBalance(addresses, chainInfo, chain, net
     unsubLocalToken && unsubLocalToken();
     unsubEvmContractToken && unsubEvmContractToken();
     unsubWasmContractToken && unsubWasmContractToken();
+    unsubBridgedToken && unsubBridgedToken();
   };
 }
 
@@ -110,6 +115,59 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
     unsub();
   };
 }
+async function subscribeBridgedBalance(addresses, chain, api, callBack) {
+  const tokenMap = state.getAssetByChainAndAsset(chain, [_AssetType.LOCAL]);
+
+  // @ts-ignore
+  const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
+    try {
+      const isBridgedToken = _isBridgedToken(tokenInfo);
+      if (isBridgedToken) {
+        const multiLocation = _getXcmAssetMultilocation(tokenInfo);
+        return await api.query.foreignAssets.account.multi(addresses.map(address => [multiLocation, address]), balances => {
+          const items = balances.map((balance, index) => {
+            const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
+            let frozen = BN_ZERO;
+            let total = BN_ZERO;
+            if (bdata) {
+              // @ts-ignore
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
+              const addressBalance = new BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
+
+              // @ts-ignore
+              if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
+                frozen = addressBalance;
+              } else {
+                total = addressBalance;
+              }
+            }
+            const free = total.sub(frozen);
+            return {
+              address: addresses[index],
+              tokenSlug: tokenInfo.slug,
+              free: free.toString(),
+              locked: frozen.toString(),
+              state: APIItemState.READY,
+              substrateInfo: {
+                miscFrozen: frozen.toString(),
+                reserved: '0'
+              }
+            };
+          });
+          callBack(items);
+        });
+      }
+    } catch (err) {
+      console.warn(err);
+    }
+    return undefined;
+  }));
+  return () => {
+    unsubList.forEach(unsub => {
+      unsub && unsub();
+    });
+  };
+}
 function subscribePSP22Balance(addresses, chain, api, callBack) {
   let tokenList = {};
   const psp22ContractMap = {};

package/services/chain-service/constants.d.ts

@@ -18,6 +18,7 @@ export declare const _BALANCE_CHAIN_GROUP: {
     statemine: string[];
     kusama: string[];
     centrifuge: string[];
+    supportBridged: string[];
 };
 export declare const _BALANCE_TOKEN_GROUP: {
     crab: string[];
@@ -63,6 +64,7 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     avail: string[];
     pendulum: string[];
     centrifuge: string[];
+    disable_transfer: string[];
 };
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];

package/services/chain-service/constants.js

@@ -28,11 +28,12 @@ export const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
-  centrifuge: ['centrifuge']
+  centrifuge: ['centrifuge'],
+  supportBridged: ['rococo_assethub']
 };
 export const _BALANCE_TOKEN_GROUP = {
   crab: ['CKTON', 'PKTON'],
@@ -46,7 +47,7 @@ export const _NFT_CHAIN_GROUP = {
   statemine: ['statemine'],
   statemint: ['statemint'],
   unique_network: ['unique_network', 'quartz', 'opal'],
-  bitcountry: ['bitcountry', 'pioneer'],
+  bitcountry: ['bitcountry', 'pioneer', 'continuum_network'],
   vara: ['vara_network']
 };
 
@@ -71,6 +72,7 @@ export const _STAKING_ERA_LENGTH_MAP = {
   shibuya: 24,
   bifrost_testnet: 0.5,
   bifrost: 2,
+  bifrost_dot: 24,
   ternoa: 24,
   calamari: 6,
   calamari_test: 6,
@@ -201,12 +203,13 @@ export const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
-  centrifuge: ['centrifuge']
+  centrifuge: ['centrifuge'],
+  disable_transfer: ['invarch']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']
@@ -233,7 +236,8 @@ export const _XCM_TYPE = {
 
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network'];
 export const EVM_PASS_CONNECT_STATUS = {
-  arbitrum_one: ['*']
+  arbitrum_one: ['*'],
+  okxTest: ['*']
 };
 export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']

package/services/chain-service/handler/chain-spec/goldberg.d.ts

@@ -19,9 +19,25 @@ declare const chainSpec: {
             appLookup: string;
             commitment: string;
         };
+        V2HeaderExtension: {
+            appLookup: string;
+            commitment: string;
+        };
+        V3HeaderExtension: {
+            appLookup: string;
+            commitment: string;
+        };
+        VTHeaderExtension: {
+            newField: string;
+            commitment: string;
+            appLookup: string;
+        };
         HeaderExtension: {
             _enum: {
                 V1: string;
+                V2: string;
+                V3: string;
+                VTest: string;
             };
         };
         DaHeader: {
@@ -41,6 +57,8 @@ declare const chainSpec: {
             extra: string;
             types: string;
         };
+        BlockLengthColumns: string;
+        BlockLengthRows: string;
         BlockLength: {
             max: string;
             cols: string;
@@ -56,9 +74,34 @@ declare const chainSpec: {
             root: string;
             proof: string;
             numberOfLeaves: string;
-            leaf_index: string;
+            leafIndex: string;
             leaf: string;
         };
+        DataProofV2: {
+            dataRoot: string;
+            blobRoot: string;
+            bridgeRoot: string;
+            proof: string;
+            numberOfLeaves: string;
+            leafIndex: string;
+            leaf: string;
+        };
+        ProofResponse: {
+            dataProof: string;
+            message: string;
+        };
+        Message: {
+            messageType: string;
+            from: string;
+            to: string;
+            originDomain: string;
+            destinationDomain: string;
+            data: string;
+            id: string;
+        };
+        MessageType: {
+            _enum: string[];
+        };
         Cell: {
             row: string;
             col: string;
@@ -88,6 +131,19 @@ declare const chainSpec: {
                 })[];
                 type: string;
             };
+            queryAppData: {
+                description: string;
+                params: ({
+                    name: string;
+                    type: string;
+                    isOptional?: undefined;
+                } | {
+                    name: string;
+                    type: string;
+                    isOptional: boolean;
+                })[];
+                type: string;
+            };
             queryDataProof: {
                 description: string;
                 params: ({
@@ -101,6 +157,19 @@ declare const chainSpec: {
                 })[];
                 type: string;
             };
+            queryDataProofV2: {
+                description: string;
+                params: ({
+                    name: string;
+                    type: string;
+                    isOptional?: undefined;
+                } | {
+                    name: string;
+                    type: string;
+                    isOptional: boolean;
+                })[];
+                type: string;
+            };
         };
     };
     signedExtensions: {

package/services/chain-service/handler/chain-spec/goldberg.js

@@ -22,9 +22,25 @@ const chainSpec = {
       appLookup: 'DataLookup',
       commitment: 'KateCommitment'
     },
+    V2HeaderExtension: {
+      appLookup: 'DataLookup',
+      commitment: 'KateCommitment'
+    },
+    V3HeaderExtension: {
+      appLookup: 'DataLookup',
+      commitment: 'KateCommitment'
+    },
+    VTHeaderExtension: {
+      newField: 'Vec<u8>',
+      commitment: 'KateCommitment',
+      appLookup: 'DataLookup'
+    },
     HeaderExtension: {
       _enum: {
-        V1: 'V1HeaderExtension'
+        V1: 'V1HeaderExtension',
+        V2: 'V2HeaderExtension',
+        V3: 'V3HeaderExtension',
+        VTest: 'VTHeaderExtension'
       }
     },
     DaHeader: {
@@ -44,10 +60,12 @@ const chainSpec = {
       extra: 'CheckAppIdExtra',
       types: 'CheckAppIdTypes'
     },
+    BlockLengthColumns: 'Compact<u32>',
+    BlockLengthRows: 'Compact<u32>',
     BlockLength: {
       max: 'PerDispatchClass',
-      cols: 'Compact<u32>',
-      rows: 'Compact<u32>',
+      cols: 'BlockLengthColumns',
+      rows: 'BlockLengthRows',
       chunkSize: 'Compact<u32>'
     },
     PerDispatchClass: {
@@ -59,12 +77,37 @@ const chainSpec = {
       root: 'H256',
       proof: 'Vec<H256>',
       numberOfLeaves: 'Compact<u32>',
-      leaf_index: 'Compact<u32>',
+      leafIndex: 'Compact<u32>',
       leaf: 'H256'
     },
+    DataProofV2: {
+      dataRoot: 'H256',
+      blobRoot: 'H256',
+      bridgeRoot: 'H256',
+      proof: 'Vec<H256>',
+      numberOfLeaves: 'Compact<u32>',
+      leafIndex: 'Compact<u32>',
+      leaf: 'H256'
+    },
+    ProofResponse: {
+      dataProof: 'DataProofV2',
+      message: 'Option<Message>'
+    },
+    Message: {
+      messageType: 'MessageType',
+      from: 'H256',
+      to: 'H256',
+      originDomain: 'u32',
+      destinationDomain: 'u32',
+      data: 'Vec<u8>',
+      id: 'u64'
+    },
+    MessageType: {
+      _enum: ['ArbitraryMessage', 'FungibleToken']
+    },
     Cell: {
-      row: 'u32',
-      col: 'u32'
+      row: 'BlockLengthRows',
+      col: 'BlockLengthColumns'
     }
   },
   rpc: {
@@ -90,10 +133,22 @@ const chainSpec = {
         }],
         type: 'Vec<u8>'
       },
+      queryAppData: {
+        description: 'Fetches app data rows for the given app',
+        params: [{
+          name: 'app_id',
+          type: 'AppId'
+        }, {
+          name: 'at',
+          type: 'Hash',
+          isOptional: true
+        }],
+        type: 'Vec<Option<Vec<u8>>>'
+      },
       queryDataProof: {
-        description: 'Generate the data proof for the given `index`',
+        description: 'Generate the data proof for the given `transaction_index`',
         params: [{
-          name: 'data_index',
+          name: 'transaction_index',
           type: 'u32'
         }, {
           name: 'at',
@@ -101,6 +156,18 @@ const chainSpec = {
           isOptional: true
         }],
         type: 'DataProof'
+      },
+      queryDataProofV2: {
+        description: 'Generate the data proof for the given `transaction_index`',
+        params: [{
+          name: 'transaction_index',
+          type: 'u32'
+        }, {
+          name: 'at',
+          type: 'Hash',
+          isOptional: true
+        }],
+        type: 'ProofResponse'
       }
     }
   },