@subwallet/extension-base 1.1.30-0 → 1.1.31-0

package/cjs/constants/index.js

@@ -101,7 +101,7 @@ const IGNORE_QR_SIGNER = [];
 exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
 const XCM_MIN_AMOUNT_RATIO = 1.2;
 exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
-const GAS_PRICE_RATIO = 1.05;
+const GAS_PRICE_RATIO = 1 + 2 / 100;
 exports.GAS_PRICE_RATIO = GAS_PRICE_RATIO;
-const NETWORK_MULTI_GAS_FEE = ['astarEvm'];
+const NETWORK_MULTI_GAS_FEE = ['*'];
 exports.NETWORK_MULTI_GAS_FEE = NETWORK_MULTI_GAS_FEE;

package/cjs/koni/api/dotsama/transfer.js

@@ -190,6 +190,9 @@ const createTransferExtrinsic = async _ref => {
   } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
   } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
+    if (networkKey === 'invarch') {
+      return [null, transferAmount || value];
+    }
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);
     } else if (value) {

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.30-0'
+  version: '1.1.31-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/utils/eth.js

@@ -72,6 +72,7 @@ const signatureToHex = sig => {
 };
 exports.signatureToHex = signatureToHex;
 const recalculateGasPrice = (_price, chain) => {
-  return _constants.NETWORK_MULTI_GAS_FEE.includes(chain) ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
+  const needMulti = _constants.NETWORK_MULTI_GAS_FEE.includes(chain) || _constants.NETWORK_MULTI_GAS_FEE.includes('*');
+  return needMulti ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
 };
 exports.recalculateGasPrice = recalculateGasPrice;

package/cjs/utils/fetchStaticData.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchStaticData = fetchStaticData;
+var _staticData = require("@subwallet/extension-base/utils/staticData");
 var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -13,6 +14,10 @@ const branchName = process.env.BRANCH_NAME || 'koni-dev';
 const fetchTarget = branchName === 'master' || branchName === 'webapp' ? 'list.json' : 'preview.json';
 async function fetchStaticData(slug, targetFile) {
   const fetchFile = targetFile || fetchTarget;
-  const rs = await _axios.default.get(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
-  return rs.data;
+  try {
+    const rs = await _axios.default.get(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
+    return rs.data;
+  } catch (e) {
+    return _staticData.staticData[slug];
+  }
 }

package/cjs/utils/staticData/index.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.crowdloanFunds = exports.chains = exports.buyTokenConfigs = exports.buyServiceInfos = exports.StaticKey = void 0;
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+const buyServiceInfos = require('./buyServiceInfos.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+exports.buyServiceInfos = buyServiceInfos;
+const buyTokenConfigs = require('./buyTokenConfigs.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+exports.buyTokenConfigs = buyTokenConfigs;
+const chains = require('./chains.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+exports.chains = chains;
+const crowdloanFunds = require('./crowdloanFunds.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+exports.crowdloanFunds = crowdloanFunds;
+const marketingCampaigns = require('./marketingCampaigns.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+exports.marketingCampaigns = marketingCampaigns;
+const termAndCondition = require('./termAndCondition.json');
+exports.termAndCondition = termAndCondition;
+let StaticKey;
+exports.StaticKey = StaticKey;
+(function (StaticKey) {
+  StaticKey["BUY_SERVICE_INFOS"] = "buy-service-infos";
+  StaticKey["CHAINS"] = "chains";
+  StaticKey["MARKETING_CAMPAINGS"] = "marketing-campaigns";
+  StaticKey["CROWDLOAN_FUNDS"] = "crowdloan-funds";
+  StaticKey["TERM_AND_CONDITION"] = "term-and-condition";
+  StaticKey["BUY_TOKEN_CONFIGS"] = "buy-token-configs";
+})(StaticKey || (exports.StaticKey = StaticKey = {}));
+const staticData = {
+  [StaticKey.CHAINS]: chains,
+  [StaticKey.BUY_SERVICE_INFOS]: buyServiceInfos,
+  [StaticKey.CROWDLOAN_FUNDS]: crowdloanFunds,
+  [StaticKey.MARKETING_CAMPAINGS]: marketingCampaigns,
+  [StaticKey.TERM_AND_CONDITION]: termAndCondition.default,
+  [StaticKey.BUY_TOKEN_CONFIGS]: buyTokenConfigs
+};
+exports.staticData = staticData;

package/constants/index.d.ts

@@ -20,7 +20,7 @@ export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
-export declare const GAS_PRICE_RATIO = 1.05;
+export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -23,7 +23,7 @@ export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
-export const GAS_PRICE_RATIO = 1.05;
-export const NETWORK_MULTI_GAS_FEE = ['astarEvm'];
+export const GAS_PRICE_RATIO = 1 + 2 / 100;
+export const NETWORK_MULTI_GAS_FEE = ['*'];
 export * from "./staking.js";
 export * from "./storage.js";

package/koni/api/dotsama/transfer.js

@@ -181,6 +181,9 @@ 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 (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
+    if (networkKey === 'invarch') {
+      return [null, transferAmount || value];
+    }
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);
     } else if (value) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.30-0",
+  "version": "1.1.31-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1348,6 +1348,17 @@
       "require": "./cjs/utils/request.js",
       "default": "./utils/request.js"
     },
+    "./utils/staticData": {
+      "types": "./utils/staticData/index.d.ts",
+      "require": "./cjs/utils/staticData/index.js",
+      "default": "./utils/staticData/index.js"
+    },
+    "./utils/staticData/buyServiceInfos.json": "./utils/staticData/buyServiceInfos.json",
+    "./utils/staticData/buyTokenConfigs.json": "./utils/staticData/buyTokenConfigs.json",
+    "./utils/staticData/chains.json": "./utils/staticData/chains.json",
+    "./utils/staticData/crowdloanFunds.json": "./utils/staticData/crowdloanFunds.json",
+    "./utils/staticData/marketingCampaigns.json": "./utils/staticData/marketingCampaigns.json",
+    "./utils/staticData/termAndCondition.json": "./utils/staticData/termAndCondition.json",
     "./utils/translate": {
       "types": "./utils/translate.d.ts",
       "require": "./cjs/utils/translate.js",
@@ -1382,11 +1393,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.33",
-    "@subwallet/extension-base": "^1.1.30-0",
-    "@subwallet/extension-chains": "^1.1.30-0",
-    "@subwallet/extension-dapp": "^1.1.30-0",
-    "@subwallet/extension-inject": "^1.1.30-0",
+    "@subwallet/chain-list": "0.2.36",
+    "@subwallet/extension-base": "^1.1.31-0",
+    "@subwallet/extension-chains": "^1.1.31-0",
+    "@subwallet/extension-dapp": "^1.1.31-0",
+    "@subwallet/extension-inject": "^1.1.31-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@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.30-0'
+  version: '1.1.31-0'
 };

package/utils/eth.js

@@ -61,5 +61,6 @@ export const signatureToHex = sig => {
   return hexR + hexS + hexV;
 };
 export const recalculateGasPrice = (_price, chain) => {
-  return NETWORK_MULTI_GAS_FEE.includes(chain) ? new BigN(_price).multipliedBy(GAS_PRICE_RATIO).toFixed(0) : _price;
+  const needMulti = NETWORK_MULTI_GAS_FEE.includes(chain) || NETWORK_MULTI_GAS_FEE.includes('*');
+  return needMulti ? new BigN(_price).multipliedBy(GAS_PRICE_RATIO).toFixed(0) : _price;
 };

package/utils/fetchStaticData.js

@@ -1,11 +1,16 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { staticData } from '@subwallet/extension-base/utils/staticData';
 import axios from 'axios';
 const branchName = process.env.BRANCH_NAME || 'koni-dev';
 const fetchTarget = branchName === 'master' || branchName === 'webapp' ? 'list.json' : 'preview.json';
 export async function fetchStaticData(slug, targetFile) {
   const fetchFile = targetFile || fetchTarget;
-  const rs = await axios.get(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
-  return rs.data;
+  try {
+    const rs = await axios.get(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
+    return rs.data;
+  } catch (e) {
+    return staticData[slug];
+  }
 }

package/utils/staticData/buyServiceInfos.json

@@ -0,0 +1,48 @@
+[
+  {
+    "id": 1,
+    "slug": "transak",
+    "name": "Transak",
+    "contactUrl": "https://support.transak.com",
+    "termUrl": "https://transak.com/terms-of-service",
+    "policyUrl": "https://transak.com/privacy-policy",
+    "url": "https://transak.com"
+  },
+  {
+    "id": 2,
+    "slug": "banxa",
+    "name": "Banxa",
+    "contactUrl": "http://support.banxa.com",
+    "termUrl": "https://banxa.com/wp-content/uploads/2023/07/Customer-Terms-and-Conditions-19-June-2023.pdf",
+    "policyUrl": "https://banxa.com/wp-content/uploads/2023/07/Privacy-and-Cookies-Policy-19-June-2023.pdf",
+    "url": "https://banxa.com"
+  },
+  {
+    "id": 3,
+    "slug": "coinbase",
+    "name": "Coinbase",
+    "contactUrl": "https://help.coinbase.com/en/contact-us",
+    "termUrl": "https://coinbase.com/legal/user_agreement/united_states",
+    "policyUrl": "https://coinbase.com/legal/privacy",
+    "url": "https://coinbase.com"
+  },
+  {
+    "id": 4,
+    "slug": "moonpay",
+    "name": "Moonpay",
+    "contactUrl": " ",
+    "termUrl": " ",
+    "policyUrl": " ",
+    "url": " "
+  },
+  {
+    "id": 5,
+    "slug": "onramper",
+    "name": "OnRamper",
+    "contactUrl": " ",
+    "termUrl": " ",
+    "policyUrl": " ",
+    "url": " "
+  }
+]
+