@subwallet/extension-base 1.1.14-1 → 1.1.16-0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/background/KoniTypes.d.ts +1 -1
- package/background/handlers/Extension.js +2 -2
- package/background/types.d.ts +2 -2
- package/cjs/background/handlers/Extension.js +2 -2
- package/cjs/koni/api/dotsama/transfer.js +12 -2
- package/cjs/koni/api/nft/wasm_nft/index.js +1 -1
- package/cjs/koni/api/staking/bonding/relayChain.js +2 -1
- package/cjs/koni/api/tokens/wasm/index.js +17 -0
- package/cjs/koni/background/handlers/Extension.js +3 -3
- package/cjs/packageInfo.js +1 -1
- package/cjs/services/chain-service/constants.js +4 -3
- package/cjs/services/chain-service/helper/index.js +4 -1
- package/koni/api/dotsama/transfer.js +12 -2
- package/koni/api/nft/wasm_nft/index.js +2 -2
- package/koni/api/staking/bonding/relayChain.js +2 -1
- package/koni/api/tokens/wasm/index.d.ts +2 -0
- package/koni/api/tokens/wasm/index.js +16 -1
- package/koni/background/handlers/Extension.js +3 -3
- package/package.json +7 -6
- package/packageInfo.js +1 -1
- package/services/chain-service/constants.js +4 -3
- package/services/chain-service/helper/index.d.ts +1 -0
- package/services/chain-service/helper/index.js +2 -0
- package/services/chain-service/helper/neuroguns_psp34_abi.json +1866 -0
|
@@ -1600,7 +1600,7 @@ export interface KoniRequestSignatures {
|
|
|
1600
1600
|
'pri(mantaPay.subscribeSyncingState)': [null, MantaPaySyncState, MantaPaySyncState];
|
|
1601
1601
|
'pri(mantaPay.initSyncMantaPay)': [string, null];
|
|
1602
1602
|
'pri(authorize.listV2)': [null, ResponseAuthorizeList];
|
|
1603
|
-
'pri(authorize.requestsV2)': [RequestAuthorizeSubscribe,
|
|
1603
|
+
'pri(authorize.requestsV2)': [RequestAuthorizeSubscribe, AuthorizeRequest[], AuthorizeRequest[]];
|
|
1604
1604
|
'pri(authorize.approveV2)': [RequestAuthorizeApproveV2, boolean];
|
|
1605
1605
|
'pri(authorize.changeSiteAll)': [RequestAuthorizationAll, boolean, AuthUrls];
|
|
1606
1606
|
'pri(authorize.changeSite)': [RequestAuthorization, boolean, AuthUrls];
|
|
@@ -264,7 +264,7 @@ export default class Extension {
|
|
|
264
264
|
unsubscribe(id);
|
|
265
265
|
subscription.unsubscribe();
|
|
266
266
|
});
|
|
267
|
-
return
|
|
267
|
+
return this.#state.metaSubject.value;
|
|
268
268
|
}
|
|
269
269
|
jsonRestore({
|
|
270
270
|
file,
|
|
@@ -444,7 +444,7 @@ export default class Extension {
|
|
|
444
444
|
unsubscribe(id);
|
|
445
445
|
subscription.unsubscribe();
|
|
446
446
|
});
|
|
447
|
-
return
|
|
447
|
+
return this.#state.signSubject.value;
|
|
448
448
|
}
|
|
449
449
|
windowOpen({
|
|
450
450
|
allowedPath: path,
|
package/background/types.d.ts
CHANGED
|
@@ -116,7 +116,7 @@ export interface RequestSignatures extends KoniRequestSignatures {
|
|
|
116
116
|
'pri(metadata.approve)': [RequestMetadataApprove, boolean];
|
|
117
117
|
'pri(metadata.get)': [string | null, MetadataDef | null];
|
|
118
118
|
'pri(metadata.reject)': [RequestMetadataReject, boolean];
|
|
119
|
-
'pri(metadata.requests)': [RequestMetadataSubscribe,
|
|
119
|
+
'pri(metadata.requests)': [RequestMetadataSubscribe, MetadataRequest[], MetadataRequest[]];
|
|
120
120
|
'pri(metadata.list)': [null, MetadataDef[]];
|
|
121
121
|
'pri(seed.create)': [RequestSeedCreate, ResponseSeedCreate];
|
|
122
122
|
'pri(seed.validate)': [RequestSeedValidate, ResponseSeedValidate];
|
|
@@ -125,7 +125,7 @@ export interface RequestSignatures extends KoniRequestSignatures {
|
|
|
125
125
|
'pri(signing.approve.signature)': [RequestSigningApproveSignature, boolean];
|
|
126
126
|
'pri(signing.cancel)': [RequestSigningCancel, boolean];
|
|
127
127
|
'pri(signing.isLocked)': [RequestSigningIsLocked, ResponseSigningIsLocked];
|
|
128
|
-
'pri(signing.requests)': [RequestSigningSubscribe,
|
|
128
|
+
'pri(signing.requests)': [RequestSigningSubscribe, SigningRequest[], SigningRequest[]];
|
|
129
129
|
'pri(window.open)': [WindowOpenParams, boolean];
|
|
130
130
|
'pub(accounts.list)': [RequestAccountList, InjectedAccount[]];
|
|
131
131
|
'pub(accounts.subscribe)': [RequestAccountSubscribe, boolean, InjectedAccount[]];
|
|
@@ -293,7 +293,7 @@ class Extension {
|
|
|
293
293
|
(0, _subscriptions.unsubscribe)(id);
|
|
294
294
|
subscription.unsubscribe();
|
|
295
295
|
});
|
|
296
|
-
return
|
|
296
|
+
return this.#state.metaSubject.value;
|
|
297
297
|
}
|
|
298
298
|
jsonRestore(_ref16) {
|
|
299
299
|
let {
|
|
@@ -481,7 +481,7 @@ class Extension {
|
|
|
481
481
|
(0, _subscriptions.unsubscribe)(id);
|
|
482
482
|
subscription.unsubscribe();
|
|
483
483
|
});
|
|
484
|
-
return
|
|
484
|
+
return this.#state.signSubject.value;
|
|
485
485
|
}
|
|
486
486
|
windowOpen(_ref24) {
|
|
487
487
|
let {
|
|
@@ -141,8 +141,18 @@ const createTransferExtrinsic = async _ref => {
|
|
|
141
141
|
gasLimit
|
|
142
142
|
}, to, value, {});
|
|
143
143
|
transferAmount = value;
|
|
144
|
-
} else if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey)
|
|
145
|
-
|
|
144
|
+
} else if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey)) {
|
|
145
|
+
if (!(0, _utils2._isNativeToken)(tokenInfo)) {
|
|
146
|
+
if (isTxCurrenciesSupported) {
|
|
147
|
+
transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
|
|
148
|
+
}
|
|
149
|
+
} else {
|
|
150
|
+
if (transferAll) {
|
|
151
|
+
transfer = api.tx.balances.transferAll(to, false);
|
|
152
|
+
} else if (value) {
|
|
153
|
+
transfer = api.tx.balances.transferKeepAlive(to, new _util.BN(value));
|
|
154
|
+
}
|
|
155
|
+
}
|
|
146
156
|
} else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && isTxTokensSupported) {
|
|
147
157
|
if (transferAll) {
|
|
148
158
|
transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), false);
|
|
@@ -268,7 +268,7 @@ class WasmNftApi extends _nft.BaseNftApi {
|
|
|
268
268
|
name: tokenId
|
|
269
269
|
};
|
|
270
270
|
const _isFeatured = isFeatured && !_domain.AZERO_DOMAIN_CONTRACTS.includes(contractPromise.address.toString());
|
|
271
|
-
const _tokenUri = await contractPromise.query[(0, _wasm.
|
|
271
|
+
const _tokenUri = await contractPromise.query[(0, _wasm.getTokenUriMethod)(contractPromise.address.toString())](address, {
|
|
272
272
|
gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
|
|
273
273
|
}, (0, _wasm.isAzeroDomainNft)(contractPromise.address.toString()) ? {
|
|
274
274
|
bytes: tokenId
|
|
@@ -518,12 +518,13 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
|
|
|
518
518
|
};
|
|
519
519
|
}
|
|
520
520
|
async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakingMetadata) {
|
|
521
|
+
var _chainApi$api$query$s2;
|
|
521
522
|
const chainApi = await substrateApi.isReady;
|
|
522
523
|
const _era = await chainApi.api.query.staking.currentEra();
|
|
523
524
|
const currentEra = _era.toString();
|
|
524
525
|
const allValidators = [];
|
|
525
526
|
const validatorInfoList = [];
|
|
526
|
-
const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), chainApi.api.query.stakingRewards && chainApi.api.query.stakingRewards.data()]);
|
|
527
|
+
const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s2 = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s2 === void 0 ? void 0 : _chainApi$api$query$s2.data) && chainApi.api.query.stakingRewards.data()]);
|
|
527
528
|
const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
|
|
528
529
|
const maxNominatorRewarded = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
|
|
529
530
|
const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
|
|
@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.getPSP22ContractPromise = getPSP22ContractPromise;
|
|
7
7
|
exports.getPSP34ContractPromise = getPSP34ContractPromise;
|
|
8
8
|
exports.getPSP34TransferExtrinsic = getPSP34TransferExtrinsic;
|
|
9
|
+
exports.getTokenUriMethod = getTokenUriMethod;
|
|
9
10
|
exports.isAzeroDomainNft = isAzeroDomainNft;
|
|
11
|
+
exports.isNeurogunNft = isNeurogunNft;
|
|
10
12
|
exports.isPinkRoboNft = isPinkRoboNft;
|
|
11
13
|
var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
|
|
12
14
|
var _helper = require("@subwallet/extension-base/services/chain-service/helper");
|
|
@@ -20,6 +22,9 @@ function getPSP22ContractPromise(apiPromise, contractAddress) {
|
|
|
20
22
|
function isPinkRoboNft(contractAddress) {
|
|
21
23
|
return ['XoywUxTTtNKPRrRN7V5KXCqz2QLMFeK7DxhpSniqZHps5Xq'].includes(contractAddress);
|
|
22
24
|
}
|
|
25
|
+
function isNeurogunNft(contractAddress) {
|
|
26
|
+
return ['aZ9bd2tHeGKrs3FnJv5oe7kgVrP5GQvdJMhC2GxjXA2Yqbd'].includes(contractAddress);
|
|
27
|
+
}
|
|
23
28
|
function isAzeroDomainNft(contractAddress) {
|
|
24
29
|
return ['5FsB91tXSEuMj6akzdPczAtmBaVKToqHmtAwSUzXh49AYzaD', '5CTQBfBC9SfdrCDBJdfLiyW2pg9z5W6C6Es8sK313BLnFgDf'].includes(contractAddress);
|
|
25
30
|
}
|
|
@@ -27,11 +32,23 @@ function getPSP34ContractPromise(apiPromise, contractAddress) {
|
|
|
27
32
|
if (isPinkRoboNft(contractAddress)) {
|
|
28
33
|
return new _apiContract.ContractPromise(apiPromise, _helper._PINK_PSP34_ABI, contractAddress);
|
|
29
34
|
}
|
|
35
|
+
if (isNeurogunNft(contractAddress)) {
|
|
36
|
+
return new _apiContract.ContractPromise(apiPromise, _helper._NEUROGUNS_PSP34_ABI, contractAddress);
|
|
37
|
+
}
|
|
30
38
|
if (isAzeroDomainNft(contractAddress)) {
|
|
31
39
|
return new _apiContract.ContractPromise(apiPromise, _helper._AZERO_DOMAIN_REGISTRY_ABI, contractAddress);
|
|
32
40
|
}
|
|
33
41
|
return new _apiContract.ContractPromise(apiPromise, _helper._PSP34_ABI, contractAddress);
|
|
34
42
|
}
|
|
43
|
+
function getTokenUriMethod(contractAddress) {
|
|
44
|
+
if (isPinkRoboNft(contractAddress)) {
|
|
45
|
+
return 'pinkMint::tokenUri';
|
|
46
|
+
}
|
|
47
|
+
if (isNeurogunNft(contractAddress)) {
|
|
48
|
+
return 'tokenUri';
|
|
49
|
+
}
|
|
50
|
+
return 'psp34Traits::tokenUri';
|
|
51
|
+
}
|
|
35
52
|
const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;
|
|
36
53
|
async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress, recipientAddress, params) {
|
|
37
54
|
const contractAddress = params.contractAddress;
|
|
@@ -270,7 +270,7 @@ class KoniExtension {
|
|
|
270
270
|
this.cancelSubscription(id);
|
|
271
271
|
subscription.unsubscribe();
|
|
272
272
|
});
|
|
273
|
-
return
|
|
273
|
+
return this.#koniState.metaSubject.value;
|
|
274
274
|
}
|
|
275
275
|
jsonRestore(_ref12) {
|
|
276
276
|
let {
|
|
@@ -392,7 +392,7 @@ class KoniExtension {
|
|
|
392
392
|
this.cancelSubscription(id);
|
|
393
393
|
subscription.unsubscribe();
|
|
394
394
|
});
|
|
395
|
-
return
|
|
395
|
+
return this.#koniState.signSubject.value;
|
|
396
396
|
}
|
|
397
397
|
windowOpen(_ref18) {
|
|
398
398
|
let {
|
|
@@ -633,7 +633,7 @@ class KoniExtension {
|
|
|
633
633
|
port.onDisconnect.addListener(() => {
|
|
634
634
|
this.cancelSubscription(id);
|
|
635
635
|
});
|
|
636
|
-
return
|
|
636
|
+
return this.#koniState.authSubjectV2.value;
|
|
637
637
|
}
|
|
638
638
|
async getAuthListV2() {
|
|
639
639
|
const authList = await this._getAuthListV2();
|
package/cjs/packageInfo.js
CHANGED
|
@@ -38,7 +38,7 @@ const _BALANCE_CHAIN_GROUP = {
|
|
|
38
38
|
kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
|
|
39
39
|
genshiro: ['genshiro_testnet', 'genshiro'],
|
|
40
40
|
equilibrium_parachain: ['equilibrium_parachain'],
|
|
41
|
-
bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum'],
|
|
41
|
+
bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
|
|
42
42
|
statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
|
|
43
43
|
kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
|
|
44
44
|
};
|
|
@@ -61,7 +61,7 @@ const _NFT_CHAIN_GROUP = {
|
|
|
61
61
|
// Staking--------------------------------------------------------------------------------------------------------------
|
|
62
62
|
exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
|
|
63
63
|
const _STAKING_CHAIN_GROUP = {
|
|
64
|
-
relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin'],
|
|
64
|
+
relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network'],
|
|
65
65
|
para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
|
|
66
66
|
astar: ['astar', 'shiden', 'shibuya'],
|
|
67
67
|
amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
|
|
@@ -103,7 +103,8 @@ const _STAKING_ERA_LENGTH_MAP = {
|
|
|
103
103
|
kilt_peregrine: 2,
|
|
104
104
|
edgeware: 6,
|
|
105
105
|
kate: 6,
|
|
106
|
-
creditcoin: 24
|
|
106
|
+
creditcoin: 24,
|
|
107
|
+
vara_network: 12
|
|
107
108
|
};
|
|
108
109
|
exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
|
|
109
110
|
const _PARACHAIN_INFLATION_DISTRIBUTION = {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports._TEST_ERC721_ABI = exports._PSP34_ABI = exports._PSP22_ABI = exports._PINK_PSP34_ABI = exports._ERC721_ABI = exports._ERC20_ABI = exports._AZERO_DOMAIN_REGISTRY_ABI = void 0;
|
|
6
|
+
exports._TEST_ERC721_ABI = exports._PSP34_ABI = exports._PSP22_ABI = exports._PINK_PSP34_ABI = exports._NEUROGUNS_PSP34_ABI = exports._ERC721_ABI = exports._ERC20_ABI = exports._AZERO_DOMAIN_REGISTRY_ABI = void 0;
|
|
7
7
|
// Copyright 2019-2022 @subwallet/extension-base
|
|
8
8
|
// SPDX-License-Identifier: Apache-2.0
|
|
9
9
|
|
|
@@ -26,5 +26,8 @@ exports._PSP34_ABI = _PSP34_ABI;
|
|
|
26
26
|
const _PINK_PSP34_ABI = require('./pink_psp34_abi.json');
|
|
27
27
|
// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
|
|
28
28
|
exports._PINK_PSP34_ABI = _PINK_PSP34_ABI;
|
|
29
|
+
const _NEUROGUNS_PSP34_ABI = require('./neuroguns_psp34_abi.json');
|
|
30
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
|
|
31
|
+
exports._NEUROGUNS_PSP34_ABI = _NEUROGUNS_PSP34_ABI;
|
|
29
32
|
const _AZERO_DOMAIN_REGISTRY_ABI = require('./azero_domain_registry_abi.json');
|
|
30
33
|
exports._AZERO_DOMAIN_REGISTRY_ABI = _AZERO_DOMAIN_REGISTRY_ABI;
|
|
@@ -132,8 +132,18 @@ export const createTransferExtrinsic = async ({
|
|
|
132
132
|
gasLimit
|
|
133
133
|
}, to, value, {});
|
|
134
134
|
transferAmount = value;
|
|
135
|
-
} else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey)
|
|
136
|
-
|
|
135
|
+
} else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey)) {
|
|
136
|
+
if (!_isNativeToken(tokenInfo)) {
|
|
137
|
+
if (isTxCurrenciesSupported) {
|
|
138
|
+
transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
|
|
139
|
+
}
|
|
140
|
+
} else {
|
|
141
|
+
if (transferAll) {
|
|
142
|
+
transfer = api.tx.balances.transferAll(to, false);
|
|
143
|
+
} else if (value) {
|
|
144
|
+
transfer = api.tx.balances.transferKeepAlive(to, new BN(value));
|
|
145
|
+
}
|
|
146
|
+
}
|
|
137
147
|
} else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && isTxTokensSupported) {
|
|
138
148
|
if (transferAll) {
|
|
139
149
|
transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), false);
|
|
@@ -5,7 +5,7 @@ import { _AssetType } from '@subwallet/chain-list/types';
|
|
|
5
5
|
import { AZERO_DOMAIN_CONTRACTS } from '@subwallet/extension-base/koni/api/dotsama/domain';
|
|
6
6
|
import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
|
|
7
7
|
import { collectionApiFromArtZero, collectionDetailApiFromArtZero, externalUrlOnArtZero, ipfsApiFromArtZero, itemImageApiFromArtZero } from '@subwallet/extension-base/koni/api/nft/wasm_nft/utils';
|
|
8
|
-
import { getPSP34ContractPromise, isAzeroDomainNft, isPinkRoboNft } from '@subwallet/extension-base/koni/api/tokens/wasm';
|
|
8
|
+
import { getPSP34ContractPromise, getTokenUriMethod, isAzeroDomainNft, isPinkRoboNft } from '@subwallet/extension-base/koni/api/tokens/wasm';
|
|
9
9
|
import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
|
|
10
10
|
import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
|
|
11
11
|
import { isUrl } from '@subwallet/extension-base/utils';
|
|
@@ -262,7 +262,7 @@ export class WasmNftApi extends BaseNftApi {
|
|
|
262
262
|
name: tokenId
|
|
263
263
|
};
|
|
264
264
|
const _isFeatured = isFeatured && !AZERO_DOMAIN_CONTRACTS.includes(contractPromise.address.toString());
|
|
265
|
-
const _tokenUri = await contractPromise.query[
|
|
265
|
+
const _tokenUri = await contractPromise.query[getTokenUriMethod(contractPromise.address.toString())](address, {
|
|
266
266
|
gasLimit: getDefaultWeightV2((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
|
|
267
267
|
}, isAzeroDomainNft(contractPromise.address.toString()) ? {
|
|
268
268
|
bytes: tokenId
|
|
@@ -492,12 +492,13 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
|
|
|
492
492
|
};
|
|
493
493
|
}
|
|
494
494
|
export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakingMetadata) {
|
|
495
|
+
var _chainApi$api$query$s2;
|
|
495
496
|
const chainApi = await substrateApi.isReady;
|
|
496
497
|
const _era = await chainApi.api.query.staking.currentEra();
|
|
497
498
|
const currentEra = _era.toString();
|
|
498
499
|
const allValidators = [];
|
|
499
500
|
const validatorInfoList = [];
|
|
500
|
-
const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), chainApi.api.query.stakingRewards && chainApi.api.query.stakingRewards.data()]);
|
|
501
|
+
const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s2 = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s2 === void 0 ? void 0 : _chainApi$api$query$s2.data) && chainApi.api.query.stakingRewards.data()]);
|
|
501
502
|
const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
|
|
502
503
|
const maxNominatorRewarded = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
|
|
503
504
|
const bnTotalEraStake = new BN(_totalEraStake.toString());
|
|
@@ -3,6 +3,8 @@ import { ApiPromise } from '@polkadot/api';
|
|
|
3
3
|
import { ContractPromise } from '@polkadot/api-contract';
|
|
4
4
|
export declare function getPSP22ContractPromise(apiPromise: ApiPromise, contractAddress: string): ContractPromise;
|
|
5
5
|
export declare function isPinkRoboNft(contractAddress: string): boolean;
|
|
6
|
+
export declare function isNeurogunNft(contractAddress: string): boolean;
|
|
6
7
|
export declare function isAzeroDomainNft(contractAddress: string): boolean;
|
|
7
8
|
export declare function getPSP34ContractPromise(apiPromise: ApiPromise, contractAddress: string): ContractPromise;
|
|
9
|
+
export declare function getTokenUriMethod(contractAddress: string): string;
|
|
8
10
|
export declare function getPSP34TransferExtrinsic(networkKey: string, substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
|
|
5
|
-
import { _AZERO_DOMAIN_REGISTRY_ABI, _PINK_PSP34_ABI, _PSP22_ABI, _PSP34_ABI } from '@subwallet/extension-base/services/chain-service/helper';
|
|
5
|
+
import { _AZERO_DOMAIN_REGISTRY_ABI, _NEUROGUNS_PSP34_ABI, _PINK_PSP34_ABI, _PSP22_ABI, _PSP34_ABI } from '@subwallet/extension-base/services/chain-service/helper';
|
|
6
6
|
import { ContractPromise } from '@polkadot/api-contract';
|
|
7
7
|
export function getPSP22ContractPromise(apiPromise, contractAddress) {
|
|
8
8
|
return new ContractPromise(apiPromise, _PSP22_ABI, contractAddress);
|
|
@@ -10,6 +10,9 @@ export function getPSP22ContractPromise(apiPromise, contractAddress) {
|
|
|
10
10
|
export function isPinkRoboNft(contractAddress) {
|
|
11
11
|
return ['XoywUxTTtNKPRrRN7V5KXCqz2QLMFeK7DxhpSniqZHps5Xq'].includes(contractAddress);
|
|
12
12
|
}
|
|
13
|
+
export function isNeurogunNft(contractAddress) {
|
|
14
|
+
return ['aZ9bd2tHeGKrs3FnJv5oe7kgVrP5GQvdJMhC2GxjXA2Yqbd'].includes(contractAddress);
|
|
15
|
+
}
|
|
13
16
|
export function isAzeroDomainNft(contractAddress) {
|
|
14
17
|
return ['5FsB91tXSEuMj6akzdPczAtmBaVKToqHmtAwSUzXh49AYzaD', '5CTQBfBC9SfdrCDBJdfLiyW2pg9z5W6C6Es8sK313BLnFgDf'].includes(contractAddress);
|
|
15
18
|
}
|
|
@@ -17,11 +20,23 @@ export function getPSP34ContractPromise(apiPromise, contractAddress) {
|
|
|
17
20
|
if (isPinkRoboNft(contractAddress)) {
|
|
18
21
|
return new ContractPromise(apiPromise, _PINK_PSP34_ABI, contractAddress);
|
|
19
22
|
}
|
|
23
|
+
if (isNeurogunNft(contractAddress)) {
|
|
24
|
+
return new ContractPromise(apiPromise, _NEUROGUNS_PSP34_ABI, contractAddress);
|
|
25
|
+
}
|
|
20
26
|
if (isAzeroDomainNft(contractAddress)) {
|
|
21
27
|
return new ContractPromise(apiPromise, _AZERO_DOMAIN_REGISTRY_ABI, contractAddress);
|
|
22
28
|
}
|
|
23
29
|
return new ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
|
|
24
30
|
}
|
|
31
|
+
export function getTokenUriMethod(contractAddress) {
|
|
32
|
+
if (isPinkRoboNft(contractAddress)) {
|
|
33
|
+
return 'pinkMint::tokenUri';
|
|
34
|
+
}
|
|
35
|
+
if (isNeurogunNft(contractAddress)) {
|
|
36
|
+
return 'tokenUri';
|
|
37
|
+
}
|
|
38
|
+
return 'psp34Traits::tokenUri';
|
|
39
|
+
}
|
|
25
40
|
const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;
|
|
26
41
|
export async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress, recipientAddress, params) {
|
|
27
42
|
const contractAddress = params.contractAddress;
|
|
@@ -250,7 +250,7 @@ export default class KoniExtension {
|
|
|
250
250
|
this.cancelSubscription(id);
|
|
251
251
|
subscription.unsubscribe();
|
|
252
252
|
});
|
|
253
|
-
return
|
|
253
|
+
return this.#koniState.metaSubject.value;
|
|
254
254
|
}
|
|
255
255
|
jsonRestore({
|
|
256
256
|
file,
|
|
@@ -366,7 +366,7 @@ export default class KoniExtension {
|
|
|
366
366
|
this.cancelSubscription(id);
|
|
367
367
|
subscription.unsubscribe();
|
|
368
368
|
});
|
|
369
|
-
return
|
|
369
|
+
return this.#koniState.signSubject.value;
|
|
370
370
|
}
|
|
371
371
|
windowOpen({
|
|
372
372
|
allowedPath: path,
|
|
@@ -600,7 +600,7 @@ export default class KoniExtension {
|
|
|
600
600
|
port.onDisconnect.addListener(() => {
|
|
601
601
|
this.cancelSubscription(id);
|
|
602
602
|
});
|
|
603
|
-
return
|
|
603
|
+
return this.#koniState.authSubjectV2.value;
|
|
604
604
|
}
|
|
605
605
|
async getAuthListV2() {
|
|
606
606
|
const authList = await this._getAuthListV2();
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"./cjs/detectPackage.js"
|
|
18
18
|
],
|
|
19
19
|
"type": "module",
|
|
20
|
-
"version": "1.1.
|
|
20
|
+
"version": "1.1.16-0",
|
|
21
21
|
"main": "./cjs/index.js",
|
|
22
22
|
"module": "./index.js",
|
|
23
23
|
"types": "./index.d.ts",
|
|
@@ -583,6 +583,7 @@
|
|
|
583
583
|
"./services/chain-service/helper/azero_domain_registry_abi.json": "./services/chain-service/helper/azero_domain_registry_abi.json",
|
|
584
584
|
"./services/chain-service/helper/erc20_abi.json": "./services/chain-service/helper/erc20_abi.json",
|
|
585
585
|
"./services/chain-service/helper/erc721_abi.json": "./services/chain-service/helper/erc721_abi.json",
|
|
586
|
+
"./services/chain-service/helper/neuroguns_psp34_abi.json": "./services/chain-service/helper/neuroguns_psp34_abi.json",
|
|
586
587
|
"./services/chain-service/helper/pink_psp34_abi.json": "./services/chain-service/helper/pink_psp34_abi.json",
|
|
587
588
|
"./services/chain-service/helper/psp22_abi.json": "./services/chain-service/helper/psp22_abi.json",
|
|
588
589
|
"./services/chain-service/helper/psp34_abi.json": "./services/chain-service/helper/psp34_abi.json",
|
|
@@ -1226,11 +1227,11 @@
|
|
|
1226
1227
|
"@reduxjs/toolkit": "^1.9.1",
|
|
1227
1228
|
"@sora-substrate/type-definitions": "^1.17.7",
|
|
1228
1229
|
"@substrate/connect": "^0.7.26",
|
|
1229
|
-
"@subwallet/chain-list": "
|
|
1230
|
-
"@subwallet/extension-base": "^1.1.
|
|
1231
|
-
"@subwallet/extension-chains": "^1.1.
|
|
1232
|
-
"@subwallet/extension-dapp": "^1.1.
|
|
1233
|
-
"@subwallet/extension-inject": "^1.1.
|
|
1230
|
+
"@subwallet/chain-list": "0.2.16-beta.4",
|
|
1231
|
+
"@subwallet/extension-base": "^1.1.16-0",
|
|
1232
|
+
"@subwallet/extension-chains": "^1.1.16-0",
|
|
1233
|
+
"@subwallet/extension-dapp": "^1.1.16-0",
|
|
1234
|
+
"@subwallet/extension-inject": "^1.1.16-0",
|
|
1234
1235
|
"@subwallet/keyring": "^0.1.1",
|
|
1235
1236
|
"@subwallet/ui-keyring": "^0.1.1",
|
|
1236
1237
|
"@walletconnect/sign-client": "^2.8.4",
|
package/packageInfo.js
CHANGED
|
@@ -7,5 +7,5 @@ export const packageInfo = {
|
|
|
7
7
|
name: '@subwallet/extension-base',
|
|
8
8
|
path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
|
|
9
9
|
type: 'esm',
|
|
10
|
-
version: '1.1.
|
|
10
|
+
version: '1.1.16-0'
|
|
11
11
|
};
|
|
@@ -27,7 +27,7 @@ export const _BALANCE_CHAIN_GROUP = {
|
|
|
27
27
|
kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
|
|
28
28
|
genshiro: ['genshiro_testnet', 'genshiro'],
|
|
29
29
|
equilibrium_parachain: ['equilibrium_parachain'],
|
|
30
|
-
bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum'],
|
|
30
|
+
bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
|
|
31
31
|
statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
|
|
32
32
|
kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
|
|
33
33
|
};
|
|
@@ -49,7 +49,7 @@ export const _NFT_CHAIN_GROUP = {
|
|
|
49
49
|
// Staking--------------------------------------------------------------------------------------------------------------
|
|
50
50
|
|
|
51
51
|
export const _STAKING_CHAIN_GROUP = {
|
|
52
|
-
relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin'],
|
|
52
|
+
relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network'],
|
|
53
53
|
para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
|
|
54
54
|
astar: ['astar', 'shiden', 'shibuya'],
|
|
55
55
|
amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
|
|
@@ -90,7 +90,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
|
|
|
90
90
|
kilt_peregrine: 2,
|
|
91
91
|
edgeware: 6,
|
|
92
92
|
kate: 6,
|
|
93
|
-
creditcoin: 24
|
|
93
|
+
creditcoin: 24,
|
|
94
|
+
vara_network: 12
|
|
94
95
|
};
|
|
95
96
|
export const _PARACHAIN_INFLATION_DISTRIBUTION = {
|
|
96
97
|
moonbeam: {
|
|
@@ -4,4 +4,5 @@ export declare const _TEST_ERC721_ABI: any;
|
|
|
4
4
|
export declare const _PSP22_ABI: Record<string, any>;
|
|
5
5
|
export declare const _PSP34_ABI: Record<string, any>;
|
|
6
6
|
export declare const _PINK_PSP34_ABI: Record<string, any>;
|
|
7
|
+
export declare const _NEUROGUNS_PSP34_ABI: Record<string, any>;
|
|
7
8
|
export declare const _AZERO_DOMAIN_REGISTRY_ABI: Record<string, any>;
|
|
@@ -14,4 +14,6 @@ export const _PSP34_ABI = require("./psp34_abi.json");
|
|
|
14
14
|
// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
|
|
15
15
|
export const _PINK_PSP34_ABI = require("./pink_psp34_abi.json");
|
|
16
16
|
// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
|
|
17
|
+
export const _NEUROGUNS_PSP34_ABI = require("./neuroguns_psp34_abi.json");
|
|
18
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
|
|
17
19
|
export const _AZERO_DOMAIN_REGISTRY_ABI = require("./azero_domain_registry_abi.json");
|