@subwallet/extension-base 1.1.7-0 → 1.1.9-0

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

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _AssetType } from '@subwallet/chain-list/types';
+import { AZERO_DOMAIN_CONTRACTS } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { collectionApiFromArtZero, collectionDetailApiFromArtZero, externalUrlOnArtZero, ipfsApiFromArtZero, itemImageApiFromArtZero } from '@subwallet/extension-base/koni/api/nft/wasm_nft/utils';
-import { getPSP34ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
+import { getPSP34ContractPromise, isAzeroDomainNft, isPinkRoboNft } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { isUrl } from '@subwallet/extension-base/utils';
 import axios from 'axios';
 import fetch from 'cross-fetch';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -70,6 +72,9 @@ export class WasmNftApi extends BaseNftApi {
     if (!tokenUri || tokenUri.length === 0) {
       return undefined;
     }
+    if (isUrl(tokenUri)) {
+      return tokenUri;
+    }
     if (tokenUri.startsWith('/ipfs/')) {
       return tokenUri;
     }
@@ -256,16 +261,19 @@ export class WasmNftApi extends BaseNftApi {
       owner: '',
       name: tokenId
     };
-    const _tokenUri = await contractPromise.query['psp34Traits::tokenUri'](address, {
+    const _isFeatured = isFeatured && !AZERO_DOMAIN_CONTRACTS.includes(contractPromise.address.toString());
+    const _tokenUri = await contractPromise.query[isPinkRoboNft(contractPromise.address.toString()) ? 'pinkMint::tokenUri' : 'psp34Traits::tokenUri'](address, {
       gasLimit: getDefaultWeightV2((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
-    }, tokenId);
+    }, isAzeroDomainNft(contractPromise.address.toString()) ? {
+      bytes: tokenId
+    } : tokenId);
     if (_tokenUri.output) {
       let itemDetail = false;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const _tokenUriObj = _tokenUri.output.toJSON();
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      const tokenUri = _tokenUriObj.Ok || _tokenUriObj.ok;
-      if (isFeatured) {
+      const tokenUri = isPinkRoboNft(contractPromise.address.toString()) ? _tokenUriObj.ok.ok : _tokenUriObj.Ok || _tokenUriObj.ok;
+      if (_isFeatured) {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
           const resp = await fetch(`${ipfsApiFromArtZero(this.chain)}?input=${parsedTokenUri}`);
@@ -277,6 +285,11 @@ export class WasmNftApi extends BaseNftApi {
         if (detailUrl) {
           const resp = await fetch(detailUrl);
           itemDetail = resp && resp.ok && (await resp.json());
+          if (AZERO_DOMAIN_CONTRACTS.includes(contractPromise.address.toString())) {
+            var _itemDetail;
+            // @ts-ignore
+            itemDetail = (_itemDetail = itemDetail) === null || _itemDetail === void 0 ? void 0 : _itemDetail.metadata;
+          }
         }
       }
       if (!itemDetail) {
@@ -286,14 +299,14 @@ export class WasmNftApi extends BaseNftApi {
       nftItem.description = itemDetail.description;
       nftItem.externalUrl = itemDetail.external_url;
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
-      if (isFeatured) {
+      if (_isFeatured) {
         nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
         nftItem.externalUrl = externalUrlOnArtZero(this.chain);
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
       }
       const propertiesMap = {};
-      const traitList = itemDetail.attributes ? itemDetail.attributes : itemDetail.traits;
+      const traitList = itemDetail.attributes || itemDetail.traits;
       if (traitList) {
         traitList.forEach(traitMap => {
           propertiesMap[traitMap.trait_type] = {
@@ -339,8 +352,13 @@ export class WasmNftApi extends BaseNftApi {
           if (_tokenByIndexResp.output) {
             const rawTokenId = _tokenByIndexResp.output.toHuman();
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            const tokenIdObj = rawTokenId.Ok.Ok || rawTokenId.ok.ok; // capital O, not normal o
+            let tokenIdObj = rawTokenId.Ok.Ok || rawTokenId.ok.ok; // capital O, not normal o
             const tokenId = Object.values(tokenIdObj)[0].replaceAll(',', '');
+            if (isAzeroDomainNft(contractPromise.address.toString())) {
+              tokenIdObj = {
+                bytes: tokenId
+              };
+            }
             nftIds.push(tokenId);
             let tokenUri;
             try {

package/koni/api/staking/bonding/relayChain.js

@@ -68,23 +68,33 @@ export function validateRelayBondingCondition(chainInfo, amount, selectedValidat
 }
 export function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, callback) {
   return substrateApi.api.query.staking.currentEra(async _currentEra => {
-    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6, _substrateApi$api$que7;
     const currentEra = _currentEra.toString();
     const maxNominations = substrateApi.api.consts.staking.maxNominations.toString();
     const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
     const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
-    const [_minNominatorBond, _minPoolJoin, _minimumActiveStake] = await Promise.all([substrateApi.api.query.staking.minNominatorBond(), (_substrateApi$api$que = substrateApi.api.query) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.minJoinBond(), ((_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.staking) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minimumActiveStake) && ((_substrateApi$api$que5 = substrateApi.api.query) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.staking) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.minimumActiveStake())]);
+    const [_totalEraStake, _totalIssuance, _auctionCounter, _minNominatorBond, _minPoolJoin, _minimumActiveStake] = await Promise.all([substrateApi.api.query.staking.erasTotalStake(parseInt(currentEra)), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que = substrateApi.api.query.auctions) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.auctionCounter(), substrateApi.api.query.staking.minNominatorBond(), (_substrateApi$api$que2 = substrateApi.api.query) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.nominationPools) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.minJoinBond(), ((_substrateApi$api$que4 = substrateApi.api.query) === null || _substrateApi$api$que4 === void 0 ? void 0 : (_substrateApi$api$que5 = _substrateApi$api$que4.staking) === null || _substrateApi$api$que5 === void 0 ? void 0 : _substrateApi$api$que5.minimumActiveStake) && ((_substrateApi$api$que6 = substrateApi.api.query) === null || _substrateApi$api$que6 === void 0 ? void 0 : (_substrateApi$api$que7 = _substrateApi$api$que6.staking) === null || _substrateApi$api$que7 === void 0 ? void 0 : _substrateApi$api$que7.minimumActiveStake())]);
     const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
     const minNominatorBond = _minNominatorBond.toString();
     const bnMinActiveStake = new BN(minActiveStake);
     const bnMinNominatorBond = new BN(minNominatorBond);
     const minStake = bnMinActiveStake.gt(bnMinNominatorBond) ? bnMinActiveStake : bnMinNominatorBond;
+    const rawTotalEraStake = _totalEraStake.toString();
+    const rawTotalIssuance = _totalIssuance.toString();
+    const numAuctions = _auctionCounter ? _auctionCounter.toHuman() : 0;
+    const bnTotalEraStake = new BN(rawTotalEraStake);
+    const bnTotalIssuance = new BN(rawTotalIssuance);
+    const inflation = calculateInflation(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
+    const expectedReturn = calculateChainStakedReturn(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
     const minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
     const unlockingPeriod = parseInt(unlockingEras) * (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default); // in hours
 
     callback(chainInfo.slug, {
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
+      expectedReturn: !_STAKING_CHAIN_GROUP.ternoa.includes(chainInfo.slug) ? expectedReturn : undefined,
+      // in %, annually
+      inflation,
       era: parseInt(currentEra),
       minStake: minStake.toString(),
       maxValidatorPerNominator: parseInt(maxNominations),

package/koni/api/tokens/wasm/index.d.ts

@@ -2,5 +2,7 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 import { ApiPromise } from '@polkadot/api';
 import { ContractPromise } from '@polkadot/api-contract';
 export declare function getPSP22ContractPromise(apiPromise: ApiPromise, contractAddress: string): ContractPromise;
+export declare function isPinkRoboNft(contractAddress: string): boolean;
+export declare function isAzeroDomainNft(contractAddress: string): boolean;
 export declare function getPSP34ContractPromise(apiPromise: ApiPromise, contractAddress: string): ContractPromise;
 export declare function getPSP34TransferExtrinsic(networkKey: string, substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;

package/koni/api/tokens/wasm/index.js

@@ -2,12 +2,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
-import { _PSP22_ABI, _PSP34_ABI } from '@subwallet/extension-base/services/chain-service/helper';
+import { _AZERO_DOMAIN_REGISTRY_ABI, _PINK_PSP34_ABI, _PSP22_ABI, _PSP34_ABI } from '@subwallet/extension-base/services/chain-service/helper';
 import { ContractPromise } from '@polkadot/api-contract';
 export function getPSP22ContractPromise(apiPromise, contractAddress) {
   return new ContractPromise(apiPromise, _PSP22_ABI, contractAddress);
 }
+export function isPinkRoboNft(contractAddress) {
+  return ['XoywUxTTtNKPRrRN7V5KXCqz2QLMFeK7DxhpSniqZHps5Xq'].includes(contractAddress);
+}
+export function isAzeroDomainNft(contractAddress) {
+  return ['5FsB91tXSEuMj6akzdPczAtmBaVKToqHmtAwSUzXh49AYzaD', '5CTQBfBC9SfdrCDBJdfLiyW2pg9z5W6C6Es8sK313BLnFgDf'].includes(contractAddress);
+}
 export function getPSP34ContractPromise(apiPromise, contractAddress) {
+  if (isPinkRoboNft(contractAddress)) {
+    return new ContractPromise(apiPromise, _PINK_PSP34_ABI, contractAddress);
+  }
+  if (isAzeroDomainNft(contractAddress)) {
+    return new ContractPromise(apiPromise, _AZERO_DOMAIN_REGISTRY_ABI, contractAddress);
+  }
   return new ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
 }
 const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;

package/koni/background/cron.js

@@ -105,7 +105,7 @@ export class KoniCron {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+      this.addCron('refreshPoolingSta             kingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();

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

@@ -207,5 +207,7 @@ export default class KoniExtension {
     private subscribeMantaPayConfig;
     private subscribeMantaPaySyncState;
     private findRawMetadata;
+    private resolveDomainByAddress;
+    private resolveAddressByDomain;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -11,6 +11,7 @@ import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, ChainTy
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
+import { resolveAzeroAddressToDomain, resolveAzeroDomainToAddress } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
 import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
 import { getNftTransferExtrinsic, isRecipientSelf } from '@subwallet/extension-base/koni/api/nft/transfer';
@@ -3395,6 +3396,14 @@ export default class KoniExtension {
       specVersion
     };
   }
+  async resolveDomainByAddress(request) {
+    const chainApi = this.#koniState.getSubstrateApi(request.chain);
+    return await resolveAzeroDomainToAddress(request.domain, request.chain, chainApi.api);
+  }
+  async resolveAddressByDomain(request) {
+    const chainApi = this.#koniState.getSubstrateApi(request.chain);
+    return await resolveAzeroAddressToDomain(request.address, request.chain, chainApi.api);
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -3602,6 +3611,10 @@ export default class KoniExtension {
       // Subscribe address
       case 'pri(accounts.subscribeAddresses)':
         return this.subscribeAddresses(id, port);
+      case 'pri(accounts.resolveDomainToAddress)':
+        return await this.resolveDomainByAddress(request);
+      case 'pri(accounts.resolveAddressToDomain)':
+        return await this.resolveAddressByDomain(request);
 
       // ChainService
       case 'pri(chainService.subscribeChainInfoMap)':

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

@@ -183,6 +183,7 @@ export default class KoniState {
     getActiveChainInfoMap(): Record<string, _ChainInfo>;
     upsertChainInfo(data: _NetworkUpsertParams): Promise<boolean>;
     removeCustomChain(networkKey: string): boolean;
+    forceRemoveChain(networkKey: string): void;
     private getDefaultNetworkKeys;
     disableChain(chainSlug: string): Promise<boolean>;
     enableChain(chainSlug: string, enableTokens?: boolean): Promise<boolean>;

package/koni/background/handlers/State.js

@@ -848,6 +848,9 @@ export default class KoniState {
   removeCustomChain(networkKey) {
     return this.chainService.removeCustomChain(networkKey);
   }
+  forceRemoveChain(networkKey) {
+    this.chainService.forceRemoveChain(networkKey);
+  }
 
   // TODO: avoids turning off chains related to ledger account
   getDefaultNetworkKeys = () => {

package/koni/background/subscription.js

@@ -126,7 +126,9 @@ export class KoniSubscription {
         maxWithdrawalRequestPerValidator: rs.maxWithdrawalRequestPerValidator,
         // by default
         allowCancelUnstaking: rs.allowCancelUnstaking,
-        unstakingPeriod: rs.unstakingPeriod
+        unstakingPeriod: rs.unstakingPeriod,
+        expectedReturn: rs.expectedReturn,
+        inflation: rs.inflation
       });
     });
     if (onlyRunOnFirstTime) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.7-0",
+  "version": "1.1.9-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -169,6 +169,11 @@
       "require": "./cjs/koni/api/dotsama/crowdloan.js",
       "default": "./koni/api/dotsama/crowdloan.js"
     },
+    "./koni/api/dotsama/domain": {
+      "types": "./koni/api/dotsama/domain.d.ts",
+      "require": "./cjs/koni/api/dotsama/domain.js",
+      "default": "./koni/api/dotsama/domain.js"
+    },
     "./koni/api/dotsama/parseTransaction": {
       "types": "./koni/api/dotsama/parseTransaction.d.ts",
       "require": "./cjs/koni/api/dotsama/parseTransaction.js",
@@ -570,8 +575,10 @@
       "require": "./cjs/services/chain-service/helper/api-helper/spec/dataavail.js",
       "default": "./services/chain-service/helper/api-helper/spec/dataavail.js"
     },
+    "./services/chain-service/helper/azero_domain_registry_abi.json": "./services/chain-service/helper/azero_domain_registry_abi.json",
     "./services/chain-service/helper/erc20_abi.json": "./services/chain-service/helper/erc20_abi.json",
     "./services/chain-service/helper/erc721_abi.json": "./services/chain-service/helper/erc721_abi.json",
+    "./services/chain-service/helper/pink_psp34_abi.json": "./services/chain-service/helper/pink_psp34_abi.json",
     "./services/chain-service/helper/psp22_abi.json": "./services/chain-service/helper/psp22_abi.json",
     "./services/chain-service/helper/psp34_abi.json": "./services/chain-service/helper/psp34_abi.json",
     "./services/chain-service/helper/test_erc721_abi.json": "./services/chain-service/helper/test_erc721_abi.json",
@@ -650,6 +657,11 @@
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
       "default": "./services/migration-service/scripts/ClearOldStorage.js"
     },
+    "./services/migration-service/scripts/DeleteChain": {
+      "types": "./services/migration-service/scripts/DeleteChain.d.ts",
+      "require": "./cjs/services/migration-service/scripts/DeleteChain.js",
+      "default": "./services/migration-service/scripts/DeleteChain.js"
+    },
     "./services/migration-service/scripts/MigrateAuthUrls": {
       "types": "./services/migration-service/scripts/MigrateAuthUrls.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateAuthUrls.js",
@@ -1164,6 +1176,7 @@
   "dependencies": {
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
+    "@azns/resolver-core": "^1.4.0",
     "@equilab/api": "^1.14.25",
     "@ethereumjs/common": "^2.6.5",
     "@ethereumjs/tx": "^4.0.2",
@@ -1188,11 +1201,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.9",
-    "@subwallet/extension-base": "^1.1.7-0",
-    "@subwallet/extension-chains": "^1.1.7-0",
-    "@subwallet/extension-dapp": "^1.1.7-0",
-    "@subwallet/extension-inject": "^1.1.7-0",
+    "@subwallet/chain-list": "0.2.11-beta.0",
+    "@subwallet/extension-base": "^1.1.9-0",
+    "@subwallet/extension-chains": "^1.1.9-0",
+    "@subwallet/extension-dapp": "^1.1.9-0",
+    "@subwallet/extension-inject": "^1.1.9-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@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.7-0'
+  version: '1.1.9-0'
 };