@subwallet/extension-base 1.1.43-0 → 1.1.45-0

package/services/subscan-service/index.js

@@ -2,13 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { SWError } from '@subwallet/extension-base/background/errors/SWError';
+import { BASE_FETCH_ORDINAL_EVENT_DATA } from '@subwallet/extension-base/koni/api/nft/ordinal_nft/constants';
 import { wait } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 const QUERY_ROW = 100;
 export class SubscanService {
-  limitRate = 2; // limit per interval check
+  callRate = 2; // limit per interval check
+  limitRate = 2; // max rate per interval check
   intervalCheck = 1000; // interval check in ms
   maxRetry = 9; // interval check in ms
+  rollbackRateTime = 30 * 1000; // rollback rate time in ms
+  timeoutRollbackRate = undefined;
   requestMap = {};
   nextId = 0;
   isRunning = false;
@@ -17,10 +21,18 @@ export class SubscanService {
   }
   constructor(subscanChainMap, options) {
     this.subscanChainMap = subscanChainMap;
+    this.callRate = (options === null || options === void 0 ? void 0 : options.limitRate) || this.callRate;
     this.limitRate = (options === null || options === void 0 ? void 0 : options.limitRate) || this.limitRate;
     this.intervalCheck = (options === null || options === void 0 ? void 0 : options.intervalCheck) || this.intervalCheck;
     this.maxRetry = (options === null || options === void 0 ? void 0 : options.maxRetry) || this.maxRetry;
   }
+  reduceLimitRate() {
+    clearTimeout(this.timeoutRollbackRate);
+    this.callRate = Math.ceil(this.limitRate / 2);
+    this.timeoutRollbackRate = setTimeout(() => {
+      this.callRate = this.limitRate;
+    }, this.rollbackRateTime);
+  }
   getApiUrl(chain, path) {
     const subscanChain = this.subscanChainMap[chain];
     if (!subscanChain) {
@@ -37,13 +49,14 @@ export class SubscanService {
       body: JSON.stringify(body)
     });
   }
-  addRequest(run) {
+  addRequest(run, ordinal) {
     const newId = this.getId();
     return new Promise((resolve, reject) => {
       this.requestMap[newId] = {
         id: newId,
         status: 'pending',
         retry: -1,
+        ordinal,
         run,
         resolve,
         reject
@@ -65,7 +78,7 @@ export class SubscanService {
       }
 
       // Get first this.limit requests base on id
-      const requests = remainingRequests.filter(request => request.status !== 'running').sort((a, b) => a.id - b.id).slice(0, this.limitRate);
+      const requests = remainingRequests.filter(request => request.status !== 'running').sort((a, b) => a.id - b.id).sort((a, b) => a.ordinal - b.ordinal).slice(0, this.callRate);
 
       // Start requests
       requests.forEach(request => {
@@ -73,12 +86,20 @@ export class SubscanService {
         request.run().then(rs => {
           request.resolve(rs);
         }).catch(e => {
-          if (request.retry < maxRetry) {
-            request.status = 'pending';
-            request.retry++;
+          const error = JSON.parse(e.message);
+
+          // Limit rate
+          if (error.code === 20008) {
+            if (request.retry < maxRetry) {
+              request.status = 'pending';
+              request.retry++;
+              this.reduceLimitRate();
+            } else {
+              // Reject request
+              request.reject(new SWError('MAX_RETRY', String(e)));
+            }
           } else {
-            // Reject request
-            request.reject(new SWError('MAX_RETRY', String(e)));
+            request.reject(new SWError('UNKNOWN', String(e)));
           }
         });
       });
@@ -102,7 +123,7 @@ export class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    });
+    }, 1);
   }
   getCrowdloanContributions(relayChain, address, page = 0) {
     return this.addRequest(async () => {
@@ -117,7 +138,7 @@ export class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    });
+    }, 2);
   }
   getExtrinsicsList(chain, address, page = 0, blockRange) {
     const _blockRange = (() => {
@@ -127,7 +148,7 @@ export class SubscanService {
       return `${blockRange.from || 0}-${blockRange.to}`;
     })();
     return this.addRequest(async () => {
-      const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/extrinsics'), {
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/extrinsics'), {
         page,
         row: QUERY_ROW,
         address,
@@ -138,7 +159,7 @@ export class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    });
+    }, 0);
   }
   async fetchAllPossibleExtrinsicItems(chain, address, cbAfterEachRequest, limit = {
     page: 10,
@@ -159,11 +180,26 @@ export class SubscanService {
       if (res.count > maxCount) {
         maxCount = res.count;
       }
-      cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.extrinsics);
-      res.extrinsics.forEach(item => {
+      const extrinsics = res.extrinsics;
+      const extrinsicIndexes = extrinsics.map(item => item.extrinsic_index);
+      const extrinsicParams = await this.getExtrinsicParams(chain, extrinsicIndexes, 0);
+      for (const data of extrinsicParams) {
+        const {
+          extrinsic_index: extrinsicIndex,
+          params
+        } = data;
+        const extrinsic = extrinsics.find(item => item.extrinsic_index === extrinsicIndex);
+        if (extrinsic) {
+          extrinsic.params = JSON.stringify(params);
+        }
+      }
+
+      // Call callback after each request, for parse data
+      cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(extrinsics);
+      for (const item of extrinsics) {
         resultMap[item.extrinsic_hash] = item;
-      });
-      currentCount += res.extrinsics.length;
+      }
+      currentCount += extrinsics.length;
       if (page > limit.page || currentCount > limit.record) {
         return;
       }
@@ -193,7 +229,7 @@ export class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    });
+    }, 0);
   }
   async fetchAllPossibleTransferItems(chain, address, direction, cbAfterEachRequest, limit = {
     page: 10,
@@ -250,6 +286,31 @@ export class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    });
+    }, 2);
+  }
+  getAccountRemarkEvents(chain, address) {
+    return this.addRequest(async () => {
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/events'), {
+        ...BASE_FETCH_ORDINAL_EVENT_DATA,
+        address
+      });
+      if (rs.status !== 200) {
+        throw new SWError('SubscanService.getAccountRemarkEvents', await rs.text());
+      }
+      const jsonData = await rs.json();
+      return jsonData.data.events;
+    }, 3);
+  }
+  getExtrinsicParams(chain, extrinsicIndexes, ordinal = 3) {
+    return this.addRequest(async () => {
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/extrinsic/params'), {
+        extrinsic_index: extrinsicIndexes
+      });
+      if (rs.status !== 200) {
+        throw new SWError('SubscanService.getExtrinsicParams', await rs.text());
+      }
+      const jsonData = await rs.json();
+      return jsonData.data;
+    }, ordinal);
   }
 }

