Move extension-koni-base to extension/base/koni => Make other migrati…

…on more easier
Koniverse · Mar 20, 2023 · 7c7a259 · 7c7a259
1 parent cb2a4ee
commit 7c7a259
Show file tree

Hide file tree

Showing 118 changed files with 160 additions and 632 deletions.
diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
@@ -79,7 +79,6 @@
     "@subwallet/extension-chains": "^0.8.1",
     "@subwallet/extension-dapp": "^0.8.1",
     "@subwallet/extension-inject": "^0.8.1",
-    "@subwallet/extension-koni-base": "^0.8.1",
     "@subwallet/keyring": "^0.0.4",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-4",

diff --git a/.../extension-koni-base/src/api/coingecko.ts → .../extension-base/src/koni/api/coingecko.ts b/.../extension-koni-base/src/api/coingecko.ts → .../extension-base/src/koni/api/coingecko.ts
diff --git a/...ges/extension-koni-base/src/api/donate.ts → ...ges/extension-base/src/koni/api/donate.ts b/...ges/extension-koni-base/src/api/donate.ts → ...ges/extension-base/src/koni/api/donate.ts
diff --git a/...sion-koni-base/src/api/dotsama/balance.ts → ...sion-base/src/koni/api/dotsama/balance.ts b/...sion-koni-base/src/api/dotsama/balance.ts → ...sion-base/src/koni/api/dotsama/balance.ts
@@ -1,19 +1,19 @@
-// Copyright 2019-2022 @subwallet/extension-koni-base authors & contributors
+// Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 import { SignedBalance } from '@equilab/api/genshiro/interfaces';
 import { _AssetType, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { APIItemState, BalanceItem, TokenBalanceRaw } from '@subwallet/extension-base/background/KoniTypes';
 import { ASTAR_REFRESH_BALANCE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL, SUBSCRIBE_BALANCE_FAST_INTERVAL } from '@subwallet/extension-base/constants';
+import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { getEVMBalance } from '@subwallet/extension-base/koni/api/tokens/evm/balance';
+import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
+import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
+import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { _BALANCE_CHAIN_GROUP, _BALANCE_TOKEN_GROUP, _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isPureEvmChain, _isSmartContractToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, sumBN } from '@subwallet/extension-base/utils';
-import { PalletNominationPoolsPoolMember } from '@subwallet/extension-koni-base/api/staking/bonding/utils';
-import { getEVMBalance } from '@subwallet/extension-koni-base/api/tokens/evm/balance';
-import { getERC20Contract } from '@subwallet/extension-koni-base/api/tokens/evm/web3';
-import { getPSP22ContractPromise } from '@subwallet/extension-koni-base/api/tokens/wasm';
-import { state } from '@subwallet/extension-koni-base/background/handlers';
 import { Contract } from 'web3-eth-contract';
 
 import { ApiPromise } from '@polkadot/api';

diff --git a/...on-koni-base/src/api/dotsama/crowdloan.ts → ...on-base/src/koni/api/dotsama/crowdloan.ts b/...on-koni-base/src/api/dotsama/crowdloan.ts → ...on-base/src/koni/api/dotsama/crowdloan.ts
@@ -1,14 +1,14 @@
-// Copyright 2019-2022 @subwallet/extension-koni-base authors & contributors
+// Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { APIItemState, CrowdloanItem, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ACALA_REFRESH_CROWDLOAN_INTERVAL } from '@subwallet/extension-base/constants';
+import registry from '@subwallet/extension-base/koni/api/dotsama/typeRegistry';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getChainSubstrateAddressPrefix, _getSubstrateParaId, _getSubstrateRelayParent, _isChainEvmCompatible, _isSubstrateParachain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, reformatAddress } from '@subwallet/extension-base/utils';
-import registry from '@subwallet/extension-koni-base/api/dotsama/typeRegistry';
 import axios from 'axios';
 
 import { ApiPromise } from '@polkadot/api';

diff --git a/...i-base/src/api/dotsama/ignore-api.spec.ts → ...e/src/koni/api/dotsama/ignore-api.spec.ts b/...i-base/src/api/dotsama/ignore-api.spec.ts → ...e/src/koni/api/dotsama/ignore-api.spec.ts
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 @subwallet/extension-koni-base authors & contributors
+// Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 jest.setTimeout(50000);

