Skip to content

Commit fbe912a

Browse files
committed
update version
1 parent 9767d5e commit fbe912a

File tree

12 files changed

+109
-60
lines changed

12 files changed

+109
-60
lines changed

.github/workflows/benchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
- name: Install Nargo
2121
uses: noir-lang/[email protected]
2222
with:
23-
toolchain: 1.0.0-beta.17
23+
toolchain: 1.0.0-beta.18
2424

2525
- name: Install bb
2626
run: |
2727
curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/refs/heads/next/barretenberg/bbup/install | bash
28-
~/.bb/bbup -nv 1.0.0-beta.17
28+
~/.bb/bbup -nv 1.0.0-beta.18
2929
sudo apt install libc++-dev
3030
3131
- name: Build Noir benchmark programs

.github/workflows/circuits_e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install Nargo
3434
uses: noir-lang/[email protected]
3535
with:
36-
toolchain: 1.0.0-beta.17
36+
toolchain: 1.0.0-beta.18
3737

3838
- name: Install Barretenberg
3939
run: |

.github/workflows/circuits_profile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Nargo
1818
uses: noir-lang/[email protected]
1919
with:
20-
toolchain: 1.0.0-beta.17
20+
toolchain: 1.0.0-beta.18
2121

2222
- name: Run nargo info
2323
run: nargo info --workspace --silence-warnings | tee profiling_info.txt

.github/workflows/contract_test.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,20 @@ jobs:
2929
- name: Install Nargo
3030
uses: noir-lang/[email protected]
3131
with:
32-
toolchain: 1.0.0-beta.17
33-
34-
- name: Run nargo codegen-verifier
35-
run: |
36-
nargo codegen-verifier --package get_storage
37-
nargo codegen-verifier --package get_account
38-
nargo codegen-verifier --package get_header
39-
nargo codegen-verifier --package get_receipt
40-
nargo codegen-verifier --package get_transaction
41-
nargo codegen-verifier --package get_log
32+
toolchain: 1.0.0-beta.18
33+
34+
# Note: Solidity verifier generation is not yet supported for UltraHonk in Nargo 1.0+
35+
# Using pre-generated verifier contracts committed to the repository
36+
# TODO: Re-enable when bb write_solidity_verifier supports Honk
37+
# - name: Generate Verifier Contracts
38+
# run: |
39+
# nargo compile --workspace
40+
# bb write_solidity_verifier -k ./target/get_storage/vk/vk -o ./contract/get_storage/plonk_vk.sol
41+
# bb write_solidity_verifier -k ./target/get_account/vk/vk -o ./contract/get_account/plonk_vk.sol
42+
# bb write_solidity_verifier -k ./target/get_header/vk/vk -o ./contract/get_header/plonk_vk.sol
43+
# bb write_solidity_verifier -k ./target/get_receipt/vk/vk -o ./contract/get_receipt/plonk_vk.sol
44+
# bb write_solidity_verifier -k ./target/get_transaction/vk/vk -o ./contract/get_transaction/plonk_vk.sol
45+
# bb write_solidity_verifier -k ./target/get_log/vk/vk -o ./contract/get_log/plonk_vk.sol
4246

4347
- name: Run Forge build
4448
run: |

.github/workflows/e2e_test.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install Nargo
3535
uses: noir-lang/[email protected]
3636
with:
37-
toolchain: 1.0.0-beta.17
37+
toolchain: 1.0.0-beta.18
3838

3939
- name: Compile Circuit
4040
run: nargo compile --workspace
@@ -55,14 +55,17 @@ jobs:
5555
nargo prove --package get_transaction --oracle-resolver=http://localhost:5555
5656
nargo prove --package get_log --oracle-resolver=http://localhost:5555
5757
58-
- name: Run nargo codegen-verifier
59-
run: |
60-
nargo codegen-verifier --package get_header
61-
nargo codegen-verifier --package get_account
62-
nargo codegen-verifier --package get_storage
63-
nargo codegen-verifier --package get_receipt
64-
nargo codegen-verifier --package get_transaction
65-
nargo codegen-verifier --package get_log
58+
# Note: Solidity verifier generation is not yet supported for UltraHonk in Nargo 1.0+
59+
# Using pre-generated verifier contracts committed to the repository
60+
# TODO: Re-enable when bb write_solidity_verifier supports Honk
61+
# - name: Generate Verifier Contracts
62+
# run: |
63+
# bb write_solidity_verifier -k ./target/get_header/vk/vk -o ./contract/get_header/plonk_vk.sol
64+
# bb write_solidity_verifier -k ./target/get_account/vk/vk -o ./contract/get_account/plonk_vk.sol
65+
# bb write_solidity_verifier -k ./target/get_storage/vk/vk -o ./contract/get_storage/plonk_vk.sol
66+
# bb write_solidity_verifier -k ./target/get_receipt/vk/vk -o ./contract/get_receipt/plonk_vk.sol
67+
# bb write_solidity_verifier -k ./target/get_transaction/vk/vk -o ./contract/get_transaction/plonk_vk.sol
68+
# bb write_solidity_verifier -k ./target/get_log/vk/vk -o ./contract/get_log/plonk_vk.sol
6669

6770
- name: Install Foundry
6871
uses: foundry-rs/foundry-toolchain@v1

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
CARGO_TERM_COLOR: always
11-
MINIMUM_NOIR_VERSION: 1.0.0-beta.17
11+
MINIMUM_NOIR_VERSION: 1.0.0-beta.18
1212

1313
jobs:
1414
noir-version-list:

.pnp.cjs

Lines changed: 36 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ethereum/oracles/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
"dependencies": {
2626
"@ethereumjs/trie": "^6.2.0",
2727
"@iarna/toml": "^2.2.5",
28-
"@noir-lang/backend_barretenberg": "0.30.0",
29-
"@noir-lang/noir_js": "0.30.0",
30-
"@noir-lang/noirc_abi": "0.30.0",
28+
"@noir-lang/noir_js": "1.0.0-beta.18",
29+
"@noir-lang/noirc_abi": "1.0.0-beta.18",
3130
"dotenv": "^16.4.5",
3231
"execa": "^9.0.2",
3332
"fastify": "^4.26.2",

ethereum/oracles/src/noir/circuit/abi.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ describe('abi', () => {
1010
const privateParam = { name: 'b', type, visibility: 'private' } as const;
1111
const abi: Abi = {
1212
parameters: [publicParam, privateParam],
13-
param_witnesses: {},
1413
return_type: null,
15-
return_witnesses: [],
1614
error_types: {}
1715
};
1816

ethereum/oracles/src/noir/circuit/abi.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ export function publicInputs(abi: Abi): Abi {
1111
export function returnValues(abi: Abi): Abi {
1212
return {
1313
parameters: [],
14-
param_witnesses: {},
1514
error_types: {},
16-
return_type: abi.return_type,
17-
return_witnesses: abi.return_witnesses
15+
return_type: abi.return_type
1816
};
1917
}

0 commit comments

Comments
 (0)