package/services/subscan-service/subscan-chain-map.js

@@ -131,6 +131,8 @@ export const SUBSCAN_BALANCE_CHAIN_MAP = {
   vara_network: 'vara',
   bifrost: 'bifrost',
   creditcoin: 'creditcoin',
-  joystream: 'joystream'
+  joystream: 'joystream',
+  manta_network: 'manta',
+  continuum_network: 'continuum'
 };
 export const SUBSCAN_BALANCE_CHAIN_MAP_REVERSE = Object.fromEntries(Object.entries(SUBSCAN_BALANCE_CHAIN_MAP).map(([k, v]) => [v, k]));

package/services/subscan-service/types.d.ts

@@ -1,6 +1,8 @@
 export interface SubscanRequest<T> {
     id: number;
     retry: number;
+    /** Serve smaller first  */
+    ordinal: number;
     status: 'pending' | 'running';
     run: () => Promise<any>;
     resolve: (value: any) => T;
@@ -51,9 +53,13 @@ export interface ExtrinsicItem {
     block_timestamp: number;
     extrinsic_index: string;
     call_module_function: string;
+    /** Need be called from another api */
     params: string;
+    /** Deprecated */
     account_id: string;
+    /** Deprecated */
     account_index: string;
+    /** Deprecated */
     signature: string;
     call_module: string;
     nonce: number;
@@ -61,6 +67,7 @@ export interface ExtrinsicItem {
     success: boolean;
     fee: string;
     fee_used: string;
+    /** Deprecated */
     from_hex: string;
     tip: string;
     finalized: boolean;

package/services/transaction-service/utils.js

@@ -22,6 +22,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('3dpscan.io')) {
     return 'account';
   }
+  if (explorerLink.includes('explorer.polimec.org')) {
+    return 'account';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {

package/cjs/koni/api/nft/ordinal_nft/utils.js

@@ -1,41 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fetchRemarkEvent = exports.fetchExtrinsicParams = void 0;
-var _constants = require("./constants");
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-const fetchRemarkEvent = async (chain, address) => {
-  const params = {
-    ..._constants.BASE_FETCH_ORDINAL_EVENT_DATA,
-    address
-  };
-  const response = await fetch(_constants.GET_EVENT_LIST_API.replace('{{chain}}', chain), {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(params)
-  });
-  const data = await response.json();
-  return data.data.events;
-};
-exports.fetchRemarkEvent = fetchRemarkEvent;
-const fetchExtrinsicParams = async (chain, extrinsicIndexes) => {
-  const params = {
-    extrinsic_index: extrinsicIndexes
-  };
-  const response = await fetch(_constants.GET_EXTRINSIC_PARAMS_API.replace('{{chain}}', chain), {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(params)
-  });
-  const data = await response.json();
-  return data.data;
-};
-exports.fetchExtrinsicParams = fetchExtrinsicParams;

package/koni/api/nft/ordinal_nft/utils.d.ts

@@ -1,2 +0,0 @@
-export declare const fetchRemarkEvent: (chain: string, address: string) => Promise<import("@subwallet/extension-base/types").SubscanEventBaseItemData[]>;
-export declare const fetchExtrinsicParams: (chain: string, extrinsicIndexes: string[]) => Promise<import("@subwallet/extension-base/types").SubscanExtrinsicParam[]>;

package/koni/api/nft/ordinal_nft/utils.js

@@ -1,33 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { BASE_FETCH_ORDINAL_EVENT_DATA, GET_EVENT_LIST_API, GET_EXTRINSIC_PARAMS_API } from "./constants.js";
-export const fetchRemarkEvent = async (chain, address) => {
-  const params = {
-    ...BASE_FETCH_ORDINAL_EVENT_DATA,
-    address
-  };
-  const response = await fetch(GET_EVENT_LIST_API.replace('{{chain}}', chain), {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(params)
-  });
-  const data = await response.json();
-  return data.data.events;
-};
-export const fetchExtrinsicParams = async (chain, extrinsicIndexes) => {
-  const params = {
-    extrinsic_index: extrinsicIndexes
-  };
-  const response = await fetch(GET_EXTRINSIC_PARAMS_API.replace('{{chain}}', chain), {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(params)
-  });
-  const data = await response.json();
-  return data.data;
-};