Skip to content

Commit 1c37f2a

Browse files
authored
Merge branch 'master' into WP-1219/add-eip1559-statics
2 parents b23d244 + 390f655 commit 1c37f2a

File tree

165 files changed

+1517
-763
lines changed

Some content is hidden

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

165 files changed

+1517
-763
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ RUN cd /var/bitgo-express && \
265265
#LINK_END
266266

267267
#LABEL_START
268-
LABEL created="Tue, 17 Dec 2024 14:15:00 GMT"
269-
LABEL version=10.6.3
270-
LABEL git_hash=e9a7f5fa057dd4966907be08d4b78d00deb68808
268+
LABEL created="Tue, 24 Dec 2024 19:50:26 GMT"
269+
LABEL version=10.6.5
270+
LABEL git_hash=ee5390723be96e9588fd0dd126a6106ed2c47c73
271271
#LABEL_END
272272

273273
USER node

modules/abstract-cosmos/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [11.2.12](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-24)
7+
8+
**Note:** Version bump only for package @bitgo/abstract-cosmos
9+
10+
## [11.2.11](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-19)
11+
12+
**Note:** Version bump only for package @bitgo/abstract-cosmos
13+
614
## [11.2.10](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-17)
715

816
**Note:** Version bump only for package @bitgo/abstract-cosmos

modules/abstract-cosmos/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@bitgo/abstract-cosmos",
3-
"version": "11.2.10",
3+
"version": "11.2.12",
44
"description": "BitGo SDK coin library for COSMOS base implementation",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
@@ -38,8 +38,8 @@
3838
]
3939
},
4040
"dependencies": {
41-
"@bitgo/sdk-core": "^28.17.0",
42-
"@bitgo/statics": "^50.15.0",
41+
"@bitgo/sdk-core": "^28.17.2",
42+
"@bitgo/statics": "^50.16.0",
4343
"@bitgo/utxo-lib": "^11.2.1",
4444
"@cosmjs/amino": "^0.29.5",
4545
"@cosmjs/crypto": "^0.30.1",

modules/abstract-eth/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [22.4.6](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-24)
7+
8+
### Bug Fixes
9+
10+
- **abstract-eth:** fix verifyCoin method to validate native coin ([c2bf82c](https://github.com/BitGo/BitGoJS/commit/c2bf82cd0268f63081d2bc4ef46854dfe0db1819))
11+
12+
## [22.4.5](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-19)
13+
14+
**Note:** Version bump only for package @bitgo/abstract-eth
15+
616
## [22.4.4](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-17)
717

818
**Note:** Version bump only for package @bitgo/abstract-eth

modules/abstract-eth/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@bitgo/abstract-eth",
3-
"version": "22.4.4",
3+
"version": "22.4.6",
44
"description": "BitGo SDK coin library for ETH base implementation",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
@@ -40,8 +40,8 @@
4040
]
4141
},
4242
"dependencies": {
43-
"@bitgo/sdk-core": "^28.17.0",
44-
"@bitgo/statics": "^50.15.0",
43+
"@bitgo/sdk-core": "^28.17.2",
44+
"@bitgo/statics": "^50.16.0",
4545
"@bitgo/utxo-lib": "^11.2.1",
4646
"@ethereumjs/common": "^2.6.5",
4747
"@ethereumjs/tx": "^3.3.0",
@@ -58,8 +58,8 @@
5858
"superagent": "^9.0.1"
5959
},
6060
"devDependencies": {
61-
"@bitgo/sdk-api": "^1.57.3",
62-
"@bitgo/sdk-test": "^8.0.59",
61+
"@bitgo/sdk-api": "^1.57.5",
62+
"@bitgo/sdk-test": "^8.0.61",
6363
"@types/keccak": "^3.0.5"
6464
}
6565
}

modules/abstract-eth/src/abstractEthLikeNewCoins.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
13731373
? new optionalDeps.ethUtil.BN(params.eip1559.maxFeePerGas)
13741374
: params.gasPrice
13751375
? new optionalDeps.ethUtil.BN(this.setGasPrice(params.gasPrice))
1376-
: await this.getGasPriceFromExternalAPI();
1376+
: await this.getGasPriceFromExternalAPI(this.staticsCoin?.name as string);
13771377

13781378
const bitgoFeeAddressNonce = await this.getAddressNonce(bitgoFeeAddress);
13791379

