@subwallet/extension-base 1.0.2-1b → 1.0.2-2

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

@@ -3,44 +3,11 @@
 
 import { _AssetType } from '@subwallet/chain-list/types';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
-import { ART_ZERO_COLLECTION_API, ART_ZERO_EXTERNAL_URL, ART_ZERO_IMAGE_API, ART_ZERO_IPFS_API, ART_ZERO_TESTNET_COLLECTION_API, ART_ZERO_TESTNET_IMAGE_API, ART_ZERO_TESTNET_IPFS_API } from '@subwallet/extension-base/koni/api/nft/wasm_nft/utils';
+import { ART_ZERO_COLLECTION_API, ART_ZERO_CONTRACTS, ART_ZERO_EXTERNAL_URL, ART_ZERO_IMAGE_API, ART_ZERO_IPFS_API } from '@subwallet/extension-base/koni/api/nft/wasm_nft/utils';
 import { getPSP34ContractPromise } 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 axios from 'axios';
 import fetch from 'cross-fetch';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-
-// interface CollectionAttributes {
-//   storedOnChain: boolean,
-//   attributeList: string[] // list of attribute names
-// }
-
-async function isArtZeroFeaturedCollection(networkKey, contractAddress) {
-  const timeout = new Promise(resolve => {
-    const id = setTimeout(() => {
-      clearTimeout(id);
-      resolve(null);
-    }, 3000);
-  });
-  const urlencoded = new URLSearchParams();
-  urlencoded.append('collection_address', contractAddress);
-  const collectionInfoPromise = new Promise(function (resolve) {
-    fetch(`${networkKey === 'alephTest' ? ART_ZERO_TESTNET_COLLECTION_API : ART_ZERO_COLLECTION_API}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
-      },
-      body: urlencoded
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
-  const collectionInfo = await Promise.race([timeout, collectionInfoPromise]);
-
-  // @ts-ignore
-  return collectionInfo !== null && (collectionInfo === null || collectionInfo === void 0 ? void 0 : collectionInfo.status) !== 'FAILED';
-}
 export class WasmNftApi extends BaseNftApi {
   wasmContracts = [];
   constructor(api, addresses, chain) {
@@ -53,40 +20,31 @@ export class WasmNftApi extends BaseNftApi {
     if (!tokenUri || tokenUri.length === 0) {
       return undefined;
     }
-    if (tokenUri.startsWith('/ipfs/')) {
-      return tokenUri;
-    }
-    if (tokenUri.startsWith('ipfs://')) {
-      return `/ipfs/${tokenUri.split('ipfs://')[1]}`;
-    }
     if (!tokenUri.includes('ipfs://') && !tokenUri.includes('ipfs://ipfs/')) {
-      return `/ipfs/${tokenUri}`;
+      return `ipfs://${tokenUri}`;
     }
     if (tokenUri.includes('ipfs://ipfs/')) {
-      return `/ipfs/${tokenUri.split('ipfs://ipfs/')[1]}`;
+      return `ipfs://${tokenUri}`;
     }
     return tokenUri;
   }
-  async parseFeaturedNftImage(tokenUri) {
+  parseFeaturedNftImage(tokenUri) {
     const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
     if (!parsedTokenUri) {
       return undefined;
     }
-    const nftItemImageSrc = `${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IMAGE_API : ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
-    const collectionImageUrl = await axios(nftItemImageSrc, {
-      method: 'GET'
-    });
-    return collectionImageUrl.data;
+    return `${ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
   }
   async parseFeaturedCollectionImage(smartContract) {
-    const urlencoded = new URLSearchParams();
-    urlencoded.append('collection_address', smartContract);
-    const resp = await fetch(this.chain === 'alephTest' ? ART_ZERO_TESTNET_COLLECTION_API : ART_ZERO_COLLECTION_API, {
+    const resp = await fetch(ART_ZERO_COLLECTION_API, {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
+        Accept: 'application/json',
+        'Content-Type': 'application/json'
       },
-      body: urlencoded
+      body: JSON.stringify({
+        collection_address: smartContract
+      })
     });
     const result = resp && resp.ok && (await resp.json());
     if (!result) {
@@ -100,91 +58,82 @@ export class WasmNftApi extends BaseNftApi {
     if (!parsedCollectionImage) {
       return;
     }
-    const collectionImageSrc = `${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IMAGE_API : ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}&size=500`;
-    const collectionImageUrl = await axios(collectionImageSrc, {
-      method: 'GET'
+    return `${ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}`;
+  }
+  async getCollectionAttributes(contractPromise) {
+    const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], {
+      gasLimit: -1
     });
-    return collectionImageUrl.data;
+    const onChainAttributeCount = _onChainAttributeCount.output ? _onChainAttributeCount.output.toString() : '0';
+    if (parseInt(onChainAttributeCount) === 0) {
+      return {
+        storedOnChain: false,
+        attributeList: []
+      };
+    }
+    const attributeList = [];
+    const attributeIndexes = [];
+    for (let i = 0; i < parseInt(onChainAttributeCount); i++) {
+      attributeIndexes.push(i);
+    }
+    await Promise.all(attributeIndexes.map(async i => {
+      const _attributeByIndex = await contractPromise.query['psp34Traits::getAttributeName'](this.addresses[0], {
+        gasLimit: -1
+      }, i);
+      if (_attributeByIndex.output) {
+        const attributeName = _attributeByIndex.output.toString();
+        if (attributeName !== '') {
+          attributeList.push(attributeName);
+        }
+      }
+    }));
+    return {
+      storedOnChain: true,
+      attributeList
+    };
+  }
+  async processOnChainMetadata(contractPromise, address, tokenIdObj, collectionAttributes, isFeatured) {
+    const nftItem = {
+      chain: '',
+      collectionId: '',
+      id: '',
+      owner: ''
+    };
+    const _attributeValues = await contractPromise.query['psp34Traits::getAttributes'](address, {
+      gasLimit: -1
+    }, tokenIdObj, collectionAttributes);
+    if (_attributeValues.output) {
+      const attributeValues = _attributeValues.output.toHuman();
+      const attributeDict = {};
+      for (let i = 0; i < collectionAttributes.length; i++) {
+        const attributeName = collectionAttributes[i];
+        const attributeValue = attributeValues[i] ? attributeValues[i] : '';
+        if (attributeName.toLowerCase() === 'nft_name') {
+          nftItem.name = attributeValue;
+        } else if (attributeName.toLowerCase() === 'description') {
+          nftItem.description = attributeValue;
+        } else if (attributeName.toLowerCase() === 'avatar') {
+          if (isFeatured) {
+            nftItem.image = this.parseFeaturedNftImage(attributeValue);
+          } else {
+            nftItem.image = this.parseUrl(attributeValue);
+          }
+        } else {
+          if (attributeValue !== '') {
+            attributeDict[attributeName] = {
+              value: attributeValue
+            };
+          }
+        }
+      }
+      nftItem.properties = attributeDict;
+    }
+    if (isFeatured) {
+      nftItem.externalUrl = ART_ZERO_EXTERNAL_URL;
+    }
+    return nftItem;
   }
-
-  // private async getCollectionAttributes (contractPromise: ContractPromise): Promise<CollectionAttributes> {
-  //   const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], { gasLimit: getDefaultWeightV2(this.substrateApi?.api as ApiPromise) });
-  //   const onChainAttributeCount = _onChainAttributeCount.output ? _onChainAttributeCount.output.toString() : '0';
-  //
-  //   if (parseInt(onChainAttributeCount) === 0) {
-  //     return {
-  //       storedOnChain: false,
-  //       attributeList: []
-  //     };
-  //   }
-  //
-  //   const attributeList: string[] = [];
-  //   const attributeIndexes: number[] = [];
-  //
-  //   for (let i = 0; i < parseInt(onChainAttributeCount); i++) {
-  //     attributeIndexes.push(i);
-  //   }
-  //
-  //   await Promise.all(attributeIndexes.map(async (i) => {
-  //     const _attributeByIndex = await contractPromise.query['psp34Traits::getAttributeName'](this.addresses[0], { gasLimit: getDefaultWeightV2(this.substrateApi?.api as ApiPromise) }, i);
-  //
-  //     if (_attributeByIndex.output) {
-  //       const attributeName = _attributeByIndex.output.toString();
-  //
-  //       if (attributeName !== '') {
-  //         attributeList.push(attributeName);
-  //       }
-  //     }
-  //   }));
-  //
-  //   return {
-  //     storedOnChain: true,
-  //     attributeList
-  //   };
-  // }
-
-  // private async processOnChainMetadata (contractPromise: ContractPromise, address: string, tokenIdObj: Record<string, string>, collectionAttributes: string[], isFeatured: boolean): Promise<NftItem> {
-  //   const nftItem: NftItem = { chain: '', collectionId: '', id: '', owner: '' };
-  //   const _attributeValues = await contractPromise.query['psp34Traits::getAttributes'](address, { gasLimit: getDefaultWeightV2(this.substrateApi?.api as ApiPromise) }, tokenIdObj, collectionAttributes);
-  //
-  //   if (_attributeValues.output) {
-  //     const attributeValues = _attributeValues.output.toHuman() as string[];
-  //
-  //     const attributeDict: Record<string, any> = {};
-  //
-  //     for (let i = 0; i < collectionAttributes.length; i++) {
-  //       const attributeName = collectionAttributes[i];
-  //       const attributeValue = attributeValues[i] ? attributeValues[i] : '';
-  //
-  //       if (attributeName.toLowerCase() === 'nft_name') {
-  //         nftItem.name = attributeValue;
-  //       } else if (attributeName.toLowerCase() === 'description') {
-  //         nftItem.description = attributeValue;
-  //       } else if (attributeName.toLowerCase() === 'avatar') {
-  //         if (isFeatured) {
-  //           nftItem.image = await this.parseFeaturedNftImage(attributeValue);
-  //         } else {
-  //           nftItem.image = this.parseUrl(attributeValue);
-  //         }
-  //       } else {
-  //         if (attributeValue !== '') {
-  //           attributeDict[attributeName] = { value: attributeValue };
-  //         }
-  //       }
-  //     }
-  //
-  //     nftItem.properties = attributeDict;
-  //   }
-  //
-  //   if (isFeatured) {
-  //     nftItem.externalUrl = ART_ZERO_EXTERNAL_URL;
-  //   }
-  //
-  //   return nftItem;
-  // }
-
   async processOffChainMetadata(contractPromise, address, tokenId, isFeatured) {
-    var _this$substrateApi;
     const nftItem = {
       chain: '',
       collectionId: '',
@@ -193,23 +142,19 @@ export class WasmNftApi extends BaseNftApi {
       name: tokenId
     };
     const _tokenUri = await contractPromise.query['psp34Traits::tokenUri'](address, {
-      gasLimit: getDefaultWeightV2((_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api)
+      gasLimit: -1
     }, 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;
+      const tokenUri = _tokenUri.output.toString();
       if (isFeatured) {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
-          const resp = await fetch(`${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IPFS_API : ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
+          const resp = await fetch(`${ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
-        const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
-        const detailUrl = this.parseUrl(parsedTokenUri);
+        const detailUrl = this.parseUrl(tokenUri);
         if (detailUrl) {
           const resp = await fetch(detailUrl);
           itemDetail = resp && resp.ok && (await resp.json());
@@ -224,7 +169,7 @@ export class WasmNftApi extends BaseNftApi {
       nftItem.externalUrl = itemDetail.external_url;
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
       if (isFeatured) {
-        nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
+        nftItem.image = this.parseFeaturedNftImage(rawImageSrc);
         nftItem.externalUrl = ART_ZERO_EXTERNAL_URL;
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
@@ -242,24 +187,20 @@ export class WasmNftApi extends BaseNftApi {
     }
     return nftItem;
   }
-  async getItemsByCollection(contractPromise, tokenInfo, collectionName, nftParams, isFeatured) {
+  async getItemsByCollection(contractPromise, collectionAttributes, isMetadataOnchain, tokenInfo, collectionName, nftParams) {
     let ownItem = false;
     let collectionImage;
     const smartContract = _getContractAddressOfToken(tokenInfo);
-    const nftOwnerMap = {};
+    const isFeatured = ART_ZERO_CONTRACTS.includes(smartContract);
     await Promise.all(this.addresses.map(async address => {
-      var _this$substrateApi2, _balance$output;
       if (isEthereumAddress(address)) {
         return;
       }
       const nftIds = [];
       const _balance = await contractPromise.query['psp34::balanceOf'](address, {
-        gasLimit: getDefaultWeightV2((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
+        gasLimit: -1
       }, address);
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const balanceJson = _balance === null || _balance === void 0 ? void 0 : (_balance$output = _balance.output) === null || _balance$output === void 0 ? void 0 : _balance$output.toJSON();
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      const balance = _balance.output ? balanceJson.ok || balanceJson.Ok : '0';
+      const balance = _balance.output ? _balance.output.toString() : '0';
       if (parseInt(balance) === 0) {
         return;
       }
@@ -269,17 +210,20 @@ export class WasmNftApi extends BaseNftApi {
       }
       try {
         await Promise.all(itemIndexes.map(async i => {
-          var _this$substrateApi3;
           const _tokenByIndexResp = await contractPromise.query['psp34Enumerable::ownersTokenByIndex'](address, {
-            gasLimit: getDefaultWeightV2((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
+            gasLimit: -1
           }, address, i);
           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
-            const tokenId = Object.values(tokenIdObj)[0].replaceAll(',', '');
+            const tokenIdObj = rawTokenId.Ok;
+            const tokenId = Object.values(tokenIdObj)[0];
             nftIds.push(tokenId);
-            const nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
+            let nftItem;
+            if (isMetadataOnchain) {
+              nftItem = await this.processOnChainMetadata(contractPromise, address, tokenIdObj, collectionAttributes, isFeatured);
+            } else {
+              nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
+            }
             nftItem.collectionId = smartContract;
             nftItem.chain = this.chain;
             nftItem.type = _AssetType.PSP34;
@@ -294,8 +238,6 @@ export class WasmNftApi extends BaseNftApi {
             }
           }
         }));
-
-        nftOwnerMap[address] = nftIds;
       } catch (e) {
         console.error(`error parsing item for ${this.chain} nft`, e);
       }
@@ -315,9 +257,6 @@ export class WasmNftApi extends BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
-        nftParams.cleanUpNfts(this.chain, owner, smartContract, nftIds);
-      });
     }
   }
   async fetchNfts(params) {
@@ -329,17 +268,20 @@ export class WasmNftApi extends BaseNftApi {
     return 1;
   }
   async handleNfts(params) {
-    var _this$substrateApi4;
+    var _this$substrateApi;
     if (!this.wasmContracts || this.wasmContracts.length === 0) {
       return;
     }
     await this.connect(); // might not be necessary
 
-    const apiPromise = (_this$substrateApi4 = this.substrateApi) === null || _this$substrateApi4 === void 0 ? void 0 : _this$substrateApi4.api;
+    const apiPromise = (_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api;
     await Promise.all(this.wasmContracts.map(async tokenInfo => {
       const contractPromise = getPSP34ContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
-      const isCollectionFeatured = await isArtZeroFeaturedCollection(this.chain, _getContractAddressOfToken(tokenInfo));
-      return await this.getItemsByCollection(contractPromise, tokenInfo, tokenInfo.name, params, isCollectionFeatured);
+      const {
+        attributeList,
+        storedOnChain
+      } = await this.getCollectionAttributes(contractPromise);
+      return await this.getItemsByCollection(contractPromise, attributeList, storedOnChain, tokenInfo, tokenInfo.name, params);
     }));
   }
 }

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

@@ -1,7 +1,5 @@
-export declare const ART_ZERO_TESTNET_IMAGE_API = "https://a0-test-api.artzero.io/getImage";
-export declare const ART_ZERO_TESTNET_IPFS_API = "https://a0-test-api.artzero.io/getJSON";
-export declare const ART_ZERO_TESTNET_COLLECTION_API = "https://a0-test-api.artzero.io/getCollectionByAddress";
-export declare const ART_ZERO_IMAGE_API = "https://a0-api.artzero.io/getImage";
-export declare const ART_ZERO_IPFS_API = "https://a0-api.artzero.io/getJSON";
-export declare const ART_ZERO_COLLECTION_API = "https://a0-api.artzero.io/getCollectionByAddress";
-export declare const ART_ZERO_EXTERNAL_URL = "https://a0.artzero.io/#/marketplace";
+export declare const ART_ZERO_CONTRACTS: string[];
+export declare const ART_ZERO_IMAGE_API = "https://api.artzero.io/getImage";
+export declare const ART_ZERO_IPFS_API = "https://api.artzero.io/getJSON";
+export declare const ART_ZERO_COLLECTION_API = "https://api.artzero.io/getCollectionByAddress";
+export declare const ART_ZERO_EXTERNAL_URL = "https://artzero.io/demotestnet/#/marketplace";

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

@@ -1,10 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export const ART_ZERO_TESTNET_IMAGE_API = 'https://a0-test-api.artzero.io/getImage';
-export const ART_ZERO_TESTNET_IPFS_API = 'https://a0-test-api.artzero.io/getJSON';
-export const ART_ZERO_TESTNET_COLLECTION_API = 'https://a0-test-api.artzero.io/getCollectionByAddress';
-export const ART_ZERO_IMAGE_API = 'https://a0-api.artzero.io/getImage';
-export const ART_ZERO_IPFS_API = 'https://a0-api.artzero.io/getJSON';
-export const ART_ZERO_COLLECTION_API = 'https://a0-api.artzero.io/getCollectionByAddress';
-export const ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
+export const ART_ZERO_CONTRACTS = ['5Hg1xe6JAGZj92wxtj1ykAfQpwwRNqzAnvhZ3TuXZEmLU1Vw'];
+export const ART_ZERO_IMAGE_API = 'https://api.artzero.io/getImage';
+export const ART_ZERO_IPFS_API = 'https://api.artzero.io/getJSON';
+export const ART_ZERO_COLLECTION_API = 'https://api.artzero.io/getCollectionByAddress';
+export const ART_ZERO_EXTERNAL_URL = 'https://artzero.io/demotestnet/#/marketplace';

package/koni/api/staking/bonding/amplitude.d.ts

@@ -8,3 +8,4 @@ export declare function getAmplitudeBondingExtrinsic(substrateApi: _SubstrateApi
 export declare function getAmplitudeUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, nominatorMetadata: NominatorMetadata, collatorAddress: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAmplitudeWithdrawalExtrinsic(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAmplitudeClaimRewardExtrinsic(substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getAmplitudeCancelWithdrawalExtrinsic(substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getBondedValidators, getStakingStatusByNominations, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { getBondedValidators, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
-import { BN, BN_ZERO } from '@polkadot/util';
+import { BN } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export async function getAmplitudeStakingMetadata(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
@@ -39,31 +39,24 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
   const nominationList = [];
   const unstakingList = [];
   const [_delegatorState, _unstakingInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegatorState(address), chainApi.api.query.parachainStaking.unstaking(address)]);
-  const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
   const delegatorState = _delegatorState.toPrimitive();
   const unstakingInfo = _unstakingInfo.toPrimitive();
-  console.log('unstakingInfo ampe', unstakingInfo, !!unstakingInfo);
   if (!delegatorState && !unstakingInfo) {
     return;
   }
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityInfo = chainApi.api.query.identity ? (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
-    const identity = identityInfo ? parseIdentity(identityInfo) : undefined;
+    const identityInfo = (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive();
+    const identity = parseIdentity(identityInfo);
     activeStake = delegatorState.amount.toString();
-    const bnActiveStake = new BN(activeStake);
-    let delegationStatus = StakingStatus.NOT_EARNING;
-    if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
-      delegationStatus = StakingStatus.EARNING_REWARD;
-    }
     nominationList.push({
-      status: delegationStatus,
+      status: StakingStatus.NOT_EARNING,
       chain,
       validatorAddress: delegatorState.owner,
       activeStake: delegatorState.amount.toString(),
       validatorMinStake: '0',
-      hasUnstaking: !!unstakingInfo && Object.values(unstakingInfo).length > 0,
+      hasUnstaking: !!unstakingInfo,
       validatorIdentity: identity
     });
   }
@@ -91,11 +84,9 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return;
   }
-  const stakingStatus = getStakingStatusByNominations(new BN(activeStake), nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,
-    status: stakingStatus,
     address: address,
     activeStake: activeStake,
     nominations: nominationList,
@@ -176,4 +167,8 @@ export async function getAmplitudeWithdrawalExtrinsic(substrateApi, address) {
 export async function getAmplitudeClaimRewardExtrinsic(substrateApi) {
   const chainApi = await substrateApi.isReady;
   return chainApi.api.tx.utility.batch([chainApi.api.tx.parachainStaking.incrementDelegatorRewards(), chainApi.api.tx.parachainStaking.claimRewards()]);
+}
+export async function getAmplitudeCancelWithdrawalExtrinsic(substrateApi) {
+  const chainApi = await substrateApi.isReady;
+  return chainApi.api.tx.parachainStaking.cancelLeaveCandidates();
 }

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

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getStakingStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
@@ -61,7 +60,6 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
   const [_ledger, _era, _stakerInfo] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra(), chainApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const ledger = _ledger.toPrimitive();
   const currentEra = _era.toString();
-  const minDelegatorStake = chainApi.api.consts.dappsStaking.minimumStakingAmount.toString();
   let bnTotalActiveStake = BN_ZERO;
   if (_stakerInfo.length > 0) {
     const dAppInfoMap = {};
@@ -78,13 +76,13 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new BN(currentStake);
       if (bnCurrentStake.gt(BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? StakingStatus.EARNING_REWARD : StakingStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
-          status: dappStakingStatus,
+          status: StakingStatus.NOT_EARNING,
+          // TODO
           chain,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,
@@ -111,7 +109,6 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return;
   }
-  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,
@@ -119,9 +116,10 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
     activeStake: bnTotalActiveStake.toString(),
     nominations: nominationList,
     unstakings: unstakingList,
-    status: stakingStatus
+    status: StakingStatus.NOT_EARNING // TODO
   };
 }
+
 export async function getAstarDappsInfo(networkKey, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
@@ -159,7 +157,7 @@ export async function getAstarDappsInfo(networkKey, substrateApi) {
     allDappsInfo.push({
       commission: 0,
       expectedReturn: 0,
-      address: dappAddress.toLowerCase(),
+      address: dappAddress,
       totalStake: totalStake,
       ownStake: '0',
       otherStake: totalStake.toString(),

package/koni/api/staking/bonding/index.d.ts

@@ -1,10 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainStakingMetadata, NominatorMetadata, StakingType, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-export declare function validateUnbondingCondition(nominatorMetadata: NominatorMetadata, amount: string, chain: string, chainStakingMetadata: ChainStakingMetadata, selectedValidator?: string): TransactionError[];
-export declare function validateBondingCondition(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], address: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata?: NominatorMetadata): TransactionError[];
-export declare function getChainStakingMetadata(chainInfo: _ChainInfo, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
+export declare function getChainStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getValidatorsInfo(networkKey: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;
 export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("@subwallet/extension-base/background/KoniTypes").NominationPoolInfo[]>;

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

@@ -2,34 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
-import { getAmplitudeBondingExtrinsic, getAmplitudeClaimRewardExtrinsic, getAmplitudeCollatorsInfo, getAmplitudeNominatorMetadata, getAmplitudeStakingMetadata, getAmplitudeUnbondingExtrinsic, getAmplitudeWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/amplitude';
+import { getAmplitudeBondingExtrinsic, getAmplitudeCancelWithdrawalExtrinsic, getAmplitudeClaimRewardExtrinsic, getAmplitudeCollatorsInfo, getAmplitudeNominatorMetadata, getAmplitudeStakingMetadata, getAmplitudeUnbondingExtrinsic, getAmplitudeWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/amplitude';
 import { getAstarBondingExtrinsic, getAstarClaimRewardExtrinsic, getAstarDappsInfo, getAstarNominatorMetadata, getAstarStakingMetadata, getAstarUnbondingExtrinsic, getAstarWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
-import { getParaBondingExtrinsic, getParaCancelWithdrawalExtrinsic, getParachainCollatorsInfo, getParaChainNominatorMetadata, getParaChainStakingMetadata, getParaUnbondingExtrinsic, getParaWithdrawalExtrinsic, validateParaChainBondingCondition, validateParaChainUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
-import { getPoolingClaimRewardExtrinsic, getPoolingWithdrawalExtrinsic, getRelayBondingExtrinsic, getRelayCancelWithdrawalExtrinsic, getRelayChainNominatorMetadata, getRelayChainStakingMetadata, getRelayPoolsInfo, getRelayUnbondingExtrinsic, getRelayValidatorsInfo, getRelayWithdrawalExtrinsic, validateRelayBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
+import { getParaBondingExtrinsic, getParaCancelWithdrawalExtrinsic, getParachainCollatorsInfo, getParaChainNominatorMetadata, getParaChainStakingMetadata, getParaUnbondingExtrinsic, getParaWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
+import { getPoolingClaimRewardExtrinsic, getPoolingWithdrawalExtrinsic, getRelayBondingExtrinsic, getRelayCancelWithdrawalExtrinsic, getRelayChainNominatorMetadata, getRelayChainStakingMetadata, getRelayPoolsInfo, getRelayUnbondingExtrinsic, getRelayValidatorsInfo, getRelayWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 // all addresses must be converted to its chain format
 
-export function validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, selectedValidator) {
-  if (_STAKING_CHAIN_GROUP.relay.includes(chain)) {
-    return validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata);
-  }
-  return validateParaChainUnbondingCondition(amount, nominatorMetadata, chainStakingMetadata, selectedValidator);
-}
-export function validateBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata) {
-  if (_STAKING_CHAIN_GROUP.relay.includes(chainInfo.slug)) {
-    return validateRelayBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
-  }
-  return validateParaChainBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
-}
-export async function getChainStakingMetadata(chainInfo, substrateApi) {
-  if (_STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
-    return getAstarStakingMetadata(chainInfo.slug, substrateApi);
-  } else if (_STAKING_CHAIN_GROUP.para.includes(chainInfo.slug)) {
-    return getParaChainStakingMetadata(chainInfo.slug, substrateApi);
-  } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chainInfo.slug)) {
-    return getAmplitudeStakingMetadata(chainInfo.slug, substrateApi);
+export async function getChainStakingMetadata(chain, substrateApi) {
+  if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return getAstarStakingMetadata(chain, substrateApi);
+  } else if (_STAKING_CHAIN_GROUP.para.includes(chain)) {
+    return getParaChainStakingMetadata(chain, substrateApi);
+  } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return getAmplitudeStakingMetadata(chain, substrateApi);
   }
-  return getRelayChainStakingMetadata(chainInfo, substrateApi);
+  return getRelayChainStakingMetadata(chain, substrateApi);
 }
 export async function getNominatorMetadata(chainInfo, address, substrateApi) {
   if (_STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
@@ -98,6 +86,8 @@ export async function getClaimRewardExtrinsic(substrateApi, chain, address, stak
 export async function getCancelWithdrawalExtrinsic(substrateApi, chain, selectedUnstaking) {
   if (_STAKING_CHAIN_GROUP.para.includes(chain)) {
     return getParaCancelWithdrawalExtrinsic(substrateApi, selectedUnstaking);
+  } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return getAmplitudeCancelWithdrawalExtrinsic(substrateApi);
   }
   return getRelayCancelWithdrawalExtrinsic(substrateApi, selectedUnstaking);
 }

package/koni/api/staking/bonding/paraChain.d.ts

@@ -1,9 +1,6 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainStakingMetadata, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-export declare function validateParaChainUnbondingCondition(amount: string, nominatorMetadata: NominatorMetadata, chainStakingMetadata: ChainStakingMetadata, selectedCollator: string): TransactionError[];
-export declare function validateParaChainBondingCondition(chainInfo: _ChainInfo, amount: string, selectedCollators: ValidatorInfo[], address: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata?: NominatorMetadata): TransactionError[];
 export declare function getParaChainStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getParaChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getParachainCollatorsInfo(chain: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;