Skip to content

Commit eda2853

Browse files
committed
Merge remote-tracking branch 'origin/koni/dev/issue-3901-v2' into subwallet-dev
# Conflicts: # packages/extension-base/package.json # packages/extension-koni-ui/package.json # packages/extension-web-ui/package.json # yarn.lock
2 parents c6418f3 + 08253d0 commit eda2853

File tree

108 files changed

+4705
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+4705
-336
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"@polkadot/types-support": "^15.0.1",
106106
"@polkadot/util": "^13.2.3",
107107
"@polkadot/util-crypto": "^13.2.3",
108-
"@subwallet/chain-list": "0.2.98",
108+
"@subwallet/chain-list": "0.2.99-beta.12",
109109
"@subwallet/keyring": "^0.1.8-beta.0",
110110
"@subwallet/react-ui": "5.1.2-b79",
111111
"@subwallet/ui-keyring": "0.1.8-beta.0",

packages/extension-base/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@reduxjs/toolkit": "^1.9.1",
5656
"@sora-substrate/type-definitions": "^1.17.7",
5757
"@substrate/connect": "^0.8.9",
58-
"@subwallet/chain-list": "0.2.99-beta.14",
58+
"@subwallet/chain-list": "0.2.99-beta.12",
5959
"@subwallet/extension-base": "^1.3.20-0",
6060
"@subwallet/extension-chains": "^1.3.20-0",
6161
"@subwallet/extension-dapp": "^1.3.20-0",

packages/extension-base/src/background/KoniTypes.ts

+12-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
1717
import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
1818
import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
1919
import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
20-
import { AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
20+
import { AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
2121
import { RequestSubmitTransfer, RequestSubscribeTransfer, ResponseSubscribeTransfer } from '@subwallet/extension-base/types/balance/transfer';
2222
import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
2323
import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -439,6 +439,7 @@ export interface UiSettings {
439439
notificationSetup: NotificationSetup;
440440
// On-ramp service account reference
441441
walletReference: string;
442+
allowOneSign: boolean;
442443
}
443444

444445
export type RequestSettingsType = UiSettings;
@@ -716,7 +717,8 @@ export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType
716717
additionalInfo?: any,
717718
startBlock?: number,
718719
nonce?: number,
719-
addressPrefix?: number
720+
addressPrefix?: number,
721+
processId?: string;
720722
}
721723

722724
export interface SWWarning {
@@ -1128,6 +1130,7 @@ export interface ConfirmationsQueueItemOptions {
11281130
requiredPassword?: boolean;
11291131
address?: string;
11301132
networkKey?: string;
1133+
isPassConfirmation?: boolean;
11311134
}
11321135

11331136
export interface ConfirmationsQueueItem<T> extends ConfirmationsQueueItemOptions, ConfirmationRequestBase {
@@ -2097,6 +2100,7 @@ export interface KoniRequestSignatures {
20972100
'pri(settings.savePriceCurrency)': [RequestChangePriceCurrency, boolean];
20982101
'pri(settings.saveShowZeroBalance)': [RequestChangeShowZeroBalance, boolean];
20992102
'pri(settings.saveShowBalance)': [RequestChangeShowBalance, boolean];
2103+
'pri(settings.update.allowOneSign)': [RequestChangeAllowOneSign, boolean];
21002104
'pri(settings.logo.assets.subscribe)': [null, Record<string, string>, Record<string, string>];
21012105
'pri(settings.logo.chains.subscribe)': [null, Record<string, string>, Record<string, string>];
21022106

@@ -2326,6 +2330,12 @@ export interface KoniRequestSignatures {
23262330
/* Popular tokens */
23272331
'pri(tokens.subscribePriority)': [null, TokenPriorityDetails, TokenPriorityDetails];
23282332
/* Popular tokens */
2333+
2334+
/* Process multi steps */
2335+
'pri(process.transaction.submit)': [RequestSubmitProcessTransaction, SWTransactionResponse];
2336+
'pri(process.subscribe.id)': [RequestSubscribeProcessById, ResponseSubscribeProcessById, ResponseSubscribeProcessById];
2337+
'pri(process.subscribe.alive)': [null, ResponseSubscribeProcessAlive, ResponseSubscribeProcessAlive];
2338+
/* Process multi steps */
23292339
}
23302340

23312341
export interface ApplicationMetadataType {

packages/extension-base/src/defaults.ts

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
const ALLOWED_PATH = [
55
'/',
66
'/settings/security',
7+
'/transaction-submission',
78
'/accounts/connect-ledger',
89
'/accounts/restore-json',
910
'/accounts/detail',

0 commit comments

Comments
 (0)