Skip to content

Commit dc5e272

Browse files
JoeCap08055JoeCap08055
committed
fix: merge from main
2 parents a504353 + 8cccb13 commit dc5e272

Some content is hidden

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

60 files changed

+8071
-1197
lines changed

‎.github/workflows/benchmarks-run.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository == 'frequency-chain/frequency'
2121
name: Build Benchmark Binary
2222
runs-on: ubicloud-standard-16
23-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
23+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
2424
permissions:
2525
contents: read
2626
steps:
@@ -117,7 +117,7 @@ jobs:
117117
name: Post Benchmark Tests
118118
needs: run-benchmarks
119119
runs-on: ubicloud-standard-16
120-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
120+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
121121
permissions:
122122
contents: read
123123
steps:

‎.github/workflows/check-migrations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Check Migrations on Paseo
1717
continue-on-error: false
1818
runs-on: ubicloud-standard-8
19-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
19+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
2020
steps:
2121
- name: Checkout sources
2222
uses: actions/checkout@v4

‎.github/workflows/e2e-testnet.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ on:
1010
release-version:
1111
description: "Test Release version (v#.#.#[-rc#])"
1212
required: true
13+
ethereum-utils-version:
14+
description: "Ethereum utils version to use (v#.#.#[-rc#])"
15+
required: true
1316

1417
env:
1518
TAG_FROM_UI: ${{github.event.inputs.release-version}}
19+
ETHEREUM_UTILS_FROM_UI: ${{github.event.inputs.ethereum-utils-version}}
1620

1721
# Set default permissions as restrictive
1822
permissions:
@@ -29,10 +33,12 @@ jobs:
2933
shell: bash
3034
run: |
3135
version=${{env.TAG_FROM_UI}}
36+
ethereum_utils_version=${{env.ETHEREUM_UTILS_FROM_UI}}
3237
echo "Release version entered in UI: $version"
38+
echo "Ethereum utils version entered in UI: $ethereum_utils_version"
3339
regex='^v([0-9]+)\.(0|([1-9][0-9]*))\.(0|([1-9][0-9]*))(-rc[1-9][0-9]*)?$'
34-
if [[ ! $version =~ $regex ]]; then
35-
echo "ERROR: Entered version $version is not valid."
40+
if [[ ! $version =~ $regex ]] || [[ ! $ethereum_utils_version =~ $regex ]]; then
41+
echo "ERROR: Entered version $version or ethereum_version $ethereum_utils_version is not valid."
3642
echo "Please use v#.#.#[-rc#] format."
3743
exit 1
3844
fi
@@ -44,14 +50,15 @@ jobs:
4450
- name: Set Env Vars
4551
run: |
4652
echo "API_AUGMENT_VERSION=$(echo ${{ env.TAG_FROM_UI }} | sed 's/^v//')" >> $GITHUB_ENV
53+
echo "ETHEREUM_UTILS_VERSION=$(echo ${{ env.ETHEREUM_UTILS_FROM_UI }} | sed 's/^v//')" >> $GITHUB_ENV
4754
- name: Set up NodeJs
4855
uses: actions/setup-node@v4
4956
with:
5057
node-version: 22
5158
cache: "npm"
5259
cache-dependency-path: e2e/package-lock.json
5360
- name: Install Built api-augment
54-
run: npm install @frequency-chain/api-augment@${{ env.API_AUGMENT_VERSION }}
61+
run: npm install @frequency-chain/api-augment@${{ env.API_AUGMENT_VERSION }} @frequency-chain/ethereum-utils@${{ env.ETHEREUM_UTILS_VERSION }}
5562
working-directory: e2e
5663
- name: Fund e2e Tests
5764
working-directory: e2e
@@ -87,14 +94,15 @@ jobs:
8794
- name: Set Env Vars
8895
run: |
8996
echo "API_AUGMENT_VERSION=$(echo ${{ env.TAG_FROM_UI }} | sed 's/^v//')" >> $GITHUB_ENV
97+
echo "ETHEREUM_UTILS_VERSION=$(echo ${{ env.ETHEREUM_UTILS_FROM_UI }} | sed 's/^v//')" >> $GITHUB_ENV
9098
- name: Set up NodeJs
9199
uses: actions/setup-node@v4
92100
with:
93101
node-version: 22
94102
cache: "npm"
95103
cache-dependency-path: e2e/package-lock.json
96104
- name: Install Built api-augment
97-
run: npm install @frequency-chain/api-augment@${{ env.API_AUGMENT_VERSION }}
105+
run: npm install @frequency-chain/api-augment@${{ env.API_AUGMENT_VERSION }} @frequency-chain/ethereum-utils@${{ env.ETHEREUM_UTILS_VERSION }}
98106
working-directory: e2e
99107
- name: E2E Test - ${{ matrix.test-file }}
100108
working-directory: e2e

‎.github/workflows/merge-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
publish-js-api-augment-rc:
1717
name: Merge - Publish JS API Augment Release Candidate
1818
runs-on: ubicloud-standard-4
19-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
19+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
2020
steps:
2121
- name: Check Out Repo
2222
uses: actions/checkout@v4
@@ -53,7 +53,7 @@ jobs:
5353
calc-code-coverage:
5454
name: Merge - Calculate Code Coverage
5555
runs-on: ubicloud-standard-30
56-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
56+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
5757
steps:
5858
- name: Check Out Repo
5959
uses: actions/checkout@v4

‎.github/workflows/release.yml

