@subwallet/extension-base 1.1.2-1 → 1.1.4-0

package/cjs/services/wallet-connect-service/index.js

@@ -24,6 +24,7 @@ var _eip155RequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default
 var _koniState = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("koniState");
 var _client = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("client");
 var _option = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("option");
+var _haveData = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("haveData");
 var _initClient = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("initClient");
 var _updateSessions = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("updateSessions");
 var _onSessionProposal = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionProposal");
@@ -55,6 +56,10 @@ class WalletConnectService {
     Object.defineProperty(this, _initClient, {
       value: _initClient2
     });
+    Object.defineProperty(this, _haveData, {
+      get: _get_haveData,
+      set: void 0
+    });
     Object.defineProperty(this, _requestService, {
       writable: true,
       value: void 0
@@ -104,66 +109,64 @@ class WalletConnectService {
     (0, _classPrivateFieldLooseBase2.default)(this, _option)[_option] = Object.assign({}, (0, _classPrivateFieldLooseBase2.default)(this, _option)[_option], newOption);
     await (0, _classPrivateFieldLooseBase2.default)(this, _initClient)[_initClient]();
   }
-  getSessions() {
-    var _classPrivateFieldLoo3;
-    (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    console.log((_classPrivateFieldLoo3 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo3 === void 0 ? void 0 : _classPrivateFieldLoo3.session.values);
-  }
   async connect(uri) {
-    var _classPrivateFieldLoo4;
+    var _classPrivateFieldLoo3;
+    if (!(0, _classPrivateFieldLooseBase2.default)(this, _haveData)[_haveData]) {
+      await (0, _classPrivateFieldLooseBase2.default)(this, _initClient)[_initClient](true);
+    }
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo4 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.pair({
+    await ((_classPrivateFieldLoo3 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo3 === void 0 ? void 0 : _classPrivateFieldLoo3.pair({
       uri
     }));
   }
   async approveSession(result) {
-    var _classPrivateFieldLoo5;
+    var _classPrivateFieldLoo4;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo5 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo5 === void 0 ? void 0 : _classPrivateFieldLoo5.approve(result));
+    await ((_classPrivateFieldLoo4 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.approve(result));
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
   async rejectSession(id) {
-    var _classPrivateFieldLoo6;
+    var _classPrivateFieldLoo5;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo6 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo6 === void 0 ? void 0 : _classPrivateFieldLoo6.reject({
+    await ((_classPrivateFieldLoo5 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo5 === void 0 ? void 0 : _classPrivateFieldLoo5.reject({
       id: id,
       reason: (0, _utils2.getSdkError)('USER_REJECTED')
     }));
   }
   async responseRequest(response) {
-    var _classPrivateFieldLoo7;
+    var _classPrivateFieldLoo6;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo7 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.respond(response));
+    await ((_classPrivateFieldLoo6 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo6 === void 0 ? void 0 : _classPrivateFieldLoo6.respond(response));
   }
   async resetWallet(resetAll) {
-    var _classPrivateFieldLoo8, _classPrivateFieldLoo10, _classPrivateFieldLoo12;
+    var _classPrivateFieldLoo7, _classPrivateFieldLoo9, _classPrivateFieldLoo11;
     (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
 
     // Disconnect session
-    const sessions = ((_classPrivateFieldLoo8 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.session.values) || [];
+    const sessions = ((_classPrivateFieldLoo7 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.session.values) || [];
     for (const session of sessions) {
-      var _classPrivateFieldLoo9;
-      (_classPrivateFieldLoo9 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.disconnect({
+      var _classPrivateFieldLoo8;
+      (_classPrivateFieldLoo8 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.disconnect({
         topic: session.topic,
         reason: (0, _utils2.getSdkError)('USER_DISCONNECTED')
       }).catch(console.error);
     }
 
     // Disconnect pair
-    const pairs = ((_classPrivateFieldLoo10 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.pairing.values) || [];
+    const pairs = ((_classPrivateFieldLoo9 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.pairing.values) || [];
     for (const pair of pairs) {
-      var _classPrivateFieldLoo11;
-      (_classPrivateFieldLoo11 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.disconnect({
+      var _classPrivateFieldLoo10;
+      (_classPrivateFieldLoo10 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.disconnect({
         topic: pair.topic,
         reason: (0, _utils2.getSdkError)('USER_DISCONNECTED')
       }).catch(console.error);
     }
-    const keys = (await ((_classPrivateFieldLoo12 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.getKeys())) || [];
+    const keys = (await ((_classPrivateFieldLoo11 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));
     for (const key of deleteKeys) {
       try {
-        var _classPrivateFieldLoo13;
-        await ((_classPrivateFieldLoo13 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.core.storage.removeItem(key));
+        var _classPrivateFieldLoo12;
+        await ((_classPrivateFieldLoo12 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.removeItem(key));
       } catch (e) {
         console.error(e);
       }
@@ -171,8 +174,8 @@ class WalletConnectService {
     await (0, _classPrivateFieldLooseBase2.default)(this, _initClient)[_initClient]();
   }
   async disconnect(topic) {
-    var _classPrivateFieldLoo14;
-    await ((_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.disconnect({
+    var _classPrivateFieldLoo13;
+    await ((_classPrivateFieldLoo13 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.disconnect({
       topic: topic,
       reason: (0, _utils2.getSdkError)('USER_DISCONNECTED')
     }));
@@ -180,9 +183,20 @@ class WalletConnectService {
   }
 }
 exports.default = WalletConnectService;
-async function _initClient2() {
+function _get_haveData() {
+  const sessionStorage = localStorage.getItem('wc@2:client:0.3//session');
+  const pairingStorage = localStorage.getItem('wc@2:core:0.3//pairing');
+  const subscriptionStorage = localStorage.getItem('wc@2:core:0.3//subscription');
+  const sessions = sessionStorage ? JSON.parse(sessionStorage) : [];
+  const pairings = pairingStorage ? JSON.parse(pairingStorage) : [];
+  const subscriptions = subscriptionStorage ? JSON.parse(subscriptionStorage) : [];
+  return !!sessions.length || !!pairings.length || !!subscriptions.length;
+}
+async function _initClient2(force) {
   (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
-  (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
+  if (force || (0, _classPrivateFieldLooseBase2.default)(this, _haveData)[_haveData]) {
+    (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
+  }
   (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   (0, _classPrivateFieldLooseBase2.default)(this, _createListener)[_createListener]();
 }
@@ -252,18 +266,18 @@ function _onSessionRequest2(requestEvent) {
   }
 }
 function _createListener2() {
-  var _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20;
-  (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
-  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_ping', data => console.log('ping', data));
-  (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_event', data => console.log('event', data));
-  (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_update', data => console.log('update', data));
-  (_classPrivateFieldLoo20 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));
+  var _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19;
+  (_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
+  (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
+  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', data => console.log('ping', data));
+  (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_event', data => console.log('event', data));
+  (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_update', data => console.log('update', data));
+  (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));
 }
 function _removeListener2() {
   _constants.ALL_WALLET_CONNECT_EVENT.forEach(event => {
-    var _classPrivateFieldLoo21;
-    (_classPrivateFieldLoo21 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo21 === void 0 ? void 0 : _classPrivateFieldLoo21.removeAllListeners(event);
+    var _classPrivateFieldLoo20;
+    (_classPrivateFieldLoo20 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.removeAllListeners(event);
   });
 }
 function _checkClient2() {

package/cjs/utils/environment.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RuntimeInfo = void 0;
+exports.getOS = exports.TARGET_ENV = exports.RuntimeInfo = exports.MODULE_SUPPORT = void 0;
 var _KoniTypes = require("../background/KoniTypes");
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -63,4 +63,34 @@ function detectRuntimeEnvironment() {
   }
 }
 const RuntimeInfo = detectRuntimeEnvironment();
-exports.RuntimeInfo = RuntimeInfo;
+exports.RuntimeInfo = RuntimeInfo;
+const getOS = () => {
+  var _window$navigator, _window$navigator$use;
+  const userAgent = window.navigator.userAgent;
+  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const platform = ((_window$navigator = window.navigator) === null || _window$navigator === void 0 ? void 0 : (_window$navigator$use = _window$navigator.userAgentData) === null || _window$navigator$use === void 0 ? void 0 : _window$navigator$use.platform) || window.navigator.platform;
+  const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
+  const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
+  const iosPlatforms = ['iPhone', 'iPad', 'iPod'];
+  let os = 'Unknown';
+  if (macosPlatforms.indexOf(platform) !== -1) {
+    os = 'Mac OS';
+  } else if (iosPlatforms.indexOf(platform) !== -1) {
+    os = 'iOS';
+  } else if (windowsPlatforms.indexOf(platform) !== -1) {
+    os = 'Windows';
+  } else if (/Android/.test(userAgent)) {
+    os = 'Android';
+  } else if (/Linux/.test(platform)) {
+    os = 'Linux';
+  }
+  return os;
+};
+exports.getOS = getOS;
+const TARGET_ENV = process.env.TARGET_ENV || 'extension';
+exports.TARGET_ENV = TARGET_ENV;
+const MODULE_SUPPORT = {
+  MANTA_ZK: TARGET_ENV === 'extension'
+};
+exports.MODULE_SUPPORT = MODULE_SUPPORT;

package/cjs/utils/index.js

@@ -9,6 +9,7 @@ var _exportNames = {
   nonEmptyArr: true,
   isEmptyArray: true,
   isAccountAll: true,
+  isMobile: true,
   reformatAddress: true,
   filterAddressByNetworkKey: true,
   categoryAddresses: true,
@@ -55,7 +56,7 @@ exports.hexToStr = hexToStr;
 exports.hexToUTF16 = hexToUTF16;
 exports.inJestTest = inJestTest;
 exports.isAccountAll = isAccountAll;
-exports.isEmptyArray = exports.isDef = exports.isAddressesEqual = void 0;
+exports.isMobile = exports.isEmptyArray = exports.isDef = exports.isAddressesEqual = void 0;
 exports.isSameAddress = isSameAddress;
 exports.isUrl = isUrl;
 exports.isValidSubstrateAddress = exports.isValidProvider = void 0;
@@ -70,6 +71,7 @@ exports.utf16ToString = utf16ToString;
 exports.waitTimeout = waitTimeout;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
+var _environment = require("@subwallet/extension-base/utils/environment");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _canDerive = require("./canDerive");
@@ -85,15 +87,15 @@ Object.keys(_array).forEach(function (key) {
     }
   });
 });
-var _environment = require("./environment");
-Object.keys(_environment).forEach(function (key) {
+var _environment2 = require("./environment");
+Object.keys(_environment2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _environment[key]) return;
+  if (key in exports && exports[key] === _environment2[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _environment[key];
+      return _environment2[key];
     }
   });
 });
@@ -109,6 +111,18 @@ Object.keys(_lazy).forEach(function (key) {
     }
   });
 });
+var _registry = require("./registry");
+Object.keys(_registry).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _registry[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _registry[key];
+    }
+  });
+});
 var _translate = require("./translate");
 Object.keys(_translate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -135,6 +149,8 @@ exports.isEmptyArray = isEmptyArray;
 function isAccountAll(address) {
   return address === _constants.ALL_ACCOUNT_KEY;
 }
+const isMobile = _KoniTypes.MobileOS.includes((0, _environment.getOS)());
+exports.isMobile = isMobile;
 function reformatAddress(address) {
   let networkPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 42;
   let isEthereum = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

package/cjs/utils/registry.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createRegistry = void 0;
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _types = require("@polkadot/types");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const createRegistry = (chain, rawMetadata) => {
+  var _chain$substrateInfo;
+  const registry = new _types.TypeRegistry();
+  const metadata = new _types.Metadata(registry, rawMetadata);
+  registry.setMetadata(metadata);
+  const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chain);
+  registry.setChainProperties(registry.createType('ChainProperties', {
+    ss58Format: ((_chain$substrateInfo = chain.substrateInfo) === null || _chain$substrateInfo === void 0 ? void 0 : _chain$substrateInfo.addressPrefix) || 42,
+    tokenDecimals: tokenInfo.decimals,
+    tokenSymbol: tokenInfo.symbol
+  }));
+  return registry;
+};
+exports.createRegistry = createRegistry;

package/koni/api/dotsama/transfer.js

@@ -167,8 +167,6 @@ export const createTransferExtrinsic = async ({
     //   }
   } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
-  } else if (_TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
-    /* empty */
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);

package/koni/api/nft/config.d.ts

@@ -15,12 +15,12 @@ export declare const UNIQUE_SCAN_ENDPOINT = "https://explorer-api.unique.network
 export declare const QUARTZ_SCAN_ENDPOINT = "https://hasura-quartz.unique.network/v1/graphql";
 export declare const UNIQUE_IPFS_GATEWAY = "https://ipfs.unique.network/ipfs/";
 export declare const NFT_STORAGE_GATEWAY = "https://nftstorage.link/ipfs/";
-export declare const IPFS_IO_GATEWAY = "https://ipfs.io/ipfs/";
+export declare const IPFS_W3S_LINK = "https://w3s.link/ipfs/";
 export declare const GATEWAY_IPFS_IO = "https://gateway.ipfs.io/ipfs/";
 export declare const DWEB_LINK = "https://dweb.link/ipfs/";
-export declare const IPFS_GATEWAY_CLOUD = "https://ipfs-gateway.cloud/ipfs/";
+export declare const IPFS_GATEWAY_4EVERLAND = "https://4everland.io/ipfs/";
 export declare const IPFS_FLEEK = "https://ipfs.fleek.co/ipfs/";
-export declare const IPFS_TELOS_MIAMI = "https://ipfs.telos.miami/ipfs";
+export declare const IPFS_HARDBIN = "https://hardbin.com/ipfs";
 export declare enum SUPPORTED_NFT_NETWORKS {
     karura = "karura",
     acala = "acala",

package/koni/api/nft/config.js

@@ -19,12 +19,12 @@ export const UNIQUE_SCAN_ENDPOINT = 'https://explorer-api.unique.network/v1/grap
 export const QUARTZ_SCAN_ENDPOINT = 'https://hasura-quartz.unique.network/v1/graphql';
 export const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';
 export const NFT_STORAGE_GATEWAY = 'https://nftstorage.link/ipfs/';
-export const IPFS_IO_GATEWAY = 'https://ipfs.io/ipfs/';
+export const IPFS_W3S_LINK = 'https://w3s.link/ipfs/';
 export const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
 export const DWEB_LINK = 'https://dweb.link/ipfs/';
-export const IPFS_GATEWAY_CLOUD = 'https://ipfs-gateway.cloud/ipfs/';
+export const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 export const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
-export const IPFS_TELOS_MIAMI = 'https://ipfs.telos.miami/ipfs';
+export const IPFS_HARDBIN = 'https://hardbin.com/ipfs';
 export let SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
   SUPPORTED_NFT_NETWORKS["karura"] = "karura";
@@ -68,8 +68,8 @@ export let SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME;
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["pioneer"] = "pioneer";
 })(SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME || (SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = {}));
 const RANDOM_IPFS_GATEWAY_SETTING = [{
-  provider: IPFS_IO_GATEWAY,
-  weight: 0 // Not stable
+  provider: IPFS_W3S_LINK,
+  weight: 1
 }, {
   provider: CF_IPFS_GATEWAY,
   weight: 4
@@ -86,11 +86,11 @@ const RANDOM_IPFS_GATEWAY_SETTING = [{
   provider: DWEB_LINK,
   weight: 5
 }, {
-  provider: IPFS_GATEWAY_CLOUD,
-  weight: 0 // Deceptive site warning
+  provider: IPFS_GATEWAY_4EVERLAND,
+  weight: 2
 }, {
-  provider: IPFS_TELOS_MIAMI,
-  weight: 0
+  provider: IPFS_HARDBIN,
+  weight: 1
 }];
 if (!RuntimeInfo.protocol || RuntimeInfo.protocol && !RuntimeInfo.protocol.startsWith('http')) {
   RANDOM_IPFS_GATEWAY_SETTING.push({

package/koni/api/nft/nft.js

@@ -68,7 +68,7 @@ export class BaseNftApi {
     if (!input || input.length === 0) {
       return undefined;
     }
-    if (isUrl(input)) {
+    if (isUrl(input) || input.includes('https://') || input.includes('http')) {
       return input;
     }
     if (input.startsWith('/ipfs/')) {

package/koni/api/nft/rmrk_nft/index.d.ts

@@ -1,7 +1,6 @@
 import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 export declare class RmrkNftApi extends BaseNftApi {
     constructor(addresses: string[], chain: string);
-    parseUrl(input: string): string | undefined;
     private getMetadata;
     private getAllByAccount;
     handleNft(address: string, params: HandleNftParams): Promise<void>;

package/koni/api/nft/rmrk_nft/index.js

@@ -5,7 +5,7 @@ import { RMRK_VER } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl, reformatAddress } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
-import { getRandomIpfsGateway, SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
+import { SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
 var RMRK_SOURCE;
 (function (RMRK_SOURCE) {
   RMRK_SOURCE["BIRD_KANARIA"] = "bird_kanaria";
@@ -18,18 +18,23 @@ export class RmrkNftApi extends BaseNftApi {
   constructor(addresses, chain) {
     super(chain, null, addresses);
   }
-  parseUrl(input) {
-    if (!input || input.length === 0) {
-      return undefined;
-    }
-    if (isUrl(input) || input.includes('https://') || input.includes('http')) {
-      return input;
-    }
-    if (!input.includes('ipfs://ipfs/')) {
-      return getRandomIpfsGateway() + input;
-    }
-    return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1];
-  }
+
+  // override parseUrl (input: string): string | undefined {
+  //   if (!input || input.length === 0) {
+  //     return undefined;
+  //   }
+  //
+  //   if (isUrl(input) || input.includes('https://') || input.includes('http')) {
+  //     return input;
+  //   }
+  //
+  //   if (!input.includes('ipfs://ipfs/')) {
+  //     return getRandomIpfsGateway() + input;
+  //   }
+  //
+  //   return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1];
+  // }
+
   async getMetadata(metadataUrl) {
     let url = metadataUrl;
     if (!isUrl(metadataUrl)) {
@@ -69,53 +74,57 @@ export class RmrkNftApi extends BaseNftApi {
     }));
     const nfts = [];
     await Promise.all(data.map(async item => {
-      const primaryResource = item.primaryResource ? item.primaryResource : null;
-      const metadataUri = primaryResource && primaryResource.metadata ? primaryResource.metadata : item.metadata;
-      const nftMetadata = await this.getMetadata(metadataUri);
-      if (item.source === RMRK_SOURCE.BIRD_KANARIA) {
-        nfts.push({
-          ...item,
-          metadata: nftMetadata,
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.KANARIA) {
-        nfts.push({
-          ...item,
-          metadata: {
-            ...nftMetadata,
-            image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
-          },
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.SINGULAR_V1) {
-        nfts.push({
-          ...item,
-          metadata: {
-            description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
-            name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
-            attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
-            animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
-            image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
-          },
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.SINGULAR_V2) {
-        const id = item.id;
-        if (!id.toLowerCase().includes(KANBIRD_KEYWORD)) {
-          // excludes kanaria bird, already handled above
+      try {
+        const primaryResource = item.primaryResource ? item.primaryResource : null;
+        const metadataUri = primaryResource && primaryResource.metadata ? primaryResource.metadata : item.metadata;
+        const nftMetadata = await this.getMetadata(metadataUri);
+        if (item.source === RMRK_SOURCE.BIRD_KANARIA) {
+          nfts.push({
+            ...item,
+            metadata: nftMetadata,
+            owner: account
+          });
+        } else if (item.source === RMRK_SOURCE.KANARIA) {
+          nfts.push({
+            ...item,
+            metadata: {
+              ...nftMetadata,
+              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
+            },
+            owner: account
+          });
+        } else if (item.source === RMRK_SOURCE.SINGULAR_V1) {
           nfts.push({
             ...item,
             metadata: {
               description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
               name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
               attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
-              properties: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.properties,
               animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
-              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.mediaUri)
+              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
             },
             owner: account
           });
+        } else if (item.source === RMRK_SOURCE.SINGULAR_V2) {
+          const id = item.id;
+          if (!id.toLowerCase().includes(KANBIRD_KEYWORD)) {
+            // excludes kanaria bird, already handled above
+            nfts.push({
+              ...item,
+              metadata: {
+                description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
+                name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
+                attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
+                properties: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.properties,
+                animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
+                image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.mediaUri)
+              },
+              owner: account
+            });
+          }
         }
+      } catch (e) {
+        console.log('error fetching RMRK NFT', e);
       }
     }));
     return nfts;

package/koni/background/handlers/Extension.d.ts

@@ -78,6 +78,7 @@ export default class KoniExtension {
     private setEnableChainPatrol;
     private setShowZeroBalance;
     private setLanguage;
+    private setShowBalance;
     private subscribeAuthUrls;
     private _saveCurrentAccountAddress;
     private updateCurrentAccountAddress;
@@ -201,5 +202,6 @@ export default class KoniExtension {
     private disableMantaPay;
     private subscribeMantaPayConfig;
     private subscribeMantaPaySyncState;
+    private findRawMetadata;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }