Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
697 changes: 190 additions & 507 deletions avm-transpiler/Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion avm-transpiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crate-type = ["staticlib", "rlib"]
[dependencies]
# local
acvm = { path = "../noir/noir-repo/acvm-repo/acvm", features = ["bn254"] }
noirc_errors = { path = "../noir/noir-repo/compiler/noirc_errors" }
noirc_abi = { path = "../noir/noir-repo/tooling/noirc_abi" }
noirc_artifacts = { path = "../noir/noir-repo/tooling/noirc_artifacts" }
noirc_evaluator = { path = "../noir/noir-repo/compiler/noirc_evaluator", features = ["bn254"] }
noirc_frontend = { path = "../noir/noir-repo/compiler/noirc_frontend", features = ["test_utils"] }

Expand Down
2 changes: 1 addition & 1 deletion avm-transpiler/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use base64 as _;
use fxhash as _;
use libc as _;
use noirc_abi as _;
use noirc_errors as _;
use noirc_artifacts as _;
use noirc_evaluator as _;
use noirc_frontend as _;
use once_cell as _;
Expand Down
2 changes: 1 addition & 1 deletion avm-transpiler/src/transpile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use acvm::acir::circuit::BrilligOpcodeLocation;
use acvm::brillig_vm::brillig::{
BinaryFieldOp, BinaryIntOp, BlackBoxOp, HeapArray, HeapVector, MemoryAddress, ValueOrArray,
};
use noirc_errors::debug_info::DebugInfo;
use noirc_artifacts::debug::DebugInfo;

use crate::bit_traits::{BitsQueryable, bits_needed_for};
use crate::instructions::{AddressingModeBuilder, AvmInstruction, AvmOperand, AvmTypeTag};
Expand Down
2 changes: 1 addition & 1 deletion avm-transpiler/src/transpile_contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};

use acvm::acir::circuit::Program;
use noirc_abi::{Abi, AbiErrorType, AbiParameter, AbiType};
use noirc_errors::debug_info::{DebugInfo, ProgramDebugInfo};
use noirc_artifacts::debug::{DebugInfo, ProgramDebugInfo};
use noirc_evaluator::ErrorType;

use crate::instructions::{AvmInstruction, AvmOperand, AvmTypeTag};
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/acir_tests/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function test_cmds {
local sol_prefix="$tests_hash:ISOLATE=1"
# Solidity tests. Isolate because anvil.
# Test the solidity verifier with and without zk
for t in assert_statement a_1_mul slices verify_honk_proof; do
for t in assert_statement a_1_mul vectors verify_honk_proof; do
echo "$sol_prefix $scripts/bb_prove_sol_verify.sh $t --disable_zk"
echo "$sol_prefix $scripts/bb_prove_sol_verify.sh $t"
echo "$sol_prefix USE_OPTIMIZED_CONTRACT=true $scripts/bb_prove_sol_verify.sh $t --disable_zk"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ impl PublicContext {
T: Serialize,
{
// Safety: AVM opcodes are constrained by the AVM itself
unsafe { emit_public_log(Serialize::serialize(log).as_slice()) };
unsafe { emit_public_log(Serialize::serialize(log).as_vector()) };
}

/// Checks if a given note hash exists in the note hash tree at a particular
Expand Down
2 changes: 1 addition & 1 deletion noir-projects/aztec-nr/aztec/src/macros/dispatch.nr
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pub comptime fn generate_public_dispatch(m: Module) -> Quoted {
} else {
quote {
let return_value = dep::aztec::protocol_types::traits::Serialize::serialize($call);
dep::aztec::context::public_context::avm_return(return_value.as_slice());
dep::aztec::context::public_context::avm_return(return_value.as_vector());
}
};

Expand Down
2 changes: 1 addition & 1 deletion noir-projects/aztec-nr/aztec/src/macros/utils.nr
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ impl AsStrQuote for Quoted {
let token_as_fmt_str = f"{token}";
let token_as_str = unquote!(quote {$token_as_fmt_str});
let token_len = unquote!(quote { $token_as_str.as_bytes().len() });
let token_as_bytes = unquote!(quote { $token_as_str.as_bytes().as_slice() });
let token_as_bytes = unquote!(quote { $token_as_str.as_bytes().as_vector() });
total_len += token_len;
acc = acc.append(token_as_bytes);
}
Expand Down
1 change: 0 additions & 1 deletion noir/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export js_include=$(printf " --include %s" $js_projects)
export GIT_COMMIT=$noir_commit
export SOURCE_DATE_EPOCH=0
export GIT_DIRTY=false
export RUSTFLAGS="-Dwarnings"

# Builds nargo, acvm and profiler binaries.
function build_native {
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo
Submodule noir-repo updated 1118 files
4 changes: 2 additions & 2 deletions yarn-project/simulator/src/public/fixtures/bulk_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export async function megaBulkTest(
const argsField2 = [5, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
const argsField3 = [7, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
const argsField4 = [9, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
const argsField5 = [11, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
//const argsField5 = [11, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
//const argsField6 = [13, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
//const argsField7 = [15, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
//const argsField8 = [17, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
Expand All @@ -144,7 +144,7 @@ export async function megaBulkTest(
{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField2) },
{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField3) },
{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField4) },
{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField5) },
//{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField5) },
//{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField6) },
//{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField7) },
//{ address: avmTestContract.address, fnName: 'bulk_testing', args: genArgs(argsField8) },
Expand Down
16 changes: 8 additions & 8 deletions yarn-project/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@aztec/noir-noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A."
dependencies:
"@aztec/noir-types": "npm:1.0.0-beta.16"
"@aztec/noir-types": "npm:1.0.0-beta.17"
glob: "npm:^11.0.3"
ts-command-line-args: "npm:^2.5.1"
bin:
Expand All @@ -1693,22 +1693,22 @@ __metadata:
linkType: soft

"@aztec/noir-noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
version: 1.0.0-beta.16
resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=830e3b&locator=%40aztec%2Faztec3-packages%40workspace%3A."
version: 1.0.0-beta.17
resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=4af4ac&locator=%40aztec%2Faztec3-packages%40workspace%3A."
dependencies:
"@aztec/noir-acvm_js": "npm:1.0.0-beta.16"
"@aztec/noir-noirc_abi": "npm:1.0.0-beta.16"
"@aztec/noir-types": "npm:1.0.0-beta.16"
"@aztec/noir-acvm_js": "npm:1.0.0-beta.17"
"@aztec/noir-noirc_abi": "npm:1.0.0-beta.17"
"@aztec/noir-types": "npm:1.0.0-beta.17"
pako: "npm:^2.1.0"
checksum: 10/182180ebdc374167e4d1758ff9155b501c658cea9b1aea85b31b7285f8de445cc86071eb47cc72e8bea59d4eecfe500542d72921da74e02d422760a4071fb37c
checksum: 10/85478451e01ae0b9cb05bfc6314b3592fd39ad232b60bbb045078a2f965c9aa344b51ad75d5d47789b47f6623c50567d2ffb1b30b5b8faa3748089ad965cf32b
languageName: node
linkType: hard

"@aztec/noir-noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
version: 0.0.0-use.local
resolution: "@aztec/noir-noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A."
dependencies:
"@aztec/noir-types": "npm:1.0.0-beta.16"
"@aztec/noir-types": "npm:1.0.0-beta.17"
languageName: node
linkType: soft

Expand Down
Loading