Lines changed: 83 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
needs: create-release-branch
7676
name: Run All Benchmarks - Build
7777
runs-on: ubicloud-standard-16
78-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
78+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
7979
permissions:
8080
contents: read
8181
steps:
@@ -154,7 +154,7 @@ jobs:
154154
needs: run-all-benchmarks-bench
155155
name: Run All Benchmarks - Test
156156
runs-on: ubicloud-standard-16
157-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
157+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
158158
steps:
159159
- name: Check Out Repo
160160
uses: actions/checkout@v4
@@ -233,7 +233,7 @@ jobs:
233233
- arch: arm64
234234
runner: ubicloud-standard-16-arm
235235
runs-on: ${{matrix.runner}}
236-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
236+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
237237
env:
238238
SIGNING_SUBKEY_FINGERPRINT: B6327D1474C6392032870E8EFA4FD1E73A0FE707
239239
steps:
@@ -394,7 +394,7 @@ jobs:
394394
needs: version-code
395395
name: Build Rust Developer Docs
396396
runs-on: ubicloud-standard-4
397-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
397+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
398398
steps:
399399
- name: Check Out Repo
400400
uses: actions/checkout@v4
@@ -427,7 +427,7 @@ jobs:
427427
RELEASE_FILENAME_PREFIX: frequency-local
428428
ARCH: amd64
429429
runs-on: ubuntu-24.04
430-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
430+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
431431
steps:
432432
- name: Set Env Vars
433433
run: |
@@ -476,10 +476,39 @@ jobs:
476476
path: js/api-augment/dist
477477
if-no-files-found: error
478478

479+
build-js-ethereum-utils:
480+
name: Build JS Ethereum utils
481+
runs-on: ubuntu-24.04
482+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.5
483+
steps:
484+
- name: Check Out Repo
485+
uses: actions/checkout@v4
486+
with:
487+
ref: ${{env.RELEASE_BRANCH_NAME}}
488+
- name: Set up NodeJs
489+
uses: actions/setup-node@v4
490+
with:
491+
node-version: 20
492+
cache: "npm"
493+
registry-url: "https://registry.npmjs.org"
494+
cache-dependency-path: js/ethereum-utils/package-lock.json
495+
- name: Install
496+
run: npm ci
497+
working-directory: js/ethereum-utils
498+
- name: Build
499+
run: npm run build
500+
working-directory: js/ethereum-utils
501+
- name: Upload Dist Dir
502+
uses: actions/upload-artifact@v4
503+
with:
504+
name: js-ethereum-utils-${{github.run_id}}
505+
path: js/ethereum-utils/dist
506+
if-no-files-found: error
507+
479508
build-js-schemas:
480509
name: Build JS Schemas
481510
runs-on: ubuntu-24.04
482-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
511+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
483512
steps:
484513
- name: Check Out Repo
485514
uses: actions/checkout@v4
@@ -705,6 +734,7 @@ jobs:
705734
test-version-matches-release,
706735
build-rust-developer-docs,
707736
build-js-api-augment,
737+
build-js-ethereum-utils,
708738
build-js-schemas,
709739
]
710740
name: Wait for All Builds to Finish
@@ -721,7 +751,7 @@ jobs:
721751
needs: wait-for-all-builds
722752
name: Release Built Artifacts
723753
runs-on: ubuntu-24.04
724-
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.6
754+
container: ghcr.io/frequency-chain/frequency/ci-base-image:1.5.7
725755
permissions:
726756
contents: write
727757
steps:
@@ -1205,6 +1235,52 @@ jobs:
12051235
env:
12061236
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
12071237

1238+
release-js-ethereum-utils:
1239+
needs: wait-for-all-builds
1240+
name: Release JS Ethereum utils
1241+
runs-on: ubuntu-24.04
1242+
steps:
1243+
- name: Check Out Repo
1244+
uses: actions/checkout@v4
1245+
with:
1246+
ref: ${{env.RELEASE_BRANCH_NAME}}
1247+
- name: Full Release?
1248+
id: is-full-release
1249+
uses: ./.github/workflows/common/is-full-release
1250+
with:
1251+
version-tag: ${{env.NEW_RELEASE_TAG}}
1252+
- name: Set up NodeJs
1253+
uses: actions/setup-node@v4
1254+
with:
1255+
node-version: 20
1256+
cache: "npm"
1257+
registry-url: "https://registry.npmjs.org"
1258+
cache-dependency-path: js/ethereum-utils/package-lock.json
1259+
- name: Download Dist Dir
1260+
id: download
1261+
uses: actions/download-artifact@v4
1262+
with:
1263+
name: js-ethereum-utils-${{github.run_id}}
1264+
path: js/ethereum-utils/dist
1265+
- name: Version Package
1266+
if: env.TEST_RUN != 'true'
1267+
run: npm version --new-version "${{env.NEW_RELEASE_TAG}}" --no-git-tag-version
1268+
working-directory: js/ethereum-utils/dist
1269+
- name: Release on NPM @latest
1270+
if: env.TEST_RUN != 'true' &&
1271+
steps.is-full-release.outputs.is-full-release == 'true'
1272+
run: npm publish --tag latest --access public
1273+
working-directory: ./js/ethereum-utils/dist
1274+
env:
1275+
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
1276+
- name: Release Candidate on NPM
1277+
if: env.TEST_RUN != 'true' &&
1278+
steps.is-full-release.outputs.is-full-release != 'true'
1279+
run: npm publish --tag next --access public
1280+
working-directory: ./js/ethereum-utils/dist
1281+
env:
1282+
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
1283+
12081284
release-js-schemas:
12091285
needs: wait-for-all-builds
12101286
name: Release JS Schemas

0 commit comments

Comments
 (0)