@subwallet/extension-base 1.2.10-0 → 1.2.11-1

package/services/transaction-service/index.js

@@ -14,7 +14,7 @@ import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { anyNumberToBN, reformatAddress } from '@subwallet/extension-base/utils';
+import { _isRuntimeUpdated, anyNumberToBN, getMetadataHash, reformatAddress } from '@subwallet/extension-base/utils';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { BN_ZERO } from '@subwallet/extension-base/utils/number';
@@ -189,7 +189,7 @@ export default class TransactionService {
   }
   async sendTransaction(transaction) {
     // Send Transaction
-    const emitter = transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : await this.signAndSendEvmTransaction(transaction);
+    const emitter = await (transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : this.signAndSendEvmTransaction(transaction));
     const {
       eventsHandler
     } = transaction;
@@ -1010,7 +1010,7 @@ export default class TransactionService {
     }
     return emitter;
   }
-  signAndSendSubstrateTransaction({
+  async signAndSendSubstrateTransaction({
     address,
     chain,
     id,
@@ -1024,7 +1024,10 @@ export default class TransactionService {
       warnings: [],
       extrinsicHash: id
     };
-    transaction.signAsync(address, {
+    const extrinsic = transaction;
+    const registry = extrinsic.registry;
+    const signedExtensions = registry.signedExtensions;
+    const signerOption = {
       signer: {
         signPayload: async payload => {
           const signing = await this.state.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload);
@@ -1034,7 +1037,15 @@ export default class TransactionService {
           };
         }
       }
-    }).then(async rs => {
+    };
+    if (_isRuntimeUpdated(signedExtensions)) {
+      try {
+        const metadataHash = await getMetadataHash(chain);
+        signerOption.mode = 1;
+        signerOption.metadataHash = `0x${metadataHash}`;
+      } catch (e) {}
+    }
+    extrinsic.signAsync(address, signerOption).then(async rs => {
       // Emit signed event
       emitter.emit('signed', eventData);
 

package/types/index.d.ts

@@ -11,8 +11,9 @@ export interface Message extends MessageEvent {
 export * from './balance';
 export * from './buy';
 export * from './campaigns';
+export * from './common';
 export * from './fee';
+export * from './metadata';
 export * from './ordinal';
 export * from './transaction';
 export * from './yield';
-export * from './common';

package/types/index.js

@@ -4,9 +4,10 @@
 export * from "./balance/index.js";
 export * from "./buy.js";
 export * from "./campaigns/index.js";
+export * from "./common/index.js";
 export * from "./fee/index.js";
+export * from "./metadata.js";
 export * from "./ordinal.js";
 export * from "./transaction.js";
 export * from "./yield/index.js";
-export * from "./common/index.js";
 export {};

package/types/metadata.d.ts

@@ -0,0 +1,6 @@
+export interface ResponseShortenMetadata {
+    txMetadata: string;
+}
+export interface ResponseMetadataHash {
+    metadataHash: string;
+}

package/types/metadata.js

@@ -0,0 +1 @@
+export {};

package/utils/index.d.ts

@@ -51,6 +51,7 @@ export * from './fetchEvmChainInfo';
 export * from './fetchStaticData';
 export * from './gear';
 export * from './lazy';
+export * from './metadata';
 export * from './number';
 export * from './object';
 export * from './promise';

package/utils/index.js

@@ -353,6 +353,7 @@ export * from "./fetchEvmChainInfo.js";
 export * from "./fetchStaticData.js";
 export * from "./gear/index.js";
 export * from "./lazy.js";
+export * from "./metadata.js";
 export * from "./number.js";
 export * from "./object.js";
 export * from "./promise.js";

package/utils/metadata.d.ts

@@ -0,0 +1,3 @@
+export declare const _isRuntimeUpdated: (signedExtensions: string[]) => boolean;
+export declare const getMetadataHash: (chain: string) => Promise<string>;
+export declare const getShortMetadata: (chain: string, blob: string) => Promise<string>;

package/utils/metadata.js

@@ -0,0 +1,39 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const LEDGER_API_URL = 'https://ledger-api.subwallet.app';
+const createUrl = path => `${LEDGER_API_URL}/${path}`;
+export const _isRuntimeUpdated = signedExtensions => {
+  return signedExtensions.includes('CheckMetadataHash');
+};
+export const getMetadataHash = async chain => {
+  const data = {
+    id: chain
+  };
+  const resp = await fetch(createUrl('node/metadata/hash'), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(data)
+  });
+  const rs = await resp.json();
+  return rs.metadataHash;
+};
+export const getShortMetadata = async (chain, blob) => {
+  const data = {
+    chain: {
+      id: chain
+    },
+    txBlob: blob
+  };
+  const resp = await fetch(createUrl('transaction/metadata'), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(data)
+  });
+  const rs = await resp.json();
+  return rs.txMetadata;
+};

package/utils/registry.d.ts

@@ -1,4 +1,4 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
+import { ResponseFindRawMetadata } from '@subwallet/extension-base/background/KoniTypes';
 import { Registry } from '@polkadot/types/types';
-import { HexString } from '@polkadot/util/types';
-export declare const createRegistry: (chain: _ChainInfo, rawMetadata: HexString) => Registry;
+export declare const createRegistry: (chain: _ChainInfo, data: ResponseFindRawMetadata) => Registry;

package/utils/registry.js

@@ -3,12 +3,13 @@
 
 import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { Metadata, TypeRegistry } from '@polkadot/types';
-export const createRegistry = (chain, rawMetadata) => {
+export const createRegistry = (chain, data) => {
   var _chain$substrateInfo;
   const registry = new TypeRegistry();
-  const metadata = new Metadata(registry, rawMetadata);
-  registry.setMetadata(metadata);
+  const metadata = new Metadata(registry, data.rawMetadata);
   const tokenInfo = _getChainNativeTokenBasicInfo(chain);
+  registry.register(data.types);
+  registry.setMetadata(metadata, undefined, data.userExtensions);
   registry.setChainProperties(registry.createType('ChainProperties', {
     ss58Format: ((_chain$substrateInfo = chain.substrateInfo) === null || _chain$substrateInfo === void 0 ? void 0 : _chain$substrateInfo.addressPrefix) || 42,
     tokenDecimals: tokenInfo.decimals,