Skip to content

Commit 19e2abb

Browse files
aditya-bitgoaditya-bitgo
committed
Merge remote-tracking branch 'origin/master' into SI-361
TICKET: SI-361
2 parents f833b28 + eb28af8 commit 19e2abb

42 files changed

Lines changed: 1548 additions & 121 deletions

File tree

Some content is hidden

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

‎.github/workflows/audit-api-spec.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: yq -P < openapi.json > openapi-head.yaml
5757

5858
- name: Upload API spec to artifact
59-
uses: actions/upload-artifact@v6
59+
uses: actions/upload-artifact@v7
6060
with:
6161
name: openapi-head.yaml
6262
path: openapi-head.yaml
@@ -116,7 +116,7 @@ jobs:
116116
run: yq -P < openapi.json > openapi-merge-base.yaml
117117

118118
- name: Upload API spec to artifact
119-
uses: actions/upload-artifact@v6
119+
uses: actions/upload-artifact@v7
120120
with:
121121
name: openapi-merge-base.yaml
122122
path: openapi-merge-base.yaml
@@ -129,12 +129,12 @@ jobs:
129129
specs-identical: ${{ steps.check-specs-identical.outputs.identical }}
130130
steps:
131131
- name: Download head API spec artifact
132-
uses: actions/download-artifact@v7
132+
uses: actions/download-artifact@v8
133133
with:
134134
name: openapi-head.yaml
135135

136136
- name: Download merge base API spec artifact
137-
uses: actions/download-artifact@v7
137+
uses: actions/download-artifact@v8
138138
with:
139139
name: openapi-merge-base.yaml
140140

@@ -161,7 +161,7 @@ jobs:
161161
ref: ${{ github.event.pull_request.head.sha }}
162162

163163
- name: Download head API spec artifact
164-
uses: actions/download-artifact@v7
164+
uses: actions/download-artifact@v8
165165
with:
166166
name: openapi-head.yaml
167167

@@ -210,12 +210,12 @@ jobs:
210210
runs-on: ubuntu-latest
211211
steps:
212212
- name: Download head API spec artifact
213-
uses: actions/download-artifact@v7
213+
uses: actions/download-artifact@v8
214214
with:
215215
name: openapi-head.yaml
216216

217217
- name: Download merge base API spec artifact
218-
uses: actions/download-artifact@v7
218+
uses: actions/download-artifact@v8
219219
with:
220220
name: openapi-merge-base.yaml
221221

@@ -334,4 +334,4 @@ jobs:
334334
exit 1
335335
fi
336336
- name: Verify API Spec Check Passed
337-
run: echo "✅ All API specification checks passed successfully!"
337+
run: echo "✅ All API specification checks passed successfully!"

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
with:
3232
mode: firewall-free
3333

34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@v6
3535
with:
3636
ref: ${{ github.event.pull_request.head.sha }}
3737
fetch-depth: 0
3838

3939
- name: Setup node:${{ matrix.node-version }}
40-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
40+
uses: actions/setup-node@v6
4141
with:
4242
node-version: ${{ matrix.node-version }}
4343

@@ -56,7 +56,7 @@ jobs:
5656
5757
- name: restore lerna dependencies
5858
id: lerna-cache
59-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 #v4.2.3
59+
uses: actions/cache@v5
6060
with:
6161
path: |
6262
node_modules
@@ -101,18 +101,18 @@ jobs:
101101
with:
102102
mode: firewall-free
103103

104-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
104+
- uses: actions/checkout@v6
105105
with:
106106
ref: ${{ github.event.pull_request.head.sha }}
107107

108108
- name: Setup node 20
109-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
109+
uses: actions/setup-node@v6
110110
with:
111111
node-version: 20
112112

113113
- name: restore lerna dependencies
114114
id: lerna-cache
115-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 #v4.2.3
115+
uses: actions/cache@v5
116116
with:
117117
path: |
118118
node_modules
@@ -152,12 +152,12 @@ jobs:
152152
with:
153153
mode: firewall-free
154154

155-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
155+
- uses: actions/checkout@v6
156156
with:
157157
ref: ${{ github.event.pull_request.head.sha }}
158158

159159
- name: Setup node 20
160-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
160+
uses: actions/setup-node@v6
161161
with:
162162
node-version: 20 # this just needs to pass our lock file requirement for compilation
163163

@@ -216,7 +216,7 @@ jobs:
216216
217217
- name: restore lerna dependencies
218218
id: lerna-cache
219-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 #v4.2.3
219+
uses: actions/cache@v5
220220
with:
221221
path: |
222222
node_modules
@@ -244,7 +244,7 @@ jobs:
244244
runs-on: ubuntu-latest
245245

246246
steps:
247-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
247+
- uses: actions/checkout@v6
248248
with:
249249
ref: ${{ github.event.pull_request.head.sha }}
250250

@@ -316,7 +316,7 @@ jobs:
316316
runs-on: ubuntu-latest
317317

318318
steps:
319-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
319+
- uses: actions/checkout@v6
320320
with:
321321
ref: ${{ github.event.pull_request.head.sha }}
322322

@@ -327,7 +327,7 @@ jobs:
327327
runs-on: ubuntu-latest
328328

329329
steps:
330-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
330+
- uses: actions/checkout@v6
331331
with:
332332
ref: ${{ github.event.pull_request.head.sha }}
333333

@@ -342,18 +342,18 @@ jobs:
342342
with:
343343
mode: firewall-free
344344

345-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
345+
- uses: actions/checkout@v6
346346
with:
347347
ref: ${{ github.event.pull_request.head.sha }}
348348