diff --git a/...-base/src/api/dotsama/parseTransaction.ts → .../src/koni/api/dotsama/parseTransaction.ts b/...-base/src/api/dotsama/parseTransaction.ts → .../src/koni/api/dotsama/parseTransaction.ts
diff --git a/...ion-koni-base/src/api/dotsama/transfer.ts → ...ion-base/src/koni/api/dotsama/transfer.ts b/...ion-koni-base/src/api/dotsama/transfer.ts → ...ion-base/src/koni/api/dotsama/transfer.ts
@@ -1,13 +1,13 @@
-// Copyright 2019-2022 @subwallet/extension-koni-base authors & contributors
+// Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, SupportTransferResponse, TransactionResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { _BALANCE_TOKEN_GROUP, _TRANSFER_CHAIN_GROUP, _TRANSFER_NOT_SUPPORTED_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
-import { getPSP22ContractPromise } from '@subwallet/extension-koni-base/api/tokens/wasm';
 import { KeyringPair } from '@subwallet/keyring/types';
 
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';

diff --git a/...koni-base/src/api/dotsama/typeRegistry.ts → ...base/src/koni/api/dotsama/typeRegistry.ts b/...koni-base/src/api/dotsama/typeRegistry.ts → ...base/src/koni/api/dotsama/typeRegistry.ts
diff --git a/...-koni-base/src/api/nft/acala_nft/index.ts → ...-base/src/koni/api/nft/acala_nft/index.ts b/...-koni-base/src/api/nft/acala_nft/index.ts → ...-base/src/koni/api/nft/acala_nft/index.ts
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { isUrl } from '@subwallet/extension-base/utils';
-import { getRandomIpfsGateway } from '@subwallet/extension-koni-base/api/nft/config';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 import fetch from 'cross-fetch';
 
 interface AssetId {

diff --git a/...oni-base/src/api/nft/bit.country/index.ts → ...ase/src/koni/api/nft/bit.country/index.ts b/...oni-base/src/api/nft/bit.country/index.ts → ...ase/src/koni/api/nft/bit.country/index.ts
@@ -1,11 +1,11 @@
-// Copyright 2019-2022 @subwallet/extension-koni-base authors & contributors
+// Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BIT_COUNTRY_SERVER } from '@subwallet/extension-base/koni/api/nft/config';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { isUrl } from '@subwallet/extension-base/utils';
-import { BIT_COUNTRY_SERVER } from '@subwallet/extension-koni-base/api/nft/config';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 import fetch from 'cross-fetch';
 
 interface AssetId {

diff --git a/...extension-koni-base/src/api/nft/config.ts → ...extension-base/src/koni/api/nft/config.ts b/...extension-koni-base/src/api/nft/config.ts → ...extension-base/src/koni/api/nft/config.ts
diff --git a/...on-koni-base/src/api/nft/evm_nft/index.ts → ...on-base/src/koni/api/nft/evm_nft/index.ts b/...on-koni-base/src/api/nft/evm_nft/index.ts → ...on-base/src/koni/api/nft/evm_nft/index.ts
@@ -3,12 +3,12 @@
 
 import { _AssetType, _ChainAsset } from '@subwallet/chain-list/types';
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { isUrl } from '@subwallet/extension-base/utils';
-import { getRandomIpfsGateway } from '@subwallet/extension-koni-base/api/nft/config';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 import fetch from 'cross-fetch';
 
 import { isEthereumAddress } from '@polkadot/util-crypto';

diff --git a/.../extension-koni-base/src/api/nft/index.ts → .../extension-base/src/koni/api/nft/index.ts b/.../extension-koni-base/src/api/nft/index.ts → .../extension-base/src/koni/api/nft/index.ts
@@ -3,19 +3,19 @@
 
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { AcalaNftApi } from '@subwallet/extension-base/koni/api/nft/acala_nft';
+import { BitCountryNftApi } from '@subwallet/extension-base/koni/api/nft/bit.country';
+import { EvmNftApi } from '@subwallet/extension-base/koni/api/nft/evm_nft';
+import { KaruraNftApi } from '@subwallet/extension-base/koni/api/nft/karura_nft';
+import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
+import { RmrkNftApi } from '@subwallet/extension-base/koni/api/nft/rmrk_nft';
+import StatemineNftApi from '@subwallet/extension-base/koni/api/nft/statemine_nft';
+import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
+import { WasmNftApi } from '@subwallet/extension-base/koni/api/nft/wasm_nft';
 import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses } from '@subwallet/extension-base/utils';
-import { AcalaNftApi } from '@subwallet/extension-koni-base/api/nft/acala_nft';
-import { BitCountryNftApi } from '@subwallet/extension-koni-base/api/nft/bit.country';
-import { EvmNftApi } from '@subwallet/extension-koni-base/api/nft/evm_nft';
-import { KaruraNftApi } from '@subwallet/extension-koni-base/api/nft/karura_nft';
-import { BaseNftApi } from '@subwallet/extension-koni-base/api/nft/nft';
-import { RmrkNftApi } from '@subwallet/extension-koni-base/api/nft/rmrk_nft';
-import StatemineNftApi from '@subwallet/extension-koni-base/api/nft/statemine_nft';
-import UniqueNftApi from '@subwallet/extension-koni-base/api/nft/unique_nft';
-import { WasmNftApi } from '@subwallet/extension-koni-base/api/nft/wasm_nft';
 
 function createSubstrateNftApi (chain: string, substrateApi: _SubstrateApi | null, addresses: string[]): BaseNftApi | null {
   const [substrateAddresses] = categoryAddresses(addresses);

diff --git a/...koni-base/src/api/nft/karura_nft/index.ts → ...base/src/koni/api/nft/karura_nft/index.ts b/...koni-base/src/api/nft/karura_nft/index.ts → ...base/src/koni/api/nft/karura_nft/index.ts
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { isUrl } from '@subwallet/extension-base/utils';
-import { getRandomIpfsGateway } from '@subwallet/extension-koni-base/api/nft/config';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 import fetch from 'cross-fetch';
 
 interface AssetId {

diff --git a/...es/extension-koni-base/src/api/nft/nft.ts → ...es/extension-base/src/koni/api/nft/nft.ts b/...es/extension-koni-base/src/api/nft/nft.ts → ...es/extension-base/src/koni/api/nft/nft.ts
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { isUrl } from '@subwallet/extension-base/utils';
-import { getRandomIpfsGateway } from '@subwallet/extension-koni-base/api/nft/config';
 
 export interface HandleNftParams {
   updateItem: (chain: string, data: NftItem, owner: string) => void,

diff --git a/...koni-base/src/api/nft/quartz_nft/index.ts → ...base/src/koni/api/nft/quartz_nft/index.ts b/...koni-base/src/api/nft/quartz_nft/index.ts → ...base/src/koni/api/nft/quartz_nft/index.ts
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { hexToStr, hexToUTF16, parseIpfsLink, utf16ToString } from '@subwallet/extension-base/utils';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 
 import { deserializeNft } from './protobuf';
 

diff --git a/...i-base/src/api/nft/quartz_nft/protobuf.ts → ...e/src/koni/api/nft/quartz_nft/protobuf.ts b/...i-base/src/api/nft/quartz_nft/protobuf.ts → ...e/src/koni/api/nft/quartz_nft/protobuf.ts
diff --git a/...n-koni-base/src/api/nft/rmrk_nft/index.ts → ...n-base/src/koni/api/nft/rmrk_nft/index.ts b/...n-koni-base/src/api/nft/rmrk_nft/index.ts → ...n-base/src/koni/api/nft/rmrk_nft/index.ts
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem, RMRK_VER } from '@subwallet/extension-base/background/KoniTypes';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl, reformatAddress } from '@subwallet/extension-base/utils';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 import fetch from 'cross-fetch';
 
 import { getRandomIpfsGateway, SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V1_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from '../config';

diff --git a/...i-base/src/api/nft/statemine_nft/index.ts → ...e/src/koni/api/nft/statemine_nft/index.ts b/...i-base/src/api/nft/statemine_nft/index.ts → ...e/src/koni/api/nft/statemine_nft/index.ts
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { isUrl } from '@subwallet/extension-base/utils';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 import fetch from 'cross-fetch';
 
 interface AssetId {

diff --git a/...tension-koni-base/src/api/nft/transfer.ts → ...tension-base/src/koni/api/nft/transfer.ts b/...tension-koni-base/src/api/nft/transfer.ts → ...tension-base/src/koni/api/nft/transfer.ts
@@ -3,9 +3,9 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME } from '@subwallet/extension-base/koni/api/nft/config';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
-import { SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME } from '@subwallet/extension-koni-base/api/nft/config';
 
 import { ApiPromise } from '@polkadot/api';
 

diff --git a/...rc/api/nft/unique_nft/ignore-test.spec.ts → ...ni/api/nft/unique_nft/ignore-test.spec.ts b/...rc/api/nft/unique_nft/ignore-test.spec.ts → ...ni/api/nft/unique_nft/ignore-test.spec.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
-import { UniqueNftApiV2 } from '@subwallet/extension-koni-base/api/nft/unique_nft/uniqueNftV2';
+import { UniqueNftApiV2 } from '@subwallet/extension-base/koni/api/nft/unique_nft/uniqueNftV2';
 
 jest.setTimeout(50000);
 

diff --git a/...koni-base/src/api/nft/unique_nft/index.ts → ...base/src/koni/api/nft/unique_nft/index.ts b/...koni-base/src/api/nft/unique_nft/index.ts → ...base/src/koni/api/nft/unique_nft/index.ts
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { hexToStr, hexToUTF16, utf16ToString } from '@subwallet/extension-base/utils';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
 
 import { deserializeNft } from './protobuf';
 

diff --git a/...i-base/src/api/nft/unique_nft/protobuf.ts → ...e/src/koni/api/nft/unique_nft/protobuf.ts b/...i-base/src/api/nft/unique_nft/protobuf.ts → ...e/src/koni/api/nft/unique_nft/protobuf.ts
diff --git a/...e/src/api/nft/unique_nft/runtime_types.ts → .../koni/api/nft/unique_nft/runtime_types.ts b/...e/src/api/nft/unique_nft/runtime_types.ts → .../koni/api/nft/unique_nft/runtime_types.ts
diff --git a/...ase/src/api/nft/unique_nft/uniqueNftV2.ts → ...rc/koni/api/nft/unique_nft/uniqueNftV2.ts b/...ase/src/api/nft/unique_nft/uniqueNftV2.ts → ...rc/koni/api/nft/unique_nft/uniqueNftV2.ts
@@ -1,8 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-koni-base/api/nft/config';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/api/nft/nft';
+import { UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import fetch from 'cross-fetch';
 
 interface NftData {

diff --git a/...n-koni-base/src/api/nft/wasm_nft/index.ts → ...n-base/src/koni/api/nft/wasm_nft/index.ts b/...n-koni-base/src/api/nft/wasm_nft/index.ts → ...n-base/src/koni/api/nft/wasm_nft/index.ts
@@ -3,11 +3,11 @@
 
 import { _AssetType, _ChainAsset } from '@subwallet/chain-list/types';
 import { NftCollection, NftItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BaseNftApi, HandleNftParams } 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 { getPSP34ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
-import { BaseNftApi, HandleNftParams } from '@subwallet/extension-koni-base/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-koni-base/api/nft/wasm_nft/utils';
-import { getPSP34ContractPromise } from '@subwallet/extension-koni-base/api/tokens/wasm';
 import fetch from 'cross-fetch';
 
 import { ApiPromise } from '@polkadot/api';

diff --git a/...n-koni-base/src/api/nft/wasm_nft/utils.ts → ...n-base/src/koni/api/nft/wasm_nft/utils.ts b/...n-koni-base/src/api/nft/wasm_nft/utils.ts → ...n-base/src/koni/api/nft/wasm_nft/utils.ts
diff --git a/...base/src/api/staking/bonding/amplitude.ts → ...src/koni/api/staking/bonding/amplitude.ts b/...base/src/api/staking/bonding/amplitude.ts → ...src/koni/api/staking/bonding/amplitude.ts
@@ -3,10 +3,10 @@
 
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ChainStakingMetadata, NominationInfo, NominatorMetadata, StakingType, UnstakingInfo, UnstakingStatus, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { BlockHeader, getBondedValidators, isUnstakeAll, PalletIdentityRegistration, ParachainStakingStakeOption, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { parseRawNumber } from '@subwallet/extension-base/utils';
-import { BlockHeader, getBondedValidators, isUnstakeAll, PalletIdentityRegistration, ParachainStakingStakeOption, parseIdentity } from '@subwallet/extension-koni-base/api/staking/bonding/utils';
 
 import { BN } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';

diff --git a/...oni-base/src/api/staking/bonding/astar.ts → ...ase/src/koni/api/staking/bonding/astar.ts b/...oni-base/src/api/staking/bonding/astar.ts → ...ase/src/koni/api/staking/bonding/astar.ts
@@ -3,12 +3,12 @@
 
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { BasicTxInfo, ChainStakingMetadata, NominationInfo, NominatorMetadata, StakingType, UnlockingStakeInfo, UnstakingInfo, UnstakingStatus, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { getFreeBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
+import { PalletDappsStakingAccountLedger, PalletDappsStakingDappInfo } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { isUrl, parseNumberToDisplay, parseRawNumber } from '@subwallet/extension-base/utils';
-import { getFreeBalance } from '@subwallet/extension-koni-base/api/dotsama/balance';
-import { PalletDappsStakingAccountLedger, PalletDappsStakingDappInfo } from '@subwallet/extension-koni-base/api/staking/bonding/utils';
 import fetch from 'cross-fetch';
 
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';