Skip to content

Commit 6bb74c5

Browse files
committed
Merge remote-tracking branch 'refs/remotes/upstream/webapp' into webapp-dev
2 parents 621b52b + c149f3f commit 6bb74c5

File tree

99 files changed

+2667
-831
lines changed

Some content is hidden

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

99 files changed

+2667
-831
lines changed

.123trigger

+2-1
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,5 @@
158158
1.2.21
159159
1.2.22
160160
1.2.23
161-
1.2.24
161+
1.2.24
162+
1.2.25

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# CHANGELOG
22

3+
## 1.2.24
4+
Build date: Aug 17, 2024.
5+
6+
Features & Update:
7+
- Update balance calculation for nomination pool runtime update (#3443)
8+
- Do not allow send to empty account (Native token balance = 0) (#2783)
9+
- Add validate for Solochain when receive, transfer with Generic ledger account (#3464)
10+
- Update chainlist (#3451)
11+
- Add support for Blast Mainnet
12+
- Add in-app staking support for DENTX
13+
14+
Bugs fixed:
15+
- Fix Input overflow width issue (#3441)
16+
- Fix bug Do not show Signature popup in case not enough balance to cover gas fee (#2501)
17+
18+
319
## 1.2.24
420
Build date: Aug 09, 2024.
521

CONTRIBUTORS

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
2787 AnhMTV Fix eslint after merge
2-
2520 Nam Phạm [Issue 3440] fix: token balance formula
3-
2176 S2kael [Issue-3425] Update stable version for chain-list
1+
2796 AnhMTV Update earning with middleware service
2+
2532 Nam Phạm [Issue 3450] fix: get era stakers overview
3+
2180 S2kael [Issue-3450] Update stable version for chain-list
44
848 lw-cdm [Issue-3407] WebApp - Support Avail Ledger app
55
561 nguyentiendung [Issue-2845] Fix UI bugs export accounts
66
465 Jaco 0.42.5 (#969)
7-
255 bluezdot [Issue-3425] Update chainlist
8-
196 Thiendekaco [Issue 1907] [fix] Webapp - Improve connect extension feature #6
7+
262 bluezdot [Issue-3450] fix: bug rounding number
8+
209 Thiendekaco [Issue 2501] [update] Extension - Update message error has been standardized #2
99
185 quangdo
1010
160 Automation Bot [CI Skip] Auto increase webapp build number
1111
145 dominhquang [Issue-3414] Fix bug re-open popup
@@ -14,7 +14,7 @@
1414
83 Hieu Dao Update README.md
1515
82 Thibaut Sardan Add account filtering feature (#832)
1616
81 leewong Swap - Change idle time to 300s
17-
66 bluedot [Issue-2965] fix: Handle earning status for request redeem
17+
67 bluedot [Issue-2965] fix: Handle earning status for request redeem
1818
63 Roman fix ui issues
1919
53 Dominhquangdev update Bridge code
2020
32 Frenkie Nguyen [Issue 3413] WebApp - Do not show earning position for Bifrost liquid staking
@@ -28,6 +28,7 @@
2828
4 Amaury Martiny PostMessageProvider with on('connected' | 'disconnected') (#279)
2929
4 namph update UI for nft
3030
4 Quangdm-cdm
31+
4 Thanh [Issue-3450] Add Story Partner Testnet
3132
3 Antoine Estienne Add eth test for extension signature (#909)
3233
3 quangdm Update style for Auth Transaction Screen, Export Screen, Derive Screen
3334
2 Axel Chalon Add typings to messages (#130)
@@ -50,6 +51,7 @@
5051
1 Forrest Add Web3AccountsOptions to web3FromAddress function (#617)
5152
1 itsonal add new language - Urdu (#847)
5253
1 KarishmaBothara Added code to support custom signed extension/user extension (#670)
54+
1 lw [UI] Fix issue related to input overflow width
5355
1 Marcel Jackisch Minor changes to readme (#376)
5456
1 Michael Healy Small typo (#932)
5557
1 Minh Ha ✨ allows background handler to handle custom extention port name (#685)

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/Koniverse/Subwallet-V2.git"
1111
},
1212
"sideEffects": false,
13-
"version": "1.2.25-0",
13+
"version": "1.2.26-0",
1414
"workspaces": [
1515
"packages/*"
1616
],
@@ -103,7 +103,7 @@
103103
"@polkadot/types-support": "^12.0.2",
104104
"@polkadot/util": "^12.6.2",
105105
"@polkadot/util-crypto": "^12.6.2",
106-
"@subwallet/chain-list": "0.2.81",
106+
"@subwallet/chain-list": "0.2.82",
107107
"@subwallet/keyring": "^0.1.5",
108108
"@subwallet/react-ui": "5.1.2-b79",
109109
"@subwallet/ui-keyring": "^0.1.5",

packages/extension-base/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"./detectPackage.cjs"
1818
],
1919
"type": "module",
20-
"version": "1.2.25-0",
20+
"version": "1.2.26-0",
2121
"main": "index.js",
2222
"dependencies": {
2323
"@acala-network/api": "^5.0.2",
@@ -28,7 +28,7 @@
2828
"@ethereumjs/common": "^4.1.0",
2929
"@ethereumjs/tx": "^5.1.0",
3030
"@ethersproject/abi": "^5.7.0",
31-
"@galacticcouncil/sdk": "^2.1.0",
31+
"@galacticcouncil/sdk": "^4.2.0",
3232
"@gear-js/api": "^0.38.1",
3333
"@json-rpc-tools/utils": "^1.7.6",
3434
"@metamask/safe-event-emitter": "^2.0.0",
@@ -54,11 +54,11 @@
5454
"@reduxjs/toolkit": "^1.9.1",
5555
"@sora-substrate/type-definitions": "^1.17.7",
5656
"@substrate/connect": "^0.8.9",
57-
"@subwallet/chain-list": "0.2.81",
58-
"@subwallet/extension-base": "^1.2.25-0",
59-
"@subwallet/extension-chains": "^1.2.25-0",
60-
"@subwallet/extension-dapp": "^1.2.25-0",
61-
"@subwallet/extension-inject": "^1.2.25-0",
57+
"@subwallet/chain-list": "0.2.82",
58+
"@subwallet/extension-base": "^1.2.26-0",
59+
"@subwallet/extension-chains": "^1.2.26-0",
60+
"@subwallet/extension-dapp": "^1.2.26-0",
61+
"@subwallet/extension-inject": "^1.2.26-0",
6262
"@subwallet/keyring": "^0.1.5",
6363
"@subwallet/ui-keyring": "^0.1.5",
6464
"@walletconnect/keyvaluestorage": "^1.1.1",
@@ -98,7 +98,7 @@
9898
"web3-utils": "^1.10.0"
9999
},
100100
"devDependencies": {
101-
"@subwallet/extension-mocks": "^1.2.25-0",
101+
"@subwallet/extension-mocks": "^1.2.26-0",
102102
"@types/uuid": "^9.0.1"
103103
}
104104
}

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

+19-3
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ export enum ExtrinsicType {
528528

529529
SWAP = 'swap',
530530

531-
// SET_FEE_TOKEN = 'set_fee-token',
531+
SET_FEE_TOKEN = 'set_fee-token',
532532

533533
EVM_EXECUTE = 'evm.execute',
534534
UNKNOWN = 'unknown'
@@ -583,7 +583,8 @@ export interface ExtrinsicDataTypeMap {
583583

584584
[ExtrinsicType.EVM_EXECUTE]: TransactionConfig,
585585
[ExtrinsicType.CROWDLOAN]: any,
586-
[ExtrinsicType.SWAP]: SwapTxData
586+
[ExtrinsicType.SWAP]: SwapTxData,
587+
[ExtrinsicType.SET_FEE_TOKEN]: RequestChangeFeeToken,
587588
[ExtrinsicType.UNKNOWN]: any
588589
}
589590

@@ -631,6 +632,7 @@ export interface AmountData extends BasicTokenInfo {
631632

632633
export interface FeeData extends AmountData {
633634
tooHigh?: boolean;
635+
feeTokenSlug: string;
634636
}
635637

636638
export interface AmountDataWithId extends AmountData {
@@ -1278,12 +1280,14 @@ export interface EvmSignatureRequest extends EvmSignRequest {
12781280
id: string;
12791281
type: string;
12801282
payload: unknown;
1283+
errors?: Error[]
12811284
}
12821285

12831286
export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignRequest {
12841287
estimateGas: string;
12851288
parseData: EvmTransactionData;
12861289
isToContract: boolean;
1290+
errors?: TransactionError[]
12871291
}
12881292

12891293
export type EvmWatchTransactionRequest = EvmSendTransactionRequest;
@@ -1331,13 +1335,20 @@ export interface AddTokenRequestExternal {
13311335
contractError: boolean;
13321336
}
13331337

1338+
export interface ErrorNetworkConnection {
1339+
networkKey: string,
1340+
address: string,
1341+
errors: Error[]
1342+
}
1343+
13341344
export interface ConfirmationDefinitions {
13351345
addNetworkRequest: [ConfirmationsQueueItem<_NetworkUpsertParams>, ConfirmationResult<null>],
13361346
addTokenRequest: [ConfirmationsQueueItem<AddTokenRequestExternal>, ConfirmationResult<boolean>],
13371347
switchNetworkRequest: [ConfirmationsQueueItem<SwitchNetworkRequest>, ConfirmationResult<boolean>],
13381348
evmSignatureRequest: [ConfirmationsQueueItem<EvmSignatureRequest>, ConfirmationResult<string>],
13391349
evmSendTransactionRequest: [ConfirmationsQueueItem<EvmSendTransactionRequest>, ConfirmationResult<string>]
1340-
evmWatchTransactionRequest: [ConfirmationsQueueItem<EvmWatchTransactionRequest>, ConfirmationResult<string>]
1350+
evmWatchTransactionRequest: [ConfirmationsQueueItem<EvmWatchTransactionRequest>, ConfirmationResult<string>],
1351+
errorConnectNetwork: [ConfirmationsQueueItem<ErrorNetworkConnection>, ConfirmationResult<null>]
13411352
}
13421353

13431354
export type ConfirmationType = keyof ConfirmationDefinitions;
@@ -1516,6 +1527,7 @@ export interface ResponseQrSignEvm {
15161527
export interface RequestChangeFeeToken {
15171528
currentFeeToken?: string;
15181529
selectedFeeToken: string;
1530+
convertedFeeAmount: string;
15191531
}
15201532

15211533
/// Transfer
@@ -2433,6 +2445,10 @@ export interface KoniRequestSignatures {
24332445
'pri(swapService.getLatestQuote)': [SwapRequest, SwapQuoteResponse];
24342446
'pri(swapService.validateSwapProcess)': [ValidateSwapProcessParams, TransactionError[]];
24352447
/* Swap */
2448+
2449+
/* Ledger */
2450+
2451+
'pri(ledger.generic.allow)': [null, string[], string[]];
24362452
}
24372453

24382454
export interface ApplicationMetadataType {

packages/extension-base/src/background/errors/EvmProviderError.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ const defaultErrorMap: Record<EvmProviderErrorType, { message: string, code?: nu
4040
export class EvmProviderError extends SWError {
4141
override errorType: EvmProviderErrorType;
4242

43-
constructor (errorType: EvmProviderErrorType, errMessage?: string, data?: unknown) {
43+
constructor (errorType: EvmProviderErrorType, errMessage?: string, data?: unknown, name?: string) {
4444
const { code, message } = defaultErrorMap[errorType];
4545
const finalMessage = errMessage || t(message || '') || errorType;
4646

47-
super(errorType, finalMessage, code, data);
47+
super(errorType, finalMessage, code, data, name);
4848
this.errorType = errorType;
4949
}
5050
}

packages/extension-base/src/background/errors/SWError.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ export class SWError extends Error implements SWErrorType {
88
code: number | undefined;
99
data: unknown | undefined;
1010

11-
constructor (errorType: string, message: string, code?: number, data?: unknown) {
11+
constructor (errorType: string, message: string, code?: number, data?: unknown, name?: string) {
1212
super(message);
1313
this.errorType = errorType;
1414
this.code = code;
1515
this.data = data;
16+
17+
if (name) {
18+
this.name = name;
19+
}
1620
}
1721

1822
public toJSON () {

packages/extension-base/src/background/errors/TransactionError.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ const defaultErrorMap = {
111111
export class TransactionError extends SWError {
112112
override errorType: TransactionErrorType;
113113

114-
constructor (errorType: TransactionErrorType, errMessage?: string, data?: unknown) {
114+
constructor (errorType: TransactionErrorType, errMessage?: string, data?: unknown, name?: string) {
115115
const defaultErr = defaultErrorMap[errorType];
116116
const message = errMessage || t(defaultErr?.message || '') || errorType;
117117

118-
super(errorType, message, defaultErr?.code, data);
118+
super(errorType, message, defaultErr?.code, data, name);
119119
this.errorType = errorType;
120120
}
121121
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright 2019-2022 @subwallet/extension-base
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
export * from './swap';
5+
export * from './request';
6+
export * from './earning';
7+
export * from './transfer';

0 commit comments

Comments
 (0)