349349
- name: Setup node 22
350-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
350+
uses: actions/setup-node@v6
351351
with:
352352
node-version: 22
353353

354354
- name: restore lerna dependencies
355355
id: lerna-cache
356-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 #v4.2.3
356+
uses: actions/cache@v5
357357
with:
358358
path: |
359359
node_modules

‎.github/workflows/claude-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030

3131
- name: Configure AWS Credentials (OIDC)
3232
uses: aws-actions/configure-aws-credentials@v5

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
mode: firewall-free
2727

2828
- name: Checkout repository
29-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
29+
uses: actions/checkout@v6
3030

3131
- name: Setup Node
32-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
32+
uses: actions/setup-node@v6
3333
with:
3434
node-version-file: .nvmrc
3535

‎Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ COPY --from=builder /tmp/bitgo/modules/bitgo /var/modules/bitgo/
5656
COPY --from=builder /tmp/bitgo/modules/abstract-utxo /var/modules/abstract-utxo/
5757
COPY --from=builder /tmp/bitgo/modules/blockapis /var/modules/blockapis/
5858
COPY --from=builder /tmp/bitgo/modules/sdk-api /var/modules/sdk-api/
59+
COPY --from=builder /tmp/bitgo/modules/argon2 /var/modules/argon2/
5960
COPY --from=builder /tmp/bitgo/modules/sdk-hmac /var/modules/sdk-hmac/
6061
COPY --from=builder /tmp/bitgo/modules/unspents /var/modules/unspents/
6162
COPY --from=builder /tmp/bitgo/modules/utxo-core /var/modules/utxo-core/
@@ -156,6 +157,7 @@ cd /var/modules/bitgo && yarn link && \
156157
cd /var/modules/abstract-utxo && yarn link && \
157158
cd /var/modules/blockapis && yarn link && \
158159
cd /var/modules/sdk-api && yarn link && \
160+
cd /var/modules/argon2 && yarn link && \
159161
cd /var/modules/sdk-hmac && yarn link && \
160162
cd /var/modules/unspents && yarn link && \
161163
cd /var/modules/utxo-core && yarn link && \
@@ -259,6 +261,7 @@ RUN cd /var/bitgo-express && \
259261
yarn link @bitgo/abstract-utxo && \
260262
yarn link @bitgo/blockapis && \
261263
yarn link @bitgo/sdk-api && \
264+
yarn link @bitgo/argon2 && \
262265
yarn link @bitgo/sdk-hmac && \
263266
yarn link @bitgo/unspents && \
264267
yarn link @bitgo/utxo-core && \

‎examples/ts/http-proxy/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ basic-auth-parser@0.0.2-1:
189189
integrity sha512-GFj8iVxo9onSU6BnnQvVwqvxh60UcSHJEDnIk3z4B6iOjsKSmqe+ibW0Rsz7YO7IE1HG3D3tqCNIidP46SZVdQ==
190190

191191
basic-ftp@^5.0.2:
192-
version "5.2.2"
193-
resolved "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.2.2.tgz#4cb2422deddf432896bdb3c9b8f13b944ad4842c"
194-
integrity sha512-1tDrzKsdCg70WGvbFss/ulVAxupNauGnOlgpyjKzeQxzyllBLS0CGLV7tjIXTK3ZQA9/FBEm9qyFFN1bciA6pw==
192+
version "5.3.0"
193+
resolved "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.0.tgz#88f057d1ba8442643c505c4c83bbaa4442b15cfd"
194+
integrity sha512-5K9eNNn7ywHPsYnFwjKgYH8Hf8B5emh7JKcPaVjjrMJFQQwGpwowEnZNEtHs7DfR7hCZsmaK3VA4HUK0YarT+w==
195195

196196
call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
197197
version "1.0.2"

‎modules/abstract-lightning/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
]
4040
},
4141
"dependencies": {
42-
"@bitgo/public-types": "5.93.0",
42+
"@bitgo/public-types": "5.96.0",
4343
"@bitgo/sdk-core": "^36.40.0",
4444
"@bitgo/statics": "^58.35.0",
4545
"@bitgo/utxo-lib": "^11.22.0",

‎modules/argon2/index.mjs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// CJS/ESM interop: import the UMD bundle as a default and re-export named functions
2+
import argon2 from './argon2.umd.min.js';
3+
export const { argon2d, argon2i, argon2id, argon2Verify } = argon2;

‎modules/argon2/package.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44
"description": "Vendored argon2 (hash-wasm v4.12.0) for BitGo SDK",
55
"main": "argon2.umd.min.js",
66
"types": "index.d.ts",
7+
"exports": {
8+
".": {
9+
"import": "./index.mjs",
10+
"require": "./argon2.umd.min.js"
11+
}
12+
},
713
"scripts": {
814
"test": "mocha test/**/*.ts",
915
"verify": "./scripts/verify-vendor.sh"
1016
},
1117
"files": [
1218
"argon2.umd.min.js",
19+
"index.mjs",
1320
"index.d.ts",
1421
"LICENSE",
1522
"PROVENANCE.md"

‎modules/bitgo/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"superagent": "^9.0.1"
139139
},
140140
"devDependencies": {
141-
"@bitgo/public-types": "5.93.0",
141+
"@bitgo/public-types": "5.96.0",
142142
"@bitgo/sdk-opensslbytes": "^2.1.0",
143143
"@bitgo/sdk-test": "^9.1.38",
144144
"@openpgp/web-stream-tools": "0.0.14",

0 commit comments

Comments
 (0)