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

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

@@ -3,11 +3,44 @@
 
 import { _AssetType } from '@subwallet/chain-list/types';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
-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 { 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 { 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) {
@@ -20,31 +53,40 @@ 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}`;
+      return `/ipfs/${tokenUri.split('ipfs://ipfs/')[1]}`;
     }
     return tokenUri;
   }
-  parseFeaturedNftImage(tokenUri) {
+  async parseFeaturedNftImage(tokenUri) {
     const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
     if (!parsedTokenUri) {
       return undefined;
     }
-    return `${ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
+    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;
   }
   async parseFeaturedCollectionImage(smartContract) {
-    const resp = await fetch(ART_ZERO_COLLECTION_API, {
+    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, {
       method: 'POST',
       headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/x-www-form-urlencoded'
       },
-      body: JSON.stringify({
-        collection_address: smartContract
-      })
+      body: urlencoded
     });
     const result = resp && resp.ok && (await resp.json());
     if (!result) {
@@ -58,82 +100,91 @@ export class WasmNftApi extends BaseNftApi {
     if (!parsedCollectionImage) {
       return;
     }
-    return `${ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}`;
-  }
-  async getCollectionAttributes(contractPromise) {
-    const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], {
-      gasLimit: -1
+    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'
     });
-    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;
+    return collectionImageUrl.data;
   }
+
+  // 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: '',
@@ -142,19 +193,23 @@ export class WasmNftApi extends BaseNftApi {
       name: tokenId
     };
     const _tokenUri = await contractPromise.query['psp34Traits::tokenUri'](address, {
-      gasLimit: -1
+      gasLimit: getDefaultWeightV2((_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api)
     }, tokenId);
     if (_tokenUri.output) {
       let itemDetail = false;
-      const tokenUri = _tokenUri.output.toString();
+      // 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 parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
-          const resp = await fetch(`${ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
+          const resp = await fetch(`${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IPFS_API : ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
-        const detailUrl = this.parseUrl(tokenUri);
+        const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
+        const detailUrl = this.parseUrl(parsedTokenUri);
         if (detailUrl) {
           const resp = await fetch(detailUrl);
           itemDetail = resp && resp.ok && (await resp.json());
@@ -169,7 +224,7 @@ export class WasmNftApi extends BaseNftApi {
       nftItem.externalUrl = itemDetail.external_url;
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
       if (isFeatured) {
-        nftItem.image = this.parseFeaturedNftImage(rawImageSrc);
+        nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
         nftItem.externalUrl = ART_ZERO_EXTERNAL_URL;
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
@@ -187,20 +242,24 @@ export class WasmNftApi extends BaseNftApi {
     }
     return nftItem;
   }
-  async getItemsByCollection(contractPromise, collectionAttributes, isMetadataOnchain, tokenInfo, collectionName, nftParams) {
+  async getItemsByCollection(contractPromise, tokenInfo, collectionName, nftParams, isFeatured) {
     let ownItem = false;
     let collectionImage;
     const smartContract = _getContractAddressOfToken(tokenInfo);
-    const isFeatured = ART_ZERO_CONTRACTS.includes(smartContract);
+    const nftOwnerMap = {};
     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: -1
+        gasLimit: getDefaultWeightV2((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
       }, address);
-      const balance = _balance.output ? _balance.output.toString() : '0';
+      // 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';
       if (parseInt(balance) === 0) {
         return;
       }
@@ -210,20 +269,17 @@ 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: -1
+            gasLimit: getDefaultWeightV2((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
           }, address, i);
           if (_tokenByIndexResp.output) {
             const rawTokenId = _tokenByIndexResp.output.toHuman();
-            const tokenIdObj = rawTokenId.Ok;
-            const tokenId = Object.values(tokenIdObj)[0];
+            // 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(',', '');
             nftIds.push(tokenId);
-            let nftItem;
-            if (isMetadataOnchain) {
-              nftItem = await this.processOnChainMetadata(contractPromise, address, tokenIdObj, collectionAttributes, isFeatured);
-            } else {
-              nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
-            }
+            const nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
             nftItem.collectionId = smartContract;
             nftItem.chain = this.chain;
             nftItem.type = _AssetType.PSP34;
@@ -238,6 +294,8 @@ export class WasmNftApi extends BaseNftApi {
             }
           }
         }));
+
+        nftOwnerMap[address] = nftIds;
       } catch (e) {
         console.error(`error parsing item for ${this.chain} nft`, e);
       }
@@ -257,6 +315,9 @@ 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) {
@@ -268,20 +329,17 @@ export class WasmNftApi extends BaseNftApi {
     return 1;
   }
   async handleNfts(params) {
-    var _this$substrateApi;
+    var _this$substrateApi4;
     if (!this.wasmContracts || this.wasmContracts.length === 0) {
       return;
     }
     await this.connect(); // might not be necessary
 
-    const apiPromise = (_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api;
+    const apiPromise = (_this$substrateApi4 = this.substrateApi) === null || _this$substrateApi4 === void 0 ? void 0 : _this$substrateApi4.api;
     await Promise.all(this.wasmContracts.map(async tokenInfo => {
       const contractPromise = getPSP34ContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
-      const {
-        attributeList,
-        storedOnChain
-      } = await this.getCollectionAttributes(contractPromise);
-      return await this.getItemsByCollection(contractPromise, attributeList, storedOnChain, tokenInfo, tokenInfo.name, params);
+      const isCollectionFeatured = await isArtZeroFeaturedCollection(this.chain, _getContractAddressOfToken(tokenInfo));
+      return await this.getItemsByCollection(contractPromise, tokenInfo, tokenInfo.name, params, isCollectionFeatured);
     }));
   }
 }

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

@@ -1,5 +1,7 @@
-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";
+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";

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

@@ -1,8 +1,10 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-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';
+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';

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

@@ -4,8 +4,7 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 export declare function getAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getAmplitudeCollatorsInfo(chain: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
-export declare function getAmplitudeBondingExtrinsic(nominatorMetadata: NominatorMetadata, substrateApi: _SubstrateApi, amount: string, selectedValidatorInfo: ValidatorInfo): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getAmplitudeBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, selectedValidatorInfo: ValidatorInfo, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 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

@@ -1,11 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getBondedValidators, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+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 { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { parseRawNumber } from '@subwallet/extension-base/utils';
-import { BN } from '@polkadot/util';
+import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export async function getAmplitudeStakingMetadata(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
@@ -39,23 +39,31 @@ 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 = (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive();
-    const identity = parseIdentity(identityInfo);
+    const identityInfo = chainApi.api.query.identity ? (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
+    const identity = identityInfo ? parseIdentity(identityInfo) : undefined;
     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,
       chain,
       validatorAddress: delegatorState.owner,
       activeStake: delegatorState.amount.toString(),
       validatorMinStake: '0',
-      hasUnstaking: !!unstakingInfo,
+      hasUnstaking: !!unstakingInfo && Object.values(unstakingInfo).length > 0,
       validatorIdentity: identity
     });
   }
@@ -83,9 +91,11 @@ 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,
@@ -121,13 +131,16 @@ export async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   }
   return allCollators;
 }
-export async function getAmplitudeBondingExtrinsic(nominatorMetadata, substrateApi, amount, selectedValidatorInfo) {
+export async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidatorInfo, nominatorMetadata) {
   const chainApi = await substrateApi.isReady;
   const binaryAmount = new BN(amount);
+  if (!nominatorMetadata) {
+    return chainApi.api.tx.parachainStaking.joinDelegators(selectedValidatorInfo.address, binaryAmount);
+  }
   const {
     bondedValidators
   } = getBondedValidators(nominatorMetadata.nominations);
-  if (!bondedValidators.includes(selectedValidatorInfo.address)) {
+  if (!bondedValidators.includes(reformatAddress(selectedValidatorInfo.address, 0))) {
     return chainApi.api.tx.parachainStaking.joinDelegators(selectedValidatorInfo.address, binaryAmount);
   } else {
     const _params = chainApi.api.tx.parachainStaking.delegatorStakeMore.toJSON();
@@ -163,8 +176,4 @@ 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.d.ts

@@ -1,19 +1,10 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { BasicTxInfo, ChainStakingMetadata, NominatorMetadata, StakingType, UnlockingStakeInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
-import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { ChainStakingMetadata, NominatorMetadata, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export declare function getAstarStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getAstarNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getAstarDappsInfo(networkKey: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
-export declare function getAstarBondingTxInfo(chainInfo: _ChainInfo, substrateApi: _SubstrateApi, stakerAddress: string, amount: number, dappInfo: ValidatorInfo): Promise<import("@polkadot/types/interfaces").RuntimeDispatchInfo>;
-export declare function handleAstarBondingTxInfo(chainInfo: _ChainInfo, amount: number, networkKey: string, stakerAddress: string, dappInfo: ValidatorInfo, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>): Promise<BasicTxInfo>;
 export declare function getAstarBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, dappInfo: ValidatorInfo): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function getAstarUnbondingTxInfo(chainInfo: _ChainInfo, substrateApi: _SubstrateApi, stakerAddress: string, amount: number, dappAddress: string): Promise<import("@polkadot/types/interfaces").RuntimeDispatchInfo>;
-export declare function handleAstarUnbondingTxInfo(chainInfo: _ChainInfo, amount: number, networkKey: string, stakerAddress: string, dappAddress: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>): Promise<BasicTxInfo>;
 export declare function getAstarUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, dappAddress: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function handleAstarUnlockingInfo(substrateApi: _SubstrateApi, chainInfo: _ChainInfo, networkKey: string, address: string, type: StakingType): Promise<UnlockingStakeInfo>;
-export declare function getAstarWithdrawalTxInfo(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/types/interfaces").RuntimeDispatchInfo>;
-export declare function handleAstarWithdrawalTxInfo(networkKey: string, chainInfo: _ChainInfo, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, address: string): Promise<BasicTxInfo>;
 export declare function getAstarWithdrawalExtrinsic(substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function getAstarClaimRewardTxInfo(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/types/interfaces").RuntimeDispatchInfo>;
-export declare function handleAstarClaimRewardTxInfo(address: string, networkKey: string, chainInfo: _ChainInfo, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>): Promise<BasicTxInfo>;
 export declare function getAstarClaimRewardExtrinsic(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;