@@ -1480,6 +1480,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
14801480
if (!params.gasLimit && userKey && !userKey.startsWith('xpub')) {
14811481
const sendData = txBuilder.getSendData();
14821482
gasLimit = await this.getGasLimitFromExternalAPI(
1483+
params.intendedChain as string,
14831484
params.bitgoFeeAddress as string,
14841485
params.walletContractAddress,
14851486
sendData
@@ -1650,6 +1651,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
16501651
if (!params.gasLimit && userKey && !userKey.startsWith('xpub')) {
16511652
const sendData = txBuilder.getSendData();
16521653
gasLimit = await this.getGasLimitFromExternalAPI(
1654+
params.intendedChain as string,
16531655
params.bitgoFeeAddress as string,
16541656
params.walletContractAddress,
16551657
sendData
@@ -2230,7 +2232,8 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
22302232
* @returns {boolean}
22312233
*/
22322234
verifyCoin(txPrebuild: TransactionPrebuild): boolean {
2233-
return txPrebuild.coin === this.getChain();
2235+
const nativeCoin = this.getChain().split(':')[0];
2236+
return txPrebuild.coin === nativeCoin;
22342237
}
22352238

22362239
/**
@@ -2446,7 +2449,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
24462449
/**
24472450
* Fetch the gas price from the explorer
24482451
*/
2449-
async getGasPriceFromExternalAPI(): Promise<BN> {
2452+
async getGasPriceFromExternalAPI(wrongChainCoin: string): Promise<BN> {
24502453
try {
24512454
const res = await this.recoveryBlockchainExplorerQuery({
24522455
module: 'proxy',
@@ -2456,17 +2459,18 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
24562459
console.log(` Got gas price: ${gasPrice}`);
24572460
return gasPrice;
24582461
} catch (e) {
2459-
throw new Error('Failed to get gas price');
2462+
throw new Error(`Failed to get gas price. Please make sure to use the api key of ${wrongChainCoin}`);
24602463
}
24612464
}
24622465

24632466
/**
24642467
* Fetch the gas limit from the explorer
2468+
* @param intendedChain
24652469
* @param from
24662470
* @param to
24672471
* @param data
24682472
*/
2469-
async getGasLimitFromExternalAPI(from: string, to: string, data: string): Promise<BN> {
2473+
async getGasLimitFromExternalAPI(intendedChain: string, from: string, to: string, data: string): Promise<BN> {
24702474
try {
24712475
const res = await this.recoveryBlockchainExplorerQuery({
24722476
module: 'proxy',
@@ -2479,7 +2483,9 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
24792483
console.log(`Got gas limit: ${gasLimit}`);
24802484
return gasLimit;
24812485
} catch (e) {
2482-
throw new Error('Failed to get gas limit: ');
2486+
throw new Error(
2487+
`Failed to get gas limit. Please make sure to use the privateKey aka userKey of ${intendedChain} wallet ${to}`
2488+
);
24832489
}
24842490
}
24852491

modules/abstract-lightning/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.2.34](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-24)
7+
8+
**Note:** Version bump only for package @bitgo/abstract-lightning
9+
10+
## [1.2.33](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-19)
11+
12+
**Note:** Version bump only for package @bitgo/abstract-lightning
13+
614
## [1.2.32](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-17)
715

816
**Note:** Version bump only for package @bitgo/abstract-lightning

modules/abstract-lightning/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@bitgo/abstract-lightning",
3-
"version": "1.2.32",
3+
"version": "1.2.34",
44
"description": "BitGo SDK coin library for base Lightning Network coin implementation",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
@@ -37,7 +37,7 @@
3737
]
3838
},
3939
"dependencies": {
40-
"@bitgo/sdk-core": "^28.17.0",
40+
"@bitgo/sdk-core": "^28.17.2",
4141
"@bitgo/utxo-lib": "^11.2.1"
4242
}
4343
}

modules/abstract-utxo/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [9.9.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-24)
7+
8+
### Features
9+
10+
- **abstract-utxo:** add support for 'max' value parse.ts ([e664c26](https://github.com/BitGo/BitGoJS/commit/e664c267a2f35f9dcc5d62cbd3386be5943748e9))
11+
- **abstract-utxo:** allow 'max' value in ExpectedOutput ([470767a](https://github.com/BitGo/BitGoJS/commit/470767ab3e4df7946d12f354dee12906566bc7d4))
12+
- use descriptor outputDifference method ([663944a](https://github.com/BitGo/BitGoJS/commit/663944af14072b988d80cc69d85d257438f8846b))
13+
14+
# [9.8.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-19)
15+
16+
### Bug Fixes
17+
18+
- **abstract-utxo:** pass actual wallet to signTransaction ([1024bff](https://github.com/BitGo/BitGoJS/commit/1024bff44bd5387a908703336e83ca7f6e4c9edc))
19+
- **abstract-utxo:** remove txHex check from postProcessPrebuild ([7e7c047](https://github.com/BitGo/BitGoJS/commit/7e7c04757320f8af2f1235e34b8cea1cf6b8a442))
20+
21+
### Features
22+
23+
- **abstract-utxo:** enforce import order lint rule ([c6f0d09](https://github.com/BitGo/BitGoJS/commit/c6f0d093fceefdd7035212bf00fd2c3ac458b5bd))
24+
- **abstract-utxo:** extract signer keychain earlier ([048c240](https://github.com/BitGo/BitGoJS/commit/048c240138c833bd4782f4c606a37a47d41dc6a5))
25+
- **abstract-utxo:** implement sign for descriptor wallets ([24eaced](https://github.com/BitGo/BitGoJS/commit/24eacedc9f77c7308ceb06dc06dca6c9742581a0))
26+
627
# [9.7.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2024-12-17)
728

829
### Features

modules/abstract-utxo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@bitgo/abstract-utxo",
3-
"version": "9.7.0",
3+
"version": "9.9.0",
44
"description": "BitGo SDK coin library for UTXO base implementation",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
@@ -40,8 +40,8 @@
4040
},
4141
"dependencies": {
4242
"@bitgo/blockapis": "^1.10.9",
43-
"@bitgo/sdk-api": "^1.57.3",
44-
"@bitgo/sdk-core": "^28.17.0",
43+
"@bitgo/sdk-api": "^1.57.5",
44+
"@bitgo/sdk-core": "^28.17.2",
4545
"@bitgo/unspents": "^0.47.17",
4646
"@bitgo/utxo-lib": "^11.2.1",
4747
"@bitgo/wasm-miniscript": "^2.0.0-beta.2",

0 commit comments

Comments
 (0)