Skip to content

Commit bd01ab3

Browse files
authored
Merge branch 'master' into DX-1549-bigint-buffer-advisory
2 parents 4f762b2 + b25fe3f commit bd01ab3

File tree

312 files changed

+6460
-1717
lines changed

Some content is hidden

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

312 files changed

+6460
-1717
lines changed

.github/workflows/ci.yml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,5 +270,44 @@ jobs:
270270
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
271271
with:
272272
ref: ${{ github.event.pull_request.head.sha }}
273+
274+
- name: Setup Docker compatibility with Podman
275+
run: sudo ln -sf /usr/bin/podman /usr/local/bin/docker
276+
273277
- name: Build BitGoJS Express Docker Image
274-
run: podman build .
278+
run: ./scripts/build-docker-express.sh
279+
280+
dockerfile-check:
281+
runs-on: ubuntu-latest
282+
283+
steps:
284+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
285+
with:
286+
ref: ${{ github.event.pull_request.head.sha }}
287+
288+
- name: Setup node 22
289+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
290+
with:
291+
node-version: 22
292+
293+
- name: restore lerna dependencies
294+
id: lerna-cache
295+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 #v4.2.3
296+
with:
297+
path: |
298+
node_modules
299+
modules/*/node_modules
300+
key: ${{ runner.os }}-node22-${{ hashFiles('yarn.lock') }}-${{ hashFiles('tsconfig.packages.json') }}-${{ hashFiles('package.json') }}
301+
302+
- name: Install Packages
303+
if: steps.lerna-cache.outputs.cache-hit != 'true' || contains( github.event.pull_request.labels.*.name, 'SKIP_CACHE')
304+
run: yarn install --with-frozen-lockfile --ignore-scripts
305+
306+
- name: Check Dockerfile is up to date
307+
run: |
308+
yarn update-dockerfile
309+
if ! git diff --quiet; then
310+
echo "Dockerfile is not up to date. Please run 'yarn update-dockerfile' and commit the changes."
311+
git diff
312+
exit 1
313+
fi

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@
109109
/modules/sdk-core/src/bitgo/address-book/ @BitGo/prime
110110
/modules/sdk-core/src/bitgo/trading/ @BitGo/prime
111111

112-
# Asset Metadata Service
113-
/modules/statics/src/coins/botTokens.ts @BitGo/ams
114-
/modules/statics/src/coins/botOfcTokens.ts @BitGo/ams
115-
116112
# Core Modules
117113
/modules/bitgo/ @BitGo/coins @BitGo/web-experience @BitGo/wallet-platform
118114
/modules/bitgo/test/v2/unit/lightning/ @BitGo/btc-team
@@ -141,6 +137,10 @@
141137
/types/ @BitGo/coins @BitGo/web-experience @BitGo/wallet-platform
142138
/webpack/ @BitGo/coins @BitGo/web-experience @BitGo/wallet-platform
143139

140+
# Asset Metadata Service
141+
/modules/statics/src/coins/botTokens.ts @BitGo/ams
142+
/modules/statics/src/coins/botOfcTokens.ts @BitGo/ams
143+
144144
/.eslintrc.json @BitGo/coins @BitGo/web-experience @BitGo/wallet-platform @BitGo/developer-experience
145145
/.prettierrc.yml @BitGo/coins @BitGo/web-experience @BitGo/wallet-platform @BitGo/developer-experience
146146
/check-package-versions.js @BitGo/coins @BitGo/web-experience @BitGo/wallet-platform @BitGo/developer-experience

Dockerfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ COPY --from=builder /tmp/bitgo/modules/sdk-coin-icp /var/modules/sdk-coin-icp/
8888
COPY --from=builder /tmp/bitgo/modules/sdk-coin-initia /var/modules/sdk-coin-initia/
8989
COPY --from=builder /tmp/bitgo/modules/sdk-coin-injective /var/modules/sdk-coin-injective/
9090
COPY --from=builder /tmp/bitgo/modules/sdk-coin-islm /var/modules/sdk-coin-islm/
91-
COPY --from=builder /tmp/bitgo/modules/sdk-coin-mantra /var/modules/sdk-coin-mantra/
9291
COPY --from=builder /tmp/bitgo/modules/sdk-coin-mon /var/modules/sdk-coin-mon/
9392
COPY --from=builder /tmp/bitgo/modules/sdk-coin-near /var/modules/sdk-coin-near/
9493
COPY --from=builder /tmp/bitgo/modules/sdk-coin-oas /var/modules/sdk-coin-oas/
@@ -185,7 +184,6 @@ cd /var/modules/sdk-coin-icp && yarn link && \
185184
cd /var/modules/sdk-coin-initia && yarn link && \
186185
cd /var/modules/sdk-coin-injective && yarn link && \
187186
cd /var/modules/sdk-coin-islm && yarn link && \
188-
cd /var/modules/sdk-coin-mantra && yarn link && \
189187
cd /var/modules/sdk-coin-mon && yarn link && \
190188
cd /var/modules/sdk-coin-near && yarn link && \
191189
cd /var/modules/sdk-coin-oas && yarn link && \
@@ -285,7 +283,6 @@ RUN cd /var/bitgo-express && \
285283
yarn link @bitgo/sdk-coin-initia && \
286284
yarn link @bitgo/sdk-coin-injective && \
287285
yarn link @bitgo/sdk-coin-islm && \
288-
yarn link @bitgo/sdk-coin-mantra && \
289286
yarn link @bitgo/sdk-coin-mon && \
290287
yarn link @bitgo/sdk-coin-near && \
291288
yarn link @bitgo/sdk-coin-oas && \
@@ -333,14 +330,16 @@ RUN cd /var/bitgo-express && \
333330
yarn link @bitgo/sdk-coin-zec
334331
#LINK_END
335332

336-
#LABEL_START
337-
LABEL created="Thu, 04 Sep 2025 18:59:30 GMT"
338-
LABEL version=15.0.0
339-
LABEL git_hash=bbdf6e60b720b25e3212f3a4c5bdc81732a505e8
340-
#LABEL_END
333+
ARG BUILD_DATE
334+
ARG VERSION
335+
ARG GIT_HASH
336+
337+
LABEL created=${BUILD_DATE}
338+
LABEL version=${VERSION}
339+
LABEL git_hash=${GIT_HASH}
341340

342341
USER node
343-
ENV NODE_ENV production
344-
ENV BITGO_BIND 0.0.0.0
342+
ENV NODE_ENV=production
343+
ENV BITGO_BIND=0.0.0.0
345344
EXPOSE 3080
346345
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/node", "/var/bitgo-express/bin/bitgo-express"]

modules/abstract-cosmos/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
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.15.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-09-25)
7+
8+
### Features
9+
10+
- configure learn to skip git operations ([ee3a622](https://github.com/BitGo/BitGoJS/commit/ee3a6220496476aa7f4545b5f4a9a3bf97d9bdb9))
11+
612
## [11.14.2](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-09-03)
713

814
### Bug Fixes

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.14.2",
3+
"version": "11.15.0",
44
"description": "BitGo SDK coin library for COSMOS base implementation",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
@@ -38,10 +38,10 @@
3838
]
3939
},
4040
"dependencies": {
41-
"@bitgo/sdk-core": "^36.8.0",
41+
"@bitgo/sdk-core": "^36.9.0",
4242
"@bitgo/sdk-lib-mpc": "^10.7.0",
4343
"@bitgo/secp256k1": "^1.5.0",
44-
"@bitgo/statics": "^57.8.0",
44+
"@bitgo/statics": "^58.0.0",
4545
"@cosmjs/amino": "^0.29.5",
4646
"@cosmjs/crypto": "^0.30.1",
4747
"@cosmjs/encoding": "^0.29.5",

modules/abstract-eth/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
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+
# [24.13.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-09-25)
7+
8+
### Bug Fixes
9+
10+
- **abstract-eth:** follow up updates from PR 6882 ([36a87de](https://github.com/BitGo/BitGoJS/commit/36a87de002c6b6ab8c72429b186c0660ccc88e92))
11+
12+
### Features
13+
14+
- **abstract-eth:** add flush token support for ERC721 and ERC1155 ([5d4fa35](https://github.com/BitGo/BitGoJS/commit/5d4fa353088b2bd99ed5e6423bf17d3e1c300e35))
15+
- configure learn to skip git operations ([ee3a622](https://github.com/BitGo/BitGoJS/commit/ee3a6220496476aa7f4545b5f4a9a3bf97d9bdb9))
16+
617
# [24.12.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-09-03)
718

819
### Bug Fixes

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": "24.12.0",
3+
"version": "24.13.0",
44
"description": "BitGo SDK coin library for ETH base implementation",
55
"main": "./dist/src/index.js",
66
"types": "./dist/src/index.d.ts",
@@ -40,10 +40,10 @@
4040
]
4141
},
4242
"dependencies": {
43-
"@bitgo/sdk-core": "^36.8.0",
43+
"@bitgo/sdk-core": "^36.9.0",
4444
"@bitgo/sdk-lib-mpc": "^10.7.0",
4545
"@bitgo/secp256k1": "^1.5.0",
46-
"@bitgo/statics": "^57.8.0",
46+
"@bitgo/statics": "^58.0.0",
4747
"@ethereumjs/common": "^2.6.5",
4848
"@ethereumjs/rlp": "^4.0.0",
4949
"@ethereumjs/tx": "^3.3.0",
@@ -60,8 +60,8 @@
6060
"superagent": "^9.0.1"
6161
},
6262
"devDependencies": {
63-
"@bitgo/sdk-api": "^1.68.3",
64-
"@bitgo/sdk-test": "^9.0.9",
63+
"@bitgo/sdk-api": "^1.69.0",
64+
"@bitgo/sdk-test": "^9.1.0",
6565
"@types/keccak": "^3.0.5"
6666
},
6767
"gitHead": "18e460ddf02de2dbf13c2aa243478188fb539f0c"

modules/abstract-eth/src/ethLikeToken.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ export class EthLikeToken extends AbstractEthLikeNewCoins {
4343
static createTokenConstructors(
4444
coinNames: CoinNames,
4545
tokenConfigs: EthLikeTokenConfig[] = [
46-
...tokens.bitcoin[coinNames.Mainnet].tokens,
47-
...tokens.testnet[coinNames.Mainnet].tokens,
46+
...(tokens.bitcoin[coinNames.Mainnet]?.tokens || []),
47+
...(tokens.testnet[coinNames.Mainnet]?.tokens || []),
4848
]
4949
): NamedCoinConstructor[] {
5050
const tokensCtors: NamedCoinConstructor[] = [];

modules/abstract-eth/src/lib/transactionBuilder.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import { Transaction } from './transaction';
4949
import { TransferBuilder } from './transferBuilder';
5050

5151
const DEFAULT_M = 3;
52+
const RAW_TX_HEX_REGEX = /^(0x)?[0-9a-f]{1,}$/;
5253

5354
/**
5455
* EthereumLike transaction builder.
@@ -165,7 +166,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
165166
/** @inheritdoc */
166167
protected fromImplementation(rawTransaction: string, isFirstSigner?: boolean): Transaction {
167168
let tx: Transaction;
168-
if (/^0x?[0-9a-f]{1,}$/.test(rawTransaction.toLowerCase())) {
169+
if (RAW_TX_HEX_REGEX.test(rawTransaction.toLowerCase())) {
169170
tx = Transaction.fromSerialized(this._coinConfig, this._common, rawTransaction, isFirstSigner);
170171
this.loadBuilderInput(tx.toJson(), isFirstSigner);
171172
} else {
@@ -343,7 +344,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
343344
throw new InvalidTransactionError('Raw transaction is empty');
344345
}
345346
if (typeof rawTransaction === 'string') {
346-
if (/^0x?[0-9a-f]{1,}$/.test(rawTransaction.toLowerCase())) {
347+
if (RAW_TX_HEX_REGEX.test(rawTransaction.toLowerCase())) {
347348
const txBytes = ethUtil.toBuffer(ethUtil.addHexPrefix(rawTransaction.toLowerCase()));
348349
if (!this.isEip1559Txn(txBytes) && !this.isRLPDecodable(txBytes)) {
349350
throw new ParseTransactionError('There was error in decoding the hex string');

0 commit comments

Comments
 (0)