From 7e23dbb43d8e86e0e929424210256b3a888869fb Mon Sep 17 00:00:00 2001 From: AztecBot Date: Tue, 21 May 2024 18:55:56 +0000 Subject: [PATCH 1/4] [1 changes] fix(frontend): Call trait method with mut self from generic definition (https://github.com/noir-lang/noir/pull/5041) feat: Implement turbofish operator (https://github.com/noir-lang/noir/pull/3542) feat: add `as_witness` builtin function in order to constrain a witness to be equal to a variable (https://github.com/noir-lang/noir/pull/4641) chore(experimental): Elaborate impls & non-trait impls (https://github.com/noir-lang/noir/pull/5007) feat: add native rust implementation of schnorr signature verification (https://github.com/noir-lang/noir/pull/5053) chore: Release Noir(0.30.0) (https://github.com/noir-lang/noir/pull/4981) --- .noir-sync-commit | 2 +- .../.github/workflows/formatting.yml | 2 +- .../.github/workflows/gates_report.yml | 144 +- noir/noir-repo/.release-please-manifest.json | 4 +- noir/noir-repo/.tokeignore | 12 + noir/noir-repo/CHANGELOG.md | 42 + noir/noir-repo/Cargo.lock | 850 +----- noir/noir-repo/Cargo.toml | 16 +- noir/noir-repo/acvm-repo/CHANGELOG.md | 129 + noir/noir-repo/acvm-repo/acir/Cargo.toml | 2 +- .../acvm-repo/acir/benches/serialization.rs | 2 +- .../noir-repo/acvm-repo/acir_field/Cargo.toml | 2 +- noir/noir-repo/acvm-repo/acvm/Cargo.toml | 2 +- .../optimizers/constant_backpropagation.rs | 2 +- .../compiler/optimizers/redundant_range.rs | 2 +- noir/noir-repo/acvm-repo/acvm_js/Cargo.toml | 6 +- noir/noir-repo/acvm-repo/acvm_js/build.sh | 2 +- noir/noir-repo/acvm-repo/acvm_js/package.json | 2 +- noir/noir-repo/acvm-repo/acvm_js/src/lib.rs | 3 + .../acvm-repo/blackbox_solver/Cargo.toml | 2 +- .../bn254_blackbox_solver/Cargo.toml | 18 +- .../benches/criterion.rs | 53 +- .../src/generator/generators.rs | 184 ++ .../src/generator/hash_to_curve.rs | 135 + .../src/generator/mod.rs | 8 + .../bn254_blackbox_solver/src/lib.rs | 62 +- .../src/pedersen/commitment.rs | 76 + .../src/pedersen/hash.rs | 68 + .../bn254_blackbox_solver/src/pedersen/mod.rs | 2 + .../bn254_blackbox_solver/src/schnorr/mod.rs | 146 + .../src/wasm/acvm_backend.wasm | Bin 756082 -> 0 bytes .../src/wasm/barretenberg_structures.rs | 25 - .../bn254_blackbox_solver/src/wasm/mod.rs | 352 --- .../src/wasm/pedersen.rs | 73 - .../bn254_blackbox_solver/src/wasm/schnorr.rs | 104 - noir/noir-repo/acvm-repo/brillig/Cargo.toml | 2 +- .../noir-repo/acvm-repo/brillig_vm/Cargo.toml | 2 +- .../aztec_macros/src/transforms/functions.rs | 2 +- .../aztec_macros/src/utils/ast_utils.rs | 7 +- .../compiler/noirc_driver/src/lib.rs | 29 +- .../noirc_driver/tests/stdlib_warnings.rs | 3 +- .../src/brillig/brillig_gen/brillig_block.rs | 87 +- .../src/ssa/acir_gen/acir_ir/acir_variable.rs | 5 +- .../noirc_evaluator/src/ssa/acir_gen/mod.rs | 100 +- .../noirc_evaluator/src/ssa/ir/instruction.rs | 7 +- .../src/ssa/ir/instruction/call.rs | 1 + .../noirc_evaluator/src/ssa/opt/inlining.rs | 8 +- .../src/ssa/opt/remove_bit_shifts.rs | 11 +- .../src/ssa/opt/remove_enable_side_effects.rs | 15 +- .../src/ssa/opt/remove_if_else.rs | 3 +- .../src/ssa/ssa_gen/context.rs | 49 +- .../noirc_frontend/src/ast/expression.rs | 34 +- .../noirc_frontend/src/ast/function.rs | 9 + .../compiler/noirc_frontend/src/ast/mod.rs | 9 +- .../noirc_frontend/src/ast/statement.rs | 35 +- .../compiler/noirc_frontend/src/debug/mod.rs | 74 +- .../src/elaborator/expressions.rs | 613 ++++ .../noirc_frontend/src/elaborator/mod.rs | 1103 +++++++ .../noirc_frontend/src/elaborator/patterns.rs | 469 +++ .../noirc_frontend/src/elaborator/scope.rs | 200 ++ .../src/elaborator/statements.rs | 409 +++ .../noirc_frontend/src/elaborator/types.rs | 1438 ++++++++++ .../src/hir/comptime/hir_to_ast.rs | 10 +- .../src/hir/comptime/interpreter.rs | 66 +- .../noirc_frontend/src/hir/comptime/scan.rs | 2 +- .../noirc_frontend/src/hir/comptime/tests.rs | 13 + .../noirc_frontend/src/hir/comptime/value.rs | 15 +- .../src/hir/def_collector/dc_crate.rs | 108 +- .../src/hir/def_collector/dc_mod.rs | 17 +- .../noirc_frontend/src/hir/def_map/mod.rs | 10 +- .../src/hir/resolution/import.rs | 9 + .../src/hir/resolution/resolver.rs | 48 +- .../src/hir/type_check/errors.rs | 10 + .../noirc_frontend/src/hir/type_check/expr.rs | 92 +- .../noirc_frontend/src/hir/type_check/mod.rs | 16 +- .../noirc_frontend/src/hir_def/expr.rs | 17 +- .../noirc_frontend/src/hir_def/function.rs | 5 +- .../noirc_frontend/src/hir_def/types.rs | 47 +- .../compiler/noirc_frontend/src/lib.rs | 1 + .../src/monomorphization/mod.rs | 4 +- .../noirc_frontend/src/node_interner.rs | 10 +- .../noirc_frontend/src/parser/parser.rs | 63 +- .../src/parser/parser/primitives.rs | 15 +- .../noirc_frontend/src/resolve_locations.rs | 2 +- .../compiler/noirc_frontend/src/tests.rs | 2551 +++++++++-------- .../src/tests/name_shadowing.rs | 419 +++ noir/noir-repo/compiler/wasm/package.json | 2 +- noir/noir-repo/compiler/wasm/src/compile.rs | 21 +- .../compiler/wasm/src/compile_new.rs | 30 +- noir/noir-repo/cspell.json | 2 + .../docs/noir/concepts/data_types/integers.md | 4 +- .../docs/docs/noir/standard_library/traits.md | 33 +- .../explainers/explainer-oracle.md | 57 + .../explainers/explainer-recursion.md | 176 ++ .../getting_started/_category_.json | 5 + .../hello_noir/_category_.json | 5 + .../getting_started/hello_noir/index.md | 142 + .../hello_noir/project_breakdown.md | 199 ++ .../installation/_category_.json | 6 + .../getting_started/installation/index.md | 48 + .../installation/other_install_methods.md | 102 + .../getting_started/tooling/noir_codegen.md | 113 + .../version-v0.30.0/how_to/_category_.json | 5 + .../how_to/debugger/_category_.json | 6 + .../debugger/debugging_with_the_repl.md | 164 ++ .../how_to/debugger/debugging_with_vs_code.md | 68 + .../version-v0.30.0/how_to/how-to-oracles.md | 276 ++ .../how_to/how-to-recursion.md | 179 ++ .../how_to/how-to-solidity-verifier.md | 231 ++ .../version-v0.30.0/how_to/merkle-proof.mdx | 49 + .../how_to/using-devcontainers.mdx | 110 + .../versioned_docs/version-v0.30.0/index.mdx | 67 + .../version-v0.30.0/migration_notes.md | 105 + .../noir/concepts/_category_.json | 6 + .../version-v0.30.0/noir/concepts/assert.md | 45 + .../version-v0.30.0/noir/concepts/comments.md | 33 + .../noir/concepts/control_flow.md | 77 + .../version-v0.30.0/noir/concepts/data_bus.md | 21 + .../noir/concepts/data_types/_category_.json | 5 + .../noir/concepts/data_types/arrays.md | 251 ++ .../noir/concepts/data_types/booleans.md | 31 + .../noir/concepts/data_types/fields.md | 192 ++ .../concepts/data_types/function_types.md | 26 + .../noir/concepts/data_types/index.md | 110 + .../noir/concepts/data_types/integers.md | 157 + .../noir/concepts/data_types/references.md | 23 + .../noir/concepts/data_types/slices.mdx | 195 ++ .../noir/concepts/data_types/strings.md | 80 + .../noir/concepts/data_types/structs.md | 70 + .../noir/concepts/data_types/tuples.md | 48 + .../noir/concepts/functions.md | 226 ++ .../version-v0.30.0/noir/concepts/generics.md | 106 + .../version-v0.30.0/noir/concepts/globals.md | 72 + .../version-v0.30.0/noir/concepts/lambdas.md | 81 + .../noir/concepts/mutability.md | 121 + .../version-v0.30.0/noir/concepts/ops.md | 98 + .../version-v0.30.0/noir/concepts/oracles.md | 31 + .../noir/concepts/shadowing.md | 44 + .../version-v0.30.0/noir/concepts/traits.md | 389 +++ .../noir/concepts/unconstrained.md | 99 + .../modules_packages_crates/_category_.json | 6 + .../crates_and_packages.md | 43 + .../modules_packages_crates/dependencies.md | 124 + .../noir/modules_packages_crates/modules.md | 105 + .../modules_packages_crates/workspaces.md | 42 + .../noir/standard_library/_category_.json | 6 + .../noir/standard_library/bigint.md | 122 + .../noir/standard_library/black_box_fns.md | 32 + .../noir/standard_library/bn254.md | 46 + .../standard_library/containers/boundedvec.md | 340 +++ .../standard_library/containers/hashmap.md | 570 ++++ .../noir/standard_library/containers/index.md | 5 + .../noir/standard_library/containers/vec.mdx | 151 + .../cryptographic_primitives/_category_.json | 5 + .../cryptographic_primitives/ciphers.mdx | 32 + .../cryptographic_primitives/ec_primitives.md | 102 + .../ecdsa_sig_verification.mdx | 98 + .../cryptographic_primitives/eddsa.mdx | 37 + .../embedded_curve_ops.mdx | 98 + .../cryptographic_primitives/hashes.mdx | 257 ++ .../cryptographic_primitives/index.md | 14 + .../cryptographic_primitives/schnorr.mdx | 64 + .../noir/standard_library/logging.md | 78 + .../noir/standard_library/merkle_trees.md | 58 + .../noir/standard_library/options.md | 101 + .../noir/standard_library/recursion.md | 88 + .../noir/standard_library/traits.md | 464 +++ .../noir/standard_library/zeroed.md | 26 + .../NoirJS/backend_barretenberg/.nojekyll | 1 + .../classes/BarretenbergBackend.md | 160 ++ .../classes/BarretenbergVerifier.md | 58 + .../NoirJS/backend_barretenberg/index.md | 59 + .../type-aliases/BackendOptions.md | 21 + .../backend_barretenberg/typedoc-sidebar.cjs | 4 + .../reference/NoirJS/noir_js/.nojekyll | 1 + .../reference/NoirJS/noir_js/classes/Noir.md | 132 + .../reference/NoirJS/noir_js/functions/and.md | 22 + .../NoirJS/noir_js/functions/blake2s256.md | 21 + .../functions/ecdsa_secp256k1_verify.md | 28 + .../functions/ecdsa_secp256r1_verify.md | 28 + .../NoirJS/noir_js/functions/keccak256.md | 21 + .../NoirJS/noir_js/functions/sha256.md | 21 + .../reference/NoirJS/noir_js/functions/xor.md | 22 + .../reference/NoirJS/noir_js/index.md | 55 + .../noir_js/type-aliases/ErrorWithPayload.md | 15 + .../type-aliases/ForeignCallHandler.md | 24 + .../noir_js/type-aliases/ForeignCallInput.md | 9 + .../noir_js/type-aliases/ForeignCallOutput.md | 9 + .../NoirJS/noir_js/type-aliases/WitnessMap.md | 9 + .../NoirJS/noir_js/typedoc-sidebar.cjs | 4 + .../reference/NoirJS/noir_wasm/.nojekyll | 1 + .../NoirJS/noir_wasm/functions/compile.md | 51 + .../noir_wasm/functions/compile_contract.md | 51 + .../noir_wasm/functions/createFileManager.md | 21 + .../functions/inflateDebugSymbols.md | 21 + .../reference/NoirJS/noir_wasm/index.md | 49 + .../NoirJS/noir_wasm/typedoc-sidebar.cjs | 4 + .../version-v0.30.0/reference/_category_.json | 5 + .../reference/debugger/_category_.json | 6 + .../debugger/debugger_known_limitations.md | 59 + .../reference/debugger/debugger_repl.md | 360 +++ .../reference/debugger/debugger_vscode.md | 82 + .../reference/nargo_commands.md | 397 +++ .../version-v0.30.0/tooling/debugger.md | 27 + .../tooling/language_server.md | 43 + .../version-v0.30.0/tooling/testing.md | 62 + .../version-v0.30.0/tutorials/noirjs_app.md | 326 +++ .../version-v0.30.0-sidebars.json | 93 + noir/noir-repo/noir_stdlib/src/aes128.nr | 1 - .../noir_stdlib/src/embedded_curve_ops.nr | 7 +- noir/noir-repo/noir_stdlib/src/lib.nr | 3 + noir/noir-repo/noir_stdlib/src/ops.nr | 173 +- noir/noir-repo/noir_stdlib/src/ops/arith.nr | 103 + noir/noir-repo/noir_stdlib/src/ops/bit.nr | 109 + noir/noir-repo/noir_stdlib/src/uint128.nr | 270 +- noir/noir-repo/scripts/count_loc.sh | 33 + .../security/insectarium/noir_stdlib.md | 61 + .../turbofish_generic_count/Nargo.toml | 7 + .../turbofish_generic_count/src/main.nr | 22 + .../brillig_embedded_curve/src/main.nr | 6 +- .../execution_success/generics/src/main.nr | 15 + .../no_predicates_brillig/Nargo.toml | 7 + .../no_predicates_brillig/Prover.toml | 2 + .../no_predicates_brillig/src/main.nr | 16 + .../trait_method_mut_self/Nargo.toml | 7 + .../trait_method_mut_self/Prover.toml | 2 + .../trait_method_mut_self/src/main.nr | 74 + .../execution_success/u16_support/Nargo.toml | 7 + .../execution_success/u16_support/Prover.toml | 1 + .../execution_success/u16_support/src/main.nr | 24 + .../tooling/backend_interface/Cargo.toml | 1 - .../tooling/backend_interface/src/cli/info.rs | 62 - .../tooling/backend_interface/src/cli/mod.rs | 2 - .../backend_interface/src/proof_system.rs | 25 +- .../mock_backend/src/info_cmd.rs | 40 - .../test-binaries/mock_backend/src/main.rs | 3 - .../tooling/bb_abstraction_leaks/build.rs | 2 +- noir/noir-repo/tooling/lsp/src/lib.rs | 2 +- .../tooling/lsp/src/notifications/mod.rs | 4 +- .../lsp/src/requests/code_lens_request.rs | 2 +- .../lsp/src/requests/goto_declaration.rs | 2 +- .../lsp/src/requests/goto_definition.rs | 2 +- .../tooling/lsp/src/requests/test_run.rs | 2 +- .../tooling/lsp/src/requests/tests.rs | 2 +- .../tooling/nargo_cli/src/cli/check_cmd.rs | 11 +- .../nargo_cli/src/cli/codegen_verifier_cmd.rs | 3 +- .../tooling/nargo_cli/src/cli/compile_cmd.rs | 17 +- .../tooling/nargo_cli/src/cli/dap_cmd.rs | 18 +- .../tooling/nargo_cli/src/cli/debug_cmd.rs | 14 +- .../tooling/nargo_cli/src/cli/execute_cmd.rs | 14 +- .../tooling/nargo_cli/src/cli/export_cmd.rs | 8 +- .../tooling/nargo_cli/src/cli/info_cmd.rs | 23 +- .../tooling/nargo_cli/src/cli/lsp_cmd.rs | 8 +- .../tooling/nargo_cli/src/cli/mod.rs | 18 +- .../tooling/nargo_cli/src/cli/new_cmd.rs | 8 +- .../tooling/nargo_cli/src/cli/prove_cmd.rs | 7 +- .../tooling/nargo_cli/src/cli/test_cmd.rs | 10 +- .../tooling/nargo_cli/src/cli/verify_cmd.rs | 7 +- .../tooling/nargo_cli/tests/stdlib-tests.rs | 17 +- .../tooling/nargo_fmt/src/rewrite/expr.rs | 35 +- .../tests/expected/turbofish_call.nr | 8 + .../tests/expected/turbofish_method_call.nr | 12 + .../nargo_fmt/tests/input/turbofish_call.nr | 7 + .../tests/input/turbofish_method_call.nr | 5 + .../tooling/noir_codegen/package.json | 2 +- noir/noir-repo/tooling/noir_js/package.json | 2 +- .../tooling/noir_js/test/node/execute.test.ts | 12 + .../noir_js_backend_barretenberg/package.json | 4 +- .../tooling/noir_js_types/package.json | 2 +- noir/noir-repo/tooling/noirc_abi/src/lib.rs | 10 +- .../tooling/noirc_abi_wasm/package.json | 2 +- noir/noir-repo/yarn.lock | 13 +- 272 files changed, 19017 insertions(+), 3527 deletions(-) create mode 100644 noir/noir-repo/.tokeignore create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/hash_to_curve.rs create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/mod.rs create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/commitment.rs create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/hash.rs create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/mod.rs create mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/schnorr/mod.rs delete mode 100755 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/acvm_backend.wasm delete mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs delete mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs delete mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs delete mode 100644 noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/elaborator/mod.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/elaborator/patterns.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/elaborator/scope.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/elaborator/statements.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/elaborator/types.rs create mode 100644 noir/noir-repo/compiler/noirc_frontend/src/tests/name_shadowing.rs create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-oracle.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-recursion.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/project_breakdown.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/other_install_methods.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/tooling/noir_codegen.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_the_repl.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_vs_code.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-oracles.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-recursion.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-solidity-verifier.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/merkle-proof.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/using-devcontainers.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/index.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/migration_notes.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/assert.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/comments.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/control_flow.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_bus.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/arrays.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/booleans.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/fields.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/function_types.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/integers.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/references.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/slices.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/strings.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/structs.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/tuples.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/functions.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/generics.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/globals.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/lambdas.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/mutability.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/ops.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/oracles.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/shadowing.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/traits.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/unconstrained.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/crates_and_packages.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/dependencies.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/modules.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/workspaces.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bigint.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/black_box_fns.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bn254.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/boundedvec.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/hashmap.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/vec.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ciphers.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ec_primitives.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/eddsa.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/hashes.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/schnorr.mdx create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/logging.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/merkle_trees.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/options.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/recursion.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/traits.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/zeroed.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/.nojekyll create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/.nojekyll create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/classes/Noir.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/and.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/blake2s256.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/keccak256.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/sha256.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/xor.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/.nojekyll create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile_contract.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/createFileManager.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/index.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/_category_.json create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_known_limitations.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_repl.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_vscode.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/nargo_commands.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/debugger.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/language_server.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/testing.md create mode 100644 noir/noir-repo/docs/versioned_docs/version-v0.30.0/tutorials/noirjs_app.md create mode 100644 noir/noir-repo/docs/versioned_sidebars/version-v0.30.0-sidebars.json create mode 100644 noir/noir-repo/noir_stdlib/src/ops/arith.nr create mode 100644 noir/noir-repo/noir_stdlib/src/ops/bit.nr create mode 100755 noir/noir-repo/scripts/count_loc.sh create mode 100644 noir/noir-repo/security/insectarium/noir_stdlib.md create mode 100644 noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/Nargo.toml create mode 100644 noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/src/main.nr create mode 100644 noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Nargo.toml create mode 100644 noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Prover.toml create mode 100644 noir/noir-repo/test_programs/execution_success/no_predicates_brillig/src/main.nr create mode 100644 noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Nargo.toml create mode 100644 noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Prover.toml create mode 100644 noir/noir-repo/test_programs/execution_success/trait_method_mut_self/src/main.nr create mode 100644 noir/noir-repo/test_programs/execution_success/u16_support/Nargo.toml create mode 100644 noir/noir-repo/test_programs/execution_success/u16_support/Prover.toml create mode 100644 noir/noir-repo/test_programs/execution_success/u16_support/src/main.nr delete mode 100644 noir/noir-repo/tooling/backend_interface/src/cli/info.rs delete mode 100644 noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs create mode 100644 noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_call.nr create mode 100644 noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_method_call.nr create mode 100644 noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_call.nr create mode 100644 noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_method_call.nr diff --git a/.noir-sync-commit b/.noir-sync-commit index 61a3851ea0c..90fcf3f8242 100644 --- a/.noir-sync-commit +++ b/.noir-sync-commit @@ -1 +1 @@ -c49d3a9ded819b828cffdfc031e86614da21e329 +89846cfbc4961c5258d91b5973f027be80885a20 diff --git a/noir/noir-repo/.github/workflows/formatting.yml b/noir/noir-repo/.github/workflows/formatting.yml index 8166fb0f7c2..08c02af519f 100644 --- a/noir/noir-repo/.github/workflows/formatting.yml +++ b/noir/noir-repo/.github/workflows/formatting.yml @@ -44,7 +44,7 @@ jobs: save-if: ${{ github.event_name != 'merge_group' }} - name: Run `cargo clippy` - run: cargo clippy --workspace --locked --release + run: cargo clippy --all-targets --workspace --locked --release - name: Run `cargo fmt` run: cargo fmt --all --check diff --git a/noir/noir-repo/.github/workflows/gates_report.yml b/noir/noir-repo/.github/workflows/gates_report.yml index ba4cb600c59..3d4bef1940e 100644 --- a/noir/noir-repo/.github/workflows/gates_report.yml +++ b/noir/noir-repo/.github/workflows/gates_report.yml @@ -1,88 +1,88 @@ -name: Report gates diff +# name: Report gates diff -on: - push: - branches: - - master - pull_request: +# on: +# push: +# branches: +# - master +# pull_request: -jobs: - build-nargo: - runs-on: ubuntu-latest - strategy: - matrix: - target: [x86_64-unknown-linux-gnu] +# jobs: +# build-nargo: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# target: [x86_64-unknown-linux-gnu] - steps: - - name: Checkout Noir repo - uses: actions/checkout@v4 +# steps: +# - name: Checkout Noir repo +# uses: actions/checkout@v4 - - name: Setup toolchain - uses: dtolnay/rust-toolchain@1.74.1 +# - name: Setup toolchain +# uses: dtolnay/rust-toolchain@1.74.1 - - uses: Swatinem/rust-cache@v2 - with: - key: ${{ matrix.target }} - cache-on-failure: true - save-if: ${{ github.event_name != 'merge_group' }} +# - uses: Swatinem/rust-cache@v2 +# with: +# key: ${{ matrix.target }} +# cache-on-failure: true +# save-if: ${{ github.event_name != 'merge_group' }} - - name: Build Nargo - run: cargo build --package nargo_cli --release +# - name: Build Nargo +# run: cargo build --package nargo_cli --release - - name: Package artifacts - run: | - mkdir dist - cp ./target/release/nargo ./dist/nargo - 7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz +# - name: Package artifacts +# run: | +# mkdir dist +# cp ./target/release/nargo ./dist/nargo +# 7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: nargo - path: ./dist/* - retention-days: 3 +# - name: Upload artifact +# uses: actions/upload-artifact@v4 +# with: +# name: nargo +# path: ./dist/* +# retention-days: 3 - compare_gas_reports: - needs: [build-nargo] - runs-on: ubuntu-latest - permissions: - pull-requests: write +# compare_gas_reports: +# needs: [build-nargo] +# runs-on: ubuntu-latest +# permissions: +# pull-requests: write - steps: - - uses: actions/checkout@v4 +# steps: +# - uses: actions/checkout@v4 - - name: Download nargo binary - uses: actions/download-artifact@v4 - with: - name: nargo - path: ./nargo +# - name: Download nargo binary +# uses: actions/download-artifact@v4 +# with: +# name: nargo +# path: ./nargo - - name: Set nargo on PATH - run: | - nargo_binary="${{ github.workspace }}/nargo/nargo" - chmod +x $nargo_binary - echo "$(dirname $nargo_binary)" >> $GITHUB_PATH - export PATH="$PATH:$(dirname $nargo_binary)" - nargo -V +# - name: Set nargo on PATH +# run: | +# nargo_binary="${{ github.workspace }}/nargo/nargo" +# chmod +x $nargo_binary +# echo "$(dirname $nargo_binary)" >> $GITHUB_PATH +# export PATH="$PATH:$(dirname $nargo_binary)" +# nargo -V - - name: Generate gates report - working-directory: ./test_programs - run: | - ./gates_report.sh - mv gates_report.json ../gates_report.json +# - name: Generate gates report +# working-directory: ./test_programs +# run: | +# ./gates_report.sh +# mv gates_report.json ../gates_report.json - - name: Compare gates reports - id: gates_diff - uses: vezenovm/noir-gates-diff@acf12797860f237117e15c0d6e08d64253af52b6 - with: - report: gates_report.json - summaryQuantile: 0.9 # only display the 10% most significant circuit size diffs in the summary (defaults to 20%) +# - name: Compare gates reports +# id: gates_diff +# uses: vezenovm/noir-gates-diff@acf12797860f237117e15c0d6e08d64253af52b6 +# with: +# report: gates_report.json +# summaryQuantile: 0.9 # only display the 10% most significant circuit size diffs in the summary (defaults to 20%) - - name: Add gates diff to sticky comment - if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target' - uses: marocchino/sticky-pull-request-comment@v2 - with: - # delete the comment in case changes no longer impact circuit sizes - delete: ${{ !steps.gates_diff.outputs.markdown }} - message: ${{ steps.gates_diff.outputs.markdown }} +# - name: Add gates diff to sticky comment +# if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target' +# uses: marocchino/sticky-pull-request-comment@v2 +# with: +# # delete the comment in case changes no longer impact circuit sizes +# delete: ${{ !steps.gates_diff.outputs.markdown }} +# message: ${{ steps.gates_diff.outputs.markdown }} diff --git a/noir/noir-repo/.release-please-manifest.json b/noir/noir-repo/.release-please-manifest.json index 447e12155b8..83338327d88 100644 --- a/noir/noir-repo/.release-please-manifest.json +++ b/noir/noir-repo/.release-please-manifest.json @@ -1,4 +1,4 @@ { - ".": "0.29.0", - "acvm-repo": "0.45.0" + ".": "0.30.0", + "acvm-repo": "0.46.0" } diff --git a/noir/noir-repo/.tokeignore b/noir/noir-repo/.tokeignore new file mode 100644 index 00000000000..55f24e41dbd --- /dev/null +++ b/noir/noir-repo/.tokeignore @@ -0,0 +1,12 @@ +docs +scripts + +# aztec_macros is explicitly considered OOS for Noir audit +aztec_macros + +# config files +*.toml +*.md +*.json +*.txt +*.config.mjs diff --git a/noir/noir-repo/CHANGELOG.md b/noir/noir-repo/CHANGELOG.md index 7be8c387026..db4ec8f4567 100644 --- a/noir/noir-repo/CHANGELOG.md +++ b/noir/noir-repo/CHANGELOG.md @@ -1,5 +1,47 @@ # Changelog +## [0.30.0](https://github.com/noir-lang/noir/compare/v0.29.0...v0.30.0) (2024-05-20) + + +### ⚠ BREAKING CHANGES + +* remove `Opcode::Brillig` from ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5995) +* AES blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6016) + +### Features + +* `multi_scalar_mul` blackbox func (https://github.com/AztecProtocol/aztec-packages/pull/6097) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* `variable_base_scalar_mul` blackbox func (https://github.com/AztecProtocol/aztec-packages/pull/6039) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Add `Not` trait to stdlib ([#4999](https://github.com/noir-lang/noir/issues/4999)) ([95d4d13](https://github.com/noir-lang/noir/commit/95d4d133d1eb5e0eb44cd928d8183d890e970a13)) +* Add `std::ops::Neg` trait to stdlib ([07930d4](https://github.com/noir-lang/noir/commit/07930d4373a393146210efae69e6ec40171f047b)) +* Add native rust implementations of pedersen functions ([#4871](https://github.com/noir-lang/noir/issues/4871)) ([fb039f7](https://github.com/noir-lang/noir/commit/fb039f74df23aea39bc0593a5d538d82b4efadf0)) +* Add support for u16/i16 ([#4985](https://github.com/noir-lang/noir/issues/4985)) ([e43661d](https://github.com/noir-lang/noir/commit/e43661d16c1cd07e2af2392b88d29c689889ff9a)) +* AES blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6016) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Do not return databus returndata, keep it private. ([#5023](https://github.com/noir-lang/noir/issues/5023)) ([a5b7df1](https://github.com/noir-lang/noir/commit/a5b7df12faf9d71ff24f8c5cde5e78da44558caf)) +* Dynamic assertion payloads v2 (https://github.com/AztecProtocol/aztec-packages/pull/5949) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Implement `From` array trait for `BoundedVec` ([#4927](https://github.com/noir-lang/noir/issues/4927)) ([bf491dc](https://github.com/noir-lang/noir/commit/bf491dce9595d0e37057ae6d6721eb7a83cec0e2)) +* Implement `ops` traits on `u16`/`i16` ([#4996](https://github.com/noir-lang/noir/issues/4996)) ([8b65663](https://github.com/noir-lang/noir/commit/8b65663f9e836c11a87e458bd7c6a52920448d5c)) +* Implement `std::ops::Sub` on `EmbeddedCurvePoint` ([07930d4](https://github.com/noir-lang/noir/commit/07930d4373a393146210efae69e6ec40171f047b)) +* Increase default expression width to 4 ([#4995](https://github.com/noir-lang/noir/issues/4995)) ([f01d309](https://github.com/noir-lang/noir/commit/f01d3090759a5ff0f1f83c5616d22890c6bd76be)) +* Parsing non-string assertion payloads in noir js (https://github.com/AztecProtocol/aztec-packages/pull/6079) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Remove query to backend to get expression width ([#4975](https://github.com/noir-lang/noir/issues/4975)) ([e5f356b](https://github.com/noir-lang/noir/commit/e5f356b063fe4facbd14320b7eafed664d0bb027)) +* Set aztec private functions to be recursive (https://github.com/AztecProtocol/aztec-packages/pull/6192) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) + + +### Bug Fixes + +* Compute the correct slice length when coercing from a literal array of complex types ([#4986](https://github.com/noir-lang/noir/issues/4986)) ([f3f1150](https://github.com/noir-lang/noir/commit/f3f11507983009771656811f9570bdbe6849c7ef)) +* Defer overflow checks for unsigned integers to acir-gen ([#4832](https://github.com/noir-lang/noir/issues/4832)) ([b577761](https://github.com/noir-lang/noir/commit/b5777613c51f26fb4f580b9168c4190b1f4bd8f7)) +* Fix no predicates for brillig with intermediate functions ([#5015](https://github.com/noir-lang/noir/issues/5015)) ([9c6de4b](https://github.com/noir-lang/noir/commit/9c6de4b25d318c6d211361dd62a112a9d2432c56)) +* Fixed several vulnerabilities in U128, added some tests ([#5024](https://github.com/noir-lang/noir/issues/5024)) ([e5ab24d](https://github.com/noir-lang/noir/commit/e5ab24d6a4154d11b3c8ae08f4431b7b93c76f23)) +* Ignore no_predicates in brillig functions ([#5012](https://github.com/noir-lang/noir/issues/5012)) ([b541e79](https://github.com/noir-lang/noir/commit/b541e793e20fa3c991e0328ec2ff7926bdcdfd45)) +* Set index and value to 0 for array_get with predicate ([#4971](https://github.com/noir-lang/noir/issues/4971)) ([c49d3a9](https://github.com/noir-lang/noir/commit/c49d3a9ded819b828cffdfc031e86614da21e329)) + + +### Miscellaneous Chores + +* Remove `Opcode::Brillig` from ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5995) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) + ## [0.29.0](https://github.com/noir-lang/noir/compare/v0.28.0...v0.29.0) (2024-05-03) diff --git a/noir/noir-repo/Cargo.lock b/noir/noir-repo/Cargo.lock index 859579c077f..b5dc6f9bfdf 100644 --- a/noir/noir-repo/Cargo.lock +++ b/noir/noir-repo/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "acir" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir_field", "base64 0.21.2", @@ -26,7 +26,7 @@ dependencies = [ [[package]] name = "acir_field" -version = "0.45.0" +version = "0.46.0" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -40,7 +40,7 @@ dependencies = [ [[package]] name = "acvm" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "acvm_blackbox_solver", @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "acvm_blackbox_solver" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "blake2", @@ -93,13 +93,14 @@ dependencies = [ [[package]] name = "acvm_js" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acvm", "bn254_blackbox_solver", "build-data", "console_error_panic_hook", "const-str", + "getrandom 0.2.15", "gloo-utils", "js-sys", "pkg-config", @@ -117,7 +118,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ - "gimli 0.27.3", + "gimli", ] [[package]] @@ -132,7 +133,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -144,7 +145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.10", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -442,7 +443,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aztec_macros" -version = "0.29.0" +version = "0.30.0" dependencies = [ "convert_case 0.6.0", "iter-extended", @@ -453,7 +454,7 @@ dependencies = [ [[package]] name = "backend-interface" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "bb_abstraction_leaks", @@ -462,7 +463,6 @@ dependencies = [ "dirs", "flate2", "reqwest", - "serde", "serde_json", "tar", "tempfile", @@ -564,18 +564,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "blake2" version = "0.10.6" @@ -609,29 +597,24 @@ dependencies = [ [[package]] name = "bn254_blackbox_solver" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "acvm_blackbox_solver", "ark-ec", "ark-ff", - "cfg-if 1.0.0", + "ark-std", "criterion", - "getrandom 0.2.10", "hex", - "js-sys", "lazy_static", "noir_grumpkin", "num-bigint", "pprof 0.12.1", - "thiserror", - "wasm-bindgen-futures", - "wasmer", ] [[package]] name = "brillig" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir_field", "serde", @@ -639,7 +622,7 @@ dependencies = [ [[package]] name = "brillig_vm" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "acvm_blackbox_solver", @@ -693,28 +676,6 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bytecount" version = "0.6.3" @@ -850,9 +811,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -868,9 +829,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -887,7 +848,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -925,7 +886,7 @@ checksum = "fc4159b76af02757139baf42c0c971c6dc155330999fbfd8eddb29b97fb2db68" dependencies = [ "codespan-reporting", "lsp-types 0.88.0", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -1059,19 +1020,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "corosensei" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "libc", - "scopeguard", - "windows-sys 0.33.0", -] - [[package]] name = "cpp_demangle" version = "0.4.2" @@ -1090,89 +1038,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cranelift-bforest" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" -dependencies = [ - "arrayvec", - "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-egraph", - "cranelift-entity", - "cranelift-isle", - "gimli 0.26.2", - "log", - "regalloc2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" - -[[package]] -name = "cranelift-egraph" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" -dependencies = [ - "cranelift-entity", - "fxhash", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "log", - "smallvec", -] - -[[package]] -name = "cranelift-entity" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" - -[[package]] -name = "cranelift-frontend" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" - [[package]] name = "crc32fast" version = "1.3.2" @@ -1252,24 +1117,11 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1352,7 +1204,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -1363,20 +1215,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.32", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.14.0", - "lock_api", - "once_cell", - "parking_lot_core 0.9.8", + "syn 2.0.64", ] [[package]] @@ -1584,47 +1423,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" -[[package]] -name = "enum-iterator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "enumset" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.32", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -1661,12 +1459,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fastrand" version = "2.0.1" @@ -1763,7 +1555,7 @@ dependencies = [ [[package]] name = "fm" -version = "0.29.0" +version = "0.30.0" dependencies = [ "codespan-reporting", "iter-extended", @@ -1779,11 +1571,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding 2.3.1", ] [[package]] @@ -1795,12 +1587,6 @@ dependencies = [ "libc", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.1.31" @@ -1864,7 +1650,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -1930,9 +1716,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1941,17 +1727,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.27.3" @@ -2024,7 +1799,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.0.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util 0.7.10", @@ -2051,9 +1826,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -2066,9 +1838,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -2226,9 +1998,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2309,12 +2081,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "serde", ] @@ -2384,7 +2156,7 @@ dependencies = [ [[package]] name = "iter-extended" -version = "0.29.0" +version = "0.30.0" [[package]] name = "itertools" @@ -2611,12 +2383,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - [[package]] name = "libaes" version = "0.7.0" @@ -2625,9 +2391,9 @@ checksum = "82903360c009b816f5ab72a9b68158c27c301ee2c3f20655b55c5e589e7d3bb7" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -2687,7 +2453,7 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -2700,16 +2466,7 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "url 2.4.0", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", + "url 2.5.0", ] [[package]] @@ -2742,15 +2499,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memmap2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.6.5" @@ -2807,15 +2555,9 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "more-asserts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" - [[package]] name = "nargo" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "codespan-reporting", @@ -2841,7 +2583,7 @@ dependencies = [ [[package]] name = "nargo_cli" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "assert_cmd", @@ -2895,7 +2637,7 @@ dependencies = [ [[package]] name = "nargo_fmt" -version = "0.29.0" +version = "0.30.0" dependencies = [ "bytecount", "noirc_frontend", @@ -2907,7 +2649,7 @@ dependencies = [ [[package]] name = "nargo_toml" -version = "0.29.0" +version = "0.30.0" dependencies = [ "dirs", "fm", @@ -2917,7 +2659,7 @@ dependencies = [ "serde", "thiserror", "toml 0.7.6", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -2986,7 +2728,7 @@ dependencies = [ [[package]] name = "noir_debugger" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "assert_cmd", @@ -3021,7 +2763,7 @@ dependencies = [ [[package]] name = "noir_lsp" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "async-lsp", @@ -3047,13 +2789,13 @@ dependencies = [ [[package]] name = "noir_wasm" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "build-data", "console_error_panic_hook", "fm", - "getrandom 0.2.10", + "getrandom 0.2.15", "gloo-utils", "js-sys", "nargo", @@ -3070,7 +2812,7 @@ dependencies = [ [[package]] name = "noirc_abi" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "iter-extended", @@ -3088,12 +2830,12 @@ dependencies = [ [[package]] name = "noirc_abi_wasm" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "build-data", "console_error_panic_hook", - "getrandom 0.2.10", + "getrandom 0.2.15", "gloo-utils", "iter-extended", "js-sys", @@ -3105,11 +2847,11 @@ dependencies = [ [[package]] name = "noirc_arena" -version = "0.29.0" +version = "0.30.0" [[package]] name = "noirc_driver" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "aztec_macros", @@ -3130,7 +2872,7 @@ dependencies = [ [[package]] name = "noirc_errors" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "base64 0.21.2", @@ -3148,7 +2890,7 @@ dependencies = [ [[package]] name = "noirc_evaluator" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "chrono", @@ -3165,7 +2907,7 @@ dependencies = [ [[package]] name = "noirc_frontend" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "base64 0.21.2", @@ -3194,7 +2936,7 @@ dependencies = [ [[package]] name = "noirc_printable_type" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "iter-extended", @@ -3417,9 +3159,9 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -3428,7 +3170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.2.6", ] [[package]] @@ -3658,30 +3400,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -3690,9 +3408,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -3717,26 +3435,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -3754,19 +3452,13 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "radix_trie" version = "0.2.1" @@ -3836,7 +3528,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -3925,23 +3617,11 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", "redox_syscall 0.2.16", "thiserror", ] -[[package]] -name = "regalloc2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - [[package]] name = "regex" version = "1.10.3" @@ -3998,27 +3678,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "region" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" -dependencies = [ - "bitflags 1.3.2", - "libc", - "mach", - "winapi", -] - -[[package]] -name = "rend" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" -dependencies = [ - "bytecheck", -] - [[package]] name = "reqwest" version = "0.11.20" @@ -4040,7 +3699,7 @@ dependencies = [ "log", "mime", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding 2.3.1", "pin-project-lite", "rustls", "rustls-pemfile", @@ -4050,7 +3709,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "url 2.4.0", + "url 2.5.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4114,42 +3773,13 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if 1.0.0", - "getrandom 0.2.10", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", "windows-sys 0.52.0", ] -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rust-embed" version = "6.8.1" @@ -4170,7 +3800,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.32", + "syn 2.0.64", "walkdir", ] @@ -4391,12 +4021,6 @@ dependencies = [ "untrusted 0.7.1", ] -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "sec1" version = "0.3.0" @@ -4411,12 +4035,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "self_cell" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" - [[package]] name = "semver" version = "1.0.20" @@ -4428,9 +4046,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.179" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] @@ -4469,26 +4087,15 @@ dependencies = [ "thiserror", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_derive" -version = "1.0.179" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -4510,7 +4117,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -4544,7 +4151,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", "serde_json", "serde_with_macros", @@ -4560,7 +4167,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -4593,16 +4200,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shared-buffer" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" -dependencies = [ - "bytes", - "memmap2 0.6.2", -] - [[package]] name = "shell-words" version = "1.1.0" @@ -4619,12 +4216,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - [[package]] name = "similar" version = "2.3.0" @@ -4670,12 +4261,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - [[package]] name = "small-ord-set" version = "0.1.3" @@ -4807,7 +4392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "167a4ffd7c35c143fd1030aa3c2caf76ba42220bd5a6b5f4781896434723b8c3" dependencies = [ "debugid", - "memmap2 0.5.10", + "memmap2", "stable_deref_trait", "uuid", ] @@ -4836,21 +4421,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" version = "0.4.40" @@ -4862,12 +4441,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "target-lexicon" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - [[package]] name = "tempfile" version = "3.8.0" @@ -4970,7 +4543,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -5070,7 +4643,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -5159,7 +4732,7 @@ version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -5221,7 +4794,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -5392,13 +4965,13 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", - "percent-encoding 2.3.0", + "idna 0.5.0", + "percent-encoding 2.3.1", "serde", ] @@ -5499,7 +5072,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", "wasm-bindgen-shared", ] @@ -5533,7 +5106,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5568,179 +5141,6 @@ dependencies = [ "quote", ] -[[package]] -name = "wasm-encoder" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasmer" -version = "4.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c15724dc25d1ee57962334aea8e41ade2675e5ea2ac6b8d42da6051b0face66" -dependencies = [ - "bytes", - "cfg-if 1.0.0", - "derivative", - "indexmap 1.9.3", - "js-sys", - "more-asserts", - "rustc-demangle", - "serde", - "serde-wasm-bindgen", - "shared-buffer", - "target-lexicon", - "thiserror", - "tracing", - "wasm-bindgen", - "wasmer-compiler", - "wasmer-compiler-cranelift", - "wasmer-derive", - "wasmer-types", - "wasmer-vm", - "wasmparser", - "wat", - "winapi", -] - -[[package]] -name = "wasmer-compiler" -version = "4.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a7f3b3a96f8d844c25e2c032af9572306dd63fa93dc17bcca4c5458ac569bd" -dependencies = [ - "backtrace", - "bytes", - "cfg-if 1.0.0", - "enum-iterator", - "enumset", - "lazy_static", - "leb128", - "memmap2 0.5.10", - "more-asserts", - "region", - "rkyv", - "self_cell", - "shared-buffer", - "smallvec", - "thiserror", - "wasmer-types", - "wasmer-vm", - "wasmparser", - "winapi", -] - -[[package]] -name = "wasmer-compiler-cranelift" -version = "4.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102e2c5bacac69495c4025767e2fa26797ffb27f242dccb7cf57d9cefd944386" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "gimli 0.26.2", - "more-asserts", - "rayon", - "smallvec", - "target-lexicon", - "tracing", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-derive" -version = "4.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea737fa08f95d6abc4459f42a70a9833e8974b814e74971d77ef473814f4d4c" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "wasmer-types" -version = "4.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0689110e291b0f07fc665f2824e5ff81df120848e8a9acfbf1a9bf7990773f9" -dependencies = [ - "bytecheck", - "enum-iterator", - "enumset", - "indexmap 1.9.3", - "more-asserts", - "rkyv", - "target-lexicon", - "thiserror", -] - -[[package]] -name = "wasmer-vm" -version = "4.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd41f822a1ac4242d478754e8ceba2806a00ea5072803622e1fe91e8e28b2a1" -dependencies = [ - "backtrace", - "cc", - "cfg-if 1.0.0", - "corosensei", - "crossbeam-queue", - "dashmap", - "derivative", - "enum-iterator", - "fnv", - "indexmap 1.9.3", - "lazy_static", - "libc", - "mach", - "memoffset 0.9.0", - "more-asserts", - "region", - "scopeguard", - "thiserror", - "wasmer-types", - "winapi", -] - -[[package]] -name = "wasmparser" -version = "0.121.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" -dependencies = [ - "bitflags 2.5.0", - "indexmap 2.0.0", - "semver", -] - -[[package]] -name = "wast" -version = "64.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" -dependencies = [ - "leb128", - "memchr", - "unicode-width", - "wasm-encoder", -] - -[[package]] -name = "wat" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" -dependencies = [ - "wast", -] - [[package]] name = "web-sys" version = "0.3.63" @@ -5797,19 +5197,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "windows-sys" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" -dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -5870,12 +5257,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" -[[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" - [[package]] name = "windows_aarch64_msvc" version = "0.48.0" @@ -5888,12 +5269,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" -[[package]] -name = "windows_i686_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" - [[package]] name = "windows_i686_gnu" version = "0.48.0" @@ -5906,12 +5281,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" -[[package]] -name = "windows_i686_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" - [[package]] name = "windows_i686_msvc" version = "0.48.0" @@ -5924,12 +5293,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" -[[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" - [[package]] name = "windows_x86_64_gnu" version = "0.48.0" @@ -5954,12 +5317,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" -[[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" - [[package]] name = "windows_x86_64_msvc" version = "0.48.0" @@ -5991,15 +5348,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "xattr" version = "1.0.1" @@ -6026,7 +5374,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] [[package]] @@ -6046,5 +5394,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.64", ] diff --git a/noir/noir-repo/Cargo.toml b/noir/noir-repo/Cargo.toml index f744d6d0cf5..670ae36dd4b 100644 --- a/noir/noir-repo/Cargo.toml +++ b/noir/noir-repo/Cargo.toml @@ -41,7 +41,7 @@ resolver = "2" [workspace.package] # x-release-please-start-version -version = "0.29.0" +version = "0.30.0" # x-release-please-end authors = ["The Noir Team "] edition = "2021" @@ -52,13 +52,13 @@ repository = "https://github.com/noir-lang/noir/" [workspace.dependencies] # ACVM workspace dependencies -acir_field = { version = "0.45.0", path = "acvm-repo/acir_field", default-features = false } -acir = { version = "0.45.0", path = "acvm-repo/acir", default-features = false } -acvm = { version = "0.45.0", path = "acvm-repo/acvm" } -brillig = { version = "0.45.0", path = "acvm-repo/brillig", default-features = false } -brillig_vm = { version = "0.45.0", path = "acvm-repo/brillig_vm", default-features = false } -acvm_blackbox_solver = { version = "0.45.0", path = "acvm-repo/blackbox_solver", default-features = false } -bn254_blackbox_solver = { version = "0.45.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false } +acir_field = { version = "0.46.0", path = "acvm-repo/acir_field", default-features = false } +acir = { version = "0.46.0", path = "acvm-repo/acir", default-features = false } +acvm = { version = "0.46.0", path = "acvm-repo/acvm" } +brillig = { version = "0.46.0", path = "acvm-repo/brillig", default-features = false } +brillig_vm = { version = "0.46.0", path = "acvm-repo/brillig_vm", default-features = false } +acvm_blackbox_solver = { version = "0.46.0", path = "acvm-repo/blackbox_solver", default-features = false } +bn254_blackbox_solver = { version = "0.46.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false } # Noir compiler workspace dependencies fm = { path = "compiler/fm" } diff --git a/noir/noir-repo/acvm-repo/CHANGELOG.md b/noir/noir-repo/acvm-repo/CHANGELOG.md index 6ac04f6f83f..c9bb0d610eb 100644 --- a/noir/noir-repo/acvm-repo/CHANGELOG.md +++ b/noir/noir-repo/acvm-repo/CHANGELOG.md @@ -5,6 +5,135 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.46.0](https://github.com/noir-lang/noir/compare/v0.45.0...v0.46.0) (2024-05-20) + + +### ⚠ BREAKING CHANGES + +* remove `Opcode::Brillig` from ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5995) +* AES blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6016) +* Bit shift is restricted to u8 right operand ([#4907](https://github.com/noir-lang/noir/issues/4907)) +* contract interfaces and better function calls (https://github.com/AztecProtocol/aztec-packages/pull/5687) +* change backend width to 4 (https://github.com/AztecProtocol/aztec-packages/pull/5374) +* Use fixed size arrays in black box functions where sizes are known (https://github.com/AztecProtocol/aztec-packages/pull/5620) +* trap with revert data (https://github.com/AztecProtocol/aztec-packages/pull/5732) +* **acir:** BrilligCall opcode (https://github.com/AztecProtocol/aztec-packages/pull/5709) +* remove fixed-length keccak256 (https://github.com/AztecProtocol/aztec-packages/pull/5617) +* storage_layout and `#[aztec(storage)]` (https://github.com/AztecProtocol/aztec-packages/pull/5387) +* **acir:** Add predicate to call opcode (https://github.com/AztecProtocol/aztec-packages/pull/5616) +* contract_abi-exports (https://github.com/AztecProtocol/aztec-packages/pull/5386) +* Brillig typed memory (https://github.com/AztecProtocol/aztec-packages/pull/5395) +* **acir:** Program and witness stack structure (https://github.com/AztecProtocol/aztec-packages/pull/5149) +* automatic NoteInterface and NoteGetterOptions auto select (https://github.com/AztecProtocol/aztec-packages/pull/4508) +* Acir call opcode (https://github.com/AztecProtocol/aztec-packages/pull/4773) +* Support contracts with no constructor (https://github.com/AztecProtocol/aztec-packages/pull/5175) +* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898) +* move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479) +* note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500) +* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) +* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) +* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) +* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) +* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) + +### Features + +* `multi_scalar_mul` blackbox func (https://github.com/AztecProtocol/aztec-packages/pull/6097) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* `variable_base_scalar_mul` blackbox func (https://github.com/AztecProtocol/aztec-packages/pull/6039) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Acir call opcode (https://github.com/AztecProtocol/aztec-packages/pull/4773) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* **acir_gen:** Brillig stdlib ([#4848](https://github.com/noir-lang/noir/issues/4848)) ([0c8175c](https://github.com/noir-lang/noir/commit/0c8175cb539efd9427c73ae5af0d48abe688ebab)) +* **acir_gen:** Fold attribute at compile-time and initial non inlined ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5341) ([a0f7474](https://github.com/noir-lang/noir/commit/a0f7474ae6bd74132efdb945d2eb2383f3913cce)) +* **acir:** Add predicate to call opcode (https://github.com/AztecProtocol/aztec-packages/pull/5616) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* **acir:** BrilligCall opcode (https://github.com/AztecProtocol/aztec-packages/pull/5709) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* **acir:** Program and witness stack structure (https://github.com/AztecProtocol/aztec-packages/pull/5149) ([13eb71b](https://github.com/noir-lang/noir/commit/13eb71b8de44eb6aad9c37943ad06fc73db589f5)) +* **acvm_js:** Execute program ([#4694](https://github.com/noir-lang/noir/issues/4694)) ([386f6d0](https://github.com/noir-lang/noir/commit/386f6d0a5822912db878285cb001032a7c0ff622)) +* **acvm:** Execute multiple circuits (https://github.com/AztecProtocol/aztec-packages/pull/5380) ([a0f7474](https://github.com/noir-lang/noir/commit/a0f7474ae6bd74132efdb945d2eb2383f3913cce)) +* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Add CMOV instruction to brillig and brillig gen (https://github.com/AztecProtocol/aztec-packages/pull/5308) ([13eb71b](https://github.com/noir-lang/noir/commit/13eb71b8de44eb6aad9c37943ad06fc73db589f5)) +* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896)) +* Add native rust implementations of pedersen functions ([#4871](https://github.com/noir-lang/noir/issues/4871)) ([fb039f7](https://github.com/noir-lang/noir/commit/fb039f74df23aea39bc0593a5d538d82b4efadf0)) +* Add poseidon2 opcode implementation for acvm/brillig, and Noir ([#4398](https://github.com/noir-lang/noir/issues/4398)) ([10e8292](https://github.com/noir-lang/noir/commit/10e82920798380f50046e52db4a20ca205191ab7)) +* Add return values to aztec fns (https://github.com/AztecProtocol/aztec-packages/pull/5389) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* Add support for overriding expression width ([#4117](https://github.com/noir-lang/noir/issues/4117)) ([c8026d5](https://github.com/noir-lang/noir/commit/c8026d557d535b10fe455165d6445076df7a03de)) +* Added cast opcode and cast calldata (https://github.com/AztecProtocol/aztec-packages/pull/4423) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a)) +* AES blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6016) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682)) +* Automatic NoteInterface and NoteGetterOptions auto select (https://github.com/AztecProtocol/aztec-packages/pull/4508) ([13eb71b](https://github.com/noir-lang/noir/commit/13eb71b8de44eb6aad9c37943ad06fc73db589f5)) +* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* **avm:** Brillig CONST of size > u128 (https://github.com/AztecProtocol/aztec-packages/pull/5217) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* **avm:** Integrate AVM with initializers (https://github.com/AztecProtocol/aztec-packages/pull/5469) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Backpropagate constants in ACIR during optimization ([#3926](https://github.com/noir-lang/noir/issues/3926)) ([aad0da0](https://github.com/noir-lang/noir/commit/aad0da024c69663f42e6913e674682d5864b26ae)) +* Bit shift is restricted to u8 right operand ([#4907](https://github.com/noir-lang/noir/issues/4907)) ([c4b0369](https://github.com/noir-lang/noir/commit/c4b03691feca17ef268acab523292f3051f672ea)) +* Brillig heterogeneous memory cells (https://github.com/AztecProtocol/aztec-packages/pull/5608) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda)) +* Brillig IR refactor (https://github.com/AztecProtocol/aztec-packages/pull/5233) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Brillig pointer codegen and execution (https://github.com/AztecProtocol/aztec-packages/pull/5737) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Brillig typed memory (https://github.com/AztecProtocol/aztec-packages/pull/5395) ([0bc18c4](https://github.com/noir-lang/noir/commit/0bc18c4f78171590dd58bded959f68f53a44cc8c)) +* Change backend width to 4 (https://github.com/AztecProtocol/aztec-packages/pull/5374) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Check initializer msg.sender matches deployer from address preimage (https://github.com/AztecProtocol/aztec-packages/pull/5222) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Contract interfaces and better function calls (https://github.com/AztecProtocol/aztec-packages/pull/5687) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Contract_abi-exports (https://github.com/AztecProtocol/aztec-packages/pull/5386) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* Dynamic assertion payloads v2 (https://github.com/AztecProtocol/aztec-packages/pull/5949) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09)) +* Handle `BrilligCall` opcodes in the debugger ([#4897](https://github.com/noir-lang/noir/issues/4897)) ([b380dc4](https://github.com/noir-lang/noir/commit/b380dc44de5c9f8de278ece3d531ebbc2c9238ba)) +* Impl of missing functionality in new key store (https://github.com/AztecProtocol/aztec-packages/pull/5750) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Increase default expression width to 4 ([#4995](https://github.com/noir-lang/noir/issues/4995)) ([f01d309](https://github.com/noir-lang/noir/commit/f01d3090759a5ff0f1f83c5616d22890c6bd76be)) +* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Initial Earthly CI (https://github.com/AztecProtocol/aztec-packages/pull/5069) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e)) +* **nargo:** Handle call stacks for multiple Acir calls ([#4711](https://github.com/noir-lang/noir/issues/4711)) ([5b23171](https://github.com/noir-lang/noir/commit/5b231714740447d82cde7cdbe65d4a8b46a31df4)) +* New brillig field operations and refactor of binary operations (https://github.com/AztecProtocol/aztec-packages/pull/5208) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a)) +* Parsing non-string assertion payloads in noir js (https://github.com/AztecProtocol/aztec-packages/pull/6079) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Remove replacement of boolean range opcodes with `AssertZero` opcodes ([#4107](https://github.com/noir-lang/noir/issues/4107)) ([dac0e87](https://github.com/noir-lang/noir/commit/dac0e87ee3be3446b92bbb12ef4832fd493fcee3)) +* Restore hashing args via slice for performance (https://github.com/AztecProtocol/aztec-packages/pull/5539) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* Set aztec private functions to be recursive (https://github.com/AztecProtocol/aztec-packages/pull/6192) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Signed integer division and modulus in brillig gen (https://github.com/AztecProtocol/aztec-packages/pull/5279) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* **simulator:** Fetch return values at circuit execution (https://github.com/AztecProtocol/aztec-packages/pull/5642) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda)) +* Storage_layout and `#[aztec(storage)]` (https://github.com/AztecProtocol/aztec-packages/pull/5387) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* Support contracts with no constructor (https://github.com/AztecProtocol/aztec-packages/pull/5175) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c)) +* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc)) +* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) ([0205d3b](https://github.com/noir-lang/noir/commit/0205d3b4ad0cf5ffd775a43eb5af273a772cf138)) +* Sync from aztec-packages ([#4483](https://github.com/noir-lang/noir/issues/4483)) ([fe8f277](https://github.com/noir-lang/noir/commit/fe8f2776ccfde29209a2c3fc162311c99e4f59be)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5234) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5286) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5572) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5619) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5697) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5794) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5814) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5935) ([1b867b1](https://github.com/noir-lang/noir/commit/1b867b121fba5db3087ca845b4934e6732b23fd1)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5955) ([1b867b1](https://github.com/noir-lang/noir/commit/1b867b121fba5db3087ca845b4934e6732b23fd1)) +* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5999) ([1b867b1](https://github.com/noir-lang/noir/commit/1b867b121fba5db3087ca845b4934e6732b23fd1)) +* Trap with revert data (https://github.com/AztecProtocol/aztec-packages/pull/5732) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Use fixed size arrays in black box functions where sizes are known (https://github.com/AztecProtocol/aztec-packages/pull/5620) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Variable length returns (https://github.com/AztecProtocol/aztec-packages/pull/5633) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda)) + + +### Bug Fixes + +* **acvm:** Mark outputs of Opcode::Call solvable ([#4708](https://github.com/noir-lang/noir/issues/4708)) ([8fea405](https://github.com/noir-lang/noir/commit/8fea40576f262bd5bb588923c0660d8967404e56)) +* Avoid huge unrolling in hash_args (https://github.com/AztecProtocol/aztec-packages/pull/5703) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda)) +* Catch panics from EC point creation (e.g. the point is at infinity) ([#4790](https://github.com/noir-lang/noir/issues/4790)) ([645dba1](https://github.com/noir-lang/noir/commit/645dba192f16ef34018828186ffb297422a8dc73)) +* Don't reuse brillig with slice arguments (https://github.com/AztecProtocol/aztec-packages/pull/5800) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b)) +* Issue 4682 and add solver for unconstrained bigintegers ([#4729](https://github.com/noir-lang/noir/issues/4729)) ([e4d33c1](https://github.com/noir-lang/noir/commit/e4d33c126a2795d9aaa6048d4e91b64cb4bbe4f2)) +* Noir test incorrect reporting (https://github.com/AztecProtocol/aztec-packages/pull/4925) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e)) +* Proper field inversion for bigints ([#4802](https://github.com/noir-lang/noir/issues/4802)) ([b46d0e3](https://github.com/noir-lang/noir/commit/b46d0e39f4252f8bbaa987f88d112e4c233b3d61)) +* Remove panic from `init_log_level` in `acvm_js` ([#4195](https://github.com/noir-lang/noir/issues/4195)) ([2e26530](https://github.com/noir-lang/noir/commit/2e26530bf53006c1ed4fee310bcaa905c95dd95b)) + + +### Miscellaneous Chores + +* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) +* Move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a)) +* Remove `Opcode::Brillig` from ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5995) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a)) +* Remove fixed-length keccak256 (https://github.com/AztecProtocol/aztec-packages/pull/5617) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda)) +* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc)) + ## [0.45.0](https://github.com/noir-lang/noir/compare/v0.44.0...v0.45.0) (2024-05-03) diff --git a/noir/noir-repo/acvm-repo/acir/Cargo.toml b/noir/noir-repo/acvm-repo/acir/Cargo.toml index 9e1a2f940c4..32a9bbe8303 100644 --- a/noir/noir-repo/acvm-repo/acir/Cargo.toml +++ b/noir/noir-repo/acvm-repo/acir/Cargo.toml @@ -2,7 +2,7 @@ name = "acir" description = "ACIR is the IR that the VM processes, it is analogous to LLVM IR" # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true diff --git a/noir/noir-repo/acvm-repo/acir/benches/serialization.rs b/noir/noir-repo/acvm-repo/acir/benches/serialization.rs index e51726e3901..a7f32b4a4c7 100644 --- a/noir/noir-repo/acvm-repo/acir/benches/serialization.rs +++ b/noir/noir-repo/acvm-repo/acir/benches/serialization.rs @@ -33,7 +33,7 @@ fn sample_program(num_opcodes: usize) -> Program { functions: vec![Circuit { current_witness_index: 4000, opcodes: assert_zero_opcodes.to_vec(), - expression_width: ExpressionWidth::Bounded { width: 3 }, + expression_width: ExpressionWidth::Bounded { width: 4 }, private_parameters: BTreeSet::from([Witness(1), Witness(2), Witness(3), Witness(4)]), public_parameters: PublicInputs(BTreeSet::from([Witness(5)])), return_values: PublicInputs(BTreeSet::from([Witness(6)])), diff --git a/noir/noir-repo/acvm-repo/acir_field/Cargo.toml b/noir/noir-repo/acvm-repo/acir_field/Cargo.toml index 89ee161206e..dd4b7af9ffc 100644 --- a/noir/noir-repo/acvm-repo/acir_field/Cargo.toml +++ b/noir/noir-repo/acvm-repo/acir_field/Cargo.toml @@ -2,7 +2,7 @@ name = "acir_field" description = "The field implementation being used by ACIR." # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true diff --git a/noir/noir-repo/acvm-repo/acvm/Cargo.toml b/noir/noir-repo/acvm-repo/acvm/Cargo.toml index 1b671d49366..74aed429f9a 100644 --- a/noir/noir-repo/acvm-repo/acvm/Cargo.toml +++ b/noir/noir-repo/acvm-repo/acvm/Cargo.toml @@ -2,7 +2,7 @@ name = "acvm" description = "The virtual machine that processes ACIR given a backend/proof system." # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs index 0e7d28104da..5b778f63f07 100644 --- a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs +++ b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs @@ -282,7 +282,7 @@ mod tests { fn test_circuit(opcodes: Vec) -> Circuit { Circuit { current_witness_index: 1, - expression_width: ExpressionWidth::Bounded { width: 3 }, + expression_width: ExpressionWidth::Bounded { width: 4 }, opcodes, private_parameters: BTreeSet::new(), public_parameters: PublicInputs::default(), diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs index c6ca18d30ae..0e1629717b3 100644 --- a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs +++ b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs @@ -164,7 +164,7 @@ mod tests { Circuit { current_witness_index: 1, - expression_width: ExpressionWidth::Bounded { width: 3 }, + expression_width: ExpressionWidth::Bounded { width: 4 }, opcodes, private_parameters: BTreeSet::new(), public_parameters: PublicInputs::default(), diff --git a/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml b/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml index 1675d601351..63f64e97729 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml +++ b/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml @@ -2,7 +2,7 @@ name = "acvm_js" description = "Typescript wrapper around the ACVM allowing execution of ACIR code" # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true @@ -29,6 +29,10 @@ tracing-web.workspace = true const-str = "0.5.5" +# This is an unused dependency, we are adding it +# so that we can enable the js feature in getrandom. +getrandom = { workspace = true, features = ["js"] } + [build-dependencies] build-data.workspace = true pkg-config = "0.3" diff --git a/noir/noir-repo/acvm-repo/acvm_js/build.sh b/noir/noir-repo/acvm-repo/acvm_js/build.sh index c07d2d8a4c1..16fb26e55db 100755 --- a/noir/noir-repo/acvm-repo/acvm_js/build.sh +++ b/noir/noir-repo/acvm-repo/acvm_js/build.sh @@ -25,7 +25,7 @@ function run_if_available { require_command jq require_command cargo require_command wasm-bindgen -#require_command wasm-opt +require_command wasm-opt self_path=$(dirname "$(readlink -f "$0")") pname=$(cargo read-manifest | jq -r '.name') diff --git a/noir/noir-repo/acvm-repo/acvm_js/package.json b/noir/noir-repo/acvm-repo/acvm_js/package.json index 5be2f164ac4..48c5b2a8644 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/package.json +++ b/noir/noir-repo/acvm-repo/acvm_js/package.json @@ -1,6 +1,6 @@ { "name": "@noir-lang/acvm_js", - "version": "0.45.0", + "version": "0.46.0", "publishConfig": { "access": "public" }, diff --git a/noir/noir-repo/acvm-repo/acvm_js/src/lib.rs b/noir/noir-repo/acvm-repo/acvm_js/src/lib.rs index 66a4388b132..3b8210f4875 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/src/lib.rs +++ b/noir/noir-repo/acvm-repo/acvm_js/src/lib.rs @@ -2,6 +2,9 @@ #![warn(clippy::semicolon_if_nothing_returned)] #![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))] +// See Cargo.toml for explanation. +use getrandom as _; + mod black_box_solvers; mod build_info; mod compression; diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml b/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml index f40046acad6..6c1cd190254 100644 --- a/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml +++ b/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml @@ -2,7 +2,7 @@ name = "acvm_blackbox_solver" description = "A solver for the blackbox functions found in ACIR and Brillig" # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml index 3a6c9b1d55b..132dddd50e5 100644 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml @@ -2,7 +2,7 @@ name = "bn254_blackbox_solver" description = "Solvers for black box functions which are specific for the bn254 curve" # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true @@ -15,8 +15,6 @@ repository.workspace = true [dependencies] acir.workspace = true acvm_blackbox_solver.workspace = true -thiserror.workspace = true -cfg-if = "1.0.0" hex.workspace = true lazy_static = "1.4" @@ -26,20 +24,8 @@ ark-ec = { version = "^0.4.0", default-features = false } ark-ff = { version = "^0.4.0", default-features = false } num-bigint.workspace = true -[target.'cfg(target_arch = "wasm32")'.dependencies] -wasmer = { version = "4.2.6", default-features = false, features = [ - "js-default", -] } - -getrandom = { workspace = true, features = ["js"] } -wasm-bindgen-futures.workspace = true -js-sys.workspace = true - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -getrandom.workspace = true -wasmer = "4.2.6" - [dev-dependencies] +ark-std = { version = "^0.4.0", default-features = false } criterion = "0.5.0" pprof = { version = "0.12", features = [ "flamegraph", diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/benches/criterion.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/benches/criterion.rs index eb529ed2c11..a8fa7d8aae4 100644 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/benches/criterion.rs +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/benches/criterion.rs @@ -2,7 +2,8 @@ use criterion::{criterion_group, criterion_main, Criterion}; use std::{hint::black_box, time::Duration}; use acir::FieldElement; -use bn254_blackbox_solver::poseidon2_permutation; +use acvm_blackbox_solver::BlackBoxFunctionSolver; +use bn254_blackbox_solver::{poseidon2_permutation, Bn254BlackBoxSolver}; use pprof::criterion::{Output, PProfProfiler}; @@ -12,10 +13,58 @@ fn bench_poseidon2(c: &mut Criterion) { c.bench_function("poseidon2", |b| b.iter(|| poseidon2_permutation(black_box(&inputs), 4))); } +fn bench_pedersen_commitment(c: &mut Criterion) { + let inputs = [FieldElement::one(); 2]; + let solver = Bn254BlackBoxSolver::new(); + + c.bench_function("pedersen_commitment", |b| { + b.iter(|| solver.pedersen_commitment(black_box(&inputs), 0)) + }); +} + +fn bench_pedersen_hash(c: &mut Criterion) { + let inputs = [FieldElement::one(); 2]; + let solver = Bn254BlackBoxSolver::new(); + + c.bench_function("pedersen_hash", |b| b.iter(|| solver.pedersen_hash(black_box(&inputs), 0))); +} + +fn bench_schnorr_verify(c: &mut Criterion) { + let solver = Bn254BlackBoxSolver::new(); + + let pub_key_x = FieldElement::from_hex( + "0x04b260954662e97f00cab9adb773a259097f7a274b83b113532bce27fa3fb96a", + ) + .unwrap(); + let pub_key_y = FieldElement::from_hex( + "0x2fd51571db6c08666b0edfbfbc57d432068bccd0110a39b166ab243da0037197", + ) + .unwrap(); + let sig_bytes: [u8; 64] = [ + 1, 13, 119, 112, 212, 39, 233, 41, 84, 235, 255, 93, 245, 172, 186, 83, 157, 253, 76, 77, + 33, 128, 178, 15, 214, 67, 105, 107, 177, 234, 77, 48, 27, 237, 155, 84, 39, 84, 247, 27, + 22, 8, 176, 230, 24, 115, 145, 220, 254, 122, 135, 179, 171, 4, 214, 202, 64, 199, 19, 84, + 239, 138, 124, 12, + ]; + + let message: &[u8] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + + c.bench_function("schnorr_verify", |b| { + b.iter(|| { + solver.schnorr_verify( + black_box(&pub_key_x), + black_box(&pub_key_y), + black_box(&sig_bytes), + black_box(message), + ) + }) + }); +} + criterion_group!( name = benches; config = Criterion::default().sample_size(40).measurement_time(Duration::from_secs(20)).with_profiler(PProfProfiler::new(100, Output::Flamegraph(None))); - targets = bench_poseidon2 + targets = bench_poseidon2, bench_pedersen_commitment, bench_pedersen_hash, bench_schnorr_verify ); criterion_main!(benches); diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs new file mode 100644 index 00000000000..f89d582d167 --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs @@ -0,0 +1,184 @@ +// Adapted from https://github.com/laudiacay/barustenberg/blob/df6bc6f095fe7f288bf6a12e7317fd8eb33d68ae/barustenberg/src/ecc/groups/affine_element.rshttps://github.com/laudiacay/barustenberg/blob/df6bc6f095fe7f288bf6a12e7317fd8eb33d68ae/barustenberg/src/ecc/groups/group.rs +//! +//! Code is used under the MIT license + +use std::sync::OnceLock; + +use ark_ec::short_weierstrass::Affine; + +use acvm_blackbox_solver::blake3; +use grumpkin::GrumpkinParameters; + +use super::hash_to_curve::hash_to_curve; + +pub(crate) const DEFAULT_DOMAIN_SEPARATOR: &[u8] = "DEFAULT_DOMAIN_SEPARATOR".as_bytes(); +const NUM_DEFAULT_GENERATORS: usize = 8; + +fn default_generators() -> &'static [Affine; NUM_DEFAULT_GENERATORS] { + static INSTANCE: OnceLock<[Affine; NUM_DEFAULT_GENERATORS]> = + OnceLock::new(); + INSTANCE.get_or_init(|| { + _derive_generators(DEFAULT_DOMAIN_SEPARATOR, NUM_DEFAULT_GENERATORS as u32, 0) + .try_into() + .expect("Should generate `NUM_DEFAULT_GENERATORS`") + }) +} + +/// Derives generator points via [hash-to-curve][hash_to_curve]. +/// +/// # ALGORITHM DESCRIPTION +/// +/// 1. Each generator has an associated "generator index" described by its location in the vector +/// 2. a 64-byte preimage buffer is generated with the following structure: +/// - bytes 0-31: BLAKE3 hash of domain_separator +/// - bytes 32-63: generator index in big-endian form +/// 3. The [hash-to-curve algorithm][hash_to_curve] is used to hash the above into a curve point. +/// +/// NOTE: The domain separator is included to ensure that it is possible to derive independent sets of +/// index-addressable generators. +/// +/// [hash_to_curve]: super::hash_to_curve::hash_to_curve +pub(crate) fn derive_generators( + domain_separator_bytes: &[u8], + num_generators: u32, + starting_index: u32, +) -> Vec> { + // We cache a small number of the default generators so we can reuse them without needing to repeatedly recalculate them. + if domain_separator_bytes == DEFAULT_DOMAIN_SEPARATOR + && starting_index + num_generators <= NUM_DEFAULT_GENERATORS as u32 + { + let start_index = starting_index as usize; + let end_index = (starting_index + num_generators) as usize; + default_generators()[start_index..end_index].to_vec() + } else { + _derive_generators(domain_separator_bytes, num_generators, starting_index) + } +} + +fn _derive_generators( + domain_separator_bytes: &[u8], + num_generators: u32, + starting_index: u32, +) -> Vec> { + let mut generator_preimage = [0u8; 64]; + let domain_hash = blake3(domain_separator_bytes).expect("hash should succeed"); + //1st 32 bytes are blake3 domain_hash + generator_preimage[..32].copy_from_slice(&domain_hash); + + // Convert generator index in big-endian form + let mut res = Vec::with_capacity(num_generators as usize); + for i in starting_index..(starting_index + num_generators) { + let generator_be_bytes: [u8; 4] = i.to_be_bytes(); + generator_preimage[32] = generator_be_bytes[0]; + generator_preimage[33] = generator_be_bytes[1]; + generator_preimage[34] = generator_be_bytes[2]; + generator_preimage[35] = generator_be_bytes[3]; + let generator = hash_to_curve(&generator_preimage, 0); + res.push(generator); + } + res +} + +#[cfg(test)] +mod test { + + use ark_ec::AffineRepr; + use ark_ff::{BigInteger, PrimeField}; + + use super::*; + + #[test] + fn test_derive_generators() { + let res = derive_generators("test domain".as_bytes(), 128, 0); + + let is_unique = |y: Affine, j: usize| -> bool { + for (i, res) in res.iter().enumerate() { + if i != j && *res == y { + return false; + } + } + true + }; + + for (i, res) in res.iter().enumerate() { + assert!(is_unique(*res, i)); + assert!(res.is_on_curve()); + } + } + + #[test] + fn derive_length_generator() { + let domain_separator = "pedersen_hash_length"; + let length_generator = derive_generators(domain_separator.as_bytes(), 1, 0)[0]; + + let expected_generator = ( + "2df8b940e5890e4e1377e05373fae69a1d754f6935e6a780b666947431f2cdcd", + "2ecd88d15967bc53b885912e0d16866154acb6aac2d3f85e27ca7eefb2c19083", + ); + assert_eq!( + hex::encode(length_generator.x().unwrap().into_bigint().to_bytes_be()), + expected_generator.0, + "Failed on x component" + ); + assert_eq!( + hex::encode(length_generator.y().unwrap().into_bigint().to_bytes_be()), + expected_generator.1, + "Failed on y component" + ); + } + + #[test] + fn derives_default_generators() { + const DEFAULT_GENERATORS: &[[&str; 2]] = &[ + [ + "083e7911d835097629f0067531fc15cafd79a89beecb39903f69572c636f4a5a", + "1a7f5efaad7f315c25a918f30cc8d7333fccab7ad7c90f14de81bcc528f9935d", + ], + [ + "054aa86a73cb8a34525e5bbed6e43ba1198e860f5f3950268f71df4591bde402", + "209dcfbf2cfb57f9f6046f44d71ac6faf87254afc7407c04eb621a6287cac126", + ], + [ + "1c44f2a5207c81c28a8321a5815ce8b1311024bbed131819bbdaf5a2ada84748", + "03aaee36e6422a1d0191632ac6599ae9eba5ac2c17a8c920aa3caf8b89c5f8a8", + ], + [ + "26d8b1160c6821a30c65f6cb47124afe01c29f4338f44d4a12c9fccf22fb6fb2", + "05c70c3b9c0d25a4c100e3a27bf3cc375f8af8cdd9498ec4089a823d7464caff", + ], + [ + "20ed9c6a1d27271c4498bfce0578d59db1adbeaa8734f7facc097b9b994fcf6e", + "29cd7d370938b358c62c4a00f73a0d10aba7e5aaa04704a0713f891ebeb92371", + ], + [ + "0224a8abc6c8b8d50373d64cd2a1ab1567bf372b3b1f7b861d7f01257052d383", + "2358629b90eafb299d6650a311e79914b0215eb0a790810b26da5a826726d711", + ], + [ + "0f106f6d46bc904a5290542490b2f238775ff3c445b2f8f704c466655f460a2a", + "29ab84d472f1d33f42fe09c47b8f7710f01920d6155250126731e486877bcf27", + ], + [ + "0298f2e42249f0519c8a8abd91567ebe016e480f219b8c19461d6a595cc33696", + "035bec4b8520a4ece27bd5aafabee3dfe1390d7439c419a8c55aceb207aac83b", + ], + ]; + + let generated_generators = + derive_generators(DEFAULT_DOMAIN_SEPARATOR, DEFAULT_GENERATORS.len() as u32, 0); + for (i, (generator, expected_generator)) in + generated_generators.iter().zip(DEFAULT_GENERATORS).enumerate() + { + assert_eq!( + hex::encode(generator.x().unwrap().into_bigint().to_bytes_be()), + expected_generator[0], + "Failed on x component of generator {i}" + ); + assert_eq!( + hex::encode(generator.y().unwrap().into_bigint().to_bytes_be()), + expected_generator[1], + "Failed on y component of generator {i}" + ); + } + } +} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/hash_to_curve.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/hash_to_curve.rs new file mode 100644 index 00000000000..c0197883442 --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/hash_to_curve.rs @@ -0,0 +1,135 @@ +// Adapted from https://github.com/laudiacay/barustenberg/blob/df6bc6f095fe7f288bf6a12e7317fd8eb33d68ae/barustenberg/src/ecc/groups/affine_element.rs +//! +//! Code is used under the MIT license + +use acvm_blackbox_solver::blake3; + +use ark_ec::{short_weierstrass::Affine, AffineRepr, CurveConfig}; +use ark_ff::Field; +use ark_ff::{BigInteger, PrimeField}; +use grumpkin::GrumpkinParameters; + +/// Hash a seed buffer into a point +/// +/// # ALGORITHM DESCRIPTION +/// +/// 1. Initialize unsigned integer `attempt_count = 0` +/// 2. Copy seed into a buffer whose size is 2 bytes greater than `seed` (initialized to `0`) +/// 3. Interpret `attempt_count` as a byte and write into buffer at `[buffer.size() - 2]` +/// 4. Compute Blake3 hash of buffer +/// 5. Set the end byte of the buffer to `1` +/// 6. Compute Blake3 hash of buffer +/// 7. Interpret the two hash outputs as the high / low 256 bits of a 512-bit integer (big-endian) +/// 8. Derive x-coordinate of point by reducing the 512-bit integer modulo the curve's field modulus (Fq) +/// 9. Compute `y^2` from the curve formula `y^2 = x^3 + ax + b` (`a`, `b` are curve params. for BN254, `a = 0`, `b = 3`) +/// 10. IF `y^2` IS NOT A QUADRATIC RESIDUE: +/// +/// a. increment `attempt_count` by 1 and go to step 2 +/// +/// 11. IF `y^2` IS A QUADRATIC RESIDUE: +/// +/// a. derive y coordinate via `y = sqrt(y)` +/// +/// b. Interpret most significant bit of 512-bit integer as a 'parity' bit +/// +/// c. If parity bit is set AND `y`'s most significant bit is not set, invert `y` +/// +/// d. If parity bit is not set AND `y`'s most significant bit is set, invert `y` +/// +/// e. return (x, y) +/// +/// N.B. steps c. and e. are because the `sqrt()` algorithm can return 2 values, +/// we need to a way to canonically distinguish between these 2 values and select a "preferred" one +pub(crate) fn hash_to_curve(seed: &[u8], attempt_count: u8) -> Affine { + let seed_size = seed.len(); + // expand by 2 bytes to cover incremental hash attempts + let mut target_seed = seed.to_vec(); + target_seed.extend_from_slice(&[0u8; 2]); + + target_seed[seed_size] = attempt_count; + target_seed[seed_size + 1] = 0; + let hash_hi = blake3(&target_seed).expect("hash should succeed"); + target_seed[seed_size + 1] = 1; + let hash_lo = blake3(&target_seed).expect("hash should succeed"); + + let mut hash = hash_hi.to_vec(); + hash.extend_from_slice(&hash_lo); + + // Here we reduce the 512 bit number modulo the base field modulus to calculate `x` + let x = <::BaseField as Field>::BasePrimeField::from_be_bytes_mod_order(&hash); + let x = ::BaseField::from_base_prime_field(x); + + if let Some(point) = Affine::::get_point_from_x_unchecked(x, false) { + let parity_bit = hash_hi[0] > 127; + let y_bit_set = point.y().unwrap().into_bigint().get_bit(0); + if (parity_bit && !y_bit_set) || (!parity_bit && y_bit_set) { + -point + } else { + point + } + } else { + hash_to_curve(seed, attempt_count + 1) + } +} + +#[cfg(test)] +mod test { + + use ark_ec::AffineRepr; + use ark_ff::{BigInteger, PrimeField}; + + use super::hash_to_curve; + + #[test] + fn smoke_test() { + let test_cases: [(&[u8], u8, (&str, &str)); 4] = [ + ( + &[], + 0, + ( + "24c4cb9c1206ab5470592f237f1698abe684dadf0ab4d7a132c32b2134e2c12e", + "0668b8d61a317fb34ccad55c930b3554f1828a0e5530479ecab4defe6bbc0b2e", + ), + ), + ( + &[], + 1, + ( + "24c4cb9c1206ab5470592f237f1698abe684dadf0ab4d7a132c32b2134e2c12e", + "0668b8d61a317fb34ccad55c930b3554f1828a0e5530479ecab4defe6bbc0b2e", + ), + ), + ( + &[1], + 0, + ( + "107f1b633c6113f3222f39f6256f0546b41a4880918c86864b06471afb410454", + "050cd3823d0c01590b6a50adcc85d2ee4098668fd28805578aa05a423ea938c6", + ), + ), + ( + &[0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64], + 0, + ( + "037c5c229ae495f6e8d1b4bf7723fafb2b198b51e27602feb8a4d1053d685093", + "10cf9596c5b2515692d930efa2cf3817607e4796856a79f6af40c949b066969f", + ), + ), + ]; + + for (seed, attempt_count, expected_point) in test_cases { + let point = hash_to_curve(seed, attempt_count); + assert!(point.is_on_curve()); + assert_eq!( + hex::encode(point.x().unwrap().into_bigint().to_bytes_be()), + expected_point.0, + "Failed on x component with seed {seed:?}, attempt_count {attempt_count}" + ); + assert_eq!( + hex::encode(point.y().unwrap().into_bigint().to_bytes_be()), + expected_point.1, + "Failed on y component with seed {seed:?}, attempt_count {attempt_count}" + ); + } + } +} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/mod.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/mod.rs new file mode 100644 index 00000000000..0f62642516a --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/generator/mod.rs @@ -0,0 +1,8 @@ +//! This module is adapted from the [Barustenberg][barustenberg] Rust implementation of the Barretenberg library. +//! +//! Code is used under the MIT license +//! +//! [barustenberg]: https://github.com/laudiacay/barustenberg/blob/df6bc6f095fe7f288bf6a12e7317fd8eb33d68ae/ + +pub(crate) mod generators; +mod hash_to_curve; diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs index 4cb51b59755..eebc65db141 100644 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs @@ -2,41 +2,29 @@ #![warn(clippy::semicolon_if_nothing_returned)] #![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))] -use acir::{BlackBoxFunc, FieldElement}; +use acir::FieldElement; use acvm_blackbox_solver::{BlackBoxFunctionSolver, BlackBoxResolutionError}; mod embedded_curve_ops; +mod generator; +mod pedersen; mod poseidon2; -mod wasm; +mod schnorr; +use ark_ec::AffineRepr; pub use embedded_curve_ops::{embedded_curve_add, multi_scalar_mul}; pub use poseidon2::poseidon2_permutation; -use wasm::Barretenberg; -use self::wasm::{Pedersen, SchnorrSig}; - -pub struct Bn254BlackBoxSolver { - blackbox_vendor: Barretenberg, -} +pub struct Bn254BlackBoxSolver; impl Bn254BlackBoxSolver { pub async fn initialize() -> Bn254BlackBoxSolver { - // We fallback to the sync initialization of barretenberg on non-wasm targets. - // This ensures that wasm packages consuming this still build on the default target (useful for linting, etc.) - cfg_if::cfg_if! { - if #[cfg(target_arch = "wasm32")] { - let blackbox_vendor = Barretenberg::initialize().await; - Bn254BlackBoxSolver { blackbox_vendor } - } else { - Bn254BlackBoxSolver::new() - } - } + Bn254BlackBoxSolver } #[cfg(not(target_arch = "wasm32"))] pub fn new() -> Bn254BlackBoxSolver { - let blackbox_vendor = Barretenberg::new(); - Bn254BlackBoxSolver { blackbox_vendor } + Bn254BlackBoxSolver } } @@ -55,16 +43,15 @@ impl BlackBoxFunctionSolver for Bn254BlackBoxSolver { signature: &[u8; 64], message: &[u8], ) -> Result { - let pub_key_bytes: Vec = - public_key_x.to_be_bytes().iter().copied().chain(public_key_y.to_be_bytes()).collect(); - - let pub_key: [u8; 64] = pub_key_bytes.try_into().unwrap(); let sig_s: [u8; 32] = signature[0..32].try_into().unwrap(); let sig_e: [u8; 32] = signature[32..64].try_into().unwrap(); - - self.blackbox_vendor.verify_signature(pub_key, sig_s, sig_e, message).map_err(|err| { - BlackBoxResolutionError::Failed(BlackBoxFunc::SchnorrVerify, err.to_string()) - }) + Ok(schnorr::verify_signature( + public_key_x.into_repr(), + public_key_y.into_repr(), + sig_s, + sig_e, + message, + )) } fn pedersen_commitment( @@ -72,10 +59,13 @@ impl BlackBoxFunctionSolver for Bn254BlackBoxSolver { inputs: &[FieldElement], domain_separator: u32, ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> { - #[allow(deprecated)] - self.blackbox_vendor.encrypt(inputs.to_vec(), domain_separator).map_err(|err| { - BlackBoxResolutionError::Failed(BlackBoxFunc::PedersenCommitment, err.to_string()) - }) + let inputs: Vec = inputs.iter().map(|input| input.into_repr()).collect(); + let result = pedersen::commitment::commit_native_with_index(&inputs, domain_separator); + let res_x = + FieldElement::from_repr(*result.x().expect("should not commit to point at infinity")); + let res_y = + FieldElement::from_repr(*result.y().expect("should not commit to point at infinity")); + Ok((res_x, res_y)) } fn pedersen_hash( @@ -83,10 +73,10 @@ impl BlackBoxFunctionSolver for Bn254BlackBoxSolver { inputs: &[FieldElement], domain_separator: u32, ) -> Result { - #[allow(deprecated)] - self.blackbox_vendor.hash(inputs.to_vec(), domain_separator).map_err(|err| { - BlackBoxResolutionError::Failed(BlackBoxFunc::PedersenCommitment, err.to_string()) - }) + let inputs: Vec = inputs.iter().map(|input| input.into_repr()).collect(); + let result = pedersen::hash::hash_with_index(&inputs, domain_separator); + let result = FieldElement::from_repr(result); + Ok(result) } fn multi_scalar_mul( diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/commitment.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/commitment.rs new file mode 100644 index 00000000000..6769150508a --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/commitment.rs @@ -0,0 +1,76 @@ +// Taken from: https://github.com/laudiacay/barustenberg/blob/df6bc6f095fe7f288bf6a12e7317fd8eb33d68ae/barustenberg/src/crypto/pedersen/pederson.rs + +use ark_ec::{short_weierstrass::Affine, AffineRepr, CurveGroup}; +use ark_ff::{MontConfig, PrimeField}; +use grumpkin::{Fq, FqConfig, Fr, FrConfig, GrumpkinParameters}; + +use crate::generator::generators::{derive_generators, DEFAULT_DOMAIN_SEPARATOR}; + +/// Given a vector of fields, generate a pedersen commitment using the indexed generators. +pub(crate) fn commit_native_with_index( + inputs: &[Fq], + starting_index: u32, +) -> Affine { + let generators = + derive_generators(DEFAULT_DOMAIN_SEPARATOR, inputs.len() as u32, starting_index); + + // As |F_r| > |F_q|, we can safely convert any `F_q` into an `F_r` uniquely. + assert!(FrConfig::MODULUS > FqConfig::MODULUS); + + inputs.iter().enumerate().fold(Affine::zero(), |mut acc, (i, input)| { + acc = (acc + (generators[i] * Fr::from_bigint(input.into_bigint()).unwrap()).into_affine()) + .into_affine(); + acc + }) +} + +#[cfg(test)] +mod test { + + use acir::FieldElement; + use ark_ec::short_weierstrass::Affine; + use ark_std::{One, Zero}; + use grumpkin::Fq; + + use crate::pedersen::commitment::commit_native_with_index; + + #[test] + fn commitment() { + // https://github.com/AztecProtocol/aztec-packages/blob/72931bdb8202c34042cdfb8cee2ef44b75939879/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.test.cpp#L10-L18 + let res = commit_native_with_index(&[Fq::one(), Fq::one()], 0); + let expected = Affine::new( + FieldElement::from_hex( + "0x2f7a8f9a6c96926682205fb73ee43215bf13523c19d7afe36f12760266cdfe15", + ) + .unwrap() + .into_repr(), + FieldElement::from_hex( + "0x01916b316adbbf0e10e39b18c1d24b33ec84b46daddf72f43878bcc92b6057e6", + ) + .unwrap() + .into_repr(), + ); + + assert_eq!(res, expected); + } + + #[test] + fn commitment_with_zero() { + // https://github.com/AztecProtocol/aztec-packages/blob/72931bdb8202c34042cdfb8cee2ef44b75939879/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.test.cpp#L20-L29 + let res = commit_native_with_index(&[Fq::zero(), Fq::one()], 0); + let expected = Affine::new( + FieldElement::from_hex( + "0x054aa86a73cb8a34525e5bbed6e43ba1198e860f5f3950268f71df4591bde402", + ) + .unwrap() + .into_repr(), + FieldElement::from_hex( + "0x209dcfbf2cfb57f9f6046f44d71ac6faf87254afc7407c04eb621a6287cac126", + ) + .unwrap() + .into_repr(), + ); + + assert_eq!(res, expected); + } +} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/hash.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/hash.rs new file mode 100644 index 00000000000..28bf354edc9 --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/hash.rs @@ -0,0 +1,68 @@ +// Taken from: https://github.com/laudiacay/barustenberg/blob/df6bc6f095fe7f288bf6a12e7317fd8eb33d68ae/barustenberg/src/crypto/pedersen/pederson_hash.rs + +use std::sync::OnceLock; + +use ark_ec::{short_weierstrass::Affine, CurveConfig, CurveGroup}; +use grumpkin::GrumpkinParameters; + +use crate::generator::generators::derive_generators; + +use super::commitment::commit_native_with_index; + +/// Given a vector of fields, generate a pedersen hash using the indexed generators. +pub(crate) fn hash_with_index( + inputs: &[grumpkin::Fq], + starting_index: u32, +) -> ::BaseField { + let length_as_scalar: ::ScalarField = + (inputs.len() as u64).into(); + let length_prefix = *length_generator() * length_as_scalar; + let result = length_prefix + commit_native_with_index(inputs, starting_index); + result.into_affine().x +} + +fn length_generator() -> &'static Affine { + static INSTANCE: OnceLock> = OnceLock::new(); + INSTANCE.get_or_init(|| derive_generators("pedersen_hash_length".as_bytes(), 1, 0)[0]) +} + +#[cfg(test)] +pub(crate) mod test { + + use super::*; + + use acir::FieldElement; + use ark_std::One; + use grumpkin::Fq; + + //reference: https://github.com/AztecProtocol/barretenberg/blob/master/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.test.cpp + #[test] + fn hash_one() { + // https://github.com/AztecProtocol/aztec-packages/blob/72931bdb8202c34042cdfb8cee2ef44b75939879/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.test.cpp#L21-L26 + let res = hash_with_index(&[Fq::one(), Fq::one()], 0); + + assert_eq!( + res, + FieldElement::from_hex( + "0x07ebfbf4df29888c6cd6dca13d4bb9d1a923013ddbbcbdc3378ab8845463297b", + ) + .unwrap() + .into_repr(), + ); + } + + #[test] + fn test_hash_with_index() { + // https://github.com/AztecProtocol/aztec-packages/blob/72931bdb8202c34042cdfb8cee2ef44b75939879/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.test.cpp#L28-L33 + let res = hash_with_index(&[Fq::one(), Fq::one()], 5); + + assert_eq!( + res, + FieldElement::from_hex( + "0x1c446df60816b897cda124524e6b03f36df0cec333fad87617aab70d7861daa6", + ) + .unwrap() + .into_repr(), + ); + } +} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/mod.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/mod.rs new file mode 100644 index 00000000000..c3c4ed56450 --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/pedersen/mod.rs @@ -0,0 +1,2 @@ +pub(crate) mod commitment; +pub(crate) mod hash; diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/schnorr/mod.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/schnorr/mod.rs new file mode 100644 index 00000000000..cb213726973 --- /dev/null +++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/schnorr/mod.rs @@ -0,0 +1,146 @@ +use acvm_blackbox_solver::blake2s; +use ark_ec::{ + short_weierstrass::{Affine, SWCurveConfig}, + AffineRepr, CurveConfig, CurveGroup, +}; +use ark_ff::{BigInteger, PrimeField, Zero}; +use grumpkin::{Fq, GrumpkinParameters}; + +pub(crate) fn verify_signature( + pub_key_x: Fq, + pub_key_y: Fq, + sig_s_bytes: [u8; 32], + sig_e_bytes: [u8; 32], + message: &[u8], +) -> bool { + let pub_key = Affine::::new_unchecked(pub_key_x, pub_key_y); + + if !pub_key.is_on_curve() + || !pub_key.is_in_correct_subgroup_assuming_on_curve() + || pub_key.is_zero() + { + return false; + } + + let sig_s = + ::ScalarField::from_be_bytes_mod_order(&sig_s_bytes); + let sig_e = + ::ScalarField::from_be_bytes_mod_order(&sig_e_bytes); + + if sig_s.is_zero() || sig_e.is_zero() { + return false; + } + + // R = g^{sig.s} • pub^{sig.e} + let r = GrumpkinParameters::GENERATOR * sig_s + pub_key * sig_e; + if r.is_zero() { + // this result implies k == 0, which would be catastrophic for the prover. + // it is a cheap check that ensures this doesn't happen. + return false; + } + + // compare the _hashes_ rather than field elements modulo r + // e = H(pedersen(r, pk.x, pk.y), m), where r = R.x + let target_e_bytes = schnorr_generate_challenge(message, pub_key_x, pub_key_y, r.into_affine()); + + sig_e_bytes == target_e_bytes +} + +fn schnorr_generate_challenge( + message: &[u8], + pub_key_x: Fq, + pub_key_y: Fq, + r: Affine, +) -> [u8; 32] { + // create challenge message pedersen_commitment(R.x, pubkey) + + let r_x = *r.x().expect("r has been checked to be non-zero"); + let pedersen_hash = crate::pedersen::hash::hash_with_index(&[r_x, pub_key_x, pub_key_y], 0); + + let mut hash_input: Vec = pedersen_hash.into_bigint().to_bytes_be(); + hash_input.extend(message); + + blake2s(&hash_input).unwrap() +} + +#[cfg(test)] +mod schnorr_tests { + use acir::FieldElement; + + use super::verify_signature; + + #[test] + fn verifies_valid_signature() { + let pub_key_x: grumpkin::Fq = FieldElement::from_hex( + "0x04b260954662e97f00cab9adb773a259097f7a274b83b113532bce27fa3fb96a", + ) + .unwrap() + .into_repr(); + let pub_key_y: grumpkin::Fq = FieldElement::from_hex( + "0x2fd51571db6c08666b0edfbfbc57d432068bccd0110a39b166ab243da0037197", + ) + .unwrap() + .into_repr(); + let sig_s_bytes: [u8; 32] = [ + 1, 13, 119, 112, 212, 39, 233, 41, 84, 235, 255, 93, 245, 172, 186, 83, 157, 253, 76, + 77, 33, 128, 178, 15, 214, 67, 105, 107, 177, 234, 77, 48, + ]; + let sig_e_bytes: [u8; 32] = [ + 27, 237, 155, 84, 39, 84, 247, 27, 22, 8, 176, 230, 24, 115, 145, 220, 254, 122, 135, + 179, 171, 4, 214, 202, 64, 199, 19, 84, 239, 138, 124, 12, + ]; + let message: &[u8] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + + assert!(verify_signature(pub_key_x, pub_key_y, sig_s_bytes, sig_e_bytes, message)); + } + + #[test] + fn rejects_zero_e() { + let pub_key_x: grumpkin::Fq = FieldElement::from_hex( + "0x04b260954662e97f00cab9adb773a259097f7a274b83b113532bce27fa3fb96a", + ) + .unwrap() + .into_repr(); + let pub_key_y: grumpkin::Fq = FieldElement::from_hex( + "0x2fd51571db6c08666b0edfbfbc57d432068bccd0110a39b166ab243da0037197", + ) + .unwrap() + .into_repr(); + let sig_s_bytes: [u8; 32] = [ + 1, 13, 119, 112, 212, 39, 233, 41, 84, 235, 255, 93, 245, 172, 186, 83, 157, 253, 76, + 77, 33, 128, 178, 15, 214, 67, 105, 107, 177, 234, 77, 48, + ]; + let sig_e_bytes: [u8; 32] = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, + ]; + let message: &[u8] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + + assert!(!verify_signature(pub_key_x, pub_key_y, sig_s_bytes, sig_e_bytes, message)); + } + + #[test] + fn rejects_zero_s() { + let pub_key_x: grumpkin::Fq = FieldElement::from_hex( + "0x04b260954662e97f00cab9adb773a259097f7a274b83b113532bce27fa3fb96a", + ) + .unwrap() + .into_repr(); + let pub_key_y: grumpkin::Fq = FieldElement::from_hex( + "0x2fd51571db6c08666b0edfbfbc57d432068bccd0110a39b166ab243da0037197", + ) + .unwrap() + .into_repr(); + let sig_s_bytes: [u8; 32] = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, + ]; + let sig_e_bytes: [u8; 32] = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, + ]; + let message: &[u8] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + + assert!(!verify_signature(pub_key_x, pub_key_y, sig_s_bytes, sig_e_bytes, message)); + } +} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/acvm_backend.wasm b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/acvm_backend.wasm deleted file mode 100755 index bcf3bbf27ee6f7331f0ab8c776fef80ff023e3d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 756082 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 z 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 z�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

dkm%X3=UgWNSw$!dVTVkgzREa8n zlh%Ec*4fP<6MRvz#EHJ%v<`!!g{BsMfuk323~;^oB#w)F2ucM0)h7`oE^G)4M?O6p z60_||U}vU5mAwo&ruIoFubEhFO2~S! za3wvINBiXA!MdE`u8ng^_8$&ksKg4xhnEThfU-wZVyAh7Rbsfo?I|4o(s_4PV%j0( z@HELO;kRBsgZ<6?eGqT4M=b-S# z;wf0c68gv6BIHR@OsL+zsCmM1dn zgktr?OXyEI_9`R>`8}N^{+FM<^R1tG!)xFE>4FiJ!`lsYd6Kc7+H{IPnEAB2_Ol=O z@Ts4>F0pUNIq)ai>ktHi_CSjpN zLIP2@9->d+TE!=DFXp_uhv*aXP+|dApTKPyYQR8sCj-T89w^;T2CCZ{sBUYZy3IgQ zRSZ-yxV^W&iH;R*jA+=hhu!ipii-4m{Qz@e@ror%T1c>AiXDp;N>aFb(h~`(T(CE&)k5GWv3R?!^66e+Zl(?s0f@B-i`cyM=VB#?)9GWHIVDPrJE3cy-UIN&av7`||#>T+0mNB%D zTRm~8g#mbZEWj&IwLTF{?AU=tYd9`C0!MIM=*hT_>o)CBIInv#(6Tb4z46%3m1IqY zC3jUA&+w!H(jgjJcaKa210`6D)apBJ3llu+)vqZdK8cow7xJPH{uW;JdA_cgXK^iA z@B-Sx`1!0$ctJ$QWR`MBdO<`s>xJ=2lJC|_Om(b=Xd$F|Io_dY^&Sf46_6{v0s?Q* zie3TcXz^Yyuu!u|do?8t!y1Zc4!Yg1eVsRhBEVoTB;Lq55RY1mO+&1R`nut}+ z&|n0wzF+{A>zF4vyN<>3x||c`k5!9gPiBj%L>~t~O-zGn3vc6mb&*`JmNnC1$4#p? z8Kz9pIb%s_nY)#iJ@-w|o!E0>Om?r3>j$k7aRO#pe;z zAjW!|EH6tSMB!2)BuE()fA9DUe)^*?zwHzEvPD+nY1_;sGeFzSgzwvgk1U&=xD z!#$pyzUP1(cA*Vgit@9m3)`EfCa}X!H*!xO>@3D#diy)Hu?%?rGc~3D+@C5Tqz*0xxK?9jmSR~^z&>FGn zwxayTBVrAq&a~AQBt$)GD-?W$AaT=53?zi6_N||_dVtAvy&mBFN_H$GG)hcYu)%^k zO{521Z%LdUVxphaJ?$`Ld*VzF7I_4)fQ~$xR=gDdfgXgBI#eR|K(5mRMe~W}h*l49 z2wkrS5hrP84pI-813`Dw1DT}{5qdalsFK~}(dMpb#HEdD=lx`7kepmpgu#d|MUj=M zB9)7**R`;CAh;g+otJ;&Pc~hfwDeKTB1=u#)`7xv(_jDc%jd484au5MTX_7D`+xPN zlYlTs{>OC2lx?5F|NU#%f1n^~BLP*v?e%Y)M9e($s?Xm0 z`%64cMuRW@#>Xxrm6siWtZXSL*IEk7Y$=%7{f-)~$Oe_UuwiM(+XG49q6lg4E z?n@nJRAdaWIm1(ttsLrX+en}-IxH(~nzhI*Hp40AoT^3P$X}3`W6njY$+uH>n#MTO z;piF@p(7qBts<3a2(_6DlZHoEt4C!Tcx~!p2s|eWC{w2CQv8fE&7?M-W25n0D}d&i zdn?AF{%5ldot$2AT4&ddf;Bo;;o*3=lHPps)Wa(ircR<|l}Da~g-3fLQ}wp-mMIoRGKm7Q zj!KniUzy@rB-)ojJQ2!Fy#keJwm7yzX8}4llFT;VGEtQLVQ5Fjk>M1T$Y_GfmQfAO zGGhvKrXeGFh%6N`Rge_Ofyvt%vu-x~A~Fi)XUx2&j%h^J8MCt?-noIo+e8C$^OcoC zg5=IAD}@AU6OR-UBoB;AtutTI#WvN>Cf}fD8u@F6=w=hd7s#{_KG}8Iv$<&s;YGwj zY}1EUzy=X?vU`#`0H0RG348^N!qWj8kZQ@@w7yw4Af%CqQkA`ClW zkb-c|M;et9+X}+7?0@L1NZj)Org`{(SHI1dWL~hhHv&BVU$90wK1&a>c~7d1c0=@~ zHz)5Zl+h)*qFcY+4r!5=?4OUMH)L42XjzeO$B*r3H3+8Nu zoX0TNl?4(*S290Byk$OXF1AF%*<_mQVvy_EB$PV$)F#TY!ih|r#RP-`;`*UXShq7fs-}mJ>A)J_!t0yTo8zbk+-nK4SRg|9*kse zh{gi%;Syu^-STO*ZJ>uWj6>*TPzOI?!8&8EBvW{TRno`Vi7%k$qg#aa$*UKTZq;zxfo6pbImN$2Bz$JWSOuOm~nr_w%l` zV#;X7x;)4t}~O z022F#$ez*9dtqVdA}Y68;}Isw)&@9ctG!H|+B+Q>8d|LOF1OojPXcJdOnbN5_OU$E zUiQz@ur*PkBUto|MWnCx+GsNsYKr#uv7$v>CQhG{3e&4@^;-FsJcg zNe|Et;=!EWsQdsi0Uwfhki+~fwnu^aWz9qLF&%h|*-RT5d+o94YVK-uC6SIv^eqk` zpx2z2Fcp0Z8G+n2(YH7|iR{H``&Oy3V5fJY6lDWgG z!!g`3FPy9)vz=zL)D&CK(@f$=s0W%!$$mUwCZ90eKB%`3eyhEbnCXEiO;8x&z63D_ z2z~}pZ~$ZYoZ_@=*<{E}di%MTp0qd%@6hfw{`7*JS~Ssm6-;p4c_xs`N)r2Or9c>>hY}Ms4&KNM(K}?kr zLTPiQdji`f&0wY>G^IBck9==waCugH+y+;mw!m*xu$V~9!X&;gF)BVzL#%z5lFpb6 zGc(Ja=017&q2tw9o4;sN43*m$W78k}-sbh44v?L&j&~1_;pxX%OlBGCm^DXOvNn&w z8WzjL-NR+`x2CrY6B9QYY@VN=FFIuxh9}%gM`Y<+KVLv)J&5k z=K?*Yv&%>nD$SxHWi?T-QxqFConnA2P7equLxT|F>w@OE3NPuVR+Va%fiqx@N++%A z1&m1aQSsCwk1h;S(*#`7uKCmy4^y-xq8m(F!f2s1Xq}2#`5wF+d|`g`%+6h*)`2uk zG01gH*i7Q-^oMcjBG1!MK^M%Z`ZI0b=JR-G%lo10-nu5Cwg#ZfOLQ!WxwO1B=IC|d zjG>-rjKTT1K=kT@+GPx4Bx9ErpEbo$m3;1BXnagQu(PSDP$IhFQ2}6>%+&nh5-)7h z8LW%r&eeeVCc1+l>^b5MqSSNT+-Q>^s6X7KWjW|MJ@iIQetHb+XmPj9E4)L~xF=*h z=m-%pcfTuL4bC_N^SWa5uYouI0tm#l2W1wfo0CSpZO+z8xKmYj06umJB zpfFE_2}mozTld63I|2EnZxog8b0c;an;G zsVCnsdi2<3&c`t?LgjElbrfRDWh@4vXSp&L*7uD|dZNOV;v!t~Bgli0U`<^Sm7sa2 z`G6ZIif3-;rl?M3M^khejLShj6pOkA7(JLca7OEhG@f6(1cz+|Z+&J=^edpp+Q-AwSZ z`crHu08iL_qB_N~;7*Lp`O!i*6mJZkLDG&k8iKQ~wOkj)y=%zen;S`HaQQt(U< zbb1MyqM7_a#V2Cenn%-e*z98%TV@eUVRh)r(dlu^WqFu^GX-cdG?NS%EK*X)Uzo&t z67;kMmvPdBh$21X-wmC8OnDrw${L!r=$c-?VE(3y4;+VkOIw{4^8NdgTw|^Qf>8tgzCO4~Chxf-upt zDlAN?qX4q33jMY&nyes$8BLlvU#OS;8C^6q>DY1ET15m_DLi8ZnU^Nb7@VlfBapuE z6jAibmhA%xTCJR)YNfT~{%En?N}~J9Hn4f7mD}rOtMJnrb9jTq&cjwKaqFOPgmZ1y zK6ZqyriTL%t=xef1V@QYPZ;SSK)Hy7pAgV6e*&^1hmiRvUB$uB6~f2D6RsL@ZkX0Y z=Ijt6vW}|EDU+02q}+KRQN^_F67|Q$L)tWS{{+T}mT`eGI?0=a!QMQTO;esU+$M=} z>krmDuddI#8aBDjvit+6Lf=fErpZcCpDx)BGc_Zy`DDqM1|8rjSu&=e#}HLxvyr~u zw!>(sXQ7AVW650uJ;2D?c_}q7&{3=n%nP;`&kH0YtS?hbY0|92`Z5hjQZr){_7p5R zqH2w8ZMx0dwa=(tTm$h-vJW-3&{tg^iY;FoHk`mU=R@Aj!g{ zzzGAEUO@?pzHxN!3#5u_9uqKeucx#_*YP96CeR7pN5N9JS{ep~N9QKLc-H8*8M& ziDS)6*O`~{Bp#SnJ|M(aau)E|Hbtd_+@q4`r4dN5No=sm&^)?z&rxecY8jP(A$S!R zCtfIu7Gik*Ci){%uf7Q!&o^NLxsa3=1QA3*@Ph9Q{sC+mpP~g1z?Sjp z)7mmVv#~AXv**B;@hQo)5*{p)KL}gKrydGhM!QvKZ_9|LeBEprpL?*j4EIj*m4$oB zSRt%T*)l%&4P(pr)HjYTLzsmoU~ugohM=9jEd$^!w()m z5Z7jn8o>Kx?dh}Z_?)(u*ya&TV`H0#+JmSpF#h}4JTmb+M>Y@fDQq4Ot(JlKv9Xq+ zPMu>dgKwTe%g}_hwG15QOcBFSb_~g&@h4=#Qs7!-U84I9!VR+W<{7@R&lmAcgzu_IT1>Go*R z89=9`gaS3KgXcGE>V(~UOygK}st8wr+&MH+#FZJ(s(%g!-J3kC9)Ehzs_J=g4VmPU z42|NdFSh-t+<+yu#;e|gcXyIcpk`-woxe0=?nTH8O$QbLT@*Y@{%YD>M^1Q+IgKAe znY_xJMhGk!@+fb9ZaaH2q{1P>F@Q00bJPT7(iS@gINx*L&-r!?a6UE=H(K!YU1xL$ zquFw844DED85Nq8acyU?7kB;sMG7u_id96ywE}s_)x2`2)@_#Bq-dNFtNk$~# z-uRYCDp)V=P~><$jWE7FM^YsjF@AgFJL72t0LFzh4o-VA?dJAoHsj%{uiG2By&`UP z#F-QaauufdxYqV__h|1gGs2o&9e|+8DC+>*mm z6=~ODi&mul4I93cb_?vWI*0e+3uo>2;it-@x&S>9F@(E-2{AT= z$!tOm7KGRC%K@8VS%UEd8Ng`8g$Oq?0NrO4^Llu1yeRs@oIl2kYBX)j)wYXQr2C`ss5Ixx%+l6 zK94Slh|qTXaQ|tnjRB>Eeh(FE`}4 z8%OYfH`#sG+3qubQ-i-~y4aQco4bkQyvV1!358cTG44T1d=y~Uons4qSAB6FJENK4 zE@3f6)``B#NAIb~0Bru2u;wlb_8N9QhJPWv35Z;;KzfG`cbyyB6>aea5 z$uH>&?Y>V}pzU+I!hJs7^?u={t!L zo#RN~!F`S+eLMGff;)EfE!>|<_cL*%@1p|_n;=rTF#a6LRvhUsk^Bt}K&^){DD<9t zL2r&l&8rF?jgge7(P$vVEbw@->HHL8DwxGN1(>AAD%g%4?J5nmM0FjUD&ffxo?CD^ zUI0{~DVLQ5hw#k3Tvul9#kw+cHwWl4)o#wq11}ehriAJy>0U)MUrf@yB65}P95hF@AG&{wX$Ppphqo(Hk+h|;j9&L>qn(oo_$TEWeE3|w+x?*vKxH9b7j(gDX zOUj1OLk*iXO~w$qEE3QB47x>U@Vp7-V2Y1vBV4n=;fEk_;Lww6%Xf-G{80wYF`%oj zh|^7kJWlDNB(z#w1Hvx&iD1!^W2)cmjEd^V5m6-Cve6?7bgElbOLP}nHTc(SH(ID# z$z6`&@`?_!3z}hyS)seyF)P%ReW-BsoIzk!wt6=7VkTzA;HR3t_Hti?Lh_9tqP+Xs zRS&KtrM^1SwfZVTK8o5y6n9tF+i|GR#(UT;+Fka8QeBQ(|E&qxi86~&vYEC74@mqPk5sYLQj!`dRMasC6m&yC=+!eKUY%^Rs6z9;uMghFzpIwfdf^^5+4AsS&lj1oHkZtfY< zbLJ6-=8jhX4nUWF#Mc^W$F+(eKq7(h4r7JsICyYvSq>5d7u0?c-EHE|1PTWvpm zt%)NeV%&gvi9P{b|0W@rHL#=?H(Fz;#OTdx)bZnJm0ARiLE%R8WZjw(2o1O+RkdSP zwPXOKsuqK%Shu9G{B6;}G@-Oels}K)12_ampBL)oqg<{p2d~WPW{BzF3!H= zkJf!!#E0!dB0jjoi1^@3Wfo*0o)Dk3BcmZcwv@Dp4=xB|P6CKvPTVEp6DR4EL42gB z1@RF%3*uAiBGDv>Psyhf@yVc=h|m0b#OHShTkM(@>}YyZn(}ngdo?}6SN)W<#d*CXpsmq?Bgsy7tOXBBiA8COJ~dAfDz( zDJe8cj+ElS{gX&3j>g|@BBdyNJvFCDDLEWD9#VO;eRK46j%TeCtpD@#?s~`I+9p*(toYeiWp;KpQUeRK5nBocBj2i)+U`8r1cnT{F~`{^A>12-c@3Q-@^nFNZ(e$5a+ z<>3~w+8pwP)9>;vJJ|Cr(a7`dA`V!XF}}9t#E?A;`L;ia#lKW<0gYstApEe1Boh{a zQkE6?HDb;96zm)*MJHhAKq-Xc=X~i1l%f-|bD$KRhMfbY5HuwR#ZhQ}1)-RPLec$f zXXDI)R%rgSI2Ah|D4=hpd7DhqMzL`7@aV-9C?yY`vL5`Y*r%DuI7wldQOD(ci|vmb z$E=74OSn+AT?TQtQ?|~(p7I*R#ZCE+r_c_RvJ5PczZr+T=}=Oe?K`+>Z73;ioLsY6 zuy2R2rRmLr-ssuYmbm^AD5ag$BFI=*j#>5>v{?<}NFW6}c8Mxs@sXe4Vk>%Xjo+5U zhj}=jlw(;<$ER+Al+RWFQraO#RA&;g5zUoS5Ptq z#zIP_TT;4}=~mnlH?m@!o%r+M$gXdw=A6Vm)RK3bkl}*h_Zjal40``9N=opKS&Oi;v=ln7VaQ zL>exbxOF+qByFY=CsyK8#YF*NQ5qzCqU1_6uY1*x0mT@uInFLw&N<318O~Q5yLqjt zSFeag@NGrGksGdlH7*C^a)_F?2wLPsNEbFE(75&65a={CLFaQRR3SS zBq$i*_^fs<2?$8|JiaBt013BvNq6+Fs5y9DM}E;4f!0&&tpLKHWX~3iS`h-1{7wkK z^n&0OM+QqZsz4x1x{;I}>l4544FB4=W%(VVg?DAYx*lnV%31DQ9Pd4fR>r&?V_un_ zW9ifpHb&9}me;U8^2<^iy6QiVr8-YPK=47y%R=obeOez$Vmzao1bEIWNuv932XAT_ zBsspS1DI`{(cnEsU1v0i->r8%x(n8I>+O&3-mEM0a-*)H)ErN@OzSP&N-Fz3Wm&Jk zti&YAeV81qF9=d>4R{|N<4%@ucV$k>pHySZTpgPRi1mS}4|%l&CEc4qwdHUT2wI#P zA}h~Q*bp>5S2PRx*T)^FxswRG0`55J4oOfQEj#UwiBgP$V9`O1B<*SDQsYUwnQM(I z=>`_u_5G8cuSUlKd=0aEeK1TW;Hjlsbz7ZgH`pcJC##%KnYq%CrMxS2$J?ftxN3Q1 z<|KdvRX`2f3W1^6MPSh2k%(DiI{9kbs>h;Q%c>+Z3EWzgEeMMFs>F#0a zf|A={7yDYeLUljom%%B5xzK}#l)8wGd5wK9szZHmH|+T(=cP`Fsq8lsYRZZs%3QMJ zlxpD}q}9aRxk^ps7eEfp{@_tP5jj7U1$|}6oWY>GAit~bNC!^H#3mRk4eKh#nU_%` z_9&W}j8HFZH&RQHZe%EIn5StZFvYT_z&IM|aio!5H`3S^19>y8#qvq>#a|LQ2p7BJ z!>quUSVd`DYt)2?DoER!7DtUSmj59SUqj5JWqjd>coDV?=)gaYR=bA!WLAD!);f)o zkc(+m32Q+}3qLV6p<(=l!2Ubyg__2nX{PQ0!;}a=hOnW=sDUm9Q{P_)x~Aw`6tStW zHBJK77?EFSHEU|J7?QJ}tlUDiC{3GTQE6jwGi@eY8%$dZD+I04$jR7sGZRiigw5*$ zsAO!%%B~5z0?-U&I~HFpy|(mNsE;5I;E$;+HHM`RpG`_F9D?a=04NTvRWaKaRU-$s zGo^1`s!l7jSgF@mo*HV|oF<8#j%64Jk{^kCjTtNS5DC z?Gm=(K9^C8ZoP}X$G%R|C=_rdq6WLdQnBaOmI z8qi}=3|STdE*pjAK}+=Jv#qyXYpqS9k}}q-x9+j2`Z2|lcA-I2h(cVeGqj0CAm*-k zY`vfm29|KJehJj24&-%>(E_cKFf${35{R_A34^J|6g>vnX4r>2!~I_yDl%O(hn1%> z4AYC;A$>`1BHb`l$xWmihT9K<(Acc|B9)?-O?~306P2Yem8EsYsnC@+^>qoa6^{){ z|EN2tUQ%-I{7VVgs~BWmuc?{6mX1jk!&EO3LlQ8R`3-jKZS!6CZ-JpgGl3D)hqAiB zP`_z6qKbAq^I+3%0r~NBxiU9MG}!X$?8s+Xv&K zdYSgnFobD#lmdcePZhz2M-r+5UwC0CBJdbzN1R0a@eCZt)p zF~W>J9I8skjj|(KhVS^^s3&$u;tFY%)oB*|29%i_?eD|;)AA?uKjhA$p z+2JO^M(y}7ENtkU`j{n+6QB#BW_pYxj5gqavgUw%8a1`t0r^sNJ_E8ktC7ZOYjeF# zuVddqFq)T}nA&=8p%>@Ix8tjL<13QCf-*QZd3jN988_mFW%JA+m6 z@ty6A`(K{E@De=Q#`opa%}RYbr*2g0-kdtF)bU)&ElS;zQ>PFthKu|!88;Zy#C%wn zVRya-)t}c{=DZ0mrFU_q`awy7P*blQ;_QhF1VIp=2%)1WVue^7j_cLWO5j!vdSE46 zk1L|b{VR+upbc@=ficl*Nt!ARH2QP#V)a}bl?Pv%U!2*k>bAdDr)YsIg+YQ%bGl_<6(}Zs?)M24_VE$p>CZ>s@d>26G>Igp#p6VU6@2e zjWD21VATi|+Js#VD_Ij~HAhmNi>hWLspbz0DY6w2>rB1{-}5b8A>S&#jR;?D`11nv=JUM4+-O@Ke&>g!k=BB5HT z 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 diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs deleted file mode 100644 index 302ffa8af9b..00000000000 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs +++ /dev/null @@ -1,25 +0,0 @@ -use acir::FieldElement; - -#[derive(Debug, Default)] -pub(crate) struct Assignments(Vec); - -impl Assignments { - pub(crate) fn to_bytes(&self) -> Vec { - let mut buffer = Vec::new(); - - let witness_len = self.0.len() as u32; - buffer.extend_from_slice(&witness_len.to_be_bytes()); - - for assignment in self.0.iter() { - buffer.extend_from_slice(&assignment.to_be_bytes()); - } - - buffer - } -} - -impl From> for Assignments { - fn from(w: Vec) -> Assignments { - Assignments(w) - } -} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs deleted file mode 100644 index f4f6f56aa99..00000000000 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs +++ /dev/null @@ -1,352 +0,0 @@ -//! ACVM execution is independent of the proving backend against which the ACIR code is being proven. -//! However there are currently a few opcodes for which there is currently no rust implementation so we must -//! use the C++ implementations included in Aztec Lab's Barretenberg library. -//! -//! As [`acvm`] includes rust implementations for these opcodes, this module can be removed. - -mod barretenberg_structures; -mod pedersen; -mod schnorr; - -use barretenberg_structures::Assignments; - -pub(crate) use pedersen::Pedersen; -pub(crate) use schnorr::SchnorrSig; - -/// The number of bytes necessary to store a `FieldElement`. -const FIELD_BYTES: usize = 32; - -#[derive(Debug, thiserror::Error)] -pub(crate) enum Error { - #[error(transparent)] - FromFeature(#[from] FeatureError), -} - -#[derive(Debug, thiserror::Error)] -pub(crate) enum FeatureError { - #[error("Trying to call {name} resulted in an error")] - FunctionCallFailed { name: String, source: wasmer::RuntimeError }, - #[error("Could not find function export named {name}")] - InvalidExport { name: String, source: wasmer::ExportError }, - #[error("No value available when value was expected")] - NoValue, - #[error("Value expected to be i32")] - InvalidI32, - #[error("Could not convert value {value} from i32 to u32")] - InvalidU32 { value: i32, source: std::num::TryFromIntError }, - #[error("Could not convert value {value} from i32 to usize")] - InvalidUsize { value: i32, source: std::num::TryFromIntError }, - #[error("Value expected to be 0 or 1 representing a boolean")] - InvalidBool, -} -#[derive(Debug, thiserror::Error)] -#[error(transparent)] -pub(crate) struct BackendError(#[from] Error); - -impl From for BackendError { - fn from(value: FeatureError) -> Self { - BackendError(Error::FromFeature(value)) - } -} - -#[derive(Debug)] -pub(crate) struct Barretenberg { - store: std::cell::RefCell, - memory: wasmer::Memory, - instance: wasmer::Instance, -} - -use std::cell::RefCell; - -use wasmer::{ - imports, Function, FunctionEnv, FunctionEnvMut, Imports, Instance, Memory, MemoryType, Store, - Value, WasmPtr, -}; - -/// The number of bytes necessary to represent a pointer to memory inside the wasm. -// pub(super) const POINTER_BYTES: usize = 4; - -/// The Barretenberg WASM gives us 1024 bytes of scratch space which we can use without -/// needing to allocate/free it ourselves. This can be useful for when we need to pass in several small variables -/// when calling functions on the wasm, however it's important to not overrun this scratch space as otherwise -/// the written data will begin to corrupt the stack. -/// -/// Using this scratch space isn't particularly safe if we have multiple threads interacting with the wasm however, -/// each thread could write to the same pointer address simultaneously. -pub(super) const WASM_SCRATCH_BYTES: usize = 1024; - -/// Embed the Barretenberg WASM file -const WASM_BIN: &[u8] = include_bytes!("./acvm_backend.wasm"); - -impl Barretenberg { - #[cfg(not(target_arch = "wasm32"))] - pub(crate) fn new() -> Barretenberg { - let (instance, memory, store) = instance_load(); - let barretenberg = Barretenberg { memory, instance, store: RefCell::new(store) }; - barretenberg.call_wasi_initialize(); - barretenberg - } - - #[cfg(target_arch = "wasm32")] - pub(crate) async fn initialize() -> Barretenberg { - let (instance, memory, store) = instance_load().await; - let barretenberg = Barretenberg { memory, instance, store: RefCell::new(store) }; - barretenberg.call_wasi_initialize(); - barretenberg - } - /// Call initialization function for WASI, to initialize all of the appropriate - /// globals. - fn call_wasi_initialize(&self) { - self.call_multiple("_initialize", vec![]) - .expect("expected call to WASI initialization function to not fail"); - } -} - -/// A wrapper around the arguments or return value from a WASM call. -/// Notice, `Option` is used because not every call returns a value, -/// some calls are simply made to free a pointer or manipulate the heap. -#[derive(Debug, Clone)] -pub(crate) struct WASMValue(Option); - -impl From for WASMValue { - fn from(value: usize) -> Self { - WASMValue(Some(Value::I32(value as i32))) - } -} - -impl From for WASMValue { - fn from(value: u32) -> Self { - WASMValue(Some(Value::I32(value as i32))) - } -} - -impl From for WASMValue { - fn from(value: i32) -> Self { - WASMValue(Some(Value::I32(value))) - } -} - -impl From for WASMValue { - fn from(value: Value) -> Self { - WASMValue(Some(value)) - } -} - -impl TryFrom for bool { - type Error = FeatureError; - - fn try_from(value: WASMValue) -> Result { - match value.try_into()? { - 0 => Ok(false), - 1 => Ok(true), - _ => Err(FeatureError::InvalidBool), - } - } -} - -impl TryFrom for usize { - type Error = FeatureError; - - fn try_from(value: WASMValue) -> Result { - let value: i32 = value.try_into()?; - value.try_into().map_err(|source| FeatureError::InvalidUsize { value, source }) - } -} - -impl TryFrom for u32 { - type Error = FeatureError; - - fn try_from(value: WASMValue) -> Result { - let value = value.try_into()?; - u32::try_from(value).map_err(|source| FeatureError::InvalidU32 { value, source }) - } -} - -impl TryFrom for i32 { - type Error = FeatureError; - - fn try_from(value: WASMValue) -> Result { - value.0.map_or(Err(FeatureError::NoValue), |val| val.i32().ok_or(FeatureError::InvalidI32)) - } -} - -impl TryFrom for Value { - type Error = FeatureError; - - fn try_from(value: WASMValue) -> Result { - value.0.ok_or(FeatureError::NoValue) - } -} - -impl Barretenberg { - /// Transfer bytes to WASM heap - // TODO: Consider making this Result-returning - pub(crate) fn transfer_to_heap(&self, data: &[u8], offset: usize) { - let memory = &self.memory; - let store = self.store.borrow(); - let memory_view = memory.view(&store); - - memory_view.write(offset as u64, data).unwrap(); - } - - // TODO: Consider making this Result-returning - pub(crate) fn read_memory(&self, start: usize) -> [u8; SIZE] { - self.read_memory_variable_length(start, SIZE) - .try_into() - .expect("Read memory should be of the specified length") - } - - // TODO: Consider making this Result-returning - pub(crate) fn read_memory_variable_length(&self, offset: usize, length: usize) -> Vec { - let memory = &self.memory; - let store = &self.store.borrow(); - let memory_view = memory.view(&store); - - let mut buf = vec![0; length]; - - memory_view.read(offset as u64, &mut buf).unwrap(); - buf - } - - pub(crate) fn call(&self, name: &str, param: &WASMValue) -> Result { - self.call_multiple(name, vec![param]) - } - - pub(crate) fn call_multiple( - &self, - name: &str, - params: Vec<&WASMValue>, - ) -> Result { - // We take in a reference to values, since they do not implement Copy. - // We then clone them inside of this function, so that the API does not have a bunch of Clones everywhere - - let mut args: Vec = vec![]; - for param in params.into_iter().cloned() { - args.push(param.try_into()?); - } - let func = self - .instance - .exports - .get_function(name) - .map_err(|source| FeatureError::InvalidExport { name: name.to_string(), source })?; - let boxed_value = func.call(&mut self.store.borrow_mut(), &args).map_err(|source| { - FeatureError::FunctionCallFailed { name: name.to_string(), source } - })?; - let option_value = boxed_value.first().cloned(); - - Ok(WASMValue(option_value)) - } - - /// Creates a pointer and allocates the bytes that the pointer references to, to the heap - pub(crate) fn allocate(&self, bytes: &[u8]) -> Result { - let ptr: i32 = self.call("bbmalloc", &bytes.len().into())?.try_into()?; - - let i32_bytes = ptr.to_be_bytes(); - let u32_bytes = u32::from_be_bytes(i32_bytes); - - self.transfer_to_heap(bytes, u32_bytes as usize); - Ok(ptr.into()) - } -} - -fn init_memory_and_state() -> (Memory, Store, Imports) { - let mut store = Store::default(); - - let mem_type = MemoryType::new(18, Some(65536), false); - let memory = Memory::new(&mut store, mem_type).unwrap(); - - let function_env = FunctionEnv::new(&mut store, memory.clone()); - let custom_imports = imports! { - "env" => { - "logstr" => Function::new_typed_with_env( - &mut store, - &function_env, - logstr, - ), - "memory" => memory.clone(), - }, - "wasi_snapshot_preview1" => { - "proc_exit" => Function::new_typed(&mut store, proc_exit), - "random_get" => Function::new_typed_with_env( - &mut store, - &function_env, - random_get - ), - }, - }; - - (memory, store, custom_imports) -} - -#[cfg(not(target_arch = "wasm32"))] -fn instance_load() -> (Instance, Memory, Store) { - use wasmer::Module; - - let (memory, mut store, custom_imports) = init_memory_and_state(); - - let module = Module::new(&store, WASM_BIN).unwrap(); - - (Instance::new(&mut store, &module, &custom_imports).unwrap(), memory, store) -} - -#[cfg(target_arch = "wasm32")] -async fn instance_load() -> (Instance, Memory, Store) { - use js_sys::WebAssembly::{self}; - use wasmer::AsJs; - - let (memory, mut store, custom_imports) = init_memory_and_state(); - - let js_bytes = unsafe { js_sys::Uint8Array::view(&WASM_BIN) }; - let js_module_promise = WebAssembly::compile(&js_bytes); - let js_module: js_sys::WebAssembly::Module = - wasm_bindgen_futures::JsFuture::from(js_module_promise).await.unwrap().into(); - - let js_instance_promise = - WebAssembly::instantiate_module(&js_module, &custom_imports.as_jsvalue(&store).into()); - let js_instance = wasm_bindgen_futures::JsFuture::from(js_instance_promise).await.unwrap(); - let module = wasmer::Module::from((js_module, WASM_BIN)); - let instance: wasmer::Instance = Instance::from_jsvalue(&mut store, &module, &js_instance) - .map_err(|_| "Error while creating BlackBox Functions vendor instance") - .unwrap(); - - (instance, memory, store) -} - -fn logstr(mut env: FunctionEnvMut, ptr: i32) { - let (memory, store) = env.data_and_store_mut(); - let memory_view = memory.view(&store); - - let log_str_wasm_ptr: WasmPtr = WasmPtr::new(ptr as u32); - - match log_str_wasm_ptr.read_utf8_string_with_nul(&memory_view) { - Ok(log_string) => println!("{log_string}"), - Err(err) => println!("Error while reading log string from memory: {err}"), - }; -} - -// Based on https://github.com/wasmerio/wasmer/blob/2.3.0/lib/wasi/src/syscalls/mod.rs#L2537 -fn random_get(mut env: FunctionEnvMut, buf_ptr: i32, buf_len: i32) -> i32 { - let mut u8_buffer = vec![0; buf_len as usize]; - let res = getrandom::getrandom(&mut u8_buffer); - match res { - Ok(()) => { - let (memory, store) = env.data_and_store_mut(); - let memory_view = memory.view(&store); - match memory_view.write(buf_ptr as u64, u8_buffer.as_mut_slice()) { - Ok(_) => { - 0_i32 // __WASI_ESUCCESS - } - Err(_) => { - 29_i32 // __WASI_EIO - } - } - } - Err(_) => { - 29_i32 // __WASI_EIO - } - } -} - -fn proc_exit(_: i32) { - unimplemented!("proc_exit is not implemented") -} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs deleted file mode 100644 index c816e5b4d1b..00000000000 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs +++ /dev/null @@ -1,73 +0,0 @@ -use acir::FieldElement; - -use super::{Assignments, Barretenberg, Error, FIELD_BYTES}; - -pub(crate) trait Pedersen { - fn encrypt( - &self, - inputs: Vec, - hash_index: u32, - ) -> Result<(FieldElement, FieldElement), Error>; - - fn hash(&self, inputs: Vec, hash_index: u32) -> Result; -} - -impl Pedersen for Barretenberg { - fn encrypt( - &self, - inputs: Vec, - hash_index: u32, - ) -> Result<(FieldElement, FieldElement), Error> { - let input_buf = Assignments::from(inputs).to_bytes(); - let input_ptr = self.allocate(&input_buf)?; - let result_ptr: usize = 0; - - self.call_multiple( - "pedersen_plookup_commit_with_hash_index", - vec![&input_ptr, &result_ptr.into(), &hash_index.into()], - )?; - - let result_bytes: [u8; 2 * FIELD_BYTES] = self.read_memory(result_ptr); - let (point_x_bytes, point_y_bytes) = result_bytes.split_at(FIELD_BYTES); - - let point_x = FieldElement::from_be_bytes_reduce(point_x_bytes); - let point_y = FieldElement::from_be_bytes_reduce(point_y_bytes); - - Ok((point_x, point_y)) - } - - fn hash(&self, inputs: Vec, hash_index: u32) -> Result { - let input_buf = Assignments::from(inputs).to_bytes(); - let input_ptr = self.allocate(&input_buf)?; - let result_ptr: usize = 0; - - self.call_multiple( - "pedersen_plookup_compress_with_hash_index", - vec![&input_ptr, &result_ptr.into(), &hash_index.into()], - )?; - - let result_bytes: [u8; FIELD_BYTES] = self.read_memory(result_ptr); - - let hash = FieldElement::from_be_bytes_reduce(&result_bytes); - - Ok(hash) - } -} - -#[test] -fn pedersen_hash_to_point() -> Result<(), Error> { - let barretenberg = Barretenberg::new(); - let (x, y) = barretenberg.encrypt(vec![FieldElement::one(), FieldElement::one()], 1)?; - let expected_x = FieldElement::from_hex( - "0x12afb43195f5c621d1d2cabb5f629707095c5307fd4185a663d4e80bb083e878", - ) - .unwrap(); - let expected_y = FieldElement::from_hex( - "0x25793f5b5e62beb92fd18a66050293a9fd554a2ff13bceba0339cae1a038d7c1", - ) - .unwrap(); - - assert_eq!(expected_x.to_hex(), x.to_hex()); - assert_eq!(expected_y.to_hex(), y.to_hex()); - Ok(()) -} diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs deleted file mode 100644 index 18c4f04ef64..00000000000 --- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs +++ /dev/null @@ -1,104 +0,0 @@ -use super::{Barretenberg, Error, FIELD_BYTES, WASM_SCRATCH_BYTES}; - -pub(crate) trait SchnorrSig { - fn construct_signature( - &self, - message: &[u8], - private_key: [u8; 32], - ) -> Result<([u8; 32], [u8; 32]), Error>; - fn construct_public_key(&self, private_key: [u8; 32]) -> Result<[u8; 64], Error>; - fn verify_signature( - &self, - pub_key: [u8; 64], - sig_s: [u8; 32], - sig_e: [u8; 32], - message: &[u8], - ) -> Result; -} - -impl SchnorrSig for Barretenberg { - fn construct_signature( - &self, - message: &[u8], - private_key: [u8; 32], - ) -> Result<([u8; 32], [u8; 32]), Error> { - let sig_s_ptr: usize = 0; - let sig_e_ptr: usize = sig_s_ptr + FIELD_BYTES; - let private_key_ptr: usize = sig_e_ptr + FIELD_BYTES; - let message_ptr: usize = private_key_ptr + private_key.len(); - assert!( - message_ptr + message.len() < WASM_SCRATCH_BYTES, - "Message overran wasm scratch space" - ); - - self.transfer_to_heap(&private_key, private_key_ptr); - self.transfer_to_heap(message, message_ptr); - self.call_multiple( - "construct_signature", - vec![ - &message_ptr.into(), - &message.len().into(), - &private_key_ptr.into(), - &sig_s_ptr.into(), - &sig_e_ptr.into(), - ], - )?; - - let sig_s: [u8; FIELD_BYTES] = self.read_memory(sig_s_ptr); - let sig_e: [u8; FIELD_BYTES] = self.read_memory(sig_e_ptr); - - Ok((sig_s, sig_e)) - } - - #[allow(dead_code)] - fn construct_public_key(&self, private_key: [u8; 32]) -> Result<[u8; 64], Error> { - let private_key_ptr: usize = 0; - let result_ptr: usize = private_key_ptr + FIELD_BYTES; - - self.transfer_to_heap(&private_key, private_key_ptr); - - self.call_multiple( - "compute_public_key", - vec![&private_key_ptr.into(), &result_ptr.into()], - )?; - - Ok(self.read_memory(result_ptr)) - } - - fn verify_signature( - &self, - pub_key: [u8; 64], - sig_s: [u8; 32], - sig_e: [u8; 32], - message: &[u8], - ) -> Result { - let public_key_ptr: usize = 0; - let sig_s_ptr: usize = public_key_ptr + pub_key.len(); - let sig_e_ptr: usize = sig_s_ptr + sig_s.len(); - let message_ptr: usize = sig_e_ptr + sig_e.len(); - assert!( - message_ptr + message.len() < WASM_SCRATCH_BYTES, - "Message overran wasm scratch space" - ); - - self.transfer_to_heap(&pub_key, public_key_ptr); - self.transfer_to_heap(&sig_s, sig_s_ptr); - self.transfer_to_heap(&sig_e, sig_e_ptr); - self.transfer_to_heap(message, message_ptr); - - let verified = self.call_multiple( - "verify_signature", - vec![ - &message_ptr.into(), - &message.len().into(), - &public_key_ptr.into(), - &sig_s_ptr.into(), - &sig_e_ptr.into(), - ], - )?; - - // Note, currently for Barretenberg plonk, if the signature fails - // then the whole circuit fails. - Ok(verified.try_into()?) - } -} diff --git a/noir/noir-repo/acvm-repo/brillig/Cargo.toml b/noir/noir-repo/acvm-repo/brillig/Cargo.toml index 081abe022ae..f60bde6f074 100644 --- a/noir/noir-repo/acvm-repo/brillig/Cargo.toml +++ b/noir/noir-repo/acvm-repo/brillig/Cargo.toml @@ -2,7 +2,7 @@ name = "brillig" description = "Brillig is the bytecode ACIR uses for non-determinism." # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true diff --git a/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml b/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml index 57cf3be974a..7dd11912449 100644 --- a/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml +++ b/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml @@ -2,7 +2,7 @@ name = "brillig_vm" description = "The virtual machine that processes Brillig bytecode, used to introduce non-determinism to the ACVM" # x-release-please-start-version -version = "0.45.0" +version = "0.46.0" # x-release-please-end authors.workspace = true edition.workspace = true diff --git a/noir/noir-repo/aztec_macros/src/transforms/functions.rs b/noir/noir-repo/aztec_macros/src/transforms/functions.rs index 90563c6085c..39d709ef520 100644 --- a/noir/noir-repo/aztec_macros/src/transforms/functions.rs +++ b/noir/noir-repo/aztec_macros/src/transforms/functions.rs @@ -680,7 +680,7 @@ fn add_struct_to_hasher(identifier: &Ident, hasher_name: &str) -> Statement { fn str_to_bytes(identifier: &Ident) -> (Statement, Ident) { // let identifier_as_bytes = identifier.as_bytes(); let var = variable_ident(identifier.clone()); - let contents = if let ExpressionKind::Variable(p) = &var.kind { + let contents = if let ExpressionKind::Variable(p, _) = &var.kind { p.segments.first().cloned().unwrap_or_else(|| panic!("No segments")).0.contents } else { panic!("Unexpected identifier type") diff --git a/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs b/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs index ebb4854f86e..ba51090c2be 100644 --- a/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs +++ b/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs @@ -27,15 +27,15 @@ pub fn expression(kind: ExpressionKind) -> Expression { } pub fn variable(name: &str) -> Expression { - expression(ExpressionKind::Variable(ident_path(name))) + expression(ExpressionKind::Variable(ident_path(name), None)) } pub fn variable_ident(identifier: Ident) -> Expression { - expression(ExpressionKind::Variable(path(identifier))) + expression(ExpressionKind::Variable(path(identifier), None)) } pub fn variable_path(path: Path) -> Expression { - expression(ExpressionKind::Variable(path)) + expression(ExpressionKind::Variable(path, None)) } pub fn method_call( @@ -47,6 +47,7 @@ pub fn method_call( object, method_name: ident(method_name), arguments, + generics: None, }))) } diff --git a/noir/noir-repo/compiler/noirc_driver/src/lib.rs b/noir/noir-repo/compiler/noirc_driver/src/lib.rs index ef874d45f88..801c0b685a9 100644 --- a/noir/noir-repo/compiler/noirc_driver/src/lib.rs +++ b/noir/noir-repo/compiler/noirc_driver/src/lib.rs @@ -54,8 +54,8 @@ pub const NOIR_ARTIFACT_VERSION_STRING: &str = #[derive(Args, Clone, Debug, Default)] pub struct CompileOptions { /// Override the expression width requested by the backend. - #[arg(long, value_parser = parse_expression_width)] - pub expression_width: Option, + #[arg(long, value_parser = parse_expression_width, default_value = "4")] + pub expression_width: ExpressionWidth, /// Force a full recompilation. #[arg(long = "force")] @@ -103,6 +103,10 @@ pub struct CompileOptions { /// Force Brillig output (for step debugging) #[arg(long, hide = true)] pub force_brillig: bool, + + /// Enable the experimental elaborator pass + #[arg(long, hide = true)] + pub use_elaborator: bool, } fn parse_expression_width(input: &str) -> Result { @@ -245,12 +249,13 @@ pub fn check_crate( crate_id: CrateId, deny_warnings: bool, disable_macros: bool, + use_elaborator: bool, ) -> CompilationResult<()> { let macros: &[&dyn MacroProcessor] = if disable_macros { &[] } else { &[&aztec_macros::AztecMacro as &dyn MacroProcessor] }; let mut errors = vec![]; - let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros); + let diagnostics = CrateDefMap::collect_defs(crate_id, context, use_elaborator, macros); errors.extend(diagnostics.into_iter().map(|(error, file_id)| { let diagnostic = CustomDiagnostic::from(&error); diagnostic.in_file(file_id) @@ -282,8 +287,13 @@ pub fn compile_main( options: &CompileOptions, cached_program: Option, ) -> CompilationResult { - let (_, mut warnings) = - check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?; + let (_, mut warnings) = check_crate( + context, + crate_id, + options.deny_warnings, + options.disable_macros, + options.use_elaborator, + )?; let main = context.get_main_function(&crate_id).ok_or_else(|| { // TODO(#2155): This error might be a better to exist in Nargo @@ -318,8 +328,13 @@ pub fn compile_contract( crate_id: CrateId, options: &CompileOptions, ) -> CompilationResult { - let (_, warnings) = - check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?; + let (_, warnings) = check_crate( + context, + crate_id, + options.deny_warnings, + options.disable_macros, + options.use_elaborator, + )?; // TODO: We probably want to error if contracts is empty let contracts = context.get_all_contracts(&crate_id); diff --git a/noir/noir-repo/compiler/noirc_driver/tests/stdlib_warnings.rs b/noir/noir-repo/compiler/noirc_driver/tests/stdlib_warnings.rs index 6f437621123..327c8daad06 100644 --- a/noir/noir-repo/compiler/noirc_driver/tests/stdlib_warnings.rs +++ b/noir/noir-repo/compiler/noirc_driver/tests/stdlib_warnings.rs @@ -24,7 +24,8 @@ fn stdlib_does_not_produce_constant_warnings() -> Result<(), ErrorsAndWarnings> let mut context = Context::new(file_manager, parsed_files); let root_crate_id = prepare_crate(&mut context, file_name); - let ((), warnings) = noirc_driver::check_crate(&mut context, root_crate_id, false, false)?; + let ((), warnings) = + noirc_driver::check_crate(&mut context, root_crate_id, false, false, false)?; assert_eq!(warnings, Vec::new(), "stdlib is producing warnings"); diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs index 873ebe51e6f..f660c8e0b7a 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs @@ -1328,7 +1328,15 @@ impl<'block> BrilligBlock<'block> { self.brillig_context.binary_instruction(left, right, result_variable, brillig_binary_op); - self.add_overflow_check(brillig_binary_op, left, right, result_variable, is_signed); + self.add_overflow_check( + brillig_binary_op, + left, + right, + result_variable, + binary, + dfg, + is_signed, + ); } /// Splits a two's complement signed integer in the sign bit and the absolute value. @@ -1481,15 +1489,20 @@ impl<'block> BrilligBlock<'block> { self.brillig_context.deallocate_single_addr(bias); } + #[allow(clippy::too_many_arguments)] fn add_overflow_check( &mut self, binary_operation: BrilligBinaryOp, left: SingleAddrVariable, right: SingleAddrVariable, result: SingleAddrVariable, + binary: &Binary, + dfg: &DataFlowGraph, is_signed: bool, ) { let bit_size = left.bit_size; + let max_lhs_bits = dfg.get_value_max_num_bits(binary.lhs); + let max_rhs_bits = dfg.get_value_max_num_bits(binary.rhs); if bit_size == FieldElement::max_num_bits() { return; @@ -1497,6 +1510,11 @@ impl<'block> BrilligBlock<'block> { match (binary_operation, is_signed) { (BrilligBinaryOp::Add, false) => { + if std::cmp::max(max_lhs_bits, max_rhs_bits) < bit_size { + // `left` and `right` have both been casted up from smaller types and so cannot overflow. + return; + } + let condition = SingleAddrVariable::new(self.brillig_context.allocate_register(), 1); // Check that lhs <= result @@ -1511,6 +1529,12 @@ impl<'block> BrilligBlock<'block> { self.brillig_context.deallocate_single_addr(condition); } (BrilligBinaryOp::Sub, false) => { + if dfg.is_constant(binary.lhs) && max_lhs_bits > max_rhs_bits { + // `left` is a fixed constant and `right` is restricted such that `left - right > 0` + // Note strict inequality as `right > left` while `max_lhs_bits == max_rhs_bits` is possible. + return; + } + let condition = SingleAddrVariable::new(self.brillig_context.allocate_register(), 1); // Check that rhs <= lhs @@ -1527,39 +1551,36 @@ impl<'block> BrilligBlock<'block> { self.brillig_context.deallocate_single_addr(condition); } (BrilligBinaryOp::Mul, false) => { - // Multiplication overflow is only possible for bit sizes > 1 - if bit_size > 1 { - let is_right_zero = - SingleAddrVariable::new(self.brillig_context.allocate_register(), 1); - let zero = - self.brillig_context.make_constant_instruction(0_usize.into(), bit_size); - self.brillig_context.binary_instruction( - zero, - right, - is_right_zero, - BrilligBinaryOp::Equals, - ); - self.brillig_context.codegen_if_not(is_right_zero.address, |ctx| { - let condition = SingleAddrVariable::new(ctx.allocate_register(), 1); - let division = SingleAddrVariable::new(ctx.allocate_register(), bit_size); - // Check that result / rhs == lhs - ctx.binary_instruction( - result, - right, - division, - BrilligBinaryOp::UnsignedDiv, - ); - ctx.binary_instruction(division, left, condition, BrilligBinaryOp::Equals); - ctx.codegen_constrain( - condition, - Some("attempt to multiply with overflow".to_string()), - ); - ctx.deallocate_single_addr(condition); - ctx.deallocate_single_addr(division); - }); - self.brillig_context.deallocate_single_addr(is_right_zero); - self.brillig_context.deallocate_single_addr(zero); + if bit_size == 1 || max_lhs_bits + max_rhs_bits <= bit_size { + // Either performing boolean multiplication (which cannot overflow), + // or `left` and `right` have both been casted up from smaller types and so cannot overflow. + return; } + + let is_right_zero = + SingleAddrVariable::new(self.brillig_context.allocate_register(), 1); + let zero = self.brillig_context.make_constant_instruction(0_usize.into(), bit_size); + self.brillig_context.binary_instruction( + zero, + right, + is_right_zero, + BrilligBinaryOp::Equals, + ); + self.brillig_context.codegen_if_not(is_right_zero.address, |ctx| { + let condition = SingleAddrVariable::new(ctx.allocate_register(), 1); + let division = SingleAddrVariable::new(ctx.allocate_register(), bit_size); + // Check that result / rhs == lhs + ctx.binary_instruction(result, right, division, BrilligBinaryOp::UnsignedDiv); + ctx.binary_instruction(division, left, condition, BrilligBinaryOp::Equals); + ctx.codegen_constrain( + condition, + Some("attempt to multiply with overflow".to_string()), + ); + ctx.deallocate_single_addr(condition); + ctx.deallocate_single_addr(division); + }); + self.brillig_context.deallocate_single_addr(is_right_zero); + self.brillig_context.deallocate_single_addr(zero); } _ => {} } diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs index 407cdf0a17f..5f180edd05c 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs @@ -236,7 +236,10 @@ impl AcirContext { self.acir_ir.call_stack = call_stack; } - fn get_or_create_witness_var(&mut self, var: AcirVar) -> Result { + pub(crate) fn get_or_create_witness_var( + &mut self, + var: AcirVar, + ) -> Result { if self.var_to_expression(var)?.to_witness().is_some() { // If called with a variable which is already a witness then return the same variable. return Ok(var); diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs index 2e2f03a0012..2430a00fd4c 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs @@ -1729,13 +1729,16 @@ impl<'a> Context<'a> { // will expand the array if there is one. let return_acir_vars = self.flatten_value_list(return_values, dfg)?; let mut warnings = Vec::new(); - for acir_var in return_acir_vars { + for (acir_var, is_databus) in return_acir_vars { if self.acir_context.is_constant(&acir_var) { warnings.push(SsaReport::Warning(InternalWarning::ReturnConstant { call_stack: call_stack.clone(), })); } - self.acir_context.return_var(acir_var)?; + if !is_databus { + // We do not return value for the data bus. + self.acir_context.return_var(acir_var)?; + } } Ok(warnings) } @@ -1837,15 +1840,15 @@ impl<'a> Context<'a> { let binary_type = AcirType::from(binary_type); let bit_count = binary_type.bit_size(); - - match binary.operator { + let num_type = binary_type.to_numeric_type(); + let result = match binary.operator { BinaryOp::Add => self.acir_context.add_var(lhs, rhs), BinaryOp::Sub => self.acir_context.sub_var(lhs, rhs), BinaryOp::Mul => self.acir_context.mul_var(lhs, rhs), BinaryOp::Div => self.acir_context.div_var( lhs, rhs, - binary_type, + binary_type.clone(), self.current_side_effects_enabled_var, ), // Note: that this produces unnecessary constraints when @@ -1869,7 +1872,71 @@ impl<'a> Context<'a> { BinaryOp::Shl | BinaryOp::Shr => unreachable!( "ICE - bit shift operators do not exist in ACIR and should have been replaced" ), + }?; + + if let NumericType::Unsigned { bit_size } = &num_type { + // Check for integer overflow + self.check_unsigned_overflow( + result, + *bit_size, + binary.lhs, + binary.rhs, + dfg, + binary.operator, + )?; } + + Ok(result) + } + + /// Adds a range check against the bit size of the result of addition, subtraction or multiplication + fn check_unsigned_overflow( + &mut self, + result: AcirVar, + bit_size: u32, + lhs: ValueId, + rhs: ValueId, + dfg: &DataFlowGraph, + op: BinaryOp, + ) -> Result<(), RuntimeError> { + // We try to optimize away operations that are guaranteed not to overflow + let max_lhs_bits = dfg.get_value_max_num_bits(lhs); + let max_rhs_bits = dfg.get_value_max_num_bits(rhs); + + let msg = match op { + BinaryOp::Add => { + if std::cmp::max(max_lhs_bits, max_rhs_bits) < bit_size { + // `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow. + return Ok(()); + } + "attempt to add with overflow".to_string() + } + BinaryOp::Sub => { + if dfg.is_constant(lhs) && max_lhs_bits > max_rhs_bits { + // `lhs` is a fixed constant and `rhs` is restricted such that `lhs - rhs > 0` + // Note strict inequality as `rhs > lhs` while `max_lhs_bits == max_rhs_bits` is possible. + return Ok(()); + } + "attempt to subtract with overflow".to_string() + } + BinaryOp::Mul => { + if bit_size == 1 || max_lhs_bits + max_rhs_bits <= bit_size { + // Either performing boolean multiplication (which cannot overflow), + // or `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow. + return Ok(()); + } + "attempt to multiply with overflow".to_string() + } + _ => return Ok(()), + }; + + let with_pred = self.acir_context.mul_var(result, self.current_side_effects_enabled_var)?; + self.acir_context.range_constrain_var( + with_pred, + &NumericType::Unsigned { bit_size }, + Some(msg), + )?; + Ok(()) } /// Operands in a binary operation are checked to have the same type. @@ -2538,6 +2605,15 @@ impl<'a> Context<'a> { Ok(result) } + + Intrinsic::AsWitness => { + let arg = arguments[0]; + let input = self.convert_value(arg, dfg).into_var()?; + Ok(self + .acir_context + .get_or_create_witness_var(input) + .map(|val| self.convert_vars_to_values(vec![val], dfg, result_ids))?) + } _ => todo!("expected a black box function"), } } @@ -2595,12 +2671,22 @@ impl<'a> Context<'a> { &mut self, arguments: &[ValueId], dfg: &DataFlowGraph, - ) -> Result, InternalError> { + ) -> Result, InternalError> { let mut acir_vars = Vec::with_capacity(arguments.len()); for value_id in arguments { + let is_databus = if let Some(return_databus) = self.data_bus.return_data { + dfg[*value_id] == dfg[return_databus] + } else { + false + }; let value = self.convert_value(*value_id, dfg); acir_vars.append( - &mut self.acir_context.flatten(value)?.iter().map(|(var, _)| *var).collect(), + &mut self + .acir_context + .flatten(value)? + .iter() + .map(|(var, _)| (*var, is_databus)) + .collect(), ); } Ok(acir_vars) diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs index 7cc19e9f2b8..f136d3c5fb2 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs @@ -64,6 +64,7 @@ pub(crate) enum Intrinsic { BlackBox(BlackBoxFunc), FromField, AsField, + AsWitness, } impl std::fmt::Display for Intrinsic { @@ -87,6 +88,7 @@ impl std::fmt::Display for Intrinsic { Intrinsic::BlackBox(function) => write!(f, "{function}"), Intrinsic::FromField => write!(f, "from_field"), Intrinsic::AsField => write!(f, "as_field"), + Intrinsic::AsWitness => write!(f, "as_witness"), } } } @@ -97,7 +99,9 @@ impl Intrinsic { /// If there are no side effects then the `Intrinsic` can be removed if the result is unused. pub(crate) fn has_side_effects(&self) -> bool { match self { - Intrinsic::AssertConstant | Intrinsic::ApplyRangeConstraint => true, + Intrinsic::AssertConstant | Intrinsic::ApplyRangeConstraint | Intrinsic::AsWitness => { + true + } // These apply a constraint that the input must fit into a specified number of limbs. Intrinsic::ToBits(_) | Intrinsic::ToRadix(_) => true, @@ -140,6 +144,7 @@ impl Intrinsic { "to_be_bits" => Some(Intrinsic::ToBits(Endian::Big)), "from_field" => Some(Intrinsic::FromField), "as_field" => Some(Intrinsic::AsField), + "as_witness" => Some(Intrinsic::AsWitness), other => BlackBoxFunc::lookup(other).map(Intrinsic::BlackBox), } } diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs index 7ad6a625f9c..8e320de9337 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs @@ -293,6 +293,7 @@ pub(super) fn simplify_call( let instruction = Instruction::Cast(truncated_value, target_type); SimplifyResult::SimplifiedToInstruction(instruction) } + Intrinsic::AsWitness => SimplifyResult::None, } } diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/inlining.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/inlining.rs index bddfb25f26c..73dc3888184 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/inlining.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/inlining.rs @@ -11,7 +11,7 @@ use crate::ssa::{ ir::{ basic_block::BasicBlockId, dfg::{CallStack, InsertInstructionResult}, - function::{Function, FunctionId}, + function::{Function, FunctionId, RuntimeType}, instruction::{Instruction, InstructionId, TerminatorInstruction}, value::{Value, ValueId}, }, @@ -392,10 +392,12 @@ impl<'function> PerFunctionContext<'function> { Some(func_id) => { let function = &ssa.functions[&func_id]; // If we have not already finished the flattening pass, functions marked - // to not have predicates should be marked as entry points. + // to not have predicates should be marked as entry points unless we are inlining into brillig. + let entry_point = &ssa.functions[&self.context.entry_point]; let no_predicates_is_entry_point = self.context.no_predicates_is_entry_point - && function.is_no_predicates(); + && function.is_no_predicates() + && !matches!(entry_point.runtime(), RuntimeType::Brillig); if function.runtime().is_entry_point() || no_predicates_is_entry_point { self.push_instruction(*id); } else { diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs index 42727054503..65a77552c79 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs @@ -109,7 +109,7 @@ impl Context<'_> { return InsertInstructionResult::SimplifiedTo(zero).first(); } } - let pow = self.numeric_constant(FieldElement::from(rhs_bit_size_pow_2), typ); + let pow = self.numeric_constant(FieldElement::from(rhs_bit_size_pow_2), typ.clone()); let max_lhs_bits = self.function.dfg.get_value_max_num_bits(lhs); @@ -123,15 +123,18 @@ impl Context<'_> { // we can safely cast to unsigned because overflow_checks prevent bit-shift with a negative value let rhs_unsigned = self.insert_cast(rhs, Type::unsigned(bit_size)); let pow = self.pow(base, rhs_unsigned); - let pow = self.insert_cast(pow, typ); + let pow = self.insert_cast(pow, typ.clone()); (FieldElement::max_num_bits(), self.insert_binary(predicate, BinaryOp::Mul, pow)) }; if max_bit <= bit_size { self.insert_binary(lhs, BinaryOp::Mul, pow) } else { - let result = self.insert_binary(lhs, BinaryOp::Mul, pow); - self.insert_truncate(result, bit_size, max_bit) + let lhs_field = self.insert_cast(lhs, Type::field()); + let pow_field = self.insert_cast(pow, Type::field()); + let result = self.insert_binary(lhs_field, BinaryOp::Mul, pow_field); + let result = self.insert_truncate(result, bit_size, max_bit); + self.insert_cast(result, typ) } } diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs index 02b9202b209..9309652d508 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs @@ -108,17 +108,19 @@ impl Context { fn responds_to_side_effects_var(dfg: &DataFlowGraph, instruction: &Instruction) -> bool { use Instruction::*; match instruction { - Binary(binary) => { - if matches!(binary.operator, BinaryOp::Div | BinaryOp::Mod) { + Binary(binary) => match binary.operator { + BinaryOp::Add | BinaryOp::Sub | BinaryOp::Mul => { + dfg.type_of_value(binary.lhs).is_unsigned() + } + BinaryOp::Div | BinaryOp::Mod => { if let Some(rhs) = dfg.get_numeric_constant(binary.rhs) { rhs == FieldElement::zero() } else { true } - } else { - false } - } + _ => false, + }, Cast(_, _) | Not(_) @@ -155,7 +157,8 @@ impl Context { | Intrinsic::BlackBox(_) | Intrinsic::FromField | Intrinsic::AsField - | Intrinsic::AsSlice => false, + | Intrinsic::AsSlice + | Intrinsic::AsWitness => false, }, // We must assume that functions contain a side effect as we cannot inspect more deeply. diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs index fc915756110..3d2b5142219 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs @@ -231,6 +231,7 @@ fn slice_capacity_change( | Intrinsic::StrAsBytes | Intrinsic::BlackBox(_) | Intrinsic::FromField - | Intrinsic::AsField => SizeChange::None, + | Intrinsic::AsField + | Intrinsic::AsWitness => SizeChange::None, } } diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs index f7ecdc8870d..ebcbfbabe73 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs @@ -304,7 +304,7 @@ impl<'a> FunctionContext<'a> { /// Insert constraints ensuring that the operation does not overflow the bit size of the result /// - /// If the result is unsigned, we simply range check against the bit size + /// If the result is unsigned, overflow will be checked during acir-gen (cf. issue #4456), except for bit-shifts, because we will convert them to field multiplication /// /// If the result is signed, we just prepare it for check_signed_overflow() by casting it to /// an unsigned value representing the signed integer. @@ -351,51 +351,12 @@ impl<'a> FunctionContext<'a> { } Type::Numeric(NumericType::Unsigned { bit_size }) => { let dfg = &self.builder.current_function.dfg; - - let max_lhs_bits = self.builder.current_function.dfg.get_value_max_num_bits(lhs); - let max_rhs_bits = self.builder.current_function.dfg.get_value_max_num_bits(rhs); + let max_lhs_bits = dfg.get_value_max_num_bits(lhs); match operator { - BinaryOpKind::Add => { - if std::cmp::max(max_lhs_bits, max_rhs_bits) < bit_size { - // `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow. - return result; - } - - let message = "attempt to add with overflow".to_string(); - self.builder.set_location(location).insert_range_check( - result, - bit_size, - Some(message), - ); - } - BinaryOpKind::Subtract => { - if dfg.is_constant(lhs) && max_lhs_bits > max_rhs_bits { - // `lhs` is a fixed constant and `rhs` is restricted such that `lhs - rhs > 0` - // Note strict inequality as `rhs > lhs` while `max_lhs_bits == max_rhs_bits` is possible. - return result; - } - - let message = "attempt to subtract with overflow".to_string(); - self.builder.set_location(location).insert_range_check( - result, - bit_size, - Some(message), - ); - } - BinaryOpKind::Multiply => { - if bit_size == 1 || max_lhs_bits + max_rhs_bits <= bit_size { - // Either performing boolean multiplication (which cannot overflow), - // or `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow. - return result; - } - - let message = "attempt to multiply with overflow".to_string(); - self.builder.set_location(location).insert_range_check( - result, - bit_size, - Some(message), - ); + BinaryOpKind::Add | BinaryOpKind::Subtract | BinaryOpKind::Multiply => { + // Overflow check is deferred to acir-gen + return result; } BinaryOpKind::ShiftLeft => { if let Some(rhs_const) = dfg.get_numeric_constant(rhs) { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs index 59c04218e2e..0173b17d28f 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs @@ -10,6 +10,8 @@ use acvm::FieldElement; use iter_extended::vecmap; use noirc_errors::{Span, Spanned}; +use super::UnaryRhsMemberAccess; + #[derive(Debug, PartialEq, Eq, Clone)] pub enum ExpressionKind { Literal(Literal), @@ -23,7 +25,9 @@ pub enum ExpressionKind { Cast(Box), Infix(Box), If(Box), - Variable(Path), + // The optional vec here is the optional list of generics + // provided by the turbofish operator, if used + Variable(Path, Option>), Tuple(Vec), Lambda(Box), Parenthesized(Box), @@ -39,7 +43,7 @@ pub type UnresolvedGenerics = Vec; impl ExpressionKind { pub fn into_path(self) -> Option { match self { - ExpressionKind::Variable(path) => Some(path), + ExpressionKind::Variable(path, _) => Some(path), _ => None, } } @@ -164,16 +168,19 @@ impl Expression { pub fn member_access_or_method_call( lhs: Expression, - (rhs, args): (Ident, Option>), + (rhs, args): UnaryRhsMemberAccess, span: Span, ) -> Expression { let kind = match args { None => ExpressionKind::MemberAccess(Box::new(MemberAccessExpression { lhs, rhs })), - Some(arguments) => ExpressionKind::MethodCall(Box::new(MethodCallExpression { - object: lhs, - method_name: rhs, - arguments, - })), + Some((generics, arguments)) => { + ExpressionKind::MethodCall(Box::new(MethodCallExpression { + object: lhs, + method_name: rhs, + generics, + arguments, + })) + } }; Expression::new(kind, span) } @@ -435,6 +442,8 @@ pub struct CallExpression { pub struct MethodCallExpression { pub object: Expression, pub method_name: Ident, + /// Method calls have an optional list of generics if the turbofish operator was used + pub generics: Option>, pub arguments: Vec, } @@ -494,7 +503,14 @@ impl Display for ExpressionKind { Cast(cast) => cast.fmt(f), Infix(infix) => infix.fmt(f), If(if_expr) => if_expr.fmt(f), - Variable(path) => path.fmt(f), + Variable(path, generics) => { + if let Some(generics) = generics { + let generics = vecmap(generics, ToString::to_string); + write!(f, "{path}::<{}>", generics.join(", ")) + } else { + path.fmt(f) + } + } Constructor(constructor) => constructor.fmt(f), MemberAccess(access) => access.fmt(f), Tuple(elements) => { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/ast/function.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/function.rs index dc426a4642a..8acc068d86a 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/ast/function.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/function.rs @@ -32,6 +32,15 @@ pub enum FunctionKind { Recursive, } +impl FunctionKind { + pub fn can_ignore_return_type(self) -> bool { + match self { + FunctionKind::LowLevel | FunctionKind::Builtin | FunctionKind::Oracle => true, + FunctionKind::Normal | FunctionKind::Recursive => false, + } + } +} + impl NoirFunction { pub fn normal(def: FunctionDefinition) -> NoirFunction { NoirFunction { kind: FunctionKind::Normal, def } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs index 254ec4a7590..c3556dac6af 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs @@ -32,6 +32,7 @@ use iter_extended::vecmap; pub enum IntegerBitSize { One, Eight, + Sixteen, ThirtyTwo, SixtyFour, } @@ -48,6 +49,7 @@ impl From for u32 { match size { One => 1, Eight => 8, + Sixteen => 16, ThirtyTwo => 32, SixtyFour => 64, } @@ -64,6 +66,7 @@ impl TryFrom for IntegerBitSize { match value { 1 => Ok(One), 8 => Ok(Eight), + 16 => Ok(Sixteen), 32 => Ok(ThirtyTwo), 64 => Ok(SixtyFour), _ => Err(InvalidIntegerBitSizeError(value)), @@ -129,6 +132,10 @@ pub struct UnresolvedType { pub span: Option, } +/// Type wrapper for a member access +pub(crate) type UnaryRhsMemberAccess = + (Ident, Option<(Option>, Vec)>); + /// The precursor to TypeExpression, this is the type that the parser allows /// to be used in the length position of an array type. Only constants, variables, /// and numeric binary operators are allowed here. @@ -307,7 +314,7 @@ impl UnresolvedTypeExpression { None => Err(expr), } } - ExpressionKind::Variable(path) => Ok(UnresolvedTypeExpression::Variable(path)), + ExpressionKind::Variable(path, _) => Ok(UnresolvedTypeExpression::Variable(path)), ExpressionKind::Prefix(prefix) if prefix.operator == UnaryOp::Minus => { let lhs = Box::new(UnresolvedTypeExpression::Constant(0, expr.span)); let rhs = Box::new(UnresolvedTypeExpression::from_expr_helper(prefix.rhs)?); diff --git a/noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs index 0da39edfd85..863615da53d 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs @@ -228,11 +228,10 @@ impl From for Expression { fn from(i: Ident) -> Expression { Expression { span: i.0.span(), - kind: ExpressionKind::Variable(Path { - span: i.span(), - segments: vec![i], - kind: PathKind::Plain, - }), + kind: ExpressionKind::Variable( + Path { span: i.span(), segments: vec![i], kind: PathKind::Plain }, + None, + ), } } } @@ -509,7 +508,7 @@ impl Recoverable for Pattern { impl LValue { fn as_expression(&self) -> Expression { let kind = match self { - LValue::Ident(ident) => ExpressionKind::Variable(Path::from_ident(ident.clone())), + LValue::Ident(ident) => ExpressionKind::Variable(Path::from_ident(ident.clone()), None), LValue::MemberAccess { object, field_name, span: _ } => { ExpressionKind::MemberAccess(Box::new(MemberAccessExpression { lhs: object.as_expression(), @@ -565,7 +564,7 @@ impl ForRange { identifier: Ident, block: Expression, for_loop_span: Span, - ) -> StatementKind { + ) -> Statement { /// Counter used to generate unique names when desugaring /// code in the parser requires the creation of fresh variables. /// The parser is stateless so this is a static global instead. @@ -599,15 +598,15 @@ impl ForRange { // array.len() let segments = vec![array_ident]; - let array_ident = ExpressionKind::Variable(Path { - segments, - kind: PathKind::Plain, - span: array_span, - }); + let array_ident = ExpressionKind::Variable( + Path { segments, kind: PathKind::Plain, span: array_span }, + None, + ); let end_range = ExpressionKind::MethodCall(Box::new(MethodCallExpression { object: Expression::new(array_ident.clone(), array_span), method_name: Ident::new("len".to_string(), array_span), + generics: None, arguments: vec![], })); let end_range = Expression::new(end_range, array_span); @@ -618,11 +617,10 @@ impl ForRange { // array[i] let segments = vec![Ident::new(index_name, array_span)]; - let index_ident = ExpressionKind::Variable(Path { - segments, - kind: PathKind::Plain, - span: array_span, - }); + let index_ident = ExpressionKind::Variable( + Path { segments, kind: PathKind::Plain, span: array_span }, + None, + ); let loop_element = ExpressionKind::Index(Box::new(IndexExpression { collection: Expression::new(array_ident, array_span), @@ -662,7 +660,8 @@ impl ForRange { let block = ExpressionKind::Block(BlockExpression { statements: vec![let_array, for_loop], }); - StatementKind::Expression(Expression::new(block, for_loop_span)) + let kind = StatementKind::Expression(Expression::new(block, for_loop_span)); + Statement { kind, span: for_loop_span } } } } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs index 3e7d123398b..c222e08e77a 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs @@ -171,11 +171,14 @@ impl DebugInstrumenter { let last_stmt = if has_ret_expr { ast::Statement { kind: ast::StatementKind::Expression(ast::Expression { - kind: ast::ExpressionKind::Variable(ast::Path { - segments: vec![ident("__debug_expr", span)], - kind: PathKind::Plain, - span, - }), + kind: ast::ExpressionKind::Variable( + ast::Path { + segments: vec![ident("__debug_expr", span)], + kind: PathKind::Plain, + span, + }, + None, + ), span, }), span, @@ -568,11 +571,14 @@ fn build_assign_var_stmt(var_id: SourceVarId, expr: ast::Expression) -> ast::Sta let span = expr.span; let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression { func: Box::new(ast::Expression { - kind: ast::ExpressionKind::Variable(ast::Path { - segments: vec![ident("__debug_var_assign", span)], - kind: PathKind::Plain, - span, - }), + kind: ast::ExpressionKind::Variable( + ast::Path { + segments: vec![ident("__debug_var_assign", span)], + kind: PathKind::Plain, + span, + }, + None, + ), span, }), arguments: vec![uint_expr(var_id.0 as u128, span), expr], @@ -583,11 +589,14 @@ fn build_assign_var_stmt(var_id: SourceVarId, expr: ast::Expression) -> ast::Sta fn build_drop_var_stmt(var_id: SourceVarId, span: Span) -> ast::Statement { let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression { func: Box::new(ast::Expression { - kind: ast::ExpressionKind::Variable(ast::Path { - segments: vec![ident("__debug_var_drop", span)], - kind: PathKind::Plain, - span, - }), + kind: ast::ExpressionKind::Variable( + ast::Path { + segments: vec![ident("__debug_var_drop", span)], + kind: PathKind::Plain, + span, + }, + None, + ), span, }), arguments: vec![uint_expr(var_id.0 as u128, span)], @@ -607,11 +616,14 @@ fn build_assign_member_stmt( let span = expr.span; let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression { func: Box::new(ast::Expression { - kind: ast::ExpressionKind::Variable(ast::Path { - segments: vec![ident(&format!["__debug_member_assign_{arity}"], span)], - kind: PathKind::Plain, - span, - }), + kind: ast::ExpressionKind::Variable( + ast::Path { + segments: vec![ident(&format!["__debug_member_assign_{arity}"], span)], + kind: PathKind::Plain, + span, + }, + None, + ), span, }), arguments: [ @@ -627,11 +639,14 @@ fn build_assign_member_stmt( fn build_debug_call_stmt(fname: &str, fn_id: DebugFnId, span: Span) -> ast::Statement { let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression { func: Box::new(ast::Expression { - kind: ast::ExpressionKind::Variable(ast::Path { - segments: vec![ident(&format!["__debug_fn_{fname}"], span)], - kind: PathKind::Plain, - span, - }), + kind: ast::ExpressionKind::Variable( + ast::Path { + segments: vec![ident(&format!["__debug_fn_{fname}"], span)], + kind: PathKind::Plain, + span, + }, + None, + ), span, }), arguments: vec![uint_expr(fn_id.0 as u128, span)], @@ -693,11 +708,10 @@ fn ident(s: &str, span: Span) -> ast::Ident { fn id_expr(id: &ast::Ident) -> ast::Expression { ast::Expression { - kind: ast::ExpressionKind::Variable(Path { - segments: vec![id.clone()], - kind: PathKind::Plain, - span: id.span(), - }), + kind: ast::ExpressionKind::Variable( + Path { segments: vec![id.clone()], kind: PathKind::Plain, span: id.span() }, + None, + ), span: id.span(), } } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs new file mode 100644 index 00000000000..75c95c06d09 --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs @@ -0,0 +1,613 @@ +use iter_extended::vecmap; +use noirc_errors::{Location, Span}; +use regex::Regex; +use rustc_hash::FxHashSet as HashSet; + +use crate::{ + ast::{ + ArrayLiteral, ConstructorExpression, IfExpression, InfixExpression, Lambda, + UnresolvedTypeExpression, + }, + hir::{ + resolution::{errors::ResolverError, resolver::LambdaContext}, + type_check::TypeCheckError, + }, + hir_def::{ + expr::{ + HirArrayLiteral, HirBinaryOp, HirBlockExpression, HirCallExpression, HirCastExpression, + HirConstructorExpression, HirIdent, HirIfExpression, HirIndexExpression, + HirInfixExpression, HirLambda, HirMemberAccess, HirMethodCallExpression, + HirMethodReference, HirPrefixExpression, + }, + traits::TraitConstraint, + }, + macros_api::{ + BlockExpression, CallExpression, CastExpression, Expression, ExpressionKind, HirExpression, + HirLiteral, HirStatement, Ident, IndexExpression, Literal, MemberAccessExpression, + MethodCallExpression, PrefixExpression, + }, + node_interner::{DefinitionKind, ExprId, FuncId}, + Shared, StructType, Type, +}; + +use super::Elaborator; + +impl<'context> Elaborator<'context> { + pub(super) fn elaborate_expression(&mut self, expr: Expression) -> (ExprId, Type) { + let (hir_expr, typ) = match expr.kind { + ExpressionKind::Literal(literal) => self.elaborate_literal(literal, expr.span), + ExpressionKind::Block(block) => self.elaborate_block(block), + ExpressionKind::Prefix(prefix) => self.elaborate_prefix(*prefix), + ExpressionKind::Index(index) => self.elaborate_index(*index), + ExpressionKind::Call(call) => self.elaborate_call(*call, expr.span), + ExpressionKind::MethodCall(call) => self.elaborate_method_call(*call, expr.span), + ExpressionKind::Constructor(constructor) => self.elaborate_constructor(*constructor), + ExpressionKind::MemberAccess(access) => { + return self.elaborate_member_access(*access, expr.span) + } + ExpressionKind::Cast(cast) => self.elaborate_cast(*cast, expr.span), + ExpressionKind::Infix(infix) => return self.elaborate_infix(*infix, expr.span), + ExpressionKind::If(if_) => self.elaborate_if(*if_), + ExpressionKind::Variable(variable, generics) => { + let generics = generics.map(|option_inner| { + option_inner.into_iter().map(|generic| self.resolve_type(generic)).collect() + }); + return self.elaborate_variable(variable, generics); + } + ExpressionKind::Tuple(tuple) => self.elaborate_tuple(tuple), + ExpressionKind::Lambda(lambda) => self.elaborate_lambda(*lambda), + ExpressionKind::Parenthesized(expr) => return self.elaborate_expression(*expr), + ExpressionKind::Quote(quote) => self.elaborate_quote(quote), + ExpressionKind::Comptime(comptime) => self.elaborate_comptime_block(comptime), + ExpressionKind::Error => (HirExpression::Error, Type::Error), + }; + let id = self.interner.push_expr(hir_expr); + self.interner.push_expr_location(id, expr.span, self.file); + self.interner.push_expr_type(id, typ.clone()); + (id, typ) + } + + pub(super) fn elaborate_block(&mut self, block: BlockExpression) -> (HirExpression, Type) { + self.push_scope(); + let mut block_type = Type::Unit; + let mut statements = Vec::with_capacity(block.statements.len()); + + for (i, statement) in block.statements.into_iter().enumerate() { + let (id, stmt_type) = self.elaborate_statement(statement); + statements.push(id); + + if let HirStatement::Semi(expr) = self.interner.statement(&id) { + let inner_expr_type = self.interner.id_type(expr); + let span = self.interner.expr_span(&expr); + + self.unify(&inner_expr_type, &Type::Unit, || TypeCheckError::UnusedResultError { + expr_type: inner_expr_type.clone(), + expr_span: span, + }); + + if i + 1 == statements.len() { + block_type = stmt_type; + } + } + } + + self.pop_scope(); + (HirExpression::Block(HirBlockExpression { statements }), block_type) + } + + fn elaborate_literal(&mut self, literal: Literal, span: Span) -> (HirExpression, Type) { + use HirExpression::Literal as Lit; + match literal { + Literal::Unit => (Lit(HirLiteral::Unit), Type::Unit), + Literal::Bool(b) => (Lit(HirLiteral::Bool(b)), Type::Bool), + Literal::Integer(integer, sign) => { + let int = HirLiteral::Integer(integer, sign); + (Lit(int), self.polymorphic_integer_or_field()) + } + Literal::Str(str) | Literal::RawStr(str, _) => { + let len = Type::Constant(str.len() as u64); + (Lit(HirLiteral::Str(str)), Type::String(Box::new(len))) + } + Literal::FmtStr(str) => self.elaborate_fmt_string(str, span), + Literal::Array(array_literal) => { + self.elaborate_array_literal(array_literal, span, true) + } + Literal::Slice(array_literal) => { + self.elaborate_array_literal(array_literal, span, false) + } + } + } + + fn elaborate_array_literal( + &mut self, + array_literal: ArrayLiteral, + span: Span, + is_array: bool, + ) -> (HirExpression, Type) { + let (expr, elem_type, length) = match array_literal { + ArrayLiteral::Standard(elements) => { + let first_elem_type = self.interner.next_type_variable(); + let first_span = elements.first().map(|elem| elem.span).unwrap_or(span); + + let elements = vecmap(elements.into_iter().enumerate(), |(i, elem)| { + let span = elem.span; + let (elem_id, elem_type) = self.elaborate_expression(elem); + + self.unify(&elem_type, &first_elem_type, || { + TypeCheckError::NonHomogeneousArray { + first_span, + first_type: first_elem_type.to_string(), + first_index: 0, + second_span: span, + second_type: elem_type.to_string(), + second_index: i, + } + .add_context("elements in an array must have the same type") + }); + elem_id + }); + + let length = Type::Constant(elements.len() as u64); + (HirArrayLiteral::Standard(elements), first_elem_type, length) + } + ArrayLiteral::Repeated { repeated_element, length } => { + let span = length.span; + let length = + UnresolvedTypeExpression::from_expr(*length, span).unwrap_or_else(|error| { + self.push_err(ResolverError::ParserError(Box::new(error))); + UnresolvedTypeExpression::Constant(0, span) + }); + + let length = self.convert_expression_type(length); + let (repeated_element, elem_type) = self.elaborate_expression(*repeated_element); + + let length_clone = length.clone(); + (HirArrayLiteral::Repeated { repeated_element, length }, elem_type, length_clone) + } + }; + let constructor = if is_array { HirLiteral::Array } else { HirLiteral::Slice }; + let elem_type = Box::new(elem_type); + let typ = if is_array { + Type::Array(Box::new(length), elem_type) + } else { + Type::Slice(elem_type) + }; + (HirExpression::Literal(constructor(expr)), typ) + } + + fn elaborate_fmt_string(&mut self, str: String, call_expr_span: Span) -> (HirExpression, Type) { + let re = Regex::new(r"\{([a-zA-Z0-9_]+)\}") + .expect("ICE: an invalid regex pattern was used for checking format strings"); + + let mut fmt_str_idents = Vec::new(); + let mut capture_types = Vec::new(); + + for field in re.find_iter(&str) { + let matched_str = field.as_str(); + let ident_name = &matched_str[1..(matched_str.len() - 1)]; + + let scope_tree = self.scopes.current_scope_tree(); + let variable = scope_tree.find(ident_name); + if let Some((old_value, _)) = variable { + old_value.num_times_used += 1; + let ident = HirExpression::Ident(old_value.ident.clone(), None); + let expr_id = self.interner.push_expr(ident); + self.interner.push_expr_location(expr_id, call_expr_span, self.file); + let ident = old_value.ident.clone(); + let typ = self.type_check_variable(ident, expr_id); + self.interner.push_expr_type(expr_id, typ.clone()); + capture_types.push(typ); + fmt_str_idents.push(expr_id); + } else if ident_name.parse::().is_ok() { + self.push_err(ResolverError::NumericConstantInFormatString { + name: ident_name.to_owned(), + span: call_expr_span, + }); + } else { + self.push_err(ResolverError::VariableNotDeclared { + name: ident_name.to_owned(), + span: call_expr_span, + }); + } + } + + let len = Type::Constant(str.len() as u64); + let typ = Type::FmtString(Box::new(len), Box::new(Type::Tuple(capture_types))); + (HirExpression::Literal(HirLiteral::FmtStr(str, fmt_str_idents)), typ) + } + + fn elaborate_prefix(&mut self, prefix: PrefixExpression) -> (HirExpression, Type) { + let span = prefix.rhs.span; + let (rhs, rhs_type) = self.elaborate_expression(prefix.rhs); + let ret_type = self.type_check_prefix_operand(&prefix.operator, &rhs_type, span); + (HirExpression::Prefix(HirPrefixExpression { operator: prefix.operator, rhs }), ret_type) + } + + fn elaborate_index(&mut self, index_expr: IndexExpression) -> (HirExpression, Type) { + let span = index_expr.index.span; + let (index, index_type) = self.elaborate_expression(index_expr.index); + + let expected = self.polymorphic_integer_or_field(); + self.unify(&index_type, &expected, || TypeCheckError::TypeMismatch { + expected_typ: "an integer".to_owned(), + expr_typ: index_type.to_string(), + expr_span: span, + }); + + // When writing `a[i]`, if `a : &mut ...` then automatically dereference `a` as many + // times as needed to get the underlying array. + let lhs_span = index_expr.collection.span; + let (lhs, lhs_type) = self.elaborate_expression(index_expr.collection); + let (collection, lhs_type) = self.insert_auto_dereferences(lhs, lhs_type); + + let typ = match lhs_type.follow_bindings() { + // XXX: We can check the array bounds here also, but it may be better to constant fold first + // and have ConstId instead of ExprId for constants + Type::Array(_, base_type) => *base_type, + Type::Slice(base_type) => *base_type, + Type::Error => Type::Error, + typ => { + self.push_err(TypeCheckError::TypeMismatch { + expected_typ: "Array".to_owned(), + expr_typ: typ.to_string(), + expr_span: lhs_span, + }); + Type::Error + } + }; + + let expr = HirExpression::Index(HirIndexExpression { collection, index }); + (expr, typ) + } + + fn elaborate_call(&mut self, call: CallExpression, span: Span) -> (HirExpression, Type) { + let (func, func_type) = self.elaborate_expression(*call.func); + + let mut arguments = Vec::with_capacity(call.arguments.len()); + let args = vecmap(call.arguments, |arg| { + let span = arg.span; + let (arg, typ) = self.elaborate_expression(arg); + arguments.push(arg); + (typ, arg, span) + }); + + let location = Location::new(span, self.file); + let call = HirCallExpression { func, arguments, location }; + let typ = self.type_check_call(&call, func_type, args, span); + (HirExpression::Call(call), typ) + } + + fn elaborate_method_call( + &mut self, + method_call: MethodCallExpression, + span: Span, + ) -> (HirExpression, Type) { + let object_span = method_call.object.span; + let (mut object, mut object_type) = self.elaborate_expression(method_call.object); + object_type = object_type.follow_bindings(); + + let method_name = method_call.method_name.0.contents.as_str(); + match self.lookup_method(&object_type, method_name, span) { + Some(method_ref) => { + // Automatically add `&mut` if the method expects a mutable reference and + // the object is not already one. + if let HirMethodReference::FuncId(func_id) = &method_ref { + if *func_id != FuncId::dummy_id() { + let function_type = self.interner.function_meta(func_id).typ.clone(); + + self.try_add_mutable_reference_to_object( + &function_type, + &mut object_type, + &mut object, + ); + } + } + + // These arguments will be given to the desugared function call. + // Compared to the method arguments, they also contain the object. + let mut function_args = Vec::with_capacity(method_call.arguments.len() + 1); + let mut arguments = Vec::with_capacity(method_call.arguments.len()); + + function_args.push((object_type.clone(), object, object_span)); + + for arg in method_call.arguments { + let span = arg.span; + let (arg, typ) = self.elaborate_expression(arg); + arguments.push(arg); + function_args.push((typ, arg, span)); + } + + let location = Location::new(span, self.file); + let method = method_call.method_name; + let generics = method_call.generics.map(|option_inner| { + option_inner.into_iter().map(|generic| self.resolve_type(generic)).collect() + }); + let method_call = + HirMethodCallExpression { method, object, arguments, location, generics }; + + // Desugar the method call into a normal, resolved function call + // so that the backend doesn't need to worry about methods + // TODO: update object_type here? + let ((function_id, function_name), function_call) = method_call.into_function_call( + &method_ref, + object_type, + location, + self.interner, + ); + + let func_type = self.type_check_variable(function_name, function_id); + + // Type check the new call now that it has been changed from a method call + // to a function call. This way we avoid duplicating code. + let typ = self.type_check_call(&function_call, func_type, function_args, span); + (HirExpression::Call(function_call), typ) + } + None => (HirExpression::Error, Type::Error), + } + } + + fn elaborate_constructor( + &mut self, + constructor: ConstructorExpression, + ) -> (HirExpression, Type) { + let span = constructor.type_name.span(); + + match self.lookup_type_or_error(constructor.type_name) { + Some(Type::Struct(r#type, struct_generics)) => { + let struct_type = r#type.clone(); + let generics = struct_generics.clone(); + + let fields = constructor.fields; + let field_types = r#type.borrow().get_fields(&struct_generics); + let fields = self.resolve_constructor_expr_fields( + struct_type.clone(), + field_types, + fields, + span, + ); + let expr = HirExpression::Constructor(HirConstructorExpression { + fields, + r#type, + struct_generics, + }); + (expr, Type::Struct(struct_type, generics)) + } + Some(typ) => { + self.push_err(ResolverError::NonStructUsedInConstructor { typ, span }); + (HirExpression::Error, Type::Error) + } + None => (HirExpression::Error, Type::Error), + } + } + + /// Resolve all the fields of a struct constructor expression. + /// Ensures all fields are present, none are repeated, and all + /// are part of the struct. + fn resolve_constructor_expr_fields( + &mut self, + struct_type: Shared, + field_types: Vec<(String, Type)>, + fields: Vec<(Ident, Expression)>, + span: Span, + ) -> Vec<(Ident, ExprId)> { + let mut ret = Vec::with_capacity(fields.len()); + let mut seen_fields = HashSet::default(); + let mut unseen_fields = struct_type.borrow().field_names(); + + for (field_name, field) in fields { + let expected_type = field_types.iter().find(|(name, _)| name == &field_name.0.contents); + let expected_type = expected_type.map(|(_, typ)| typ).unwrap_or(&Type::Error); + + let field_span = field.span; + let (resolved, field_type) = self.elaborate_expression(field); + + if unseen_fields.contains(&field_name) { + unseen_fields.remove(&field_name); + seen_fields.insert(field_name.clone()); + + self.unify_with_coercions(&field_type, expected_type, resolved, || { + TypeCheckError::TypeMismatch { + expected_typ: expected_type.to_string(), + expr_typ: field_type.to_string(), + expr_span: field_span, + } + }); + } else if seen_fields.contains(&field_name) { + // duplicate field + self.push_err(ResolverError::DuplicateField { field: field_name.clone() }); + } else { + // field not required by struct + self.push_err(ResolverError::NoSuchField { + field: field_name.clone(), + struct_definition: struct_type.borrow().name.clone(), + }); + } + + ret.push((field_name, resolved)); + } + + if !unseen_fields.is_empty() { + self.push_err(ResolverError::MissingFields { + span, + missing_fields: unseen_fields.into_iter().map(|field| field.to_string()).collect(), + struct_definition: struct_type.borrow().name.clone(), + }); + } + + ret + } + + fn elaborate_member_access( + &mut self, + access: MemberAccessExpression, + span: Span, + ) -> (ExprId, Type) { + let (lhs, lhs_type) = self.elaborate_expression(access.lhs); + let rhs = access.rhs; + // `is_offset` is only used when lhs is a reference and we want to return a reference to rhs + let access = HirMemberAccess { lhs, rhs, is_offset: false }; + let expr_id = self.intern_expr(HirExpression::MemberAccess(access.clone()), span); + let typ = self.type_check_member_access(access, expr_id, lhs_type, span); + self.interner.push_expr_type(expr_id, typ.clone()); + (expr_id, typ) + } + + pub fn intern_expr(&mut self, expr: HirExpression, span: Span) -> ExprId { + let id = self.interner.push_expr(expr); + self.interner.push_expr_location(id, span, self.file); + id + } + + fn elaborate_cast(&mut self, cast: CastExpression, span: Span) -> (HirExpression, Type) { + let (lhs, lhs_type) = self.elaborate_expression(cast.lhs); + let r#type = self.resolve_type(cast.r#type); + let result = self.check_cast(lhs_type, &r#type, span); + let expr = HirExpression::Cast(HirCastExpression { lhs, r#type }); + (expr, result) + } + + fn elaborate_infix(&mut self, infix: InfixExpression, span: Span) -> (ExprId, Type) { + let (lhs, lhs_type) = self.elaborate_expression(infix.lhs); + let (rhs, rhs_type) = self.elaborate_expression(infix.rhs); + let trait_id = self.interner.get_operator_trait_method(infix.operator.contents); + + let operator = HirBinaryOp::new(infix.operator, self.file); + let expr = HirExpression::Infix(HirInfixExpression { + lhs, + operator, + trait_method_id: trait_id, + rhs, + }); + + let expr_id = self.interner.push_expr(expr); + self.interner.push_expr_location(expr_id, span, self.file); + + let typ = match self.infix_operand_type_rules(&lhs_type, &operator, &rhs_type, span) { + Ok((typ, use_impl)) => { + if use_impl { + // Delay checking the trait constraint until the end of the function. + // Checking it now could bind an unbound type variable to any type + // that implements the trait. + let constraint = TraitConstraint { + typ: lhs_type.clone(), + trait_id: trait_id.trait_id, + trait_generics: Vec::new(), + }; + self.trait_constraints.push((constraint, expr_id)); + self.type_check_operator_method(expr_id, trait_id, &lhs_type, span); + } + typ + } + Err(error) => { + self.push_err(error); + Type::Error + } + }; + + self.interner.push_expr_type(expr_id, typ.clone()); + (expr_id, typ) + } + + fn elaborate_if(&mut self, if_expr: IfExpression) -> (HirExpression, Type) { + let expr_span = if_expr.condition.span; + let (condition, cond_type) = self.elaborate_expression(if_expr.condition); + let (consequence, mut ret_type) = self.elaborate_expression(if_expr.consequence); + + self.unify(&cond_type, &Type::Bool, || TypeCheckError::TypeMismatch { + expected_typ: Type::Bool.to_string(), + expr_typ: cond_type.to_string(), + expr_span, + }); + + let alternative = if_expr.alternative.map(|alternative| { + let expr_span = alternative.span; + let (else_, else_type) = self.elaborate_expression(alternative); + + self.unify(&ret_type, &else_type, || { + let err = TypeCheckError::TypeMismatch { + expected_typ: ret_type.to_string(), + expr_typ: else_type.to_string(), + expr_span, + }; + + let context = if ret_type == Type::Unit { + "Are you missing a semicolon at the end of your 'else' branch?" + } else if else_type == Type::Unit { + "Are you missing a semicolon at the end of the first block of this 'if'?" + } else { + "Expected the types of both if branches to be equal" + }; + + err.add_context(context) + }); + else_ + }); + + if alternative.is_none() { + ret_type = Type::Unit; + } + + let if_expr = HirIfExpression { condition, consequence, alternative }; + (HirExpression::If(if_expr), ret_type) + } + + fn elaborate_tuple(&mut self, tuple: Vec) -> (HirExpression, Type) { + let mut element_ids = Vec::with_capacity(tuple.len()); + let mut element_types = Vec::with_capacity(tuple.len()); + + for element in tuple { + let (id, typ) = self.elaborate_expression(element); + element_ids.push(id); + element_types.push(typ); + } + + (HirExpression::Tuple(element_ids), Type::Tuple(element_types)) + } + + fn elaborate_lambda(&mut self, lambda: Lambda) -> (HirExpression, Type) { + self.push_scope(); + let scope_index = self.scopes.current_scope_index(); + + self.lambda_stack.push(LambdaContext { captures: Vec::new(), scope_index }); + + let mut arg_types = Vec::with_capacity(lambda.parameters.len()); + let parameters = vecmap(lambda.parameters, |(pattern, typ)| { + let parameter = DefinitionKind::Local(None); + let typ = self.resolve_inferred_type(typ); + arg_types.push(typ.clone()); + (self.elaborate_pattern(pattern, typ.clone(), parameter), typ) + }); + + let return_type = self.resolve_inferred_type(lambda.return_type); + let body_span = lambda.body.span; + let (body, body_type) = self.elaborate_expression(lambda.body); + + let lambda_context = self.lambda_stack.pop().unwrap(); + self.pop_scope(); + + self.unify(&body_type, &return_type, || TypeCheckError::TypeMismatch { + expected_typ: return_type.to_string(), + expr_typ: body_type.to_string(), + expr_span: body_span, + }); + + let captured_vars = vecmap(&lambda_context.captures, |capture| { + self.interner.definition_type(capture.ident.id) + }); + + let env_type = + if captured_vars.is_empty() { Type::Unit } else { Type::Tuple(captured_vars) }; + + let captures = lambda_context.captures; + let expr = HirExpression::Lambda(HirLambda { parameters, return_type, body, captures }); + (expr, Type::Function(arg_types, Box::new(body_type), Box::new(env_type))) + } + + fn elaborate_quote(&mut self, block: BlockExpression) -> (HirExpression, Type) { + (HirExpression::Quote(block), Type::Code) + } + + fn elaborate_comptime_block(&mut self, _comptime: BlockExpression) -> (HirExpression, Type) { + todo!("Elaborate comptime block") + } +} diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/mod.rs new file mode 100644 index 00000000000..0f9d22ca9b5 --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/mod.rs @@ -0,0 +1,1103 @@ +#![allow(unused)] +use std::{ + collections::{BTreeMap, BTreeSet}, + rc::Rc, +}; + +use crate::{ + ast::{ + ArrayLiteral, ConstructorExpression, FunctionKind, IfExpression, InfixExpression, Lambda, + UnresolvedTraitConstraint, UnresolvedTypeExpression, + }, + hir::{ + def_collector::{dc_crate::CompilationError, errors::DuplicateType}, + resolution::{errors::ResolverError, path_resolver::PathResolver, resolver::LambdaContext}, + scope::ScopeForest as GenericScopeForest, + type_check::TypeCheckError, + }, + hir_def::{ + expr::{ + HirArrayLiteral, HirBinaryOp, HirBlockExpression, HirCallExpression, HirCastExpression, + HirConstructorExpression, HirIdent, HirIfExpression, HirIndexExpression, + HirInfixExpression, HirLambda, HirMemberAccess, HirMethodCallExpression, + HirMethodReference, HirPrefixExpression, + }, + traits::TraitConstraint, + }, + macros_api::{ + BlockExpression, CallExpression, CastExpression, Expression, ExpressionKind, HirExpression, + HirLiteral, HirStatement, Ident, IndexExpression, Literal, MemberAccessExpression, + MethodCallExpression, NodeInterner, NoirFunction, PrefixExpression, Statement, + StatementKind, StructId, + }, + node_interner::{DefinitionKind, DependencyId, ExprId, FuncId, StmtId, TraitId}, + Shared, StructType, Type, TypeVariable, +}; +use crate::{ + ast::{TraitBound, UnresolvedGenerics}, + graph::CrateId, + hir::{ + def_collector::{ + dc_crate::{CollectedItems, DefCollector}, + errors::DefCollectorErrorKind, + }, + def_map::{LocalModuleId, ModuleDefId, ModuleId, MAIN_FUNCTION}, + resolution::{ + errors::PubPosition, + import::{PathResolution, PathResolutionError}, + path_resolver::StandardPathResolver, + }, + Context, + }, + hir_def::function::{FuncMeta, HirFunction}, + macros_api::{Param, Path, UnresolvedType, UnresolvedTypeData, Visibility}, + node_interner::TraitImplId, + token::FunctionAttribute, + Generics, +}; +use crate::{ + hir::{ + def_collector::dc_crate::{UnresolvedFunctions, UnresolvedTraitImpl}, + def_map::{CrateDefMap, ModuleData}, + }, + hir_def::traits::TraitImpl, + macros_api::ItemVisibility, +}; + +mod expressions; +mod patterns; +mod scope; +mod statements; +mod types; + +use fm::FileId; +use iter_extended::vecmap; +use noirc_errors::{Location, Span}; +use regex::Regex; +use rustc_hash::FxHashSet as HashSet; + +/// ResolverMetas are tagged onto each definition to track how many times they are used +#[derive(Debug, PartialEq, Eq)] +pub struct ResolverMeta { + num_times_used: usize, + ident: HirIdent, + warn_if_unused: bool, +} + +type ScopeForest = GenericScopeForest; + +pub struct Elaborator<'context> { + scopes: ScopeForest, + + errors: Vec<(CompilationError, FileId)>, + + interner: &'context mut NodeInterner, + + def_maps: &'context mut BTreeMap, + + file: FileId, + + in_unconstrained_fn: bool, + nested_loops: usize, + + /// True if the current module is a contract. + /// This is usually determined by self.path_resolver.module_id(), but it can + /// be overridden for impls. Impls are an odd case since the methods within resolve + /// as if they're in the parent module, but should be placed in a child module. + /// Since they should be within a child module, in_contract is manually set to false + /// for these so we can still resolve them in the parent module without them being in a contract. + in_contract: bool, + + /// Contains a mapping of the current struct or functions's generics to + /// unique type variables if we're resolving a struct. Empty otherwise. + /// This is a Vec rather than a map to preserve the order a functions generics + /// were declared in. + generics: Vec<(Rc, TypeVariable, Span)>, + + /// When resolving lambda expressions, we need to keep track of the variables + /// that are captured. We do this in order to create the hidden environment + /// parameter for the lambda function. + lambda_stack: Vec, + + /// Set to the current type if we're resolving an impl + self_type: Option, + + /// The current dependency item we're resolving. + /// Used to link items to their dependencies in the dependency graph + current_item: Option, + + /// If we're currently resolving methods within a trait impl, this will be set + /// to the corresponding trait impl ID. + current_trait_impl: Option, + + trait_id: Option, + + /// In-resolution names + /// + /// This needs to be a set because we can have multiple in-resolution + /// names when resolving structs that are declared in reverse order of their + /// dependencies, such as in the following case: + /// + /// ``` + /// struct Wrapper { + /// value: Wrapped + /// } + /// struct Wrapped { + /// } + /// ``` + resolving_ids: BTreeSet, + + trait_bounds: Vec, + + current_function: Option, + + /// All type variables created in the current function. + /// This map is used to default any integer type variables at the end of + /// a function (before checking trait constraints) if a type wasn't already chosen. + type_variables: Vec, + + /// Trait constraints are collected during type checking until they are + /// verified at the end of a function. This is because constraints arise + /// on each variable, but it is only until function calls when the types + /// needed for the trait constraint may become known. + trait_constraints: Vec<(TraitConstraint, ExprId)>, + + /// The current module this elaborator is in. + /// Initially empty, it is set whenever a new top-level item is resolved. + local_module: LocalModuleId, + + crate_id: CrateId, +} + +impl<'context> Elaborator<'context> { + pub fn new(context: &'context mut Context, crate_id: CrateId) -> Self { + Self { + scopes: ScopeForest::default(), + errors: Vec::new(), + interner: &mut context.def_interner, + def_maps: &mut context.def_maps, + file: FileId::dummy(), + in_unconstrained_fn: false, + nested_loops: 0, + in_contract: false, + generics: Vec::new(), + lambda_stack: Vec::new(), + self_type: None, + current_item: None, + trait_id: None, + local_module: LocalModuleId::dummy_id(), + crate_id, + resolving_ids: BTreeSet::new(), + trait_bounds: Vec::new(), + current_function: None, + type_variables: Vec::new(), + trait_constraints: Vec::new(), + current_trait_impl: None, + } + } + + pub fn elaborate( + context: &'context mut Context, + crate_id: CrateId, + mut items: CollectedItems, + ) -> Vec<(CompilationError, FileId)> { + let mut this = Self::new(context, crate_id); + + // the resolver filters literal globals first + for global in items.globals {} + + for alias in items.type_aliases {} + + for trait_ in items.traits {} + + for struct_ in items.types {} + + for trait_impl in &mut items.trait_impls { + this.collect_trait_impl(trait_impl); + } + + for ((typ, module), impls) in &items.impls { + this.collect_impls(typ, *module, impls); + } + + // resolver resolves non-literal globals here + + for functions in items.functions { + this.elaborate_functions(functions); + } + + for ((typ, module), impls) in items.impls { + this.elaborate_impls(typ, module, impls); + } + + for trait_impl in items.trait_impls { + this.elaborate_trait_impl(trait_impl); + } + + let cycle_errors = this.interner.check_for_dependency_cycles(); + this.errors.extend(cycle_errors); + + this.errors + } + + fn elaborate_functions(&mut self, functions: UnresolvedFunctions) { + self.file = functions.file_id; + self.trait_id = functions.trait_id; // TODO: Resolve? + for (local_module, id, func) in functions.functions { + self.local_module = local_module; + let generics_count = self.generics.len(); + self.elaborate_function(func, id); + self.generics.truncate(generics_count); + } + } + + fn elaborate_function(&mut self, mut function: NoirFunction, id: FuncId) { + self.current_function = Some(id); + self.resolve_where_clause(&mut function.def.where_clause); + + // Without this, impl methods can accidentally be placed in contracts. See #3254 + if self.self_type.is_some() { + self.in_contract = false; + } + + self.scopes.start_function(); + self.current_item = Some(DependencyId::Function(id)); + + // Check whether the function has globals in the local module and add them to the scope + self.resolve_local_globals(); + self.add_generics(&function.def.generics); + + self.desugar_impl_trait_args(&mut function, id); + self.trait_bounds = function.def.where_clause.clone(); + + let is_low_level_or_oracle = function + .attributes() + .function + .as_ref() + .map_or(false, |func| func.is_low_level() || func.is_oracle()); + + if function.def.is_unconstrained { + self.in_unconstrained_fn = true; + } + + let func_meta = self.extract_meta(&function, id); + + self.add_trait_constraints_to_scope(&func_meta); + + let (hir_func, body_type) = match function.kind { + FunctionKind::Builtin | FunctionKind::LowLevel | FunctionKind::Oracle => { + (HirFunction::empty(), Type::Error) + } + FunctionKind::Normal | FunctionKind::Recursive => { + let block_span = function.def.span; + let (block, body_type) = self.elaborate_block(function.def.body); + let expr_id = self.intern_expr(block, block_span); + self.interner.push_expr_type(expr_id, body_type.clone()); + (HirFunction::unchecked_from_expr(expr_id), body_type) + } + }; + + if !func_meta.can_ignore_return_type() { + self.type_check_function_body(body_type, &func_meta, hir_func.as_expr()); + } + + // Default any type variables that still need defaulting. + // This is done before trait impl search since leaving them bindable can lead to errors + // when multiple impls are available. Instead we default first to choose the Field or u64 impl. + for typ in &self.type_variables { + if let Type::TypeVariable(variable, kind) = typ.follow_bindings() { + let msg = "TypeChecker should only track defaultable type vars"; + variable.bind(kind.default_type().expect(msg)); + } + } + + // Verify any remaining trait constraints arising from the function body + for (constraint, expr_id) in std::mem::take(&mut self.trait_constraints) { + let span = self.interner.expr_span(&expr_id); + self.verify_trait_constraint( + &constraint.typ, + constraint.trait_id, + &constraint.trait_generics, + expr_id, + span, + ); + } + + // Now remove all the `where` clause constraints we added + for constraint in &func_meta.trait_constraints { + self.interner.remove_assumed_trait_implementations_for_trait(constraint.trait_id); + } + + let func_scope_tree = self.scopes.end_function(); + + // The arguments to low-level and oracle functions are always unused so we do not produce warnings for them. + if !is_low_level_or_oracle { + self.check_for_unused_variables_in_scope_tree(func_scope_tree); + } + + self.trait_bounds.clear(); + + self.interner.push_fn_meta(func_meta, id); + self.interner.update_fn(id, hir_func); + self.current_function = None; + } + + /// This turns function parameters of the form: + /// fn foo(x: impl Bar) + /// + /// into + /// fn foo(x: T0_impl_Bar) where T0_impl_Bar: Bar + fn desugar_impl_trait_args(&mut self, func: &mut NoirFunction, func_id: FuncId) { + let mut impl_trait_generics = HashSet::default(); + let mut counter: usize = 0; + for parameter in func.def.parameters.iter_mut() { + if let UnresolvedTypeData::TraitAsType(path, args) = ¶meter.typ.typ { + let mut new_generic_ident: Ident = + format!("T{}_impl_{}", func_id, path.as_string()).into(); + let mut new_generic_path = Path::from_ident(new_generic_ident.clone()); + while impl_trait_generics.contains(&new_generic_ident) + || self.lookup_generic_or_global_type(&new_generic_path).is_some() + { + new_generic_ident = + format!("T{}_impl_{}_{}", func_id, path.as_string(), counter).into(); + new_generic_path = Path::from_ident(new_generic_ident.clone()); + counter += 1; + } + impl_trait_generics.insert(new_generic_ident.clone()); + + let is_synthesized = true; + let new_generic_type_data = + UnresolvedTypeData::Named(new_generic_path, vec![], is_synthesized); + let new_generic_type = + UnresolvedType { typ: new_generic_type_data.clone(), span: None }; + let new_trait_bound = TraitBound { + trait_path: path.clone(), + trait_id: None, + trait_generics: args.to_vec(), + }; + let new_trait_constraint = UnresolvedTraitConstraint { + typ: new_generic_type, + trait_bound: new_trait_bound, + }; + + parameter.typ.typ = new_generic_type_data; + func.def.generics.push(new_generic_ident); + func.def.where_clause.push(new_trait_constraint); + } + } + self.add_generics(&impl_trait_generics.into_iter().collect()); + } + + /// Add the given generics to scope. + /// Each generic will have a fresh Shared associated with it. + pub fn add_generics(&mut self, generics: &UnresolvedGenerics) -> Generics { + vecmap(generics, |generic| { + // Map the generic to a fresh type variable + let id = self.interner.next_type_variable_id(); + let typevar = TypeVariable::unbound(id); + let span = generic.0.span(); + + // Check for name collisions of this generic + let name = Rc::new(generic.0.contents.clone()); + + if let Some((_, _, first_span)) = self.find_generic(&name) { + self.push_err(ResolverError::DuplicateDefinition { + name: generic.0.contents.clone(), + first_span: *first_span, + second_span: span, + }); + } else { + self.generics.push((name, typevar.clone(), span)); + } + + typevar + }) + } + + fn push_err(&mut self, error: impl Into) { + self.errors.push((error.into(), self.file)); + } + + fn resolve_where_clause(&mut self, clause: &mut [UnresolvedTraitConstraint]) { + for bound in clause { + if let Some(trait_id) = self.resolve_trait_by_path(bound.trait_bound.trait_path.clone()) + { + bound.trait_bound.trait_id = Some(trait_id); + } + } + } + + fn resolve_trait_by_path(&mut self, path: Path) -> Option { + let path_resolver = StandardPathResolver::new(self.module_id()); + + let error = match path_resolver.resolve(self.def_maps, path.clone()) { + Ok(PathResolution { module_def_id: ModuleDefId::TraitId(trait_id), error }) => { + if let Some(error) = error { + self.push_err(error); + } + return Some(trait_id); + } + Ok(_) => DefCollectorErrorKind::NotATrait { not_a_trait_name: path }, + Err(_) => DefCollectorErrorKind::TraitNotFound { trait_path: path }, + }; + self.push_err(error); + None + } + + fn resolve_local_globals(&mut self) { + let globals = vecmap(self.interner.get_all_globals(), |global| { + (global.id, global.local_id, global.ident.clone()) + }); + for (id, local_module_id, name) in globals { + if local_module_id == self.local_module { + let definition = DefinitionKind::Global(id); + self.add_global_variable_decl(name, definition); + } + } + } + + /// TODO: This is currently only respected for generic free functions + /// there's a bunch of other places where trait constraints can pop up + fn resolve_trait_constraints( + &mut self, + where_clause: &[UnresolvedTraitConstraint], + ) -> Vec { + where_clause + .iter() + .cloned() + .filter_map(|constraint| self.resolve_trait_constraint(constraint)) + .collect() + } + + pub fn resolve_trait_constraint( + &mut self, + constraint: UnresolvedTraitConstraint, + ) -> Option { + let typ = self.resolve_type(constraint.typ); + let trait_generics = + vecmap(constraint.trait_bound.trait_generics, |typ| self.resolve_type(typ)); + + let span = constraint.trait_bound.trait_path.span(); + let the_trait = self.lookup_trait_or_error(constraint.trait_bound.trait_path)?; + let trait_id = the_trait.id; + + let expected_generics = the_trait.generics.len(); + let actual_generics = trait_generics.len(); + + if actual_generics != expected_generics { + let item_name = the_trait.name.to_string(); + self.push_err(ResolverError::IncorrectGenericCount { + span, + item_name, + actual: actual_generics, + expected: expected_generics, + }); + } + + Some(TraitConstraint { typ, trait_id, trait_generics }) + } + + /// Extract metadata from a NoirFunction + /// to be used in analysis and intern the function parameters + /// Prerequisite: self.add_generics() has already been called with the given + /// function's generics, including any generics from the impl, if any. + fn extract_meta(&mut self, func: &NoirFunction, func_id: FuncId) -> FuncMeta { + let location = Location::new(func.name_ident().span(), self.file); + let id = self.interner.function_definition_id(func_id); + let name_ident = HirIdent::non_trait_method(id, location); + + let attributes = func.attributes().clone(); + let has_no_predicates_attribute = attributes.is_no_predicates(); + let should_fold = attributes.is_foldable(); + if !self.inline_attribute_allowed(func) { + if has_no_predicates_attribute { + self.push_err(ResolverError::NoPredicatesAttributeOnUnconstrained { + ident: func.name_ident().clone(), + }); + } else if should_fold { + self.push_err(ResolverError::FoldAttributeOnUnconstrained { + ident: func.name_ident().clone(), + }); + } + } + // Both the #[fold] and #[no_predicates] alter a function's inline type and code generation in similar ways. + // In certain cases such as type checking (for which the following flag will be used) both attributes + // indicate we should code generate in the same way. Thus, we unify the attributes into one flag here. + let has_inline_attribute = has_no_predicates_attribute || should_fold; + let is_entry_point = self.is_entry_point_function(func); + + let mut generics = vecmap(&self.generics, |(_, typevar, _)| typevar.clone()); + let mut parameters = vec![]; + let mut parameter_types = vec![]; + + for Param { visibility, pattern, typ, span: _ } in func.parameters().iter().cloned() { + if visibility == Visibility::Public && !self.pub_allowed(func) { + self.push_err(ResolverError::UnnecessaryPub { + ident: func.name_ident().clone(), + position: PubPosition::Parameter, + }); + } + + let type_span = typ.span.unwrap_or_else(|| pattern.span()); + let typ = self.resolve_type_inner(typ, &mut generics); + self.check_if_type_is_valid_for_program_input( + &typ, + is_entry_point, + has_inline_attribute, + type_span, + ); + let pattern = self.elaborate_pattern(pattern, typ.clone(), DefinitionKind::Local(None)); + + parameters.push((pattern, typ.clone(), visibility)); + parameter_types.push(typ); + } + + let return_type = Box::new(self.resolve_type(func.return_type())); + + self.declare_numeric_generics(¶meter_types, &return_type); + + if !self.pub_allowed(func) && func.def.return_visibility == Visibility::Public { + self.push_err(ResolverError::UnnecessaryPub { + ident: func.name_ident().clone(), + position: PubPosition::ReturnType, + }); + } + + let is_low_level_function = + attributes.function.as_ref().map_or(false, |func| func.is_low_level()); + + if !self.crate_id.is_stdlib() && is_low_level_function { + let error = + ResolverError::LowLevelFunctionOutsideOfStdlib { ident: func.name_ident().clone() }; + self.push_err(error); + } + + // 'pub' is required on return types for entry point functions + if is_entry_point + && return_type.as_ref() != &Type::Unit + && func.def.return_visibility == Visibility::Private + { + self.push_err(ResolverError::NecessaryPub { ident: func.name_ident().clone() }); + } + // '#[recursive]' attribute is only allowed for entry point functions + if !is_entry_point && func.kind == FunctionKind::Recursive { + self.push_err(ResolverError::MisplacedRecursiveAttribute { + ident: func.name_ident().clone(), + }); + } + + if matches!(attributes.function, Some(FunctionAttribute::Test { .. })) + && !parameters.is_empty() + { + self.push_err(ResolverError::TestFunctionHasParameters { + span: func.name_ident().span(), + }); + } + + let mut typ = Type::Function(parameter_types, return_type, Box::new(Type::Unit)); + + if !generics.is_empty() { + typ = Type::Forall(generics, Box::new(typ)); + } + + self.interner.push_definition_type(name_ident.id, typ.clone()); + + let direct_generics = func.def.generics.iter(); + let direct_generics = direct_generics + .filter_map(|generic| self.find_generic(&generic.0.contents)) + .map(|(name, typevar, _span)| (name.clone(), typevar.clone())) + .collect(); + + FuncMeta { + name: name_ident, + kind: func.kind, + location, + typ, + direct_generics, + trait_impl: self.current_trait_impl, + parameters: parameters.into(), + return_type: func.def.return_type.clone(), + return_visibility: func.def.return_visibility, + has_body: !func.def.body.is_empty(), + trait_constraints: self.resolve_trait_constraints(&func.def.where_clause), + is_entry_point, + has_inline_attribute, + } + } + + /// Only sized types are valid to be used as main's parameters or the parameters to a contract + /// function. If the given type is not sized (e.g. contains a slice or NamedGeneric type), an + /// error is issued. + fn check_if_type_is_valid_for_program_input( + &mut self, + typ: &Type, + is_entry_point: bool, + has_inline_attribute: bool, + span: Span, + ) { + if (is_entry_point && !typ.is_valid_for_program_input()) + || (has_inline_attribute && !typ.is_valid_non_inlined_function_input()) + { + self.push_err(TypeCheckError::InvalidTypeForEntryPoint { span }); + } + } + + fn inline_attribute_allowed(&self, func: &NoirFunction) -> bool { + // Inline attributes are only relevant for constrained functions + // as all unconstrained functions are not inlined + !func.def.is_unconstrained + } + + /// True if the 'pub' keyword is allowed on parameters in this function + /// 'pub' on function parameters is only allowed for entry point functions + fn pub_allowed(&self, func: &NoirFunction) -> bool { + self.is_entry_point_function(func) || func.attributes().is_foldable() + } + + fn is_entry_point_function(&self, func: &NoirFunction) -> bool { + if self.in_contract { + func.attributes().is_contract_entry_point() + } else { + func.name() == MAIN_FUNCTION + } + } + + fn declare_numeric_generics(&mut self, params: &[Type], return_type: &Type) { + if self.generics.is_empty() { + return; + } + + for (name_to_find, type_variable) in Self::find_numeric_generics(params, return_type) { + // Declare any generics to let users use numeric generics in scope. + // Don't issue a warning if these are unused + // + // We can fail to find the generic in self.generics if it is an implicit one created + // by the compiler. This can happen when, e.g. eliding array lengths using the slice + // syntax [T]. + if let Some((name, _, span)) = + self.generics.iter().find(|(name, _, _)| name.as_ref() == &name_to_find) + { + let ident = Ident::new(name.to_string(), *span); + let definition = DefinitionKind::GenericType(type_variable); + self.add_variable_decl_inner(ident, false, false, false, definition); + } + } + } + + fn find_numeric_generics( + parameters: &[Type], + return_type: &Type, + ) -> Vec<(String, TypeVariable)> { + let mut found = BTreeMap::new(); + for parameter in parameters { + Self::find_numeric_generics_in_type(parameter, &mut found); + } + Self::find_numeric_generics_in_type(return_type, &mut found); + found.into_iter().collect() + } + + fn find_numeric_generics_in_type(typ: &Type, found: &mut BTreeMap) { + match typ { + Type::FieldElement + | Type::Integer(_, _) + | Type::Bool + | Type::Unit + | Type::Error + | Type::TypeVariable(_, _) + | Type::Constant(_) + | Type::NamedGeneric(_, _) + | Type::Code + | Type::Forall(_, _) => (), + + Type::TraitAsType(_, _, args) => { + for arg in args { + Self::find_numeric_generics_in_type(arg, found); + } + } + + Type::Array(length, element_type) => { + if let Type::NamedGeneric(type_variable, name) = length.as_ref() { + found.insert(name.to_string(), type_variable.clone()); + } + Self::find_numeric_generics_in_type(element_type, found); + } + + Type::Slice(element_type) => { + Self::find_numeric_generics_in_type(element_type, found); + } + + Type::Tuple(fields) => { + for field in fields { + Self::find_numeric_generics_in_type(field, found); + } + } + + Type::Function(parameters, return_type, _env) => { + for parameter in parameters { + Self::find_numeric_generics_in_type(parameter, found); + } + Self::find_numeric_generics_in_type(return_type, found); + } + + Type::Struct(struct_type, generics) => { + for (i, generic) in generics.iter().enumerate() { + if let Type::NamedGeneric(type_variable, name) = generic { + if struct_type.borrow().generic_is_numeric(i) { + found.insert(name.to_string(), type_variable.clone()); + } + } else { + Self::find_numeric_generics_in_type(generic, found); + } + } + } + Type::Alias(alias, generics) => { + for (i, generic) in generics.iter().enumerate() { + if let Type::NamedGeneric(type_variable, name) = generic { + if alias.borrow().generic_is_numeric(i) { + found.insert(name.to_string(), type_variable.clone()); + } + } else { + Self::find_numeric_generics_in_type(generic, found); + } + } + } + Type::MutableReference(element) => Self::find_numeric_generics_in_type(element, found), + Type::String(length) => { + if let Type::NamedGeneric(type_variable, name) = length.as_ref() { + found.insert(name.to_string(), type_variable.clone()); + } + } + Type::FmtString(length, fields) => { + if let Type::NamedGeneric(type_variable, name) = length.as_ref() { + found.insert(name.to_string(), type_variable.clone()); + } + Self::find_numeric_generics_in_type(fields, found); + } + } + } + + fn add_trait_constraints_to_scope(&mut self, func_meta: &FuncMeta) { + for constraint in &func_meta.trait_constraints { + let object = constraint.typ.clone(); + let trait_id = constraint.trait_id; + let generics = constraint.trait_generics.clone(); + + if !self.interner.add_assumed_trait_implementation(object, trait_id, generics) { + if let Some(the_trait) = self.interner.try_get_trait(trait_id) { + let trait_name = the_trait.name.to_string(); + let typ = constraint.typ.clone(); + let span = func_meta.location.span; + self.push_err(TypeCheckError::UnneededTraitConstraint { + trait_name, + typ, + span, + }); + } + } + } + } + + fn elaborate_impls( + &mut self, + typ: UnresolvedType, + module: LocalModuleId, + impls: Vec<(Vec, Span, UnresolvedFunctions)>, + ) { + self.generics.clear(); + + for (generics, _, functions) in impls { + self.file = functions.file_id; + self.add_generics(&generics); + let self_type = self.resolve_type(typ.clone()); + self.self_type = Some(self_type.clone()); + + let function_ids = vecmap(&functions.functions, |(_, id, _)| *id); + self.elaborate_functions(functions); + + if self_type != Type::Error { + for method_id in function_ids { + let method_name = self.interner.function_name(&method_id).to_owned(); + + if let Some(first_fn) = + self.interner.add_method(&self_type, method_name.clone(), method_id, false) + { + let error = ResolverError::DuplicateDefinition { + name: method_name, + first_span: self.interner.function_ident(&first_fn).span(), + second_span: self.interner.function_ident(&method_id).span(), + }; + self.push_err(error); + } + } + } + } + } + + fn elaborate_trait_impl(&mut self, trait_impl: UnresolvedTraitImpl) { + self.file = trait_impl.file_id; + self.local_module = trait_impl.module_id; + + let unresolved_type = trait_impl.object_type; + let self_type_span = unresolved_type.span; + self.add_generics(&trait_impl.generics); + + let trait_generics = + vecmap(&trait_impl.trait_generics, |generic| self.resolve_type(generic.clone())); + + let self_type = self.resolve_type(unresolved_type.clone()); + let impl_id = self.interner.next_trait_impl_id(); + + self.self_type = Some(self_type.clone()); + self.current_trait_impl = Some(impl_id); + + let mut methods = trait_impl.methods.function_ids(); + + self.elaborate_functions(trait_impl.methods); + + if matches!(self_type, Type::MutableReference(_)) { + let span = self_type_span.unwrap_or_else(|| trait_impl.trait_path.span()); + self.push_err(DefCollectorErrorKind::MutableReferenceInTraitImpl { span }); + } + + if let Some(trait_id) = trait_impl.trait_id { + for func_id in &methods { + self.interner.set_function_trait(*func_id, self_type.clone(), trait_id); + } + + let where_clause = trait_impl + .where_clause + .into_iter() + .flat_map(|item| self.resolve_trait_constraint(item)) + .collect(); + + let resolved_trait_impl = Shared::new(TraitImpl { + ident: trait_impl.trait_path.last_segment().clone(), + typ: self_type.clone(), + trait_id, + trait_generics: trait_generics.clone(), + file: trait_impl.file_id, + where_clause, + methods, + }); + + let generics = vecmap(&self.generics, |(_, type_variable, _)| type_variable.clone()); + + if let Err((prev_span, prev_file)) = self.interner.add_trait_implementation( + self_type.clone(), + trait_id, + trait_generics, + impl_id, + generics, + resolved_trait_impl, + ) { + self.push_err(DefCollectorErrorKind::OverlappingImpl { + typ: self_type.clone(), + span: self_type_span.unwrap_or_else(|| trait_impl.trait_path.span()), + }); + + // The 'previous impl defined here' note must be a separate error currently + // since it may be in a different file and all errors have the same file id. + self.file = prev_file; + self.push_err(DefCollectorErrorKind::OverlappingImplNote { span: prev_span }); + self.file = trait_impl.file_id; + } + } + + self.self_type = None; + self.current_trait_impl = None; + self.generics.clear(); + } + + fn collect_impls( + &mut self, + self_type: &UnresolvedType, + module: LocalModuleId, + impls: &[(Vec, Span, UnresolvedFunctions)], + ) { + self.local_module = module; + + for (generics, span, unresolved) in impls { + self.file = unresolved.file_id; + self.declare_method_on_struct(self_type, generics, false, unresolved, *span); + } + } + + fn collect_trait_impl(&mut self, trait_impl: &mut UnresolvedTraitImpl) { + self.local_module = trait_impl.module_id; + self.file = trait_impl.file_id; + trait_impl.trait_id = self.resolve_trait_by_path(trait_impl.trait_path.clone()); + + if let Some(trait_id) = trait_impl.trait_id { + self.collect_trait_impl_methods(trait_id, trait_impl); + + let span = trait_impl.object_type.span.expect("All trait self types should have spans"); + let object_type = &trait_impl.object_type; + let generics = &trait_impl.generics; + self.declare_method_on_struct(object_type, generics, true, &trait_impl.methods, span); + } + } + + fn get_module_mut(&mut self, module: ModuleId) -> &mut ModuleData { + let message = "A crate should always be present for a given crate id"; + &mut self.def_maps.get_mut(&module.krate).expect(message).modules[module.local_id.0] + } + + fn declare_method_on_struct( + &mut self, + self_type: &UnresolvedType, + generics: &UnresolvedGenerics, + is_trait_impl: bool, + functions: &UnresolvedFunctions, + span: Span, + ) { + let generic_count = self.generics.len(); + self.add_generics(generics); + let typ = self.resolve_type(self_type.clone()); + + if let Type::Struct(struct_type, _generics) = typ { + let struct_type = struct_type.borrow(); + + // `impl`s are only allowed on types defined within the current crate + if !is_trait_impl && struct_type.id.krate() != self.crate_id { + let type_name = struct_type.name.to_string(); + self.push_err(DefCollectorErrorKind::ForeignImpl { span, type_name }); + self.generics.truncate(generic_count); + return; + } + + // Grab the module defined by the struct type. Note that impls are a case + // where the module the methods are added to is not the same as the module + // they are resolved in. + let module = self.get_module_mut(struct_type.id.module_id()); + + for (_, method_id, method) in &functions.functions { + // If this method was already declared, remove it from the module so it cannot + // be accessed with the `TypeName::method` syntax. We'll check later whether the + // object types in each method overlap or not. If they do, we issue an error. + // If not, that is specialization which is allowed. + let name = method.name_ident().clone(); + if module.declare_function(name, ItemVisibility::Public, *method_id).is_err() { + module.remove_function(method.name_ident()); + } + } + // Prohibit defining impls for primitive types if we're not in the stdlib + } else if !is_trait_impl && typ != Type::Error && !self.crate_id.is_stdlib() { + self.push_err(DefCollectorErrorKind::NonStructTypeInImpl { span }); + } + self.generics.truncate(generic_count); + } + + fn collect_trait_impl_methods( + &mut self, + trait_id: TraitId, + trait_impl: &mut UnresolvedTraitImpl, + ) { + self.local_module = trait_impl.module_id; + self.file = trait_impl.file_id; + + // In this Vec methods[i] corresponds to trait.methods[i]. If the impl has no implementation + // for a particular method, the default implementation will be added at that slot. + let mut ordered_methods = Vec::new(); + + // check whether the trait implementation is in the same crate as either the trait or the type + self.check_trait_impl_crate_coherence(trait_id, trait_impl); + + // set of function ids that have a corresponding method in the trait + let mut func_ids_in_trait = HashSet::default(); + + // Temporarily take ownership of the trait's methods so we can iterate over them + // while also mutating the interner + let the_trait = self.interner.get_trait_mut(trait_id); + let methods = std::mem::take(&mut the_trait.methods); + + for method in &methods { + let overrides: Vec<_> = trait_impl + .methods + .functions + .iter() + .filter(|(_, _, f)| f.name() == method.name.0.contents) + .collect(); + + if overrides.is_empty() { + if let Some(default_impl) = &method.default_impl { + // copy 'where' clause from unresolved trait impl + let mut default_impl_clone = default_impl.clone(); + default_impl_clone.def.where_clause.extend(trait_impl.where_clause.clone()); + + let func_id = self.interner.push_empty_fn(); + let module = self.module_id(); + let location = Location::new(default_impl.def.span, trait_impl.file_id); + self.interner.push_function(func_id, &default_impl.def, module, location); + func_ids_in_trait.insert(func_id); + ordered_methods.push(( + method.default_impl_module_id, + func_id, + *default_impl_clone, + )); + } else { + self.push_err(DefCollectorErrorKind::TraitMissingMethod { + trait_name: self.interner.get_trait(trait_id).name.clone(), + method_name: method.name.clone(), + trait_impl_span: trait_impl + .object_type + .span + .expect("type must have a span"), + }); + } + } else { + for (_, func_id, _) in &overrides { + func_ids_in_trait.insert(*func_id); + } + + if overrides.len() > 1 { + self.push_err(DefCollectorErrorKind::Duplicate { + typ: DuplicateType::TraitAssociatedFunction, + first_def: overrides[0].2.name_ident().clone(), + second_def: overrides[1].2.name_ident().clone(), + }); + } + + ordered_methods.push(overrides[0].clone()); + } + } + + // Restore the methods that were taken before the for loop + let the_trait = self.interner.get_trait_mut(trait_id); + the_trait.set_methods(methods); + + // Emit MethodNotInTrait error for methods in the impl block that + // don't have a corresponding method signature defined in the trait + for (_, func_id, func) in &trait_impl.methods.functions { + if !func_ids_in_trait.contains(func_id) { + let trait_name = the_trait.name.clone(); + let impl_method = func.name_ident().clone(); + let error = DefCollectorErrorKind::MethodNotInTrait { trait_name, impl_method }; + self.errors.push((error.into(), self.file)); + } + } + + trait_impl.methods.functions = ordered_methods; + trait_impl.methods.trait_id = Some(trait_id); + } + + fn check_trait_impl_crate_coherence( + &mut self, + trait_id: TraitId, + trait_impl: &UnresolvedTraitImpl, + ) { + self.local_module = trait_impl.module_id; + self.file = trait_impl.file_id; + + let object_crate = match self.resolve_type(trait_impl.object_type.clone()) { + Type::Struct(struct_type, _) => struct_type.borrow().id.krate(), + _ => CrateId::Dummy, + }; + + let the_trait = self.interner.get_trait(trait_id); + if self.crate_id != the_trait.crate_id && self.crate_id != object_crate { + self.push_err(DefCollectorErrorKind::TraitImplOrphaned { + span: trait_impl.object_type.span.expect("object type must have a span"), + }); + } + } +} diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/patterns.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/patterns.rs new file mode 100644 index 00000000000..810e1b90743 --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/patterns.rs @@ -0,0 +1,469 @@ +use iter_extended::vecmap; +use noirc_errors::{Location, Span}; +use rustc_hash::FxHashSet as HashSet; + +use crate::{ + ast::ERROR_IDENT, + hir::{ + resolution::errors::ResolverError, + type_check::{Source, TypeCheckError}, + }, + hir_def::{ + expr::{HirIdent, ImplKind}, + stmt::HirPattern, + }, + macros_api::{HirExpression, Ident, Path, Pattern}, + node_interner::{DefinitionId, DefinitionKind, ExprId, TraitImplKind}, + Shared, StructType, Type, TypeBindings, +}; + +use super::{Elaborator, ResolverMeta}; + +impl<'context> Elaborator<'context> { + pub(super) fn elaborate_pattern( + &mut self, + pattern: Pattern, + expected_type: Type, + definition_kind: DefinitionKind, + ) -> HirPattern { + self.elaborate_pattern_mut(pattern, expected_type, definition_kind, None) + } + + fn elaborate_pattern_mut( + &mut self, + pattern: Pattern, + expected_type: Type, + definition: DefinitionKind, + mutable: Option, + ) -> HirPattern { + match pattern { + Pattern::Identifier(name) => { + // If this definition is mutable, do not store the rhs because it will + // not always refer to the correct value of the variable + let definition = match (mutable, definition) { + (Some(_), DefinitionKind::Local(_)) => DefinitionKind::Local(None), + (_, other) => other, + }; + let ident = self.add_variable_decl(name, mutable.is_some(), true, definition); + self.interner.push_definition_type(ident.id, expected_type); + HirPattern::Identifier(ident) + } + Pattern::Mutable(pattern, span, _) => { + if let Some(first_mut) = mutable { + self.push_err(ResolverError::UnnecessaryMut { first_mut, second_mut: span }); + } + + let pattern = + self.elaborate_pattern_mut(*pattern, expected_type, definition, Some(span)); + let location = Location::new(span, self.file); + HirPattern::Mutable(Box::new(pattern), location) + } + Pattern::Tuple(fields, span) => { + let field_types = match expected_type { + Type::Tuple(fields) => fields, + Type::Error => Vec::new(), + expected_type => { + let tuple = + Type::Tuple(vecmap(&fields, |_| self.interner.next_type_variable())); + + self.push_err(TypeCheckError::TypeMismatchWithSource { + expected: expected_type, + actual: tuple, + span, + source: Source::Assignment, + }); + Vec::new() + } + }; + + let fields = vecmap(fields.into_iter().enumerate(), |(i, field)| { + let field_type = field_types.get(i).cloned().unwrap_or(Type::Error); + self.elaborate_pattern_mut(field, field_type, definition.clone(), mutable) + }); + let location = Location::new(span, self.file); + HirPattern::Tuple(fields, location) + } + Pattern::Struct(name, fields, span) => self.elaborate_struct_pattern( + name, + fields, + span, + expected_type, + definition, + mutable, + ), + } + } + + fn elaborate_struct_pattern( + &mut self, + name: Path, + fields: Vec<(Ident, Pattern)>, + span: Span, + expected_type: Type, + definition: DefinitionKind, + mutable: Option, + ) -> HirPattern { + let error_identifier = |this: &mut Self| { + // Must create a name here to return a HirPattern::Identifier. Allowing + // shadowing here lets us avoid further errors if we define ERROR_IDENT + // multiple times. + let name = ERROR_IDENT.into(); + let identifier = this.add_variable_decl(name, false, true, definition.clone()); + HirPattern::Identifier(identifier) + }; + + let (struct_type, generics) = match self.lookup_type_or_error(name) { + Some(Type::Struct(struct_type, generics)) => (struct_type, generics), + None => return error_identifier(self), + Some(typ) => { + self.push_err(ResolverError::NonStructUsedInConstructor { typ, span }); + return error_identifier(self); + } + }; + + let actual_type = Type::Struct(struct_type.clone(), generics); + let location = Location::new(span, self.file); + + self.unify(&actual_type, &expected_type, || TypeCheckError::TypeMismatchWithSource { + expected: expected_type.clone(), + actual: actual_type.clone(), + span: location.span, + source: Source::Assignment, + }); + + let typ = struct_type.clone(); + let fields = self.resolve_constructor_pattern_fields( + typ, + fields, + span, + expected_type.clone(), + definition, + mutable, + ); + + HirPattern::Struct(expected_type, fields, location) + } + + /// Resolve all the fields of a struct constructor expression. + /// Ensures all fields are present, none are repeated, and all + /// are part of the struct. + fn resolve_constructor_pattern_fields( + &mut self, + struct_type: Shared, + fields: Vec<(Ident, Pattern)>, + span: Span, + expected_type: Type, + definition: DefinitionKind, + mutable: Option, + ) -> Vec<(Ident, HirPattern)> { + let mut ret = Vec::with_capacity(fields.len()); + let mut seen_fields = HashSet::default(); + let mut unseen_fields = struct_type.borrow().field_names(); + + for (field, pattern) in fields { + let field_type = expected_type.get_field_type(&field.0.contents).unwrap_or(Type::Error); + let resolved = + self.elaborate_pattern_mut(pattern, field_type, definition.clone(), mutable); + + if unseen_fields.contains(&field) { + unseen_fields.remove(&field); + seen_fields.insert(field.clone()); + } else if seen_fields.contains(&field) { + // duplicate field + self.push_err(ResolverError::DuplicateField { field: field.clone() }); + } else { + // field not required by struct + self.push_err(ResolverError::NoSuchField { + field: field.clone(), + struct_definition: struct_type.borrow().name.clone(), + }); + } + + ret.push((field, resolved)); + } + + if !unseen_fields.is_empty() { + self.push_err(ResolverError::MissingFields { + span, + missing_fields: unseen_fields.into_iter().map(|field| field.to_string()).collect(), + struct_definition: struct_type.borrow().name.clone(), + }); + } + + ret + } + + pub(super) fn add_variable_decl( + &mut self, + name: Ident, + mutable: bool, + allow_shadowing: bool, + definition: DefinitionKind, + ) -> HirIdent { + self.add_variable_decl_inner(name, mutable, allow_shadowing, true, definition) + } + + pub fn add_variable_decl_inner( + &mut self, + name: Ident, + mutable: bool, + allow_shadowing: bool, + warn_if_unused: bool, + definition: DefinitionKind, + ) -> HirIdent { + if definition.is_global() { + return self.add_global_variable_decl(name, definition); + } + + let location = Location::new(name.span(), self.file); + let id = + self.interner.push_definition(name.0.contents.clone(), mutable, definition, location); + let ident = HirIdent::non_trait_method(id, location); + let resolver_meta = + ResolverMeta { num_times_used: 0, ident: ident.clone(), warn_if_unused }; + + let scope = self.scopes.get_mut_scope(); + let old_value = scope.add_key_value(name.0.contents.clone(), resolver_meta); + + if !allow_shadowing { + if let Some(old_value) = old_value { + self.push_err(ResolverError::DuplicateDefinition { + name: name.0.contents, + first_span: old_value.ident.location.span, + second_span: location.span, + }); + } + } + + ident + } + + pub fn add_global_variable_decl( + &mut self, + name: Ident, + definition: DefinitionKind, + ) -> HirIdent { + let scope = self.scopes.get_mut_scope(); + + // This check is necessary to maintain the same definition ids in the interner. Currently, each function uses a new resolver that has its own ScopeForest and thus global scope. + // We must first check whether an existing definition ID has been inserted as otherwise there will be multiple definitions for the same global statement. + // This leads to an error in evaluation where the wrong definition ID is selected when evaluating a statement using the global. The check below prevents this error. + let mut global_id = None; + let global = self.interner.get_all_globals(); + for global_info in global { + if global_info.ident == name && global_info.local_id == self.local_module { + global_id = Some(global_info.id); + } + } + + let (ident, resolver_meta) = if let Some(id) = global_id { + let global = self.interner.get_global(id); + let hir_ident = HirIdent::non_trait_method(global.definition_id, global.location); + let ident = hir_ident.clone(); + let resolver_meta = ResolverMeta { num_times_used: 0, ident, warn_if_unused: true }; + (hir_ident, resolver_meta) + } else { + let location = Location::new(name.span(), self.file); + let id = + self.interner.push_definition(name.0.contents.clone(), false, definition, location); + let ident = HirIdent::non_trait_method(id, location); + let resolver_meta = + ResolverMeta { num_times_used: 0, ident: ident.clone(), warn_if_unused: true }; + (ident, resolver_meta) + }; + + let old_global_value = scope.add_key_value(name.0.contents.clone(), resolver_meta); + if let Some(old_global_value) = old_global_value { + self.push_err(ResolverError::DuplicateDefinition { + name: name.0.contents.clone(), + first_span: old_global_value.ident.location.span, + second_span: name.span(), + }); + } + ident + } + + // Checks for a variable having been declared before. + // (Variable declaration and definition cannot be separate in Noir.) + // Once the variable has been found, intern and link `name` to this definition, + // returning (the ident, the IdentId of `name`) + // + // If a variable is not found, then an error is logged and a dummy id + // is returned, for better error reporting UX + pub(super) fn find_variable_or_default(&mut self, name: &Ident) -> (HirIdent, usize) { + self.use_variable(name).unwrap_or_else(|error| { + self.push_err(error); + let id = DefinitionId::dummy_id(); + let location = Location::new(name.span(), self.file); + (HirIdent::non_trait_method(id, location), 0) + }) + } + + /// Lookup and use the specified variable. + /// This will increment its use counter by one and return the variable if found. + /// If the variable is not found, an error is returned. + pub(super) fn use_variable( + &mut self, + name: &Ident, + ) -> Result<(HirIdent, usize), ResolverError> { + // Find the definition for this Ident + let scope_tree = self.scopes.current_scope_tree(); + let variable = scope_tree.find(&name.0.contents); + + let location = Location::new(name.span(), self.file); + if let Some((variable_found, scope)) = variable { + variable_found.num_times_used += 1; + let id = variable_found.ident.id; + Ok((HirIdent::non_trait_method(id, location), scope)) + } else { + Err(ResolverError::VariableNotDeclared { + name: name.0.contents.clone(), + span: name.0.span(), + }) + } + } + + pub(super) fn elaborate_variable( + &mut self, + variable: Path, + generics: Option>, + ) -> (ExprId, Type) { + let span = variable.span; + let expr = self.resolve_variable(variable); + let id = self.interner.push_expr(HirExpression::Ident(expr.clone(), generics)); + self.interner.push_expr_location(id, span, self.file); + let typ = self.type_check_variable(expr, id); + self.interner.push_expr_type(id, typ.clone()); + (id, typ) + } + + fn resolve_variable(&mut self, path: Path) -> HirIdent { + if let Some((method, constraint, assumed)) = self.resolve_trait_generic_path(&path) { + HirIdent { + location: Location::new(path.span, self.file), + id: self.interner.trait_method_id(method), + impl_kind: ImplKind::TraitMethod(method, constraint, assumed), + } + } else { + // If the Path is being used as an Expression, then it is referring to a global from a separate module + // Otherwise, then it is referring to an Identifier + // This lookup allows support of such statements: let x = foo::bar::SOME_GLOBAL + 10; + // If the expression is a singular indent, we search the resolver's current scope as normal. + let (hir_ident, var_scope_index) = self.get_ident_from_path(path); + + if hir_ident.id != DefinitionId::dummy_id() { + match self.interner.definition(hir_ident.id).kind { + DefinitionKind::Function(id) => { + if let Some(current_item) = self.current_item { + self.interner.add_function_dependency(current_item, id); + } + } + DefinitionKind::Global(global_id) => { + if let Some(current_item) = self.current_item { + self.interner.add_global_dependency(current_item, global_id); + } + } + DefinitionKind::GenericType(_) => { + // Initialize numeric generics to a polymorphic integer type in case + // they're used in expressions. We must do this here since type_check_variable + // does not check definition kinds and otherwise expects parameters to + // already be typed. + if self.interner.definition_type(hir_ident.id) == Type::Error { + let typ = Type::polymorphic_integer_or_field(self.interner); + self.interner.push_definition_type(hir_ident.id, typ); + } + } + DefinitionKind::Local(_) => { + // only local variables can be captured by closures. + self.resolve_local_variable(hir_ident.clone(), var_scope_index); + } + } + } + + hir_ident + } + } + + pub(super) fn type_check_variable(&mut self, ident: HirIdent, expr_id: ExprId) -> Type { + let mut bindings = TypeBindings::new(); + + // Add type bindings from any constraints that were used. + // We need to do this first since otherwise instantiating the type below + // will replace each trait generic with a fresh type variable, rather than + // the type used in the trait constraint (if it exists). See #4088. + if let ImplKind::TraitMethod(_, constraint, _) = &ident.impl_kind { + let the_trait = self.interner.get_trait(constraint.trait_id); + assert_eq!(the_trait.generics.len(), constraint.trait_generics.len()); + + for (param, arg) in the_trait.generics.iter().zip(&constraint.trait_generics) { + // Avoid binding t = t + if !arg.occurs(param.id()) { + bindings.insert(param.id(), (param.clone(), arg.clone())); + } + } + } + + // An identifiers type may be forall-quantified in the case of generic functions. + // E.g. `fn foo(t: T, field: Field) -> T` has type `forall T. fn(T, Field) -> T`. + // We must instantiate identifiers at every call site to replace this T with a new type + // variable to handle generic functions. + let t = self.interner.id_type_substitute_trait_as_type(ident.id); + + // This instantiates a trait's generics as well which need to be set + // when the constraint below is later solved for when the function is + // finished. How to link the two? + let (typ, bindings) = t.instantiate_with_bindings(bindings, self.interner); + + // Push any trait constraints required by this definition to the context + // to be checked later when the type of this variable is further constrained. + if let Some(definition) = self.interner.try_definition(ident.id) { + if let DefinitionKind::Function(function) = definition.kind { + let function = self.interner.function_meta(&function); + + for mut constraint in function.trait_constraints.clone() { + constraint.apply_bindings(&bindings); + self.trait_constraints.push((constraint, expr_id)); + } + } + } + + if let ImplKind::TraitMethod(_, mut constraint, assumed) = ident.impl_kind { + constraint.apply_bindings(&bindings); + if assumed { + let trait_impl = TraitImplKind::Assumed { + object_type: constraint.typ, + trait_generics: constraint.trait_generics, + }; + self.interner.select_impl_for_expression(expr_id, trait_impl); + } else { + // Currently only one impl can be selected per expr_id, so this + // constraint needs to be pushed after any other constraints so + // that monomorphization can resolve this trait method to the correct impl. + self.trait_constraints.push((constraint, expr_id)); + } + } + + self.interner.store_instantiation_bindings(expr_id, bindings); + typ + } + + fn get_ident_from_path(&mut self, path: Path) -> (HirIdent, usize) { + let location = Location::new(path.span(), self.file); + + let error = match path.as_ident().map(|ident| self.use_variable(ident)) { + Some(Ok(found)) => return found, + // Try to look it up as a global, but still issue the first error if we fail + Some(Err(error)) => match self.lookup_global(path) { + Ok(id) => return (HirIdent::non_trait_method(id, location), 0), + Err(_) => error, + }, + None => match self.lookup_global(path) { + Ok(id) => return (HirIdent::non_trait_method(id, location), 0), + Err(error) => error, + }, + }; + self.push_err(error); + let id = DefinitionId::dummy_id(); + (HirIdent::non_trait_method(id, location), 0) + } +} diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/scope.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/scope.rs new file mode 100644 index 00000000000..cf10dbbc2b2 --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/scope.rs @@ -0,0 +1,200 @@ +use noirc_errors::Spanned; +use rustc_hash::FxHashMap as HashMap; + +use crate::ast::ERROR_IDENT; +use crate::hir::comptime::Value; +use crate::hir::def_map::{LocalModuleId, ModuleId}; +use crate::hir::resolution::path_resolver::{PathResolver, StandardPathResolver}; +use crate::hir::resolution::resolver::SELF_TYPE_NAME; +use crate::hir::scope::{Scope as GenericScope, ScopeTree as GenericScopeTree}; +use crate::macros_api::Ident; +use crate::{ + hir::{ + def_map::{ModuleDefId, TryFromModuleDefId}, + resolution::errors::ResolverError, + }, + hir_def::{ + expr::{HirCapturedVar, HirIdent}, + traits::Trait, + }, + macros_api::{Path, StructId}, + node_interner::{DefinitionId, TraitId, TypeAliasId}, + Shared, StructType, +}; +use crate::{Type, TypeAlias}; + +use super::{Elaborator, ResolverMeta}; + +type Scope = GenericScope; +type ScopeTree = GenericScopeTree; + +impl<'context> Elaborator<'context> { + pub(super) fn lookup(&mut self, path: Path) -> Result { + let span = path.span(); + let id = self.resolve_path(path)?; + T::try_from(id).ok_or_else(|| ResolverError::Expected { + expected: T::description(), + got: id.as_str().to_owned(), + span, + }) + } + + pub(super) fn module_id(&self) -> ModuleId { + assert_ne!(self.local_module, LocalModuleId::dummy_id(), "local_module is unset"); + ModuleId { krate: self.crate_id, local_id: self.local_module } + } + + pub(super) fn resolve_path(&mut self, path: Path) -> Result { + let resolver = StandardPathResolver::new(self.module_id()); + let path_resolution = resolver.resolve(self.def_maps, path)?; + + if let Some(error) = path_resolution.error { + self.push_err(error); + } + + Ok(path_resolution.module_def_id) + } + + pub(super) fn get_struct(&self, type_id: StructId) -> Shared { + self.interner.get_struct(type_id) + } + + pub(super) fn get_trait_mut(&mut self, trait_id: TraitId) -> &mut Trait { + self.interner.get_trait_mut(trait_id) + } + + pub(super) fn resolve_local_variable(&mut self, hir_ident: HirIdent, var_scope_index: usize) { + let mut transitive_capture_index: Option = None; + + for lambda_index in 0..self.lambda_stack.len() { + if self.lambda_stack[lambda_index].scope_index > var_scope_index { + // Beware: the same variable may be captured multiple times, so we check + // for its presence before adding the capture below. + let position = self.lambda_stack[lambda_index] + .captures + .iter() + .position(|capture| capture.ident.id == hir_ident.id); + + if position.is_none() { + self.lambda_stack[lambda_index].captures.push(HirCapturedVar { + ident: hir_ident.clone(), + transitive_capture_index, + }); + } + + if lambda_index + 1 < self.lambda_stack.len() { + // There is more than one closure between the current scope and + // the scope of the variable, so this is a propagated capture. + // We need to track the transitive capture index as we go up in + // the closure stack. + transitive_capture_index = Some(position.unwrap_or( + // If this was a fresh capture, we added it to the end of + // the captures vector: + self.lambda_stack[lambda_index].captures.len() - 1, + )); + } + } + } + } + + pub(super) fn lookup_global(&mut self, path: Path) -> Result { + let span = path.span(); + let id = self.resolve_path(path)?; + + if let Some(function) = TryFromModuleDefId::try_from(id) { + return Ok(self.interner.function_definition_id(function)); + } + + if let Some(global) = TryFromModuleDefId::try_from(id) { + let global = self.interner.get_global(global); + return Ok(global.definition_id); + } + + let expected = "global variable".into(); + let got = "local variable".into(); + Err(ResolverError::Expected { span, expected, got }) + } + + pub fn push_scope(&mut self) { + self.scopes.start_scope(); + } + + pub fn pop_scope(&mut self) { + let scope = self.scopes.end_scope(); + self.check_for_unused_variables_in_scope_tree(scope.into()); + } + + pub fn check_for_unused_variables_in_scope_tree(&mut self, scope_decls: ScopeTree) { + let mut unused_vars = Vec::new(); + for scope in scope_decls.0.into_iter() { + Self::check_for_unused_variables_in_local_scope(scope, &mut unused_vars); + } + + for unused_var in unused_vars.iter() { + if let Some(definition_info) = self.interner.try_definition(unused_var.id) { + let name = &definition_info.name; + if name != ERROR_IDENT && !definition_info.is_global() { + let ident = Ident(Spanned::from(unused_var.location.span, name.to_owned())); + self.push_err(ResolverError::UnusedVariable { ident }); + } + } + } + } + + fn check_for_unused_variables_in_local_scope(decl_map: Scope, unused_vars: &mut Vec) { + let unused_variables = decl_map.filter(|(variable_name, metadata)| { + let has_underscore_prefix = variable_name.starts_with('_'); // XXX: This is used for development mode, and will be removed + metadata.warn_if_unused && metadata.num_times_used == 0 && !has_underscore_prefix + }); + unused_vars.extend(unused_variables.map(|(_, meta)| meta.ident.clone())); + } + + /// Lookup a given trait by name/path. + pub fn lookup_trait_or_error(&mut self, path: Path) -> Option<&mut Trait> { + match self.lookup(path) { + Ok(trait_id) => Some(self.get_trait_mut(trait_id)), + Err(error) => { + self.push_err(error); + None + } + } + } + + /// Lookup a given struct type by name. + pub fn lookup_struct_or_error(&mut self, path: Path) -> Option> { + match self.lookup(path) { + Ok(struct_id) => Some(self.get_struct(struct_id)), + Err(error) => { + self.push_err(error); + None + } + } + } + + /// Looks up a given type by name. + /// This will also instantiate any struct types found. + pub(super) fn lookup_type_or_error(&mut self, path: Path) -> Option { + let ident = path.as_ident(); + if ident.map_or(false, |i| i == SELF_TYPE_NAME) { + if let Some(typ) = &self.self_type { + return Some(typ.clone()); + } + } + + match self.lookup(path) { + Ok(struct_id) => { + let struct_type = self.get_struct(struct_id); + let generics = struct_type.borrow().instantiate(self.interner); + Some(Type::Struct(struct_type, generics)) + } + Err(error) => { + self.push_err(error); + None + } + } + } + + pub fn lookup_type_alias(&mut self, path: Path) -> Option> { + self.lookup(path).ok().map(|id| self.interner.get_type_alias(id)) + } +} diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/statements.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/statements.rs new file mode 100644 index 00000000000..a7a2df4041e --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/statements.rs @@ -0,0 +1,409 @@ +use noirc_errors::{Location, Span}; + +use crate::{ + ast::{AssignStatement, ConstrainStatement, LValue}, + hir::{ + resolution::errors::ResolverError, + type_check::{Source, TypeCheckError}, + }, + hir_def::{ + expr::HirIdent, + stmt::{ + HirAssignStatement, HirConstrainStatement, HirForStatement, HirLValue, HirLetStatement, + }, + }, + macros_api::{ + ForLoopStatement, ForRange, HirStatement, LetStatement, Statement, StatementKind, + }, + node_interner::{DefinitionId, DefinitionKind, StmtId}, + Type, +}; + +use super::Elaborator; + +impl<'context> Elaborator<'context> { + fn elaborate_statement_value(&mut self, statement: Statement) -> (HirStatement, Type) { + match statement.kind { + StatementKind::Let(let_stmt) => self.elaborate_let(let_stmt), + StatementKind::Constrain(constrain) => self.elaborate_constrain(constrain), + StatementKind::Assign(assign) => self.elaborate_assign(assign), + StatementKind::For(for_stmt) => self.elaborate_for(for_stmt), + StatementKind::Break => self.elaborate_jump(true, statement.span), + StatementKind::Continue => self.elaborate_jump(false, statement.span), + StatementKind::Comptime(statement) => self.elaborate_comptime(*statement), + StatementKind::Expression(expr) => { + let (expr, typ) = self.elaborate_expression(expr); + (HirStatement::Expression(expr), typ) + } + StatementKind::Semi(expr) => { + let (expr, _typ) = self.elaborate_expression(expr); + (HirStatement::Semi(expr), Type::Unit) + } + StatementKind::Error => (HirStatement::Error, Type::Error), + } + } + + pub(super) fn elaborate_statement(&mut self, statement: Statement) -> (StmtId, Type) { + let span = statement.span; + let (hir_statement, typ) = self.elaborate_statement_value(statement); + let id = self.interner.push_stmt(hir_statement); + self.interner.push_stmt_location(id, span, self.file); + (id, typ) + } + + pub(super) fn elaborate_let(&mut self, let_stmt: LetStatement) -> (HirStatement, Type) { + let expr_span = let_stmt.expression.span; + let (expression, expr_type) = self.elaborate_expression(let_stmt.expression); + let definition = DefinitionKind::Local(Some(expression)); + let annotated_type = self.resolve_type(let_stmt.r#type); + + // First check if the LHS is unspecified + // If so, then we give it the same type as the expression + let r#type = if annotated_type != Type::Error { + // Now check if LHS is the same type as the RHS + // Importantly, we do not coerce any types implicitly + self.unify_with_coercions(&expr_type, &annotated_type, expression, || { + TypeCheckError::TypeMismatch { + expected_typ: annotated_type.to_string(), + expr_typ: expr_type.to_string(), + expr_span, + } + }); + if annotated_type.is_unsigned() { + self.lint_overflowing_uint(&expression, &annotated_type); + } + annotated_type + } else { + expr_type + }; + + let let_ = HirLetStatement { + pattern: self.elaborate_pattern(let_stmt.pattern, r#type.clone(), definition), + r#type, + expression, + attributes: let_stmt.attributes, + comptime: let_stmt.comptime, + }; + (HirStatement::Let(let_), Type::Unit) + } + + pub(super) fn elaborate_constrain(&mut self, stmt: ConstrainStatement) -> (HirStatement, Type) { + let expr_span = stmt.0.span; + let (expr_id, expr_type) = self.elaborate_expression(stmt.0); + + // Must type check the assertion message expression so that we instantiate bindings + let msg = stmt.1.map(|assert_msg_expr| self.elaborate_expression(assert_msg_expr).0); + + self.unify(&expr_type, &Type::Bool, || TypeCheckError::TypeMismatch { + expr_typ: expr_type.to_string(), + expected_typ: Type::Bool.to_string(), + expr_span, + }); + + (HirStatement::Constrain(HirConstrainStatement(expr_id, self.file, msg)), Type::Unit) + } + + pub(super) fn elaborate_assign(&mut self, assign: AssignStatement) -> (HirStatement, Type) { + let span = assign.expression.span; + let (expression, expr_type) = self.elaborate_expression(assign.expression); + let (lvalue, lvalue_type, mutable) = self.elaborate_lvalue(assign.lvalue, span); + + if !mutable { + let (name, span) = self.get_lvalue_name_and_span(&lvalue); + self.push_err(TypeCheckError::VariableMustBeMutable { name, span }); + } + + self.unify_with_coercions(&expr_type, &lvalue_type, expression, || { + TypeCheckError::TypeMismatchWithSource { + actual: expr_type.clone(), + expected: lvalue_type.clone(), + span, + source: Source::Assignment, + } + }); + + let stmt = HirAssignStatement { lvalue, expression }; + (HirStatement::Assign(stmt), Type::Unit) + } + + pub(super) fn elaborate_for(&mut self, for_loop: ForLoopStatement) -> (HirStatement, Type) { + let (start, end) = match for_loop.range { + ForRange::Range(start, end) => (start, end), + ForRange::Array(_) => { + let for_stmt = + for_loop.range.into_for(for_loop.identifier, for_loop.block, for_loop.span); + + return self.elaborate_statement_value(for_stmt); + } + }; + + let start_span = start.span; + let end_span = end.span; + + let (start_range, start_range_type) = self.elaborate_expression(start); + let (end_range, end_range_type) = self.elaborate_expression(end); + let (identifier, block) = (for_loop.identifier, for_loop.block); + + self.nested_loops += 1; + self.push_scope(); + + // TODO: For loop variables are currently mutable by default since we haven't + // yet implemented syntax for them to be optionally mutable. + let kind = DefinitionKind::Local(None); + let identifier = self.add_variable_decl(identifier, false, true, kind); + + // Check that start range and end range have the same types + let range_span = start_span.merge(end_span); + self.unify(&start_range_type, &end_range_type, || TypeCheckError::TypeMismatch { + expected_typ: start_range_type.to_string(), + expr_typ: end_range_type.to_string(), + expr_span: range_span, + }); + + let expected_type = self.polymorphic_integer(); + + self.unify(&start_range_type, &expected_type, || TypeCheckError::TypeCannotBeUsed { + typ: start_range_type.clone(), + place: "for loop", + span: range_span, + }); + + self.interner.push_definition_type(identifier.id, start_range_type); + + let (block, _block_type) = self.elaborate_expression(block); + + self.pop_scope(); + self.nested_loops -= 1; + + let statement = + HirStatement::For(HirForStatement { start_range, end_range, block, identifier }); + + (statement, Type::Unit) + } + + fn elaborate_jump(&mut self, is_break: bool, span: noirc_errors::Span) -> (HirStatement, Type) { + if !self.in_unconstrained_fn { + self.push_err(ResolverError::JumpInConstrainedFn { is_break, span }); + } + if self.nested_loops == 0 { + self.push_err(ResolverError::JumpOutsideLoop { is_break, span }); + } + + let expr = if is_break { HirStatement::Break } else { HirStatement::Continue }; + (expr, self.interner.next_type_variable()) + } + + fn get_lvalue_name_and_span(&self, lvalue: &HirLValue) -> (String, Span) { + match lvalue { + HirLValue::Ident(name, _) => { + let span = name.location.span; + + if let Some(definition) = self.interner.try_definition(name.id) { + (definition.name.clone(), span) + } else { + ("(undeclared variable)".into(), span) + } + } + HirLValue::MemberAccess { object, .. } => self.get_lvalue_name_and_span(object), + HirLValue::Index { array, .. } => self.get_lvalue_name_and_span(array), + HirLValue::Dereference { lvalue, .. } => self.get_lvalue_name_and_span(lvalue), + } + } + + fn elaborate_lvalue(&mut self, lvalue: LValue, assign_span: Span) -> (HirLValue, Type, bool) { + match lvalue { + LValue::Ident(ident) => { + let mut mutable = true; + let (ident, scope_index) = self.find_variable_or_default(&ident); + self.resolve_local_variable(ident.clone(), scope_index); + + let typ = if ident.id == DefinitionId::dummy_id() { + Type::Error + } else { + if let Some(definition) = self.interner.try_definition(ident.id) { + mutable = definition.mutable; + } + + let typ = self.interner.definition_type(ident.id).instantiate(self.interner).0; + typ.follow_bindings() + }; + + (HirLValue::Ident(ident.clone(), typ.clone()), typ, mutable) + } + LValue::MemberAccess { object, field_name, span } => { + let (object, lhs_type, mut mutable) = self.elaborate_lvalue(*object, assign_span); + let mut object = Box::new(object); + let field_name = field_name.clone(); + + let object_ref = &mut object; + let mutable_ref = &mut mutable; + let location = Location::new(span, self.file); + + let dereference_lhs = move |_: &mut Self, _, element_type| { + // We must create a temporary value first to move out of object_ref before + // we eventually reassign to it. + let id = DefinitionId::dummy_id(); + let ident = HirIdent::non_trait_method(id, location); + let tmp_value = HirLValue::Ident(ident, Type::Error); + + let lvalue = std::mem::replace(object_ref, Box::new(tmp_value)); + *object_ref = + Box::new(HirLValue::Dereference { lvalue, element_type, location }); + *mutable_ref = true; + }; + + let name = &field_name.0.contents; + let (object_type, field_index) = self + .check_field_access(&lhs_type, name, field_name.span(), Some(dereference_lhs)) + .unwrap_or((Type::Error, 0)); + + let field_index = Some(field_index); + let typ = object_type.clone(); + let lvalue = + HirLValue::MemberAccess { object, field_name, field_index, typ, location }; + (lvalue, object_type, mutable) + } + LValue::Index { array, index, span } => { + let expr_span = index.span; + let (index, index_type) = self.elaborate_expression(index); + let location = Location::new(span, self.file); + + let expected = self.polymorphic_integer_or_field(); + self.unify(&index_type, &expected, || TypeCheckError::TypeMismatch { + expected_typ: "an integer".to_owned(), + expr_typ: index_type.to_string(), + expr_span, + }); + + let (mut lvalue, mut lvalue_type, mut mutable) = + self.elaborate_lvalue(*array, assign_span); + + // Before we check that the lvalue is an array, try to dereference it as many times + // as needed to unwrap any &mut wrappers. + while let Type::MutableReference(element) = lvalue_type.follow_bindings() { + let element_type = element.as_ref().clone(); + lvalue = + HirLValue::Dereference { lvalue: Box::new(lvalue), element_type, location }; + lvalue_type = *element; + // We know this value to be mutable now since we found an `&mut` + mutable = true; + } + + let typ = match lvalue_type.follow_bindings() { + Type::Array(_, elem_type) => *elem_type, + Type::Slice(elem_type) => *elem_type, + Type::Error => Type::Error, + Type::String(_) => { + let (_lvalue_name, lvalue_span) = self.get_lvalue_name_and_span(&lvalue); + self.push_err(TypeCheckError::StringIndexAssign { span: lvalue_span }); + Type::Error + } + other => { + // TODO: Need a better span here + self.push_err(TypeCheckError::TypeMismatch { + expected_typ: "array".to_string(), + expr_typ: other.to_string(), + expr_span: assign_span, + }); + Type::Error + } + }; + + let array = Box::new(lvalue); + let array_type = typ.clone(); + (HirLValue::Index { array, index, typ, location }, array_type, mutable) + } + LValue::Dereference(lvalue, span) => { + let (lvalue, reference_type, _) = self.elaborate_lvalue(*lvalue, assign_span); + let lvalue = Box::new(lvalue); + let location = Location::new(span, self.file); + + let element_type = Type::type_variable(self.interner.next_type_variable_id()); + let expected_type = Type::MutableReference(Box::new(element_type.clone())); + + self.unify(&reference_type, &expected_type, || TypeCheckError::TypeMismatch { + expected_typ: expected_type.to_string(), + expr_typ: reference_type.to_string(), + expr_span: assign_span, + }); + + // Dereferences are always mutable since we already type checked against a &mut T + let typ = element_type.clone(); + let lvalue = HirLValue::Dereference { lvalue, element_type, location }; + (lvalue, typ, true) + } + } + } + + /// Type checks a field access, adding dereference operators as necessary + pub(super) fn check_field_access( + &mut self, + lhs_type: &Type, + field_name: &str, + span: Span, + dereference_lhs: Option, + ) -> Option<(Type, usize)> { + let lhs_type = lhs_type.follow_bindings(); + + match &lhs_type { + Type::Struct(s, args) => { + let s = s.borrow(); + if let Some((field, index)) = s.get_field(field_name, args) { + return Some((field, index)); + } + } + Type::Tuple(elements) => { + if let Ok(index) = field_name.parse::() { + let length = elements.len(); + if index < length { + return Some((elements[index].clone(), index)); + } else { + self.push_err(TypeCheckError::TupleIndexOutOfBounds { + index, + lhs_type, + length, + span, + }); + return None; + } + } + } + // If the lhs is a mutable reference we automatically transform + // lhs.field into (*lhs).field + Type::MutableReference(element) => { + if let Some(mut dereference_lhs) = dereference_lhs { + dereference_lhs(self, lhs_type.clone(), element.as_ref().clone()); + return self.check_field_access( + element, + field_name, + span, + Some(dereference_lhs), + ); + } else { + let (element, index) = + self.check_field_access(element, field_name, span, dereference_lhs)?; + return Some((Type::MutableReference(Box::new(element)), index)); + } + } + _ => (), + } + + // If we get here the type has no field named 'access.rhs'. + // Now we specialize the error message based on whether we know the object type in question yet. + if let Type::TypeVariable(..) = &lhs_type { + self.push_err(TypeCheckError::TypeAnnotationsNeeded { span }); + } else if lhs_type != Type::Error { + self.push_err(TypeCheckError::AccessUnknownMember { + lhs_type, + field_name: field_name.to_string(), + span, + }); + } + + None + } + + pub(super) fn elaborate_comptime(&self, _statement: Statement) -> (HirStatement, Type) { + todo!("Comptime scanning") + } +} diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/types.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/types.rs new file mode 100644 index 00000000000..54920d5738b --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/types.rs @@ -0,0 +1,1438 @@ +use std::rc::Rc; + +use iter_extended::vecmap; +use noirc_errors::{Location, Span}; + +use crate::{ + ast::{BinaryOpKind, IntegerBitSize, UnresolvedTraitConstraint, UnresolvedTypeExpression}, + hir::{ + def_map::ModuleDefId, + resolution::{ + errors::ResolverError, + import::PathResolution, + resolver::{verify_mutable_reference, SELF_TYPE_NAME}, + }, + type_check::{Source, TypeCheckError}, + }, + hir_def::{ + expr::{ + HirBinaryOp, HirCallExpression, HirIdent, HirMemberAccess, HirMethodReference, + HirPrefixExpression, + }, + function::FuncMeta, + traits::{Trait, TraitConstraint}, + }, + macros_api::{ + HirExpression, HirLiteral, HirStatement, Path, PathKind, SecondaryAttribute, Signedness, + UnaryOp, UnresolvedType, UnresolvedTypeData, + }, + node_interner::{DefinitionKind, ExprId, GlobalId, TraitId, TraitImplKind, TraitMethodId}, + Generics, Shared, StructType, Type, TypeAlias, TypeBinding, TypeVariable, TypeVariableKind, +}; + +use super::Elaborator; + +impl<'context> Elaborator<'context> { + /// Translates an UnresolvedType to a Type + pub(super) fn resolve_type(&mut self, typ: UnresolvedType) -> Type { + let span = typ.span; + let resolved_type = self.resolve_type_inner(typ, &mut vec![]); + if resolved_type.is_nested_slice() { + self.push_err(ResolverError::NestedSlices { span: span.unwrap() }); + } + + resolved_type + } + + /// Translates an UnresolvedType into a Type and appends any + /// freshly created TypeVariables created to new_variables. + pub fn resolve_type_inner( + &mut self, + typ: UnresolvedType, + new_variables: &mut Generics, + ) -> Type { + use crate::ast::UnresolvedTypeData::*; + + let resolved_type = match typ.typ { + FieldElement => Type::FieldElement, + Array(size, elem) => { + let elem = Box::new(self.resolve_type_inner(*elem, new_variables)); + let size = self.resolve_array_size(Some(size), new_variables); + Type::Array(Box::new(size), elem) + } + Slice(elem) => { + let elem = Box::new(self.resolve_type_inner(*elem, new_variables)); + Type::Slice(elem) + } + Expression(expr) => self.convert_expression_type(expr), + Integer(sign, bits) => Type::Integer(sign, bits), + Bool => Type::Bool, + String(size) => { + let resolved_size = self.resolve_array_size(size, new_variables); + Type::String(Box::new(resolved_size)) + } + FormatString(size, fields) => { + let resolved_size = self.convert_expression_type(size); + let fields = self.resolve_type_inner(*fields, new_variables); + Type::FmtString(Box::new(resolved_size), Box::new(fields)) + } + Code => Type::Code, + Unit => Type::Unit, + Unspecified => Type::Error, + Error => Type::Error, + Named(path, args, _) => self.resolve_named_type(path, args, new_variables), + TraitAsType(path, args) => self.resolve_trait_as_type(path, args, new_variables), + + Tuple(fields) => { + Type::Tuple(vecmap(fields, |field| self.resolve_type_inner(field, new_variables))) + } + Function(args, ret, env) => { + let args = vecmap(args, |arg| self.resolve_type_inner(arg, new_variables)); + let ret = Box::new(self.resolve_type_inner(*ret, new_variables)); + + // expect() here is valid, because the only places we don't have a span are omitted types + // e.g. a function without return type implicitly has a spanless UnresolvedType::Unit return type + // To get an invalid env type, the user must explicitly specify the type, which will have a span + let env_span = + env.span.expect("Unexpected missing span for closure environment type"); + + let env = Box::new(self.resolve_type_inner(*env, new_variables)); + + match *env { + Type::Unit | Type::Tuple(_) | Type::NamedGeneric(_, _) => { + Type::Function(args, ret, env) + } + _ => { + self.push_err(ResolverError::InvalidClosureEnvironment { + typ: *env, + span: env_span, + }); + Type::Error + } + } + } + MutableReference(element) => { + Type::MutableReference(Box::new(self.resolve_type_inner(*element, new_variables))) + } + Parenthesized(typ) => self.resolve_type_inner(*typ, new_variables), + }; + + if let Type::Struct(_, _) = resolved_type { + if let Some(unresolved_span) = typ.span { + // Record the location of the type reference + self.interner.push_type_ref_location( + resolved_type.clone(), + Location::new(unresolved_span, self.file), + ); + } + } + resolved_type + } + + pub fn find_generic(&self, target_name: &str) -> Option<&(Rc, TypeVariable, Span)> { + self.generics.iter().find(|(name, _, _)| name.as_ref() == target_name) + } + + fn resolve_named_type( + &mut self, + path: Path, + args: Vec, + new_variables: &mut Generics, + ) -> Type { + if args.is_empty() { + if let Some(typ) = self.lookup_generic_or_global_type(&path) { + return typ; + } + } + + // Check if the path is a type variable first. We currently disallow generics on type + // variables since we do not support higher-kinded types. + if path.segments.len() == 1 { + let name = &path.last_segment().0.contents; + + if name == SELF_TYPE_NAME { + if let Some(self_type) = self.self_type.clone() { + if !args.is_empty() { + self.push_err(ResolverError::GenericsOnSelfType { span: path.span() }); + } + return self_type; + } + } + } + + let span = path.span(); + let mut args = vecmap(args, |arg| self.resolve_type_inner(arg, new_variables)); + + if let Some(type_alias) = self.lookup_type_alias(path.clone()) { + let type_alias = type_alias.borrow(); + let expected_generic_count = type_alias.generics.len(); + let type_alias_string = type_alias.to_string(); + let id = type_alias.id; + + self.verify_generics_count(expected_generic_count, &mut args, span, || { + type_alias_string + }); + + if let Some(item) = self.current_item { + self.interner.add_type_alias_dependency(item, id); + } + + // Collecting Type Alias references [Location]s to be used by LSP in order + // to resolve the definition of the type alias + self.interner.add_type_alias_ref(id, Location::new(span, self.file)); + + // Because there is no ordering to when type aliases (and other globals) are resolved, + // it is possible for one to refer to an Error type and issue no error if it is set + // equal to another type alias. Fixing this fully requires an analysis to create a DFG + // of definition ordering, but for now we have an explicit check here so that we at + // least issue an error that the type was not found instead of silently passing. + let alias = self.interner.get_type_alias(id); + return Type::Alias(alias, args); + } + + match self.lookup_struct_or_error(path) { + Some(struct_type) => { + if self.resolving_ids.contains(&struct_type.borrow().id) { + self.push_err(ResolverError::SelfReferentialStruct { + span: struct_type.borrow().name.span(), + }); + + return Type::Error; + } + + let expected_generic_count = struct_type.borrow().generics.len(); + if !self.in_contract + && self + .interner + .struct_attributes(&struct_type.borrow().id) + .iter() + .any(|attr| matches!(attr, SecondaryAttribute::Abi(_))) + { + self.push_err(ResolverError::AbiAttributeOutsideContract { + span: struct_type.borrow().name.span(), + }); + } + self.verify_generics_count(expected_generic_count, &mut args, span, || { + struct_type.borrow().to_string() + }); + + if let Some(current_item) = self.current_item { + let dependency_id = struct_type.borrow().id; + self.interner.add_type_dependency(current_item, dependency_id); + } + + Type::Struct(struct_type, args) + } + None => Type::Error, + } + } + + fn resolve_trait_as_type( + &mut self, + path: Path, + args: Vec, + new_variables: &mut Generics, + ) -> Type { + let args = vecmap(args, |arg| self.resolve_type_inner(arg, new_variables)); + + if let Some(t) = self.lookup_trait_or_error(path) { + Type::TraitAsType(t.id, Rc::new(t.name.to_string()), args) + } else { + Type::Error + } + } + + fn verify_generics_count( + &mut self, + expected_count: usize, + args: &mut Vec, + span: Span, + type_name: impl FnOnce() -> String, + ) { + if args.len() != expected_count { + self.push_err(ResolverError::IncorrectGenericCount { + span, + item_name: type_name(), + actual: args.len(), + expected: expected_count, + }); + + // Fix the generic count so we can continue typechecking + args.resize_with(expected_count, || Type::Error); + } + } + + pub fn lookup_generic_or_global_type(&mut self, path: &Path) -> Option { + if path.segments.len() == 1 { + let name = &path.last_segment().0.contents; + if let Some((name, var, _)) = self.find_generic(name) { + return Some(Type::NamedGeneric(var.clone(), name.clone())); + } + } + + // If we cannot find a local generic of the same name, try to look up a global + match self.resolve_path(path.clone()) { + Ok(ModuleDefId::GlobalId(id)) => { + if let Some(current_item) = self.current_item { + self.interner.add_global_dependency(current_item, id); + } + + Some(Type::Constant(self.eval_global_as_array_length(id, path))) + } + _ => None, + } + } + + fn resolve_array_size( + &mut self, + length: Option, + new_variables: &mut Generics, + ) -> Type { + match length { + None => { + let id = self.interner.next_type_variable_id(); + let typevar = TypeVariable::unbound(id); + new_variables.push(typevar.clone()); + + // 'Named'Generic is a bit of a misnomer here, we want a type variable that + // wont be bound over but this one has no name since we do not currently + // require users to explicitly be generic over array lengths. + Type::NamedGeneric(typevar, Rc::new("".into())) + } + Some(length) => self.convert_expression_type(length), + } + } + + pub(super) fn convert_expression_type(&mut self, length: UnresolvedTypeExpression) -> Type { + match length { + UnresolvedTypeExpression::Variable(path) => { + self.lookup_generic_or_global_type(&path).unwrap_or_else(|| { + self.push_err(ResolverError::NoSuchNumericTypeVariable { path }); + Type::Constant(0) + }) + } + UnresolvedTypeExpression::Constant(int, _) => Type::Constant(int), + UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, _) => { + let (lhs_span, rhs_span) = (lhs.span(), rhs.span()); + let lhs = self.convert_expression_type(*lhs); + let rhs = self.convert_expression_type(*rhs); + + match (lhs, rhs) { + (Type::Constant(lhs), Type::Constant(rhs)) => { + Type::Constant(op.function()(lhs, rhs)) + } + (lhs, _) => { + let span = + if !matches!(lhs, Type::Constant(_)) { lhs_span } else { rhs_span }; + self.push_err(ResolverError::InvalidArrayLengthExpr { span }); + Type::Constant(0) + } + } + } + } + } + + // this resolves Self::some_static_method, inside an impl block (where we don't have a concrete self_type) + // + // Returns the trait method, trait constraint, and whether the impl is assumed to exist by a where clause or not + // E.g. `t.method()` with `where T: Foo` in scope will return `(Foo::method, T, vec![Bar])` + fn resolve_trait_static_method_by_self( + &mut self, + path: &Path, + ) -> Option<(TraitMethodId, TraitConstraint, bool)> { + let trait_id = self.trait_id?; + + if path.kind == PathKind::Plain && path.segments.len() == 2 { + let name = &path.segments[0].0.contents; + let method = &path.segments[1]; + + if name == SELF_TYPE_NAME { + let the_trait = self.interner.get_trait(trait_id); + let method = the_trait.find_method(method.0.contents.as_str())?; + + let constraint = TraitConstraint { + typ: self.self_type.clone()?, + trait_generics: Type::from_generics(&the_trait.generics), + trait_id, + }; + return Some((method, constraint, false)); + } + } + None + } + + // this resolves TraitName::some_static_method + // + // Returns the trait method, trait constraint, and whether the impl is assumed to exist by a where clause or not + // E.g. `t.method()` with `where T: Foo` in scope will return `(Foo::method, T, vec![Bar])` + fn resolve_trait_static_method( + &mut self, + path: &Path, + ) -> Option<(TraitMethodId, TraitConstraint, bool)> { + if path.kind == PathKind::Plain && path.segments.len() == 2 { + let method = &path.segments[1]; + + let mut trait_path = path.clone(); + trait_path.pop(); + let trait_id = self.lookup(trait_path).ok()?; + let the_trait = self.interner.get_trait(trait_id); + + let method = the_trait.find_method(method.0.contents.as_str())?; + let constraint = TraitConstraint { + typ: Type::TypeVariable( + the_trait.self_type_typevar.clone(), + TypeVariableKind::Normal, + ), + trait_generics: Type::from_generics(&the_trait.generics), + trait_id, + }; + return Some((method, constraint, false)); + } + None + } + + // This resolves a static trait method T::trait_method by iterating over the where clause + // + // Returns the trait method, trait constraint, and whether the impl is assumed from a where + // clause. This is always true since this helper searches where clauses for a generic constraint. + // E.g. `t.method()` with `where T: Foo` in scope will return `(Foo::method, T, vec![Bar])` + fn resolve_trait_method_by_named_generic( + &mut self, + path: &Path, + ) -> Option<(TraitMethodId, TraitConstraint, bool)> { + if path.segments.len() != 2 { + return None; + } + + for UnresolvedTraitConstraint { typ, trait_bound } in self.trait_bounds.clone() { + if let UnresolvedTypeData::Named(constraint_path, _, _) = &typ.typ { + // if `path` is `T::method_name`, we're looking for constraint of the form `T: SomeTrait` + if constraint_path.segments.len() == 1 + && path.segments[0] != constraint_path.last_segment() + { + continue; + } + + if let Ok(ModuleDefId::TraitId(trait_id)) = + self.resolve_path(trait_bound.trait_path.clone()) + { + let the_trait = self.interner.get_trait(trait_id); + if let Some(method) = + the_trait.find_method(path.segments.last().unwrap().0.contents.as_str()) + { + let constraint = TraitConstraint { + trait_id, + typ: self.resolve_type(typ.clone()), + trait_generics: vecmap(trait_bound.trait_generics, |typ| { + self.resolve_type(typ) + }), + }; + return Some((method, constraint, true)); + } + } + } + } + None + } + + // Try to resolve the given trait method path. + // + // Returns the trait method, trait constraint, and whether the impl is assumed to exist by a where clause or not + // E.g. `t.method()` with `where T: Foo` in scope will return `(Foo::method, T, vec![Bar])` + pub(super) fn resolve_trait_generic_path( + &mut self, + path: &Path, + ) -> Option<(TraitMethodId, TraitConstraint, bool)> { + self.resolve_trait_static_method_by_self(path) + .or_else(|| self.resolve_trait_static_method(path)) + .or_else(|| self.resolve_trait_method_by_named_generic(path)) + } + + fn eval_global_as_array_length(&mut self, global: GlobalId, path: &Path) -> u64 { + let Some(stmt) = self.interner.get_global_let_statement(global) else { + let path = path.clone(); + self.push_err(ResolverError::NoSuchNumericTypeVariable { path }); + return 0; + }; + + let length = stmt.expression; + let span = self.interner.expr_span(&length); + let result = self.try_eval_array_length_id(length, span); + + match result.map(|length| length.try_into()) { + Ok(Ok(length_value)) => return length_value, + Ok(Err(_cast_err)) => self.push_err(ResolverError::IntegerTooLarge { span }), + Err(Some(error)) => self.push_err(error), + Err(None) => (), + } + 0 + } + + fn try_eval_array_length_id( + &self, + rhs: ExprId, + span: Span, + ) -> Result> { + // Arbitrary amount of recursive calls to try before giving up + let fuel = 100; + self.try_eval_array_length_id_with_fuel(rhs, span, fuel) + } + + fn try_eval_array_length_id_with_fuel( + &self, + rhs: ExprId, + span: Span, + fuel: u32, + ) -> Result> { + if fuel == 0 { + // If we reach here, it is likely from evaluating cyclic globals. We expect an error to + // be issued for them after name resolution so issue no error now. + return Err(None); + } + + match self.interner.expression(&rhs) { + HirExpression::Literal(HirLiteral::Integer(int, false)) => { + int.try_into_u128().ok_or(Some(ResolverError::IntegerTooLarge { span })) + } + HirExpression::Ident(ident, _) => { + let definition = self.interner.definition(ident.id); + match definition.kind { + DefinitionKind::Global(global_id) => { + let let_statement = self.interner.get_global_let_statement(global_id); + if let Some(let_statement) = let_statement { + let expression = let_statement.expression; + self.try_eval_array_length_id_with_fuel(expression, span, fuel - 1) + } else { + Err(Some(ResolverError::InvalidArrayLengthExpr { span })) + } + } + _ => Err(Some(ResolverError::InvalidArrayLengthExpr { span })), + } + } + HirExpression::Infix(infix) => { + let lhs = self.try_eval_array_length_id_with_fuel(infix.lhs, span, fuel - 1)?; + let rhs = self.try_eval_array_length_id_with_fuel(infix.rhs, span, fuel - 1)?; + + match infix.operator.kind { + BinaryOpKind::Add => Ok(lhs + rhs), + BinaryOpKind::Subtract => Ok(lhs - rhs), + BinaryOpKind::Multiply => Ok(lhs * rhs), + BinaryOpKind::Divide => Ok(lhs / rhs), + BinaryOpKind::Equal => Ok((lhs == rhs) as u128), + BinaryOpKind::NotEqual => Ok((lhs != rhs) as u128), + BinaryOpKind::Less => Ok((lhs < rhs) as u128), + BinaryOpKind::LessEqual => Ok((lhs <= rhs) as u128), + BinaryOpKind::Greater => Ok((lhs > rhs) as u128), + BinaryOpKind::GreaterEqual => Ok((lhs >= rhs) as u128), + BinaryOpKind::And => Ok(lhs & rhs), + BinaryOpKind::Or => Ok(lhs | rhs), + BinaryOpKind::Xor => Ok(lhs ^ rhs), + BinaryOpKind::ShiftRight => Ok(lhs >> rhs), + BinaryOpKind::ShiftLeft => Ok(lhs << rhs), + BinaryOpKind::Modulo => Ok(lhs % rhs), + } + } + _other => Err(Some(ResolverError::InvalidArrayLengthExpr { span })), + } + } + + /// Check if an assignment is overflowing with respect to `annotated_type` + /// in a declaration statement where `annotated_type` is an unsigned integer + pub(super) fn lint_overflowing_uint(&mut self, rhs_expr: &ExprId, annotated_type: &Type) { + let expr = self.interner.expression(rhs_expr); + let span = self.interner.expr_span(rhs_expr); + match expr { + HirExpression::Literal(HirLiteral::Integer(value, false)) => { + let v = value.to_u128(); + if let Type::Integer(_, bit_count) = annotated_type { + let bit_count: u32 = (*bit_count).into(); + let max = 1 << bit_count; + if v >= max { + self.push_err(TypeCheckError::OverflowingAssignment { + expr: value, + ty: annotated_type.clone(), + range: format!("0..={}", max - 1), + span, + }); + }; + }; + } + HirExpression::Prefix(expr) => { + self.lint_overflowing_uint(&expr.rhs, annotated_type); + if matches!(expr.operator, UnaryOp::Minus) { + self.push_err(TypeCheckError::InvalidUnaryOp { + kind: "annotated_type".to_string(), + span, + }); + } + } + HirExpression::Infix(expr) => { + self.lint_overflowing_uint(&expr.lhs, annotated_type); + self.lint_overflowing_uint(&expr.rhs, annotated_type); + } + _ => {} + } + } + + pub(super) fn unify( + &mut self, + actual: &Type, + expected: &Type, + make_error: impl FnOnce() -> TypeCheckError, + ) { + let mut errors = Vec::new(); + actual.unify(expected, &mut errors, make_error); + self.errors.extend(errors.into_iter().map(|error| (error.into(), self.file))); + } + + /// Wrapper of Type::unify_with_coercions using self.errors + pub(super) fn unify_with_coercions( + &mut self, + actual: &Type, + expected: &Type, + expression: ExprId, + make_error: impl FnOnce() -> TypeCheckError, + ) { + let mut errors = Vec::new(); + actual.unify_with_coercions(expected, expression, self.interner, &mut errors, make_error); + self.errors.extend(errors.into_iter().map(|error| (error.into(), self.file))); + } + + /// Return a fresh integer or field type variable and log it + /// in self.type_variables to default it later. + pub(super) fn polymorphic_integer_or_field(&mut self) -> Type { + let typ = Type::polymorphic_integer_or_field(self.interner); + self.type_variables.push(typ.clone()); + typ + } + + /// Return a fresh integer type variable and log it + /// in self.type_variables to default it later. + pub(super) fn polymorphic_integer(&mut self) -> Type { + let typ = Type::polymorphic_integer(self.interner); + self.type_variables.push(typ.clone()); + typ + } + + /// Translates a (possibly Unspecified) UnresolvedType to a Type. + /// Any UnresolvedType::Unspecified encountered are replaced with fresh type variables. + pub(super) fn resolve_inferred_type(&mut self, typ: UnresolvedType) -> Type { + match &typ.typ { + UnresolvedTypeData::Unspecified => self.interner.next_type_variable(), + _ => self.resolve_type_inner(typ, &mut vec![]), + } + } + + pub(super) fn type_check_prefix_operand( + &mut self, + op: &crate::ast::UnaryOp, + rhs_type: &Type, + span: Span, + ) -> Type { + let mut unify = |this: &mut Self, expected| { + this.unify(rhs_type, &expected, || TypeCheckError::TypeMismatch { + expr_typ: rhs_type.to_string(), + expected_typ: expected.to_string(), + expr_span: span, + }); + expected + }; + + match op { + crate::ast::UnaryOp::Minus => { + if rhs_type.is_unsigned() { + self.push_err(TypeCheckError::InvalidUnaryOp { + kind: rhs_type.to_string(), + span, + }); + } + let expected = self.polymorphic_integer_or_field(); + self.unify(rhs_type, &expected, || TypeCheckError::InvalidUnaryOp { + kind: rhs_type.to_string(), + span, + }); + expected + } + crate::ast::UnaryOp::Not => { + let rhs_type = rhs_type.follow_bindings(); + + // `!` can work on booleans or integers + if matches!(rhs_type, Type::Integer(..)) { + return rhs_type; + } + + unify(self, Type::Bool) + } + crate::ast::UnaryOp::MutableReference => { + Type::MutableReference(Box::new(rhs_type.follow_bindings())) + } + crate::ast::UnaryOp::Dereference { implicitly_added: _ } => { + let element_type = self.interner.next_type_variable(); + unify(self, Type::MutableReference(Box::new(element_type.clone()))); + element_type + } + } + } + + /// Insert as many dereference operations as necessary to automatically dereference a method + /// call object to its base value type T. + pub(super) fn insert_auto_dereferences(&mut self, object: ExprId, typ: Type) -> (ExprId, Type) { + if let Type::MutableReference(element) = typ { + let location = self.interner.id_location(object); + + let object = self.interner.push_expr(HirExpression::Prefix(HirPrefixExpression { + operator: UnaryOp::Dereference { implicitly_added: true }, + rhs: object, + })); + self.interner.push_expr_type(object, element.as_ref().clone()); + self.interner.push_expr_location(object, location.span, location.file); + + // Recursively dereference to allow for converting &mut &mut T to T + self.insert_auto_dereferences(object, *element) + } else { + (object, typ) + } + } + + /// Given a method object: `(*foo).bar` of a method call `(*foo).bar.baz()`, remove the + /// implicitly added dereference operator if one is found. + /// + /// Returns Some(new_expr_id) if a dereference was removed and None otherwise. + fn try_remove_implicit_dereference(&mut self, object: ExprId) -> Option { + match self.interner.expression(&object) { + HirExpression::MemberAccess(mut access) => { + let new_lhs = self.try_remove_implicit_dereference(access.lhs)?; + access.lhs = new_lhs; + access.is_offset = true; + + // `object` will have a different type now, which will be filled in + // later when type checking the method call as a function call. + self.interner.replace_expr(&object, HirExpression::MemberAccess(access)); + Some(object) + } + HirExpression::Prefix(prefix) => match prefix.operator { + // Found a dereference we can remove. Now just replace it with its rhs to remove it. + UnaryOp::Dereference { implicitly_added: true } => Some(prefix.rhs), + _ => None, + }, + _ => None, + } + } + + fn bind_function_type_impl( + &mut self, + fn_params: &[Type], + fn_ret: &Type, + callsite_args: &[(Type, ExprId, Span)], + span: Span, + ) -> Type { + if fn_params.len() != callsite_args.len() { + self.push_err(TypeCheckError::ParameterCountMismatch { + expected: fn_params.len(), + found: callsite_args.len(), + span, + }); + return Type::Error; + } + + for (param, (arg, _, arg_span)) in fn_params.iter().zip(callsite_args) { + self.unify(arg, param, || TypeCheckError::TypeMismatch { + expected_typ: param.to_string(), + expr_typ: arg.to_string(), + expr_span: *arg_span, + }); + } + + fn_ret.clone() + } + + pub(super) fn bind_function_type( + &mut self, + function: Type, + args: Vec<(Type, ExprId, Span)>, + span: Span, + ) -> Type { + // Could do a single unification for the entire function type, but matching beforehand + // lets us issue a more precise error on the individual argument that fails to type check. + match function { + Type::TypeVariable(binding, TypeVariableKind::Normal) => { + if let TypeBinding::Bound(typ) = &*binding.borrow() { + return self.bind_function_type(typ.clone(), args, span); + } + + let ret = self.interner.next_type_variable(); + let args = vecmap(args, |(arg, _, _)| arg); + let env_type = self.interner.next_type_variable(); + let expected = Type::Function(args, Box::new(ret.clone()), Box::new(env_type)); + + if let Err(error) = binding.try_bind(expected, span) { + self.push_err(error); + } + ret + } + // The closure env is ignored on purpose: call arguments never place + // constraints on closure environments. + Type::Function(parameters, ret, _env) => { + self.bind_function_type_impl(¶meters, &ret, &args, span) + } + Type::Error => Type::Error, + found => { + self.push_err(TypeCheckError::ExpectedFunction { found, span }); + Type::Error + } + } + } + + pub(super) fn check_cast(&mut self, from: Type, to: &Type, span: Span) -> Type { + match from.follow_bindings() { + Type::Integer(..) + | Type::FieldElement + | Type::TypeVariable(_, TypeVariableKind::IntegerOrField) + | Type::TypeVariable(_, TypeVariableKind::Integer) + | Type::Bool => (), + + Type::TypeVariable(_, _) => { + self.push_err(TypeCheckError::TypeAnnotationsNeeded { span }); + return Type::Error; + } + Type::Error => return Type::Error, + from => { + self.push_err(TypeCheckError::InvalidCast { from, span }); + return Type::Error; + } + } + + match to { + Type::Integer(sign, bits) => Type::Integer(*sign, *bits), + Type::FieldElement => Type::FieldElement, + Type::Bool => Type::Bool, + Type::Error => Type::Error, + _ => { + self.push_err(TypeCheckError::UnsupportedCast { span }); + Type::Error + } + } + } + + // Given a binary comparison operator and another type. This method will produce the output type + // and a boolean indicating whether to use the trait impl corresponding to the operator + // or not. A value of false indicates the caller to use a primitive operation for this + // operator, while a true value indicates a user-provided trait impl is required. + fn comparator_operand_type_rules( + &mut self, + lhs_type: &Type, + rhs_type: &Type, + op: &HirBinaryOp, + span: Span, + ) -> Result<(Type, bool), TypeCheckError> { + use Type::*; + + match (lhs_type, rhs_type) { + // Avoid reporting errors multiple times + (Error, _) | (_, Error) => Ok((Bool, false)), + (Alias(alias, args), other) | (other, Alias(alias, args)) => { + let alias = alias.borrow().get_type(args); + self.comparator_operand_type_rules(&alias, other, op, span) + } + + // Matches on TypeVariable must be first to follow any type + // bindings. + (TypeVariable(var, _), other) | (other, TypeVariable(var, _)) => { + if let TypeBinding::Bound(binding) = &*var.borrow() { + return self.comparator_operand_type_rules(other, binding, op, span); + } + + let use_impl = self.bind_type_variables_for_infix(lhs_type, op, rhs_type, span); + Ok((Bool, use_impl)) + } + (Integer(sign_x, bit_width_x), Integer(sign_y, bit_width_y)) => { + if sign_x != sign_y { + return Err(TypeCheckError::IntegerSignedness { + sign_x: *sign_x, + sign_y: *sign_y, + span, + }); + } + if bit_width_x != bit_width_y { + return Err(TypeCheckError::IntegerBitWidth { + bit_width_x: *bit_width_x, + bit_width_y: *bit_width_y, + span, + }); + } + Ok((Bool, false)) + } + (FieldElement, FieldElement) => { + if op.kind.is_valid_for_field_type() { + Ok((Bool, false)) + } else { + Err(TypeCheckError::FieldComparison { span }) + } + } + + // <= and friends are technically valid for booleans, just not very useful + (Bool, Bool) => Ok((Bool, false)), + + (lhs, rhs) => { + self.unify(lhs, rhs, || TypeCheckError::TypeMismatchWithSource { + expected: lhs.clone(), + actual: rhs.clone(), + span: op.location.span, + source: Source::Binary, + }); + Ok((Bool, true)) + } + } + } + + /// Handles the TypeVariable case for checking binary operators. + /// Returns true if we should use the impl for the operator instead of the primitive + /// version of it. + fn bind_type_variables_for_infix( + &mut self, + lhs_type: &Type, + op: &HirBinaryOp, + rhs_type: &Type, + span: Span, + ) -> bool { + self.unify(lhs_type, rhs_type, || TypeCheckError::TypeMismatchWithSource { + expected: lhs_type.clone(), + actual: rhs_type.clone(), + source: Source::Binary, + span, + }); + + let use_impl = !lhs_type.is_numeric(); + + // If this operator isn't valid for fields we have to possibly narrow + // TypeVariableKind::IntegerOrField to TypeVariableKind::Integer. + // Doing so also ensures a type error if Field is used. + // The is_numeric check is to allow impls for custom types to bypass this. + if !op.kind.is_valid_for_field_type() && lhs_type.is_numeric() { + let target = Type::polymorphic_integer(self.interner); + + use crate::ast::BinaryOpKind::*; + use TypeCheckError::*; + self.unify(lhs_type, &target, || match op.kind { + Less | LessEqual | Greater | GreaterEqual => FieldComparison { span }, + And | Or | Xor | ShiftRight | ShiftLeft => FieldBitwiseOp { span }, + Modulo => FieldModulo { span }, + other => unreachable!("Operator {other:?} should be valid for Field"), + }); + } + + use_impl + } + + // Given a binary operator and another type. This method will produce the output type + // and a boolean indicating whether to use the trait impl corresponding to the operator + // or not. A value of false indicates the caller to use a primitive operation for this + // operator, while a true value indicates a user-provided trait impl is required. + pub(super) fn infix_operand_type_rules( + &mut self, + lhs_type: &Type, + op: &HirBinaryOp, + rhs_type: &Type, + span: Span, + ) -> Result<(Type, bool), TypeCheckError> { + if op.kind.is_comparator() { + return self.comparator_operand_type_rules(lhs_type, rhs_type, op, span); + } + + use Type::*; + match (lhs_type, rhs_type) { + // An error type on either side will always return an error + (Error, _) | (_, Error) => Ok((Error, false)), + (Alias(alias, args), other) | (other, Alias(alias, args)) => { + let alias = alias.borrow().get_type(args); + self.infix_operand_type_rules(&alias, op, other, span) + } + + // Matches on TypeVariable must be first so that we follow any type + // bindings. + (TypeVariable(int, _), other) | (other, TypeVariable(int, _)) => { + if let TypeBinding::Bound(binding) = &*int.borrow() { + return self.infix_operand_type_rules(binding, op, other, span); + } + if op.kind == BinaryOpKind::ShiftLeft || op.kind == BinaryOpKind::ShiftRight { + self.unify( + rhs_type, + &Type::Integer(Signedness::Unsigned, IntegerBitSize::Eight), + || TypeCheckError::InvalidShiftSize { span }, + ); + let use_impl = if lhs_type.is_numeric() { + let integer_type = Type::polymorphic_integer(self.interner); + self.bind_type_variables_for_infix(lhs_type, op, &integer_type, span) + } else { + true + }; + return Ok((lhs_type.clone(), use_impl)); + } + let use_impl = self.bind_type_variables_for_infix(lhs_type, op, rhs_type, span); + Ok((other.clone(), use_impl)) + } + (Integer(sign_x, bit_width_x), Integer(sign_y, bit_width_y)) => { + if op.kind == BinaryOpKind::ShiftLeft || op.kind == BinaryOpKind::ShiftRight { + if *sign_y != Signedness::Unsigned || *bit_width_y != IntegerBitSize::Eight { + return Err(TypeCheckError::InvalidShiftSize { span }); + } + return Ok((Integer(*sign_x, *bit_width_x), false)); + } + if sign_x != sign_y { + return Err(TypeCheckError::IntegerSignedness { + sign_x: *sign_x, + sign_y: *sign_y, + span, + }); + } + if bit_width_x != bit_width_y { + return Err(TypeCheckError::IntegerBitWidth { + bit_width_x: *bit_width_x, + bit_width_y: *bit_width_y, + span, + }); + } + Ok((Integer(*sign_x, *bit_width_x), false)) + } + // The result of two Fields is always a witness + (FieldElement, FieldElement) => { + if !op.kind.is_valid_for_field_type() { + if op.kind == BinaryOpKind::Modulo { + return Err(TypeCheckError::FieldModulo { span }); + } else { + return Err(TypeCheckError::FieldBitwiseOp { span }); + } + } + Ok((FieldElement, false)) + } + + (Bool, Bool) => Ok((Bool, false)), + + (lhs, rhs) => { + if op.kind == BinaryOpKind::ShiftLeft || op.kind == BinaryOpKind::ShiftRight { + if rhs == &Type::Integer(Signedness::Unsigned, IntegerBitSize::Eight) { + return Ok((lhs.clone(), true)); + } + return Err(TypeCheckError::InvalidShiftSize { span }); + } + self.unify(lhs, rhs, || TypeCheckError::TypeMismatchWithSource { + expected: lhs.clone(), + actual: rhs.clone(), + span: op.location.span, + source: Source::Binary, + }); + Ok((lhs.clone(), true)) + } + } + } + + /// Prerequisite: verify_trait_constraint of the operator's trait constraint. + /// + /// Although by this point the operator is expected to already have a trait impl, + /// we still need to match the operator's type against the method's instantiated type + /// to ensure the instantiation bindings are correct and the monomorphizer can + /// re-apply the needed bindings. + pub(super) fn type_check_operator_method( + &mut self, + expr_id: ExprId, + trait_method_id: TraitMethodId, + object_type: &Type, + span: Span, + ) { + let the_trait = self.interner.get_trait(trait_method_id.trait_id); + + let method = &the_trait.methods[trait_method_id.method_index]; + let (method_type, mut bindings) = method.typ.clone().instantiate(self.interner); + + match method_type { + Type::Function(args, _, _) => { + // We can cheat a bit and match against only the object type here since no operator + // overload uses other generic parameters or return types aside from the object type. + let expected_object_type = &args[0]; + self.unify(object_type, expected_object_type, || TypeCheckError::TypeMismatch { + expected_typ: expected_object_type.to_string(), + expr_typ: object_type.to_string(), + expr_span: span, + }); + } + other => { + unreachable!("Expected operator method to have a function type, but found {other}") + } + } + + // We must also remember to apply these substitutions to the object_type + // referenced by the selected trait impl, if one has yet to be selected. + let impl_kind = self.interner.get_selected_impl_for_expression(expr_id); + if let Some(TraitImplKind::Assumed { object_type, trait_generics }) = impl_kind { + let the_trait = self.interner.get_trait(trait_method_id.trait_id); + let object_type = object_type.substitute(&bindings); + bindings.insert( + the_trait.self_type_typevar_id, + (the_trait.self_type_typevar.clone(), object_type.clone()), + ); + self.interner.select_impl_for_expression( + expr_id, + TraitImplKind::Assumed { object_type, trait_generics }, + ); + } + + self.interner.store_instantiation_bindings(expr_id, bindings); + } + + pub(super) fn type_check_member_access( + &mut self, + mut access: HirMemberAccess, + expr_id: ExprId, + lhs_type: Type, + span: Span, + ) -> Type { + let access_lhs = &mut access.lhs; + + let dereference_lhs = |this: &mut Self, lhs_type, element| { + let old_lhs = *access_lhs; + *access_lhs = this.interner.push_expr(HirExpression::Prefix(HirPrefixExpression { + operator: crate::ast::UnaryOp::Dereference { implicitly_added: true }, + rhs: old_lhs, + })); + this.interner.push_expr_type(old_lhs, lhs_type); + this.interner.push_expr_type(*access_lhs, element); + + let old_location = this.interner.id_location(old_lhs); + this.interner.push_expr_location(*access_lhs, span, old_location.file); + }; + + // If this access is just a field offset, we want to avoid dereferencing + let dereference_lhs = (!access.is_offset).then_some(dereference_lhs); + + match self.check_field_access(&lhs_type, &access.rhs.0.contents, span, dereference_lhs) { + Some((element_type, index)) => { + self.interner.set_field_index(expr_id, index); + // We must update `access` in case we added any dereferences to it + self.interner.replace_expr(&expr_id, HirExpression::MemberAccess(access)); + element_type + } + None => Type::Error, + } + } + + pub(super) fn lookup_method( + &mut self, + object_type: &Type, + method_name: &str, + span: Span, + ) -> Option { + match object_type.follow_bindings() { + Type::Struct(typ, _args) => { + let id = typ.borrow().id; + match self.interner.lookup_method(object_type, id, method_name, false) { + Some(method_id) => Some(HirMethodReference::FuncId(method_id)), + None => { + self.push_err(TypeCheckError::UnresolvedMethodCall { + method_name: method_name.to_string(), + object_type: object_type.clone(), + span, + }); + None + } + } + } + // TODO: We should allow method calls on `impl Trait`s eventually. + // For now it is fine since they are only allowed on return types. + Type::TraitAsType(..) => { + self.push_err(TypeCheckError::UnresolvedMethodCall { + method_name: method_name.to_string(), + object_type: object_type.clone(), + span, + }); + None + } + Type::NamedGeneric(_, _) => { + let func_meta = self.interner.function_meta( + &self.current_function.expect("unexpected method outside a function"), + ); + + for constraint in &func_meta.trait_constraints { + if *object_type == constraint.typ { + if let Some(the_trait) = self.interner.try_get_trait(constraint.trait_id) { + for (method_index, method) in the_trait.methods.iter().enumerate() { + if method.name.0.contents == method_name { + let trait_method = TraitMethodId { + trait_id: constraint.trait_id, + method_index, + }; + return Some(HirMethodReference::TraitMethodId( + trait_method, + constraint.trait_generics.clone(), + )); + } + } + } + } + } + + self.push_err(TypeCheckError::UnresolvedMethodCall { + method_name: method_name.to_string(), + object_type: object_type.clone(), + span, + }); + None + } + // Mutable references to another type should resolve to methods of their element type. + // This may be a struct or a primitive type. + Type::MutableReference(element) => self + .interner + .lookup_primitive_trait_method_mut(element.as_ref(), method_name) + .map(HirMethodReference::FuncId) + .or_else(|| self.lookup_method(&element, method_name, span)), + + // If we fail to resolve the object to a struct type, we have no way of type + // checking its arguments as we can't even resolve the name of the function + Type::Error => None, + + // The type variable must be unbound at this point since follow_bindings was called + Type::TypeVariable(_, TypeVariableKind::Normal) => { + self.push_err(TypeCheckError::TypeAnnotationsNeeded { span }); + None + } + + other => match self.interner.lookup_primitive_method(&other, method_name) { + Some(method_id) => Some(HirMethodReference::FuncId(method_id)), + None => { + self.push_err(TypeCheckError::UnresolvedMethodCall { + method_name: method_name.to_string(), + object_type: object_type.clone(), + span, + }); + None + } + }, + } + } + + pub(super) fn type_check_call( + &mut self, + call: &HirCallExpression, + func_type: Type, + args: Vec<(Type, ExprId, Span)>, + span: Span, + ) -> Type { + // Need to setup these flags here as `self` is borrowed mutably to type check the rest of the call expression + // These flags are later used to type check calls to unconstrained functions from constrained functions + let func_mod = self.current_function.map(|func| self.interner.function_modifiers(&func)); + let is_current_func_constrained = + func_mod.map_or(true, |func_mod| !func_mod.is_unconstrained); + + let is_unconstrained_call = self.is_unconstrained_call(call.func); + self.check_if_deprecated(call.func); + + // Check that we are not passing a mutable reference from a constrained runtime to an unconstrained runtime + if is_current_func_constrained && is_unconstrained_call { + for (typ, _, _) in args.iter() { + if matches!(&typ.follow_bindings(), Type::MutableReference(_)) { + self.push_err(TypeCheckError::ConstrainedReferenceToUnconstrained { span }); + } + } + } + + let return_type = self.bind_function_type(func_type, args, span); + + // Check that we are not passing a slice from an unconstrained runtime to a constrained runtime + if is_current_func_constrained && is_unconstrained_call { + if return_type.contains_slice() { + self.push_err(TypeCheckError::UnconstrainedSliceReturnToConstrained { span }); + } else if matches!(&return_type.follow_bindings(), Type::MutableReference(_)) { + self.push_err(TypeCheckError::UnconstrainedReferenceToConstrained { span }); + } + }; + + return_type + } + + fn check_if_deprecated(&mut self, expr: ExprId) { + if let HirExpression::Ident(HirIdent { location, id, impl_kind: _ }, _) = + self.interner.expression(&expr) + { + if let Some(DefinitionKind::Function(func_id)) = + self.interner.try_definition(id).map(|def| &def.kind) + { + let attributes = self.interner.function_attributes(func_id); + if let Some(note) = attributes.get_deprecated_note() { + self.push_err(TypeCheckError::CallDeprecated { + name: self.interner.definition_name(id).to_string(), + note, + span: location.span, + }); + } + } + } + } + + fn is_unconstrained_call(&self, expr: ExprId) -> bool { + if let HirExpression::Ident(HirIdent { id, .. }, _) = self.interner.expression(&expr) { + if let Some(DefinitionKind::Function(func_id)) = + self.interner.try_definition(id).map(|def| &def.kind) + { + let modifiers = self.interner.function_modifiers(func_id); + return modifiers.is_unconstrained; + } + } + false + } + + /// Check if the given method type requires a mutable reference to the object type, and check + /// if the given object type is already a mutable reference. If not, add one. + /// This is used to automatically transform a method call: `foo.bar()` into a function + /// call: `bar(&mut foo)`. + /// + /// A notable corner case of this function is where it interacts with auto-deref of `.`. + /// If a field is being mutated e.g. `foo.bar.mutate_bar()` where `foo: &mut Foo`, the compiler + /// will insert a dereference before bar `(*foo).bar.mutate_bar()` which would cause us to + /// mutate a copy of bar rather than a reference to it. We must check for this corner case here + /// and remove the implicitly added dereference operator if we find one. + pub(super) fn try_add_mutable_reference_to_object( + &mut self, + function_type: &Type, + object_type: &mut Type, + object: &mut ExprId, + ) { + let expected_object_type = match function_type { + Type::Function(args, _, _) => args.first(), + Type::Forall(_, typ) => match typ.as_ref() { + Type::Function(args, _, _) => args.first(), + typ => unreachable!("Unexpected type for function: {typ}"), + }, + typ => unreachable!("Unexpected type for function: {typ}"), + }; + + if let Some(expected_object_type) = expected_object_type { + let actual_type = object_type.follow_bindings(); + + if matches!(expected_object_type.follow_bindings(), Type::MutableReference(_)) { + if !matches!(actual_type, Type::MutableReference(_)) { + if let Err(error) = verify_mutable_reference(self.interner, *object) { + self.push_err(TypeCheckError::ResolverError(error)); + } + + let new_type = Type::MutableReference(Box::new(actual_type)); + *object_type = new_type.clone(); + + // First try to remove a dereference operator that may have been implicitly + // inserted by a field access expression `foo.bar` on a mutable reference `foo`. + let new_object = self.try_remove_implicit_dereference(*object); + + // If that didn't work, then wrap the whole expression in an `&mut` + *object = new_object.unwrap_or_else(|| { + let location = self.interner.id_location(*object); + + let new_object = + self.interner.push_expr(HirExpression::Prefix(HirPrefixExpression { + operator: UnaryOp::MutableReference, + rhs: *object, + })); + self.interner.push_expr_type(new_object, new_type); + self.interner.push_expr_location(new_object, location.span, location.file); + new_object + }); + } + // Otherwise if the object type is a mutable reference and the method is not, insert as + // many dereferences as needed. + } else if matches!(actual_type, Type::MutableReference(_)) { + let (new_object, new_type) = self.insert_auto_dereferences(*object, actual_type); + *object_type = new_type; + *object = new_object; + } + } + } + + pub fn type_check_function_body(&mut self, body_type: Type, meta: &FuncMeta, body_id: ExprId) { + let (expr_span, empty_function) = self.function_info(body_id); + let declared_return_type = meta.return_type(); + + let func_span = self.interner.expr_span(&body_id); // XXX: We could be more specific and return the span of the last stmt, however stmts do not have spans yet + if let Type::TraitAsType(trait_id, _, generics) = declared_return_type { + if self.interner.lookup_trait_implementation(&body_type, *trait_id, generics).is_err() { + self.push_err(TypeCheckError::TypeMismatchWithSource { + expected: declared_return_type.clone(), + actual: body_type, + span: func_span, + source: Source::Return(meta.return_type.clone(), expr_span), + }); + } + } else { + self.unify_with_coercions(&body_type, declared_return_type, body_id, || { + let mut error = TypeCheckError::TypeMismatchWithSource { + expected: declared_return_type.clone(), + actual: body_type.clone(), + span: func_span, + source: Source::Return(meta.return_type.clone(), expr_span), + }; + + if empty_function { + error = error.add_context( + "implicitly returns `()` as its body has no tail or `return` expression", + ); + } + error + }); + } + } + + fn function_info(&self, function_body_id: ExprId) -> (noirc_errors::Span, bool) { + let (expr_span, empty_function) = + if let HirExpression::Block(block) = self.interner.expression(&function_body_id) { + let last_stmt = block.statements().last(); + let mut span = self.interner.expr_span(&function_body_id); + + if let Some(last_stmt) = last_stmt { + if let HirStatement::Expression(expr) = self.interner.statement(last_stmt) { + span = self.interner.expr_span(&expr); + } + } + + (span, last_stmt.is_none()) + } else { + (self.interner.expr_span(&function_body_id), false) + }; + (expr_span, empty_function) + } + + pub fn verify_trait_constraint( + &mut self, + object_type: &Type, + trait_id: TraitId, + trait_generics: &[Type], + function_ident_id: ExprId, + span: Span, + ) { + match self.interner.lookup_trait_implementation(object_type, trait_id, trait_generics) { + Ok(impl_kind) => { + self.interner.select_impl_for_expression(function_ident_id, impl_kind); + } + Err(erroring_constraints) => { + if erroring_constraints.is_empty() { + self.push_err(TypeCheckError::TypeAnnotationsNeeded { span }); + } else { + // Don't show any errors where try_get_trait returns None. + // This can happen if a trait is used that was never declared. + let constraints = erroring_constraints + .into_iter() + .map(|constraint| { + let r#trait = self.interner.try_get_trait(constraint.trait_id)?; + let mut name = r#trait.name.to_string(); + if !constraint.trait_generics.is_empty() { + let generics = + vecmap(&constraint.trait_generics, ToString::to_string); + name += &format!("<{}>", generics.join(", ")); + } + Some((constraint.typ, name)) + }) + .collect::>>(); + + if let Some(constraints) = constraints { + self.push_err(TypeCheckError::NoMatchingImplFound { constraints, span }); + } + } + } + } + } +} diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/hir_to_ast.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/hir_to_ast.rs index 1ab9c13ea25..e0fdd91adb4 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/hir_to_ast.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/hir_to_ast.rs @@ -82,9 +82,12 @@ impl ExprId { let span = interner.expr_span(&self); let kind = match expression { - HirExpression::Ident(ident) => { + HirExpression::Ident(ident, generics) => { let path = Path::from_ident(ident.to_ast(interner)); - ExpressionKind::Variable(path) + ExpressionKind::Variable( + path, + generics.map(|option| option.iter().map(|generic| generic.to_ast()).collect()), + ) } HirExpression::Literal(HirLiteral::Array(array)) => { let array = array.into_ast(interner, span); @@ -146,6 +149,9 @@ impl ExprId { object: method_call.object.to_ast(interner), method_name: method_call.method, arguments: vecmap(method_call.arguments, |arg| arg.to_ast(interner)), + generics: method_call + .generics + .map(|option| option.iter().map(|generic| generic.to_ast()).collect()), })) } HirExpression::Cast(cast) => { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/interpreter.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/interpreter.rs index 26b7c212a30..5984e454f7a 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/interpreter.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/interpreter.rs @@ -296,7 +296,7 @@ impl<'a> Interpreter<'a> { /// Evaluate an expression and return the result pub(super) fn evaluate(&mut self, id: ExprId) -> IResult { match self.interner.expression(&id) { - HirExpression::Ident(ident) => self.evaluate_ident(ident, id), + HirExpression::Ident(ident, _) => self.evaluate_ident(ident, id), HirExpression::Literal(literal) => self.evaluate_literal(literal, id), HirExpression::Block(block) => self.evaluate_block(block), HirExpression::Prefix(prefix) => self.evaluate_prefix(prefix, id), @@ -401,6 +401,14 @@ impl<'a> Interpreter<'a> { let value = if is_negative { 0u8.wrapping_sub(value) } else { value }; Ok(Value::U8(value)) } + (Signedness::Unsigned, IntegerBitSize::Sixteen) => { + let value: u16 = + value.try_to_u64().and_then(|value| value.try_into().ok()).ok_or( + InterpreterError::IntegerOutOfRangeForType { value, typ, location }, + )?; + let value = if is_negative { 0u16.wrapping_sub(value) } else { value }; + Ok(Value::U16(value)) + } (Signedness::Unsigned, IntegerBitSize::ThirtyTwo) => { let value: u32 = value.try_to_u64().and_then(|value| value.try_into().ok()).ok_or( @@ -430,6 +438,14 @@ impl<'a> Interpreter<'a> { let value = if is_negative { -value } else { value }; Ok(Value::I8(value)) } + (Signedness::Signed, IntegerBitSize::Sixteen) => { + let value: i16 = + value.try_to_u64().and_then(|value| value.try_into().ok()).ok_or( + InterpreterError::IntegerOutOfRangeForType { value, typ, location }, + )?; + let value = if is_negative { -value } else { value }; + Ok(Value::I16(value)) + } (Signedness::Signed, IntegerBitSize::ThirtyTwo) => { let value: i32 = value.try_to_u64().and_then(|value| value.try_into().ok()).ok_or( @@ -509,9 +525,11 @@ impl<'a> Interpreter<'a> { crate::ast::UnaryOp::Minus => match rhs { Value::Field(value) => Ok(Value::Field(FieldElement::zero() - value)), Value::I8(value) => Ok(Value::I8(-value)), + Value::I16(value) => Ok(Value::I16(-value)), Value::I32(value) => Ok(Value::I32(-value)), Value::I64(value) => Ok(Value::I64(-value)), Value::U8(value) => Ok(Value::U8(0 - value)), + Value::U16(value) => Ok(Value::U16(0 - value)), Value::U32(value) => Ok(Value::U32(0 - value)), Value::U64(value) => Ok(Value::U64(0 - value)), value => { @@ -523,9 +541,11 @@ impl<'a> Interpreter<'a> { crate::ast::UnaryOp::Not => match rhs { Value::Bool(value) => Ok(Value::Bool(!value)), Value::I8(value) => Ok(Value::I8(!value)), + Value::I16(value) => Ok(Value::I16(!value)), Value::I32(value) => Ok(Value::I32(!value)), Value::I64(value) => Ok(Value::I64(!value)), Value::U8(value) => Ok(Value::U8(!value)), + Value::U16(value) => Ok(Value::U16(!value)), Value::U32(value) => Ok(Value::U32(!value)), Value::U64(value) => Ok(Value::U64(!value)), value => { @@ -559,9 +579,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Add => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Field(lhs + rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs + rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs + rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs + rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs + rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs + rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs + rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs + rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs + rhs)), (lhs, rhs) => { @@ -572,9 +594,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Subtract => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Field(lhs - rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs - rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs - rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs - rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs - rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs - rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs - rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs - rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs - rhs)), (lhs, rhs) => { @@ -585,9 +609,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Multiply => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Field(lhs * rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs * rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs * rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs * rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs * rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs * rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs * rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs * rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs * rhs)), (lhs, rhs) => { @@ -598,9 +624,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Divide => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Field(lhs / rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs / rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs / rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs / rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs / rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs / rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs / rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs / rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs / rhs)), (lhs, rhs) => { @@ -611,9 +639,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Equal => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Bool(lhs == rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::Bool(lhs == rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::Bool(lhs == rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::Bool(lhs == rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::Bool(lhs == rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::Bool(lhs == rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::Bool(lhs == rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::Bool(lhs == rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::Bool(lhs == rhs)), (lhs, rhs) => { @@ -624,9 +654,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::NotEqual => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Bool(lhs != rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::Bool(lhs != rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::Bool(lhs != rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::Bool(lhs != rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::Bool(lhs != rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::Bool(lhs != rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::Bool(lhs != rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::Bool(lhs != rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::Bool(lhs != rhs)), (lhs, rhs) => { @@ -637,9 +669,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Less => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Bool(lhs < rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::Bool(lhs < rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::Bool(lhs < rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::Bool(lhs < rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::Bool(lhs < rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::Bool(lhs < rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::Bool(lhs < rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::Bool(lhs < rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::Bool(lhs < rhs)), (lhs, rhs) => { @@ -650,9 +684,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::LessEqual => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Bool(lhs <= rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::Bool(lhs <= rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::Bool(lhs <= rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::Bool(lhs <= rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::Bool(lhs <= rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::Bool(lhs <= rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::Bool(lhs <= rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::Bool(lhs <= rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::Bool(lhs <= rhs)), (lhs, rhs) => { @@ -663,9 +699,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Greater => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Bool(lhs > rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::Bool(lhs > rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::Bool(lhs > rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::Bool(lhs > rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::Bool(lhs > rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::Bool(lhs > rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::Bool(lhs > rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::Bool(lhs > rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::Bool(lhs > rhs)), (lhs, rhs) => { @@ -676,9 +714,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::GreaterEqual => match (lhs, rhs) { (Value::Field(lhs), Value::Field(rhs)) => Ok(Value::Bool(lhs >= rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::Bool(lhs >= rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::Bool(lhs >= rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::Bool(lhs >= rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::Bool(lhs >= rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::Bool(lhs >= rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::Bool(lhs >= rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::Bool(lhs >= rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::Bool(lhs >= rhs)), (lhs, rhs) => { @@ -689,9 +729,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::And => match (lhs, rhs) { (Value::Bool(lhs), Value::Bool(rhs)) => Ok(Value::Bool(lhs & rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs & rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs & rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs & rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs & rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs & rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs & rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs & rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs & rhs)), (lhs, rhs) => { @@ -702,9 +744,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Or => match (lhs, rhs) { (Value::Bool(lhs), Value::Bool(rhs)) => Ok(Value::Bool(lhs | rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs | rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs | rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs | rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs | rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs | rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs | rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs | rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs | rhs)), (lhs, rhs) => { @@ -715,9 +759,11 @@ impl<'a> Interpreter<'a> { BinaryOpKind::Xor => match (lhs, rhs) { (Value::Bool(lhs), Value::Bool(rhs)) => Ok(Value::Bool(lhs ^ rhs)), (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs ^ rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs ^ rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs ^ rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs ^ rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs ^ rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs ^ rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs ^ rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs ^ rhs)), (lhs, rhs) => { @@ -727,9 +773,11 @@ impl<'a> Interpreter<'a> { }, BinaryOpKind::ShiftRight => match (lhs, rhs) { (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs >> rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs >> rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs >> rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs >> rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs >> rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs >> rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs >> rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs >> rhs)), (lhs, rhs) => { @@ -739,9 +787,11 @@ impl<'a> Interpreter<'a> { }, BinaryOpKind::ShiftLeft => match (lhs, rhs) { (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs << rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs << rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs << rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs << rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs << rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs << rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs << rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs << rhs)), (lhs, rhs) => { @@ -751,9 +801,11 @@ impl<'a> Interpreter<'a> { }, BinaryOpKind::Modulo => match (lhs, rhs) { (Value::I8(lhs), Value::I8(rhs)) => Ok(Value::I8(lhs % rhs)), + (Value::I16(lhs), Value::I16(rhs)) => Ok(Value::I16(lhs % rhs)), (Value::I32(lhs), Value::I32(rhs)) => Ok(Value::I32(lhs % rhs)), (Value::I64(lhs), Value::I64(rhs)) => Ok(Value::I64(lhs % rhs)), (Value::U8(lhs), Value::U8(rhs)) => Ok(Value::U8(lhs % rhs)), + (Value::U16(lhs), Value::U16(rhs)) => Ok(Value::U16(lhs % rhs)), (Value::U32(lhs), Value::U32(rhs)) => Ok(Value::U32(lhs % rhs)), (Value::U64(lhs), Value::U64(rhs)) => Ok(Value::U64(lhs % rhs)), (lhs, rhs) => { @@ -795,9 +847,11 @@ impl<'a> Interpreter<'a> { value.try_to_u64().expect("index could not fit into u64") as usize } Value::I8(value) => value as usize, + Value::I16(value) => value as usize, Value::I32(value) => value as usize, Value::I64(value) => value as usize, Value::U8(value) => value as usize, + Value::U16(value) => value as usize, Value::U32(value) => value as usize, Value::U64(value) => value as usize, value => { @@ -908,9 +962,11 @@ impl<'a> Interpreter<'a> { let (mut lhs, lhs_is_negative) = match self.evaluate(cast.lhs)? { Value::Field(value) => (value, false), Value::U8(value) => ((value as u128).into(), false), + Value::U16(value) => ((value as u128).into(), false), Value::U32(value) => ((value as u128).into(), false), Value::U64(value) => ((value as u128).into(), false), Value::I8(value) => signed_int_to_field!(value), + Value::I16(value) => signed_int_to_field!(value), Value::I32(value) => signed_int_to_field!(value), Value::I64(value) => signed_int_to_field!(value), Value::Bool(value) => { @@ -946,6 +1002,9 @@ impl<'a> Interpreter<'a> { Err(InterpreterError::TypeUnsupported { typ: cast.r#type, location }) } (Signedness::Unsigned, IntegerBitSize::Eight) => cast_to_int!(lhs, to_u128, u8, U8), + (Signedness::Unsigned, IntegerBitSize::Sixteen) => { + cast_to_int!(lhs, to_u128, u16, U16) + } (Signedness::Unsigned, IntegerBitSize::ThirtyTwo) => { cast_to_int!(lhs, to_u128, u32, U32) } @@ -957,6 +1016,9 @@ impl<'a> Interpreter<'a> { Err(InterpreterError::TypeUnsupported { typ: cast.r#type, location }) } (Signedness::Signed, IntegerBitSize::Eight) => cast_to_int!(lhs, to_i128, i8, I8), + (Signedness::Signed, IntegerBitSize::Sixteen) => { + cast_to_int!(lhs, to_i128, i16, I16) + } (Signedness::Signed, IntegerBitSize::ThirtyTwo) => { cast_to_int!(lhs, to_i128, i32, I32) } @@ -1149,9 +1211,11 @@ impl<'a> Interpreter<'a> { let get_index = |this: &mut Self, expr| -> IResult<(_, fn(_) -> _)> { match this.evaluate(expr)? { Value::I8(value) => Ok((value as i128, |i| Value::I8(i as i8))), + Value::I16(value) => Ok((value as i128, |i| Value::I16(i as i16))), Value::I32(value) => Ok((value as i128, |i| Value::I32(i as i32))), Value::I64(value) => Ok((value as i128, |i| Value::I64(i as i64))), Value::U8(value) => Ok((value as i128, |i| Value::U8(i as u8))), + Value::U16(value) => Ok((value as i128, |i| Value::U16(i as u16))), Value::U32(value) => Ok((value as i128, |i| Value::U32(i as u32))), Value::U64(value) => Ok((value as i128, |i| Value::U64(i as u64))), value => { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/scan.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/scan.rs index 7101a158ddb..cc6b9aa7e9c 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/scan.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/scan.rs @@ -65,7 +65,7 @@ impl<'interner> Interpreter<'interner> { fn scan_expression(&mut self, expr: ExprId) -> IResult<()> { match self.interner.expression(&expr) { - HirExpression::Ident(ident) => self.scan_ident(ident, expr), + HirExpression::Ident(ident, _) => self.scan_ident(ident, expr), HirExpression::Literal(literal) => self.scan_literal(literal), HirExpression::Block(block) => self.scan_block(block), HirExpression::Prefix(prefix) => self.scan_expression(prefix.rhs), diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/tests.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/tests.rs index 5a12eb7292c..41475d3ccf4 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/tests.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/tests.rs @@ -103,6 +103,19 @@ fn for_loop() { assert_eq!(result, Value::U8(15)); } +#[test] +fn for_loop_u16() { + let program = "fn main() -> pub u16 { + let mut x = 0; + for i in 0 .. 6 { + x += i; + } + x + }"; + let result = interpret(program, vec!["main".into()]); + assert_eq!(result, Value::U16(15)); +} + #[test] fn for_loop_with_break() { let program = "unconstrained fn main() -> pub u32 { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/value.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/value.rs index 6845c6ac5a9..3c8b6e92445 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/value.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/comptime/value.rs @@ -22,9 +22,11 @@ pub enum Value { Bool(bool), Field(FieldElement), I8(i8), + I16(i16), I32(i32), I64(i64), U8(u8), + U16(u16), U32(u32), U64(u64), String(Rc), @@ -45,9 +47,11 @@ impl Value { Value::Bool(_) => Type::Bool, Value::Field(_) => Type::FieldElement, Value::I8(_) => Type::Integer(Signedness::Signed, IntegerBitSize::Eight), + Value::I16(_) => Type::Integer(Signedness::Signed, IntegerBitSize::Sixteen), Value::I32(_) => Type::Integer(Signedness::Signed, IntegerBitSize::ThirtyTwo), Value::I64(_) => Type::Integer(Signedness::Signed, IntegerBitSize::SixtyFour), Value::U8(_) => Type::Integer(Signedness::Unsigned, IntegerBitSize::Eight), + Value::U16(_) => Type::Integer(Signedness::Unsigned, IntegerBitSize::Sixteen), Value::U32(_) => Type::Integer(Signedness::Unsigned, IntegerBitSize::ThirtyTwo), Value::U64(_) => Type::Integer(Signedness::Unsigned, IntegerBitSize::SixtyFour), Value::String(value) => { @@ -87,6 +91,12 @@ impl Value { let value = (value as u128).into(); HirExpression::Literal(HirLiteral::Integer(value, negative)) } + Value::I16(value) => { + let negative = value < 0; + let value = value.abs(); + let value = (value as u128).into(); + HirExpression::Literal(HirLiteral::Integer(value, negative)) + } Value::I32(value) => { let negative = value < 0; let value = value.abs(); @@ -102,6 +112,9 @@ impl Value { Value::U8(value) => { HirExpression::Literal(HirLiteral::Integer((value as u128).into(), false)) } + Value::U16(value) => { + HirExpression::Literal(HirLiteral::Integer((value as u128).into(), false)) + } Value::U32(value) => { HirExpression::Literal(HirLiteral::Integer((value as u128).into(), false)) } @@ -112,7 +125,7 @@ impl Value { Value::Function(id, _typ) => { let id = interner.function_definition_id(id); let impl_kind = ImplKind::NotATraitMethod; - HirExpression::Ident(HirIdent { location, id, impl_kind }) + HirExpression::Ident(HirIdent { location, id, impl_kind }, None) } Value::Closure(_lambda, _env, _typ) => { // TODO: How should a closure's environment be inlined? diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs index 2f6b101e62f..d2eaf79b0f0 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs @@ -1,5 +1,6 @@ use super::dc_mod::collect_defs; use super::errors::{DefCollectorErrorKind, DuplicateType}; +use crate::elaborator::Elaborator; use crate::graph::CrateId; use crate::hir::comptime::{Interpreter, InterpreterError}; use crate::hir::def_map::{CrateDefMap, LocalModuleId, ModuleId}; @@ -53,6 +54,10 @@ impl UnresolvedFunctions { self.functions.push((mod_id, func_id, func)); } + pub fn function_ids(&self) -> Vec { + vecmap(&self.functions, |(_, id, _)| *id) + } + pub fn resolve_trait_bounds_trait_ids( &mut self, def_maps: &BTreeMap, @@ -129,14 +134,18 @@ pub struct UnresolvedGlobal { /// Given a Crate root, collect all definitions in that crate pub struct DefCollector { pub(crate) def_map: CrateDefMap, - pub(crate) collected_imports: Vec, - pub(crate) collected_functions: Vec, - pub(crate) collected_types: BTreeMap, - pub(crate) collected_type_aliases: BTreeMap, - pub(crate) collected_traits: BTreeMap, - pub(crate) collected_globals: Vec, - pub(crate) collected_impls: ImplMap, - pub(crate) collected_traits_impls: Vec, + pub(crate) imports: Vec, + pub(crate) items: CollectedItems, +} + +pub struct CollectedItems { + pub(crate) functions: Vec, + pub(crate) types: BTreeMap, + pub(crate) type_aliases: BTreeMap, + pub(crate) traits: BTreeMap, + pub(crate) globals: Vec, + pub(crate) impls: ImplMap, + pub(crate) trait_impls: Vec, } /// Maps the type and the module id in which the impl is defined to the functions contained in that @@ -210,14 +219,16 @@ impl DefCollector { fn new(def_map: CrateDefMap) -> DefCollector { DefCollector { def_map, - collected_imports: vec![], - collected_functions: vec![], - collected_types: BTreeMap::new(), - collected_type_aliases: BTreeMap::new(), - collected_traits: BTreeMap::new(), - collected_impls: HashMap::new(), - collected_globals: vec![], - collected_traits_impls: vec![], + imports: vec![], + items: CollectedItems { + functions: vec![], + types: BTreeMap::new(), + type_aliases: BTreeMap::new(), + traits: BTreeMap::new(), + impls: HashMap::new(), + globals: vec![], + trait_impls: vec![], + }, } } @@ -229,6 +240,7 @@ impl DefCollector { context: &mut Context, ast: SortedModule, root_file_id: FileId, + use_elaborator: bool, macro_processors: &[&dyn MacroProcessor], ) -> Vec<(CompilationError, FileId)> { let mut errors: Vec<(CompilationError, FileId)> = vec![]; @@ -242,7 +254,12 @@ impl DefCollector { let crate_graph = &context.crate_graph[crate_id]; for dep in crate_graph.dependencies.clone() { - errors.extend(CrateDefMap::collect_defs(dep.crate_id, context, macro_processors)); + errors.extend(CrateDefMap::collect_defs( + dep.crate_id, + context, + use_elaborator, + macro_processors, + )); let dep_def_root = context.def_map(&dep.crate_id).expect("ice: def map was just created").root; @@ -275,18 +292,13 @@ impl DefCollector { // Add the current crate to the collection of DefMaps context.def_maps.insert(crate_id, def_collector.def_map); - inject_prelude(crate_id, context, crate_root, &mut def_collector.collected_imports); + inject_prelude(crate_id, context, crate_root, &mut def_collector.imports); for submodule in submodules { - inject_prelude( - crate_id, - context, - LocalModuleId(submodule), - &mut def_collector.collected_imports, - ); + inject_prelude(crate_id, context, LocalModuleId(submodule), &mut def_collector.imports); } // Resolve unresolved imports collected from the crate, one by one. - for collected_import in def_collector.collected_imports { + for collected_import in std::mem::take(&mut def_collector.imports) { match resolve_import(crate_id, &collected_import, &context.def_maps) { Ok(resolved_import) => { if let Some(error) = resolved_import.error { @@ -323,6 +335,12 @@ impl DefCollector { } } + if use_elaborator { + let mut more_errors = Elaborator::elaborate(context, crate_id, def_collector.items); + more_errors.append(&mut errors); + return errors; + } + let mut resolved_module = ResolvedModule { errors, ..Default::default() }; // We must first resolve and intern the globals before we can resolve any stmts inside each function. @@ -330,26 +348,25 @@ impl DefCollector { // // Additionally, we must resolve integer globals before structs since structs may refer to // the values of integer globals as numeric generics. - let (literal_globals, other_globals) = - filter_literal_globals(def_collector.collected_globals); + let (literal_globals, other_globals) = filter_literal_globals(def_collector.items.globals); resolved_module.resolve_globals(context, literal_globals, crate_id); resolved_module.errors.extend(resolve_type_aliases( context, - def_collector.collected_type_aliases, + def_collector.items.type_aliases, crate_id, )); resolved_module.errors.extend(resolve_traits( context, - def_collector.collected_traits, + def_collector.items.traits, crate_id, )); // Must resolve structs before we resolve globals. resolved_module.errors.extend(resolve_structs( context, - def_collector.collected_types, + def_collector.items.types, crate_id, )); @@ -358,7 +375,7 @@ impl DefCollector { resolved_module.errors.extend(collect_trait_impls( context, crate_id, - &mut def_collector.collected_traits_impls, + &mut def_collector.items.trait_impls, )); // Before we resolve any function symbols we must go through our impls and @@ -368,11 +385,7 @@ impl DefCollector { // // These are resolved after trait impls so that struct methods are chosen // over trait methods if there are name conflicts. - resolved_module.errors.extend(collect_impls( - context, - crate_id, - &def_collector.collected_impls, - )); + resolved_module.errors.extend(collect_impls(context, crate_id, &def_collector.items.impls)); // We must wait to resolve non-integer globals until after we resolve structs since struct // globals will need to reference the struct type they're initialized to to ensure they are valid. @@ -383,7 +396,7 @@ impl DefCollector { &mut context.def_interner, crate_id, &context.def_maps, - def_collector.collected_functions, + def_collector.items.functions, None, &mut resolved_module.errors, ); @@ -392,13 +405,13 @@ impl DefCollector { &mut context.def_interner, crate_id, &context.def_maps, - def_collector.collected_impls, + def_collector.items.impls, &mut resolved_module.errors, )); resolved_module.trait_impl_functions = resolve_trait_impls( context, - def_collector.collected_traits_impls, + def_collector.items.trait_impls, crate_id, &mut resolved_module.errors, ); @@ -431,15 +444,18 @@ fn inject_prelude( crate_root: LocalModuleId, collected_imports: &mut Vec, ) { - let segments: Vec<_> = "std::prelude" - .split("::") - .map(|segment| crate::ast::Ident::new(segment.into(), Span::default())) - .collect(); + if !crate_id.is_stdlib() { + let segments: Vec<_> = "std::prelude" + .split("::") + .map(|segment| crate::ast::Ident::new(segment.into(), Span::default())) + .collect(); - let path = - Path { segments: segments.clone(), kind: crate::ast::PathKind::Dep, span: Span::default() }; + let path = Path { + segments: segments.clone(), + kind: crate::ast::PathKind::Dep, + span: Span::default(), + }; - if !crate_id.is_stdlib() { if let Ok(PathResolution { module_def_id, error }) = path_resolver::resolve_path( &context.def_maps, ModuleId { krate: crate_id, local_id: crate_root }, diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs index b2ec7dbc813..3d0ffdb0155 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs @@ -70,7 +70,7 @@ pub fn collect_defs( // Then add the imports to defCollector to resolve once all modules in the hierarchy have been resolved for import in ast.imports { - collector.def_collector.collected_imports.push(ImportDirective { + collector.def_collector.imports.push(ImportDirective { module_id: collector.module_id, path: import.path, alias: import.alias, @@ -126,7 +126,7 @@ impl<'a> ModCollector<'a> { errors.push((err.into(), self.file_id)); } - self.def_collector.collected_globals.push(UnresolvedGlobal { + self.def_collector.items.globals.push(UnresolvedGlobal { file_id: self.file_id, module_id: self.module_id, global_id, @@ -154,7 +154,7 @@ impl<'a> ModCollector<'a> { } let key = (r#impl.object_type, self.module_id); - let methods = self.def_collector.collected_impls.entry(key).or_default(); + let methods = self.def_collector.items.impls.entry(key).or_default(); methods.push((r#impl.generics, r#impl.type_span, unresolved_functions)); } } @@ -191,7 +191,7 @@ impl<'a> ModCollector<'a> { trait_generics: trait_impl.trait_generics, }; - self.def_collector.collected_traits_impls.push(unresolved_trait_impl); + self.def_collector.items.trait_impls.push(unresolved_trait_impl); } } @@ -269,7 +269,7 @@ impl<'a> ModCollector<'a> { } } - self.def_collector.collected_functions.push(unresolved_functions); + self.def_collector.items.functions.push(unresolved_functions); errors } @@ -316,7 +316,7 @@ impl<'a> ModCollector<'a> { } // And store the TypeId -> StructType mapping somewhere it is reachable - self.def_collector.collected_types.insert(id, unresolved); + self.def_collector.items.types.insert(id, unresolved); } definition_errors } @@ -354,7 +354,7 @@ impl<'a> ModCollector<'a> { errors.push((err.into(), self.file_id)); } - self.def_collector.collected_type_aliases.insert(type_alias_id, unresolved); + self.def_collector.items.type_aliases.insert(type_alias_id, unresolved); } errors } @@ -420,6 +420,7 @@ impl<'a> ModCollector<'a> { // TODO(Maddiaa): Investigate trait implementations with attributes see: https://github.com/noir-lang/noir/issues/2629 attributes: crate::token::Attributes::empty(), is_unconstrained: false, + generic_count: generics.len(), is_comptime: false, }; @@ -506,7 +507,7 @@ impl<'a> ModCollector<'a> { method_ids, fns_with_default_impl: unresolved_functions, }; - self.def_collector.collected_traits.insert(trait_id, unresolved); + self.def_collector.items.traits.insert(trait_id, unresolved); } errors } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs index 590c2e3d6b6..19e06387d43 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs @@ -73,6 +73,7 @@ impl CrateDefMap { pub fn collect_defs( crate_id: CrateId, context: &mut Context, + use_elaborator: bool, macro_processors: &[&dyn MacroProcessor], ) -> Vec<(CompilationError, FileId)> { // Check if this Crate has already been compiled @@ -116,7 +117,14 @@ impl CrateDefMap { }; // Now we want to populate the CrateDefMap using the DefCollector - errors.extend(DefCollector::collect(def_map, context, ast, root_file_id, macro_processors)); + errors.extend(DefCollector::collect( + def_map, + context, + ast, + root_file_id, + use_elaborator, + macro_processors, + )); errors.extend( parsing_errors.iter().map(|e| (e.clone().into(), root_file_id)).collect::>(), diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs index 8850331f683..343113836ed 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs @@ -2,11 +2,14 @@ use noirc_errors::{CustomDiagnostic, Span}; use thiserror::Error; use crate::graph::CrateId; +use crate::hir::def_collector::dc_crate::CompilationError; use std::collections::BTreeMap; use crate::ast::{Ident, ItemVisibility, Path, PathKind}; use crate::hir::def_map::{CrateDefMap, LocalModuleId, ModuleDefId, ModuleId, PerNs}; +use super::errors::ResolverError; + #[derive(Debug, Clone)] pub struct ImportDirective { pub module_id: LocalModuleId, @@ -53,6 +56,12 @@ pub struct ResolvedImport { pub error: Option, } +impl From for CompilationError { + fn from(error: PathResolutionError) -> Self { + Self::ResolverError(ResolverError::PathResolutionError(error)) + } +} + impl<'a> From<&'a PathResolutionError> for CustomDiagnostic { fn from(error: &'a PathResolutionError) -> Self { match &error { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs index 60baaecab59..1f006697359 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs @@ -56,17 +56,17 @@ use crate::hir_def::{ use super::errors::{PubPosition, ResolverError}; use super::import::PathResolution; -const SELF_TYPE_NAME: &str = "Self"; +pub const SELF_TYPE_NAME: &str = "Self"; type Scope = GenericScope; type ScopeTree = GenericScopeTree; type ScopeForest = GenericScopeForest; pub struct LambdaContext { - captures: Vec, + pub captures: Vec, /// the index in the scope tree /// (sometimes being filled by ScopeTree's find method) - scope_index: usize, + pub scope_index: usize, } /// The primary jobs of the Resolver are to validate that every variable found refers to exactly 1 @@ -1345,7 +1345,7 @@ impl<'a> Resolver<'a> { range @ ForRange::Array(_) => { let for_stmt = range.into_for(for_loop.identifier, for_loop.block, for_loop.span); - self.resolve_stmt(for_stmt, for_loop.span) + self.resolve_stmt(for_stmt.kind, for_loop.span) } } } @@ -1361,7 +1361,7 @@ impl<'a> Resolver<'a> { StatementKind::Comptime(statement) => { let hir_statement = self.resolve_stmt(statement.kind, statement.span); let statement_id = self.interner.push_stmt(hir_statement); - self.interner.push_statement_location(statement_id, statement.span, self.file); + self.interner.push_stmt_location(statement_id, statement.span, self.file); HirStatement::Comptime(statement_id) } } @@ -1370,7 +1370,7 @@ impl<'a> Resolver<'a> { pub fn intern_stmt(&mut self, stmt: Statement) -> StmtId { let hir_stmt = self.resolve_stmt(stmt.kind, stmt.span); let id = self.interner.push_stmt(hir_stmt); - self.interner.push_statement_location(id, stmt.span, self.file); + self.interner.push_stmt_location(id, stmt.span, self.file); id } @@ -1475,14 +1475,20 @@ impl<'a> Resolver<'a> { Literal::FmtStr(str) => self.resolve_fmt_str_literal(str, expr.span), Literal::Unit => HirLiteral::Unit, }), - ExpressionKind::Variable(path) => { + ExpressionKind::Variable(path, generics) => { + let generics = + generics.map(|generics| vecmap(generics, |typ| self.resolve_type(typ))); + if let Some((method, constraint, assumed)) = self.resolve_trait_generic_path(&path) { - HirExpression::Ident(HirIdent { - location: Location::new(expr.span, self.file), - id: self.interner.trait_method_id(method), - impl_kind: ImplKind::TraitMethod(method, constraint, assumed), - }) + HirExpression::Ident( + HirIdent { + location: Location::new(expr.span, self.file), + id: self.interner.trait_method_id(method), + impl_kind: ImplKind::TraitMethod(method, constraint, assumed), + }, + generics, + ) } else { // If the Path is being used as an Expression, then it is referring to a global from a separate module // Otherwise, then it is referring to an Identifier @@ -1519,7 +1525,7 @@ impl<'a> Resolver<'a> { } } - HirExpression::Ident(hir_ident) + HirExpression::Ident(hir_ident, generics) } } ExpressionKind::Prefix(prefix) => { @@ -1557,12 +1563,20 @@ impl<'a> Resolver<'a> { ExpressionKind::MethodCall(call_expr) => { let method = call_expr.method_name; let object = self.resolve_expression(call_expr.object); + + // Cannot verify the generic count here equals the expected count since we don't + // know which definition `method` refers to until it is resolved during type checking. + let generics = call_expr + .generics + .map(|generics| vecmap(generics, |typ| self.resolve_type(typ))); + let arguments = vecmap(call_expr.arguments, |arg| self.resolve_expression(arg)); let location = Location::new(expr.span, self.file); HirExpression::MethodCall(HirMethodCallExpression { - arguments, method, object, + generics, + arguments, location, }) } @@ -2038,7 +2052,7 @@ impl<'a> Resolver<'a> { HirExpression::Literal(HirLiteral::Integer(int, false)) => { int.try_into_u128().ok_or(Some(ResolverError::IntegerTooLarge { span })) } - HirExpression::Ident(ident) => { + HirExpression::Ident(ident, _) => { let definition = self.interner.definition(ident.id); match definition.kind { DefinitionKind::Global(global_id) => { @@ -2092,7 +2106,7 @@ impl<'a> Resolver<'a> { let variable = scope_tree.find(ident_name); if let Some((old_value, _)) = variable { old_value.num_times_used += 1; - let ident = HirExpression::Ident(old_value.ident.clone()); + let ident = HirExpression::Ident(old_value.ident.clone(), None); let expr_id = self.interner.push_expr(ident); self.interner.push_expr_location(expr_id, call_expr_span, self.file); fmt_str_idents.push(expr_id); @@ -2132,7 +2146,7 @@ pub fn verify_mutable_reference(interner: &NodeInterner, rhs: ExprId) -> Result< let span = interner.expr_span(&rhs); Err(ResolverError::MutableReferenceToArrayElement { span }) } - HirExpression::Ident(ident) => { + HirExpression::Ident(ident, _) => { if let Some(definition) = interner.try_definition(ident.id) { if !definition.mutable { return Err(ResolverError::MutableReferenceToImmutableVariable { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs index b81727a27f5..549d8138f1d 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs @@ -115,6 +115,10 @@ pub enum TypeCheckError { NoMatchingImplFound { constraints: Vec<(Type, String)>, span: Span }, #[error("Constraint for `{typ}: {trait_name}` is not needed, another matching impl is already in scope")] UnneededTraitConstraint { trait_name: String, typ: Type, span: Span }, + #[error( + "Expected {expected_count} generic(s) from this function, but {actual_count} were provided" + )] + IncorrectTurbofishGenericCount { expected_count: usize, actual_count: usize, span: Span }, #[error( "Cannot pass a mutable reference from a constrained runtime to an unconstrained runtime" )] @@ -325,6 +329,12 @@ impl<'a> From<&'a TypeCheckError> for Diagnostic { "`{trait_name}::{method_name}` expects {expected_num_parameters} parameter{plural}, but this method has {actual_num_parameters}"); Diagnostic::simple_error(primary_message, "".to_string(), *span) } + TypeCheckError::IncorrectTurbofishGenericCount { expected_count, actual_count, span } => { + let expected_plural = if *expected_count == 1 { "" } else { "s" }; + let actual_plural = if *actual_count == 1 { "was" } else { "were" }; + let msg = format!("Expected {expected_count} generic{expected_plural} from this function, but {actual_count} {actual_plural} provided"); + Diagnostic::simple_error(msg, "".into(), *span) + }, } } } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs index 9b40c959981..abff466e1d5 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs @@ -20,7 +20,7 @@ use super::{errors::TypeCheckError, TypeChecker}; impl<'interner> TypeChecker<'interner> { fn check_if_deprecated(&mut self, expr: &ExprId) { - if let HirExpression::Ident(expr::HirIdent { location, id, impl_kind: _ }) = + if let HirExpression::Ident(expr::HirIdent { location, id, impl_kind: _ }, _) = self.interner.expression(expr) { if let Some(DefinitionKind::Function(func_id)) = @@ -39,7 +39,7 @@ impl<'interner> TypeChecker<'interner> { } fn is_unconstrained_call(&self, expr: &ExprId) -> bool { - if let HirExpression::Ident(expr::HirIdent { id, .. }) = self.interner.expression(expr) { + if let HirExpression::Ident(expr::HirIdent { id, .. }, _) = self.interner.expression(expr) { if let Some(DefinitionKind::Function(func_id)) = self.interner.try_definition(id).map(|def| &def.kind) { @@ -103,7 +103,7 @@ impl<'interner> TypeChecker<'interner> { /// function `foo` to refer to. pub(crate) fn check_expression(&mut self, expr_id: &ExprId) -> Type { let typ = match self.interner.expression(expr_id) { - HirExpression::Ident(ident) => self.check_ident(ident, expr_id), + HirExpression::Ident(ident, generics) => self.check_ident(ident, expr_id, generics), HirExpression::Literal(literal) => match literal { HirLiteral::Array(hir_array_literal) => { let (length, elem_type) = self.check_hir_array_literal(hir_array_literal); @@ -236,28 +236,38 @@ impl<'interner> TypeChecker<'interner> { // Automatically add `&mut` if the method expects a mutable reference and // the object is not already one. - if let HirMethodReference::FuncId(func_id) = &method_ref { - if *func_id != FuncId::dummy_id() { - let function_type = - self.interner.function_meta(func_id).typ.clone(); - - self.try_add_mutable_reference_to_object( - &mut method_call, - &function_type, - &mut object_type, - ); + let func_id = match &method_ref { + HirMethodReference::FuncId(func_id) => *func_id, + HirMethodReference::TraitMethodId(method_id, _) => { + let id = self.interner.trait_method_id(*method_id); + let definition = self.interner.definition(id); + let DefinitionKind::Function(func_id) = definition.kind else { + unreachable!( + "Expected trait function to be a DefinitionKind::Function" + ) + }; + func_id } + }; + + if func_id != FuncId::dummy_id() { + let function_type = self.interner.function_meta(&func_id).typ.clone(); + self.try_add_mutable_reference_to_object( + &mut method_call, + &function_type, + &mut object_type, + ); } // TODO: update object_type here? - let function_call = method_call.into_function_call( + let (_, function_call) = method_call.into_function_call( &method_ref, object_type, location, self.interner, ); - self.interner.replace_expr(expr_id, function_call); + self.interner.replace_expr(expr_id, HirExpression::Call(function_call)); // Type check the new call now that it has been changed from a method call // to a function call. This way we avoid duplicating code. @@ -349,7 +359,12 @@ impl<'interner> TypeChecker<'interner> { } /// Returns the type of the given identifier - fn check_ident(&mut self, ident: HirIdent, expr_id: &ExprId) -> Type { + fn check_ident( + &mut self, + ident: HirIdent, + expr_id: &ExprId, + generics: Option>, + ) -> Type { let mut bindings = TypeBindings::new(); // Add type bindings from any constraints that were used. @@ -374,10 +389,20 @@ impl<'interner> TypeChecker<'interner> { // variable to handle generic functions. let t = self.interner.id_type_substitute_trait_as_type(ident.id); + let span = self.interner.expr_span(expr_id); + + let definition = self.interner.try_definition(ident.id); + let function_generic_count = definition.map_or(0, |definition| match &definition.kind { + DefinitionKind::Function(function) => { + self.interner.function_modifiers(function).generic_count + } + _ => 0, + }); + // This instantiates a trait's generics as well which need to be set // when the constraint below is later solved for when the function is // finished. How to link the two? - let (typ, bindings) = t.instantiate_with_bindings(bindings, self.interner); + let (typ, bindings) = self.instantiate(t, bindings, generics, function_generic_count, span); // Push any trait constraints required by this definition to the context // to be checked later when the type of this variable is further constrained. @@ -412,6 +437,37 @@ impl<'interner> TypeChecker<'interner> { typ } + fn instantiate( + &mut self, + typ: Type, + bindings: TypeBindings, + turbofish_generics: Option>, + function_generic_count: usize, + span: Span, + ) -> (Type, TypeBindings) { + match turbofish_generics { + Some(turbofish_generics) => { + if turbofish_generics.len() != function_generic_count { + self.errors.push(TypeCheckError::IncorrectTurbofishGenericCount { + expected_count: function_generic_count, + actual_count: turbofish_generics.len(), + span, + }); + typ.instantiate_with_bindings(bindings, self.interner) + } else { + // Fetch the count of any implicit generics on the function, such as + // for a method within a generic impl. + let implicit_generic_count = match &typ { + Type::Forall(generics, _) => generics.len() - function_generic_count, + _ => 0, + }; + typ.instantiate_with(turbofish_generics, self.interner, implicit_generic_count) + } + } + None => typ.instantiate_with_bindings(bindings, self.interner), + } + } + pub fn verify_trait_constraint( &mut self, object_type: &Type, @@ -521,7 +577,7 @@ impl<'interner> TypeChecker<'interner> { /// Insert as many dereference operations as necessary to automatically dereference a method /// call object to its base value type T. - fn insert_auto_dereferences(&mut self, object: ExprId, typ: Type) -> (ExprId, Type) { + pub(crate) fn insert_auto_dereferences(&mut self, object: ExprId, typ: Type) -> (ExprId, Type) { if let Type::MutableReference(element) = typ { let location = self.interner.id_location(object); diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs index 0f8131d6ebb..b2a76828c88 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs @@ -25,7 +25,7 @@ use crate::{ Type, TypeBindings, }; -use self::errors::Source; +pub use self::errors::Source; pub struct TypeChecker<'interner> { interner: &'interner mut NodeInterner, @@ -89,7 +89,6 @@ pub fn type_check_func(interner: &mut NodeInterner, func_id: FuncId) -> Vec Vec>), Literal(HirLiteral), Block(HirBlockExpression), Prefix(HirPrefixExpression), @@ -181,6 +183,8 @@ pub struct HirCallExpression { pub struct HirMethodCallExpression { pub method: Ident, pub object: ExprId, + /// Method calls have an optional list of generics provided by the turbofish operator + pub generics: Option>, pub arguments: Vec, pub location: Location, } @@ -200,13 +204,15 @@ pub enum HirMethodReference { impl HirMethodCallExpression { /// Converts a method call into a function call + /// + /// Returns ((func_var_id, func_var), call_expr) pub fn into_function_call( mut self, method: &HirMethodReference, object_type: Type, location: Location, interner: &mut NodeInterner, - ) -> HirExpression { + ) -> ((ExprId, HirIdent), HirCallExpression) { let mut arguments = vec![self.object]; arguments.append(&mut self.arguments); @@ -224,10 +230,11 @@ impl HirMethodCallExpression { (id, ImplKind::TraitMethod(*method_id, constraint, false)) } }; - let func = HirExpression::Ident(HirIdent { location, id, impl_kind }); - let func = interner.push_expr(func); + let func_var = HirIdent { location, id, impl_kind }; + let func = interner.push_expr(HirExpression::Ident(func_var.clone(), self.generics)); interner.push_expr_location(func, location.span, location.file); - HirExpression::Call(HirCallExpression { func, arguments, location }) + let expr = HirCallExpression { func, arguments, location }; + ((func, func_var), expr) } } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs index c38dd41fd3d..ceec9ad8580 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs @@ -135,10 +135,7 @@ impl FuncMeta { /// So this method tells the type checker to ignore the return /// of the empty function, which is unit pub fn can_ignore_return_type(&self) -> bool { - match self.kind { - FunctionKind::LowLevel | FunctionKind::Builtin | FunctionKind::Oracle => true, - FunctionKind::Normal | FunctionKind::Recursive => false, - } + self.kind.can_ignore_return_type() } pub fn function_signature(&self) -> FunctionSignature { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs index f3b2a24c1f0..cf9aafbb308 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs @@ -1423,14 +1423,14 @@ impl Type { /// Retrieves the type of the given field name /// Panics if the type is not a struct or tuple. - pub fn get_field_type(&self, field_name: &str) -> Type { + pub fn get_field_type(&self, field_name: &str) -> Option { match self { - Type::Struct(def, args) => def.borrow().get_field(field_name, args).unwrap().0, + Type::Struct(def, args) => def.borrow().get_field(field_name, args).map(|(typ, _)| typ), Type::Tuple(fields) => { let mut fields = fields.iter().enumerate(); - fields.find(|(i, _)| i.to_string() == *field_name).unwrap().1.clone() + fields.find(|(i, _)| i.to_string() == *field_name).map(|(_, typ)| typ).cloned() } - other => panic!("Tried to iterate over the fields of '{other}', which has none"), + _ => None, } } @@ -1478,6 +1478,43 @@ impl Type { } } + /// Instantiates a type with the given types. + /// This differs from substitute in that only the quantified type variables + /// are matched against the type list and are eligible for substitution - similar + /// to normal instantiation. This function is used when the turbofish operator + /// is used and generic substitutions are provided manually by users. + /// + /// Expects the given type vector to be the same length as the Forall type variables. + pub fn instantiate_with( + &self, + types: Vec, + interner: &NodeInterner, + implicit_generic_count: usize, + ) -> (Type, TypeBindings) { + match self { + Type::Forall(typevars, typ) => { + assert_eq!(types.len() + implicit_generic_count, typevars.len(), "Turbofish operator used with incorrect generic count which was not caught by name resolution"); + + let replacements = typevars + .iter() + .enumerate() + .map(|(i, var)| { + let binding = if i < implicit_generic_count { + interner.next_type_variable() + } else { + types[i - implicit_generic_count].clone() + }; + (var.id(), (var.clone(), binding)) + }) + .collect(); + + let instantiated = typ.substitute(&replacements); + (instantiated, replacements) + } + other => (other.clone(), HashMap::new()), + } + } + /// Substitute any type variables found within this type with the /// given bindings if found. If a type variable is not found within /// the given TypeBindings, it is unchanged. @@ -1727,7 +1764,7 @@ fn convert_array_expression_to_slice( let as_slice_id = interner.function_definition_id(as_slice_method); let location = interner.expr_location(&expression); - let as_slice = HirExpression::Ident(HirIdent::non_trait_method(as_slice_id, location)); + let as_slice = HirExpression::Ident(HirIdent::non_trait_method(as_slice_id, location), None); let func = interner.push_expr(as_slice); // Copy the expression and give it a new ExprId. The old one diff --git a/noir/noir-repo/compiler/noirc_frontend/src/lib.rs b/noir/noir-repo/compiler/noirc_frontend/src/lib.rs index 958a18ac2fb..b05c635f436 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/lib.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/lib.rs @@ -12,6 +12,7 @@ pub mod ast; pub mod debug; +pub mod elaborator; pub mod graph; pub mod lexer; pub mod monomorphization; diff --git a/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs index f918610af2c..9a20d0dd537 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs @@ -393,7 +393,7 @@ impl<'interner> Monomorphizer<'interner> { use ast::Literal::*; let expr = match self.interner.expression(&expr) { - HirExpression::Ident(ident) => self.ident(ident, expr)?, + HirExpression::Ident(ident, _) => self.ident(ident, expr)?, HirExpression::Literal(HirLiteral::Str(contents)) => Literal(Str(contents)), HirExpression::Literal(HirLiteral::FmtStr(contents, idents)) => { let fields = try_vecmap(idents, |ident| self.expr(ident))?; @@ -1172,7 +1172,7 @@ impl<'interner> Monomorphizer<'interner> { arguments: &mut Vec, ) { match hir_argument { - HirExpression::Ident(ident) => { + HirExpression::Ident(ident, _) => { let typ = self.interner.definition_type(ident.id); let typ: Type = typ.follow_bindings(); let is_fmt_str = match typ { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs b/noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs index 88adc7a9414..7f1b67abfbd 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs @@ -244,6 +244,8 @@ pub struct FunctionModifiers { pub is_unconstrained: bool, + pub generic_count: usize, + pub is_comptime: bool, } @@ -257,6 +259,7 @@ impl FunctionModifiers { visibility: ItemVisibility::Public, attributes: Attributes::empty(), is_unconstrained: false, + generic_count: 0, is_comptime: false, } } @@ -532,7 +535,7 @@ impl NodeInterner { self.id_to_type.insert(expr_id.into(), typ); } - /// Store the type for an interned expression + /// Store the type for a definition pub fn push_definition_type(&mut self, definition_id: DefinitionId, typ: Type) { self.definition_to_type.insert(definition_id, typ); } @@ -696,7 +699,7 @@ impl NodeInterner { let statement = self.push_stmt(HirStatement::Error); let span = name.span(); let id = self.push_global(name, local_id, statement, file, attributes, mutable); - self.push_statement_location(statement, span, file); + self.push_stmt_location(statement, span, file); id } @@ -775,6 +778,7 @@ impl NodeInterner { visibility: function.visibility, attributes: function.attributes.clone(), is_unconstrained: function.is_unconstrained, + generic_count: function.generics.len(), is_comptime: function.is_comptime, }; self.push_function_definition(id, modifiers, module, location) @@ -942,7 +946,7 @@ impl NodeInterner { self.id_location(stmt_id) } - pub fn push_statement_location(&mut self, id: StmtId, span: Span, file: FileId) { + pub fn push_stmt_location(&mut self, id: StmtId, span: Span, file: FileId) { self.id_to_location.insert(id.into(), Location::new(span, file)); } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs index b627714d2a6..890ab795e00 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs @@ -35,7 +35,7 @@ use super::{spanned, Item, ItemKind}; use crate::ast::{ BinaryOp, BinaryOpKind, BlockExpression, ForLoopStatement, ForRange, Ident, IfExpression, InfixExpression, LValue, Literal, ModuleDeclaration, NoirTypeAlias, Param, Path, Pattern, - Recoverable, Statement, TraitBound, TypeImpl, UnresolvedTraitConstraint, + Recoverable, Statement, TraitBound, TypeImpl, UnaryRhsMemberAccess, UnresolvedTraitConstraint, UnresolvedTypeExpression, UseTree, UseTreeKind, Visibility, }; use crate::ast::{ @@ -676,9 +676,9 @@ fn parse_type<'a>() -> impl NoirParser + 'a { recursive(parse_type_inner) } -fn parse_type_inner( - recursive_type_parser: impl NoirParser, -) -> impl NoirParser { +fn parse_type_inner<'a>( + recursive_type_parser: impl NoirParser + 'a, +) -> impl NoirParser + 'a { choice(( field_type(), int_type(), @@ -751,9 +751,9 @@ fn string_type() -> impl NoirParser { .map_with_span(|expr, span| UnresolvedTypeData::String(expr).with_span(span)) } -fn format_string_type( - type_parser: impl NoirParser, -) -> impl NoirParser { +fn format_string_type<'a>( + type_parser: impl NoirParser + 'a, +) -> impl NoirParser + 'a { keyword(Keyword::FormatString) .ignore_then( type_expression() @@ -783,22 +783,27 @@ fn int_type() -> impl NoirParser { }) } -fn named_type(type_parser: impl NoirParser) -> impl NoirParser { +fn named_type<'a>( + type_parser: impl NoirParser + 'a, +) -> impl NoirParser + 'a { path().then(generic_type_args(type_parser)).map_with_span(|(path, args), span| { UnresolvedTypeData::Named(path, args, false).with_span(span) }) } -fn named_trait(type_parser: impl NoirParser) -> impl NoirParser { +fn named_trait<'a>( + type_parser: impl NoirParser + 'a, +) -> impl NoirParser + 'a { keyword(Keyword::Impl).ignore_then(path()).then(generic_type_args(type_parser)).map_with_span( |(path, args), span| UnresolvedTypeData::TraitAsType(path, args).with_span(span), ) } -fn generic_type_args( - type_parser: impl NoirParser, -) -> impl NoirParser> { +fn generic_type_args<'a>( + type_parser: impl NoirParser + 'a, +) -> impl NoirParser> + 'a { type_parser + .clone() // Without checking for a terminating ',' or '>' here we may incorrectly // parse a generic `N * 2` as just the type `N` then fail when there is no // separator afterward. Failing early here ensures we try the `type_expression` @@ -814,7 +819,9 @@ fn generic_type_args( .map(Option::unwrap_or_default) } -fn array_type(type_parser: impl NoirParser) -> impl NoirParser { +fn array_type<'a>( + type_parser: impl NoirParser + 'a, +) -> impl NoirParser + 'a { just(Token::LeftBracket) .ignore_then(type_parser) .then(just(Token::Semicolon).ignore_then(type_expression())) @@ -1037,6 +1044,7 @@ where expr_no_constructors, statement, allow_constructors, + parse_type(), )) }) } @@ -1057,6 +1065,7 @@ fn atom_or_right_unary<'a, P, P2, S>( expr_no_constructors: P2, statement: S, allow_constructors: bool, + type_parser: impl NoirParser + 'a, ) -> impl NoirParser + 'a where P: ExprParser + 'a, @@ -1067,7 +1076,7 @@ where Call(Vec), ArrayIndex(Expression), Cast(UnresolvedType), - MemberAccess((Ident, Option>)), + MemberAccess(UnaryRhsMemberAccess), } // `(arg1, ..., argN)` in `my_func(arg1, ..., argN)` @@ -1081,14 +1090,17 @@ where // `as Type` in `atom as Type` let cast_rhs = keyword(Keyword::As) - .ignore_then(parse_type()) + .ignore_then(type_parser.clone()) .map(UnaryRhs::Cast) .labelled(ParsingRuleLabel::Cast); + // A turbofish operator is optional in a method call to specify generic types + let turbofish = primitives::turbofish(type_parser); + // `.foo` or `.foo(args)` in `atom.foo` or `atom.foo(args)` let member_rhs = just(Token::Dot) .ignore_then(field_name()) - .then(parenthesized(expression_list(expr_parser.clone())).or_not()) + .then(turbofish.then(parenthesized(expression_list(expr_parser.clone()))).or_not()) .map(UnaryRhs::MemberAccess) .labelled(ParsingRuleLabel::FieldAccess); @@ -1277,7 +1289,7 @@ fn type_expression_atom<'a, P>(expr_parser: P) -> impl NoirParser + where P: ExprParser + 'a, { - variable() + primitives::variable_no_turbofish() .or(literal()) .map_with_span(Expression::new) .or(parenthesized(expr_parser)) @@ -1367,22 +1379,19 @@ mod test { #[test] fn parse_cast() { + let expression_nc = expression_no_constructors(expression()); parse_all( atom_or_right_unary( expression(), expression_no_constructors(expression()), fresh_statement(), true, + parse_type(), ), - vec!["x as u8", "0 as Field", "(x + 3) as [Field; 8]"], + vec!["x as u8", "x as u16", "0 as Field", "(x + 3) as [Field; 8]"], ); parse_all_failing( - atom_or_right_unary( - expression(), - expression_no_constructors(expression()), - fresh_statement(), - true, - ), + atom_or_right_unary(expression(), expression_nc, fresh_statement(), true, parse_type()), vec!["x as pub u8"], ); } @@ -1402,6 +1411,7 @@ mod test { expression_no_constructors(expression()), fresh_statement(), true, + parse_type(), ), valid, ); @@ -1546,7 +1556,10 @@ mod test { // Let statements are not type checked here, so the parser will accept as // long as it is a type. Other statements such as Public are type checked // Because for now, they can only have one type - parse_all(declaration(expression()), vec!["let _ = 42", "let x = y", "let x : u8 = y"]); + parse_all( + declaration(expression()), + vec!["let _ = 42", "let x = y", "let x : u8 = y", "let x: u16 = y"], + ); } #[test] diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs index 8413f14ae4d..9da19c0a185 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs @@ -1,6 +1,7 @@ use chumsky::prelude::*; use crate::ast::{ExpressionKind, Ident, UnaryOp}; +use crate::macros_api::UnresolvedType; use crate::{ parser::{labels::ParsingRuleLabel, ExprParser, NoirParser, ParserError}, token::{Keyword, Token, TokenKind}, @@ -77,8 +78,20 @@ where .map(|rhs| ExpressionKind::prefix(UnaryOp::Dereference { implicitly_added: false }, rhs)) } +pub(super) fn turbofish<'a>( + type_parser: impl NoirParser + 'a, +) -> impl NoirParser>> + 'a { + just(Token::DoubleColon).ignore_then(super::generic_type_args(type_parser)).or_not() +} + pub(super) fn variable() -> impl NoirParser { - path().map(ExpressionKind::Variable) + path() + .then(turbofish(super::parse_type())) + .map(|(path, generics)| ExpressionKind::Variable(path, generics)) +} + +pub(super) fn variable_no_turbofish() -> impl NoirParser { + path().map(|path| ExpressionKind::Variable(path, None)) } #[cfg(test)] diff --git a/noir/noir-repo/compiler/noirc_frontend/src/resolve_locations.rs b/noir/noir-repo/compiler/noirc_frontend/src/resolve_locations.rs index ac8c96a092e..2fa7c8adbf8 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/resolve_locations.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/resolve_locations.rs @@ -97,7 +97,7 @@ impl NodeInterner { return_type_location_instead: bool, ) -> Option { match expression { - HirExpression::Ident(ident) => { + HirExpression::Ident(ident, _) => { let definition_info = self.definition(ident.id); match definition_info.kind { DefinitionKind::Function(func_id) => { diff --git a/noir/noir-repo/compiler/noirc_frontend/src/tests.rs b/noir/noir-repo/compiler/noirc_frontend/src/tests.rs index 5f99e9e347a..7bf5655486b 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/tests.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/tests.rs @@ -1,1236 +1,1215 @@ +#![cfg(test)] + +#[cfg(test)] +mod name_shadowing; + // XXX: These tests repeat a lot of code // what we should do is have test cases which are passed to a test harness // A test harness will allow for more expressive and readable tests -#[cfg(test)] -mod test { - - use core::panic; - use std::collections::BTreeMap; - - use fm::FileId; - - use iter_extended::vecmap; - use noirc_errors::Location; - - use crate::hir::def_collector::dc_crate::CompilationError; - use crate::hir::def_collector::errors::{DefCollectorErrorKind, DuplicateType}; - use crate::hir::def_map::ModuleData; - use crate::hir::resolution::errors::ResolverError; - use crate::hir::resolution::import::PathResolutionError; - use crate::hir::type_check::TypeCheckError; - use crate::hir::Context; - use crate::node_interner::{NodeInterner, StmtId}; - - use crate::hir::def_collector::dc_crate::DefCollector; - use crate::hir_def::expr::HirExpression; - use crate::hir_def::stmt::HirStatement; - use crate::monomorphization::monomorphize; - use crate::parser::ParserErrorReason; - use crate::ParsedModule; - use crate::{ - hir::def_map::{CrateDefMap, LocalModuleId}, - parse_program, - }; - use fm::FileManager; - use noirc_arena::Arena; +use core::panic; +use std::collections::BTreeMap; + +use fm::FileId; + +use iter_extended::vecmap; +use noirc_errors::Location; + +use crate::hir::def_collector::dc_crate::CompilationError; +use crate::hir::def_collector::errors::{DefCollectorErrorKind, DuplicateType}; +use crate::hir::def_map::ModuleData; +use crate::hir::resolution::errors::ResolverError; +use crate::hir::resolution::import::PathResolutionError; +use crate::hir::type_check::TypeCheckError; +use crate::hir::Context; +use crate::node_interner::{NodeInterner, StmtId}; + +use crate::hir::def_collector::dc_crate::DefCollector; +use crate::hir_def::expr::HirExpression; +use crate::hir_def::stmt::HirStatement; +use crate::monomorphization::monomorphize; +use crate::parser::ParserErrorReason; +use crate::ParsedModule; +use crate::{ + hir::def_map::{CrateDefMap, LocalModuleId}, + parse_program, +}; +use fm::FileManager; +use noirc_arena::Arena; + +pub(crate) fn has_parser_error(errors: &[(CompilationError, FileId)]) -> bool { + errors.iter().any(|(e, _f)| matches!(e, CompilationError::ParseError(_))) +} - pub(crate) fn has_parser_error(errors: &[(CompilationError, FileId)]) -> bool { - errors.iter().any(|(e, _f)| matches!(e, CompilationError::ParseError(_))) - } +pub(crate) fn remove_experimental_warnings(errors: &mut Vec<(CompilationError, FileId)>) { + errors.retain(|(error, _)| match error { + CompilationError::ParseError(error) => { + !matches!(error.reason(), Some(ParserErrorReason::ExperimentalFeature(..))) + } + _ => true, + }); +} - pub(crate) fn remove_experimental_warnings(errors: &mut Vec<(CompilationError, FileId)>) { - errors.retain(|(error, _)| match error { - CompilationError::ParseError(error) => { - !matches!(error.reason(), Some(ParserErrorReason::ExperimentalFeature(..))) - } - _ => true, - }); - } - - pub(crate) fn get_program( - src: &str, - ) -> (ParsedModule, Context, Vec<(CompilationError, FileId)>) { - let root = std::path::Path::new("/"); - let fm = FileManager::new(root); - - let mut context = Context::new(fm, Default::default()); - context.def_interner.populate_dummy_operator_traits(); - let root_file_id = FileId::dummy(); - let root_crate_id = context.crate_graph.add_crate_root(root_file_id); - - let (program, parser_errors) = parse_program(src); - let mut errors = vecmap(parser_errors, |e| (e.into(), root_file_id)); - remove_experimental_warnings(&mut errors); - - if !has_parser_error(&errors) { - // Allocate a default Module for the root, giving it a ModuleId - let mut modules: Arena = Arena::default(); - let location = Location::new(Default::default(), root_file_id); - let root = modules.insert(ModuleData::new(None, location, false)); - - let def_map = CrateDefMap { - root: LocalModuleId(root), - modules, - krate: root_crate_id, - extern_prelude: BTreeMap::new(), - }; +pub(crate) fn get_program(src: &str) -> (ParsedModule, Context, Vec<(CompilationError, FileId)>) { + let root = std::path::Path::new("/"); + let fm = FileManager::new(root); + + let mut context = Context::new(fm, Default::default()); + context.def_interner.populate_dummy_operator_traits(); + let root_file_id = FileId::dummy(); + let root_crate_id = context.crate_graph.add_crate_root(root_file_id); + + let (program, parser_errors) = parse_program(src); + let mut errors = vecmap(parser_errors, |e| (e.into(), root_file_id)); + remove_experimental_warnings(&mut errors); + + if !has_parser_error(&errors) { + // Allocate a default Module for the root, giving it a ModuleId + let mut modules: Arena = Arena::default(); + let location = Location::new(Default::default(), root_file_id); + let root = modules.insert(ModuleData::new(None, location, false)); + + let def_map = CrateDefMap { + root: LocalModuleId(root), + modules, + krate: root_crate_id, + extern_prelude: BTreeMap::new(), + }; - // Now we want to populate the CrateDefMap using the DefCollector - errors.extend(DefCollector::collect( - def_map, - &mut context, - program.clone().into_sorted(), - root_file_id, - &[], // No macro processors - )); - } - (program, context, errors) + // Now we want to populate the CrateDefMap using the DefCollector + errors.extend(DefCollector::collect( + def_map, + &mut context, + program.clone().into_sorted(), + root_file_id, + false, + &[], // No macro processors + )); } + (program, context, errors) +} - pub(crate) fn get_program_errors(src: &str) -> Vec<(CompilationError, FileId)> { - get_program(src).2 - } +pub(crate) fn get_program_errors(src: &str) -> Vec<(CompilationError, FileId)> { + get_program(src).2 +} - #[test] - fn check_trait_implemented_for_all_t() { - let src = " - trait Default { - fn default() -> Self; - } - - trait Eq { - fn eq(self, other: Self) -> bool; - } - - trait IsDefault { - fn is_default(self) -> bool; - } - - impl IsDefault for T where T: Default + Eq { - fn is_default(self) -> bool { - self.eq(T::default()) - } - } - - struct Foo { - a: u64, - } - - impl Eq for Foo { - fn eq(self, other: Foo) -> bool { self.a == other.a } +#[test] +fn check_trait_implemented_for_all_t() { + let src = " + trait Default { + fn default() -> Self; + } + + trait Eq { + fn eq(self, other: Self) -> bool; + } + + trait IsDefault { + fn is_default(self) -> bool; + } + + impl IsDefault for T where T: Default + Eq { + fn is_default(self) -> bool { + self.eq(T::default()) } - - impl Default for u64 { - fn default() -> Self { - 0 - } + } + + struct Foo { + a: u64, + } + + impl Eq for Foo { + fn eq(self, other: Foo) -> bool { self.a == other.a } + } + + impl Default for u64 { + fn default() -> Self { + 0 } - - impl Default for Foo { - fn default() -> Self { - Foo { a: Default::default() } - } + } + + impl Default for Foo { + fn default() -> Self { + Foo { a: Default::default() } } - - fn main(a: Foo) -> pub bool { - a.is_default() - }"; - - let errors = get_program_errors(src); - errors.iter().for_each(|err| println!("{:?}", err)); - assert!(errors.is_empty()); } + + fn main(a: Foo) -> pub bool { + a.is_default() + }"; + + let errors = get_program_errors(src); + errors.iter().for_each(|err| println!("{:?}", err)); + assert!(errors.is_empty()); +} - #[test] - fn check_trait_implementation_duplicate_method() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Field; +#[test] +fn check_trait_implementation_duplicate_method() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Field; + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + impl Default for Foo { + // Duplicate trait methods should not compile + fn default(x: Field, y: Field) -> Field { + y + 2 * x } - - struct Foo { - bar: Field, - array: [Field; 2], + // Duplicate trait methods should not compile + fn default(x: Field, y: Field) -> Field { + x + 2 * y } - - impl Default for Foo { - // Duplicate trait methods should not compile - fn default(x: Field, y: Field) -> Field { - y + 2 * x + } + + fn main() {}"; + + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::Duplicate { + typ, + first_def, + second_def, + }) => { + assert_eq!(typ, &DuplicateType::TraitAssociatedFunction); + assert_eq!(first_def, "default"); + assert_eq!(second_def, "default"); } - // Duplicate trait methods should not compile - fn default(x: Field, y: Field) -> Field { - x + 2 * y + _ => { + panic!("No other errors are expected! Found = {:?}", err); } - } - - fn main() {}"; - - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::Duplicate { - typ, - first_def, - second_def, - }) => { - assert_eq!(typ, &DuplicateType::TraitAssociatedFunction); - assert_eq!(first_def, "default"); - assert_eq!(second_def, "default"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + }; } +} - #[test] - fn check_trait_wrong_method_return_type() { - let src = " - trait Default { - fn default() -> Self; - } - - struct Foo { +#[test] +fn check_trait_wrong_method_return_type() { + let src = " + trait Default { + fn default() -> Self; + } + + struct Foo { + } + + impl Default for Foo { + fn default() -> Field { + 0 } - - impl Default for Foo { - fn default() -> Field { - 0 + } + + fn main() { + } + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::TypeError(TypeCheckError::TypeMismatch { + expected_typ, + expr_typ, + expr_span: _, + }) => { + assert_eq!(expected_typ, "Foo"); + assert_eq!(expr_typ, "Field"); } - } - - fn main() { - } - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::TypeError(TypeCheckError::TypeMismatch { - expected_typ, - expr_typ, - expr_span: _, - }) => { - assert_eq!(expected_typ, "Foo"); - assert_eq!(expr_typ, "Field"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_wrong_method_return_type2() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Self; - } - - struct Foo { - bar: Field, - array: [Field; 2], +#[test] +fn check_trait_wrong_method_return_type2() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Self; + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + impl Default for Foo { + fn default(x: Field, _y: Field) -> Field { + x } - - impl Default for Foo { - fn default(x: Field, _y: Field) -> Field { - x + } + + fn main() { + }"; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::TypeError(TypeCheckError::TypeMismatch { + expected_typ, + expr_typ, + expr_span: _, + }) => { + assert_eq!(expected_typ, "Foo"); + assert_eq!(expr_typ, "Field"); } - } - - fn main() { - }"; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::TypeError(TypeCheckError::TypeMismatch { - expected_typ, - expr_typ, - expr_span: _, - }) => { - assert_eq!(expected_typ, "Foo"); - assert_eq!(expr_typ, "Field"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_missing_implementation() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Self; - - fn method2(x: Field) -> Field; - - } - - struct Foo { - bar: Field, - array: [Field; 2], +#[test] +fn check_trait_missing_implementation() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Self; + + fn method2(x: Field) -> Field; + + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + impl Default for Foo { + fn default(x: Field, y: Field) -> Self { + Self { bar: x, array: [x,y] } } - - impl Default for Foo { - fn default(x: Field, y: Field) -> Self { - Self { bar: x, array: [x,y] } + } + + fn main() { + } + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::TraitMissingMethod { + trait_name, + method_name, + trait_impl_span: _, + }) => { + assert_eq!(trait_name, "Default"); + assert_eq!(method_name, "method2"); } - } - - fn main() { - } - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::TraitMissingMethod { - trait_name, - method_name, - trait_impl_span: _, - }) => { - assert_eq!(trait_name, "Default"); - assert_eq!(method_name, "method2"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_not_in_scope() { - let src = " - struct Foo { - bar: Field, - array: [Field; 2], +#[test] +fn check_trait_not_in_scope() { + let src = " + struct Foo { + bar: Field, + array: [Field; 2], + } + + // Default trait does not exist + impl Default for Foo { + fn default(x: Field, y: Field) -> Self { + Self { bar: x, array: [x,y] } } - - // Default trait does not exist - impl Default for Foo { - fn default(x: Field, y: Field) -> Self { - Self { bar: x, array: [x,y] } + } + + fn main() { + } + + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::TraitNotFound { + trait_path, + }) => { + assert_eq!(trait_path.as_string(), "Default"); } - } - - fn main() { - } - - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::TraitNotFound { - trait_path, - }) => { - assert_eq!(trait_path.as_string(), "Default"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_wrong_method_name() { - let src = " - trait Default { - } - - struct Foo { - bar: Field, - array: [Field; 2], +#[test] +fn check_trait_wrong_method_name() { + let src = " + trait Default { + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + // wrong trait name method should not compile + impl Default for Foo { + fn does_not_exist(x: Field, y: Field) -> Self { + Self { bar: x, array: [x,y] } } - - // wrong trait name method should not compile - impl Default for Foo { - fn does_not_exist(x: Field, y: Field) -> Self { - Self { bar: x, array: [x,y] } + } + + fn main() { + }"; + let compilation_errors = get_program_errors(src); + assert!(!has_parser_error(&compilation_errors)); + assert!( + compilation_errors.len() == 1, + "Expected 1 compilation error, got: {:?}", + compilation_errors + ); + + for (err, _file_id) in compilation_errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::MethodNotInTrait { + trait_name, + impl_method, + }) => { + assert_eq!(trait_name, "Default"); + assert_eq!(impl_method, "does_not_exist"); } - } - - fn main() { - }"; - let compilation_errors = get_program_errors(src); - assert!(!has_parser_error(&compilation_errors)); - assert!( - compilation_errors.len() == 1, - "Expected 1 compilation error, got: {:?}", - compilation_errors - ); - - for (err, _file_id) in compilation_errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::MethodNotInTrait { - trait_name, - impl_method, - }) => { - assert_eq!(trait_name, "Default"); - assert_eq!(impl_method, "does_not_exist"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_wrong_parameter() { - let src = " - trait Default { - fn default(x: Field) -> Self; - } - - struct Foo { - bar: u32, +#[test] +fn check_trait_wrong_parameter() { + let src = " + trait Default { + fn default(x: Field) -> Self; + } + + struct Foo { + bar: u32, + } + + impl Default for Foo { + fn default(x: u32) -> Self { + Foo {bar: x} } - - impl Default for Foo { - fn default(x: u32) -> Self { - Foo {bar: x} + } + + fn main() { + } + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::TypeError(TypeCheckError::TraitMethodParameterTypeMismatch { + method_name, + expected_typ, + actual_typ, + .. + }) => { + assert_eq!(method_name, "default"); + assert_eq!(expected_typ, "Field"); + assert_eq!(actual_typ, "u32"); } - } - - fn main() { - } - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::TypeError(TypeCheckError::TraitMethodParameterTypeMismatch { - method_name, - expected_typ, - actual_typ, - .. - }) => { - assert_eq!(method_name, "default"); - assert_eq!(expected_typ, "Field"); - assert_eq!(actual_typ, "u32"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_wrong_parameter2() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Self; - } - - struct Foo { - bar: Field, - array: [Field; 2], +#[test] +fn check_trait_wrong_parameter2() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Self; + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + impl Default for Foo { + fn default(x: Field, y: Foo) -> Self { + Self { bar: x, array: [x, y.bar] } } - - impl Default for Foo { - fn default(x: Field, y: Foo) -> Self { - Self { bar: x, array: [x, y.bar] } + } + + fn main() { + }"; + + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::TypeError(TypeCheckError::TraitMethodParameterTypeMismatch { + method_name, + expected_typ, + actual_typ, + .. + }) => { + assert_eq!(method_name, "default"); + assert_eq!(expected_typ, "Field"); + assert_eq!(actual_typ, "Foo"); } - } - - fn main() { - }"; - - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::TypeError(TypeCheckError::TraitMethodParameterTypeMismatch { - method_name, - expected_typ, - actual_typ, - .. - }) => { - assert_eq!(method_name, "default"); - assert_eq!(expected_typ, "Field"); - assert_eq!(actual_typ, "Foo"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_wrong_parameter_type() { - let src = " - trait Default { - fn default(x: Field, y: NotAType) -> Field; - } - - fn main(x: Field, y: Field) { - assert(y == x); - }"; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 2, "Expected 2 errors, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::ResolverError(ResolverError::PathResolutionError( - PathResolutionError::Unresolved(ident), - )) => { - assert_eq!(ident, "NotAType"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } +#[test] +fn check_trait_wrong_parameter_type() { + let src = " + trait Default { + fn default(x: Field, y: NotAType) -> Field; } - - #[test] - fn check_trait_wrong_parameters_count() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Self; - } - - struct Foo { - bar: Field, - array: [Field; 2], - } - - impl Default for Foo { - fn default(x: Field) -> Self { - Self { bar: x, array: [x, x] } + + fn main(x: Field, y: Field) { + assert(y == x); + }"; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 2, "Expected 2 errors, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::ResolverError(ResolverError::PathResolutionError( + PathResolutionError::Unresolved(ident), + )) => { + assert_eq!(ident, "NotAType"); } - } - - fn main() { - } - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::TypeError(TypeCheckError::MismatchTraitImplNumParameters { - actual_num_parameters, - expected_num_parameters, - trait_name, - method_name, - .. - }) => { - assert_eq!(actual_num_parameters, &1_usize); - assert_eq!(expected_num_parameters, &2_usize); - assert_eq!(method_name, "default"); - assert_eq!(trait_name, "Default"); - } - _ => { - panic!("No other errors are expected in this test case! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_impl_for_non_type() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Field; +#[test] +fn check_trait_wrong_parameters_count() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Self; + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + impl Default for Foo { + fn default(x: Field) -> Self { + Self { bar: x, array: [x, x] } } - - impl Default for main { - fn default(x: Field, y: Field) -> Field { - x + y + } + + fn main() { + } + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::TypeError(TypeCheckError::MismatchTraitImplNumParameters { + actual_num_parameters, + expected_num_parameters, + trait_name, + method_name, + .. + }) => { + assert_eq!(actual_num_parameters, &1_usize); + assert_eq!(expected_num_parameters, &2_usize); + assert_eq!(method_name, "default"); + assert_eq!(trait_name, "Default"); } - } - - fn main() {} - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::ResolverError(ResolverError::Expected { - expected, got, .. - }) => { - assert_eq!(expected, "type"); - assert_eq!(got, "function"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + _ => { + panic!("No other errors are expected in this test case! Found = {:?}", err); + } + }; } +} - #[test] - fn check_impl_struct_not_trait() { - let src = " - struct Foo { - bar: Field, - array: [Field; 2], - } - - struct Default { - x: Field, - z: Field, - } - - // Default is struct not a trait - impl Default for Foo { - fn default(x: Field, y: Field) -> Self { - Self { bar: x, array: [x,y] } - } - } - - fn main() { - } - - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::NotATrait { - not_a_trait_name, - }) => { - assert_eq!(not_a_trait_name.to_string(), "plain::Default"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } +#[test] +fn check_trait_impl_for_non_type() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Field; } - #[test] - fn check_trait_duplicate_declaration() { - let src = " - trait Default { - fn default(x: Field, y: Field) -> Self; - } - - struct Foo { - bar: Field, - array: [Field; 2], - } - - impl Default for Foo { - fn default(x: Field,y: Field) -> Self { - Self { bar: x, array: [x,y] } - } - } - - - trait Default { - fn default(x: Field) -> Self; - } - - fn main() { - }"; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::Duplicate { - typ, - first_def, - second_def, - }) => { - assert_eq!(typ, &DuplicateType::Trait); - assert_eq!(first_def, "Default"); - assert_eq!(second_def, "Default"); - } - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; + impl Default for main { + fn default(x: Field, y: Field) -> Field { + x + y } } - #[test] - fn check_trait_duplicate_implementation() { - let src = " - trait Default { - } - struct Foo { - bar: Field, - } - - impl Default for Foo { - } - impl Default for Foo { - } - fn main() { - } - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 2, "Expected 2 errors, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImpl { - .. - }) => (), - CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImplNote { - .. - }) => (), - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; - } + fn main() {} + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::ResolverError(ResolverError::Expected { expected, got, .. }) => { + assert_eq!(expected, "type"); + assert_eq!(got, "function"); + } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; } +} - #[test] - fn check_trait_duplicate_implementation_with_alias() { - let src = " - trait Default { - } - - struct MyStruct { - } - - type MyType = MyStruct; - - impl Default for MyStruct { - } - - impl Default for MyType { - } - - fn main() { - } - "; - let errors = get_program_errors(src); - assert!(!has_parser_error(&errors)); - assert!(errors.len() == 2, "Expected 2 errors, got: {:?}", errors); - for (err, _file_id) in errors { - match &err { - CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImpl { - .. - }) => (), - CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImplNote { - .. - }) => (), - _ => { - panic!("No other errors are expected! Found = {:?}", err); - } - }; +#[test] +fn check_impl_struct_not_trait() { + let src = " + struct Foo { + bar: Field, + array: [Field; 2], + } + + struct Default { + x: Field, + z: Field, + } + + // Default is struct not a trait + impl Default for Foo { + fn default(x: Field, y: Field) -> Self { + Self { bar: x, array: [x,y] } } } + + fn main() { + } + + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::NotATrait { + not_a_trait_name, + }) => { + assert_eq!(not_a_trait_name.to_string(), "plain::Default"); + } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; + } +} - #[test] - fn test_impl_self_within_default_def() { - let src = " - trait Bar { - fn ok(self) -> Self; +#[test] +fn check_trait_duplicate_declaration() { + let src = " + trait Default { + fn default(x: Field, y: Field) -> Self; + } + + struct Foo { + bar: Field, + array: [Field; 2], + } + + impl Default for Foo { + fn default(x: Field,y: Field) -> Self { + Self { bar: x, array: [x,y] } + } + } + + + trait Default { + fn default(x: Field) -> Self; + } + + fn main() { + }"; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::Duplicate { + typ, + first_def, + second_def, + }) => { + assert_eq!(typ, &DuplicateType::Trait); + assert_eq!(first_def, "Default"); + assert_eq!(second_def, "Default"); + } + _ => { + panic!("No other errors are expected! Found = {:?}", err); + } + }; + } +} - fn ref_ok(self) -> Self { - self.ok() +#[test] +fn check_trait_duplicate_implementation() { + let src = " + trait Default { + } + struct Foo { + bar: Field, + } + + impl Default for Foo { + } + impl Default for Foo { + } + fn main() { + } + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 2, "Expected 2 errors, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImpl { + .. + }) => (), + CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImplNote { + .. + }) => (), + _ => { + panic!("No other errors are expected! Found = {:?}", err); } - } + }; + } +} - impl Bar for (T, T) where T: Bar { - fn ok(self) -> Self { - self +#[test] +fn check_trait_duplicate_implementation_with_alias() { + let src = " + trait Default { + } + + struct MyStruct { + } + + type MyType = MyStruct; + + impl Default for MyStruct { + } + + impl Default for MyType { + } + + fn main() { + } + "; + let errors = get_program_errors(src); + assert!(!has_parser_error(&errors)); + assert!(errors.len() == 2, "Expected 2 errors, got: {:?}", errors); + for (err, _file_id) in errors { + match &err { + CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImpl { + .. + }) => (), + CompilationError::DefinitionError(DefCollectorErrorKind::OverlappingImplNote { + .. + }) => (), + _ => { + panic!("No other errors are expected! Found = {:?}", err); } - }"; - let errors = get_program_errors(src); - errors.iter().for_each(|err| println!("{:?}", err)); - assert!(errors.is_empty()); + }; } +} - #[test] - fn check_trait_as_type_as_fn_parameter() { - let src = " - trait Eq { - fn eq(self, other: Self) -> bool; - } +#[test] +fn test_impl_self_within_default_def() { + let src = " + trait Bar { + fn ok(self) -> Self; - struct Foo { - a: u64, + fn ref_ok(self) -> Self { + self.ok() } + } - impl Eq for Foo { - fn eq(self, other: Foo) -> bool { self.a == other.a } + impl Bar for (T, T) where T: Bar { + fn ok(self) -> Self { + self } + }"; + let errors = get_program_errors(src); + errors.iter().for_each(|err| println!("{:?}", err)); + assert!(errors.is_empty()); +} - fn test_eq(x: impl Eq) -> bool { - x.eq(x) - } +#[test] +fn check_trait_as_type_as_fn_parameter() { + let src = " + trait Eq { + fn eq(self, other: Self) -> bool; + } - fn main(a: Foo) -> pub bool { - test_eq(a) - }"; + struct Foo { + a: u64, + } - let errors = get_program_errors(src); - errors.iter().for_each(|err| println!("{:?}", err)); - assert!(errors.is_empty()); + impl Eq for Foo { + fn eq(self, other: Foo) -> bool { self.a == other.a } } - #[test] - fn check_trait_as_type_as_two_fn_parameters() { - let src = " - trait Eq { - fn eq(self, other: Self) -> bool; - } + fn test_eq(x: impl Eq) -> bool { + x.eq(x) + } - trait Test { - fn test(self) -> bool; - } + fn main(a: Foo) -> pub bool { + test_eq(a) + }"; - struct Foo { - a: u64, - } + let errors = get_program_errors(src); + errors.iter().for_each(|err| println!("{:?}", err)); + assert!(errors.is_empty()); +} - impl Eq for Foo { - fn eq(self, other: Foo) -> bool { self.a == other.a } - } +#[test] +fn check_trait_as_type_as_two_fn_parameters() { + let src = " + trait Eq { + fn eq(self, other: Self) -> bool; + } - impl Test for u64 { - fn test(self) -> bool { self == self } - } + trait Test { + fn test(self) -> bool; + } - fn test_eq(x: impl Eq, y: impl Test) -> bool { - x.eq(x) == y.test() - } + struct Foo { + a: u64, + } - fn main(a: Foo, b: u64) -> pub bool { - test_eq(a, b) - }"; - - let errors = get_program_errors(src); - errors.iter().for_each(|err| println!("{:?}", err)); - assert!(errors.is_empty()); - } - - fn get_program_captures(src: &str) -> Vec> { - let (program, context, _errors) = get_program(src); - let interner = context.def_interner; - let mut all_captures: Vec> = Vec::new(); - for func in program.into_sorted().functions { - let func_id = interner.find_function(func.name()).unwrap(); - let hir_func = interner.function(&func_id); - // Iterate over function statements and apply filtering function - find_lambda_captures( - hir_func.block(&interner).statements(), - &interner, - &mut all_captures, - ); - } - all_captures - } - - fn find_lambda_captures( - stmts: &[StmtId], - interner: &NodeInterner, - result: &mut Vec>, - ) { - for stmt_id in stmts.iter() { - let hir_stmt = interner.statement(stmt_id); - let expr_id = match hir_stmt { - HirStatement::Expression(expr_id) => expr_id, - HirStatement::Let(let_stmt) => let_stmt.expression, - HirStatement::Assign(assign_stmt) => assign_stmt.expression, - HirStatement::Constrain(constr_stmt) => constr_stmt.0, - HirStatement::Semi(semi_expr) => semi_expr, - HirStatement::For(for_loop) => for_loop.block, - HirStatement::Error => panic!("Invalid HirStatement!"), - HirStatement::Break => panic!("Unexpected break"), - HirStatement::Continue => panic!("Unexpected continue"), - HirStatement::Comptime(_) => panic!("Unexpected comptime"), - }; - let expr = interner.expression(&expr_id); + impl Eq for Foo { + fn eq(self, other: Foo) -> bool { self.a == other.a } + } - get_lambda_captures(expr, interner, result); // TODO: dyn filter function as parameter - } + impl Test for u64 { + fn test(self) -> bool { self == self } } - fn get_lambda_captures( - expr: HirExpression, - interner: &NodeInterner, - result: &mut Vec>, - ) { - if let HirExpression::Lambda(lambda_expr) = expr { - let mut cur_capture = Vec::new(); + fn test_eq(x: impl Eq, y: impl Test) -> bool { + x.eq(x) == y.test() + } - for capture in lambda_expr.captures.iter() { - cur_capture.push(interner.definition(capture.ident.id).name.clone()); - } - result.push(cur_capture); + fn main(a: Foo, b: u64) -> pub bool { + test_eq(a, b) + }"; - // Check for other captures recursively within the lambda body - let hir_body_expr = interner.expression(&lambda_expr.body); - if let HirExpression::Block(block_expr) = hir_body_expr { - find_lambda_captures(block_expr.statements(), interner, result); - } - } + let errors = get_program_errors(src); + errors.iter().for_each(|err| println!("{:?}", err)); + assert!(errors.is_empty()); +} + +fn get_program_captures(src: &str) -> Vec> { + let (program, context, _errors) = get_program(src); + let interner = context.def_interner; + let mut all_captures: Vec> = Vec::new(); + for func in program.into_sorted().functions { + let func_id = interner.find_function(func.name()).unwrap(); + let hir_func = interner.function(&func_id); + // Iterate over function statements and apply filtering function + find_lambda_captures(hir_func.block(&interner).statements(), &interner, &mut all_captures); } + all_captures +} - #[test] - fn resolve_empty_function() { - let src = " - fn main() { +fn find_lambda_captures(stmts: &[StmtId], interner: &NodeInterner, result: &mut Vec>) { + for stmt_id in stmts.iter() { + let hir_stmt = interner.statement(stmt_id); + let expr_id = match hir_stmt { + HirStatement::Expression(expr_id) => expr_id, + HirStatement::Let(let_stmt) => let_stmt.expression, + HirStatement::Assign(assign_stmt) => assign_stmt.expression, + HirStatement::Constrain(constr_stmt) => constr_stmt.0, + HirStatement::Semi(semi_expr) => semi_expr, + HirStatement::For(for_loop) => for_loop.block, + HirStatement::Error => panic!("Invalid HirStatement!"), + HirStatement::Break => panic!("Unexpected break"), + HirStatement::Continue => panic!("Unexpected continue"), + HirStatement::Comptime(_) => panic!("Unexpected comptime"), + }; + let expr = interner.expression(&expr_id); - } - "; - assert!(get_program_errors(src).is_empty()); - } - #[test] - fn resolve_basic_function() { - let src = r#" - fn main(x : Field) { - let y = x + x; - assert(y == x); - } - "#; - assert!(get_program_errors(src).is_empty()); - } - #[test] - fn resolve_unused_var() { - let src = r#" - fn main(x : Field) { - let y = x + x; - assert(x == x); - } - "#; - - let errors = get_program_errors(src); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - // It should be regarding the unused variable - match &errors[0].0 { - CompilationError::ResolverError(ResolverError::UnusedVariable { ident }) => { - assert_eq!(&ident.0.contents, "y"); - } - _ => unreachable!("we should only have an unused var error"), - } + get_lambda_captures(expr, interner, result); // TODO: dyn filter function as parameter } +} - #[test] - fn resolve_unresolved_var() { - let src = r#" - fn main(x : Field) { - let y = x + x; - assert(y == z); - } - "#; - let errors = get_program_errors(src); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - // It should be regarding the unresolved var `z` (Maybe change to undeclared and special case) - match &errors[0].0 { - CompilationError::ResolverError(ResolverError::VariableNotDeclared { - name, - span: _, - }) => assert_eq!(name, "z"), - _ => unimplemented!("we should only have an unresolved variable"), +fn get_lambda_captures( + expr: HirExpression, + interner: &NodeInterner, + result: &mut Vec>, +) { + if let HirExpression::Lambda(lambda_expr) = expr { + let mut cur_capture = Vec::new(); + + for capture in lambda_expr.captures.iter() { + cur_capture.push(interner.definition(capture.ident.id).name.clone()); + } + result.push(cur_capture); + + // Check for other captures recursively within the lambda body + let hir_body_expr = interner.expression(&lambda_expr.body); + if let HirExpression::Block(block_expr) = hir_body_expr { + find_lambda_captures(block_expr.statements(), interner, result); } } +} + +#[test] +fn resolve_empty_function() { + let src = " + fn main() { - #[test] - fn unresolved_path() { - let src = " - fn main(x : Field) { - let _z = some::path::to::a::func(x); - } - "; - let errors = get_program_errors(src); - assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); - for (compilation_error, _file_id) in errors { - match compilation_error { - CompilationError::ResolverError(err) => { - match err { - ResolverError::PathResolutionError(PathResolutionError::Unresolved( - name, - )) => { - assert_eq!(name.to_string(), "some"); - } - _ => unimplemented!("we should only have an unresolved function"), - }; - } - _ => unimplemented!(), - } } + "; + assert!(get_program_errors(src).is_empty()); +} +#[test] +fn resolve_basic_function() { + let src = r#" + fn main(x : Field) { + let y = x + x; + assert(y == x); + } + "#; + assert!(get_program_errors(src).is_empty()); +} +#[test] +fn resolve_unused_var() { + let src = r#" + fn main(x : Field) { + let y = x + x; + assert(x == x); + } + "#; + + let errors = get_program_errors(src); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + // It should be regarding the unused variable + match &errors[0].0 { + CompilationError::ResolverError(ResolverError::UnusedVariable { ident }) => { + assert_eq!(&ident.0.contents, "y"); + } + _ => unreachable!("we should only have an unused var error"), } +} - #[test] - fn resolve_literal_expr() { - let src = r#" - fn main(x : Field) { - let y = 5; - assert(y == x); - } - "#; - assert!(get_program_errors(src).is_empty()); +#[test] +fn resolve_unresolved_var() { + let src = r#" + fn main(x : Field) { + let y = x + x; + assert(y == z); + } + "#; + let errors = get_program_errors(src); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + // It should be regarding the unresolved var `z` (Maybe change to undeclared and special case) + match &errors[0].0 { + CompilationError::ResolverError(ResolverError::VariableNotDeclared { name, span: _ }) => { + assert_eq!(name, "z"); + } + _ => unimplemented!("we should only have an unresolved variable"), } +} - #[test] - fn multiple_resolution_errors() { - let src = r#" - fn main(x : Field) { - let y = foo::bar(x); - let z = y + a; - } - "#; - - let errors = get_program_errors(src); - assert!(errors.len() == 3, "Expected 3 errors, got: {:?}", errors); - - // Errors are: - // `a` is undeclared - // `z` is unused - // `foo::bar` does not exist - for (compilation_error, _file_id) in errors { - match compilation_error { - CompilationError::ResolverError(err) => { - match err { - ResolverError::UnusedVariable { ident } => { - assert_eq!(&ident.0.contents, "z"); - } - ResolverError::VariableNotDeclared { name, .. } => { - assert_eq!(name, "a"); - } - ResolverError::PathResolutionError(PathResolutionError::Unresolved( - name, - )) => { - assert_eq!(name.to_string(), "foo"); - } - _ => unimplemented!(), - }; - } - _ => unimplemented!(), +#[test] +fn unresolved_path() { + let src = " + fn main(x : Field) { + let _z = some::path::to::a::func(x); + } + "; + let errors = get_program_errors(src); + assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors); + for (compilation_error, _file_id) in errors { + match compilation_error { + CompilationError::ResolverError(err) => { + match err { + ResolverError::PathResolutionError(PathResolutionError::Unresolved(name)) => { + assert_eq!(name.to_string(), "some"); + } + _ => unimplemented!("we should only have an unresolved function"), + }; } + _ => unimplemented!(), } } +} - #[test] - fn resolve_prefix_expr() { - let src = r#" - fn main(x : Field) { - let _y = -x; - } - "#; - assert!(get_program_errors(src).is_empty()); - } +#[test] +fn resolve_literal_expr() { + let src = r#" + fn main(x : Field) { + let y = 5; + assert(y == x); + } + "#; + assert!(get_program_errors(src).is_empty()); +} - #[test] - fn resolve_for_expr() { - let src = r#" - fn main(x : u64) { - for i in 1..20 { - let _z = x + i; +#[test] +fn multiple_resolution_errors() { + let src = r#" + fn main(x : Field) { + let y = foo::bar(x); + let z = y + a; + } + "#; + + let errors = get_program_errors(src); + assert!(errors.len() == 3, "Expected 3 errors, got: {:?}", errors); + + // Errors are: + // `a` is undeclared + // `z` is unused + // `foo::bar` does not exist + for (compilation_error, _file_id) in errors { + match compilation_error { + CompilationError::ResolverError(err) => { + match err { + ResolverError::UnusedVariable { ident } => { + assert_eq!(&ident.0.contents, "z"); + } + ResolverError::VariableNotDeclared { name, .. } => { + assert_eq!(name, "a"); + } + ResolverError::PathResolutionError(PathResolutionError::Unresolved(name)) => { + assert_eq!(name.to_string(), "foo"); + } + _ => unimplemented!(), }; } - "#; - assert!(get_program_errors(src).is_empty()); + _ => unimplemented!(), + } } +} - #[test] - fn resolve_call_expr() { - let src = r#" - fn main(x : Field) { - let _z = foo(x); - } +#[test] +fn resolve_prefix_expr() { + let src = r#" + fn main(x : Field) { + let _y = -x; + } + "#; + assert!(get_program_errors(src).is_empty()); +} - fn foo(x : Field) -> Field { - x - } - "#; - assert!(get_program_errors(src).is_empty()); - } - - #[test] - fn resolve_shadowing() { - let src = r#" - fn main(x : Field) { - let x = foo(x); - let x = x; - let (x, x) = (x, x); - let _ = x; - } +#[test] +fn resolve_for_expr() { + let src = r#" + fn main(x : u64) { + for i in 1..20 { + let _z = x + i; + }; + } + "#; + assert!(get_program_errors(src).is_empty()); +} - fn foo(x : Field) -> Field { - x - } - "#; - assert!(get_program_errors(src).is_empty()); - } +#[test] +fn resolve_call_expr() { + let src = r#" + fn main(x : Field) { + let _z = foo(x); + } - #[test] - fn resolve_basic_closure() { - let src = r#" - fn main(x : Field) -> pub Field { - let closure = |y| y + x; - closure(x) - } - "#; - assert!(get_program_errors(src).is_empty()); - } + fn foo(x : Field) -> Field { + x + } + "#; + assert!(get_program_errors(src).is_empty()); +} - #[test] - fn resolve_simplified_closure() { - // based on bug https://github.com/noir-lang/noir/issues/1088 +#[test] +fn resolve_shadowing() { + let src = r#" + fn main(x : Field) { + let x = foo(x); + let x = x; + let (x, x) = (x, x); + let _ = x; + } - let src = r#"fn do_closure(x: Field) -> Field { - let y = x; - let ret_capture = || { - y - }; - ret_capture() - } - - fn main(x: Field) { - assert(do_closure(x) == 100); - } - - "#; - let parsed_captures = get_program_captures(src); - let expected_captures = vec![vec!["y".to_string()]]; - assert_eq!(expected_captures, parsed_captures); - } - - #[test] - fn resolve_complex_closures() { - let src = r#" - fn main(x: Field) -> pub Field { - let closure_without_captures = |x: Field| -> Field { x + x }; - let a = closure_without_captures(1); - - let closure_capturing_a_param = |y: Field| -> Field { y + x }; - let b = closure_capturing_a_param(2); - - let closure_capturing_a_local_var = |y: Field| -> Field { y + b }; - let c = closure_capturing_a_local_var(3); - - let closure_with_transitive_captures = |y: Field| -> Field { - let d = 5; - let nested_closure = |z: Field| -> Field { - let doubly_nested_closure = |w: Field| -> Field { w + x + b }; - a + z + y + d + x + doubly_nested_closure(4) + x + y - }; - let res = nested_closure(5); - res + fn foo(x : Field) -> Field { + x + } + "#; + assert!(get_program_errors(src).is_empty()); +} + +#[test] +fn resolve_basic_closure() { + let src = r#" + fn main(x : Field) -> pub Field { + let closure = |y| y + x; + closure(x) + } + "#; + assert!(get_program_errors(src).is_empty()); +} + +#[test] +fn resolve_simplified_closure() { + // based on bug https://github.com/noir-lang/noir/issues/1088 + + let src = r#"fn do_closure(x: Field) -> Field { + let y = x; + let ret_capture = || { + y + }; + ret_capture() + } + + fn main(x: Field) { + assert(do_closure(x) == 100); + } + + "#; + let parsed_captures = get_program_captures(src); + let expected_captures = vec![vec!["y".to_string()]]; + assert_eq!(expected_captures, parsed_captures); +} + +#[test] +fn resolve_complex_closures() { + let src = r#" + fn main(x: Field) -> pub Field { + let closure_without_captures = |x: Field| -> Field { x + x }; + let a = closure_without_captures(1); + + let closure_capturing_a_param = |y: Field| -> Field { y + x }; + let b = closure_capturing_a_param(2); + + let closure_capturing_a_local_var = |y: Field| -> Field { y + b }; + let c = closure_capturing_a_local_var(3); + + let closure_with_transitive_captures = |y: Field| -> Field { + let d = 5; + let nested_closure = |z: Field| -> Field { + let doubly_nested_closure = |w: Field| -> Field { w + x + b }; + a + z + y + d + x + doubly_nested_closure(4) + x + y }; + let res = nested_closure(5); + res + }; + + a + b + c + closure_with_transitive_captures(6) + } + "#; + assert!(get_program_errors(src).is_empty(), "there should be no errors"); + + let expected_captures = vec![ + vec![], + vec!["x".to_string()], + vec!["b".to_string()], + vec!["x".to_string(), "b".to_string(), "a".to_string()], + vec!["x".to_string(), "b".to_string(), "a".to_string(), "y".to_string(), "d".to_string()], + vec!["x".to_string(), "b".to_string()], + ]; + + let parsed_captures = get_program_captures(src); + + assert_eq!(expected_captures, parsed_captures); +} + +#[test] +fn resolve_fmt_strings() { + let src = r#" + fn main() { + let string = f"this is i: {i}"; + println(string); + + println(f"I want to print {0}"); - a + b + c + closure_with_transitive_captures(6) + let new_val = 10; + println(f"random_string{new_val}{new_val}"); + } + fn println(x : T) -> T { + x + } + "#; + + let errors = get_program_errors(src); + assert!(errors.len() == 5, "Expected 5 errors, got: {:?}", errors); + + for (err, _file_id) in errors { + match &err { + CompilationError::ResolverError(ResolverError::VariableNotDeclared { + name, .. + }) => { + assert_eq!(name, "i"); } - "#; - assert!(get_program_errors(src).is_empty(), "there should be no errors"); - - let expected_captures = vec![ - vec![], - vec!["x".to_string()], - vec!["b".to_string()], - vec!["x".to_string(), "b".to_string(), "a".to_string()], - vec![ - "x".to_string(), - "b".to_string(), - "a".to_string(), - "y".to_string(), - "d".to_string(), - ], - vec!["x".to_string(), "b".to_string()], - ]; - - let parsed_captures = get_program_captures(src); - - assert_eq!(expected_captures, parsed_captures); - } - - #[test] - fn resolve_fmt_strings() { - let src = r#" - fn main() { - let string = f"this is i: {i}"; - println(string); - - println(f"I want to print {0}"); - - let new_val = 10; - println(f"random_string{new_val}{new_val}"); + CompilationError::ResolverError(ResolverError::NumericConstantInFormatString { + name, + .. + }) => { + assert_eq!(name, "0"); } - fn println(x : T) -> T { - x + CompilationError::TypeError(TypeCheckError::UnusedResultError { + expr_type: _, + expr_span, + }) => { + let a = src.get(expr_span.start() as usize..expr_span.end() as usize).unwrap(); + assert!( + a == "println(string)" + || a == "println(f\"I want to print {0}\")" + || a == "println(f\"random_string{new_val}{new_val}\")" + ); } - "#; - - let errors = get_program_errors(src); - assert!(errors.len() == 5, "Expected 5 errors, got: {:?}", errors); - - for (err, _file_id) in errors { - match &err { - CompilationError::ResolverError(ResolverError::VariableNotDeclared { - name, - .. - }) => { - assert_eq!(name, "i"); - } - CompilationError::ResolverError(ResolverError::NumericConstantInFormatString { - name, - .. - }) => { - assert_eq!(name, "0"); - } - CompilationError::TypeError(TypeCheckError::UnusedResultError { - expr_type: _, - expr_span, - }) => { - let a = src.get(expr_span.start() as usize..expr_span.end() as usize).unwrap(); - assert!( - a == "println(string)" - || a == "println(f\"I want to print {0}\")" - || a == "println(f\"random_string{new_val}{new_val}\")" - ); - } - _ => unimplemented!(), - }; - } + _ => unimplemented!(), + }; } +} - fn check_rewrite(src: &str, expected: &str) { - let (_program, mut context, _errors) = get_program(src); - let main_func_id = context.def_interner.find_function("main").unwrap(); - let program = monomorphize(main_func_id, &mut context.def_interner).unwrap(); - assert!(format!("{}", program) == expected); - } +fn check_rewrite(src: &str, expected: &str) { + let (_program, mut context, _errors) = get_program(src); + let main_func_id = context.def_interner.find_function("main").unwrap(); + let program = monomorphize(main_func_id, &mut context.def_interner).unwrap(); + assert!(format!("{}", program) == expected); +} - #[test] - fn simple_closure_with_no_captured_variables() { - let src = r#" - fn main() -> pub Field { - let x = 1; - let closure = || x; - closure() - } - "#; +#[test] +fn simple_closure_with_no_captured_variables() { + let src = r#" + fn main() -> pub Field { + let x = 1; + let closure = || x; + closure() + } + "#; - let expected_rewrite = r#"fn main$f0() -> Field { + let expected_rewrite = r#"fn main$f0() -> Field { let x$0 = 1; let closure$3 = { let closure_variable$2 = { @@ -1248,167 +1227,219 @@ fn lambda$f1(mut env$l1: (Field)) -> Field { env$l1.0 } "#; - check_rewrite(src, expected_rewrite); - } - - #[test] - fn deny_mutually_recursive_structs() { - let src = r#" - struct Foo { bar: Bar } - struct Bar { foo: Foo } - fn main() {} - "#; - assert_eq!(get_program_errors(src).len(), 1); - } - - #[test] - fn deny_cyclic_globals() { - let src = r#" - global A = B; - global B = A; - fn main() {} - "#; - assert_eq!(get_program_errors(src).len(), 1); - } - - #[test] - fn deny_cyclic_type_aliases() { - let src = r#" - type A = B; - type B = A; - fn main() {} - "#; - assert_eq!(get_program_errors(src).len(), 1); - } - - #[test] - fn ensure_nested_type_aliases_type_check() { - let src = r#" - type A = B; - type B = u8; - fn main() { - let _a: A = 0 as u16; - } - "#; - assert_eq!(get_program_errors(src).len(), 1); - } - - #[test] - fn type_aliases_in_entry_point() { - let src = r#" - type Foo = u8; - fn main(_x: Foo) {} - "#; - assert_eq!(get_program_errors(src).len(), 0); - } - - #[test] - fn operators_in_global_used_in_type() { - let src = r#" - global ONE = 1; - global COUNT = ONE + 2; - fn main() { - let _array: [Field; COUNT] = [1, 2, 3]; - } - "#; - assert_eq!(get_program_errors(src).len(), 0); - } + check_rewrite(src, expected_rewrite); +} - #[test] - fn break_and_continue_in_constrained_fn() { - let src = r#" - fn main() { - for i in 0 .. 10 { - if i == 2 { - continue; - } - if i == 5 { - break; - } +#[test] +fn deny_cyclic_globals() { + let src = r#" + global A = B; + global B = A; + fn main() {} + "#; + assert_eq!(get_program_errors(src).len(), 1); +} + +#[test] +fn deny_cyclic_type_aliases() { + let src = r#" + type A = B; + type B = A; + fn main() {} + "#; + assert_eq!(get_program_errors(src).len(), 1); +} + +#[test] +fn ensure_nested_type_aliases_type_check() { + let src = r#" + type A = B; + type B = u8; + fn main() { + let _a: A = 0 as u16; + } + "#; + assert_eq!(get_program_errors(src).len(), 1); +} + +#[test] +fn type_aliases_in_entry_point() { + let src = r#" + type Foo = u8; + fn main(_x: Foo) {} + "#; + assert_eq!(get_program_errors(src).len(), 0); +} + +#[test] +fn operators_in_global_used_in_type() { + let src = r#" + global ONE = 1; + global COUNT = ONE + 2; + fn main() { + let _array: [Field; COUNT] = [1, 2, 3]; + } + "#; + assert_eq!(get_program_errors(src).len(), 0); +} + +#[test] +fn break_and_continue_in_constrained_fn() { + let src = r#" + fn main() { + for i in 0 .. 10 { + if i == 2 { + continue; + } + if i == 5 { + break; } } - "#; - assert_eq!(get_program_errors(src).len(), 2); - } + } + "#; + assert_eq!(get_program_errors(src).len(), 2); +} - #[test] - fn break_and_continue_outside_loop() { - let src = r#" - unconstrained fn main() { - continue; - break; - } - "#; - assert_eq!(get_program_errors(src).len(), 2); - } +#[test] +fn break_and_continue_outside_loop() { + let src = r#" + unconstrained fn main() { + continue; + break; + } + "#; + assert_eq!(get_program_errors(src).len(), 2); +} - // Regression for #2540 - #[test] - fn for_loop_over_array() { - let src = r#" - fn hello(_array: [u1; N]) { - for _ in 0..N {} - } +// Regression for #2540 +#[test] +fn for_loop_over_array() { + let src = r#" + fn hello(_array: [u1; N]) { + for _ in 0..N {} + } - fn main() { - let array: [u1; 2] = [0, 1]; - hello(array); - } - "#; - assert_eq!(get_program_errors(src).len(), 0); - } - - // Regression for #4545 - #[test] - fn type_aliases_in_main() { - let src = r#" - type Outer = [u8; N]; - fn main(_arg: Outer<1>) {} - "#; - assert_eq!(get_program_errors(src).len(), 0); - } - - #[test] - fn ban_mutable_globals() { - // Mutable globals are only allowed in a comptime context - let src = r#" - mut global FOO: Field = 0; - fn main() {} - "#; - assert_eq!(get_program_errors(src).len(), 1); - } - - #[test] - fn deny_inline_attribute_on_unconstrained() { - let src = r#" - #[no_predicates] - unconstrained fn foo(x: Field, y: Field) { - assert(x != y); - } - "#; - let errors = get_program_errors(src); - assert_eq!(errors.len(), 1); - assert!(matches!( - errors[0].0, - CompilationError::ResolverError( - ResolverError::NoPredicatesAttributeOnUnconstrained { .. } - ) - )); - } + fn main() { + let array: [u1; 2] = [0, 1]; + hello(array); + } + "#; + assert_eq!(get_program_errors(src).len(), 0); +} + +// Regression for #4545 +#[test] +fn type_aliases_in_main() { + let src = r#" + type Outer = [u8; N]; + fn main(_arg: Outer<1>) {} + "#; + assert_eq!(get_program_errors(src).len(), 0); +} + +#[test] +fn ban_mutable_globals() { + // Mutable globals are only allowed in a comptime context + let src = r#" + mut global FOO: Field = 0; + fn main() {} + "#; + assert_eq!(get_program_errors(src).len(), 1); +} + +#[test] +fn deny_inline_attribute_on_unconstrained() { + let src = r#" + #[no_predicates] + unconstrained fn foo(x: Field, y: Field) { + assert(x != y); + } + "#; + let errors = get_program_errors(src); + assert_eq!(errors.len(), 1); + assert!(matches!( + errors[0].0, + CompilationError::ResolverError(ResolverError::NoPredicatesAttributeOnUnconstrained { .. }) + )); +} - #[test] - fn deny_fold_attribute_on_unconstrained() { - let src = r#" - #[fold] - unconstrained fn foo(x: Field, y: Field) { - assert(x != y); +#[test] +fn deny_fold_attribute_on_unconstrained() { + let src = r#" + #[fold] + unconstrained fn foo(x: Field, y: Field) { + assert(x != y); + } + "#; + let errors = get_program_errors(src); + assert_eq!(errors.len(), 1); + assert!(matches!( + errors[0].0, + CompilationError::ResolverError(ResolverError::FoldAttributeOnUnconstrained { .. }) + )); +} + +#[test] +fn specify_function_types_with_turbofish() { + let src = r#" + trait Default { + fn default() -> Self; + } + + impl Default for Field { + fn default() -> Self { 0 } + } + + impl Default for u64 { + fn default() -> Self { 0 } + } + + // Need the above as we don't have access to the stdlib here. + // We also need to construct a concrete value of `U` without giving away its type + // as otherwise the unspecified type is ignored. + + fn generic_func() -> (T, U) where T: Default, U: Default { + (T::default(), U::default()) + } + + fn main() { + let _ = generic_func::(); + } + "#; + let errors = get_program_errors(src); + assert_eq!(errors.len(), 0); +} + +#[test] +fn specify_method_types_with_turbofish() { + let src = r#" + trait Default { + fn default() -> Self; + } + + impl Default for Field { + fn default() -> Self { 0 } + } + + // Need the above as we don't have access to the stdlib here. + // We also need to construct a concrete value of `U` without giving away its type + // as otherwise the unspecified type is ignored. + + struct Foo { + inner: T + } + + impl Foo { + fn generic_method(_self: Self) where U: Default { + U::default() } - "#; - let errors = get_program_errors(src); - assert_eq!(errors.len(), 1); - assert!(matches!( - errors[0].0, - CompilationError::ResolverError(ResolverError::FoldAttributeOnUnconstrained { .. }) - )); - } + } + + fn main() { + let foo: Foo = Foo { inner: 1 }; + foo.generic_method::(); + } + "#; + let errors = get_program_errors(src); + assert_eq!(errors.len(), 0); } diff --git a/noir/noir-repo/compiler/noirc_frontend/src/tests/name_shadowing.rs b/noir/noir-repo/compiler/noirc_frontend/src/tests/name_shadowing.rs new file mode 100644 index 00000000000..b0d83510039 --- /dev/null +++ b/noir/noir-repo/compiler/noirc_frontend/src/tests/name_shadowing.rs @@ -0,0 +1,419 @@ +#![cfg(test)] +use super::get_program_errors; +use std::collections::HashSet; + +#[test] +fn test_name_shadowing() { + let src = " + trait Default { + fn default() -> Self; + } + + impl Default for bool { + fn default() -> bool { + false + } + } + + impl Default for Field { + fn default() -> Field { + 0 + } + } + + impl Default for [T; N] where T: Default { + fn default() -> [T; N] { + [Default::default(); N] + } + } + + impl Default for (T, U) where T: Default, U: Default { + fn default() -> (T, U) { + (Default::default(), Default::default()) + } + } + + fn drop_var(_x: T, y: U) -> U { y } + + mod local_module { + use crate::{Default, drop_var}; + + global LOCAL_GLOBAL_N: Field = 0; + + global LOCAL_GLOBAL_M: Field = 1; + + struct LocalStruct { + field1: A, + field2: B, + field3: [A; N], + field4: ([A; N], [B; M]), + field5: &mut A, + } + + impl Default for LocalStruct where A: Default, B: Default { + fn default() -> Self { + let mut mut_field = &mut Default::default(); + Self { + field1: Default::default(), + field2: Default::default(), + field3: Default::default(), + field4: Default::default(), + field5: mut_field, + } + } + } + + trait DefinedInLocalModule1 { + fn trait_fn1(self, x: A); + fn trait_fn2(self, y: B); + fn trait_fn3(&mut self, x: A, y: B); + fn trait_fn4(self, x: [A; 0], y: [B]); + fn trait_fn5(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn trait_fn6(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn trait_fn7(self, _x: fn([A; 0]) -> B) -> Field { + drop_var(self, N + M) + } + } + + impl DefinedInLocalModule1 for LocalStruct { + fn trait_fn1(self, _x: A) { drop_var(self, ()) } + fn trait_fn2(self, _y: B) { drop_var(self, ()) } + fn trait_fn3(&mut self, _x: A, _y: B) { drop_var(self, ()) } + fn trait_fn4(self, _x: [A; 0], _y: [B]) { drop_var(self, ()) } + fn trait_fn5(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, []) } + fn trait_fn6(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, []) } + } + + pub fn local_fn4(_x: (A, B), _y: [Field; N], _z: [Field; M]) -> [A; 0] { + assert(LOCAL_GLOBAL_N != LOCAL_GLOBAL_M); + let x: Field = 0; + assert(x == 0); + let x: Field = 1; + assert(x == 1); + [] + } + } + + mod library { + use crate::{Default, drop_var}; + + mod library2 { + use crate::{Default, drop_var}; + + global IMPORT_GLOBAL_N_2: Field = 4; + + global IMPORT_GLOBAL_M_2: Field = 5; + + // When we re-export this type from another library and then use it in + // main, we get a panic + struct ReExportMeFromAnotherLib1 { + x : Field, + } + + struct PubLibLocalStruct3 { + pub_field1: A, + pub_field2: B, + pub_field3: [A; N], + pub_field4: ([A; N], [B; M]), + pub_field5: &mut A, + } + + impl Default for PubLibLocalStruct3 where A: Default, B: Default { + fn default() -> Self { + let mut mut_field = &mut Default::default(); + Self { + pub_field1: Default::default(), + pub_field2: Default::default(), + pub_field3: Default::default(), + pub_field4: Default::default(), + pub_field5: mut_field, + } + } + } + + trait PubLibDefinedInLocalModule3 { + fn pub_trait_fn1(self, x: A); + fn pub_trait_fn2(self, y: B); + fn pub_trait_fn3(&mut self, x: A, y: B); + fn pub_trait_fn4(self, x: [A; 0], y: [B]); + fn pub_trait_fn5(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn pub_trait_fn6(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn pub_trait_fn7(self, _x: fn([A; 0]) -> B) -> Field { + drop_var(self, N + M) + } + } + + impl PubLibDefinedInLocalModule3 for PubLibLocalStruct3 { + fn pub_trait_fn1(self, _x: A) { drop_var(self, ()) } + fn pub_trait_fn2(self, _y: B) { drop_var(self, ()) } + fn pub_trait_fn3(&mut self, _x: A, _y: B) { drop_var(self, ()) } + fn pub_trait_fn4(self, _x: [A; 0], _y: [B]) { drop_var(self, ()) } + fn pub_trait_fn5(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, []) } + fn pub_trait_fn6(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, []) } + } + + pub fn PubLiblocal_fn3(_x: (A, B), _y: [Field; N], _z: [Field; M]) -> [A; 0] { + assert(IMPORT_GLOBAL_N_2 != IMPORT_GLOBAL_M_2); + [] + } + } + + // Re-export + use library2::ReExportMeFromAnotherLib1; + + global IMPORT_GLOBAL_N_1: Field = 2; + + global IMPORT_GLOBAL_M_1: Field = 3; + + struct LibLocalStruct1 { + lib_field1: A, + lib_field2: B, + lib_field3: [A; N], + lib_field4: ([A; N], [B; M]), + lib_field5: &mut A, + } + + impl Default for LibLocalStruct1 where A: Default, B: Default { + fn default() -> Self { + let mut mut_field = &mut Default::default(); + Self { + lib_field1: Default::default(), + lib_field2: Default::default(), + lib_field3: Default::default(), + lib_field4: Default::default(), + lib_field5: mut_field, + } + } + } + + trait LibDefinedInLocalModule1 { + fn lib_trait_fn1(self, x: A); + fn lib_trait_fn2(self, y: B); + fn lib_trait_fn3(&mut self, x: A, y: B); + fn lib_trait_fn4(self, x: [A; 0], y: [B]); + fn lib_trait_fn5(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn lib_trait_fn6(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn lib_trait_fn7(self, _x: fn([A; 0]) -> B) -> Field { + drop_var(self, N + M) + } + } + + impl LibDefinedInLocalModule1 for LibLocalStruct1 { + fn lib_trait_fn1(self, _x: A) { drop_var(self, ()) } + fn lib_trait_fn2(self, _y: B) { drop_var(self, ()) } + fn lib_trait_fn3(&mut self, _x: A, _y: B) { drop_var(self, ()) } + fn lib_trait_fn4(self, _x: [A; 0], _y: [B]) { drop_var(self, ()) } + fn lib_trait_fn5(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, []) } + fn lib_trait_fn6(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, []) } + } + + pub fn Liblocal_fn1(_x: (A, B), _y: [Field; N], _z: [Field; M]) -> [A; 0] { + assert(IMPORT_GLOBAL_N_1 != IMPORT_GLOBAL_M_1); + [] + } + } + + mod library3 { + use crate::{Default, drop_var}; + + global IMPORT_GLOBAL_N_3: Field = 6; + + global IMPORT_GLOBAL_M_3: Field = 7; + + struct ReExportMeFromAnotherLib2 { + x : Field, + } + + struct PubCrateLibLocalStruct2 { + crate_field1: A, + crate_field2: B, + crate_field3: [A; N], + crate_field4: ([A; N], [B; M]), + crate_field5: &mut A, + } + + impl Default for PubCrateLibLocalStruct2 where A: Default, B: Default { + fn default() -> Self { + let mut mut_field = &mut Default::default(); + Self { + crate_field1: Default::default(), + crate_field2: Default::default(), + crate_field3: Default::default(), + crate_field4: Default::default(), + crate_field5: mut_field, + } + } + } + + trait PubCrateLibDefinedInLocalModule2 { + fn crate_trait_fn1(self, x: A); + fn crate_trait_fn2(self, y: B); + fn crate_trait_fn3(&mut self, x: A, y: B); + fn crate_trait_fn4(self, x: [A; 0], y: [B]); + fn crate_trait_fn5(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn crate_trait_fn6(self, x: [A; N], y: [B; M]) -> [A; 0]; + fn crate_trait_fn7(self, _x: fn([A; 0]) -> B) -> Field { + drop_var(self, N + M) + } + } + + impl PubCrateLibDefinedInLocalModule2 for PubCrateLibLocalStruct2 { + fn crate_trait_fn1(self, _x: A) { drop_var(self, ()) } + fn crate_trait_fn2(self, _y: B) { drop_var(self, ()) } + fn crate_trait_fn3(&mut self, _x: A, _y: B) { drop_var(self, ()) } + fn crate_trait_fn4(self, _x: [A; 0], _y: [B]) { drop_var(self, ()) } + fn crate_trait_fn5(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, ()); [] } + fn crate_trait_fn6(self, _x: [A; N], _y: [B; M]) -> [A; 0] { drop_var(self, ()); [] } + } + + pub(crate) fn PubCrateLiblocal_fn2(_x: (A, B), _y: [Field; N], _z: [Field; M]) -> [A; 0] { + assert(IMPORT_GLOBAL_N_3 != IMPORT_GLOBAL_M_3); + [] + } + } + + + use crate::local_module::{local_fn4, LocalStruct, DefinedInLocalModule1, LOCAL_GLOBAL_N, LOCAL_GLOBAL_M}; + + use library::{ReExportMeFromAnotherLib1, LibLocalStruct1, LibDefinedInLocalModule1, Liblocal_fn1, IMPORT_GLOBAL_N_1, IMPORT_GLOBAL_M_1}; + + // overlapping + // use library::library2::ReExportMeFromAnotherLib1; + use crate::library::library2::{PubLibLocalStruct3, PubLibDefinedInLocalModule3, PubLiblocal_fn3, IMPORT_GLOBAL_N_2, IMPORT_GLOBAL_M_2}; + + use library3::{ReExportMeFromAnotherLib2, PubCrateLibLocalStruct2, PubCrateLibDefinedInLocalModule2, PubCrateLiblocal_fn2, IMPORT_GLOBAL_N_3, IMPORT_GLOBAL_M_3}; + + + fn main(_x: ReExportMeFromAnotherLib1, _y: ReExportMeFromAnotherLib2) { + assert(LOCAL_GLOBAL_N != LOCAL_GLOBAL_M); + assert(IMPORT_GLOBAL_N_1 != IMPORT_GLOBAL_M_1); + assert(IMPORT_GLOBAL_N_2 != IMPORT_GLOBAL_M_2); + assert(IMPORT_GLOBAL_N_3 != IMPORT_GLOBAL_M_3); + + let x: LocalStruct = Default::default(); + assert(drop_var(x.trait_fn5([0; LOCAL_GLOBAL_N], [false; LOCAL_GLOBAL_M]), true)); + assert(drop_var(x.trait_fn6([0; LOCAL_GLOBAL_N], [false; LOCAL_GLOBAL_M]), true)); + + let x: LibLocalStruct1 = Default::default(); + assert(drop_var(x.lib_trait_fn5([0; IMPORT_GLOBAL_N_1], [false; IMPORT_GLOBAL_M_1]), true)); + assert(drop_var(x.lib_trait_fn6([0; IMPORT_GLOBAL_N_1], [false; IMPORT_GLOBAL_M_1]), true)); + + let x: PubLibLocalStruct3 = Default::default(); + assert(drop_var(x.pub_trait_fn5([0; IMPORT_GLOBAL_N_2], [false; IMPORT_GLOBAL_M_2]), true)); + assert(drop_var(x.pub_trait_fn6([0; IMPORT_GLOBAL_N_2], [false; IMPORT_GLOBAL_M_2]), true)); + + let x: PubCrateLibLocalStruct2 = Default::default(); + assert(drop_var(x.crate_trait_fn5([0; IMPORT_GLOBAL_N_3], [false; IMPORT_GLOBAL_M_3]), true)); + assert(drop_var(x.crate_trait_fn6([0; IMPORT_GLOBAL_N_3], [false; IMPORT_GLOBAL_M_3]), true)); + + assert(drop_var(local_fn2((0, 1), [], []), true)); + assert(drop_var(Liblocal_fn1((0, 1), [], []), true)); + assert(drop_var(PubLiblocal_fn4((0, 1), [], []), true)); + assert(drop_var(PubCrateLiblocal_fn3((0, 1), [], []), true)); + }"; + + // NOTE: these names must be "replacement-unique", i.e. + // replacing one in a discinct name should do nothing + let names_to_collapse = [ + "DefinedInLocalModule1", + "IMPORT_GLOBAL_M_1", + "IMPORT_GLOBAL_M_2", + "IMPORT_GLOBAL_M_3", + "IMPORT_GLOBAL_N_1", + "IMPORT_GLOBAL_N_2", + "IMPORT_GLOBAL_N_3", + "LOCAL_GLOBAL_M", + "LOCAL_GLOBAL_N", + "LibDefinedInLocalModule1", + "LibLocalStruct1", + "Liblocal_fn1", + "LocalStruct", + "PubCrateLibDefinedInLocalModule2", + "PubCrateLibLocalStruct2", + "PubCrateLiblocal_fn2", + "PubLibDefinedInLocalModule3", + "PubLibLocalStruct3", + "PubLiblocal_fn3", + "ReExportMeFromAnotherLib1", + "ReExportMeFromAnotherLib2", + "local_fn4", + "crate_field1", + "crate_field2", + "crate_field3", + "crate_field4", + "crate_field5", + "crate_trait_fn1", + "crate_trait_fn2", + "crate_trait_fn3", + "crate_trait_fn4", + "crate_trait_fn5", + "crate_trait_fn6", + "crate_trait_fn7", + "field1", + "field2", + "field3", + "field4", + "field5", + "lib_field1", + "lib_field2", + "lib_field3", + "lib_field4", + "lib_field5", + "lib_trait_fn1", + "lib_trait_fn2", + "lib_trait_fn3", + "lib_trait_fn4", + "lib_trait_fn5", + "lib_trait_fn6", + "lib_trait_fn7", + "pub_field1", + "pub_field2", + "pub_field3", + "pub_field4", + "pub_field5", + "pub_trait_fn1", + "pub_trait_fn2", + "pub_trait_fn3", + "pub_trait_fn4", + "pub_trait_fn5", + "pub_trait_fn6", + "pub_trait_fn7", + "trait_fn1", + "trait_fn2", + "trait_fn3", + "trait_fn4", + "trait_fn5", + "trait_fn6", + "trait_fn7", + ]; + + // TODO(https://github.com/noir-lang/noir/issues/4973): + // Name resolution panic from name shadowing test + let cases_to_skip = [ + (1, 21), + (2, 11), + (2, 21), + (3, 11), + (3, 18), + (3, 21), + (4, 21), + (5, 11), + (5, 21), + (6, 11), + (6, 18), + (6, 21), + ]; + let cases_to_skip: HashSet<(usize, usize)> = cases_to_skip.into_iter().collect(); + + for (i, x) in names_to_collapse.iter().enumerate() { + for (j, y) in names_to_collapse.iter().enumerate().filter(|(j, _)| i < *j) { + if !cases_to_skip.contains(&(i, j)) { + dbg!((i, j)); + + let modified_src = src.replace(x, y); + let errors = get_program_errors(&modified_src); + assert!(!errors.is_empty(), "Expected errors, got: {:?}", errors); + } + } + } +} diff --git a/noir/noir-repo/compiler/wasm/package.json b/noir/noir-repo/compiler/wasm/package.json index bccf937219e..0bb9b803ee0 100644 --- a/noir/noir-repo/compiler/wasm/package.json +++ b/noir/noir-repo/compiler/wasm/package.json @@ -3,7 +3,7 @@ "contributors": [ "The Noir Team " ], - "version": "0.29.0", + "version": "0.30.0", "license": "(MIT OR Apache-2.0)", "main": "dist/main.js", "types": "./dist/types/src/index.d.cts", diff --git a/noir/noir-repo/compiler/wasm/src/compile.rs b/noir/noir-repo/compiler/wasm/src/compile.rs index de157a1fe20..57b17a6f79e 100644 --- a/noir/noir-repo/compiler/wasm/src/compile.rs +++ b/noir/noir-repo/compiler/wasm/src/compile.rs @@ -1,3 +1,4 @@ +use acvm::acir::circuit::ExpressionWidth; use fm::FileManager; use gloo_utils::format::JsValueSerdeExt; use js_sys::{JsString, Object}; @@ -169,9 +170,10 @@ pub fn compile_program( console_error_panic_hook::set_once(); let (crate_id, mut context) = prepare_context(entry_point, dependency_graph, file_source_map)?; - let compile_options = CompileOptions::default(); - // For now we default to a bounded width of 3, though we can add it as a parameter - let expression_width = acvm::acir::circuit::ExpressionWidth::Bounded { width: 3 }; + let compile_options = CompileOptions { + expression_width: ExpressionWidth::Bounded { width: 4 }, + ..CompileOptions::default() + }; let compiled_program = noirc_driver::compile_main(&mut context, crate_id, &compile_options, None) @@ -184,7 +186,8 @@ pub fn compile_program( })? .0; - let optimized_program = nargo::ops::transform_program(compiled_program, expression_width); + let optimized_program = + nargo::ops::transform_program(compiled_program, compile_options.expression_width); let warnings = optimized_program.warnings.clone(); Ok(JsCompileProgramResult::new(optimized_program.into(), warnings)) @@ -199,9 +202,10 @@ pub fn compile_contract( console_error_panic_hook::set_once(); let (crate_id, mut context) = prepare_context(entry_point, dependency_graph, file_source_map)?; - let compile_options = CompileOptions::default(); - // For now we default to a bounded width of 3, though we can add it as a parameter - let expression_width = acvm::acir::circuit::ExpressionWidth::Bounded { width: 3 }; + let compile_options = CompileOptions { + expression_width: ExpressionWidth::Bounded { width: 4 }, + ..CompileOptions::default() + }; let compiled_contract = noirc_driver::compile_contract(&mut context, crate_id, &compile_options) @@ -214,7 +218,8 @@ pub fn compile_contract( })? .0; - let optimized_contract = nargo::ops::transform_contract(compiled_contract, expression_width); + let optimized_contract = + nargo::ops::transform_contract(compiled_contract, compile_options.expression_width); let functions = optimized_contract.functions.into_iter().map(ContractFunctionArtifact::from).collect(); diff --git a/noir/noir-repo/compiler/wasm/src/compile_new.rs b/noir/noir-repo/compiler/wasm/src/compile_new.rs index c187fe7f3de..4f11cafb975 100644 --- a/noir/noir-repo/compiler/wasm/src/compile_new.rs +++ b/noir/noir-repo/compiler/wasm/src/compile_new.rs @@ -3,6 +3,7 @@ use crate::compile::{ PathToFileSourceMap, }; use crate::errors::{CompileError, JsCompileError}; +use acvm::acir::circuit::ExpressionWidth; use nargo::artifacts::contract::{ContractArtifact, ContractFunctionArtifact}; use nargo::parse_all; use noirc_driver::{ @@ -96,11 +97,14 @@ impl CompilerContext { mut self, program_width: usize, ) -> Result { - let compile_options = CompileOptions::default(); - let np_language = acvm::acir::circuit::ExpressionWidth::Bounded { width: program_width }; + let expression_width = if program_width == 0 { + ExpressionWidth::Unbounded + } else { + ExpressionWidth::Bounded { width: 4 } + }; + let compile_options = CompileOptions { expression_width, ..CompileOptions::default() }; let root_crate_id = *self.context.root_crate_id(); - let compiled_program = compile_main(&mut self.context, root_crate_id, &compile_options, None) .map_err(|errs| { @@ -112,7 +116,8 @@ impl CompilerContext { })? .0; - let optimized_program = nargo::ops::transform_program(compiled_program, np_language); + let optimized_program = + nargo::ops::transform_program(compiled_program, compile_options.expression_width); let warnings = optimized_program.warnings.clone(); Ok(JsCompileProgramResult::new(optimized_program.into(), warnings)) @@ -122,10 +127,14 @@ impl CompilerContext { mut self, program_width: usize, ) -> Result { - let compile_options = CompileOptions::default(); - let np_language = acvm::acir::circuit::ExpressionWidth::Bounded { width: program_width }; - let root_crate_id = *self.context.root_crate_id(); + let expression_width = if program_width == 0 { + ExpressionWidth::Unbounded + } else { + ExpressionWidth::Bounded { width: 4 } + }; + let compile_options = CompileOptions { expression_width, ..CompileOptions::default() }; + let root_crate_id = *self.context.root_crate_id(); let compiled_contract = compile_contract(&mut self.context, root_crate_id, &compile_options) .map_err(|errs| { @@ -137,7 +146,8 @@ impl CompilerContext { })? .0; - let optimized_contract = nargo::ops::transform_contract(compiled_contract, np_language); + let optimized_contract = + nargo::ops::transform_contract(compiled_contract, compile_options.expression_width); let functions = optimized_contract.functions.into_iter().map(ContractFunctionArtifact::from).collect(); @@ -166,7 +176,7 @@ pub fn compile_program_( let compiler_context = prepare_compiler_context(entry_point, dependency_graph, file_source_map)?; - let program_width = 3; + let program_width = 4; compiler_context.compile_program(program_width) } @@ -183,7 +193,7 @@ pub fn compile_contract_( let compiler_context = prepare_compiler_context(entry_point, dependency_graph, file_source_map)?; - let program_width = 3; + let program_width = 4; compiler_context.compile_contract(program_width) } diff --git a/noir/noir-repo/cspell.json b/noir/noir-repo/cspell.json index bf3040265c2..eaf3fcd1b00 100644 --- a/noir/noir-repo/cspell.json +++ b/noir/noir-repo/cspell.json @@ -18,6 +18,7 @@ "Backpropagation", "barebones", "barretenberg", + "barustenberg", "bincode", "bindgen", "bitand", @@ -179,6 +180,7 @@ "termcolor", "thiserror", "tslog", + "turbofish", "typecheck", "typechecked", "typevar", diff --git a/noir/noir-repo/docs/docs/noir/concepts/data_types/integers.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/integers.md index 1c6b375db49..6b2d3773912 100644 --- a/noir/noir-repo/docs/docs/noir/concepts/data_types/integers.md +++ b/noir/noir-repo/docs/docs/noir/concepts/data_types/integers.md @@ -5,7 +5,9 @@ keywords: [noir, integer types, methods, examples, arithmetic] sidebar_position: 1 --- -An integer type is a range constrained field type. The Noir frontend supports both unsigned and signed integer types. The allowed sizes are 1, 8, 32 and 64 bits. +An integer type is a range constrained field type. +The Noir frontend supports both unsigned and signed integer types. +The allowed sizes are 1, 8, 16, 32 and 64 bits. :::info diff --git a/noir/noir-repo/docs/docs/noir/standard_library/traits.md b/noir/noir-repo/docs/docs/noir/standard_library/traits.md index b32a2969563..96a7b8e2f22 100644 --- a/noir/noir-repo/docs/docs/noir/standard_library/traits.md +++ b/noir/noir-repo/docs/docs/noir/standard_library/traits.md @@ -186,10 +186,10 @@ These traits abstract over addition, subtraction, multiplication, and division r Implementing these traits for a given type will also allow that type to be used with the corresponding operator for that trait (`+` for Add, etc) in addition to the normal method names. -#include_code add-trait noir_stdlib/src/ops.nr rust -#include_code sub-trait noir_stdlib/src/ops.nr rust -#include_code mul-trait noir_stdlib/src/ops.nr rust -#include_code div-trait noir_stdlib/src/ops.nr rust +#include_code add-trait noir_stdlib/src/ops/arith.nr rust +#include_code sub-trait noir_stdlib/src/ops/arith.nr rust +#include_code mul-trait noir_stdlib/src/ops/arith.nr rust +#include_code div-trait noir_stdlib/src/ops/arith.nr rust The implementations block below is given for the `Add` trait, but the same types that implement `Add` also implement `Sub`, `Mul`, and `Div`. @@ -211,7 +211,7 @@ impl Add for u64 { .. } ### `std::ops::Rem` -#include_code rem-trait noir_stdlib/src/ops.nr rust +#include_code rem-trait noir_stdlib/src/ops/arith.nr rust `Rem::rem(a, b)` is the remainder function returning the result of what is left after dividing `a` and `b`. Implementing `Rem` allows the `%` operator @@ -234,18 +234,27 @@ impl Rem for i64 { fn rem(self, other: i64) -> i64 { self % other } } ### `std::ops::Neg` -#include_code neg-trait noir_stdlib/src/ops.nr rust +#include_code neg-trait noir_stdlib/src/ops/arith.nr rust `Neg::neg` is equivalent to the unary negation operator `-`. Implementations: -#include_code neg-trait-impls noir_stdlib/src/ops.nr rust +#include_code neg-trait-impls noir_stdlib/src/ops/arith.nr rust + +### `std::ops::Not` + +#include_code not-trait noir_stdlib/src/ops/bit.nr rust + +`Not::not` is equivalent to the unary bitwise NOT operator `!`. + +Implementations: +#include_code not-trait-impls noir_stdlib/src/ops/bit.nr rust ### `std::ops::{ BitOr, BitAnd, BitXor }` -#include_code bitor-trait noir_stdlib/src/ops.nr rust -#include_code bitand-trait noir_stdlib/src/ops.nr rust -#include_code bitxor-trait noir_stdlib/src/ops.nr rust +#include_code bitor-trait noir_stdlib/src/ops/bit.nr rust +#include_code bitand-trait noir_stdlib/src/ops/bit.nr rust +#include_code bitxor-trait noir_stdlib/src/ops/bit.nr rust Traits for the bitwise operations `|`, `&`, and `^`. @@ -272,8 +281,8 @@ impl BitOr for i64 { fn bitor(self, other: i64) -> i64 { self | other } } ### `std::ops::{ Shl, Shr }` -#include_code shl-trait noir_stdlib/src/ops.nr rust -#include_code shr-trait noir_stdlib/src/ops.nr rust +#include_code shl-trait noir_stdlib/src/ops/bit.nr rust +#include_code shr-trait noir_stdlib/src/ops/bit.nr rust Traits for a bit shift left and bit shift right. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-oracle.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-oracle.md new file mode 100644 index 00000000000..b84ca5dd986 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-oracle.md @@ -0,0 +1,57 @@ +--- +title: Oracles +description: This guide provides an in-depth understanding of how Oracles work in Noir programming. Learn how to use outside calculations in your programs, constrain oracles, and understand their uses and limitations. +keywords: + - Noir Programming + - Oracles + - JSON-RPC + - Foreign Call Handlers + - Constrained Functions + - Blockchain Programming +sidebar_position: 1 +--- + +If you've seen "The Matrix" you may recall "The Oracle" as Gloria Foster smoking cigarettes and baking cookies. While she appears to "know things", she is actually providing a calculation of a pre-determined future. Noir Oracles are similar, in a way. They don't calculate the future (yet), but they allow you to use outside calculations in your programs. + +![matrix oracle prediction](@site/static/img/memes/matrix_oracle.jpeg) + +A Noir program is usually self-contained. You can pass certain inputs to it, and it will generate a deterministic output for those inputs. But what if you wanted to defer some calculation to an outside process or source? + +Oracles are functions that provide this feature. + +## Use cases + +An example usage for Oracles is proving something on-chain. For example, proving that the ETH-USDC quote was below a certain target at a certain block time. Or even making more complex proofs like proving the ownership of an NFT as an anonymous login method. + +Another interesting use case is to defer expensive calculations to be made outside of the Noir program, and then constraining the result; similar to the use of [unconstrained functions](../noir/concepts//unconstrained.md). + +In short, anything that can be constrained in a Noir program but needs to be fetched from an external source is a great candidate to be used in oracles. + +## Constraining oracles + +Just like in The Matrix, Oracles are powerful. But with great power, comes great responsibility. Just because you're using them in a Noir program doesn't mean they're true. Noir has no superpowers. If you want to prove that Portugal won the Euro Cup 2016, you're still relying on potentially untrusted information. + +To give a concrete example, Alice wants to login to the [NounsDAO](https://nouns.wtf/) forum with her username "noir_nouner" by proving she owns a noun without revealing her ethereum address. Her Noir program could have a oracle call like this: + +```rust +#[oracle(getNoun)] +unconstrained fn get_noun(address: Field) -> Field +``` + +This oracle could naively resolve with the number of Nouns she possesses. However, it is useless as a trusted source, as the oracle could resolve to anything Alice wants. In order to make this oracle call actually useful, Alice would need to constrain the response from the oracle, by proving her address and the noun count belongs to the state tree of the contract. + +In short, **Oracles don't prove anything. Your Noir program does.** + +:::danger + +If you don't constrain the return of your oracle, you could be clearly opening an attack vector on your Noir program. Make double-triple sure that the return of an oracle call is constrained! + +::: + +## How to use Oracles + +On CLI, Nargo resolves oracles by making JSON RPC calls, which means it would require an RPC node to be running. + +In JavaScript, NoirJS accepts and resolves arbitrary call handlers (that is, not limited to JSON) as long as they matches the expected types the developer defines. Refer to [Foreign Call Handler](../reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md) to learn more about NoirJS's call handling. + +If you want to build using oracles, follow through to the [oracle guide](../how_to/how-to-oracles.md) for a simple example on how to do that. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-recursion.md new file mode 100644 index 00000000000..18846176ca7 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/explainers/explainer-recursion.md @@ -0,0 +1,176 @@ +--- +title: Recursive proofs +description: Explore the concept of recursive proofs in Zero-Knowledge programming. Understand how recursion works in Noir, a language for writing smart contracts on the EVM blockchain. Learn through practical examples like Alice and Bob's guessing game, Charlie's recursive merkle tree, and Daniel's reusable components. Discover how to use recursive proofs to optimize computational resources and improve efficiency. + +keywords: + [ + "Recursive Proofs", + "Zero-Knowledge Programming", + "Noir", + "EVM Blockchain", + "Smart Contracts", + "Recursion in Noir", + "Alice and Bob Guessing Game", + "Recursive Merkle Tree", + "Reusable Components", + "Optimizing Computational Resources", + "Improving Efficiency", + "Verification Key", + "Aggregation", + "Recursive zkSNARK schemes", + "PLONK", + "Proving and Verification Keys" + ] +sidebar_position: 1 +pagination_next: how_to/how-to-recursion +--- + +In programming, we tend to think of recursion as something calling itself. A classic example would be the calculation of the factorial of a number: + +```js +function factorial(n) { + if (n === 0 || n === 1) { + return 1; + } else { + return n * factorial(n - 1); + } +} +``` + +In this case, while `n` is not `1`, this function will keep calling itself until it hits the base case, bubbling up the result on the call stack: + +```md + Is `n` 1? <--------- + /\ / + / \ n = n -1 + / \ / + Yes No -------- +``` + +In Zero-Knowledge, recursion has some similarities. + +It is not a Noir function calling itself, but a proof being used as an input to another circuit. In short, you verify one proof *inside* another proof, returning the proof that both proofs are valid. + +This means that, given enough computational resources, you can prove the correctness of any arbitrary number of proofs in a single proof. This could be useful to design state channels (for which a common example would be [Bitcoin's Lightning Network](https://en.wikipedia.org/wiki/Lightning_Network)), to save on gas costs by settling one proof on-chain, or simply to make business logic less dependent on a consensus mechanism. + +## Examples + +Let us look at some of these examples + +### Alice and Bob - Guessing game + +Alice and Bob are friends, and they like guessing games. They want to play a guessing game online, but for that, they need a trusted third-party that knows both of their secrets and finishes the game once someone wins. + +So, they use zero-knowledge proofs. Alice tries to guess Bob's number, and Bob will generate a ZK proof stating whether she succeeded or failed. + +This ZK proof can go on a smart contract, revealing the winner and even giving prizes. However, this means every turn needs to be verified on-chain. This incurs some cost and waiting time that may simply make the game too expensive or time-consuming to be worth it. + +As a solution, Alice proposes the following: "what if Bob generates his proof, and instead of sending it on-chain, I verify it *within* my own proof before playing my own turn?". + +She can then generate a proof that she verified his proof, and so on. + +```md + Did you fail? <-------------------------- + / \ / + / \ n = n -1 + / \ / + Yes No / + | | / + | | / + | You win / + | / + | / +Generate proof of that / + + / + my own guess ---------------- +``` + +### Charlie - Recursive merkle tree + +Charlie is a concerned citizen, and wants to be sure his vote in an election is accounted for. He votes with a ZK proof, but he has no way of knowing that his ZK proof was included in the total vote count! + +If the vote collector puts all of the votes into a [Merkle tree](https://en.wikipedia.org/wiki/Merkle_tree), everyone can prove the verification of two proofs within one proof, as such: + +```md + abcd + __________|______________ + | | + ab cd + _____|_____ ______|______ + | | | | + alice bob charlie daniel +``` + +Doing this recursively allows us to arrive on a final proof `abcd` which if true, verifies the correctness of all the votes. + +### Daniel - Reusable components + +Daniel has a big circuit and a big headache. A part of his circuit is a setup phase that finishes with some assertions that need to be made. But that section alone takes most of the proving time, and is largely independent of the rest of the circuit. + +He might find it more efficient to generate a proof for that setup phase separately, and verify that proof recursively in the actual business logic section of his circuit. This will allow for parallelization of both proofs, which results in a considerable speedup. + +## What params do I need + +As you can see in the [recursion reference](noir/standard_library/recursion.md), a simple recursive proof requires: + +- The proof to verify +- The Verification Key of the circuit that generated the proof +- A hash of this verification key, as it's needed for some backends +- The public inputs for the proof + +:::info + +Recursive zkSNARK schemes do not necessarily "verify a proof" in the sense that you expect a true or false to be spit out by the verifier. Rather an aggregation object is built over the public inputs. + +So, taking the example of Alice and Bob and their guessing game: + +- Alice makes her guess. Her proof is *not* recursive: it doesn't verify any proof within it! It's just a standard `assert(x != y)` circuit +- Bob verifies Alice's proof and makes his own guess. In this circuit, he doesn't exactly *prove* the verification of Alice's proof. Instead, he *aggregates* his proof to Alice's proof. The actual verification is done when the full proof is verified, for example when using `nargo verify` or through the verifier smart contract. + +We can imagine recursive proofs a [relay race](https://en.wikipedia.org/wiki/Relay_race). The first runner doesn't have to receive the baton from anyone else, as he/she already starts with it. But when his/her turn is over, the next runner needs to receive it, run a bit more, and pass it along. Even though every runner could theoretically verify the baton mid-run (why not? 🏃🔍), only at the end of the race does the referee verify that the whole race is valid. + +::: + +## Some architecture + +As with everything in computer science, there's no one-size-fits all. But there are some patterns that could help understanding and implementing them. To give three examples: + +### Adding some logic to a proof verification + +This would be an approach for something like our guessing game, where proofs are sent back and forth and are verified by each opponent. This circuit would be divided in two sections: + +- A `recursive verification` section, which would be just the call to `std::verify_proof`, and that would be skipped on the first move (since there's no proof to verify) +- A `guessing` section, which is basically the logic part where the actual guessing happens + +In such a situation, and assuming Alice is first, she would skip the first part and try to guess Bob's number. Bob would then verify her proof on the first section of his run, and try to guess Alice's number on the second part, and so on. + +### Aggregating proofs + +In some one-way interaction situations, recursion would allow for aggregation of simple proofs that don't need to be immediately verified on-chain or elsewhere. + +To give a practical example, a barman wouldn't need to verify a "proof-of-age" on-chain every time he serves alcohol to a customer. Instead, the architecture would comprise two circuits: + +- A `main`, non-recursive circuit with some logic +- A `recursive` circuit meant to verify two proofs in one proof + +The customer's proofs would be intermediate, and made on their phones, and the barman could just verify them locally. He would then aggregate them into a final proof sent on-chain (or elsewhere) at the end of the day. + +### Recursively verifying different circuits + +Nothing prevents you from verifying different circuits in a recursive proof, for example: + +- A `circuit1` circuit +- A `circuit2` circuit +- A `recursive` circuit + +In this example, a regulator could verify that taxes were paid for a specific purchase by aggregating both a `payer` circuit (proving that a purchase was made and taxes were paid), and a `receipt` circuit (proving that the payment was received) + +## How fast is it + +At the time of writing, verifying recursive proofs is surprisingly fast. This is because most of the time is spent on generating the verification key that will be used to generate the next proof. So you are able to cache the verification key and reuse it later. + +Currently, Noir JS packages don't expose the functionality of loading proving and verification keys, but that feature exists in the underlying `bb.js` package. + +## How can I try it + +Learn more about using recursion in Nargo and NoirJS in the [how-to guide](../how_to/how-to-recursion.md) and see a full example in [noir-examples](https://github.com/noir-lang/noir-examples). diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/_category_.json new file mode 100644 index 00000000000..5d694210bbf --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 0, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/_category_.json new file mode 100644 index 00000000000..23b560f610b --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 1, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/index.md new file mode 100644 index 00000000000..743c4d8d634 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/index.md @@ -0,0 +1,142 @@ +--- +title: Creating a Project +description: + Learn how to create and verify your first Noir program using Nargo, a programming language for + zero-knowledge proofs. +keywords: + [ + Nargo, + Noir, + zero-knowledge proofs, + programming language, + create Noir program, + verify Noir program, + step-by-step guide, + ] +sidebar_position: 1 + +--- + +Now that we have installed Nargo, it is time to make our first hello world program! + +## Create a Project Directory + +Noir code can live anywhere on your computer. Let us create a _projects_ folder in the home +directory to house our Noir programs. + +For Linux, macOS, and Windows PowerShell, create the directory and change directory into it by +running: + +```sh +mkdir ~/projects +cd ~/projects +``` + +## Create Our First Nargo Project + +Now that we are in the projects directory, create a new Nargo project by running: + +```sh +nargo new hello_world +``` + +> **Note:** `hello_world` can be any arbitrary project name, we are simply using `hello_world` for +> demonstration. +> +> In production, the common practice is to name the project folder as `circuits` for better +> identifiability when sitting alongside other folders in the codebase (e.g. `contracts`, `scripts`, +> `test`). + +A `hello_world` folder would be created. Similar to Rust, the folder houses _src/main.nr_ and +_Nargo.toml_ which contain the source code and environmental options of your Noir program +respectively. + +### Intro to Noir Syntax + +Let us take a closer look at _main.nr_. The default _main.nr_ generated should look like this: + +```rust +fn main(x : Field, y : pub Field) { + assert(x != y); +} +``` + +The first line of the program specifies the program's inputs: + +```rust +x : Field, y : pub Field +``` + +Program inputs in Noir are private by default (e.g. `x`), but can be labeled public using the +keyword `pub` (e.g. `y`). To learn more about private and public values, check the +[Data Types](../../noir/concepts/data_types/index.md) section. + +The next line of the program specifies its body: + +```rust +assert(x != y); +``` + +The Noir syntax `assert` can be interpreted as something similar to constraints in other zk-contract languages. + +For more Noir syntax, check the [Language Concepts](../../noir/concepts/comments.md) chapter. + +## Build In/Output Files + +Change directory into _hello_world_ and build in/output files for your Noir program by running: + +```sh +cd hello_world +nargo check +``` + +Two additional files would be generated in your project directory: + +_Prover.toml_ houses input values, and _Verifier.toml_ houses public values. + +## Prove Our Noir Program + +Now that the project is set up, we can create a proof of correct execution of our Noir program. + +Fill in input values for execution in the _Prover.toml_ file. For example: + +```toml +x = "1" +y = "2" +``` + +Prove the valid execution of your Noir program: + +```sh +nargo prove +``` + +A new folder _proofs_ would then be generated in your project directory, containing the proof file +`.proof`, where the project name is defined in Nargo.toml. + +The _Verifier.toml_ file would also be updated with the public values computed from program +execution (in this case the value of `y`): + +```toml +y = "0x0000000000000000000000000000000000000000000000000000000000000002" +``` + +> **Note:** Values in _Verifier.toml_ are computed as 32-byte hex values. + +## Verify Our Noir Program + +Once a proof is generated, we can verify correct execution of our Noir program by verifying the +proof file. + +Verify your proof by running: + +```sh +nargo verify +``` + +The verification will complete in silence if it is successful. If it fails, it will log the +corresponding error instead. + +Congratulations, you have now created and verified a proof for your very first Noir program! + +In the [next section](./project_breakdown.md), we will go into more detail on each step performed. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/project_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/project_breakdown.md new file mode 100644 index 00000000000..6160a102c6c --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/hello_noir/project_breakdown.md @@ -0,0 +1,199 @@ +--- +title: Project Breakdown +description: + Learn about the anatomy of a Nargo project, including the purpose of the Prover and Verifier TOML + files, and how to prove and verify your program. +keywords: + [Nargo, Nargo project, Prover.toml, Verifier.toml, proof verification, private asset transfer] +sidebar_position: 2 +--- + +This section breaks down our hello world program from the previous section. We elaborate on the project +structure and what the `prove` and `verify` commands did. + +## Anatomy of a Nargo Project + +Upon creating a new project with `nargo new` and building the in/output files with `nargo check` +commands, you would get a minimal Nargo project of the following structure: + + - src + - Prover.toml + - Verifier.toml + - Nargo.toml + +The source directory _src_ holds the source code for your Noir program. By default only a _main.nr_ +file will be generated within it. + +### Prover.toml + +_Prover.toml_ is used for specifying the input values for executing and proving the program. You can specify `toml` files with different names by using the `--prover-name` or `-p` flags, see the [Prover](#provertoml) section below. Optionally you may specify expected output values for prove-time checking as well. + +### Verifier.toml + +_Verifier.toml_ contains public in/output values computed when executing the Noir program. + +### Nargo.toml + +_Nargo.toml_ contains the environmental options of your project. It contains a "package" section and a "dependencies" section. + +Example Nargo.toml: + +```toml +[package] +name = "noir_starter" +type = "bin" +authors = ["Alice"] +compiler_version = "0.9.0" +description = "Getting started with Noir" +entry = "circuit/main.nr" +license = "MIT" + +[dependencies] +ecrecover = {tag = "v0.9.0", git = "https://github.com/colinnielsen/ecrecover-noir.git"} +``` + +Nargo.toml for a [workspace](../../noir/modules_packages_crates/workspaces.md) will look a bit different. For example: + +```toml +[workspace] +members = ["crates/a", "crates/b"] +default-member = "crates/a" +``` + +#### Package section + +The package section defines a number of fields including: + +- `name` (**required**) - the name of the package +- `type` (**required**) - can be "bin", "lib", or "contract" to specify whether its a binary, library or Aztec contract +- `authors` (optional) - authors of the project +- `compiler_version` - specifies the version of the compiler to use. This is enforced by the compiler and follow's [Rust's versioning](https://doc.rust-lang.org/cargo/reference/manifest.html#the-version-field), so a `compiler_version = 0.18.0` will enforce Nargo version 0.18.0, `compiler_version = ^0.18.0` will enforce anything above 0.18.0 but below 0.19.0, etc. For more information, see how [Rust handles these operators](https://docs.rs/semver/latest/semver/enum.Op.html) +- `description` (optional) +- `entry` (optional) - a relative filepath to use as the entry point into your package (overrides the default of `src/lib.nr` or `src/main.nr`) +- `backend` (optional) +- `license` (optional) + +#### Dependencies section + +This is where you will specify any dependencies for your project. See the [Dependencies page](../../noir/modules_packages_crates/dependencies.md) for more info. + +`./proofs/` and `./contract/` directories will not be immediately visible until you create a proof or +verifier contract respectively. + +### main.nr + +The _main.nr_ file contains a `main` method, this method is the entry point into your Noir program. + +In our sample program, _main.nr_ looks like this: + +```rust +fn main(x : Field, y : Field) { + assert(x != y); +} +``` + +The parameters `x` and `y` can be seen as the API for the program and must be supplied by the +prover. Since neither `x` nor `y` is marked as public, the verifier does not supply any inputs, when +verifying the proof. + +The prover supplies the values for `x` and `y` in the _Prover.toml_ file. + +As for the program body, `assert` ensures that the condition to be satisfied (e.g. `x != y`) is +constrained by the proof of the execution of said program (i.e. if the condition was not met, the +verifier would reject the proof as an invalid proof). + +### Prover.toml + +The _Prover.toml_ file is a file which the prover uses to supply his witness values(both private and +public). + +In our hello world program the _Prover.toml_ file looks like this: + +```toml +x = "1" +y = "2" +``` + +When the command `nargo prove` is executed, two processes happen: + +1. Noir creates a proof that `x`, which holds the value of `1`, and `y`, which holds the value of `2`, + is not equal. This inequality constraint is due to the line `assert(x != y)`. + +2. Noir creates and stores the proof of this statement in the _proofs_ directory in a file called your-project.proof. So if your project is named "private_voting" (defined in the project Nargo.toml), the proof will be saved at `./proofs/private_voting.proof`. Opening this file will display the proof in hex format. + +#### Arrays of Structs + +The following code shows how to pass an array of structs to a Noir program to generate a proof. + +```rust +// main.nr +struct Foo { + bar: Field, + baz: Field, +} + +fn main(foos: [Foo; 3]) -> pub Field { + foos[2].bar + foos[2].baz +} +``` + +Prover.toml: + +```toml +[[foos]] # foos[0] +bar = 0 +baz = 0 + +[[foos]] # foos[1] +bar = 0 +baz = 0 + +[[foos]] # foos[2] +bar = 1 +baz = 2 +``` + +#### Custom toml files + +You can specify a `toml` file with a different name to use for proving by using the `--prover-name` or `-p` flags. + +This command looks for proof inputs in the default **Prover.toml** and generates the proof and saves it at `./proofs/.proof`: + +```bash +nargo prove +``` + +This command looks for proof inputs in the custom **OtherProver.toml** and generates proof and saves it at `./proofs/.proof`: + +```bash +nargo prove -p OtherProver +``` + +## Verifying a Proof + +When the command `nargo verify` is executed, two processes happen: + +1. Noir checks in the _proofs_ directory for a proof file with the project name (eg. test_project.proof) + +2. If that file is found, the proof's validity is checked + +> **Note:** The validity of the proof is linked to the current Noir program; if the program is +> changed and the verifier verifies the proof, it will fail because the proof is not valid for the +> _modified_ Noir program. + +In production, the prover and the verifier are usually two separate entities. A prover would +retrieve the necessary inputs, execute the Noir program, generate a proof and pass it to the +verifier. The verifier would then retrieve the public inputs, usually from external sources, and +verify the validity of the proof against it. + +Take a private asset transfer as an example: + +A person using a browser as the prover would retrieve private inputs locally (e.g. the user's private key) and +public inputs (e.g. the user's encrypted balance on-chain), compute the transfer, generate a proof +and submit it to the verifier smart contract. + +The verifier contract would then draw the user's encrypted balance directly from the blockchain and +verify the proof submitted against it. If the verification passes, additional functions in the +verifier contract could trigger (e.g. approve the asset transfer). + +Now that you understand the concepts, you'll probably want some editor feedback while you are writing more complex code. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/_category_.json new file mode 100644 index 00000000000..0c02fb5d4d7 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/_category_.json @@ -0,0 +1,6 @@ +{ + "position": 0, + "label": "Install Nargo", + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/index.md new file mode 100644 index 00000000000..4ef86aa5914 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/index.md @@ -0,0 +1,48 @@ +--- +title: Nargo Installation +description: + nargo is a command line tool for interacting with Noir programs. This page is a quick guide on how to install Nargo through the most common and easy method, noirup +keywords: [ + Nargo + Noir + Rust + Cargo + Noirup + Installation + Terminal Commands + Version Check + Nightlies + Specific Versions + Branches + Noirup Repository +] +pagination_next: getting_started/hello_noir/index +--- + +`nargo` is the one-stop-shop for almost everything related with Noir. The name comes from our love for Rust and its package manager `cargo`. + +With `nargo`, you can start new projects, compile, execute, prove, verify, test, generate solidity contracts, and do pretty much all that is available in Noir. + +Similarly to `rustup`, we also maintain an easy installation method that covers most machines: `noirup`. + +## Installing Noirup + +Open a terminal on your machine, and write: + +```bash +curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash +``` + +Close the terminal, open another one, and run + +```bash +noirup +``` + +Done. That's it. You should have the latest version working. You can check with `nargo --version`. + +You can also install nightlies, specific versions +or branches. Check out the [noirup repository](https://github.com/noir-lang/noirup) for more +information. + +Now we're ready to start working on [our first Noir program!](../hello_noir/index.md) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/other_install_methods.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/other_install_methods.md new file mode 100644 index 00000000000..3634723562b --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/installation/other_install_methods.md @@ -0,0 +1,102 @@ +--- +title: Alternative Installations +description: There are different ways to install Nargo, the one-stop shop and command-line tool for developing Noir programs. This guide explains how to specify which version to install when using noirup, and using WSL for windows. +keywords: [ + Installation + Nargo + Noirup + Binaries + Compiling from Source + WSL for Windows + macOS + Linux + Nix + Direnv + Uninstalling Nargo + ] +sidebar_position: 1 +--- + +## Encouraged Installation Method: Noirup + +Noirup is the endorsed method for installing Nargo, streamlining the process of fetching binaries or compiling from source. It supports a range of options to cater to your specific needs, from nightly builds and specific versions to compiling from various sources. + +### Installing Noirup + +First, ensure you have `noirup` installed: + +```sh +curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash +``` + +### Fetching Binaries + +With `noirup`, you can easily switch between different Nargo versions, including nightly builds: + +- **Nightly Version**: Install the latest nightly build. + + ```sh + noirup --version nightly + ``` + +- **Specific Version**: Install a specific version of Nargo. + ```sh + noirup --version + ``` + +### Compiling from Source + +`noirup` also enables compiling Nargo from various sources: + +- **From a Specific Branch**: Install from the latest commit on a branch. + + ```sh + noirup --branch + ``` + +- **From a Fork**: Install from the main branch of a fork. + + ```sh + noirup --repo + ``` + +- **From a Specific Branch in a Fork**: Install from a specific branch in a fork. + + ```sh + noirup --repo --branch + ``` + +- **From a Specific Pull Request**: Install from a specific PR. + + ```sh + noirup --pr + ``` + +- **From a Specific Commit**: Install from a specific commit. + + ```sh + noirup -C + ``` + +- **From Local Source**: Compile and install from a local directory. + ```sh + noirup --path ./path/to/local/source + ``` + +## Installation on Windows + +The default backend for Noir (Barretenberg) doesn't provide Windows binaries at this time. For that reason, Noir cannot be installed natively. However, it is available by using Windows Subsystem for Linux (WSL). + +Step 1: Follow the instructions [here](https://learn.microsoft.com/en-us/windows/wsl/install) to install and run WSL. + +step 2: Follow the [Noirup instructions](#encouraged-installation-method-noirup). + +## Uninstalling Nargo + +If you installed Nargo with `noirup`, you can uninstall Nargo by removing the files in `~/.nargo`, `~/nargo`, and `~/noir_cache`. This ensures that all installed binaries, configurations, and cache related to Nargo are fully removed from your system. + +```bash +rm -r ~/.nargo +rm -r ~/nargo +rm -r ~/noir_cache +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/tooling/noir_codegen.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/tooling/noir_codegen.md new file mode 100644 index 00000000000..d65151da0ab --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/getting_started/tooling/noir_codegen.md @@ -0,0 +1,113 @@ +--- +title: Noir Codegen for TypeScript +description: Learn how to use Noir codegen to generate TypeScript bindings +keywords: [Nargo, Noir, compile, TypeScript] +sidebar_position: 2 +--- + +When using TypeScript, it is extra work to interpret Noir program outputs in a type-safe way. Third party libraries may exist for popular Noir programs, but they are either hard to find or unmaintained. + +Now you can generate TypeScript bindings for your Noir programs in two steps: +1. Exporting Noir functions using `nargo export` +2. Using the TypeScript module `noir_codegen` to generate TypeScript binding + +**Note:** you can only export functions from a Noir *library* (not binary or contract program types). + +## Installation + +### Your TypeScript project + +If you don't already have a TypeScript project you can add the module with `yarn` (or `npm`), then initialize it: + +```bash +yarn add typescript -D +npx tsc --init +``` + +### Add TypeScript module - `noir_codegen` + +The following command will add the module to your project's devDependencies: + +```bash +yarn add @noir-lang/noir_codegen -D +``` + +### Nargo library +Make sure you have Nargo, v0.25.0 or greater, installed. If you don't, follow the [installation guide](../installation/index.md). + +If you're in a new project, make a `circuits` folder and create a new Noir library: + +```bash +mkdir circuits && cd circuits +nargo new --lib myNoirLib +``` + +## Usage + +### Export ABI of specified functions + +First go to the `.nr` files in your Noir library, and add the `#[export]` macro to each function that you want to use in TypeScript. + +```rust +#[export] +fn your_function(... +``` + +From your Noir library (where `Nargo.toml` is), run the following command: + +```bash +nargo export +``` + +You will now have an `export` directory with a .json file per exported function. + +You can also specify the directory of Noir programs using `--program-dir`, for example: + +```bash +nargo export --program-dir=./circuits/myNoirLib +``` + +### Generate TypeScript bindings from exported functions + +To use the `noir-codegen` package we added to the TypeScript project: + +```bash +yarn noir-codegen ./export/your_function.json +``` + +This creates an `exports` directory with an `index.ts` file containing all exported functions. + +**Note:** adding `--out-dir` allows you to specify an output dir for your TypeScript bindings to go. Eg: + +```bash +yarn noir-codegen ./export/*.json --out-dir ./path/to/output/dir +``` + +## Example .nr function to .ts output + +Consider a Noir library with this function: + +```rust +#[export] +fn not_equal(x: Field, y: Field) -> bool { + x != y +} +``` + +After the export and codegen steps, you should have an `index.ts` like: + +```typescript +export type Field = string; + + +export const is_equal_circuit: CompiledCircuit = {"abi":{"parameters":[{"name":"x","type":{"kind":"field"},"visibility":"private"},{"name":"y","type":{"kind":"field"},"visibility":"private"}],"param_witnesses":{"x":[{"start":0,"end":1}],"y":[{"start":1,"end":2}]},"return_type":{"abi_type":{"kind":"boolean"},"visibility":"private"},"return_witnesses":[4]},"bytecode":"H4sIAAAAAAAA/7WUMQ7DIAxFQ0Krrr2JjSGYLVcpKrn/CaqqDQN12WK+hPBgmWd/wEyHbF1SS923uhOs3pfoChI+wKXMAXzIKyNj4PB0TFTYc0w5RUjoqeAeEu1wqK0F54RGkWvW44LPzExnlkbMEs4JNZmN8PxS42uHv82T8a3Jeyn2Ks+VLPcO558HmyLMCDOXAXXtpPt4R/Rt9T36ss6dS9HGPx/eG17nGegKBQAA"}; + +export async function is_equal(x: Field, y: Field, foreignCallHandler?: ForeignCallHandler): Promise { + const program = new Noir(is_equal_circuit); + const args: InputMap = { x, y }; + const { returnValue } = await program.execute(args, foreignCallHandler); + return returnValue as boolean; +} +``` + +Now the `is_equal()` function and relevant types are readily available for use in TypeScript. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/_category_.json new file mode 100644 index 00000000000..23b560f610b --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 1, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/_category_.json new file mode 100644 index 00000000000..cc2cbb1c253 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "Debugging", + "position": 5, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_the_repl.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_the_repl.md new file mode 100644 index 00000000000..09e5bae68ad --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_the_repl.md @@ -0,0 +1,164 @@ +--- +title: Using the REPL Debugger +description: + Step by step guide on how to debug your Noir circuits with the REPL Debugger. +keywords: + [ + Nargo, + Noir CLI, + Noir Debugger, + REPL, + ] +sidebar_position: 1 +--- + +#### Pre-requisites + +In order to use the REPL debugger, first you need to install recent enough versions of Nargo and vscode-noir. + +## Debugging a simple circuit + +Let's debug a simple circuit: + +```rust +fn main(x : Field, y : pub Field) { + assert(x != y); +} +``` + +To start the REPL debugger, using a terminal, go to a Noir circuit's home directory. Then: + +`$ nargo debug` + +You should be seeing this in your terminal: + +``` +[main] Starting debugger +At ~/noir-examples/recursion/circuits/main/src/main.nr:1:9 + 1 -> fn main(x : Field, y : pub Field) { + 2 assert(x != y); + 3 } +> +``` + +The debugger displays the current Noir code location, and it is now waiting for us to drive it. + +Let's first take a look at the available commands. For that we'll use the `help` command. + +``` +> help +Available commands: + + opcodes display ACIR opcodes + into step into to the next opcode + next step until a new source location is reached + out step until a new source location is reached + and the current stack frame is finished + break LOCATION:OpcodeLocation add a breakpoint at an opcode location + over step until a new source location is reached + without diving into function calls + restart restart the debugging session + delete LOCATION:OpcodeLocation delete breakpoint at an opcode location + witness show witness map + witness index:u32 display a single witness from the witness map + witness index:u32 value:String update a witness with the given value + memset index:usize value:String update a memory cell with the given + value + continue continue execution until the end of the + program + vars show variable values available at this point + in execution + stacktrace display the current stack trace + memory show memory (valid when executing unconstrained code) + step step to the next ACIR opcode + +Other commands: + + help Show this help message + quit Quit repl + +``` + +Some commands operate only for unconstrained functions, such as `memory` and `memset`. If you try to use them while execution is paused at an ACIR opcode, the debugger will simply inform you that you are not executing unconstrained code: + +``` +> memory +Unconstrained VM memory not available +> +``` + +Before continuing, we can take a look at the initial witness map: + +``` +> witness +_0 = 1 +_1 = 2 +> +``` + +Cool, since `x==1`, `y==2`, and we want to check that `x != y`, our circuit should succeed. At this point we could intervene and use the witness setter command to change one of the witnesses. Let's set `y=3`, then back to 2, so we don't affect the expected result: + +``` +> witness +_0 = 1 +_1 = 2 +> witness 1 3 +_1 = 3 +> witness +_0 = 1 +_1 = 3 +> witness 1 2 +_1 = 2 +> witness +_0 = 1 +_1 = 2 +> +``` + +Now we can inspect the current state of local variables. For that we use the `vars` command. + +``` +> vars +> +``` + +We currently have no vars in context, since we are at the entry point of the program. Let's use `next` to execute until the next point in the program. + +``` +> vars +> next +At ~/noir-examples/recursion/circuits/main/src/main.nr:1:20 + 1 -> fn main(x : Field, y : pub Field) { + 2 assert(x != y); + 3 } +> vars +x:Field = 0x01 +``` + +As a result of stepping, the variable `x`, whose initial value comes from the witness map, is now in context and returned by `vars`. + +``` +> next + 1 fn main(x : Field, y : pub Field) { + 2 -> assert(x != y); + 3 } +> vars +y:Field = 0x02 +x:Field = 0x01 +``` + +Stepping again we can finally see both variables and their values. And now we can see that the next assertion should succeed. + +Let's continue to the end: + +``` +> continue +(Continuing execution...) +Finished execution +> q +[main] Circuit witness successfully solved +``` + +Upon quitting the debugger after a solved circuit, the resulting circuit witness gets saved, equivalent to what would happen if we had run the same circuit with `nargo execute`. + +We just went through the basics of debugging using Noir REPL debugger. For a comprehensive reference, check out [the reference page](../../reference/debugger/debugger_repl.md). diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_vs_code.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_vs_code.md new file mode 100644 index 00000000000..a5858c1a5eb --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/debugger/debugging_with_vs_code.md @@ -0,0 +1,68 @@ +--- +title: Using the VS Code Debugger +description: + Step by step guide on how to debug your Noir circuits with the VS Code Debugger configuration and features. +keywords: + [ + Nargo, + Noir CLI, + Noir Debugger, + VS Code, + IDE, + ] +sidebar_position: 0 +--- + +This guide will show you how to use VS Code with the vscode-noir extension to debug a Noir project. + +#### Pre-requisites + +- Nargo +- vscode-noir +- A Noir project with a `Nargo.toml`, `Prover.toml` and at least one Noir (`.nr`) containing an entry point function (typically `main`). + +## Running the debugger + +The easiest way to start debugging is to open the file you want to debug, and press `F5`. This will cause the debugger to launch, using your `Prover.toml` file as input. + +You should see something like this: + +![Debugger launched](@site/static/img/debugger/1-started.png) + +Let's inspect the state of the program. For that, we open VS Code's _Debug pane_. Look for this icon: + +![Debug pane icon](@site/static/img/debugger/2-icon.png) + +You will now see two categories of variables: Locals and Witness Map. + +![Debug pane expanded](@site/static/img/debugger/3-debug-pane.png) + +1. **Locals**: variables of your program. At this point in execution this section is empty, but as we step through the code it will get populated by `x`, `result`, `digest`, etc. + +2. **Witness map**: these are initially populated from your project's `Prover.toml` file. In this example, they will be used to populate `x` and `result` at the beginning of the `main` function. + +Most of the time you will probably be focusing mostly on locals, as they represent the high level state of your program. + +You might be interested in inspecting the witness map in case you are trying to solve a really low level issue in the compiler or runtime itself, so this concerns mostly advanced or niche users. + +Let's step through the program, by using the debugger buttons or their corresponding keyboard shortcuts. + +![Debugger buttons](@site/static/img/debugger/4-debugger-buttons.png) + +Now we can see in the variables pane that there's values for `digest`, `result` and `x`. + +![Inspecting locals](@site/static/img/debugger/5-assert.png) + +We can also inspect the values of variables by directly hovering on them on the code. + +![Hover locals](@site/static/img/debugger/6-hover.png) + +Let's set a break point at the `keccak256` function, so we can continue execution up to the point when it's first invoked without having to go one step at a time. + +We just need to click the to the right of the line number 18. Once the breakpoint appears, we can click the `continue` button or use its corresponding keyboard shortcut (`F5` by default). + +![Breakpoint](@site/static/img/debugger/7-break.png) + +Now we are debugging the `keccak256` function, notice the _Call Stack pane_ at the lower right. This lets us inspect the current call stack of our process. + +That covers most of the current debugger functionalities. Check out [the reference](../../reference/debugger/debugger_vscode.md) for more details on how to configure the debugger. \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-oracles.md new file mode 100644 index 00000000000..8cf8035a5c4 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-oracles.md @@ -0,0 +1,276 @@ +--- +title: How to use Oracles +description: Learn how to use oracles in your Noir program with examples in both Nargo and NoirJS. This guide also covers writing a JSON RPC server and providing custom foreign call handlers for NoirJS. +keywords: + - Noir Programming + - Oracles + - Nargo + - NoirJS + - JSON RPC Server + - Foreign Call Handlers +sidebar_position: 1 +--- + +This guide shows you how to use oracles in your Noir program. For the sake of clarity, it assumes that: + +- You have read the [explainer on Oracles](../explainers/explainer-oracle.md) and are comfortable with the concept. +- You have a Noir program to add oracles to. You can create one using the [vite-hardhat starter](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat) as a boilerplate. +- You understand the concept of a JSON-RPC server. Visit the [JSON-RPC website](https://www.jsonrpc.org/) if you need a refresher. +- You are comfortable with server-side JavaScript (e.g. Node.js, managing packages, etc.). + +For reference, you can find the snippets used in this tutorial on the [Aztec DevRel Repository](https://github.com/AztecProtocol/dev-rel/tree/main/code-snippets/how-to-oracles). + +## Rundown + +This guide has 3 major steps: + +1. How to modify our Noir program to make use of oracle calls as unconstrained functions +2. How to write a JSON RPC Server to resolve these oracle calls with Nargo +3. How to use them in Nargo and how to provide a custom resolver in NoirJS + +## Step 1 - Modify your Noir program + +An oracle is defined in a Noir program by defining two methods: + +- An unconstrained method - This tells the compiler that it is executing an [unconstrained functions](../noir/concepts//unconstrained.md). +- A decorated oracle method - This tells the compiler that this method is an RPC call. + +An example of an oracle that returns a `Field` would be: + +```rust +#[oracle(getSqrt)] +unconstrained fn sqrt(number: Field) -> Field { } + +unconstrained fn get_sqrt(number: Field) -> Field { + sqrt(number) +} +``` + +In this example, we're wrapping our oracle function in a unconstrained method, and decorating it with `oracle(getSqrt)`. We can then call the unconstrained function as we would call any other function: + +```rust +fn main(input: Field) { + let sqrt = get_sqrt(input); +} +``` + +In the next section, we will make this `getSqrt` (defined on the `sqrt` decorator) be a method of the RPC server Noir will use. + +:::danger + +As explained in the [Oracle Explainer](../explainers/explainer-oracle.md), this `main` function is unsafe unless you constrain its return value. For example: + +```rust +fn main(input: Field) { + let sqrt = get_sqrt(input); + assert(sqrt.pow_32(2) as u64 == input as u64); // <---- constrain the return of an oracle! +} +``` + +::: + +:::info + +Currently, oracles only work with single params or array params. For example: + +```rust +#[oracle(getSqrt)] +unconstrained fn sqrt([Field; 2]) -> [Field; 2] { } +``` + +::: + +## Step 2 - Write an RPC server + +Brillig will call *one* RPC server. Most likely you will have to write your own, and you can do it in whatever language you prefer. In this guide, we will do it in Javascript. + +Let's use the above example of an oracle that consumes an array with two `Field` and returns their square roots: + +```rust +#[oracle(getSqrt)] +unconstrained fn sqrt(input: [Field; 2]) -> [Field; 2] { } + +unconstrained fn get_sqrt(input: [Field; 2]) -> [Field; 2] { + sqrt(input) +} + +fn main(input: [Field; 2]) { + let sqrt = get_sqrt(input); + assert(sqrt[0].pow_32(2) as u64 == input[0] as u64); + assert(sqrt[1].pow_32(2) as u64 == input[1] as u64); +} +``` + +:::info + +Why square root? + +In general, computing square roots is computationally more expensive than multiplications, which takes a toll when speaking about ZK applications. In this case, instead of calculating the square root in Noir, we are using our oracle to offload that computation to be made in plain. In our circuit we can simply multiply the two values. + +::: + +Now, we should write the correspondent RPC server, starting with the [default JSON-RPC 2.0 boilerplate](https://www.npmjs.com/package/json-rpc-2.0#example): + +```js +import { JSONRPCServer } from "json-rpc-2.0"; +import express from "express"; +import bodyParser from "body-parser"; + +const app = express(); +app.use(bodyParser.json()); + +const server = new JSONRPCServer(); +app.post("/", (req, res) => { + const jsonRPCRequest = req.body; + server.receive(jsonRPCRequest).then((jsonRPCResponse) => { + if (jsonRPCResponse) { + res.json(jsonRPCResponse); + } else { + res.sendStatus(204); + } + }); +}); + +app.listen(5555); +``` + +Now, we will add our `getSqrt` method, as expected by the `#[oracle(getSqrt)]` decorator in our Noir code. It maps through the params array and returns their square roots: + +```js +server.addMethod("getSqrt", async (params) => { + const values = params[0].Array.map((field) => { + return `${Math.sqrt(parseInt(field, 16))}`; + }); + return { values: [{ Array: values }] }; +}); +``` + +:::tip + +Brillig expects an object with an array of values. Each value is an object declaring to be `Single` or `Array` and returning a field element *as a string*. For example: + +```json +{ "values": [{ "Array": ["1", "2"] }]} +{ "values": [{ "Single": "1" }]} +{ "values": [{ "Single": "1" }, { "Array": ["1", "2"] }]} +``` + +If you're using Typescript, the following types may be helpful in understanding the expected return value and making sure they're easy to follow: + +```js +interface SingleForeignCallParam { + Single: string, +} + +interface ArrayForeignCallParam { + Array: string[], +} + +type ForeignCallParam = SingleForeignCallParam | ArrayForeignCallParam; + +interface ForeignCallResult { + values: ForeignCallParam[], +} +``` + +::: + +## Step 3 - Usage with Nargo + +Using the [`nargo` CLI tool](../getting_started/installation/index.md), you can use oracles in the `nargo test`, `nargo execute` and `nargo prove` commands by passing a value to `--oracle-resolver`. For example: + +```bash +nargo test --oracle-resolver http://localhost:5555 +``` + +This tells `nargo` to use your RPC Server URL whenever it finds an oracle decorator. + +## Step 4 - Usage with NoirJS + +In a JS environment, an RPC server is not strictly necessary, as you may want to resolve your oracles without needing any JSON call at all. NoirJS simply expects that you pass a callback function when you generate proofs, and that callback function can be anything. + +For example, if your Noir program expects the host machine to provide CPU pseudo-randomness, you could simply pass it as the `foreignCallHandler`. You don't strictly need to create an RPC server to serve pseudo-randomness, as you may as well get it directly in your app: + +```js +const foreignCallHandler = (name, inputs) => crypto.randomBytes(16) // etc + +await noir.generateProof(inputs, foreignCallHandler) +``` + +As one can see, in NoirJS, the [`foreignCallHandler`](../reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md) function simply means "a callback function that returns a value of type [`ForeignCallOutput`](../reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md). It doesn't have to be an RPC call like in the case for Nargo. + +:::tip + +Does this mean you don't have to write an RPC server like in [Step #2](#step-2---write-an-rpc-server)? + +You don't technically have to, but then how would you run `nargo test` or `nargo prove`? To use both `Nargo` and `NoirJS` in your development flow, you will have to write a JSON RPC server. + +::: + +In this case, let's make `foreignCallHandler` call the JSON RPC Server we created in [Step #2](#step-2---write-an-rpc-server), by making it a JSON RPC Client. + +For example, using the same `getSqrt` program in [Step #1](#step-1---modify-your-noir-program) (comments in the code): + +```js +import { JSONRPCClient } from "json-rpc-2.0"; + +// declaring the JSONRPCClient +const client = new JSONRPCClient((jsonRPCRequest) => { +// hitting the same JSON RPC Server we coded above + return fetch("http://localhost:5555", { + method: "POST", + headers: { + "content-type": "application/json", + }, + body: JSON.stringify(jsonRPCRequest), + }).then((response) => { + if (response.status === 200) { + return response + .json() + .then((jsonRPCResponse) => client.receive(jsonRPCResponse)); + } else if (jsonRPCRequest.id !== undefined) { + return Promise.reject(new Error(response.statusText)); + } + }); +}); + +// declaring a function that takes the name of the foreign call (getSqrt) and the inputs +const foreignCallHandler = async (name, input) => { + // notice that the "inputs" parameter contains *all* the inputs + // in this case we to make the RPC request with the first parameter "numbers", which would be input[0] + const oracleReturn = await client.request(name, [ + { Array: input[0].map((i) => i.toString("hex")) }, + ]); + return [oracleReturn.values[0].Array]; +}; + +// the rest of your NoirJS code +const input = { input: [4, 16] }; +const { witness } = await noir.execute(numbers, foreignCallHandler); +``` + +:::tip + +If you're in a NoirJS environment running your RPC server together with a frontend app, you'll probably hit a familiar problem in full-stack development: requests being blocked by [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) policy. For development only, you can simply install and use the [`cors` npm package](https://www.npmjs.com/package/cors) to get around the problem: + +```bash +yarn add cors +``` + +and use it as a middleware: + +```js +import cors from "cors"; + +const app = express(); +app.use(cors()) +``` + +::: + +## Conclusion + +Hopefully by the end of this guide, you should be able to: + +- Write your own logic around Oracles and how to write a JSON RPC server to make them work with your Nargo commands. +- Provide custom foreign call handlers for NoirJS. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-recursion.md new file mode 100644 index 00000000000..4c45bb87ae2 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-recursion.md @@ -0,0 +1,179 @@ +--- +title: How to use recursion on NoirJS +description: Learn how to implement recursion with NoirJS, a powerful tool for creating smart contracts on the EVM blockchain. This guide assumes familiarity with NoirJS, solidity verifiers, and the Barretenberg proving backend. Discover how to generate both final and intermediate proofs using `noir_js` and `backend_barretenberg`. +keywords: + [ + "NoirJS", + "EVM blockchain", + "smart contracts", + "recursion", + "solidity verifiers", + "Barretenberg backend", + "noir_js", + "backend_barretenberg", + "intermediate proofs", + "final proofs", + "nargo compile", + "json import", + "recursive circuit", + "recursive app" + ] +sidebar_position: 1 +--- + +This guide shows you how to use recursive proofs in your NoirJS app. For the sake of clarity, it is assumed that: + +- You already have a NoirJS app. If you don't, please visit the [NoirJS tutorial](../tutorials/noirjs_app.md) and the [reference](../reference/NoirJS/noir_js/index.md). +- You are familiar with what are recursive proofs and you have read the [recursion explainer](../explainers/explainer-recursion.md) +- You already built a recursive circuit following [the reference](../noir/standard_library/recursion.md), and understand how it works. + +It is also assumed that you're not using `noir_wasm` for compilation, and instead you've used [`nargo compile`](../reference/nargo_commands.md) to generate the `json` you're now importing into your project. However, the guide should work just the same if you're using `noir_wasm`. + +:::info + +As you've read in the [explainer](../explainers/explainer-recursion.md), a recursive proof is an intermediate proof. This means that it doesn't necessarily generate the final step that makes it verifiable in a smart contract. However, it is easy to verify within another circuit. + +While "standard" usage of NoirJS packages abstracts final proofs, it currently lacks the necessary interface to abstract away intermediate proofs. This means that these proofs need to be created by using the backend directly. + +In short: + +- `noir_js` generates *only* final proofs +- `backend_barretenberg` generates both types of proofs + +::: + +In a standard recursive app, you're also dealing with at least two circuits. For the purpose of this guide, we will assume the following: + +- `main`: a circuit of type `assert(x != y)`, where `main` is marked with a `#[recursive]` attribute. This attribute states that the backend should generate proofs that are friendly for verification within another circuit. +- `recursive`: a circuit that verifies `main` + +For a full example on how recursive proofs work, please refer to the [noir-examples](https://github.com/noir-lang/noir-examples) repository. We will *not* be using it as a reference for this guide. + +## Step 1: Setup + +In a common NoirJS app, you need to instantiate a backend with something like `const backend = new Backend(circuit)`. Then you feed it to the `noir_js` interface. + +For recursion, this doesn't happen, and the only need for `noir_js` is only to `execute` a circuit and get its witness and return value. Everything else is not interfaced, so it needs to happen on the `backend` object. + +It is also recommended that you instantiate the backend with as many threads as possible, to allow for maximum concurrency: + +```js +const backend = new Backend(circuit, { threads: 8 }) +``` + +:::tip +You can use the [`os.cpus()`](https://nodejs.org/api/os.html#oscpus) object in `nodejs` or [`navigator.hardwareConcurrency`](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/hardwareConcurrency) on the browser to make the most out of those glorious cpu cores +::: + +## Step 2: Generating the witness and the proof for `main` + +After instantiating the backend, you should also instantiate `noir_js`. We will use it to execute the circuit and get the witness. + +```js +const noir = new Noir(circuit, backend) +const { witness } = noir.execute(input) +``` + +With this witness, you are now able to generate the intermediate proof for the main circuit: + +```js +const { proof, publicInputs } = await backend.generateProof(witness) +``` + +:::warning + +Always keep in mind what is actually happening on your development process, otherwise you'll quickly become confused about what circuit we are actually running and why! + +In this case, you can imagine that Alice (running the `main` circuit) is proving something to Bob (running the `recursive` circuit), and Bob is verifying her proof within his proof. + +With this in mind, it becomes clear that our intermediate proof is the one *meant to be verified within another circuit*, so it must be Alice's. Actually, the only final proof in this theoretical scenario would be the last one, sent on-chain. + +::: + +## Step 3 - Verification and proof artifacts + +Optionally, you are able to verify the intermediate proof: + +```js +const verified = await backend.verifyProof({ proof, publicInputs }) +``` + +This can be useful to make sure our intermediate proof was correctly generated. But the real goal is to do it within another circuit. For that, we need to generate recursive proof artifacts that will be passed to the circuit that is verifying the proof we just generated. Instead of passing the proof and verification key as a byte array, we pass them as fields which makes it cheaper to verify in a circuit: + +```js +const { proofAsFields, vkAsFields, vkHash } = await backend.generateRecursiveProofArtifacts( { publicInputs, proof }, publicInputsCount) +``` + +This call takes the public inputs and the proof, but also the public inputs count. While this is easily retrievable by simply counting the `publicInputs` length, the backend interface doesn't currently abstract it away. + +:::info + +The `proofAsFields` has a constant size `[Field; 93]` and verification keys in Barretenberg are always `[Field; 114]`. + +::: + +:::warning + +One common mistake is to forget *who* makes this call. + +In a situation where Alice is generating the `main` proof, if she generates the proof artifacts and sends them to Bob, which gladly takes them as true, this would mean Alice could prove anything! + +Instead, Bob needs to make sure *he* extracts the proof artifacts, using his own instance of the `main` circuit backend. This way, Alice has to provide a valid proof for the correct `main` circuit. + +::: + +## Step 4 - Recursive proof generation + +With the artifacts, generating a recursive proof is no different from a normal proof. You simply use the `backend` (with the recursive circuit) to generate it: + +```js +const recursiveInputs = { + verification_key: vkAsFields, // array of length 114 + proof: proofAsFields, // array of length 93 + size of public inputs + publicInputs: [mainInput.y], // using the example above, where `y` is the only public input + key_hash: vkHash, +} + +const { witness, returnValue } = noir.execute(recursiveInputs) // we're executing the recursive circuit now! +const { proof, publicInputs } = backend.generateProof(witness) +const verified = backend.verifyProof({ proof, publicInputs }) +``` + +You can obviously chain this proof into another proof. In fact, if you're using recursive proofs, you're probably interested of using them this way! + +:::tip + +Managing circuits and "who does what" can be confusing. To make sure your naming is consistent, you can keep them in an object. For example: + +```js +const circuits = { + main: mainJSON, + recursive: recursiveJSON +} +const backends = { + main: new BarretenbergBackend(circuits.main), + recursive: new BarretenbergBackend(circuits.recursive) +} +const noir_programs = { + main: new Noir(circuits.main, backends.main), + recursive: new Noir(circuits.recursive, backends.recursive) +} +``` + +This allows you to neatly call exactly the method you want without conflicting names: + +```js +// Alice runs this 👇 +const { witness: mainWitness } = await noir_programs.main.execute(input) +const proof = await backends.main.generateProof(mainWitness) + +// Bob runs this 👇 +const verified = await backends.main.verifyProof(proof) +const { proofAsFields, vkAsFields, vkHash } = await backends.main.generateRecursiveProofArtifacts( + proof, + numPublicInputs, +); +const recursiveProof = await noir_programs.recursive.generateProof(recursiveInputs) +``` + +::: diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-solidity-verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-solidity-verifier.md new file mode 100644 index 00000000000..e3c7c1065da --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/how-to-solidity-verifier.md @@ -0,0 +1,231 @@ +--- +title: Generate a Solidity Verifier +description: + Learn how to run the verifier as a smart contract on the blockchain. Compile a Solidity verifier + contract for your Noir program and deploy it on any EVM blockchain acting as a verifier smart + contract. Read more to find out +keywords: + [ + solidity verifier, + smart contract, + blockchain, + compiler, + plonk_vk.sol, + EVM blockchain, + verifying Noir programs, + proving backend, + Barretenberg, + ] +sidebar_position: 0 +pagination_next: tutorials/noirjs_app +--- + +Noir has the ability to generate a verifier contract in Solidity, which can be deployed in many EVM-compatible blockchains such as Ethereum. + +This allows for a powerful feature set, as one can make use of the conciseness and the privacy provided by Noir in an immutable ledger. Applications can range from simple P2P guessing games, to complex private DeFi interactions. + +This guide shows you how to generate a Solidity Verifier and deploy it on the [Remix IDE](https://remix.ethereum.org/). It is assumed that: + +- You are comfortable with the Solidity programming language and understand how contracts are deployed on the Ethereum network +- You have Noir installed and you have a Noir program. If you don't, [get started](../getting_started/installation/index.md) with Nargo and the example Hello Noir circuit +- You are comfortable navigating RemixIDE. If you aren't or you need a refresher, you can find some video tutorials [here](https://www.youtube.com/channel/UCjTUPyFEr2xDGN6Cg8nKDaA) that could help you. + +## Rundown + +Generating a Solidity Verifier contract is actually a one-command process. However, compiling it and deploying it can have some caveats. Here's the rundown of this guide: + +1. How to generate a solidity smart contract +2. How to compile the smart contract in the RemixIDE +3. How to deploy it to a testnet + +## Step 1 - Generate a contract + +This is by far the most straight-forward step. Just run: + +```sh +nargo codegen-verifier +``` + +A new `contract` folder would then be generated in your project directory, containing the Solidity +file `plonk_vk.sol`. It can be deployed to any EVM blockchain acting as a verifier smart contract. + +:::info + +It is possible to generate verifier contracts of Noir programs for other smart contract platforms as long as the proving backend supplies an implementation. + +Barretenberg, the default proving backend for Nargo, supports generation of verifier contracts, for the time being these are only in Solidity. +::: + +## Step 2 - Compiling + +We will mostly skip the details of RemixIDE, as the UI can change from version to version. For now, we can just open +Remix and create a blank workspace. + +![Create Workspace](@site/static/img/how-tos/solidity_verifier_1.png) + +We will create a new file to contain the contract Nargo generated, and copy-paste its content. + +:::warning + +You'll likely see a warning advising you to not trust pasted code. While it is an important warning, it is irrelevant in the context of this guide and can be ignored. We will not be deploying anywhere near a mainnet. + +::: + +To compile our the verifier, we can navigate to the compilation tab: + +![Compilation Tab](@site/static/img/how-tos/solidity_verifier_2.png) + +Remix should automatically match a suitable compiler version. However, hitting the "Compile" button will most likely generate a "Stack too deep" error: + +![Stack too deep](@site/static/img/how-tos/solidity_verifier_3.png) + +This is due to the verify function needing to put many variables on the stack, but enabling the optimizer resolves the issue. To do this, let's open the "Advanced Configurations" tab and enable optimization. The default 200 runs will suffice. + +:::info + +This time we will see a warning about an unused function parameter. This is expected, as the `verify` function doesn't use the `_proof` parameter inside a solidity block, it is loaded from calldata and used in assembly. + +::: + +![Compilation success](@site/static/img/how-tos/solidity_verifier_4.png) + +## Step 3 - Deploying + +At this point we should have a compiled contract read to deploy. If we navigate to the deploy section in Remix, we will see many different environments we can deploy to. The steps to deploy on each environment would be out-of-scope for this guide, so we will just use the default Remix VM. + +Looking closely, we will notice that our "Solidity Verifier" is actually three contracts working together: + +- An `UltraVerificationKey` library which simply stores the verification key for our circuit. +- An abstract contract `BaseUltraVerifier` containing most of the verifying logic. +- A main `UltraVerifier` contract that inherits from the Base and uses the Key contract. + +Remix will take care of the dependencies for us so we can simply deploy the UltraVerifier contract by selecting it and hitting "deploy": + +![Deploying UltraVerifier](@site/static/img/how-tos/solidity_verifier_5.png) + +A contract will show up in the "Deployed Contracts" section, where we can retrieve the Verification Key Hash. This is particularly useful for double-checking the deployer contract is the correct one. + +:::note + +Why "UltraVerifier"? + +To be precise, the Noir compiler (`nargo`) doesn't generate the verifier contract directly. It compiles the Noir code into an intermediate language (ACIR), which is then executed by the backend. So it is the backend that returns the verifier smart contract, not Noir. + +In this case, the Barretenberg Backend uses the UltraPlonk proving system, hence the "UltraVerifier" name. + +::: + +## Step 4 - Verifying + +To verify a proof using the Solidity verifier contract, we call the `verify` function in this extended contract: + +```solidity +function verify(bytes calldata _proof, bytes32[] calldata _publicInputs) external view returns (bool) +``` + +When using the default example in the [Hello Noir](../getting_started/hello_noir/index.md) guide, the easiest way to confirm that the verifier contract is doing its job is by calling the `verify` function via remix with the required parameters. For `_proof`, run `nargo prove` and use the string in `proof/.proof` (adding the hex `0x` prefix). We can also copy the public input from `Verifier.toml`, as it will be properly formatted as 32-byte strings: + +``` +0x...... , [0x0000.....02] +``` + +A programmatic example of how the `verify` function is called can be seen in the example zk voting application [here](https://github.com/noir-lang/noir-examples/blob/33e598c257e2402ea3a6b68dd4c5ad492bce1b0a/foundry-voting/src/zkVote.sol#L35): + +```solidity +function castVote(bytes calldata proof, uint proposalId, uint vote, bytes32 nullifierHash) public returns (bool) { + // ... + bytes32[] memory publicInputs = new bytes32[](4); + publicInputs[0] = merkleRoot; + publicInputs[1] = bytes32(proposalId); + publicInputs[2] = bytes32(vote); + publicInputs[3] = nullifierHash; + require(verifier.verify(proof, publicInputs), "Invalid proof"); +``` + +:::info[Return Values] + +A circuit doesn't have the concept of a return value. Return values are just syntactic sugar in +Noir. + +Under the hood, the return value is passed as an input to the circuit and is checked at the end of +the circuit program. + +For example, if you have Noir program like this: + +```rust +fn main( + // Public inputs + pubkey_x: pub Field, + pubkey_y: pub Field, + // Private inputs + priv_key: Field, +) -> pub Field +``` + +the `verify` function will expect the public inputs array (second function parameter) to be of length 3, the two inputs and the return value. Like before, these values are populated in Verifier.toml after running `nargo prove`. + +Passing only two inputs will result in an error such as `PUBLIC_INPUT_COUNT_INVALID(3, 2)`. + +In this case, the inputs parameter to `verify` would be an array ordered as `[pubkey_x, pubkey_y, return]`. + +::: + +:::tip[Structs] + +You can pass structs to the verifier contract. They will be flattened so that the array of inputs is 1-dimensional array. + +For example, consider the following program: + +```rust +struct Type1 { + val1: Field, + val2: Field, +} + +struct Nested { + t1: Type1, + is_true: bool, +} + +fn main(x: pub Field, nested: pub Nested, y: pub Field) { + //... +} +``` + +The order of these inputs would be flattened to: `[x, nested.t1.val1, nested.t1.val2, nested.is_true, y]` + +::: + +The other function you can call is our entrypoint `verify` function, as defined above. + +:::tip + +It's worth noticing that the `verify` function is actually a `view` function. A `view` function does not alter the blockchain state, so it doesn't need to be distributed (i.e. it will run only on the executing node), and therefore doesn't cost any gas. + +This can be particularly useful in some situations. If Alice generated a proof and wants Bob to verify its correctness, Bob doesn't need to run Nargo, NoirJS, or any Noir specific infrastructure. He can simply make a call to the blockchain with the proof and verify it is correct without paying any gas. + +It would be incorrect to say that a Noir proof verification costs any gas at all. However, most of the time the result of `verify` is used to modify state (for example, to update a balance, a game state, etc). In that case the whole network needs to execute it, which does incur gas costs (calldata and execution, but not storage). + +::: + +## A Note on EVM chains + +ZK-SNARK verification depends on some precompiled cryptographic primitives such as Elliptic Curve Pairings (if you like complex math, you can read about EC Pairings [here](https://medium.com/@VitalikButerin/exploring-elliptic-curve-pairings-c73c1864e627)). Not all EVM chains support EC Pairings, notably some of the ZK-EVMs. This means that you won't be able to use the verifier contract in all of them. + +For example, chains like `zkSync ERA` and `Polygon zkEVM` do not currently support these precompiles, so proof verification via Solidity verifier contracts won't work. Here's a quick list of EVM chains that have been tested and are known to work: + +- Optimism +- Arbitrum +- Polygon PoS +- Scroll +- Celo + +If you test any other chains, please open a PR on this page to update the list. See [this doc](https://github.com/noir-lang/noir-starter/tree/main/with-foundry#testing-on-chain) for more info about testing verifier contracts on different EVM chains. + +## What's next + +Now that you know how to call a Noir Solidity Verifier on a smart contract using Remix, you should be comfortable with using it with some programmatic frameworks, such as [hardhat](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat) and [foundry](https://github.com/noir-lang/noir-starter/tree/main/with-foundry). + +You can find other tools, examples, boilerplates and libraries in the [awesome-noir](https://github.com/noir-lang/awesome-noir) repository. + +You should also be ready to write and deploy your first NoirJS app and start generating proofs on websites, phones, and NodeJS environments! Head on to the [NoirJS tutorial](../tutorials/noirjs_app.md) to learn how to do that. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/merkle-proof.mdx new file mode 100644 index 00000000000..16c425bed76 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/merkle-proof.mdx @@ -0,0 +1,49 @@ +--- +title: Prove Merkle Tree Membership +description: + Learn how to use merkle membership proof in Noir to prove that a given leaf is a member of a + merkle tree with a specified root, at a given index. +keywords: + [merkle proof, merkle membership proof, Noir, rust, hash function, Pedersen, sha256, merkle tree] +sidebar_position: 4 +--- + +Let's walk through an example of a merkle membership proof in Noir that proves that a given leaf is +in a merkle tree. + +```rust +use dep::std; + +fn main(message : [Field; 62], index : Field, hashpath : [Field; 40], root : Field) { + let leaf = std::hash::hash_to_field(message.as_slice()); + let merkle_root = std::merkle::compute_merkle_root(leaf, index, hashpath); + assert(merkle_root == root); +} + +``` + +The message is hashed using `hash_to_field`. The specific hash function that is being used is chosen +by the backend. The only requirement is that this hash function can heuristically be used as a +random oracle. If only collision resistance is needed, then one can call `std::hash::pedersen_hash` +instead. + +```rust +let leaf = std::hash::hash_to_field(message.as_slice()); +``` + +The leaf is then passed to a compute_merkle_root function with the root, index and hashpath. The returned root can then be asserted to be the same as the provided root. + +```rust +let merkle_root = std::merkle::compute_merkle_root(leaf, index, hashpath); +assert (merkle_root == root); +``` + +> **Note:** It is possible to re-implement the merkle tree implementation without standard library. +> However, for most usecases, it is enough. In general, the standard library will always opt to be +> as conservative as possible, while striking a balance with efficiency. + +An example, the merkle membership proof, only requires a hash function that has collision +resistance, hence a hash function like Pedersen is allowed, which in most cases is more efficient +than the even more conservative sha256. + +[View an example on the starter repo](https://github.com/noir-lang/noir-examples/blob/3ea09545cabfa464124ec2f3ea8e60c608abe6df/stealthdrop/circuits/src/main.nr#L20) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/using-devcontainers.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/using-devcontainers.mdx new file mode 100644 index 00000000000..727ec6ca667 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/how_to/using-devcontainers.mdx @@ -0,0 +1,110 @@ +--- +title: Developer Containers and Codespaces +description: "Learn how to set up a devcontainer in your GitHub repository for a seamless coding experience with Codespaces. Follow our easy 8-step guide to create your own Noir environment without installing Nargo locally." +keywords: ["Devcontainer", "Codespaces", "GitHub", "Noir Environment", "Docker Image", "Development Environment", "Remote Coding", "GitHub Codespaces", "Noir Programming", "Nargo", "VSCode Extensions", "Noirup"] +sidebar_position: 1 +--- + +Adding a developer container configuration file to your Noir project is one of the easiest way to unlock coding in browser. + +## What's a devcontainer after all? + +A [Developer Container](https://containers.dev/) (devcontainer for short) is a Docker image that comes preloaded with tools, extensions, and other tools you need to quickly get started or continue a project, without having to install Nargo locally. Think of it as a development environment in a box. + +There are many advantages to this: + +- It's platform and architecture agnostic +- You don't need to have an IDE installed, or Nargo, or use a terminal at all +- It's safer for using on a public machine or public network + +One of the best ways of using devcontainers is... not using your machine at all, for maximum control, performance, and ease of use. +Enter Codespaces. + +## Codespaces + +If a devcontainer is just a Docker image, then what stops you from provisioning a `p3dn.24xlarge` AWS EC2 instance with 92 vCPUs and 768 GiB RAM and using it to prove your 10-gate SNARK proof? + +Nothing! Except perhaps the 30-40$ per hour it will cost you. + +The problem is that provisioning takes time, and I bet you don't want to see the AWS console every time you want to code something real quick. + +Fortunately, there's an easy and free way to get a decent remote machine ready and loaded in less than 2 minutes: Codespaces. [Codespaces is a Github feature](https://github.com/features/codespaces) that allows you to code in a remote machine by using devcontainers, and it's pretty cool: + +- You can start coding Noir in less than a minute +- It uses the resources of a remote machine, so you can code on your grandma's phone if needed be +- It makes it easy to share work with your frens +- It's fully reusable, you can stop and restart whenever you need to + +:::info + +Don't take out your wallet just yet. Free GitHub accounts get about [15-60 hours of coding](https://github.com/features/codespaces) for free per month, depending on the size of your provisioned machine. + +::: + +## Tell me it's _actually_ easy + +It is! + +Github comes with a default codespace and you can use it to code your own devcontainer. That's exactly what we will be doing in this guide. + + + +8 simple steps: + +#### 1. Create a new repository on GitHub. + +#### 2. Click "Start coding with Codespaces". This will use the default image. + +#### 3. Create a folder called `.devcontainer` in the root of your repository. + +#### 4. Create a Dockerfile in that folder, and paste the following code: + +```docker +FROM --platform=linux/amd64 node:lts-bookworm-slim +SHELL ["/bin/bash", "-c"] +RUN apt update && apt install -y curl bash git tar gzip libc++-dev +RUN curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash +ENV PATH="/root/.nargo/bin:$PATH" +RUN noirup +ENTRYPOINT ["nargo"] +``` +#### 5. Create a file called `devcontainer.json` in the same folder, and paste the following code: + +```json +{ + "name": "Noir on Codespaces", + "build": { + "context": ".", + "dockerfile": "Dockerfile" + }, + "customizations": { + "vscode": { + "extensions": ["noir-lang.vscode-noir"] + } + } +} +``` +#### 6. Commit and push your changes + +This will pull the new image and build it, so it could take a minute or so + +#### 8. Done! +Just wait for the build to finish, and there's your easy Noir environment. + + +Refer to [noir-starter](https://github.com/noir-lang/noir-starter/) as an example of how devcontainers can be used together with codespaces. + + + +## How do I use it? + +Using the codespace is obviously much easier than setting it up. +Just navigate to your repository and click "Code" -> "Open with Codespaces". It should take a few seconds to load, and you're ready to go. + +:::info + +If you really like the experience, you can add a badge to your readme, links to existing codespaces, and more. +Check out the [official docs](https://docs.github.com/en/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/facilitating-quick-creation-and-resumption-of-codespaces) for more info. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/index.mdx new file mode 100644 index 00000000000..75086ddcdde --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/index.mdx @@ -0,0 +1,67 @@ +--- +title: Noir Lang +hide_title: true +description: + Learn about the public alpha release of Noir, a domain specific language heavily influenced by Rust that compiles to + an intermediate language which can be compiled to an arithmetic circuit or a rank-1 constraint system. +keywords: + [Noir, + Domain Specific Language, + Rust, + Intermediate Language, + Arithmetic Circuit, + Rank-1 Constraint System, + Ethereum Developers, + Protocol Developers, + Blockchain Developers, + Proving System, + Smart Contract Language] +sidebar_position: 0 +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +Noir Logo + +Noir is a Domain-Specific Language for SNARK proving systems developed by [Aztec Labs](https://aztec.network/). It allows you to generate complex Zero-Knowledge Programs (ZKP) by using simple and flexible syntax, requiring no previous knowledge on the underlying mathematics or cryptography. + +ZK programs are programs that can generate short proofs of a certain statement without revealing some details about it. You can read more about ZKPs [here](https://dev.to/spalladino/a-beginners-intro-to-coding-zero-knowledge-proofs-c56). + +## What's new about Noir? + +Noir works differently from most ZK languages by taking a two-pronged path. First, it compiles the program to an adaptable intermediate language known as ACIR. From there, depending on a given project's needs, ACIR can be further compiled into an arithmetic circuit for integration with the proving backend. + +:::info + +Noir is backend agnostic, which means it makes no assumptions on which proving backend powers the ZK proof. Being the language that powers [Aztec Contracts](https://docs.aztec.network/developers/contracts/main), it defaults to Aztec's Barretenberg proving backend. + +However, the ACIR output can be transformed to be compatible with other PLONK-based backends, or into a [rank-1 constraint system](https://www.rareskills.io/post/rank-1-constraint-system) suitable for backends such as Arkwork's Marlin. + +::: + +## Who is Noir for? + +Noir can be used both in complex cloud-based backends and in user's smartphones, requiring no knowledge on the underlying math or cryptography. From authorization systems that keep a password in the user's device, to complex on-chain verification of recursive proofs, Noir is designed to abstract away complexity without any significant overhead. Here are some examples of situations where Noir can be used: + + + + Noir Logo + + Aztec Contracts leverage Noir to allow for the storage and execution of private information. Writing an Aztec Contract is as easy as writing Noir, and Aztec developers can easily interact with the network storage and execution through the [Aztec.nr](https://docs.aztec.network/developers/contracts/main) library. + + + Soliditry Verifier Example + Noir can auto-generate Solidity verifier contracts that verify Noir proofs. This allows for non-interactive verification of proofs containing private information in an immutable system. This feature powers a multitude of use-case scenarios, from P2P chess tournaments, to [Aztec Layer-2 Blockchain](https://docs.aztec.network/) + + + Aztec Labs developed NoirJS, an easy interface to generate and verify Noir proofs in a Javascript environment. This allows for Noir to be used in webpages, mobile apps, games, and any other environment supporting JS execution in a standalone manner. + + + + +## Libraries + +Noir is meant to be easy to extend by simply importing Noir libraries just like in Rust. +The [awesome-noir repo](https://github.com/noir-lang/awesome-noir#libraries) is a collection of libraries developed by the Noir community. +Writing a new library is easy and makes code be composable and easy to reuse. See the section on [dependencies](noir/modules_packages_crates/dependencies.md) for more information. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/migration_notes.md new file mode 100644 index 00000000000..6bd740024e5 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/migration_notes.md @@ -0,0 +1,105 @@ +--- +title: Migration notes +description: Read about migration notes from previous versions, which could solve problems while updating +keywords: [Noir, notes, migration, updating, upgrading] +--- + +Noir is in full-speed development. Things break fast, wild, and often. This page attempts to leave some notes on errors you might encounter when upgrading and how to resolve them until proper patches are built. + +### `backend encountered an error: libc++.so.1` + +Depending on your OS, you may encounter the following error when running `nargo prove` for the first time: + +```text +The backend encountered an error: "/home/codespace/.nargo/backends/acvm-backend-barretenberg/backend_binary: error while loading shared libraries: libc++.so.1: cannot open shared object file: No such file or directory\n" +``` + +Install the `libc++-dev` library with: + +```bash +sudo apt install libc++-dev +``` + +## ≥0.19 + +### Enforcing `compiler_version` + +From this version on, the compiler will check for the `compiler_version` field in `Nargo.toml`, and will error if it doesn't match the current Nargo version in use. + +To update, please make sure this field in `Nargo.toml` matches the output of `nargo --version`. + +## ≥0.14 + +The index of the [for loops](noir/concepts/control_flow.md#loops) is now of type `u64` instead of `Field`. An example refactor would be: + +```rust +for i in 0..10 { + let i = i as Field; +} +``` + +## ≥v0.11.0 and Nargo backend + +From this version onwards, Nargo starts managing backends through the `nargo backend` command. Upgrading to the versions per usual steps might lead to: + +### `backend encountered an error` + +This is likely due to the existing locally installed version of proving backend (e.g. barretenberg) is incompatible with the version of Nargo in use. + +To fix the issue: + +1. Uninstall the existing backend + +```bash +nargo backend uninstall acvm-backend-barretenberg +``` + +You may replace _acvm-backend-barretenberg_ with the name of your backend listed in `nargo backend ls` or in ~/.nargo/backends. + +2. Reinstall a compatible version of the proving backend. + +If you are using the default barretenberg backend, simply run: + +``` +nargo prove +``` + +with your Noir program. + +This will trigger the download and installation of the latest version of barretenberg compatible with your Nargo in use. + +### `backend encountered an error: illegal instruction` + +On certain Intel-based systems, an `illegal instruction` error may arise due to incompatibility of barretenberg with certain CPU instructions. + +To fix the issue: + +1. Uninstall the existing backend + +```bash +nargo backend uninstall acvm-backend-barretenberg +``` + +You may replace _acvm-backend-barretenberg_ with the name of your backend listed in `nargo backend ls` or in ~/.nargo/backends. + +2. Reinstall a compatible version of the proving backend. + +If you are using the default barretenberg backend, simply run: + +``` +nargo backend install acvm-backend-barretenberg https://github.com/noir-lang/barretenberg-js-binary/raw/master/run-bb.tar.gz +``` + +This downloads and installs a specific bb.js based version of barretenberg binary from GitHub. + +The gzipped file is running [this bash script](https://github.com/noir-lang/barretenberg-js-binary/blob/master/run-bb-js.sh), where we need to gzip it as the Nargo currently expect the backend to be zipped up. + +Then run: + +``` +DESIRED_BINARY_VERSION=0.8.1 nargo info +``` + +This overrides the bb native binary with a bb.js node application instead, which should be compatible with most if not all hardware. This does come with the drawback of being generally slower than native binary. + +0.8.1 indicates bb.js version 0.8.1, so if you change that it will update to a different version or the default version in the script if none was supplied. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/_category_.json new file mode 100644 index 00000000000..7da08f8a8c5 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "Concepts", + "position": 0, + "collapsible": true, + "collapsed": true +} \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/assert.md new file mode 100644 index 00000000000..bcff613a695 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/assert.md @@ -0,0 +1,45 @@ +--- +title: Assert Function +description: + Learn about the assert function in Noir, which can be used to explicitly constrain the predicate or + comparison expression that follows to be true, and what happens if the expression is false at + runtime. +keywords: [Noir programming language, assert statement, predicate expression, comparison expression] +sidebar_position: 4 +--- + +Noir includes a special `assert` function which will explicitly constrain the predicate/comparison +expression that follows to be true. If this expression is false at runtime, the program will fail to +be proven. Example: + +```rust +fn main(x : Field, y : Field) { + assert(x == y); +} +``` + +> Assertions only work for predicate operations, such as `==`. If there's any ambiguity on the operation, the program will fail to compile. For example, it is unclear if `assert(x + y)` would check for `x + y == 0` or simply would return `true`. + +You can optionally provide a message to be logged when the assertion fails: + +```rust +assert(x == y, "x and y are not equal"); +``` + +Aside string literals, the optional message can be a format string or any other type supported as input for Noir's [print](../standard_library/logging.md) functions. This feature lets you incorporate runtime variables into your failed assertion logs: + +```rust +assert(x == y, f"Expected x == y, but got {x} == {y}"); +``` + +Using a variable as an assertion message directly: + +```rust +struct myStruct { + myField: Field +} + +let s = myStruct { myField: y }; +assert(s.myField == x, s); +``` + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/comments.md new file mode 100644 index 00000000000..b51a85f5c94 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/comments.md @@ -0,0 +1,33 @@ +--- +title: Comments +description: + Learn how to write comments in Noir programming language. A comment is a line of code that is + ignored by the compiler, but it can be read by programmers. Single-line and multi-line comments + are supported in Noir. +keywords: [Noir programming language, comments, single-line comments, multi-line comments] +sidebar_position: 10 +--- + +A comment is a line in your codebase which the compiler ignores, however it can be read by +programmers. + +Here is a single line comment: + +```rust +// This is a comment and is ignored +``` + +`//` is used to tell the compiler to ignore the rest of the line. + +Noir also supports multi-line block comments. Start a block comment with `/*` and end the block with `*/`. + +Noir does not natively support doc comments. You may be able to use [Rust doc comments](https://doc.rust-lang.org/reference/comments.html) in your code to leverage some Rust documentation build tools with Noir code. + +```rust +/* + This is a block comment describing a complex function. +*/ +fn main(x : Field, y : pub Field) { + assert(x != y); +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/control_flow.md new file mode 100644 index 00000000000..045d3c3a5f5 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/control_flow.md @@ -0,0 +1,77 @@ +--- +title: Control Flow +description: + Learn how to use loops and if expressions in the Noir programming language. Discover the syntax + and examples for for loops and if-else statements. +keywords: [Noir programming language, loops, for loop, if-else statements, Rust syntax] +sidebar_position: 2 +--- + +## If Expressions + +Noir supports `if-else` statements. The syntax is most similar to Rust's where it is not required +for the statement's conditional to be surrounded by parentheses. + +```rust +let a = 0; +let mut x: u32 = 0; + +if a == 0 { + if a != 0 { + x = 6; + } else { + x = 2; + } +} else { + x = 5; + assert(x == 5); +} +assert(x == 2); +``` + +## Loops + +Noir has one kind of loop: the `for` loop. `for` loops allow you to repeat a block of code multiple +times. + +The following block of code between the braces is run 10 times. + +```rust +for i in 0..10 { + // do something +} +``` + +The index for loops is of type `u64`. + +### Break and Continue + +In unconstrained code, `break` and `continue` are also allowed in `for` loops. These are only allowed +in unconstrained code since normal constrained code requires that Noir knows exactly how many iterations +a loop may have. `break` and `continue` can be used like so: + +```rust +for i in 0 .. 10 { + println("Iteration start") + + if i == 2 { + continue; + } + + if i == 5 { + break; + } + + println(i); +} +println("Loop end") +``` + +When used, `break` will end the current loop early and jump to the statement after the for loop. In the example +above, the `break` will stop the loop and jump to the `println("Loop end")`. + +`continue` will stop the current iteration of the loop, and jump to the start of the next iteration. In the example +above, `continue` will jump to `println("Iteration start")` when used. Note that the loop continues as normal after this. +The iteration variable `i` is still increased by one as normal when `continue` is used. + +`break` and `continue` cannot currently be used to jump out of more than a single loop at a time. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_bus.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_bus.md new file mode 100644 index 00000000000..e54fc861257 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_bus.md @@ -0,0 +1,21 @@ +--- +title: Data Bus +sidebar_position: 13 +--- +**Disclaimer** this feature is experimental, do not use it! + +The data bus is an optimization that the backend can use to make recursion more efficient. +In order to use it, you must define some inputs of the program entry points (usually the `main()` +function) with the `call_data` modifier, and the return values with the `return_data` modifier. +These modifiers are incompatible with `pub` and `mut` modifiers. + +## Example + +```rust +fn main(mut x: u32, y: call_data u32, z: call_data [u32;4] ) -> return_data u32 { + let a = z[x]; + a+y +} +``` + +As a result, both call_data and return_data will be treated as private inputs and encapsulated into a read-only array each, for the backend to process. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/_category_.json new file mode 100644 index 00000000000..5d694210bbf --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 0, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/arrays.md new file mode 100644 index 00000000000..efce3e95d32 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/arrays.md @@ -0,0 +1,251 @@ +--- +title: Arrays +description: + Dive into the Array data type in Noir. Grasp its methods, practical examples, and best practices for efficiently using Arrays in your Noir code. +keywords: + [ + noir, + array type, + methods, + examples, + indexing, + ] +sidebar_position: 4 +--- + +An array is one way of grouping together values into one compound type. Array types can be inferred +or explicitly specified via the syntax `[; ]`: + +```rust +fn main(x : Field, y : Field) { + let my_arr = [x, y]; + let your_arr: [Field; 2] = [x, y]; +} +``` + +Here, both `my_arr` and `your_arr` are instantiated as an array containing two `Field` elements. + +Array elements can be accessed using indexing: + +```rust +fn main() { + let a = [1, 2, 3, 4, 5]; + + let first = a[0]; + let second = a[1]; +} +``` + +All elements in an array must be of the same type (i.e. homogeneous). That is, an array cannot group +a `Field` value and a `u8` value together for example. + +You can write mutable arrays, like: + +```rust +fn main() { + let mut arr = [1, 2, 3, 4, 5]; + assert(arr[0] == 1); + + arr[0] = 42; + assert(arr[0] == 42); +} +``` + +You can instantiate a new array of a fixed size with the same value repeated for each element. The following example instantiates an array of length 32 where each element is of type Field and has the value 0. + +```rust +let array: [Field; 32] = [0; 32]; +``` + +Like in Rust, arrays in Noir are a fixed size. However, if you wish to convert an array to a [slice](./slices), you can just call `as_slice` on your array: + +```rust +let array: [Field; 32] = [0; 32]; +let sl = array.as_slice() +``` + +You can define multidimensional arrays: + +```rust +let array : [[Field; 2]; 2]; +let element = array[0][0]; +``` +However, multidimensional slices are not supported. For example, the following code will error at compile time: +```rust +let slice : [[Field]] = &[]; +``` + +## Types + +You can create arrays of primitive types or structs. There is not yet support for nested arrays +(arrays of arrays) or arrays of structs that contain arrays. + +## Methods + +For convenience, the STD provides some ready-to-use, common methods for arrays. +Each of these functions are located within the generic impl `impl [T; N] {`. +So anywhere `self` appears, it refers to the variable `self: [T; N]`. + +### len + +Returns the length of an array + +```rust +fn len(self) -> Field +``` + +example + +```rust +fn main() { + let array = [42, 42]; + assert(array.len() == 2); +} +``` + +### sort + +Returns a new sorted array. The original array remains untouched. Notice that this function will +only work for arrays of fields or integers, not for any arbitrary type. This is because the sorting +logic it uses internally is optimized specifically for these values. If you need a sort function to +sort any type, you should use the function `sort_via` described below. + +```rust +fn sort(self) -> [T; N] +``` + +example + +```rust +fn main() { + let arr = [42, 32]; + let sorted = arr.sort(); + assert(sorted == [32, 42]); +} +``` + +### sort_via + +Sorts the array with a custom comparison function + +```rust +fn sort_via(self, ordering: fn(T, T) -> bool) -> [T; N] +``` + +example + +```rust +fn main() { + let arr = [42, 32] + let sorted_ascending = arr.sort_via(|a, b| a < b); + assert(sorted_ascending == [32, 42]); // verifies + + let sorted_descending = arr.sort_via(|a, b| a > b); + assert(sorted_descending == [32, 42]); // does not verify +} +``` + +### map + +Applies a function to each element of the array, returning a new array containing the mapped elements. + +```rust +fn map(self, f: fn(T) -> U) -> [U; N] +``` + +example + +```rust +let a = [1, 2, 3]; +let b = a.map(|a| a * 2); // b is now [2, 4, 6] +``` + +### fold + +Applies a function to each element of the array, returning the final accumulated value. The first +parameter is the initial value. + +```rust +fn fold(self, mut accumulator: U, f: fn(U, T) -> U) -> U +``` + +This is a left fold, so the given function will be applied to the accumulator and first element of +the array, then the second, and so on. For a given call the expected result would be equivalent to: + +```rust +let a1 = [1]; +let a2 = [1, 2]; +let a3 = [1, 2, 3]; + +let f = |a, b| a - b; +a1.fold(10, f) //=> f(10, 1) +a2.fold(10, f) //=> f(f(10, 1), 2) +a3.fold(10, f) //=> f(f(f(10, 1), 2), 3) +``` + +example: + +```rust + +fn main() { + let arr = [2, 2, 2, 2, 2]; + let folded = arr.fold(0, |a, b| a + b); + assert(folded == 10); +} + +``` + +### reduce + +Same as fold, but uses the first element as starting element. + +```rust +fn reduce(self, f: fn(T, T) -> T) -> T +``` + +example: + +```rust +fn main() { + let arr = [2, 2, 2, 2, 2]; + let reduced = arr.reduce(|a, b| a + b); + assert(reduced == 10); +} +``` + +### all + +Returns true if all the elements satisfy the given predicate + +```rust +fn all(self, predicate: fn(T) -> bool) -> bool +``` + +example: + +```rust +fn main() { + let arr = [2, 2, 2, 2, 2]; + let all = arr.all(|a| a == 2); + assert(all); +} +``` + +### any + +Returns true if any of the elements satisfy the given predicate + +```rust +fn any(self, predicate: fn(T) -> bool) -> bool +``` + +example: + +```rust +fn main() { + let arr = [2, 2, 2, 2, 5]; + let any = arr.any(|a| a == 5); + assert(any); +} + +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/booleans.md new file mode 100644 index 00000000000..69826fcd724 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/booleans.md @@ -0,0 +1,31 @@ +--- +title: Booleans +description: + Delve into the Boolean data type in Noir. Understand its methods, practical examples, and best practices for using Booleans in your Noir programs. +keywords: + [ + noir, + boolean type, + methods, + examples, + logical operations, + ] +sidebar_position: 2 +--- + + +The `bool` type in Noir has two possible values: `true` and `false`: + +```rust +fn main() { + let t = true; + let f: bool = false; +} +``` + +> **Note:** When returning a boolean value, it will show up as a value of 1 for `true` and 0 for +> `false` in _Verifier.toml_. + +The boolean type is most commonly used in conditionals like `if` expressions and `assert` +statements. More about conditionals is covered in the [Control Flow](../control_flow) and +[Assert Function](../assert) sections. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/fields.md new file mode 100644 index 00000000000..a10a4810788 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/fields.md @@ -0,0 +1,192 @@ +--- +title: Fields +description: + Dive deep into the Field data type in Noir. Understand its methods, practical examples, and best practices to effectively use Fields in your Noir programs. +keywords: + [ + noir, + field type, + methods, + examples, + best practices, + ] +sidebar_position: 0 +--- + +The field type corresponds to the native field type of the proving backend. + +The size of a Noir field depends on the elliptic curve's finite field for the proving backend +adopted. For example, a field would be a 254-bit integer when paired with the default backend that +spans the Grumpkin curve. + +Fields support integer arithmetic and are often used as the default numeric type in Noir: + +```rust +fn main(x : Field, y : Field) { + let z = x + y; +} +``` + +`x`, `y` and `z` are all private fields in this example. Using the `let` keyword we defined a new +private value `z` constrained to be equal to `x + y`. + +If proving efficiency is of priority, fields should be used as a default for solving problems. +Smaller integer types (e.g. `u64`) incur extra range constraints. + +## Methods + +After declaring a Field, you can use these common methods on it: + +### to_le_bits + +Transforms the field into an array of bits, Little Endian. + +```rust +fn to_le_bits(_x : Field, _bit_size: u32) -> [u1] +``` + +example: + +```rust +fn main() { + let field = 2; + let bits = field.to_le_bits(32); +} +``` + +### to_be_bits + +Transforms the field into an array of bits, Big Endian. + +```rust +fn to_be_bits(_x : Field, _bit_size: u32) -> [u1] +``` + +example: + +```rust +fn main() { + let field = 2; + let bits = field.to_be_bits(32); +} +``` + +### to_le_bytes + +Transforms into an array of bytes, Little Endian + +```rust +fn to_le_bytes(_x : Field, byte_size: u32) -> [u8] +``` + +example: + +```rust +fn main() { + let field = 2; + let bytes = field.to_le_bytes(4); +} +``` + +### to_be_bytes + +Transforms into an array of bytes, Big Endian + +```rust +fn to_be_bytes(_x : Field, byte_size: u32) -> [u8] +``` + +example: + +```rust +fn main() { + let field = 2; + let bytes = field.to_be_bytes(4); +} +``` + +### to_le_radix + +Decomposes into a vector over the specified base, Little Endian + +```rust +fn to_le_radix(_x : Field, _radix: u32, _result_len: u32) -> [u8] +``` + +example: + +```rust +fn main() { + let field = 2; + let radix = field.to_le_radix(256, 4); +} +``` + +### to_be_radix + +Decomposes into a vector over the specified base, Big Endian + +```rust +fn to_be_radix(_x : Field, _radix: u32, _result_len: u32) -> [u8] +``` + +example: + +```rust +fn main() { + let field = 2; + let radix = field.to_be_radix(256, 4); +} +``` + +### pow_32 + +Returns the value to the power of the specified exponent + +```rust +fn pow_32(self, exponent: Field) -> Field +``` + +example: + +```rust +fn main() { + let field = 2 + let pow = field.pow_32(4); + assert(pow == 16); +} +``` + +### assert_max_bit_size + +Adds a constraint to specify that the field can be represented with `bit_size` number of bits + +```rust +fn assert_max_bit_size(self, bit_size: u32) +``` + +example: + +```rust +fn main() { + let field = 2 + field.assert_max_bit_size(32); +} +``` + +### sgn0 + +Parity of (prime) Field element, i.e. sgn0(x mod p) = 0 if x ∈ \{0, ..., p-1\} is even, otherwise sgn0(x mod p) = 1. + +```rust +fn sgn0(self) -> u1 +``` + + +### lt + +Returns true if the field is less than the other field + +```rust +pub fn lt(self, another: Field) -> bool +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/function_types.md new file mode 100644 index 00000000000..f6121af17e2 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/function_types.md @@ -0,0 +1,26 @@ +--- +title: Function types +sidebar_position: 10 +--- + +Noir supports higher-order functions. The syntax for a function type is as follows: + +```rust +fn(arg1_type, arg2_type, ...) -> return_type +``` + +Example: + +```rust +fn assert_returns_100(f: fn() -> Field) { // f takes no args and returns a Field + assert(f() == 100); +} + +fn main() { + assert_returns_100(|| 100); // ok + assert_returns_100(|| 150); // fails +} +``` + +A function type also has an optional capture environment - this is necessary to support closures. +See [Lambdas](../lambdas.md) for more details. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/index.md new file mode 100644 index 00000000000..357813c147a --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/index.md @@ -0,0 +1,110 @@ +--- +title: Data Types +description: + Get a clear understanding of the two categories of Noir data types - primitive types and compound + types. Learn about their characteristics, differences, and how to use them in your Noir + programming. +keywords: + [ + noir, + data types, + primitive types, + compound types, + private types, + public types, + ] +--- + +Every value in Noir has a type, which determines which operations are valid for it. + +All values in Noir are fundamentally composed of `Field` elements. For a more approachable +developing experience, abstractions are added on top to introduce different data types in Noir. + +Noir has two category of data types: primitive types (e.g. `Field`, integers, `bool`) and compound +types that group primitive types (e.g. arrays, tuples, structs). Each value can either be private or +public. + +## Private & Public Types + +A **private value** is known only to the Prover, while a **public value** is known by both the +Prover and Verifier. Mark values as `private` when the value should only be known to the prover. All +primitive types (including individual fields of compound types) in Noir are private by default, and +can be marked public when certain values are intended to be revealed to the Verifier. + +> **Note:** For public values defined in Noir programs paired with smart contract verifiers, once +> the proofs are verified on-chain the values can be considered known to everyone that has access to +> that blockchain. + +Public data types are treated no differently to private types apart from the fact that their values +will be revealed in proofs generated. Simply changing the value of a public type will not change the +circuit (where the same goes for changing values of private types as well). + +_Private values_ are also referred to as _witnesses_ sometimes. + +> **Note:** The terms private and public when applied to a type (e.g. `pub Field`) have a different +> meaning than when applied to a function (e.g. `pub fn foo() {}`). +> +> The former is a visibility modifier for the Prover to interpret if a value should be made known to +> the Verifier, while the latter is a visibility modifier for the compiler to interpret if a +> function should be made accessible to external Noir programs like in other languages. + +### pub Modifier + +All data types in Noir are private by default. Types are explicitly declared as public using the +`pub` modifier: + +```rust +fn main(x : Field, y : pub Field) -> pub Field { + x + y +} +``` + +In this example, `x` is **private** while `y` and `x + y` (the return value) are **public**. Note +that visibility is handled **per variable**, so it is perfectly valid to have one input that is +private and another that is public. + +> **Note:** Public types can only be declared through parameters on `main`. + +## Type Aliases + +A type alias is a new name for an existing type. Type aliases are declared with the keyword `type`: + +```rust +type Id = u8; + +fn main() { + let id: Id = 1; + let zero: u8 = 0; + assert(zero + 1 == id); +} +``` + +Type aliases can also be used with [generics](../generics.md): + +```rust +type Id = Size; + +fn main() { + let id: Id = 1; + let zero: u32 = 0; + assert(zero + 1 == id); +} +``` + +Type aliases can even refer to other aliases. An error will be issued if they form a cycle: + +```rust +// Ok! +type A = B; +type B = Field; + +type Bad1 = Bad2; + +// error: Dependency cycle found +type Bad2 = Bad1; +// ^^^^^^^^^^^ 'Bad2' recursively depends on itself: Bad2 -> Bad1 -> Bad2 +``` + +### BigInt + +You can achieve BigInt functionality using the [Noir BigInt](https://github.com/shuklaayush/noir-bigint) library. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/integers.md new file mode 100644 index 00000000000..6b2d3773912 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/integers.md @@ -0,0 +1,157 @@ +--- +title: Integers +description: Explore the Integer data type in Noir. Learn about its methods, see real-world examples, and grasp how to efficiently use Integers in your Noir code. +keywords: [noir, integer types, methods, examples, arithmetic] +sidebar_position: 1 +--- + +An integer type is a range constrained field type. +The Noir frontend supports both unsigned and signed integer types. +The allowed sizes are 1, 8, 16, 32 and 64 bits. + +:::info + +When an integer is defined in Noir without a specific type, it will default to `Field`. + +The one exception is for loop indices which default to `u64` since comparisons on `Field`s are not possible. + +::: + +## Unsigned Integers + +An unsigned integer type is specified first with the letter `u` (indicating its unsigned nature) followed by its bit size (e.g. `8`): + +```rust +fn main() { + let x: u8 = 1; + let y: u8 = 1; + let z = x + y; + assert (z == 2); +} +``` + +The bit size determines the maximum value the integer type can store. For example, a `u8` variable can store a value in the range of 0 to 255 (i.e. $\\2^{8}-1\\$). + +## Signed Integers + +A signed integer type is specified first with the letter `i` (which stands for integer) followed by its bit size (e.g. `8`): + +```rust +fn main() { + let x: i8 = -1; + let y: i8 = -1; + let z = x + y; + assert (z == -2); +} +``` + +The bit size determines the maximum and minimum range of value the integer type can store. For example, an `i8` variable can store a value in the range of -128 to 127 (i.e. $\\-2^{7}\\$ to $\\2^{7}-1\\$). + +## 128 bits Unsigned Integers + +The built-in structure `U128` allows you to use 128-bit unsigned integers almost like a native integer type. However, there are some differences to keep in mind: +- You cannot cast between a native integer and `U128` +- There is a higher performance cost when using `U128`, compared to a native type. + +Conversion between unsigned integer types and U128 are done through the use of `from_integer` and `to_integer` functions. `from_integer` also accepts the `Field` type as input. + +```rust +fn main() { + let x = U128::from_integer(23); + let y = U128::from_hex("0x7"); + let z = x + y; + assert(z.to_integer() == 30); +} +``` + +`U128` is implemented with two 64 bits limbs, representing the low and high bits, which explains the performance cost. You should expect `U128` to be twice more costly for addition and four times more costly for multiplication. +You can construct a U128 from its limbs: +```rust +fn main(x: u64, y: u64) { + let x = U128::from_u64s_be(x,y); + assert(z.hi == x as Field); + assert(z.lo == y as Field); +} +``` + +Note that the limbs are stored as Field elements in order to avoid unnecessary conversions. +Apart from this, most operations will work as usual: + +```rust +fn main(x: U128, y: U128) { + // multiplication + let c = x * y; + // addition and subtraction + let c = c - x + y; + // division + let c = x / y; + // bit operation; + let c = x & y | y; + // bit shift + let c = x << y; + // comparisons; + let c = x < y; + let c = x == y; +} +``` + +## Overflows + +Computations that exceed the type boundaries will result in overflow errors. This happens with both signed and unsigned integers. For example, attempting to prove: + +```rust +fn main(x: u8, y: u8) { + let z = x + y; +} +``` + +With: + +```toml +x = "255" +y = "1" +``` + +Would result in: + +``` +$ nargo prove +error: Assertion failed: 'attempt to add with overflow' +┌─ ~/src/main.nr:9:13 +│ +│ let z = x + y; +│ ----- +│ += Call stack: + ... +``` + +A similar error would happen with signed integers: + +```rust +fn main() { + let x: i8 = -118; + let y: i8 = -11; + let z = x + y; +} +``` + +### Wrapping methods + +Although integer overflow is expected to error, some use-cases rely on wrapping. For these use-cases, the standard library provides `wrapping` variants of certain common operations: + +```rust +fn wrapping_add(x: T, y: T) -> T; +fn wrapping_sub(x: T, y: T) -> T; +fn wrapping_mul(x: T, y: T) -> T; +``` + +Example of how it is used: + +```rust +use dep::std; + +fn main(x: u8, y: u8) -> pub u8 { + std::wrapping_add(x, y) +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/references.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/references.md new file mode 100644 index 00000000000..a5293d11cfb --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/references.md @@ -0,0 +1,23 @@ +--- +title: References +sidebar_position: 9 +--- + +Noir supports first-class references. References are a bit like pointers: they point to a specific address that can be followed to access the data stored at that address. You can use Rust-like syntax to use pointers in Noir: the `&` operator references the variable, the `*` operator dereferences it. + +Example: + +```rust +fn main() { + let mut x = 2; + + // you can reference x as &mut and pass it to multiplyBy2 + multiplyBy2(&mut x); +} + +// you can access &mut here +fn multiplyBy2(x: &mut Field) { + // and dereference it with * + *x = *x * 2; +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/slices.mdx new file mode 100644 index 00000000000..4eccc677b80 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/slices.mdx @@ -0,0 +1,195 @@ +--- +title: Slices +description: Explore the Slice data type in Noir. Understand its methods, see real-world examples, and learn how to effectively use Slices in your Noir programs. +keywords: [noir, slice type, methods, examples, subarrays] +sidebar_position: 5 +--- + +import Experimental from '@site/src/components/Notes/_experimental.mdx'; + + + +A slice is a dynamically-sized view into a sequence of elements. They can be resized at runtime, but because they don't own the data, they cannot be returned from a circuit. You can treat slices as arrays without a constrained size. + +```rust +use dep::std::slice; + +fn main() -> pub Field { + let mut slice: [Field] = &[0; 2]; + + let mut new_slice = slice.push_back(6); + new_slice.len() +} +``` + +To write a slice literal, use a preceeding ampersand as in: `&[0; 2]` or +`&[1, 2, 3]`. + +It is important to note that slices are not references to arrays. In Noir, +`&[..]` is more similar to an immutable, growable vector. + +View the corresponding test file [here][test-file]. + +[test-file]: https://github.com/noir-lang/noir/blob/f387ec1475129732f72ba294877efdf6857135ac/crates/nargo_cli/tests/test_data_ssa_refactor/slices/src/main.nr + +## Methods + +For convenience, the STD provides some ready-to-use, common methods for slices: + +### push_back + +Pushes a new element to the end of the slice, returning a new slice with a length one greater than the original unmodified slice. + +```rust +fn push_back(_self: [T], _elem: T) -> [T] +``` + +example: + +```rust +fn main() -> pub Field { + let mut slice: [Field] = &[0; 2]; + + let mut new_slice = slice.push_back(6); + new_slice.len() +} +``` + +View the corresponding test file [here][test-file]. + +### push_front + +Returns a new array with the specified element inserted at index 0. The existing elements indexes are incremented by 1. + +```rust +fn push_front(_self: Self, _elem: T) -> Self +``` + +Example: + +```rust +let mut new_slice: [Field] = &[]; +new_slice = new_slice.push_front(20); +assert(new_slice[0] == 20); // returns true +``` + +View the corresponding test file [here][test-file]. + +### pop_front + +Returns a tuple of two items, the first element of the array and the rest of the array. + +```rust +fn pop_front(_self: Self) -> (T, Self) +``` + +Example: + +```rust +let (first_elem, rest_of_slice) = slice.pop_front(); +``` + +View the corresponding test file [here][test-file]. + +### pop_back + +Returns a tuple of two items, the beginning of the array with the last element omitted and the last element. + +```rust +fn pop_back(_self: Self) -> (Self, T) +``` + +Example: + +```rust +let (popped_slice, last_elem) = slice.pop_back(); +``` + +View the corresponding test file [here][test-file]. + +### append + +Loops over a slice and adds it to the end of another. + +```rust +fn append(mut self, other: Self) -> Self +``` + +Example: + +```rust +let append = &[1, 2].append(&[3, 4, 5]); +``` + +### insert + +Inserts an element at a specified index and shifts all following elements by 1. + +```rust +fn insert(_self: Self, _index: Field, _elem: T) -> Self +``` + +Example: + +```rust +new_slice = rest_of_slice.insert(2, 100); +assert(new_slice[2] == 100); +``` + +View the corresponding test file [here][test-file]. + +### remove + +Remove an element at a specified index, shifting all elements after it to the left, returning the altered slice and the removed element. + +```rust +fn remove(_self: Self, _index: Field) -> (Self, T) +``` + +Example: + +```rust +let (remove_slice, removed_elem) = slice.remove(3); +``` + +### len + +Returns the length of a slice + +```rust +fn len(self) -> Field +``` + +Example: + +```rust +fn main() { + let slice = &[42, 42]; + assert(slice.len() == 2); +} +``` + +### as_array + +Converts this slice into an array. + +Make sure to specify the size of the resulting array. +Panics if the resulting array length is different than the slice's length. + +```rust +fn as_array(self) -> [T; N] +``` + +Example: + +```rust +fn main() { + let slice = &[5, 6]; + + // Always specify the length of the resulting array! + let array: [Field; 2] = slice.as_array(); + + assert(array[0] == slice[0]); + assert(array[1] == slice[1]); +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/strings.md new file mode 100644 index 00000000000..311dfd64416 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/strings.md @@ -0,0 +1,80 @@ +--- +title: Strings +description: + Discover the String data type in Noir. Learn about its methods, see real-world examples, and understand how to effectively manipulate and use Strings in Noir. +keywords: + [ + noir, + string type, + methods, + examples, + concatenation, + ] +sidebar_position: 3 +--- + + +The string type is a fixed length value defined with `str`. + +You can use strings in `assert()` functions or print them with +`println()`. See more about [Logging](../../standard_library/logging). + +```rust +use dep::std; + +fn main(message : pub str<11>, hex_as_string : str<4>) { + println(message); + assert(message == "hello world"); + assert(hex_as_string == "0x41"); +} +``` + +You can convert a `str` to a byte array by calling `as_bytes()` +or a vector by calling `as_bytes_vec()`. + +```rust +fn main() { + let message = "hello world"; + let message_bytes = message.as_bytes(); + let mut message_vec = message.as_bytes_vec(); + assert(message_bytes.len() == 11); + assert(message_bytes[0] == 104); + assert(message_bytes[0] == message_vec.get(0)); +} +``` + +## Escape characters + +You can use escape characters for your strings: + +| Escape Sequence | Description | +|-----------------|-----------------| +| `\r` | Carriage Return | +| `\n` | Newline | +| `\t` | Tab | +| `\0` | Null Character | +| `\"` | Double Quote | +| `\\` | Backslash | + +Example: + +```rust +let s = "Hello \"world" // prints "Hello "world" +let s = "hey \tyou"; // prints "hey you" +``` + +## Raw strings + +A raw string begins with the letter `r` and is optionally delimited by a number of hashes `#`. + +Escape characters are *not* processed within raw strings. All contents are interpreted literally. + +Example: + +```rust +let s = r"Hello world"; +let s = r#"Simon says "hello world""#; + +// Any number of hashes may be used (>= 1) as long as the string also terminates with the same number of hashes +let s = r#####"One "#, Two "##, Three "###, Four "####, Five will end the string."#####; +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/structs.md new file mode 100644 index 00000000000..dbf68c99813 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/structs.md @@ -0,0 +1,70 @@ +--- +title: Structs +description: + Explore the Struct data type in Noir. Learn about its methods, see real-world examples, and grasp how to effectively define and use Structs in your Noir programs. +keywords: + [ + noir, + struct type, + methods, + examples, + data structures, + ] +sidebar_position: 8 +--- + +A struct also allows for grouping multiple values of different types. Unlike tuples, we can also +name each field. + +> **Note:** The usage of _field_ here refers to each element of the struct and is unrelated to the +> field type of Noir. + +Defining a struct requires giving it a name and listing each field within as `: ` pairs: + +```rust +struct Animal { + hands: Field, + legs: Field, + eyes: u8, +} +``` + +An instance of a struct can then be created with actual values in `: ` pairs in any +order. Struct fields are accessible using their given names: + +```rust +fn main() { + let legs = 4; + + let dog = Animal { + eyes: 2, + hands: 0, + legs, + }; + + let zero = dog.hands; +} +``` + +Structs can also be destructured in a pattern, binding each field to a new variable: + +```rust +fn main() { + let Animal { hands, legs: feet, eyes } = get_octopus(); + + let ten = hands + feet + eyes as u8; +} + +fn get_octopus() -> Animal { + let octopus = Animal { + hands: 0, + legs: 8, + eyes: 2, + }; + + octopus +} +``` + +The new variables can be bound with names different from the original struct field names, as +showcased in the `legs --> feet` binding in the example above. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/tuples.md new file mode 100644 index 00000000000..2ec5c9c4113 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/data_types/tuples.md @@ -0,0 +1,48 @@ +--- +title: Tuples +description: + Dive into the Tuple data type in Noir. Understand its methods, practical examples, and best practices for efficiently using Tuples in your Noir code. +keywords: + [ + noir, + tuple type, + methods, + examples, + multi-value containers, + ] +sidebar_position: 7 +--- + +A tuple collects multiple values like an array, but with the added ability to collect values of +different types: + +```rust +fn main() { + let tup: (u8, u64, Field) = (255, 500, 1000); +} +``` + +One way to access tuple elements is via destructuring using pattern matching: + +```rust +fn main() { + let tup = (1, 2); + + let (one, two) = tup; + + let three = one + two; +} +``` + +Another way to access tuple elements is via direct member access, using a period (`.`) followed by +the index of the element we want to access. Index `0` corresponds to the first tuple element, `1` to +the second and so on: + +```rust +fn main() { + let tup = (5, 6, 7, 8); + + let five = tup.0; + let eight = tup.3; +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/functions.md new file mode 100644 index 00000000000..f656cdfd97a --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/functions.md @@ -0,0 +1,226 @@ +--- +title: Functions +description: + Learn how to declare functions and methods in Noir, a programming language with Rust semantics. + This guide covers parameter declaration, return types, call expressions, and more. +keywords: [Noir, Rust, functions, methods, parameter declaration, return types, call expressions] +sidebar_position: 1 +--- + +Functions in Noir follow the same semantics of Rust, though Noir does not support early returns. + +To declare a function the `fn` keyword is used. + +```rust +fn foo() {} +``` + +By default, functions are visible only within the package they are defined. To make them visible outside of that package (for example, as part of a [library](../modules_packages_crates/crates_and_packages.md#libraries)), you should mark them as `pub`: + +```rust +pub fn foo() {} +``` + +You can also restrict the visibility of the function to only the crate it was defined in, by specifying `pub(crate)`: + +```rust +pub(crate) fn foo() {} //foo can only be called within its crate +``` + +All parameters in a function must have a type and all types are known at compile time. The parameter +is pre-pended with a colon and the parameter type. Multiple parameters are separated using a comma. + +```rust +fn foo(x : Field, y : Field){} +``` + +The return type of a function can be stated by using the `->` arrow notation. The function below +states that the foo function must return a `Field`. If the function returns no value, then the arrow +is omitted. + +```rust +fn foo(x : Field, y : Field) -> Field { + x + y +} +``` + +Note that a `return` keyword is unneeded in this case - the last expression in a function's body is +returned. + +## Main function + +If you're writing a binary, the `main` function is the starting point of your program. You can pass all types of expressions to it, as long as they have a fixed size at compile time: + +```rust +fn main(x : Field) // this is fine: passing a Field +fn main(x : [Field; 2]) // this is also fine: passing a Field with known size at compile-time +fn main(x : (Field, bool)) // 👌: passing a (Field, bool) tuple means size 2 +fn main(x : str<5>) // this is fine, as long as you pass a string of size 5 + +fn main(x : Vec) // can't compile, has variable size +fn main(x : [Field]) // can't compile, has variable size +fn main(....// i think you got it by now +``` + +Keep in mind [tests](../../tooling/testing.md) don't differentiate between `main` and any other function. The following snippet passes tests, but won't compile or prove: + +```rust +fn main(x : [Field]) { + assert(x[0] == 1); +} + +#[test] +fn test_one() { + main(&[1, 2]); +} +``` + +```bash +$ nargo test +[testing] Running 1 test functions +[testing] Testing test_one... ok +[testing] All tests passed + +$ nargo check +The application panicked (crashed). +Message: Cannot have variable sized arrays as a parameter to main +``` + +## Call Expressions + +Calling a function in Noir is executed by using the function name and passing in the necessary +arguments. + +Below we show how to call the `foo` function from the `main` function using a call expression: + +```rust +fn main(x : Field, y : Field) { + let z = foo(x); +} + +fn foo(x : Field) -> Field { + x + x +} +``` + +## Methods + +You can define methods in Noir on any struct type in scope. + +```rust +struct MyStruct { + foo: Field, + bar: Field, +} + +impl MyStruct { + fn new(foo: Field) -> MyStruct { + MyStruct { + foo, + bar: 2, + } + } + + fn sum(self) -> Field { + self.foo + self.bar + } +} + +fn main() { + let s = MyStruct::new(40); + assert(s.sum() == 42); +} +``` + +Methods are just syntactic sugar for functions, so if we wanted to we could also call `sum` as +follows: + +```rust +assert(MyStruct::sum(s) == 42); +``` + +It is also possible to specialize which method is chosen depending on the [generic](./generics.md) type that is used. In this example, the `foo` function returns different values depending on its type: + +```rust +struct Foo {} + +impl Foo { + fn foo(self) -> Field { 1 } +} + +impl Foo { + fn foo(self) -> Field { 2 } +} + +fn main() { + let f1: Foo = Foo{}; + let f2: Foo = Foo{}; + assert(f1.foo() + f2.foo() == 3); +} +``` + +Also note that impls with the same method name defined in them cannot overlap. For example, if we already have `foo` defined for `Foo` and `Foo` like we do above, we cannot also define `foo` in an `impl Foo` since it would be ambiguous which version of `foo` to choose. + +```rust +// Including this impl in the same project as the above snippet would +// cause an overlapping impls error +impl Foo { + fn foo(self) -> Field { 3 } +} +``` + +## Lambdas + +Lambdas are anonymous functions. They follow the syntax of Rust - `|arg1, arg2, ..., argN| return_expression`. + +```rust +let add_50 = |val| val + 50; +assert(add_50(100) == 150); +``` + +See [Lambdas](./lambdas.md) for more details. + +## Attributes + +Attributes are metadata that can be applied to a function, using the following syntax: `#[attribute(value)]`. + +Supported attributes include: + +- **builtin**: the function is implemented by the compiler, for efficiency purposes. +- **deprecated**: mark the function as _deprecated_. Calling the function will generate a warning: `warning: use of deprecated function` +- **field**: Used to enable conditional compilation of code depending on the field size. See below for more details +- **oracle**: mark the function as _oracle_; meaning it is an external unconstrained function, implemented in noir_js. See [Unconstrained](./unconstrained.md) and [NoirJS](../../reference/NoirJS/noir_js/index.md) for more details. +- **test**: mark the function as unit tests. See [Tests](../../tooling/testing.md) for more details + +### Field Attribute + +The field attribute defines which field the function is compatible for. The function is conditionally compiled, under the condition that the field attribute matches the Noir native field. +The field can be defined implicitly, by using the name of the elliptic curve usually associated to it - for instance bn254, bls12_381 - or explicitly by using the field (prime) order, in decimal or hexadecimal form. +As a result, it is possible to define multiple versions of a function with each version specialized for a different field attribute. This can be useful when a function requires different parameters depending on the underlying elliptic curve. + +Example: we define the function `foo()` three times below. Once for the default Noir bn254 curve, once for the field $\mathbb F_{23}$, which will normally never be used by Noir, and once again for the bls12_381 curve. + +```rust +#[field(bn254)] +fn foo() -> u32 { + 1 +} + +#[field(23)] +fn foo() -> u32 { + 2 +} + +// This commented code would not compile as foo would be defined twice because it is the same field as bn254 +// #[field(21888242871839275222246405745257275088548364400416034343698204186575808495617)] +// fn foo() -> u32 { +// 2 +// } + +#[field(bls12_381)] +fn foo() -> u32 { + 3 +} +``` + +If the field name is not known to Noir, it will discard the function. Field names are case insensitive. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/generics.md new file mode 100644 index 00000000000..ddd42bf1f9b --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/generics.md @@ -0,0 +1,106 @@ +--- +title: Generics +description: Learn how to use Generics in Noir +keywords: [Noir, Rust, generics, functions, structs] +sidebar_position: 7 +--- + +Generics allow you to use the same functions with multiple different concrete data types. You can +read more about the concept of generics in the Rust documentation +[here](https://doc.rust-lang.org/book/ch10-01-syntax.html). + +Here is a trivial example showing the identity function that supports any type. In Rust, it is +common to refer to the most general type as `T`. We follow the same convention in Noir. + +```rust +fn id(x: T) -> T { + x +} +``` + +## In Structs + +Generics are useful for specifying types in structs. For example, we can specify that a field in a +struct will be of a certain generic type. In this case `value` is of type `T`. + +```rust +struct RepeatedValue { + value: T, + count: Field, +} + +impl RepeatedValue { + fn print(self) { + for _i in 0 .. self.count { + println(self.value); + } + } +} + +fn main() { + let repeated = RepeatedValue { value: "Hello!", count: 2 }; + repeated.print(); +} +``` + +The `print` function will print `Hello!` an arbitrary number of times, twice in this case. + +If we want to be generic over array lengths (which are type-level integers), we can use numeric +generics. Using these looks just like using regular generics, but these generics can resolve to +integers at compile-time, rather than resolving to types. Here's an example of a struct that is +generic over the size of the array it contains internally: + +```rust +struct BigInt { + limbs: [u32; N], +} + +impl BigInt { + // `N` is in scope of all methods in the impl + fn first(first: BigInt, second: BigInt) -> Self { + assert(first.limbs != second.limbs); + first + + fn second(first: BigInt, second: Self) -> Self { + assert(first.limbs != second.limbs); + second + } +} +``` + +## Calling functions on generic parameters + +Since a generic type `T` can represent any type, how can we call functions on the underlying type? +In other words, how can we go from "any type `T`" to "any type `T` that has certain methods available?" + +This is what [traits](../concepts/traits) are for in Noir. Here's an example of a function generic over +any type `T` that implements the `Eq` trait for equality: + +```rust +fn first_element_is_equal(array1: [T; N], array2: [T; N]) -> bool + where T: Eq +{ + if (array1.len() == 0) | (array2.len() == 0) { + true + } else { + array1[0] == array2[0] + } +} + +fn main() { + assert(first_element_is_equal([1, 2, 3], [1, 5, 6])); + + // We can use first_element_is_equal for arrays of any type + // as long as we have an Eq impl for the types we pass in + let array = [MyStruct::new(), MyStruct::new()]; + assert(array_eq(array, array, MyStruct::eq)); +} + +impl Eq for MyStruct { + fn eq(self, other: MyStruct) -> bool { + self.foo == other.foo + } +} +``` + +You can find more details on traits and trait implementations on the [traits page](../concepts/traits). diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/globals.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/globals.md new file mode 100644 index 00000000000..063a3d89248 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/globals.md @@ -0,0 +1,72 @@ +--- +title: Global Variables +description: + Learn about global variables in Noir. Discover how + to declare, modify, and use them in your programs. +keywords: [noir programming language, globals, global variables, constants] +sidebar_position: 8 +--- + +## Globals + + +Noir supports global variables. The global's type can be inferred by the compiler entirely: + +```rust +global N = 5; // Same as `global N: Field = 5` + +global TUPLE = (3, 2); + +fn main() { + assert(N == 5); + assert(N == TUPLE.0 + TUPLE.1); +} +``` + +:::info + +Globals can be defined as any expression, so long as they don't depend on themselves - otherwise there would be a dependency cycle! For example: + +```rust +global T = foo(T); // dependency error +``` + +::: + + +If they are initialized to a literal integer, globals can be used to specify an array's length: + +```rust +global N: Field = 2; + +fn main(y : [Field; N]) { + assert(y[0] == y[1]) +} +``` + +A global from another module can be imported or referenced externally like any other name: + +```rust +global N = 20; + +fn main() { + assert(my_submodule::N != N); +} + +mod my_submodule { + global N: Field = 10; +} +``` + +When a global is used, Noir replaces the name with its definition on each occurrence. +This means globals defined using function calls will repeat the call each time they're used: + +```rust +global RESULT = foo(); + +fn foo() -> [Field; 100] { ... } +``` + +This is usually fine since Noir will generally optimize any function call that does not +refer to a program input into a constant. It should be kept in mind however, if the called +function performs side-effects like `println`, as these will still occur on each use. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/lambdas.md new file mode 100644 index 00000000000..be3c7e0b5ca --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/lambdas.md @@ -0,0 +1,81 @@ +--- +title: Lambdas +description: Learn how to use anonymous functions in Noir programming language. +keywords: [Noir programming language, lambda, closure, function, anonymous function] +sidebar_position: 9 +--- + +## Introduction + +Lambdas are anonymous functions. The syntax is `|arg1, arg2, ..., argN| return_expression`. + +```rust +let add_50 = |val| val + 50; +assert(add_50(100) == 150); +``` + +A block can be used as the body of a lambda, allowing you to declare local variables inside it: + +```rust +let cool = || { + let x = 100; + let y = 100; + x + y +} + +assert(cool() == 200); +``` + +## Closures + +Inside the body of a lambda, you can use variables defined in the enclosing function. Such lambdas are called **closures**. In this example `x` is defined inside `main` and is accessed from within the lambda: + +```rust +fn main() { + let x = 100; + let closure = || x + 150; + assert(closure() == 250); +} +``` + +## Passing closures to higher-order functions + +It may catch you by surprise that the following code fails to compile: + +```rust +fn foo(f: fn () -> Field) -> Field { + f() +} + +fn main() { + let (x, y) = (50, 50); + assert(foo(|| x + y) == 100); // error :( +} +``` + +The reason is that the closure's capture environment affects its type - we have a closure that captures two Fields and `foo` +expects a regular function as an argument - those are incompatible. +:::note + +Variables contained within the `||` are the closure's parameters, and the expression that follows it is the closure's body. The capture environment is comprised of any variables used in the closure's body that are not parameters. + +E.g. in |x| x + y, y would be a captured variable, but x would not be, since it is a parameter of the closure. + +::: +The syntax for the type of a closure is `fn[env](args) -> ret_type`, where `env` is the capture environment of the closure - +in this example that's `(Field, Field)`. + +The best solution in our case is to make `foo` generic over the environment type of its parameter, so that it can be called +with closures with any environment, as well as with regular functions: + +```rust +fn foo(f: fn[Env]() -> Field) -> Field { + f() +} + +fn main() { + let (x, y) = (50, 50); + assert(foo(|| x + y) == 100); // compiles fine + assert(foo(|| 60) == 60); // compiles fine +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/mutability.md new file mode 100644 index 00000000000..fdeef6a87c5 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/mutability.md @@ -0,0 +1,121 @@ +--- +title: Mutability +description: + Learn about mutable variables in Noir. Discover how + to declare, modify, and use them in your programs. +keywords: [noir programming language, mutability in noir, mutable variables] +sidebar_position: 8 +--- + +Variables in noir can be declared mutable via the `mut` keyword. Mutable variables can be reassigned +to via an assignment expression. + +```rust +let x = 2; +x = 3; // error: x must be mutable to be assigned to + +let mut y = 3; +let y = 4; // OK +``` + +The `mut` modifier can also apply to patterns: + +```rust +let (a, mut b) = (1, 2); +a = 11; // error: a must be mutable to be assigned to +b = 12; // OK + +let mut (c, d) = (3, 4); +c = 13; // OK +d = 14; // OK + +// etc. +let MyStruct { x: mut y } = MyStruct { x: a }; +// y is now in scope +``` + +Note that mutability in noir is local and everything is passed by value, so if a called function +mutates its parameters then the parent function will keep the old value of the parameters. + +```rust +fn main() -> pub Field { + let x = 3; + helper(x); + x // x is still 3 +} + +fn helper(mut x: i32) { + x = 4; +} +``` + +## Non-local mutability + +Non-local mutability can be achieved through the mutable reference type `&mut T`: + +```rust +fn set_to_zero(x: &mut Field) { + *x = 0; +} + +fn main() { + let mut y = 42; + set_to_zero(&mut y); + assert(*y == 0); +} +``` + +When creating a mutable reference, the original variable being referred to (`y` in this +example) must also be mutable. Since mutable references are a reference type, they must +be explicitly dereferenced via `*` to retrieve the underlying value. Note that this yields +a copy of the value, so mutating this copy will not change the original value behind the +reference: + +```rust +fn main() { + let mut x = 1; + let x_ref = &mut x; + + let mut y = *x_ref; + let y_ref = &mut y; + + x = 2; + *x_ref = 3; + + y = 4; + *y_ref = 5; + + assert(x == 3); + assert(*x_ref == 3); + assert(y == 5); + assert(*y_ref == 5); +} +``` + +Note that types in Noir are actually deeply immutable so the copy that occurs when +dereferencing is only a conceptual copy - no additional constraints will occur. + +Mutable references can also be stored within structs. Note that there is also +no lifetime parameter on these unlike rust. This is because the allocated memory +always lasts the entire program - as if it were an array of one element. + +```rust +struct Foo { + x: &mut Field +} + +impl Foo { + fn incr(mut self) { + *self.x += 1; + } +} + +fn main() { + let foo = Foo { x: &mut 0 }; + foo.incr(); + assert(*foo.x == 1); +} +``` + +In general, you should avoid non-local & shared mutability unless it is needed. Sticking +to only local mutability will improve readability and potentially improve compiler optimizations as well. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/ops.md new file mode 100644 index 00000000000..c35c36c38a9 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/ops.md @@ -0,0 +1,98 @@ +--- +title: Logical Operations +description: + Learn about the supported arithmetic and logical operations in the Noir programming language. + Discover how to perform operations on private input types, integers, and booleans. +keywords: + [ + Noir programming language, + supported operations, + arithmetic operations, + logical operations, + predicate operators, + bitwise operations, + short-circuiting, + backend, + ] +sidebar_position: 3 +--- + +# Operations + +## Table of Supported Operations + +| Operation | Description | Requirements | +| :-------- | :------------------------------------------------------------: | -------------------------------------: | +| + | Adds two private input types together | Types must be private input | +| - | Subtracts two private input types together | Types must be private input | +| \* | Multiplies two private input types together | Types must be private input | +| / | Divides two private input types together | Types must be private input | +| ^ | XOR two private input types together | Types must be integer | +| & | AND two private input types together | Types must be integer | +| \| | OR two private input types together | Types must be integer | +| \<\< | Left shift an integer by another integer amount | Types must be integer, shift must be u8 | +| >> | Right shift an integer by another integer amount | Types must be integer, shift must be u8 | +| ! | Bitwise not of a value | Type must be integer or boolean | +| \< | returns a bool if one value is less than the other | Upper bound must have a known bit size | +| \<= | returns a bool if one value is less than or equal to the other | Upper bound must have a known bit size | +| > | returns a bool if one value is more than the other | Upper bound must have a known bit size | +| >= | returns a bool if one value is more than or equal to the other | Upper bound must have a known bit size | +| == | returns a bool if one value is equal to the other | Both types must not be constants | +| != | returns a bool if one value is not equal to the other | Both types must not be constants | + +### Predicate Operators + +`<,<=, !=, == , >, >=` are known as predicate/comparison operations because they compare two values. +This differs from the operations such as `+` where the operands are used in _computation_. + +### Bitwise Operations Example + +```rust +fn main(x : Field) { + let y = x as u32; + let z = y & y; +} +``` + +`z` is implicitly constrained to be the result of `y & y`. The `&` operand is used to denote bitwise +`&`. + +> `x & x` would not compile as `x` is a `Field` and not an integer type. + +### Logical Operators + +Noir has no support for the logical operators `||` and `&&`. This is because encoding the +short-circuiting that these operators require can be inefficient for Noir's backend. Instead you can +use the bitwise operators `|` and `&` which operate identically for booleans, just without the +short-circuiting. + +```rust +let my_val = 5; + +let mut flag = 1; +if (my_val > 6) | (my_val == 0) { + flag = 0; +} +assert(flag == 1); + +if (my_val != 10) & (my_val < 50) { + flag = 0; +} +assert(flag == 0); +``` + +### Shorthand operators + +Noir shorthand operators for most of the above operators, namely `+=, -=, *=, /=, %=, &=, |=, ^=, <<=`, and `>>=`. These allow for more concise syntax. For example: + +```rust +let mut i = 0; +i = i + 1; +``` + +could be written as: + +```rust +let mut i = 0; +i += 1; +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/oracles.md new file mode 100644 index 00000000000..aa380b5f7b8 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/oracles.md @@ -0,0 +1,31 @@ +--- +title: Oracles +description: Dive into how Noir supports Oracles via RPC calls, and learn how to declare an Oracle in Noir with our comprehensive guide. +keywords: + - Noir + - Oracles + - RPC Calls + - Unconstrained Functions + - Programming + - Blockchain +sidebar_position: 6 +--- + +:::note + +This is an experimental feature that is not fully documented. If you notice any outdated information or potential improvements to this page, pull request contributions are very welcome: https://github.com/noir-lang/noir + +::: + +Noir has support for Oracles via RPC calls. This means Noir will make an RPC call and use the return value for proof generation. + +Since Oracles are not resolved by Noir, they are [`unconstrained` functions](./unconstrained.md) + +You can declare an Oracle through the `#[oracle()]` flag. Example: + +```rust +#[oracle(get_number_sequence)] +unconstrained fn get_number_sequence(_size: Field) -> [Field] {} +``` + +The timeout for when using an external RPC oracle resolver can be set with the `NARGO_FOREIGN_CALL_TIMEOUT` environment variable. This timeout is in units of milliseconds. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/shadowing.md new file mode 100644 index 00000000000..5ce6130d201 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/shadowing.md @@ -0,0 +1,44 @@ +--- +title: Shadowing +sidebar_position: 12 +--- + +Noir allows for inheriting variables' values and re-declaring them with the same name similar to Rust, known as shadowing. + +For example, the following function is valid in Noir: + +```rust +fn main() { + let x = 5; + + { + let x = x * 2; + assert (x == 10); + } + + assert (x == 5); +} +``` + +In this example, a variable x is first defined with the value 5. + +The local scope that follows shadows the original x, i.e. creates a local mutable x based on the value of the original x. It is given a value of 2 times the original x. + +When we return to the main scope, x once again refers to just the original x, which stays at the value of 5. + +## Temporal mutability + +One way that shadowing is useful, in addition to ergonomics across scopes, is for temporarily mutating variables. + +```rust +fn main() { + let age = 30; + // age = age + 5; // Would error as `age` is immutable by default. + + let mut age = age + 5; // Temporarily mutates `age` with a new value. + + let age = age; // Locks `age`'s mutability again. + + assert (age == 35); +} +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/traits.md new file mode 100644 index 00000000000..ef1445a5907 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/traits.md @@ -0,0 +1,389 @@ +--- +title: Traits +description: + Traits in Noir can be used to abstract out a common interface for functions across + several data types. +keywords: [noir programming language, traits, interfaces, generic, protocol] +sidebar_position: 14 +--- + +## Overview + +Traits in Noir are a useful abstraction similar to interfaces or protocols in other languages. Each trait defines +the interface of several methods contained within the trait. Types can then implement this trait by providing +implementations for these methods. For example in the program: + +```rust +struct Rectangle { + width: Field, + height: Field, +} + +impl Rectangle { + fn area(self) -> Field { + self.width * self.height + } +} + +fn log_area(r: Rectangle) { + println(r.area()); +} +``` + +We have a function `log_area` to log the area of a `Rectangle`. Now how should we change the program if we want this +function to work on `Triangle`s as well?: + +```rust +struct Triangle { + width: Field, + height: Field, +} + +impl Triangle { + fn area(self) -> Field { + self.width * self.height / 2 + } +} +``` + +Making `log_area` generic over all types `T` would be invalid since not all types have an `area` method. Instead, we can +introduce a new `Area` trait and make `log_area` generic over all types `T` that implement `Area`: + +```rust +trait Area { + fn area(self) -> Field; +} + +fn log_area(shape: T) where T: Area { + println(shape.area()); +} +``` + +We also need to explicitly implement `Area` for `Rectangle` and `Triangle`. We can do that by changing their existing +impls slightly. Note that the parameter types and return type of each of our `area` methods must match those defined +by the `Area` trait. + +```rust +impl Area for Rectangle { + fn area(self) -> Field { + self.width * self.height + } +} + +impl Area for Triangle { + fn area(self) -> Field { + self.width * self.height / 2 + } +} +``` + +Now we have a working program that is generic over any type of Shape that is used! Others can even use this program +as a library with their own types - such as `Circle` - as long as they also implement `Area` for these types. + +## Where Clauses + +As seen in `log_area` above, when we want to create a function or method that is generic over any type that implements +a trait, we can add a where clause to the generic function. + +```rust +fn log_area(shape: T) where T: Area { + println(shape.area()); +} +``` + +It is also possible to apply multiple trait constraints on the same variable at once by combining traits with the `+` +operator. Similarly, we can have multiple trait constraints by separating each with a comma: + +```rust +fn foo(elements: [T], thing: U) where + T: Default + Add + Eq, + U: Bar, +{ + let mut sum = T::default(); + + for element in elements { + sum += element; + } + + if sum == T::default() { + thing.bar(); + } +} +``` + +## Generic Implementations + +You can add generics to a trait implementation by adding the generic list after the `impl` keyword: + +```rust +trait Second { + fn second(self) -> Field; +} + +impl Second for (T, Field) { + fn second(self) -> Field { + self.1 + } +} +``` + +You can also implement a trait for every type this way: + +```rust +trait Debug { + fn debug(self); +} + +impl Debug for T { + fn debug(self) { + println(self); + } +} + +fn main() { + 1.debug(); +} +``` + +### Generic Trait Implementations With Where Clauses + +Where clauses can also be placed on trait implementations themselves to restrict generics in a similar way. +For example, while `impl Foo for T` implements the trait `Foo` for every type, `impl Foo for T where T: Bar` +will implement `Foo` only for types that also implement `Bar`. This is often used for implementing generic types. +For example, here is the implementation for array equality: + +```rust +impl Eq for [T; N] where T: Eq { + // Test if two arrays have the same elements. + // Because both arrays must have length N, we know their lengths already match. + fn eq(self, other: Self) -> bool { + let mut result = true; + + for i in 0 .. self.len() { + // The T: Eq constraint is needed to call == on the array elements here + result &= self[i] == other[i]; + } + + result + } +} +``` + +## Generic Traits + +Traits themselves can also be generic by placing the generic arguments after the trait name. These generics are in +scope of every item within the trait. + +```rust +trait Into { + // Convert `self` to type `T` + fn into(self) -> T; +} +``` + +When implementing generic traits the generic arguments of the trait must be specified. This is also true anytime +when referencing a generic trait (e.g. in a `where` clause). + +```rust +struct MyStruct { + array: [Field; 2], +} + +impl Into<[Field; 2]> for MyStruct { + fn into(self) -> [Field; 2] { + self.array + } +} + +fn as_array(x: T) -> [Field; 2] + where T: Into<[Field; 2]> +{ + x.into() +} + +fn main() { + let array = [1, 2]; + let my_struct = MyStruct { array }; + + assert_eq(as_array(my_struct), array); +} +``` + +## Trait Methods With No `self` + +A trait can contain any number of methods, each of which have access to the `Self` type which represents each type +that eventually implements the trait. Similarly, the `self` variable is available as well but is not required to be used. +For example, we can define a trait to create a default value for a type. This trait will need to return the `Self` type +but doesn't need to take any parameters: + +```rust +trait Default { + fn default() -> Self; +} +``` + +Implementing this trait can be done similarly to any other trait: + +```rust +impl Default for Field { + fn default() -> Field { + 0 + } +} + +struct MyType {} + +impl Default for MyType { + fn default() -> Field { + MyType {} + } +} +``` + +However, since there is no `self` parameter, we cannot call it via the method call syntax `object.method()`. +Instead, we'll need to refer to the function directly. This can be done either by referring to the +specific impl `MyType::default()` or referring to the trait itself `Default::default()`. In the later +case, type inference determines the impl that is selected. + +```rust +let my_struct = MyStruct::default(); + +let x: Field = Default::default(); +let result = x + Default::default(); +``` + +:::warning + +```rust +let _ = Default::default(); +``` + +If type inference cannot select which impl to use because of an ambiguous `Self` type, an impl will be +arbitrarily selected. This occurs most often when the result of a trait function call with no parameters +is unused. To avoid this, when calling a trait function with no `self` or `Self` parameters or return type, +always refer to it via the implementation type's namespace - e.g. `MyType::default()`. +This is set to change to an error in future Noir versions. + +::: + +## Default Method Implementations + +A trait can also have default implementations of its methods by giving a body to the desired functions. +Note that this body must be valid for all types that may implement the trait. As a result, the only +valid operations on `self` will be operations valid for any type or other operations on the trait itself. + +```rust +trait Numeric { + fn add(self, other: Self) -> Self; + + // Default implementation of double is (self + self) + fn double(self) -> Self { + self.add(self) + } +} +``` + +When implementing a trait with default functions, a type may choose to implement only the required functions: + +```rust +impl Numeric for Field { + fn add(self, other: Field) -> Field { + self + other + } +} +``` + +Or it may implement the optional methods as well: + +```rust +impl Numeric for u32 { + fn add(self, other: u32) -> u32 { + self + other + } + + fn double(self) -> u32 { + self * 2 + } +} +``` + +## Impl Specialization + +When implementing traits for a generic type it is possible to implement the trait for only a certain combination +of generics. This can be either as an optimization or because those specific generics are required to implement the trait. + +```rust +trait Sub { + fn sub(self, other: Self) -> Self; +} + +struct NonZero { + value: T, +} + +impl Sub for NonZero { + fn sub(self, other: Self) -> Self { + let value = self.value - other.value; + assert(value != 0); + NonZero { value } + } +} +``` + +## Overlapping Implementations + +Overlapping implementations are disallowed by Noir to ensure Noir's decision on which impl to select is never ambiguous. +This means if a trait `Foo` is already implemented +by a type `Bar` for all `T`, then we cannot also have a separate impl for `Bar` (or any other +type argument). Similarly, if there is an impl for all `T` such as `impl Debug for T`, we cannot create +any more impls to `Debug` for other types since it would be ambiguous which impl to choose for any given +method call. + +```rust +trait Trait {} + +// Previous impl defined here +impl Trait for (A, B) {} + +// error: Impl for type `(Field, Field)` overlaps with existing impl +impl Trait for (Field, Field) {} +``` + +## Trait Coherence + +Another restriction on trait implementations is coherence. This restriction ensures other crates cannot create +impls that may overlap with other impls, even if several unrelated crates are used as dependencies in the same +program. + +The coherence restriction is: to implement a trait, either the trait itself or the object type must be declared +in the crate the impl is in. + +In practice this often comes up when using types provided by libraries. If a library provides a type `Foo` that does +not implement a trait in the standard library such as `Default`, you may not `impl Default for Foo` in your own crate. +While restrictive, this prevents later issues or silent changes in the program if the `Foo` library later added its +own impl for `Default`. If you are a user of the `Foo` library in this scenario and need a trait not implemented by the +library your choices are to either submit a patch to the library or use the newtype pattern. + +### The Newtype Pattern + +The newtype pattern gets around the coherence restriction by creating a new wrapper type around the library type +that we cannot create `impl`s for. Since the new wrapper type is defined in our current crate, we can create +impls for any trait we need on it. + +```rust +struct Wrapper { + foo: dep::some_library::Foo, +} + +impl Default for Wrapper { + fn default() -> Wrapper { + Wrapper { + foo: dep::some_library::Foo::new(), + } + } +} +``` + +Since we have an impl for our own type, the behavior of this code will not change even if `some_library` is updated +to provide its own `impl Default for Foo`. The downside of this pattern is that it requires extra wrapping and +unwrapping of values when converting to and from the `Wrapper` and `Foo` types. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/unconstrained.md new file mode 100644 index 00000000000..b8e71fe65f0 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/concepts/unconstrained.md @@ -0,0 +1,99 @@ +--- +title: Unconstrained Functions +description: "Learn about what unconstrained functions in Noir are, how to use them and when you'd want to." + +keywords: [Noir programming language, unconstrained, open] +sidebar_position: 5 +--- + +Unconstrained functions are functions which do not constrain any of the included computation and allow for non-deterministic computation. + +## Why? + +Zero-knowledge (ZK) domain-specific languages (DSL) enable developers to generate ZK proofs from their programs by compiling code down to the constraints of an NP complete language (such as R1CS or PLONKish languages). However, the hard bounds of a constraint system can be very limiting to the functionality of a ZK DSL. + +Enabling a circuit language to perform unconstrained execution is a powerful tool. Said another way, unconstrained execution lets developers generate witnesses from code that does not generate any constraints. Being able to execute logic outside of a circuit is critical for both circuit performance and constructing proofs on information that is external to a circuit. + +Fetching information from somewhere external to a circuit can also be used to enable developers to improve circuit efficiency. + +A ZK DSL does not just prove computation, but proves that some computation was handled correctly. Thus, it is necessary that when we switch from performing some operation directly inside of a circuit to inside of an unconstrained environment that the appropriate constraints are still laid down elsewhere in the circuit. + +## Example + +An in depth example might help drive the point home. This example comes from the excellent [post](https://discord.com/channels/1113924620781883405/1124022445054111926/1128747641853972590) by Tom in the Noir Discord. + +Let's look at how we can optimize a function to turn a `u72` into an array of `u8`s. + +```rust +fn main(num: u72) -> pub [u8; 8] { + let mut out: [u8; 8] = [0; 8]; + for i in 0..8 { + out[i] = (num >> (56 - (i * 8)) as u72 & 0xff) as u8; + } + + out +} +``` + +``` +Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 91 +Backend circuit size: 3619 +``` + +A lot of the operations in this function are optimized away by the compiler (all the bit-shifts turn into divisions by constants). However we can save a bunch of gates by casting to u8 a bit earlier. This automatically truncates the bit-shifted value to fit in a u8 which allows us to remove the AND against 0xff. This saves us ~480 gates in total. + +```rust +fn main(num: u72) -> pub [u8; 8] { + let mut out: [u8; 8] = [0; 8]; + for i in 0..8 { + out[i] = (num >> (56 - (i * 8)) as u8; + } + + out +} +``` + +``` +Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 75 +Backend circuit size: 3143 +``` + +Those are some nice savings already but we can do better. This code is all constrained so we're proving every step of calculating out using num, but we don't actually care about how we calculate this, just that it's correct. This is where brillig comes in. + +It turns out that truncating a u72 into a u8 is hard to do inside a snark, each time we do as u8 we lay down 4 ACIR opcodes which get converted into multiple gates. It's actually much easier to calculate num from out than the other way around. All we need to do is multiply each element of out by a constant and add them all together, both relatively easy operations inside a snark. + +We can then run u72_to_u8 as unconstrained brillig code in order to calculate out, then use that result in our constrained function and assert that if we were to do the reverse calculation we'd get back num. This looks a little like the below: + +```rust +fn main(num: u72) -> pub [u8; 8] { + let out = u72_to_u8(num); + + let mut reconstructed_num: u72 = 0; + for i in 0..8 { + reconstructed_num += (out[i] as u72 << (56 - (8 * i))); + } + assert(num == reconstructed_num); + out +} + +unconstrained fn u72_to_u8(num: u72) -> [u8; 8] { + let mut out: [u8; 8] = [0; 8]; + for i in 0..8 { + out[i] = (num >> (56 - (i * 8))) as u8; + } + out +} +``` + +``` +Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 78 +Backend circuit size: 2902 +``` + +This ends up taking off another ~250 gates from our circuit! We've ended up with more ACIR opcodes than before but they're easier for the backend to prove (resulting in fewer gates). + +Generally we want to use brillig whenever there's something that's easy to verify but hard to compute within the circuit. For example, if you wanted to calculate a square root of a number it'll be a much better idea to calculate this in brillig and then assert that if you square the result you get back your number. + +## Break and Continue + +In addition to loops over runtime bounds, `break` and `continue` are also available in unconstrained code. See [break and continue](../concepts/control_flow/#break-and-continue) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/_category_.json new file mode 100644 index 00000000000..1debcfe7675 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "Modules, Packages and Crates", + "position": 2, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/crates_and_packages.md new file mode 100644 index 00000000000..95ee9f52ab2 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/crates_and_packages.md @@ -0,0 +1,43 @@ +--- +title: Crates and Packages +description: Learn how to use Crates and Packages in your Noir project +keywords: [Nargo, dependencies, package management, crates, package] +sidebar_position: 0 +--- + +## Crates + +A crate is the smallest amount of code that the Noir compiler considers at a time. +Crates can contain modules, and the modules may be defined in other files that get compiled with the crate, as we’ll see in the coming sections. + +### Crate Types + +A Noir crate can come in several forms: binaries, libraries or contracts. + +#### Binaries + +_Binary crates_ are programs which you can compile to an ACIR circuit which you can then create proofs against. Each must have a function called `main` that defines the ACIR circuit which is to be proved. + +#### Libraries + +_Library crates_ don't have a `main` function and they don't compile down to ACIR. Instead they define functionality intended to be shared with multiple projects, and eventually included in a binary crate. + +#### Contracts + +Contract crates are similar to binary crates in that they compile to ACIR which you can create proofs against. They are different in that they do not have a single `main` function, but are a collection of functions to be deployed to the [Aztec network](https://aztec.network). You can learn more about the technical details of Aztec in the [monorepo](https://github.com/AztecProtocol/aztec-packages) or contract [examples](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts). + +### Crate Root + +Every crate has a root, which is the source file that the compiler starts, this is also known as the root module. The Noir compiler does not enforce any conditions on the name of the file which is the crate root, however if you are compiling via Nargo the crate root must be called `lib.nr` or `main.nr` for library or binary crates respectively. + +## Packages + +A Nargo _package_ is a collection of one of more crates that provides a set of functionality. A package must include a Nargo.toml file. + +A package _must_ contain either a library or a binary crate, but not both. + +### Differences from Cargo Packages + +One notable difference between Rust's Cargo and Noir's Nargo is that while Cargo allows a package to contain an unlimited number of binary crates and a single library crate, Nargo currently only allows a package to contain a single crate. + +In future this restriction may be lifted to allow a Nargo package to contain both a binary and library crate or multiple binary crates. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/dependencies.md new file mode 100644 index 00000000000..04c1703d929 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/dependencies.md @@ -0,0 +1,124 @@ +--- +title: Dependencies +description: + Learn how to specify and manage dependencies in Nargo, allowing you to upload packages to GitHub + and use them easily in your project. +keywords: [Nargo, dependencies, GitHub, package management, versioning] +sidebar_position: 1 +--- + +Nargo allows you to upload packages to GitHub and use them as dependencies. + +## Specifying a dependency + +Specifying a dependency requires a tag to a specific commit and the git url to the url containing +the package. + +Currently, there are no requirements on the tag contents. If requirements are added, it would follow +semver 2.0 guidelines. + +> Note: Without a `tag` , there would be no versioning and dependencies would change each time you +> compile your project. + +For example, to add the [ecrecover-noir library](https://github.com/colinnielsen/ecrecover-noir) to your project, add it to `Nargo.toml`: + +```toml +# Nargo.toml + +[dependencies] +ecrecover = {tag = "v0.8.0", git = "https://github.com/colinnielsen/ecrecover-noir"} +``` + +If the module is in a subdirectory, you can define a subdirectory in your git repository, for example: + +```toml +# Nargo.toml + +[dependencies] +easy_private_token_contract = {tag ="v0.1.0-alpha62", git = "https://github.com/AztecProtocol/aztec-packages", directory = "noir-contracts/contracts/easy_private_token_contract"} +``` + +## Specifying a local dependency + +You can also specify dependencies that are local to your machine. + +For example, this file structure has a library and binary crate + +```tree +├── binary_crate +│   ├── Nargo.toml +│   └── src +│   └── main.nr +└── lib_a + ├── Nargo.toml + └── src + └── lib.nr +``` + +Inside of the binary crate, you can specify: + +```toml +# Nargo.toml + +[dependencies] +lib_a = { path = "../lib_a" } +``` + +## Importing dependencies + +You can import a dependency to a Noir file using the following syntax. For example, to import the +ecrecover-noir library and local lib_a referenced above: + +```rust +use dep::ecrecover; +use dep::lib_a; +``` + +You can also import only the specific parts of dependency that you want to use, like so: + +```rust +use dep::std::hash::sha256; +use dep::std::scalar_mul::fixed_base_embedded_curve; +``` + +Lastly, as demonstrated in the +[elliptic curve example](../standard_library/cryptographic_primitives/ec_primitives#examples), you +can import multiple items in the same line by enclosing them in curly braces: + +```rust +use dep::std::ec::tecurve::affine::{Curve, Point}; +``` + +We don't have a way to consume libraries from inside a [workspace](./workspaces) as external dependencies right now. + +Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml. + +## Dependencies of Dependencies + +Note that when you import a dependency, you also get access to all of the dependencies of that package. + +For example, the [phy_vector](https://github.com/resurgencelabs/phy_vector) library imports an [fraction](https://github.com/resurgencelabs/fraction) library. If you're importing the phy_vector library, then you can access the functions in fractions library like so: + +```rust +use dep::phy_vector; + +fn main(x : Field, y : pub Field) { + //... + let f = phy_vector::fraction::toFraction(true, 2, 1); + //... +} +``` + +## Available Libraries + +Noir does not currently have an official package manager. You can find a list of available Noir libraries in the [awesome-noir repo here](https://github.com/noir-lang/awesome-noir#libraries). + +Some libraries that are available today include: + +- [Standard Library](https://github.com/noir-lang/noir/tree/master/noir_stdlib) - the Noir Standard Library +- [Ethereum Storage Proof Verification](https://github.com/aragonzkresearch/noir-trie-proofs) - a library that contains the primitives necessary for RLP decoding (in the form of look-up table construction) and Ethereum state and storage proof verification (or verification of any trie proof involving 32-byte long keys) +- [BigInt](https://github.com/shuklaayush/noir-bigint) - a library that provides a custom BigUint56 data type, allowing for computations on large unsigned integers +- [ECrecover](https://github.com/colinnielsen/ecrecover-noir/tree/main) - a library to verify an ECDSA signature and return the source Ethereum address +- [Sparse Merkle Tree Verifier](https://github.com/vocdoni/smtverifier-noir/tree/main) - a library for verification of sparse Merkle trees +- [Signed Int](https://github.com/resurgencelabs/signed_int) - a library for accessing a custom Signed Integer data type, allowing access to negative numbers on Noir +- [Fraction](https://github.com/resurgencelabs/fraction) - a library for accessing fractional number data type in Noir, allowing results that aren't whole numbers diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/modules.md new file mode 100644 index 00000000000..ae822a1cff4 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/modules.md @@ -0,0 +1,105 @@ +--- +title: Modules +description: + Learn how to organize your files using modules in Noir, following the same convention as Rust's + module system. Examples included. +keywords: [Noir, Rust, modules, organizing files, sub-modules] +sidebar_position: 2 +--- + +Noir's module system follows the same convention as the _newer_ version of Rust's module system. + +## Purpose of Modules + +Modules are used to organize files. Without modules all of your code would need to live in a single +file. In Noir, the compiler does not automatically scan all of your files to detect modules. This +must be done explicitly by the developer. + +## Examples + +### Importing a module in the crate root + +Filename : `src/main.nr` + +```rust +mod foo; + +fn main() { + foo::hello_world(); +} +``` + +Filename : `src/foo.nr` + +```rust +fn from_foo() {} +``` + +In the above snippet, the crate root is the `src/main.nr` file. The compiler sees the module +declaration `mod foo` which prompts it to look for a foo.nr file. + +Visually this module hierarchy looks like the following : + +``` +crate + ├── main + │ + └── foo + └── from_foo + +``` + +### Importing a module throughout the tree + +All modules are accessible from the `crate::` namespace. + +``` +crate + ├── bar + ├── foo + └── main + +``` + +In the above snippet, if `bar` would like to use functions in `foo`, it can do so by `use crate::foo::function_name`. + +### Sub-modules + +Filename : `src/main.nr` + +```rust +mod foo; + +fn main() { + foo::from_foo(); +} +``` + +Filename : `src/foo.nr` + +```rust +mod bar; +fn from_foo() {} +``` + +Filename : `src/foo/bar.nr` + +```rust +fn from_bar() {} +``` + +In the above snippet, we have added an extra module to the module tree; `bar`. `bar` is a submodule +of `foo` hence we declare bar in `foo.nr` with `mod bar`. Since `foo` is not the crate root, the +compiler looks for the file associated with the `bar` module in `src/foo/bar.nr` + +Visually the module hierarchy looks as follows: + +``` +crate + ├── main + │ + └── foo + ├── from_foo + └── bar + └── from_bar +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/workspaces.md new file mode 100644 index 00000000000..513497f12bf --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/modules_packages_crates/workspaces.md @@ -0,0 +1,42 @@ +--- +title: Workspaces +sidebar_position: 3 +--- + +Workspaces are a feature of nargo that allow you to manage multiple related Noir packages in a single repository. A workspace is essentially a group of related projects that share common build output directories and configurations. + +Each Noir project (with it's own Nargo.toml file) can be thought of as a package. Each package is expected to contain exactly one "named circuit", being the "name" defined in Nargo.toml with the program logic defined in `./src/main.nr`. + +For a project with the following structure: + +```tree +├── crates +│ ├── a +│ │ ├── Nargo.toml +│ │ └── Prover.toml +│ │ └── src +│ │ └── main.nr +│ └── b +│ ├── Nargo.toml +│ └── Prover.toml +│ └── src +│ └── main.nr +│ +└── Nargo.toml +``` + +You can define a workspace in Nargo.toml like so: + +```toml +[workspace] +members = ["crates/a", "crates/b"] +default-member = "crates/a" +``` + +`members` indicates which packages are included in the workspace. As such, all member packages of a workspace will be processed when the `--workspace` flag is used with various commands or if a `default-member` is not specified. + +`default-member` indicates which package various commands process by default. + +Libraries can be defined in a workspace. Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml. + +Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/_category_.json new file mode 100644 index 00000000000..af04c0933fd --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "Standard Library", + "position": 1, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bigint.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bigint.md new file mode 100644 index 00000000000..2bfdeec6631 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bigint.md @@ -0,0 +1,122 @@ +--- +title: Big Integers +description: How to use big integers from Noir standard library +keywords: + [ + Big Integer, + Noir programming language, + Noir libraries, + ] +--- + +The BigInt module in the standard library exposes some class of integers which do not fit (well) into a Noir native field. It implements modulo arithmetic, modulo a 'big' prime number. + +:::note + +The module can currently be considered as `Field`s with fixed modulo sizes used by a set of elliptic curves, in addition to just the native curve. [More work](https://github.com/noir-lang/noir/issues/510) is needed to achieve arbitrarily sized big integers. + +::: + +Currently 6 classes of integers (i.e 'big' prime numbers) are available in the module, namely: + +- BN254 Fq: Bn254Fq +- BN254 Fr: Bn254Fr +- Secp256k1 Fq: Secpk1Fq +- Secp256k1 Fr: Secpk1Fr +- Secp256r1 Fr: Secpr1Fr +- Secp256r1 Fq: Secpr1Fq + +Where XXX Fq and XXX Fr denote respectively the order of the base and scalar field of the (usual) elliptic curve XXX. +For instance the big integer 'Secpk1Fq' in the standard library refers to integers modulo $2^{256}-2^{32}-977$. + +Feel free to explore the source code for the other primes: + +```rust title="big_int_definition" showLineNumbers +struct BigInt { + pointer: u32, + modulus: u32, +} +``` +> Source code: noir_stdlib/src/bigint.nr#L14-L19 + + +## Example usage + +A common use-case is when constructing a big integer from its bytes representation, and performing arithmetic operations on it: + +```rust title="big_int_example" showLineNumbers +fn big_int_example(x: u8, y: u8) { + let a = Secpk1Fq::from_le_bytes(&[x, y, 0, 45, 2]); + let b = Secpk1Fq::from_le_bytes(&[y, x, 9]); + let c = (a + b) * b / a; + let d = c.to_le_bytes(); + println(d[0]); +} +``` +> Source code: test_programs/execution_success/bigint/src/main.nr#L70-L78 + + +## Methods + +The available operations for each big integer are: + +### from_le_bytes + +Construct a big integer from its little-endian bytes representation. Example: + +```rust + // Construct a big integer from a slice of bytes + let a = Secpk1Fq::from_le_bytes(&[x, y, 0, 45, 2]); + // Construct a big integer from an array of 32 bytes + let a = Secpk1Fq::from_le_bytes_32([1;32]); + ``` + +Sure, here's the formatted version of the remaining methods: + +### to_le_bytes + +Return the little-endian bytes representation of a big integer. Example: + +```rust +let bytes = a.to_le_bytes(); +``` + +### add + +Add two big integers. Example: + +```rust +let sum = a + b; +``` + +### sub + +Subtract two big integers. Example: + +```rust +let difference = a - b; +``` + +### mul + +Multiply two big integers. Example: + +```rust +let product = a * b; +``` + +### div + +Divide two big integers. Note that division is field division and not euclidean division. Example: + +```rust +let quotient = a / b; +``` + +### eq + +Compare two big integers. Example: + +```rust +let are_equal = a == b; +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/black_box_fns.md new file mode 100644 index 00000000000..eeead580969 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/black_box_fns.md @@ -0,0 +1,32 @@ +--- +title: Black Box Functions +description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. +keywords: [noir, black box functions] +--- + +Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir. + +The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not. + +## Function list + +Here is a list of the current black box functions: + +- [AES128](./cryptographic_primitives/ciphers.mdx#aes128) +- [SHA256](./cryptographic_primitives/hashes.mdx#sha256) +- [Schnorr signature verification](./cryptographic_primitives/schnorr.mdx) +- [Blake2s](./cryptographic_primitives/hashes.mdx#blake2s) +- [Blake3](./cryptographic_primitives/hashes.mdx#blake3) +- [Pedersen Hash](./cryptographic_primitives/hashes.mdx#pedersen_hash) +- [Pedersen Commitment](./cryptographic_primitives/hashes.mdx#pedersen_commitment) +- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification.mdx) +- [Embedded curve operations (MSM, addition, ...)](./cryptographic_primitives/embedded_curve_ops.mdx) +- AND +- XOR +- RANGE +- [Keccak256](./cryptographic_primitives/hashes.mdx#keccak256) +- [Recursive proof verification](./recursion) + +Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function. + +You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs). diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bn254.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bn254.md new file mode 100644 index 00000000000..3294f005dbb --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/bn254.md @@ -0,0 +1,46 @@ +--- +title: Bn254 Field Library +--- + +Noir provides a module in standard library with some optimized functions for bn254 Fr in `std::field::bn254`. + +## decompose + +```rust +fn decompose(x: Field) -> (Field, Field) {} +``` + +Decomposes a single field into two fields, low and high. The low field contains the lower 16 bytes of the input field and the high field contains the upper 16 bytes of the input field. Both field results are range checked to 128 bits. + + +## assert_gt + +```rust +fn assert_gt(a: Field, b: Field) {} +``` + +Asserts that a > b. This will generate less constraints than using `assert(gt(a, b))`. + +## assert_lt + +```rust +fn assert_lt(a: Field, b: Field) {} +``` + +Asserts that a < b. This will generate less constraints than using `assert(lt(a, b))`. + +## gt + +```rust +fn gt(a: Field, b: Field) -> bool {} +``` + +Returns true if a > b. + +## lt + +```rust +fn lt(a: Field, b: Field) -> bool {} +``` + +Returns true if a < b. \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/boundedvec.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/boundedvec.md new file mode 100644 index 00000000000..c22fe8c5045 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/boundedvec.md @@ -0,0 +1,340 @@ +--- +title: Bounded Vectors +keywords: [noir, vector, bounded vector, slice] +sidebar_position: 1 +--- + +A `BoundedVec` is a growable storage similar to a `Vec` except that it +is bounded with a maximum possible length. Unlike `Vec`, `BoundedVec` is not implemented +via slices and thus is not subject to the same restrictions slices are (notably, nested +slices - and thus nested vectors as well - are disallowed). + +Since a BoundedVec is backed by a normal array under the hood, growing the BoundedVec by +pushing an additional element is also more efficient - the length only needs to be increased +by one. + +For these reasons `BoundedVec` should generally be preferred over `Vec` when there +is a reasonable maximum bound that can be placed on the vector. + +Example: + +```rust +let mut vector: BoundedVec = BoundedVec::new(); +for i in 0..5 { + vector.push(i); +} +assert(vector.len() == 5); +assert(vector.max_len() == 10); +``` + +## Methods + +### new + +```rust +pub fn new() -> Self +``` + +Creates a new, empty vector of length zero. + +Since this container is backed by an array internally, it still needs an initial value +to give each element. To resolve this, each element is zeroed internally. This value +is guaranteed to be inaccessible unless `get_unchecked` is used. + +Example: + +```rust +let empty_vector: BoundedVec = BoundedVec::new(); +assert(empty_vector.len() == 0); +``` + +Note that whenever calling `new` the maximum length of the vector should always be specified +via a type signature: + +```rust title="new_example" showLineNumbers +fn foo() -> BoundedVec { + // Ok! MaxLen is specified with a type annotation + let v1: BoundedVec = BoundedVec::new(); + let v2 = BoundedVec::new(); + + // Ok! MaxLen is known from the type of foo's return value + v2 +} + +fn bad() { + let mut v3 = BoundedVec::new(); + + // Not Ok! We don't know if v3's MaxLen is at least 1, and the compiler often infers 0 by default. + v3.push(5); +} +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L11-L27 + + +This defaulting of `MaxLen` (and numeric generics in general) to zero may change in future noir versions +but for now make sure to use type annotations when using bounded vectors. Otherwise, you will receive a constraint failure at runtime when the vec is pushed to. + +### get + +```rust +pub fn get(mut self: Self, index: u64) -> T { +``` + +Retrieves an element from the vector at the given index, starting from zero. + +If the given index is equal to or greater than the length of the vector, this +will issue a constraint failure. + +Example: + +```rust +fn foo(v: BoundedVec) { + let first = v.get(0); + let last = v.get(v.len() - 1); + assert(first != last); +} +``` + +### get_unchecked + +```rust +pub fn get_unchecked(mut self: Self, index: u64) -> T { +``` + +Retrieves an element from the vector at the given index, starting from zero, without +performing a bounds check. + +Since this function does not perform a bounds check on length before accessing the element, +it is unsafe! Use at your own risk! + +Example: + +```rust title="get_unchecked_example" showLineNumbers +fn sum_of_first_three(v: BoundedVec) -> u32 { + // Always ensure the length is larger than the largest + // index passed to get_unchecked + assert(v.len() > 2); + let first = v.get_unchecked(0); + let second = v.get_unchecked(1); + let third = v.get_unchecked(2); + first + second + third +} +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L54-L64 + + + +### push + +```rust +pub fn push(&mut self, elem: T) { +``` + +Pushes an element to the end of the vector. This increases the length +of the vector by one. + +Panics if the new length of the vector will be greater than the max length. + +Example: + +```rust title="bounded-vec-push-example" showLineNumbers +let mut v: BoundedVec = BoundedVec::new(); + + v.push(1); + v.push(2); + + // Panics with failed assertion "push out of bounds" + v.push(3); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L68-L76 + + +### pop + +```rust +pub fn pop(&mut self) -> T +``` + +Pops the element at the end of the vector. This will decrease the length +of the vector by one. + +Panics if the vector is empty. + +Example: + +```rust title="bounded-vec-pop-example" showLineNumbers +let mut v: BoundedVec = BoundedVec::new(); + v.push(1); + v.push(2); + + let two = v.pop(); + let one = v.pop(); + + assert(two == 2); + assert(one == 1); + // error: cannot pop from an empty vector + // let _ = v.pop(); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L81-L93 + + +### len + +```rust +pub fn len(self) -> u64 { +``` + +Returns the current length of this vector + +Example: + +```rust title="bounded-vec-len-example" showLineNumbers +let mut v: BoundedVec = BoundedVec::new(); + assert(v.len() == 0); + + v.push(100); + assert(v.len() == 1); + + v.push(200); + v.push(300); + v.push(400); + assert(v.len() == 4); + + let _ = v.pop(); + let _ = v.pop(); + assert(v.len() == 2); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L98-L113 + + +### max_len + +```rust +pub fn max_len(_self: BoundedVec) -> u64 { +``` + +Returns the maximum length of this vector. This is always +equal to the `MaxLen` parameter this vector was initialized with. + +Example: + +```rust title="bounded-vec-max-len-example" showLineNumbers +let mut v: BoundedVec = BoundedVec::new(); + + assert(v.max_len() == 5); + v.push(10); + assert(v.max_len() == 5); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L118-L124 + + +### storage + +```rust +pub fn storage(self) -> [T; MaxLen] { +``` + +Returns the internal array within this vector. +Since arrays in Noir are immutable, mutating the returned storage array will not mutate +the storage held internally by this vector. + +Note that uninitialized elements may be zeroed out! + +Example: + +```rust title="bounded-vec-storage-example" showLineNumbers +let mut v: BoundedVec = BoundedVec::new(); + + assert(v.storage() == [0, 0, 0, 0, 0]); + + v.push(57); + assert(v.storage() == [57, 0, 0, 0, 0]); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L129-L136 + + +### extend_from_array + +```rust +pub fn extend_from_array(&mut self, array: [T; Len]) +``` + +Pushes each element from the given array to this vector. + +Panics if pushing each element would cause the length of this vector +to exceed the maximum length. + +Example: + +```rust title="bounded-vec-extend-from-array-example" showLineNumbers +let mut vec: BoundedVec = BoundedVec::new(); + vec.extend_from_array([2, 4]); + + assert(vec.len == 2); + assert(vec.get(0) == 2); + assert(vec.get(1) == 4); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L141-L148 + + +### extend_from_bounded_vec + +```rust +pub fn extend_from_bounded_vec(&mut self, vec: BoundedVec) +``` + +Pushes each element from the other vector to this vector. The length of +the other vector is left unchanged. + +Panics if pushing each element would cause the length of this vector +to exceed the maximum length. + +Example: + +```rust title="bounded-vec-extend-from-bounded-vec-example" showLineNumbers +let mut v1: BoundedVec = BoundedVec::new(); + let mut v2: BoundedVec = BoundedVec::new(); + + v2.extend_from_array([1, 2, 3]); + v1.extend_from_bounded_vec(v2); + + assert(v1.storage() == [1, 2, 3, 0, 0]); + assert(v2.storage() == [1, 2, 3, 0, 0, 0, 0]); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L153-L162 + + +### from_array + +```rust +pub fn from_array(array: [T; Len]) -> Self +``` + +Creates a new vector, populating it with values derived from an array input. +The maximum length of the vector is determined based on the type signature. + +Example: +```rust +let bounded_vec: BoundedVec = BoundedVec::from_array([1, 2, 3]) +``` + +### any + +```rust +pub fn any(self, predicate: fn[Env](T) -> bool) -> bool +``` + +Returns true if the given predicate returns true for any element +in this vector. + +Example: + +```rust title="bounded-vec-any-example" showLineNumbers +let mut v: BoundedVec = BoundedVec::new(); + v.extend_from_array([2, 4, 6]); + + let all_even = !v.any(|elem: u32| elem % 2 != 0); + assert(all_even); +``` +> Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L229-L235 + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/hashmap.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/hashmap.md new file mode 100644 index 00000000000..47faa99aba6 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/hashmap.md @@ -0,0 +1,570 @@ +--- +title: HashMap +keywords: [noir, map, hash, hashmap] +sidebar_position: 1 +--- + +`HashMap` is used to efficiently store and look up key-value pairs. + +`HashMap` is a bounded type which can store anywhere from zero to `MaxLen` total elements. +Note that due to hash collisions, the actual maximum number of elements stored by any particular +hashmap is likely lower than `MaxLen`. This is true even with cryptographic hash functions since +every hash value will be performed modulo `MaxLen`. + +When creating `HashMap`s, the `MaxLen` generic should always be specified if it is not already +known. Otherwise, the compiler may infer a different value for `MaxLen` (such as zero), which +will likely change the result of the program. This behavior is set to become an error in future +versions instead. + +Example: + +```rust +// Create a mapping from Fields to u32s with a maximum length of 12 +// using a poseidon2 hasher +use dep::std::hash::poseidon2::Poseidon2Hasher; +let mut map: HashMap> = HashMap::default(); + +map.insert(1, 2); +map.insert(3, 4); + +let two = map.get(1).unwrap(); +``` + +## Methods + +### default + +```rust title="default" showLineNumbers +impl Default for HashMap +where + B: BuildHasher + Default, + H: Hasher + Default +{ + fn default() -> Self { +``` +> Source code: noir_stdlib/src/collections/map.nr#L462-L469 + + +Creates a fresh, empty HashMap. + +When using this function, always make sure to specify the maximum size of the hash map. + +This is the same `default` from the `Default` implementation given further below. It is +repeated here for convenience since it is the recommended way to create a hashmap. + +Example: + +```rust title="default_example" showLineNumbers +let hashmap: HashMap> = HashMap::default(); + assert(hashmap.is_empty()); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L202-L205 + + +Because `HashMap` has so many generic arguments that are likely to be the same throughout +your program, it may be helpful to create a type alias: + +```rust title="type_alias" showLineNumbers +type MyMap = HashMap>; +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L196-L198 + + +### with_hasher + +```rust title="with_hasher" showLineNumbers +pub fn with_hasher(_build_hasher: B) -> Self + where + B: BuildHasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L82-L86 + + +Creates a hashmap with an existing `BuildHasher`. This can be used to ensure multiple +hashmaps are created with the same hasher instance. + +Example: + +```rust title="with_hasher_example" showLineNumbers +let my_hasher: BuildHasherDefault = Default::default(); + let hashmap: HashMap> = HashMap::with_hasher(my_hasher); + assert(hashmap.is_empty()); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L207-L211 + + +### get + +```rust title="get" showLineNumbers +pub fn get( + self, + key: K + ) -> Option + where + K: Eq + Hash, + B: BuildHasher, + H: Hasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L278-L287 + + +Retrieves a value from the hashmap, returning `Option::none()` if it was not found. + +Example: + +```rust title="get_example" showLineNumbers +fn get_example(map: HashMap>) { + let x = map.get(12); + + if x.is_some() { + assert(x.unwrap() == 42); + } +} +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L299-L307 + + +### insert + +```rust title="insert" showLineNumbers +pub fn insert( + &mut self, + key: K, + value: V + ) + where + K: Eq + Hash, + B: BuildHasher, + H: Hasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L313-L323 + + +Inserts a new key-value pair into the map. If the key was already in the map, its +previous value will be overridden with the newly provided one. + +Example: + +```rust title="insert_example" showLineNumbers +let mut map: HashMap> = HashMap::default(); + map.insert(12, 42); + assert(map.len() == 1); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L213-L217 + + +### remove + +```rust title="remove" showLineNumbers +pub fn remove( + &mut self, + key: K + ) + where + K: Eq + Hash, + B: BuildHasher, + H: Hasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L356-L365 + + +Removes the given key-value pair from the map. If the key was not already present +in the map, this does nothing. + +Example: + +```rust title="remove_example" showLineNumbers +map.remove(12); + assert(map.is_empty()); + + // If a key was not present in the map, remove does nothing + map.remove(12); + assert(map.is_empty()); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L221-L228 + + +### is_empty + +```rust title="is_empty" showLineNumbers +pub fn is_empty(self) -> bool { +``` +> Source code: noir_stdlib/src/collections/map.nr#L115-L117 + + +True if the length of the hash map is empty. + +Example: + +```rust title="is_empty_example" showLineNumbers +assert(map.is_empty()); + + map.insert(1, 2); + assert(!map.is_empty()); + + map.remove(1); + assert(map.is_empty()); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L230-L238 + + +### len + +```rust title="len" showLineNumbers +pub fn len(self) -> u64 { +``` +> Source code: noir_stdlib/src/collections/map.nr#L264-L266 + + +Returns the current length of this hash map. + +Example: + +```rust title="len_example" showLineNumbers +// This is equivalent to checking map.is_empty() + assert(map.len() == 0); + + map.insert(1, 2); + map.insert(3, 4); + map.insert(5, 6); + assert(map.len() == 3); + + // 3 was already present as a key in the hash map, so the length is unchanged + map.insert(3, 7); + assert(map.len() == 3); + + map.remove(1); + assert(map.len() == 2); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L240-L255 + + +### capacity + +```rust title="capacity" showLineNumbers +pub fn capacity(_self: Self) -> u64 { +``` +> Source code: noir_stdlib/src/collections/map.nr#L271-L273 + + +Returns the maximum capacity of this hashmap. This is always equal to the capacity +specified in the hashmap's type. + +Unlike hashmaps in general purpose programming languages, hashmaps in Noir have a +static capacity that does not increase as the map grows larger. Thus, this capacity +is also the maximum possible element count that can be inserted into the hashmap. +Due to hash collisions (modulo the hashmap length), it is likely the actual maximum +element count will be lower than the full capacity. + +Example: + +```rust title="capacity_example" showLineNumbers +let empty_map: HashMap> = HashMap::default(); + assert(empty_map.len() == 0); + assert(empty_map.capacity() == 42); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L257-L261 + + +### clear + +```rust title="clear" showLineNumbers +pub fn clear(&mut self) { +``` +> Source code: noir_stdlib/src/collections/map.nr#L93-L95 + + +Clears the hashmap, removing all key-value pairs from it. + +Example: + +```rust title="clear_example" showLineNumbers +assert(!map.is_empty()); + map.clear(); + assert(map.is_empty()); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L263-L267 + + +### contains_key + +```rust title="contains_key" showLineNumbers +pub fn contains_key( + self, + key: K + ) -> bool + where + K: Hash + Eq, + B: BuildHasher, + H: Hasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L101-L110 + + +True if the hashmap contains the given key. Unlike `get`, this will not also return +the value associated with the key. + +Example: + +```rust title="contains_key_example" showLineNumbers +if map.contains_key(7) { + let value = map.get(7); + assert(value.is_some()); + } else { + println("No value for key 7!"); + } +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L269-L276 + + +### entries + +```rust title="entries" showLineNumbers +pub fn entries(self) -> BoundedVec<(K, V), N> { +``` +> Source code: noir_stdlib/src/collections/map.nr#L123-L125 + + +Returns a vector of each key-value pair present in the hashmap. + +The length of the returned vector is always equal to the length of the hashmap. + +Example: + +```rust title="entries_example" showLineNumbers +let entries = map.entries(); + + // The length of a hashmap may not be compile-time known, so we + // need to loop over its capacity instead + for i in 0..map.capacity() { + if i < entries.len() { + let (key, value) = entries.get(i); + println(f"{key} -> {value}"); + } + } +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L310-L321 + + +### keys + +```rust title="keys" showLineNumbers +pub fn keys(self) -> BoundedVec { +``` +> Source code: noir_stdlib/src/collections/map.nr#L144-L146 + + +Returns a vector of each key present in the hashmap. + +The length of the returned vector is always equal to the length of the hashmap. + +Example: + +```rust title="keys_example" showLineNumbers +let keys = map.keys(); + + for i in 0..keys.max_len() { + if i < keys.len() { + let key = keys.get_unchecked(i); + let value = map.get(key).unwrap_unchecked(); + println(f"{key} -> {value}"); + } + } +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L323-L333 + + +### values + +```rust title="values" showLineNumbers +pub fn values(self) -> BoundedVec { +``` +> Source code: noir_stdlib/src/collections/map.nr#L164-L166 + + +Returns a vector of each value present in the hashmap. + +The length of the returned vector is always equal to the length of the hashmap. + +Example: + +```rust title="values_example" showLineNumbers +let values = map.values(); + + for i in 0..values.max_len() { + if i < values.len() { + let value = values.get_unchecked(i); + println(f"Found value {value}"); + } + } +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L335-L344 + + +### iter_mut + +```rust title="iter_mut" showLineNumbers +pub fn iter_mut( + &mut self, + f: fn(K, V) -> (K, V) + ) + where + K: Eq + Hash, + B: BuildHasher, + H: Hasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L183-L192 + + +Iterates through each key-value pair of the HashMap, setting each key-value pair to the +result returned from the given function. + +Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated +through. If this is not desired, use `iter_values_mut` if only values need to be mutated, +or `entries` if neither keys nor values need to be mutated. + +The iteration order is left unspecified. As a result, if two keys are mutated to become +equal, which of the two values that will be present for the key in the resulting map is also unspecified. + +Example: + +```rust title="iter_mut_example" showLineNumbers +// Add 1 to each key in the map, and double the value associated with that key. + map.iter_mut(|k, v| (k + 1, v * 2)); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L348-L351 + + +### iter_keys_mut + +```rust title="iter_keys_mut" showLineNumbers +pub fn iter_keys_mut( + &mut self, + f: fn(K) -> K + ) + where + K: Eq + Hash, + B: BuildHasher, + H: Hasher { +``` +> Source code: noir_stdlib/src/collections/map.nr#L208-L217 + + +Iterates through the HashMap, mutating each key to the result returned from +the given function. + +Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated +through. If only iteration is desired and the keys are not intended to be mutated, +prefer using `entries` instead. + +The iteration order is left unspecified. As a result, if two keys are mutated to become +equal, which of the two values that will be present for the key in the resulting map is also unspecified. + +Example: + +```rust title="iter_keys_mut_example" showLineNumbers +// Double each key, leaving the value associated with that key untouched + map.iter_keys_mut(|k| k * 2); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L353-L356 + + +### iter_values_mut + +```rust title="iter_values_mut" showLineNumbers +pub fn iter_values_mut(&mut self, f: fn(V) -> V) { +``` +> Source code: noir_stdlib/src/collections/map.nr#L233-L235 + + +Iterates through the HashMap, applying the given function to each value and mutating the +value to equal the result. This function is more efficient than `iter_mut` and `iter_keys_mut` +because the keys are untouched and the underlying hashmap thus does not need to be reordered. + +Example: + +```rust title="iter_values_mut_example" showLineNumbers +// Halve each value + map.iter_values_mut(|v| v / 2); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L358-L361 + + +### retain + +```rust title="retain" showLineNumbers +pub fn retain(&mut self, f: fn(K, V) -> bool) { +``` +> Source code: noir_stdlib/src/collections/map.nr#L247-L249 + + +Retains only the key-value pairs for which the given function returns true. +Any key-value pairs for which the function returns false will be removed from the map. + +Example: + +```rust title="retain_example" showLineNumbers +map.retain(|k, v| (k != 0) & (v != 0)); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L281-L283 + + +## Trait Implementations + +### default + +```rust title="default" showLineNumbers +impl Default for HashMap +where + B: BuildHasher + Default, + H: Hasher + Default +{ + fn default() -> Self { +``` +> Source code: noir_stdlib/src/collections/map.nr#L462-L469 + + +Constructs an empty HashMap. + +Example: + +```rust title="default_example" showLineNumbers +let hashmap: HashMap> = HashMap::default(); + assert(hashmap.is_empty()); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L202-L205 + + +### eq + +```rust title="eq" showLineNumbers +impl Eq for HashMap +where + K: Eq + Hash, + V: Eq, + B: BuildHasher, + H: Hasher +{ + fn eq(self, other: HashMap) -> bool { +``` +> Source code: noir_stdlib/src/collections/map.nr#L426-L435 + + +Checks if two HashMaps are equal. + +Example: + +```rust title="eq_example" showLineNumbers +let mut map1: HashMap> = HashMap::default(); + let mut map2: HashMap> = HashMap::default(); + + map1.insert(1, 2); + map1.insert(3, 4); + + map2.insert(3, 4); + map2.insert(1, 2); + + assert(map1 == map2); +``` +> Source code: test_programs/execution_success/hashmap/src/main.nr#L285-L296 + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/index.md new file mode 100644 index 00000000000..ea84c6d5c21 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/index.md @@ -0,0 +1,5 @@ +--- +title: Containers +description: Container types provided by Noir's standard library for storing and retrieving data +keywords: [containers, data types, vec, hashmap] +--- diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/vec.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/vec.mdx new file mode 100644 index 00000000000..fcfd7e07aa0 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/containers/vec.mdx @@ -0,0 +1,151 @@ +--- +title: Vectors +description: Delve into the Vec data type in Noir. Learn about its methods, practical examples, and best practices for using Vectors in your Noir code. +keywords: [noir, vector type, methods, examples, dynamic arrays] +sidebar_position: 6 +--- + +import Experimental from '@site/src/components/Notes/_experimental.mdx'; + + + +A vector is a collection type similar to Rust's `Vec` type. In Noir, it is a convenient way to use slices as mutable arrays. + +Example: + +```rust +let mut vector: Vec = Vec::new(); +for i in 0..5 { + vector.push(i); +} +assert(vector.len() == 5); +``` + +## Methods + +### new + +Creates a new, empty vector. + +```rust +pub fn new() -> Self +``` + +Example: + +```rust +let empty_vector: Vec = Vec::new(); +assert(empty_vector.len() == 0); +``` + +### from_slice + +Creates a vector containing each element from a given slice. Mutations to the resulting vector will not affect the original slice. + +```rust +pub fn from_slice(slice: [T]) -> Self +``` + +Example: + +```rust +let slice: [Field] = &[1, 2, 3]; +let vector_from_slice = Vec::from_slice(slice); +assert(vector_from_slice.len() == 3); +``` + +### len + +Returns the number of elements in the vector. + +```rust +pub fn len(self) -> Field +``` + +Example: + +```rust +let empty_vector: Vec = Vec::new(); +assert(empty_vector.len() == 0); +``` + +### get + +Retrieves an element from the vector at a given index. Panics if the index points beyond the vector's end. + +```rust +pub fn get(self, index: Field) -> T +``` + +Example: + +```rust +let vector: Vec = Vec::from_slice(&[10, 20, 30]); +assert(vector.get(1) == 20); +``` + +### push + +Adds a new element to the vector's end, returning a new vector with a length one greater than the original unmodified vector. + +```rust +pub fn push(&mut self, elem: T) +``` + +Example: + +```rust +let mut vector: Vec = Vec::new(); +vector.push(10); +assert(vector.len() == 1); +``` + +### pop + +Removes an element from the vector's end, returning a new vector with a length one less than the original vector, along with the removed element. Panics if the vector's length is zero. + +```rust +pub fn pop(&mut self) -> T +``` + +Example: + +```rust +let mut vector = Vec::from_slice(&[10, 20]); +let popped_elem = vector.pop(); +assert(popped_elem == 20); +assert(vector.len() == 1); +``` + +### insert + +Inserts an element at a specified index, shifting subsequent elements to the right. + +```rust +pub fn insert(&mut self, index: Field, elem: T) +``` + +Example: + +```rust +let mut vector = Vec::from_slice(&[10, 30]); +vector.insert(1, 20); +assert(vector.get(1) == 20); +``` + +### remove + +Removes an element at a specified index, shifting subsequent elements to the left, and returns the removed element. + +```rust +pub fn remove(&mut self, index: Field) -> T +``` + +Example: + +```rust +let mut vector = Vec::from_slice(&[10, 20, 30]); +let removed_elem = vector.remove(1); +assert(removed_elem == 20); +assert(vector.len() == 2); +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/_category_.json new file mode 100644 index 00000000000..5d694210bbf --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 0, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ciphers.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ciphers.mdx new file mode 100644 index 00000000000..e83e26efb97 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ciphers.mdx @@ -0,0 +1,32 @@ +--- +title: Ciphers +description: + Learn about the implemented ciphers ready to use for any Noir project +keywords: + [ciphers, Noir project, aes128, encrypt] +sidebar_position: 0 +--- + +import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx'; + +## aes128 + +Given a plaintext as an array of bytes, returns the corresponding aes128 ciphertext (CBC mode). Input padding is automatically performed using PKCS#7, so that the output length is `input.len() + (16 - input.len() % 16)`. + +```rust title="aes128" showLineNumbers +pub fn aes128_encrypt(input: [u8; N], iv: [u8; 16], key: [u8; 16]) -> [u8] {} +``` +> Source code: noir_stdlib/src/aes128.nr#L2-L4 + + +```rust +fn main() { + let input: [u8; 4] = [0, 12, 3, 15] // Random bytes, will be padded to 16 bytes. + let iv: [u8; 16] = [0; 16]; // Initialisation vector + let key: [u8; 16] = [0; 16] // AES key + let ciphertext = std::aes128::aes128_encrypt(inputs.as_bytes(), iv.as_bytes(), key.as_bytes()); // In this case, the output length will be 16 bytes. +} +``` + + + \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ec_primitives.md new file mode 100644 index 00000000000..d2b42d67b7c --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ec_primitives.md @@ -0,0 +1,102 @@ +--- +title: Elliptic Curve Primitives +keywords: [cryptographic primitives, Noir project] +sidebar_position: 4 +--- + +Data structures and methods on them that allow you to carry out computations involving elliptic +curves over the (mathematical) field corresponding to `Field`. For the field currently at our +disposal, applications would involve a curve embedded in BN254, e.g. the +[Baby Jubjub curve](https://eips.ethereum.org/EIPS/eip-2494). + +## Data structures + +### Elliptic curve configurations + +(`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::Curve`), i.e. the specific elliptic +curve you want to use, which would be specified using any one of the methods +`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::new` which take the coefficients in the +defining equation together with a generator point as parameters. You can find more detail in the +comments in +[`noir_stdlib/src/ec.nr`](https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ec.nr), but +the gist of it is that the elliptic curves of interest are usually expressed in one of the standard +forms implemented here (Twisted Edwards, Montgomery and Short Weierstraß), and in addition to that, +you could choose to use `affine` coordinates (Cartesian coordinates - the usual (x,y) - possibly +together with a point at infinity) or `curvegroup` coordinates (some form of projective coordinates +requiring more coordinates but allowing for more efficient implementations of elliptic curve +operations). Conversions between all of these forms are provided, and under the hood these +conversions are done whenever an operation is more efficient in a different representation (or a +mixed coordinate representation is employed). + +### Points + +(`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::Point`), i.e. points lying on the +elliptic curve. For a curve configuration `c` and a point `p`, it may be checked that `p` +does indeed lie on `c` by calling `c.contains(p1)`. + +## Methods + +(given a choice of curve representation, e.g. use `std::ec::tecurve::affine::Curve` and use +`std::ec::tecurve::affine::Point`) + +- The **zero element** is given by `Point::zero()`, and we can verify whether a point `p: Point` is + zero by calling `p.is_zero()`. +- **Equality**: Points `p1: Point` and `p2: Point` may be checked for equality by calling + `p1.eq(p2)`. +- **Addition**: For `c: Curve` and points `p1: Point` and `p2: Point` on the curve, adding these two + points is accomplished by calling `c.add(p1,p2)`. +- **Negation**: For a point `p: Point`, `p.negate()` is its negation. +- **Subtraction**: For `c` and `p1`, `p2` as above, subtracting `p2` from `p1` is accomplished by + calling `c.subtract(p1,p2)`. +- **Scalar multiplication**: For `c` as above, `p: Point` a point on the curve and `n: Field`, + scalar multiplication is given by `c.mul(n,p)`. If instead `n :: [u1; N]`, i.e. `n` is a bit + array, the `bit_mul` method may be used instead: `c.bit_mul(n,p)` +- **Multi-scalar multiplication**: For `c` as above and arrays `n: [Field; N]` and `p: [Point; N]`, + multi-scalar multiplication is given by `c.msm(n,p)`. +- **Coordinate representation conversions**: The `into_group` method converts a point or curve + configuration in the affine representation to one in the CurveGroup representation, and + `into_affine` goes in the other direction. +- **Curve representation conversions**: `tecurve` and `montcurve` curves and points are equivalent + and may be converted between one another by calling `into_montcurve` or `into_tecurve` on their + configurations or points. `swcurve` is more general and a curve c of one of the other two types + may be converted to this representation by calling `c.into_swcurve()`, whereas a point `p` lying + on the curve given by `c` may be mapped to its corresponding `swcurve` point by calling + `c.map_into_swcurve(p)`. +- **Map-to-curve methods**: The Elligator 2 method of mapping a field element `n: Field` into a + `tecurve` or `montcurve` with configuration `c` may be called as `c.elligator2_map(n)`. For all of + the curve configurations, the SWU map-to-curve method may be called as `c.swu_map(z,n)`, where + `z: Field` depends on `Field` and `c` and must be chosen by the user (the conditions it needs to + satisfy are specified in the comments + [here](https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ec.nr)). + +## Examples + +The +[ec_baby_jubjub test](https://github.com/noir-lang/noir/blob/master/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr) +illustrates all of the above primitives on various forms of the Baby Jubjub curve. A couple of more +interesting examples in Noir would be: + +Public-key cryptography: Given an elliptic curve and a 'base point' on it, determine the public key +from the private key. This is a matter of using scalar multiplication. In the case of Baby Jubjub, +for example, this code would do: + +```rust +use dep::std::ec::tecurve::affine::{Curve, Point}; + +fn bjj_pub_key(priv_key: Field) -> Point +{ + + let bjj = Curve::new(168700, 168696, G::new(995203441582195749578291179787384436505546430278305826713579947235728471134,5472060717959818805561601436314318772137091100104008585924551046643952123905)); + + let base_pt = Point::new(5299619240641551281634865583518297030282874472190772894086521144482721001553, 16950150798460657717958625567821834550301663161624707787222815936182638968203); + + bjj.mul(priv_key,base_pt) +} +``` + +This would come in handy in a Merkle proof. + +- EdDSA signature verification: This is a matter of combining these primitives with a suitable hash + function. See + [feat(stdlib): EdDSA sig verification noir#1136](https://github.com/noir-lang/noir/pull/1136) for + the case of Baby Jubjub and the Poseidon hash function. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx new file mode 100644 index 00000000000..4394b48f907 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx @@ -0,0 +1,98 @@ +--- +title: ECDSA Signature Verification +description: Learn about the cryptographic primitives regarding ECDSA over the secp256k1 and secp256r1 curves +keywords: [cryptographic primitives, Noir project, ecdsa, secp256k1, secp256r1, signatures] +sidebar_position: 3 +--- + +import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx'; + +Noir supports ECDSA signatures verification over the secp256k1 and secp256r1 curves. + +## ecdsa_secp256k1::verify_signature + +Verifier for ECDSA Secp256k1 signatures. +See ecdsa_secp256k1::verify_signature_slice for a version that accepts slices directly. + +```rust title="ecdsa_secp256k1" showLineNumbers +pub fn verify_signature( + public_key_x: [u8; 32], + public_key_y: [u8; 32], + signature: [u8; 64], + message_hash: [u8; N] +) -> bool +``` +> Source code: noir_stdlib/src/ecdsa_secp256k1.nr#L2-L9 + + +example: + +```rust +fn main(hashed_message : [u8;32], pub_key_x : [u8;32], pub_key_y : [u8;32], signature : [u8;64]) { + let valid_signature = std::ecdsa_secp256k1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message); + assert(valid_signature); +} +``` + + + +## ecdsa_secp256k1::verify_signature_slice + +Verifier for ECDSA Secp256k1 signatures where the message is a slice. + +```rust title="ecdsa_secp256k1_slice" showLineNumbers +pub fn verify_signature_slice( + public_key_x: [u8; 32], + public_key_y: [u8; 32], + signature: [u8; 64], + message_hash: [u8] +) -> bool +``` +> Source code: noir_stdlib/src/ecdsa_secp256k1.nr#L13-L20 + + + + +## ecdsa_secp256r1::verify_signature + +Verifier for ECDSA Secp256r1 signatures. +See ecdsa_secp256r1::verify_signature_slice for a version that accepts slices directly. + +```rust title="ecdsa_secp256r1" showLineNumbers +pub fn verify_signature( + public_key_x: [u8; 32], + public_key_y: [u8; 32], + signature: [u8; 64], + message_hash: [u8; N] +) -> bool +``` +> Source code: noir_stdlib/src/ecdsa_secp256r1.nr#L2-L9 + + +example: + +```rust +fn main(hashed_message : [u8;32], pub_key_x : [u8;32], pub_key_y : [u8;32], signature : [u8;64]) { + let valid_signature = std::ecdsa_secp256r1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message); + assert(valid_signature); +} +``` + + + +## ecdsa_secp256r1::verify_signature + +Verifier for ECDSA Secp256r1 signatures where the message is a slice. + +```rust title="ecdsa_secp256r1_slice" showLineNumbers +pub fn verify_signature_slice( + public_key_x: [u8; 32], + public_key_y: [u8; 32], + signature: [u8; 64], + message_hash: [u8] +) -> bool +``` +> Source code: noir_stdlib/src/ecdsa_secp256r1.nr#L13-L20 + + + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/eddsa.mdx new file mode 100644 index 00000000000..c2c0624dfad --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/eddsa.mdx @@ -0,0 +1,37 @@ +--- +title: EdDSA Verification +description: Learn about the cryptographic primitives regarding EdDSA +keywords: [cryptographic primitives, Noir project, eddsa, signatures] +sidebar_position: 5 +--- + +import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx'; + +## eddsa::eddsa_poseidon_verify + +Verifier for EdDSA signatures + +```rust +fn eddsa_poseidon_verify(public_key_x : Field, public_key_y : Field, signature_s: Field, signature_r8_x: Field, signature_r8_y: Field, message: Field) -> bool +``` + +It is also possible to specify the hash algorithm used for the signature by using the `eddsa_verify_with_hasher` function with a parameter implementing the Hasher trait. For instance, if you want to use Poseidon2 instead, you can do the following: +```rust +use dep::std::hash::poseidon2::Poseidon2Hasher; + +let mut hasher = Poseidon2Hasher::default(); +eddsa_verify_with_hasher(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg, &mut hasher); +``` + + + +## eddsa::eddsa_to_pub + +Private to public key conversion. + +Returns `(pub_key_x, pub_key_y)` + +```rust +fn eddsa_to_pub(secret : Field) -> (Field, Field) +``` + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx new file mode 100644 index 00000000000..9dab7dd1047 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx @@ -0,0 +1,98 @@ +--- +title: Scalar multiplication +description: See how you can perform scalar multiplication in Noir +keywords: [cryptographic primitives, Noir project, scalar multiplication] +sidebar_position: 1 +--- + +import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx'; + +The following functions perform operations over the embedded curve whose coordinates are defined by the configured noir field. +For the BN254 scalar field, this is BabyJubJub or Grumpkin. + +:::note +Suffixes `_low` and `_high` denote low and high limbs of a scalar. +::: + +## embedded_curve_ops::multi_scalar_mul + +Performs multi scalar multiplication over the embedded curve. +The function accepts arbitrary amount of point-scalar pairs on the input, it multiplies the individual pairs over +the curve and returns a sum of the resulting points. + +Points represented as x and y coordinates [x1, y1, x2, y2, ...], scalars as low and high limbs [low1, high1, low2, high2, ...]. + +```rust title="multi_scalar_mul" showLineNumbers +pub fn multi_scalar_mul( + points: [Field; N], // points represented as x and y coordinates [x1, y1, x2, y2, ...] + scalars: [Field; N] // scalars represented as low and high limbs [low1, high1, low2, high2, ...] +) -> [Field; 2] +``` +> Source code: noir_stdlib/src/embedded_curve_ops.nr#L43-L48 + + +example + +```rust +fn main(point_x: Field, point_y: Field, scalar_low: Field, scalar_high: Field) { + let point = std::embedded_curve_ops::multi_scalar_mul([point_x, point_y], [scalar_low, scalar_high]); + println(point); +} +``` + +## embedded_curve_ops::fixed_base_scalar_mul + +Performs fixed base scalar multiplication over the embedded curve (multiplies input scalar with a generator point). +The function accepts a single scalar on the input represented as 2 fields. + +```rust title="fixed_base_scalar_mul" showLineNumbers +pub fn fixed_base_scalar_mul( + scalar_low: Field, + scalar_high: Field +) -> [Field; 2] +``` +> Source code: noir_stdlib/src/embedded_curve_ops.nr#L51-L56 + + +example + +```rust +fn main(scalar_low: Field, scalar_high: Field) { + let point = std::embedded_curve_ops::fixed_base_scalar_mul(scalar_low, scalar_high); + println(point); +} +``` + +## embedded_curve_ops::embedded_curve_add + +Adds two points on the embedded curve. +This function takes two `EmbeddedCurvePoint` structures as parameters, representing points on the curve, and returns a new `EmbeddedCurvePoint` structure that represents their sum. + +### Parameters: +- `point1` (`EmbeddedCurvePoint`): The first point to add. +- `point2` (`EmbeddedCurvePoint`): The second point to add. + +### Returns: +- `EmbeddedCurvePoint`: The resulting point after the addition of `point1` and `point2`. + +```rust title="embedded_curve_add" showLineNumbers +fn embedded_curve_add( + point1: EmbeddedCurvePoint, + point2: EmbeddedCurvePoint +) -> EmbeddedCurvePoint +``` +> Source code: noir_stdlib/src/embedded_curve_ops.nr#L65-L70 + + +example + +```rust +fn main() { + let point1 = EmbeddedCurvePoint { x: 1, y: 2 }; + let point2 = EmbeddedCurvePoint { x: 3, y: 4 }; + let result = std::embedded_curve_ops::embedded_curve_add(point1, point2); + println!("Resulting Point: ({}, {})", result.x, result.y); +} +``` + + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/hashes.mdx new file mode 100644 index 00000000000..3b83d9ec31a --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/hashes.mdx @@ -0,0 +1,257 @@ +--- +title: Hash methods +description: + Learn about the cryptographic primitives ready to use for any Noir project, including sha256, + blake2s, pedersen, mimc_bn254 and mimc +keywords: + [cryptographic primitives, Noir project, sha256, blake2s, pedersen, mimc_bn254, mimc, hash] +sidebar_position: 0 +--- + +import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx'; + +## sha256 + +Given an array of bytes, returns the resulting sha256 hash. +Specify a message_size to hash only the first `message_size` bytes of the input. + +```rust title="sha256" showLineNumbers +pub fn sha256(input: [u8; N]) -> [u8; 32] +``` +> Source code: noir_stdlib/src/hash.nr#L10-L12 + + +example: +```rust title="sha256_var" showLineNumbers +let digest = std::hash::sha256_var([x as u8], 1); +``` +> Source code: test_programs/execution_success/sha256/src/main.nr#L17-L19 + + +```rust +fn main() { + let x = [163, 117, 178, 149]; // some random bytes + let hash = std::sha256::sha256_var(x, 4); +} +``` + + + + +## blake2s + +Given an array of bytes, returns an array with the Blake2 hash + +```rust title="blake2s" showLineNumbers +pub fn blake2s(input: [u8; N]) -> [u8; 32] +``` +> Source code: noir_stdlib/src/hash.nr#L16-L18 + + +example: + +```rust +fn main() { + let x = [163, 117, 178, 149]; // some random bytes + let hash = std::hash::blake2s(x); +} +``` + + + +## blake3 + +Given an array of bytes, returns an array with the Blake3 hash + +```rust title="blake3" showLineNumbers +pub fn blake3(input: [u8; N]) -> [u8; 32] +``` +> Source code: noir_stdlib/src/hash.nr#L22-L24 + + +example: + +```rust +fn main() { + let x = [163, 117, 178, 149]; // some random bytes + let hash = std::hash::blake3(x); +} +``` + + + +## pedersen_hash + +Given an array of Fields, returns the Pedersen hash. + +```rust title="pedersen_hash" showLineNumbers +pub fn pedersen_hash(input: [Field; N]) -> Field +``` +> Source code: noir_stdlib/src/hash.nr#L46-L48 + + +example: + +```rust title="pedersen-hash" showLineNumbers +use dep::std; + +fn main(x: Field, y: Field, expected_hash: Field) { + let hash = std::hash::pedersen_hash([x, y]); + assert_eq(hash, expected_hash); +} +``` +> Source code: test_programs/execution_success/pedersen_hash/src/main.nr#L1-L8 + + + + +## pedersen_commitment + +Given an array of Fields, returns the Pedersen commitment. + +```rust title="pedersen_commitment" showLineNumbers +struct PedersenPoint { + x : Field, + y : Field, +} + +pub fn pedersen_commitment(input: [Field; N]) -> PedersenPoint { +``` +> Source code: noir_stdlib/src/hash.nr#L27-L34 + + +example: + +```rust title="pedersen-commitment" showLineNumbers +use dep::std; + +fn main(x: Field, y: Field, expected_commitment: std::hash::PedersenPoint) { + let commitment = std::hash::pedersen_commitment([x, y]); + assert_eq(commitment.x, expected_commitment.x); + assert_eq(commitment.y, expected_commitment.y); +} +``` +> Source code: test_programs/execution_success/pedersen_commitment/src/main.nr#L1-L9 + + + + +## keccak256 + +Given an array of bytes (`u8`), returns the resulting keccak hash as an array of +32 bytes (`[u8; 32]`). Specify a message_size to hash only the first +`message_size` bytes of the input. + +```rust title="keccak256" showLineNumbers +pub fn keccak256(input: [u8; N], message_size: u32) -> [u8; 32] +``` +> Source code: noir_stdlib/src/hash.nr#L68-L70 + + +example: + +```rust title="keccak256" showLineNumbers +use dep::std; + +fn main(x: Field, result: [u8; 32]) { + // We use the `as` keyword here to denote the fact that we want to take just the first byte from the x Field + // The padding is taken care of by the program + let digest = std::hash::keccak256([x as u8], 1); + assert(digest == result); + + //#1399: variable message size + let message_size = 4; + let hash_a = std::hash::keccak256([1, 2, 3, 4], message_size); + let hash_b = std::hash::keccak256([1, 2, 3, 4, 0, 0, 0, 0], message_size); + + assert(hash_a == hash_b); + + let message_size_big = 8; + let hash_c = std::hash::keccak256([1, 2, 3, 4, 0, 0, 0, 0], message_size_big); + + assert(hash_a != hash_c); +} +``` +> Source code: test_programs/execution_success/keccak256/src/main.nr#L1-L22 + + + + +## poseidon + +Given an array of Fields, returns a new Field with the Poseidon Hash. Mind that you need to specify +how many inputs are there to your Poseidon function. + +```rust +// example for hash_1, hash_2 accepts an array of length 2, etc +fn hash_1(input: [Field; 1]) -> Field +``` + +example: + +```rust title="poseidon" showLineNumbers +use dep::std::hash::poseidon; +use dep::std::hash::poseidon2; + +fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field, x3: [Field; 4], y3: Field) { + let hash1 = poseidon::bn254::hash_2(x1); + assert(hash1 == y1); + + let hash2 = poseidon::bn254::hash_4(x2); + assert(hash2 == y2); + + let hash3 = poseidon2::Poseidon2::hash(x3, x3.len()); + assert(hash3 == y3); +} +``` +> Source code: test_programs/execution_success/poseidon_bn254_hash/src/main.nr#L1-L15 + + +## poseidon 2 + +Given an array of Fields, returns a new Field with the Poseidon2 Hash. Contrary to the Poseidon +function, there is only one hash and you can specify a message_size to hash only the first +`message_size` bytes of the input, + +```rust +// example for hashing the first three elements of the input +Poseidon2::hash(input, 3); +``` + +The above example for Poseidon also includes Poseidon2. + +## mimc_bn254 and mimc + +`mimc_bn254` is `mimc`, but with hardcoded parameters for the BN254 curve. You can use it by +providing an array of Fields, and it returns a Field with the hash. You can use the `mimc` method if +you're willing to input your own constants: + +```rust +fn mimc(x: Field, k: Field, constants: [Field; N], exp : Field) -> Field +``` + +otherwise, use the `mimc_bn254` method: + +```rust +fn mimc_bn254(array: [Field; N]) -> Field +``` + +example: + +```rust + +fn main() { + let x = [163, 117, 178, 149]; // some random bytes + let hash = std::hash::mimc::mimc_bn254(x); +} +``` + +## hash_to_field + +```rust +fn hash_to_field(_input : [Field]) -> Field {} +``` + +Calculates the `blake2s` hash of the inputs and returns the hash modulo the field modulus to return +a value which can be represented as a `Field`. + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/index.md new file mode 100644 index 00000000000..650f30165d5 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/index.md @@ -0,0 +1,14 @@ +--- +title: Cryptographic Primitives +description: + Learn about the cryptographic primitives ready to use for any Noir project +keywords: + [ + cryptographic primitives, + Noir project, + ] +--- + +The Noir team is progressively adding new cryptographic primitives to the standard library. Reach out for news or if you would be interested in adding more of these calculations in Noir. + +Some methods are available thanks to the Aztec backend, not being performed using Noir. When using other backends, these methods may or may not be supplied. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/schnorr.mdx new file mode 100644 index 00000000000..b59e69c8f07 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/cryptographic_primitives/schnorr.mdx @@ -0,0 +1,64 @@ +--- +title: Schnorr Signatures +description: Learn how you can verify Schnorr signatures using Noir +keywords: [cryptographic primitives, Noir project, schnorr, signatures] +sidebar_position: 2 +--- + +import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx'; + +## schnorr::verify_signature + +Verifier for Schnorr signatures over the embedded curve (for BN254 it is Grumpkin). +See schnorr::verify_signature_slice for a version that works directly on slices. + +```rust title="schnorr_verify" showLineNumbers +pub fn verify_signature( + public_key_x: Field, + public_key_y: Field, + signature: [u8; 64], + message: [u8; N] +) -> bool +``` +> Source code: noir_stdlib/src/schnorr.nr#L2-L9 + + +where `_signature` can be generated like so using the npm package +[@noir-lang/barretenberg](https://www.npmjs.com/package/@noir-lang/barretenberg) + +```js +const { BarretenbergWasm } = require('@noir-lang/barretenberg/dest/wasm'); +const { Schnorr } = require('@noir-lang/barretenberg/dest/crypto/schnorr'); + +... + +const barretenberg = await BarretenbergWasm.new(); +const schnorr = new Schnorr(barretenberg); +const pubKey = schnorr.computePublicKey(privateKey); +const message = ... +const signature = Array.from( + schnorr.constructSignature(hash, privateKey).toBuffer() +); + +... +``` + + + +## schnorr::verify_signature_slice + +Verifier for Schnorr signatures over the embedded curve (for BN254 it is Grumpkin) +where the message is a slice. + +```rust title="schnorr_verify_slice" showLineNumbers +pub fn verify_signature_slice( + public_key_x: Field, + public_key_y: Field, + signature: [u8; 64], + message: [u8] +) -> bool +``` +> Source code: noir_stdlib/src/schnorr.nr#L13-L20 + + + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/logging.md new file mode 100644 index 00000000000..db75ef9f86f --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/logging.md @@ -0,0 +1,78 @@ +--- +title: Logging +description: + Learn how to use the println statement for debugging in Noir with this tutorial. Understand the + basics of logging in Noir and how to implement it in your code. +keywords: + [ + noir logging, + println statement, + print statement, + debugging in noir, + noir std library, + logging tutorial, + basic logging in noir, + noir logging implementation, + noir debugging techniques, + rust, + ] +--- + +The standard library provides two familiar statements you can use: `println` and `print`. Despite being a limited implementation of rust's `println!` and `print!` macros, these constructs can be useful for debugging. + +You can print the output of both statements in your Noir code by using the `nargo execute` command or the `--show-output` flag when using `nargo test` (provided there are print statements in your tests). + +It is recommended to use `nargo execute` if you want to debug failing constraints with `println` or `print` statements. This is due to every input in a test being a constant rather than a witness, so we issue an error during compilation while we only print during execution (which comes after compilation). Neither `println`, nor `print` are callable for failed constraints caught at compile time. + +Both `print` and `println` are generic functions which can work on integers, fields, strings, and even structs or expressions. Note however, that slices are currently unsupported. For example: + +```rust +struct Person { + age: Field, + height: Field, +} + +fn main(age: Field, height: Field) { + let person = Person { + age: age, + height: height, + }; + println(person); + println(age + height); + println("Hello world!"); +} +``` + +You can print different types in the same statement (including strings) with a type called `fmtstr`. It can be specified in the same way as a normal string, just prepended with an "f" character: + +```rust + let fmt_str = f"i: {i}, j: {j}"; + println(fmt_str); + + let s = myStruct { y: x, x: y }; + println(s); + + println(f"i: {i}, s: {s}"); + + println(x); + println([x, y]); + + let foo = fooStruct { my_struct: s, foo: 15 }; + println(f"s: {s}, foo: {foo}"); + + println(15); // prints 0x0f, implicit Field + println(-1 as u8); // prints 255 + println(-1 as i8); // prints -1 +``` + +Examples shown above are interchangeable between the two `print` statements: + +```rust +let person = Person { age : age, height : height }; + +println(person); +print(person); + +println("Hello world!"); // Prints with a newline at the end of the input +print("Hello world!"); // Prints the input and keeps cursor on the same line +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/merkle_trees.md new file mode 100644 index 00000000000..6a9ebf72ada --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/merkle_trees.md @@ -0,0 +1,58 @@ +--- +title: Merkle Trees +description: Learn about Merkle Trees in Noir with this tutorial. Explore the basics of computing a merkle root using a proof, with examples. +keywords: + [ + Merkle trees in Noir, + Noir programming language, + check membership, + computing root from leaf, + Noir Merkle tree implementation, + Merkle tree tutorial, + Merkle tree code examples, + Noir libraries, + pedersen hash., + ] +--- + +## compute_merkle_root + +Returns the root of the tree from the provided leaf and its hash path, using a [Pedersen hash](./cryptographic_primitives/hashes.mdx#pedersen_hash). + +```rust +fn compute_merkle_root(leaf : Field, index : Field, hash_path: [Field]) -> Field +``` + +example: + +```rust +/** + // these values are for this example only + index = "0" + priv_key = "0x000000000000000000000000000000000000000000000000000000616c696365" + secret = "0x1929ea3ab8d9106a899386883d9428f8256cfedb3c4f6b66bf4aa4d28a79988f" + note_hash_path = [ + "0x1e61bdae0f027b1b2159e1f9d3f8d00fa668a952dddd822fda80dc745d6f65cc", + "0x0e4223f3925f98934393c74975142bd73079ab0621f4ee133cee050a3c194f1a", + "0x2fd7bb412155bf8693a3bd2a3e7581a679c95c68a052f835dddca85fa1569a40" + ] + */ +fn main(index: Field, priv_key: Field, secret: Field, note_hash_path: [Field; 3]) { + + let pubkey = std::scalar_mul::fixed_base_embedded_curve(priv_key); + let pubkey_x = pubkey[0]; + let pubkey_y = pubkey[1]; + let note_commitment = std::hash::pedersen(&[pubkey_x, pubkey_y, secret]); + + let root = std::merkle::compute_merkle_root(note_commitment[0], index, note_hash_path.as_slice()); + println(root); +} +``` + +To check merkle tree membership: + +1. Include a merkle root as a program input. +2. Compute the merkle root of a given leaf, index and hash path. +3. Assert the merkle roots are equal. + +For more info about merkle trees, see the Wikipedia [page](https://en.wikipedia.org/wiki/Merkle_tree). diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/options.md new file mode 100644 index 00000000000..a1bd4e1de5f --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/options.md @@ -0,0 +1,101 @@ +--- +title: Option Type +--- + +The `Option` type is a way to express that a value might be present (`Some(T))` or absent (`None`). It's a safer way to handle potential absence of values, compared to using nulls in many other languages. + +```rust +struct Option { + None, + Some(T), +} +``` + +The `Option` type, already imported into your Noir program, can be used directly: + +```rust +fn main() { + let none = Option::none(); + let some = Option::some(3); +} +``` + +See [this test](https://github.com/noir-lang/noir/blob/5cbfb9c4a06c8865c98ff2b594464b037d821a5c/crates/nargo_cli/tests/test_data/option/src/main.nr) for a more comprehensive set of examples of each of the methods described below. + +## Methods + +### none + +Constructs a none value. + +### some + +Constructs a some wrapper around a given value. + +### is_none + +Returns true if the Option is None. + +### is_some + +Returns true of the Option is Some. + +### unwrap + +Asserts `self.is_some()` and returns the wrapped value. + +### unwrap_unchecked + +Returns the inner value without asserting `self.is_some()`. This method can be useful within an if condition when we already know that `option.is_some()`. If the option is None, there is no guarantee what value will be returned, only that it will be of type T for an `Option`. + +### unwrap_or + +Returns the wrapped value if `self.is_some()`. Otherwise, returns the given default value. + +### unwrap_or_else + +Returns the wrapped value if `self.is_some()`. Otherwise, calls the given function to return a default value. + +### expect + +Asserts `self.is_some()` with a provided custom message and returns the contained `Some` value. The custom message is expected to be a format string. + +### map + +If self is `Some(x)`, this returns `Some(f(x))`. Otherwise, this returns `None`. + +### map_or + +If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns the given default value. + +### map_or_else + +If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns `default()`. + +### and + +Returns None if self is None. Otherwise, this returns `other`. + +### and_then + +If self is None, this returns None. Otherwise, this calls the given function with the Some value contained within self, and returns the result of that call. In some languages this function is called `flat_map` or `bind`. + +### or + +If self is Some, return self. Otherwise, return `other`. + +### or_else + +If self is Some, return self. Otherwise, return `default()`. + +### xor + +If only one of the two Options is Some, return that option. Otherwise, if both options are Some or both are None, None is returned. + +### filter + +Returns `Some(x)` if self is `Some(x)` and `predicate(x)` is true. Otherwise, this returns `None`. + +### flatten + +Flattens an `Option>` into a `Option`. This returns `None` if the outer Option is None. Otherwise, this returns the inner Option. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/recursion.md new file mode 100644 index 00000000000..a93894043dc --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/recursion.md @@ -0,0 +1,88 @@ +--- +title: Recursive Proofs +description: Learn about how to write recursive proofs in Noir. +keywords: [recursion, recursive proofs, verification_key, verify_proof] +--- + +Noir supports recursively verifying proofs, meaning you verify the proof of a Noir program in another Noir program. This enables creating proofs of arbitrary size by doing step-wise verification of smaller components of a large proof. + +Read [the explainer on recursion](../../explainers/explainer-recursion.md) to know more about this function and the [guide on how to use it.](../../how_to/how-to-recursion.md) + +## The `#[recursive]` Attribute + +In Noir, the `#[recursive]` attribute is used to indicate that a circuit is designed for recursive proof generation. When applied, it informs the compiler and the tooling that the circuit should be compiled in a way that makes its proofs suitable for recursive verification. This attribute eliminates the need for manual flagging of recursion at the tooling level, streamlining the proof generation process for recursive circuits. + +### Example usage with `#[recursive]` + +```rust +#[recursive] +fn main(x: Field, y: pub Field) { + assert(x == y, "x and y are not equal"); +} + +// This marks the circuit as recursion-friendly and indicates that proofs generated from this circuit +// are intended for recursive verification. +``` + +By incorporating this attribute directly in the circuit's definition, tooling like Nargo and NoirJS can automatically execute recursive-specific duties for Noir programs (e.g. recursive-friendly proof artifact generation) without additional flags or configurations. + +## Verifying Recursive Proofs + +```rust +#[foreign(recursive_aggregation)] +pub fn verify_proof(verification_key: [Field], proof: [Field], public_inputs: [Field], key_hash: Field) {} +``` + +:::info + +This is a black box function. Read [this section](./black_box_fns) to learn more about black box functions in Noir. + +::: + +## Example usage + +```rust +use dep::std; + +fn main( + verification_key : [Field; 114], + proof : [Field; 93], + public_inputs : [Field; 1], + key_hash : Field, + proof_b : [Field; 93], +) { + std::verify_proof( + verification_key.as_slice(), + proof.as_slice(), + public_inputs.as_slice(), + key_hash + ); + + std::verify_proof( + verification_key.as_slice(), + proof_b.as_slice(), + public_inputs.as_slice(), + key_hash + ); +} +``` + +You can see a full example of recursive proofs in [this example recursion demo repo](https://github.com/noir-lang/noir-examples/tree/master/recursion). + +## Parameters + +### `verification_key` + +The verification key for the zk program that is being verified. + +### `proof` + +The proof for the zk program that is being verified. + +### `public_inputs` + +These represent the public inputs of the proof we are verifying. + +### `key_hash` + +A key hash is used to check the validity of the verification key. The circuit implementing this opcode can use this hash to ensure that the key provided to the circuit matches the key produced by the circuit creator. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/traits.md new file mode 100644 index 00000000000..a14312d2792 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/traits.md @@ -0,0 +1,464 @@ +--- +title: Traits +description: Noir's stdlib provides a few commonly used traits. +keywords: [traits, trait, interface, protocol, default, add, eq] +--- + +## `std::default` + +### `std::default::Default` + +```rust title="default-trait" showLineNumbers +trait Default { + fn default() -> Self; +} +``` +> Source code: noir_stdlib/src/default.nr#L1-L5 + + +Constructs a default value of a type. + +Implementations: +```rust +impl Default for Field { .. } + +impl Default for i8 { .. } +impl Default for i16 { .. } +impl Default for i32 { .. } +impl Default for i64 { .. } + +impl Default for u8 { .. } +impl Default for u16 { .. } +impl Default for u32 { .. } +impl Default for u64 { .. } + +impl Default for () { .. } +impl Default for bool { .. } + +impl Default for [T; N] + where T: Default { .. } + +impl Default for [T] { .. } + +impl Default for (A, B) + where A: Default, B: Default { .. } + +impl Default for (A, B, C) + where A: Default, B: Default, C: Default { .. } + +impl Default for (A, B, C, D) + where A: Default, B: Default, C: Default, D: Default { .. } + +impl Default for (A, B, C, D, E) + where A: Default, B: Default, C: Default, D: Default, E: Default { .. } +``` + +For primitive integer types, the return value of `default` is `0`. Container +types such as arrays are filled with default values of their element type, +except slices whose length is unknown and thus defaulted to zero. + + +## `std::convert` + +### `std::convert::From` + +```rust title="from-trait" showLineNumbers +trait From { + fn from(input: T) -> Self; +} +``` +> Source code: noir_stdlib/src/convert.nr#L1-L5 + + +The `From` trait defines how to convert from a given type `T` to the type on which the trait is implemented. + +The Noir standard library provides a number of implementations of `From` between primitive types. +```rust title="from-impls" showLineNumbers +// Unsigned integers + +impl From for u32 { fn from(value: u8) -> u32 { value as u32 } } + +impl From for u64 { fn from(value: u8) -> u64 { value as u64 } } +impl From for u64 { fn from(value: u32) -> u64 { value as u64 } } + +impl From for Field { fn from(value: u8) -> Field { value as Field } } +impl From for Field { fn from(value: u32) -> Field { value as Field } } +impl From for Field { fn from(value: u64) -> Field { value as Field } } + +// Signed integers + +impl From for i32 { fn from(value: i8) -> i32 { value as i32 } } + +impl From for i64 { fn from(value: i8) -> i64 { value as i64 } } +impl From for i64 { fn from(value: i32) -> i64 { value as i64 } } + +// Booleans +impl From for u8 { fn from(value: bool) -> u8 { value as u8 } } +impl From for u32 { fn from(value: bool) -> u32 { value as u32 } } +impl From for u64 { fn from(value: bool) -> u64 { value as u64 } } +impl From for i8 { fn from(value: bool) -> i8 { value as i8 } } +impl From for i32 { fn from(value: bool) -> i32 { value as i32 } } +impl From for i64 { fn from(value: bool) -> i64 { value as i64 } } +impl From for Field { fn from(value: bool) -> Field { value as Field } } +``` +> Source code: noir_stdlib/src/convert.nr#L25-L52 + + +#### When to implement `From` + +As a general rule of thumb, `From` may be implemented in the [situations where it would be suitable in Rust](https://doc.rust-lang.org/std/convert/trait.From.html#when-to-implement-from): + +- The conversion is *infallible*: Noir does not provide an equivalent to Rust's `TryFrom`, if the conversion can fail then provide a named method instead. +- The conversion is *lossless*: semantically, it should not lose or discard information. For example, `u32: From` can losslessly convert any `u16` into a valid `u32` such that the original `u16` can be recovered. On the other hand, `u16: From` should not be implemented as `2**16` is a `u32` which cannot be losslessly converted into a `u16`. +- The conversion is *value-preserving*: the conceptual kind and meaning of the resulting value is the same, even though the Noir type and technical representation might be different. While it's possible to infallibly and losslessly convert a `u8` into a `str<2>` hex representation, `4u8` and `"04"` are too different for `str<2>: From` to be implemented. +- The conversion is *obvious*: it's the only reasonable conversion between the two types. If there's ambiguity on how to convert between them such that the same input could potentially map to two different values then a named method should be used. For instance rather than implementing `U128: From<[u8; 16]>`, the methods `U128::from_le_bytes` and `U128::from_be_bytes` are used as otherwise the endianness of the array would be ambiguous, resulting in two potential values of `U128` from the same byte array. + +One additional recommendation specific to Noir is: +- The conversion is *efficient*: it's relatively cheap to convert between the two types. Due to being a ZK DSL, it's more important to avoid unnecessary computation compared to Rust. If the implementation of `From` would encourage users to perform unnecessary conversion, resulting in additional proving time, then it may be preferable to expose functionality such that this conversion may be avoided. + +### `std::convert::Into` + +The `Into` trait is defined as the reciprocal of `From`. It should be easy to convince yourself that if we can convert to type `A` from type `B`, then it's possible to convert type `B` into type `A`. + +For this reason, implementing `From` on a type will automatically generate a matching `Into` implementation. One should always prefer implementing `From` over `Into` as implementing `Into` will not generate a matching `From` implementation. + +```rust title="into-trait" showLineNumbers +trait Into { + fn into(self) -> T; +} + +impl Into for U where T: From { + fn into(self) -> T { + T::from(self) + } +} +``` +> Source code: noir_stdlib/src/convert.nr#L13-L23 + + +`Into` is most useful when passing function arguments where the types don't quite match up with what the function expects. In this case, the compiler has enough type information to perform the necessary conversion by just appending `.into()` onto the arguments in question. + + +## `std::cmp` + +### `std::cmp::Eq` + +```rust title="eq-trait" showLineNumbers +trait Eq { + fn eq(self, other: Self) -> bool; +} +``` +> Source code: noir_stdlib/src/cmp.nr#L1-L5 + + +Returns `true` if `self` is equal to `other`. Implementing this trait on a type +allows the type to be used with `==` and `!=`. + +Implementations: +```rust +impl Eq for Field { .. } + +impl Eq for i8 { .. } +impl Eq for i16 { .. } +impl Eq for i32 { .. } +impl Eq for i64 { .. } + +impl Eq for u8 { .. } +impl Eq for u16 { .. } +impl Eq for u32 { .. } +impl Eq for u64 { .. } + +impl Eq for () { .. } +impl Eq for bool { .. } + +impl Eq for [T; N] + where T: Eq { .. } + +impl Eq for [T] + where T: Eq { .. } + +impl Eq for (A, B) + where A: Eq, B: Eq { .. } + +impl Eq for (A, B, C) + where A: Eq, B: Eq, C: Eq { .. } + +impl Eq for (A, B, C, D) + where A: Eq, B: Eq, C: Eq, D: Eq { .. } + +impl Eq for (A, B, C, D, E) + where A: Eq, B: Eq, C: Eq, D: Eq, E: Eq { .. } +``` + +### `std::cmp::Ord` + +```rust title="ord-trait" showLineNumbers +trait Ord { + fn cmp(self, other: Self) -> Ordering; +} +``` +> Source code: noir_stdlib/src/cmp.nr#L102-L106 + + +`a.cmp(b)` compares two values returning `Ordering::less()` if `a < b`, +`Ordering::equal()` if `a == b`, or `Ordering::greater()` if `a > b`. +Implementing this trait on a type allows `<`, `<=`, `>`, and `>=` to be +used on values of the type. + +`std::cmp` also provides `max` and `min` functions for any type which implements the `Ord` trait. + +Implementations: + +```rust +impl Ord for u8 { .. } +impl Ord for u16 { .. } +impl Ord for u32 { .. } +impl Ord for u64 { .. } + +impl Ord for i8 { .. } +impl Ord for i16 { .. } +impl Ord for i32 { .. } + +impl Ord for i64 { .. } + +impl Ord for () { .. } +impl Ord for bool { .. } + +impl Ord for [T; N] + where T: Ord { .. } + +impl Ord for [T] + where T: Ord { .. } + +impl Ord for (A, B) + where A: Ord, B: Ord { .. } + +impl Ord for (A, B, C) + where A: Ord, B: Ord, C: Ord { .. } + +impl Ord for (A, B, C, D) + where A: Ord, B: Ord, C: Ord, D: Ord { .. } + +impl Ord for (A, B, C, D, E) + where A: Ord, B: Ord, C: Ord, D: Ord, E: Ord { .. } +``` + +## `std::ops` + +### `std::ops::Add`, `std::ops::Sub`, `std::ops::Mul`, and `std::ops::Div` + +These traits abstract over addition, subtraction, multiplication, and division respectively. +Implementing these traits for a given type will also allow that type to be used with the corresponding operator +for that trait (`+` for Add, etc) in addition to the normal method names. + +```rust title="add-trait" showLineNumbers +trait Add { + fn add(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/arith.nr#L1-L5 + +```rust title="sub-trait" showLineNumbers +trait Sub { + fn sub(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/arith.nr#L19-L23 + +```rust title="mul-trait" showLineNumbers +trait Mul { + fn mul(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/arith.nr#L37-L41 + +```rust title="div-trait" showLineNumbers +trait Div { + fn div(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/arith.nr#L55-L59 + + +The implementations block below is given for the `Add` trait, but the same types that implement +`Add` also implement `Sub`, `Mul`, and `Div`. + +Implementations: +```rust +impl Add for Field { .. } + +impl Add for i8 { .. } +impl Add for i16 { .. } +impl Add for i32 { .. } +impl Add for i64 { .. } + +impl Add for u8 { .. } +impl Add for u16 { .. } +impl Add for u32 { .. } +impl Add for u64 { .. } +``` + +### `std::ops::Rem` + +```rust title="rem-trait" showLineNumbers +trait Rem{ + fn rem(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/arith.nr#L73-L77 + + +`Rem::rem(a, b)` is the remainder function returning the result of what is +left after dividing `a` and `b`. Implementing `Rem` allows the `%` operator +to be used with the implementation type. + +Unlike other numeric traits, `Rem` is not implemented for `Field`. + +Implementations: +```rust +impl Rem for u8 { fn rem(self, other: u8) -> u8 { self % other } } +impl Rem for u16 { fn rem(self, other: u16) -> u16 { self % other } } +impl Rem for u32 { fn rem(self, other: u32) -> u32 { self % other } } +impl Rem for u64 { fn rem(self, other: u64) -> u64 { self % other } } + +impl Rem for i8 { fn rem(self, other: i8) -> i8 { self % other } } +impl Rem for i16 { fn rem(self, other: i16) -> i16 { self % other } } +impl Rem for i32 { fn rem(self, other: i32) -> i32 { self % other } } +impl Rem for i64 { fn rem(self, other: i64) -> i64 { self % other } } +``` + +### `std::ops::Neg` + +```rust title="neg-trait" showLineNumbers +trait Neg { + fn neg(self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/arith.nr#L89-L93 + + +`Neg::neg` is equivalent to the unary negation operator `-`. + +Implementations: +```rust title="neg-trait-impls" showLineNumbers +impl Neg for Field { fn neg(self) -> Field { -self } } + +impl Neg for i8 { fn neg(self) -> i8 { -self } } +impl Neg for i16 { fn neg(self) -> i16 { -self } } +impl Neg for i32 { fn neg(self) -> i32 { -self } } +impl Neg for i64 { fn neg(self) -> i64 { -self } } +``` +> Source code: noir_stdlib/src/ops/arith.nr#L95-L102 + + +### `std::ops::Not` + +```rust title="not-trait" showLineNumbers +trait Not { + fn not(self: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/bit.nr#L1-L5 + + +`Not::not` is equivalent to the unary bitwise NOT operator `!`. + +Implementations: +```rust title="not-trait-impls" showLineNumbers +impl Not for bool { fn not(self) -> bool { !self } } + +impl Not for u64 { fn not(self) -> u64 { !self } } +impl Not for u32 { fn not(self) -> u32 { !self } } +impl Not for u16 { fn not(self) -> u16 { !self } } +impl Not for u8 { fn not(self) -> u8 { !self } } +impl Not for u1 { fn not(self) -> u1 { !self } } + +impl Not for i8 { fn not(self) -> i8 { !self } } +impl Not for i16 { fn not(self) -> i16 { !self } } +impl Not for i32 { fn not(self) -> i32 { !self } } +impl Not for i64 { fn not(self) -> i64 { !self } } +``` +> Source code: noir_stdlib/src/ops/bit.nr#L7-L20 + + +### `std::ops::{ BitOr, BitAnd, BitXor }` + +```rust title="bitor-trait" showLineNumbers +trait BitOr { + fn bitor(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/bit.nr#L22-L26 + +```rust title="bitand-trait" showLineNumbers +trait BitAnd { + fn bitand(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/bit.nr#L40-L44 + +```rust title="bitxor-trait" showLineNumbers +trait BitXor { + fn bitxor(self, other: Self) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/bit.nr#L58-L62 + + +Traits for the bitwise operations `|`, `&`, and `^`. + +Implementing `BitOr`, `BitAnd` or `BitXor` for a type allows the `|`, `&`, or `^` operator respectively +to be used with the type. + +The implementations block below is given for the `BitOr` trait, but the same types that implement +`BitOr` also implement `BitAnd` and `BitXor`. + +Implementations: +```rust +impl BitOr for bool { fn bitor(self, other: bool) -> bool { self | other } } + +impl BitOr for u8 { fn bitor(self, other: u8) -> u8 { self | other } } +impl BitOr for u16 { fn bitor(self, other: u16) -> u16 { self | other } } +impl BitOr for u32 { fn bitor(self, other: u32) -> u32 { self | other } } +impl BitOr for u64 { fn bitor(self, other: u64) -> u64 { self | other } } + +impl BitOr for i8 { fn bitor(self, other: i8) -> i8 { self | other } } +impl BitOr for i16 { fn bitor(self, other: i16) -> i16 { self | other } } +impl BitOr for i32 { fn bitor(self, other: i32) -> i32 { self | other } } +impl BitOr for i64 { fn bitor(self, other: i64) -> i64 { self | other } } +``` + +### `std::ops::{ Shl, Shr }` + +```rust title="shl-trait" showLineNumbers +trait Shl { + fn shl(self, other: u8) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/bit.nr#L76-L80 + +```rust title="shr-trait" showLineNumbers +trait Shr { + fn shr(self, other: u8) -> Self; +} +``` +> Source code: noir_stdlib/src/ops/bit.nr#L93-L97 + + +Traits for a bit shift left and bit shift right. + +Implementing `Shl` for a type allows the left shift operator (`<<`) to be used with the implementation type. +Similarly, implementing `Shr` allows the right shift operator (`>>`) to be used with the type. + +Note that bit shifting is not currently implemented for signed types. + +The implementations block below is given for the `Shl` trait, but the same types that implement +`Shl` also implement `Shr`. + +Implementations: +```rust +impl Shl for u8 { fn shl(self, other: u8) -> u8 { self << other } } +impl Shl for u16 { fn shl(self, other: u16) -> u16 { self << other } } +impl Shl for u32 { fn shl(self, other: u32) -> u32 { self << other } } +impl Shl for u64 { fn shl(self, other: u64) -> u64 { self << other } } +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/zeroed.md new file mode 100644 index 00000000000..f450fecdd36 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/noir/standard_library/zeroed.md @@ -0,0 +1,26 @@ +--- +title: Zeroed Function +description: + The zeroed function returns a zeroed value of any type. +keywords: + [ + zeroed + ] +--- + +Implements `fn zeroed() -> T` to return a zeroed value of any type. This function is generally unsafe to use as the zeroed bit pattern is not guaranteed to be valid for all types. It can however, be useful in cases when the value is guaranteed not to be used such as in a BoundedVec library implementing a growable vector, up to a certain length, backed by an array. The array can be initialized with zeroed values which are guaranteed to be inaccessible until the vector is pushed to. Similarly, enumerations in noir can be implemented using this method by providing zeroed values for the unused variants. + +You can access the function at `std::unsafe::zeroed`. + +This function currently supports the following types: + +- Field +- Bool +- Uint +- Array +- Slice +- String +- Tuple +- Function + +Using it on other types could result in unexpected behavior. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/.nojekyll new file mode 100644 index 00000000000..e2ac6616add --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/.nojekyll @@ -0,0 +1 @@ +TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false. \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md new file mode 100644 index 00000000000..d7249d24330 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md @@ -0,0 +1,160 @@ +# BarretenbergBackend + +## Extends + +- `BarretenbergVerifierBackend` + +## Implements + +- [`Backend`](../index.md#backend) + +## Constructors + +### new BarretenbergBackend(acirCircuit, options) + +```ts +new BarretenbergBackend(acirCircuit, options): BarretenbergBackend +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `acirCircuit` | `CompiledCircuit` | +| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) | + +#### Returns + +[`BarretenbergBackend`](BarretenbergBackend.md) + +#### Inherited from + +BarretenbergVerifierBackend.constructor + +## Properties + +| Property | Type | Description | Inheritance | +| :------ | :------ | :------ | :------ | +| `acirComposer` | `any` | - | BarretenbergVerifierBackend.acirComposer | +| `acirUncompressedBytecode` | `Uint8Array` | - | BarretenbergVerifierBackend.acirUncompressedBytecode | +| `api` | `Barretenberg` | - | BarretenbergVerifierBackend.api | +| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) | - | BarretenbergVerifierBackend.options | + +## Methods + +### destroy() + +```ts +destroy(): Promise +``` + +#### Returns + +`Promise`\<`void`\> + +#### Inherited from + +BarretenbergVerifierBackend.destroy + +*** + +### generateProof() + +```ts +generateProof(compressedWitness): Promise +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `compressedWitness` | `Uint8Array` | + +#### Returns + +`Promise`\<`ProofData`\> + +#### Description + +Generates a proof + +*** + +### generateRecursiveProofArtifacts() + +```ts +generateRecursiveProofArtifacts(proofData, numOfPublicInputs): Promise +``` + +Generates artifacts that will be passed to a circuit that will verify this proof. + +Instead of passing the proof and verification key as a byte array, we pass them +as fields which makes it cheaper to verify in a circuit. + +The proof that is passed here will have been created using a circuit +that has the #[recursive] attribute on its `main` method. + +The number of public inputs denotes how many public inputs are in the inner proof. + +#### Parameters + +| Parameter | Type | Default value | +| :------ | :------ | :------ | +| `proofData` | `ProofData` | `undefined` | +| `numOfPublicInputs` | `number` | `0` | + +#### Returns + +`Promise`\<`object`\> + +#### Example + +```typescript +const artifacts = await backend.generateRecursiveProofArtifacts(proof, numOfPublicInputs); +``` + +*** + +### getVerificationKey() + +```ts +getVerificationKey(): Promise +``` + +#### Returns + +`Promise`\<`Uint8Array`\> + +#### Inherited from + +BarretenbergVerifierBackend.getVerificationKey + +*** + +### verifyProof() + +```ts +verifyProof(proofData): Promise +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `proofData` | `ProofData` | + +#### Returns + +`Promise`\<`boolean`\> + +#### Inherited from + +BarretenbergVerifierBackend.verifyProof + +#### Description + +Verifies a proof + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md new file mode 100644 index 00000000000..500276ea748 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md @@ -0,0 +1,58 @@ +# BarretenbergVerifier + +## Constructors + +### new BarretenbergVerifier(options) + +```ts +new BarretenbergVerifier(options): BarretenbergVerifier +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) | + +#### Returns + +[`BarretenbergVerifier`](BarretenbergVerifier.md) + +## Methods + +### destroy() + +```ts +destroy(): Promise +``` + +#### Returns + +`Promise`\<`void`\> + +*** + +### verifyProof() + +```ts +verifyProof(proofData, verificationKey): Promise +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `proofData` | `ProofData` | +| `verificationKey` | `Uint8Array` | + +#### Returns + +`Promise`\<`boolean`\> + +#### Description + +Verifies a proof + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/index.md new file mode 100644 index 00000000000..64971973196 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/index.md @@ -0,0 +1,59 @@ +# backend_barretenberg + +## Exports + +### Classes + +| Class | Description | +| :------ | :------ | +| [BarretenbergBackend](classes/BarretenbergBackend.md) | - | +| [BarretenbergVerifier](classes/BarretenbergVerifier.md) | - | + +### Type Aliases + +| Type alias | Description | +| :------ | :------ | +| [BackendOptions](type-aliases/BackendOptions.md) | - | + +## References + +### CompiledCircuit + +Renames and re-exports [Backend](index.md#backend) + +*** + +### ProofData + +Renames and re-exports [Backend](index.md#backend) + +## Variables + +### Backend + +```ts +Backend: any; +``` + +## Functions + +### publicInputsToWitnessMap() + +```ts +publicInputsToWitnessMap(publicInputs, abi): Backend +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `publicInputs` | `string`[] | +| `abi` | `Abi` | + +#### Returns + +[`Backend`](index.md#backend) + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md new file mode 100644 index 00000000000..b49a479f4f4 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md @@ -0,0 +1,21 @@ +# BackendOptions + +```ts +type BackendOptions: object; +``` + +## Description + +An options object, currently only used to specify the number of threads to use. + +## Type declaration + +| Member | Type | Description | +| :------ | :------ | :------ | +| `memory` | `object` | - | +| `memory.maximum` | `number` | - | +| `threads` | `number` | **Description**

Number of threads | + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs new file mode 100644 index 00000000000..d7d5128f9e3 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs @@ -0,0 +1,4 @@ +// @ts-check +/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ +const typedocSidebar = { items: [{"type":"category","label":"Classes","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend","label":"BarretenbergBackend"},{"type":"doc","id":"reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier","label":"BarretenbergVerifier"}]},{"type":"category","label":"Type Aliases","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions","label":"BackendOptions"}]}]}; +module.exports = typedocSidebar.items; \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/.nojekyll new file mode 100644 index 00000000000..e2ac6616add --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/.nojekyll @@ -0,0 +1 @@ +TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false. \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/classes/Noir.md new file mode 100644 index 00000000000..45dd62ee57e --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/classes/Noir.md @@ -0,0 +1,132 @@ +# Noir + +## Constructors + +### new Noir(circuit, backend) + +```ts +new Noir(circuit, backend?): Noir +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `circuit` | `CompiledCircuit` | +| `backend`? | `any` | + +#### Returns + +[`Noir`](Noir.md) + +## Methods + +### destroy() + +```ts +destroy(): Promise +``` + +#### Returns + +`Promise`\<`void`\> + +#### Description + +Destroys the underlying backend instance. + +#### Example + +```typescript +await noir.destroy(); +``` + +*** + +### execute() + +```ts +execute(inputs, foreignCallHandler?): Promise +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `inputs` | `InputMap` | +| `foreignCallHandler`? | [`ForeignCallHandler`](../type-aliases/ForeignCallHandler.md) | + +#### Returns + +`Promise`\<`object`\> + +#### Description + +Allows to execute a circuit to get its witness and return value. + +#### Example + +```typescript +async execute(inputs) +``` + +*** + +### generateProof() + +```ts +generateProof(inputs, foreignCallHandler?): Promise +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `inputs` | `InputMap` | +| `foreignCallHandler`? | [`ForeignCallHandler`](../type-aliases/ForeignCallHandler.md) | + +#### Returns + +`Promise`\<`ProofData`\> + +#### Description + +Generates a witness and a proof given an object as input. + +#### Example + +```typescript +async generateProof(input) +``` + +*** + +### verifyProof() + +```ts +verifyProof(proofData): Promise +``` + +#### Parameters + +| Parameter | Type | +| :------ | :------ | +| `proofData` | `ProofData` | + +#### Returns + +`Promise`\<`boolean`\> + +#### Description + +Instantiates the verification key and verifies a proof. + +#### Example + +```typescript +async verifyProof(proof) +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/and.md new file mode 100644 index 00000000000..c783283e396 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/and.md @@ -0,0 +1,22 @@ +# and() + +```ts +and(lhs, rhs): string +``` + +Performs a bitwise AND operation between `lhs` and `rhs` + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `lhs` | `string` | | +| `rhs` | `string` | | + +## Returns + +`string` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/blake2s256.md new file mode 100644 index 00000000000..7882d0da8d5 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/blake2s256.md @@ -0,0 +1,21 @@ +# blake2s256() + +```ts +blake2s256(inputs): Uint8Array +``` + +Calculates the Blake2s256 hash of the input bytes + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `inputs` | `Uint8Array` | | + +## Returns + +`Uint8Array` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md new file mode 100644 index 00000000000..5e3cd53e9d3 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md @@ -0,0 +1,28 @@ +# ecdsa\_secp256k1\_verify() + +```ts +ecdsa_secp256k1_verify( + hashed_msg, + public_key_x_bytes, + public_key_y_bytes, + signature): boolean +``` + +Verifies a ECDSA signature over the secp256k1 curve. + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `hashed_msg` | `Uint8Array` | | +| `public_key_x_bytes` | `Uint8Array` | | +| `public_key_y_bytes` | `Uint8Array` | | +| `signature` | `Uint8Array` | | + +## Returns + +`boolean` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md new file mode 100644 index 00000000000..0b20ff68957 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md @@ -0,0 +1,28 @@ +# ecdsa\_secp256r1\_verify() + +```ts +ecdsa_secp256r1_verify( + hashed_msg, + public_key_x_bytes, + public_key_y_bytes, + signature): boolean +``` + +Verifies a ECDSA signature over the secp256r1 curve. + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `hashed_msg` | `Uint8Array` | | +| `public_key_x_bytes` | `Uint8Array` | | +| `public_key_y_bytes` | `Uint8Array` | | +| `signature` | `Uint8Array` | | + +## Returns + +`boolean` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/keccak256.md new file mode 100644 index 00000000000..d10f155ce86 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/keccak256.md @@ -0,0 +1,21 @@ +# keccak256() + +```ts +keccak256(inputs): Uint8Array +``` + +Calculates the Keccak256 hash of the input bytes + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `inputs` | `Uint8Array` | | + +## Returns + +`Uint8Array` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/sha256.md new file mode 100644 index 00000000000..6ba4ecac022 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/sha256.md @@ -0,0 +1,21 @@ +# sha256() + +```ts +sha256(inputs): Uint8Array +``` + +Calculates the SHA256 hash of the input bytes + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `inputs` | `Uint8Array` | | + +## Returns + +`Uint8Array` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/xor.md new file mode 100644 index 00000000000..8d762b895d3 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/functions/xor.md @@ -0,0 +1,22 @@ +# xor() + +```ts +xor(lhs, rhs): string +``` + +Performs a bitwise XOR operation between `lhs` and `rhs` + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `lhs` | `string` | | +| `rhs` | `string` | | + +## Returns + +`string` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/index.md new file mode 100644 index 00000000000..40bef8393fc --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/index.md @@ -0,0 +1,55 @@ +# noir_js + +## Exports + +### Classes + +| Class | Description | +| :------ | :------ | +| [Noir](classes/Noir.md) | - | + +### Type Aliases + +| Type alias | Description | +| :------ | :------ | +| [ErrorWithPayload](type-aliases/ErrorWithPayload.md) | - | +| [ForeignCallHandler](type-aliases/ForeignCallHandler.md) | A callback which performs an foreign call and returns the response. | +| [ForeignCallInput](type-aliases/ForeignCallInput.md) | - | +| [ForeignCallOutput](type-aliases/ForeignCallOutput.md) | - | +| [WitnessMap](type-aliases/WitnessMap.md) | - | + +### Functions + +| Function | Description | +| :------ | :------ | +| [and](functions/and.md) | Performs a bitwise AND operation between `lhs` and `rhs` | +| [blake2s256](functions/blake2s256.md) | Calculates the Blake2s256 hash of the input bytes | +| [ecdsa\_secp256k1\_verify](functions/ecdsa_secp256k1_verify.md) | Verifies a ECDSA signature over the secp256k1 curve. | +| [ecdsa\_secp256r1\_verify](functions/ecdsa_secp256r1_verify.md) | Verifies a ECDSA signature over the secp256r1 curve. | +| [keccak256](functions/keccak256.md) | Calculates the Keccak256 hash of the input bytes | +| [sha256](functions/sha256.md) | Calculates the SHA256 hash of the input bytes | +| [xor](functions/xor.md) | Performs a bitwise XOR operation between `lhs` and `rhs` | + +## References + +### CompiledCircuit + +Renames and re-exports [InputMap](index.md#inputmap) + +*** + +### ProofData + +Renames and re-exports [InputMap](index.md#inputmap) + +## Variables + +### InputMap + +```ts +InputMap: any; +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md new file mode 100644 index 00000000000..e8c2f4aef3d --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md @@ -0,0 +1,15 @@ +# ErrorWithPayload + +```ts +type ErrorWithPayload: ExecutionError & object; +``` + +## Type declaration + +| Member | Type | Description | +| :------ | :------ | :------ | +| `decodedAssertionPayload` | `any` | - | + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md new file mode 100644 index 00000000000..812b8b16481 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md @@ -0,0 +1,24 @@ +# ForeignCallHandler + +```ts +type ForeignCallHandler: (name, inputs) => Promise; +``` + +A callback which performs an foreign call and returns the response. + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `name` | `string` | The identifier for the type of foreign call being performed. | +| `inputs` | [`ForeignCallInput`](ForeignCallInput.md)[] | An array of hex encoded inputs to the foreign call. | + +## Returns + +`Promise`\<[`ForeignCallOutput`](ForeignCallOutput.md)[]\> + +outputs - An array of hex encoded outputs containing the results of the foreign call. + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md new file mode 100644 index 00000000000..dd95809186a --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md @@ -0,0 +1,9 @@ +# ForeignCallInput + +```ts +type ForeignCallInput: string[]; +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md new file mode 100644 index 00000000000..b71fb78a946 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md @@ -0,0 +1,9 @@ +# ForeignCallOutput + +```ts +type ForeignCallOutput: string | string[]; +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md new file mode 100644 index 00000000000..258c46f9d0c --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md @@ -0,0 +1,9 @@ +# WitnessMap + +```ts +type WitnessMap: Map; +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs new file mode 100644 index 00000000000..b3156097df6 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs @@ -0,0 +1,4 @@ +// @ts-check +/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ +const typedocSidebar = { items: [{"type":"category","label":"Classes","items":[{"type":"doc","id":"reference/NoirJS/noir_js/classes/Noir","label":"Noir"}]},{"type":"category","label":"Type Aliases","items":[{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ErrorWithPayload","label":"ErrorWithPayload"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallHandler","label":"ForeignCallHandler"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallInput","label":"ForeignCallInput"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallOutput","label":"ForeignCallOutput"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/WitnessMap","label":"WitnessMap"}]},{"type":"category","label":"Functions","items":[{"type":"doc","id":"reference/NoirJS/noir_js/functions/and","label":"and"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/blake2s256","label":"blake2s256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify","label":"ecdsa_secp256k1_verify"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify","label":"ecdsa_secp256r1_verify"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/keccak256","label":"keccak256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/sha256","label":"sha256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/xor","label":"xor"}]}]}; +module.exports = typedocSidebar.items; \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/.nojekyll new file mode 100644 index 00000000000..e2ac6616add --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/.nojekyll @@ -0,0 +1 @@ +TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false. \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile.md new file mode 100644 index 00000000000..6faf763b37f --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile.md @@ -0,0 +1,51 @@ +# compile() + +```ts +compile( + fileManager, + projectPath?, + logFn?, +debugLogFn?): Promise +``` + +Compiles a Noir project + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `fileManager` | `FileManager` | The file manager to use | +| `projectPath`? | `string` | The path to the project inside the file manager. Defaults to the root of the file manager | +| `logFn`? | `LogFn` | A logging function. If not provided, console.log will be used | +| `debugLogFn`? | `LogFn` | A debug logging function. If not provided, logFn will be used | + +## Returns + +`Promise`\<[`ProgramCompilationArtifacts`](../index.md#programcompilationartifacts)\> + +## Example + +```typescript +// Node.js + +import { compile_program, createFileManager } from '@noir-lang/noir_wasm'; + +const fm = createFileManager(myProjectPath); +const myCompiledCode = await compile_program(fm); +``` + +```typescript +// Browser + +import { compile_program, createFileManager } from '@noir-lang/noir_wasm'; + +const fm = createFileManager('/'); +for (const path of files) { + await fm.writeFile(path, await getFileAsStream(path)); +} +const myCompiledCode = await compile_program(fm); +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile_contract.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile_contract.md new file mode 100644 index 00000000000..7d0b39a43ef --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/compile_contract.md @@ -0,0 +1,51 @@ +# compile\_contract() + +```ts +compile_contract( + fileManager, + projectPath?, + logFn?, +debugLogFn?): Promise +``` + +Compiles a Noir project + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `fileManager` | `FileManager` | The file manager to use | +| `projectPath`? | `string` | The path to the project inside the file manager. Defaults to the root of the file manager | +| `logFn`? | `LogFn` | A logging function. If not provided, console.log will be used | +| `debugLogFn`? | `LogFn` | A debug logging function. If not provided, logFn will be used | + +## Returns + +`Promise`\<[`ContractCompilationArtifacts`](../index.md#contractcompilationartifacts)\> + +## Example + +```typescript +// Node.js + +import { compile_contract, createFileManager } from '@noir-lang/noir_wasm'; + +const fm = createFileManager(myProjectPath); +const myCompiledCode = await compile_contract(fm); +``` + +```typescript +// Browser + +import { compile_contract, createFileManager } from '@noir-lang/noir_wasm'; + +const fm = createFileManager('/'); +for (const path of files) { + await fm.writeFile(path, await getFileAsStream(path)); +} +const myCompiledCode = await compile_contract(fm); +``` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/createFileManager.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/createFileManager.md new file mode 100644 index 00000000000..7e65c1d69c7 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/createFileManager.md @@ -0,0 +1,21 @@ +# createFileManager() + +```ts +createFileManager(dataDir): FileManager +``` + +Creates a new FileManager instance based on fs in node and memfs in the browser (via webpack alias) + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `dataDir` | `string` | root of the file system | + +## Returns + +`FileManager` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md new file mode 100644 index 00000000000..fcea9275341 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md @@ -0,0 +1,21 @@ +# inflateDebugSymbols() + +```ts +inflateDebugSymbols(debugSymbols): any +``` + +Decompresses and decodes the debug symbols + +## Parameters + +| Parameter | Type | Description | +| :------ | :------ | :------ | +| `debugSymbols` | `string` | The base64 encoded debug symbols | + +## Returns + +`any` + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/index.md new file mode 100644 index 00000000000..b6e0f9d1bc0 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/index.md @@ -0,0 +1,49 @@ +# noir_wasm + +## Exports + +### Functions + +| Function | Description | +| :------ | :------ | +| [compile](functions/compile.md) | Compiles a Noir project | +| [compile\_contract](functions/compile_contract.md) | Compiles a Noir project | +| [createFileManager](functions/createFileManager.md) | Creates a new FileManager instance based on fs in node and memfs in the browser (via webpack alias) | +| [inflateDebugSymbols](functions/inflateDebugSymbols.md) | Decompresses and decodes the debug symbols | + +## References + +### compile\_program + +Renames and re-exports [compile](functions/compile.md) + +## Interfaces + +### ContractCompilationArtifacts + +The compilation artifacts of a given contract. + +#### Properties + +| Property | Type | Description | +| :------ | :------ | :------ | +| `contract` | `ContractArtifact` | The compiled contract. | +| `warnings` | `unknown`[] | Compilation warnings. | + +*** + +### ProgramCompilationArtifacts + +The compilation artifacts of a given program. + +#### Properties + +| Property | Type | Description | +| :------ | :------ | :------ | +| `name` | `string` | not part of the compilation output, injected later | +| `program` | `ProgramArtifact` | The compiled contract. | +| `warnings` | `unknown`[] | Compilation warnings. | + +*** + +Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/) diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs new file mode 100644 index 00000000000..e0870710349 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs @@ -0,0 +1,4 @@ +// @ts-check +/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ +const typedocSidebar = { items: [{"type":"doc","id":"reference/NoirJS/noir_wasm/index","label":"API"},{"type":"category","label":"Functions","items":[{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/compile","label":"compile"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/compile_contract","label":"compile_contract"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/createFileManager","label":"createFileManager"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/inflateDebugSymbols","label":"inflateDebugSymbols"}]}]}; +module.exports = typedocSidebar.items; \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/_category_.json new file mode 100644 index 00000000000..5b6a20a609a --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 4, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/_category_.json new file mode 100644 index 00000000000..27869205ad3 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "Debugger", + "position": 1, + "collapsible": true, + "collapsed": true +} diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_known_limitations.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_known_limitations.md new file mode 100644 index 00000000000..936d416ac4b --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_known_limitations.md @@ -0,0 +1,59 @@ +--- +title: Known limitations +description: + An overview of known limitations of the current version of the Noir debugger +keywords: + [ + Nargo, + Noir Debugger, + VS Code, + ] +sidebar_position: 2 +--- + +# Debugger Known Limitations + +There are currently some limits to what the debugger can observe. + +## Mutable references + +The debugger is currently blind to any state mutated via a mutable reference. For example, in: + +``` +let mut x = 1; +let y = &mut x; +*y = 2; +``` + +The update on `x` will not be observed by the debugger. That means, when running `vars` from the debugger REPL, or inspecting the _local variables_ pane in the VS Code debugger, `x` will appear with value 1 despite having executed `*y = 2;`. + +## Variables of type function or mutable references are opaque + +When inspecting variables, any variable of type `Function` or `MutableReference` will render its value as `<>` or `<>`. + +## Debugger instrumentation affects resulting ACIR + +In order to make the state of local variables observable, the debugger compiles Noir circuits interleaving foreign calls that track any mutations to them. While this works (except in the cases described above) and doesn't introduce any behavior changes, it does as a side effect produce bigger bytecode. In particular, when running the command `opcodes` on the REPL debugger, you will notice Unconstrained VM blocks that look like this: + +``` +... +5 BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [], q_c: 2 }), Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(2))], q_c: 0 })] + | outputs=[] + 5.0 | Mov { destination: RegisterIndex(2), source: RegisterIndex(0) } + 5.1 | Mov { destination: RegisterIndex(3), source: RegisterIndex(1) } + 5.2 | Const { destination: RegisterIndex(0), value: Value { inner: 0 } } + 5.3 | Const { destination: RegisterIndex(1), value: Value { inner: 0 } } + 5.4 | Mov { destination: RegisterIndex(2), source: RegisterIndex(2) } + 5.5 | Mov { destination: RegisterIndex(3), source: RegisterIndex(3) } + 5.6 | Call { location: 8 } + 5.7 | Stop + 5.8 | ForeignCall { function: "__debug_var_assign", destinations: [], inputs: [RegisterIndex(RegisterIndex(2)), RegisterIndex(RegisterIndex(3))] } +... +``` + +If you are interested in debugging/inspecting compiled ACIR without these synthetic changes, you can invoke the REPL debugger with the `--skip-instrumentation` flag or launch the VS Code debugger with the `skipConfiguration` property set to true in its launch configuration. You can find more details about those in the [Debugger REPL reference](debugger_repl.md) and the [VS Code Debugger reference](debugger_vscode.md). + +:::note +Skipping debugger instrumentation means you won't be able to inspect values of local variables. +::: + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_repl.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_repl.md new file mode 100644 index 00000000000..46e2011304e --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_repl.md @@ -0,0 +1,360 @@ +--- +title: REPL Debugger +description: + Noir Debugger REPL options and commands. +keywords: + [ + Nargo, + Noir CLI, + Noir Debugger, + REPL, + ] +sidebar_position: 1 +--- + +## Running the REPL debugger + +`nargo debug [OPTIONS] [WITNESS_NAME]` + +Runs the Noir REPL debugger. If a `WITNESS_NAME` is provided the debugger writes the resulting execution witness to a `WITNESS_NAME` file. + +### Options + +| Option | Description | +| --------------------- | ------------------------------------------------------------ | +| `-p, --prover-name ` | The name of the toml file which contains the inputs for the prover [default: Prover]| +| `--package ` | The name of the package to debug | +| `--print-acir` | Display the ACIR for compiled circuit | +| `--deny-warnings` | Treat all warnings as errors | +| `--silence-warnings` | Suppress warnings | +| `-h, --help` | Print help | + +None of these options are required. + +:::note +Since the debugger starts by compiling the target package, all Noir compiler options are also available. Check out the [compiler reference](../nargo_commands.md#nargo-compile) to learn more about the compiler options. +::: + +## REPL commands + +Once the debugger is running, it accepts the following commands. + +#### `help` (h) + +Displays the menu of available commands. + +``` +> help +Available commands: + + opcodes display ACIR opcodes + into step into to the next opcode + next step until a new source location is reached + out step until a new source location is reached + and the current stack frame is finished + break LOCATION:OpcodeLocation add a breakpoint at an opcode location + over step until a new source location is reached + without diving into function calls + restart restart the debugging session + delete LOCATION:OpcodeLocation delete breakpoint at an opcode location + witness show witness map + witness index:u32 display a single witness from the witness map + witness index:u32 value:String update a witness with the given value + memset index:usize value:String update a memory cell with the given + value + continue continue execution until the end of the + program + vars show variable values available at this point + in execution + stacktrace display the current stack trace + memory show memory (valid when executing unconstrained code) value + step step to the next ACIR opcode + +Other commands: + + help Show this help message + quit Quit repl + +``` + +### Stepping through programs + +#### `next` (n) + +Step until the next Noir source code location. While other commands, such as [`into`](#into-i) and [`step`](#step-s), allow for finer grained control of the program's execution at the opcode level, `next` is source code centric. For example: + +``` +3 ... +4 fn main(x: u32) { +5 assert(entry_point(x) == 2); +6 swap_entry_point(x, x + 1); +7 -> assert(deep_entry_point(x) == 4); +8 multiple_values_entry_point(x); +9 } +``` + + +Using `next` here would cause the debugger to jump to the definition of `deep_entry_point` (if available). + +If you want to step over `deep_entry_point` and go straight to line 8, use [the `over` command](#over) instead. + +#### `over` + +Step until the next source code location, without diving into function calls. For example: + +``` +3 ... +4 fn main(x: u32) { +5 assert(entry_point(x) == 2); +6 swap_entry_point(x, x + 1); +7 -> assert(deep_entry_point(x) == 4); +8 multiple_values_entry_point(x); +9 } +``` + + +Using `over` here would cause the debugger to execute until line 8 (`multiple_values_entry_point(x);`). + +If you want to step into `deep_entry_point` instead, use [the `next` command](#next-n). + +#### `out` + +Step until the end of the current function call. For example: + +``` + 3 ... + 4 fn main(x: u32) { + 5 assert(entry_point(x) == 2); + 6 swap_entry_point(x, x + 1); + 7 -> assert(deep_entry_point(x) == 4); + 8 multiple_values_entry_point(x); + 9 } + 10 + 11 unconstrained fn returns_multiple_values(x: u32) -> (u32, u32, u32, u32) { + 12 ... + ... + 55 + 56 unconstrained fn deep_entry_point(x: u32) -> u32 { + 57 -> level_1(x + 1) + 58 } + +``` + +Running `out` here will resume execution until line 8. + +#### `step` (s) + +Skips to the next ACIR code. A compiled Noir program is a sequence of ACIR opcodes. However, an unconstrained VM opcode denotes the start of an unconstrained code block, to be executed by the unconstrained VM. For example (redacted for brevity): + +``` +0 BLACKBOX::RANGE [(_0, num_bits: 32)] [ ] +1 -> BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))] + 1.0 | Mov { destination: RegisterIndex(2), source: RegisterIndex(0) } + 1.1 | Const { destination: RegisterIndex(0), value: Value { inner: 0 } } + 1.2 | Const { destination: RegisterIndex(1), value: Value { inner: 0 } } + 1.3 | Mov { destination: RegisterIndex(2), source: RegisterIndex(2) } + 1.4 | Call { location: 7 } + ... + 1.43 | Return +2 EXPR [ (1, _1) -2 ] +``` + +The `->` here shows the debugger paused at an ACIR opcode: `BRILLIG`, at index 1, which denotes an unconstrained code block is about to start. + +Using the `step` command at this point would result in the debugger stopping at ACIR opcode 2, `EXPR`, skipping unconstrained computation steps. + +Use [the `into` command](#into-i) instead if you want to follow unconstrained computation step by step. + +#### `into` (i) + +Steps into the next opcode. A compiled Noir program is a sequence of ACIR opcodes. However, a BRILLIG opcode denotes the start of an unconstrained code block, to be executed by the unconstrained VM. For example (redacted for brevity): + +``` +0 BLACKBOX::RANGE [(_0, num_bits: 32)] [ ] +1 -> BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))] + 1.0 | Mov { destination: RegisterIndex(2), source: RegisterIndex(0) } + 1.1 | Const { destination: RegisterIndex(0), value: Value { inner: 0 } } + 1.2 | Const { destination: RegisterIndex(1), value: Value { inner: 0 } } + 1.3 | Mov { destination: RegisterIndex(2), source: RegisterIndex(2) } + 1.4 | Call { location: 7 } + ... + 1.43 | Return +2 EXPR [ (1, _1) -2 ] +``` + +The `->` here shows the debugger paused at an ACIR opcode: `BRILLIG`, at index 1, which denotes an unconstrained code block is about to start. + +Using the `into` command at this point would result in the debugger stopping at opcode 1.0, `Mov ...`, allowing the debugger user to follow unconstrained computation step by step. + +Use [the `step` command](#step-s) instead if you want to skip to the next ACIR code directly. + +#### `continue` (c) + +Continues execution until the next breakpoint, or the end of the program. + +#### `restart` (res) + +Interrupts execution, and restarts a new debugging session from scratch. + +#### `opcodes` (o) + +Display the program's ACIR opcode sequence. For example: + +``` +0 BLACKBOX::RANGE [(_0, num_bits: 32)] [ ] +1 -> BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))] + 1.0 | Mov { destination: RegisterIndex(2), source: RegisterIndex(0) } + 1.1 | Const { destination: RegisterIndex(0), value: Value { inner: 0 } } + 1.2 | Const { destination: RegisterIndex(1), value: Value { inner: 0 } } + 1.3 | Mov { destination: RegisterIndex(2), source: RegisterIndex(2) } + 1.4 | Call { location: 7 } + ... + 1.43 | Return +2 EXPR [ (1, _1) -2 ] +``` + +### Breakpoints + +#### `break [Opcode]` (or shorthand `b [Opcode]`) + +Sets a breakpoint on the specified opcode index. To get a list of the program opcode numbers, see [the `opcode` command](#opcodes-o). For example: + +``` +0 BLACKBOX::RANGE [(_0, num_bits: 32)] [ ] +1 -> BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))] + 1.0 | Mov { destination: RegisterIndex(2), source: RegisterIndex(0) } + 1.1 | Const { destination: RegisterIndex(0), value: Value { inner: 0 } } + 1.2 | Const { destination: RegisterIndex(1), value: Value { inner: 0 } } + 1.3 | Mov { destination: RegisterIndex(2), source: RegisterIndex(2) } + 1.4 | Call { location: 7 } + ... + 1.43 | Return +2 EXPR [ (1, _1) -2 ] +``` + +In this example, issuing a `break 1.2` command adds break on opcode 1.2, as denoted by the `*` character: + +``` +0 BLACKBOX::RANGE [(_0, num_bits: 32)] [ ] +1 -> BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))] + 1.0 | Mov { destination: RegisterIndex(2), source: RegisterIndex(0) } + 1.1 | Const { destination: RegisterIndex(0), value: Value { inner: 0 } } + 1.2 | * Const { destination: RegisterIndex(1), value: Value { inner: 0 } } + 1.3 | Mov { destination: RegisterIndex(2), source: RegisterIndex(2) } + 1.4 | Call { location: 7 } + ... + 1.43 | Return +2 EXPR [ (1, _1) -2 ] +``` + +Running [the `continue` command](#continue-c) at this point would cause the debugger to execute the program until opcode 1.2. + +#### `delete [Opcode]` (or shorthand `d [Opcode]`) + +Deletes a breakpoint at an opcode location. Usage is analogous to [the `break` command](#). + +### Variable inspection + +#### vars + +Show variable values available at this point in execution. + +:::note +The ability to inspect variable values from the debugger depends on compilation to be run in a special debug instrumentation mode. This instrumentation weaves variable tracing code with the original source code. + +So variable value inspection comes at the expense of making the resulting ACIR bytecode bigger and harder to understand and optimize. + +If you find this compromise unacceptable, you can run the debugger with the flag `--skip-debug-instrumentation`. This will compile your circuit without any additional debug information, so the resulting ACIR bytecode will be identical to the one produced by standard Noir compilation. However, if you opt for this, the `vars` command will not be available while debugging. +::: + + +### Stacktrace + +#### `stacktrace` + +Displays the current stack trace. + + +### Witness map + +#### `witness` (w) + +Show witness map. For example: + +``` +_0 = 0 +_1 = 2 +_2 = 1 +``` + +#### `witness [Witness Index]` + +Display a single witness from the witness map. For example: + +``` +> witness 1 +_1 = 2 +``` + +#### `witness [Witness Index] [New value]` + +Overwrite the given index with a new value. For example: + +``` +> witness 1 3 +_1 = 3 +``` + + +### Unconstrained VM memory + +#### `memory` + +Show unconstrained VM memory state. For example: + +``` +> memory +At opcode 1.13: Store { destination_pointer: RegisterIndex(0), source: RegisterIndex(3) } +... +> registers +0 = 0 +1 = 10 +2 = 0 +3 = 1 +4 = 1 +5 = 2³² +6 = 1 +> into +At opcode 1.14: Const { destination: RegisterIndex(5), value: Value { inner: 1 } } +... +> memory +0 = 1 +> +``` + +In the example above: we start with clean memory, then step through a `Store` opcode which stores the value of register 3 (1) into the memory address stored in register 0 (0). Thus now `memory` shows memory address 0 contains value 1. + +:::note +This command is only functional while the debugger is executing unconstrained code. +::: + +#### `memset [Memory address] [New value]` + +Update a memory cell with the given value. For example: + +``` +> memory +0 = 1 +> memset 0 2 +> memory +0 = 2 +> memset 1 4 +> memory +0 = 2 +1 = 4 +> +``` + +:::note +This command is only functional while the debugger is executing unconstrained code. +::: \ No newline at end of file diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_vscode.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_vscode.md new file mode 100644 index 00000000000..c027332b3b0 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/debugger/debugger_vscode.md @@ -0,0 +1,82 @@ +--- +title: VS Code Debugger +description: + VS Code Debugger configuration and features. +keywords: + [ + Nargo, + Noir CLI, + Noir Debugger, + VS Code, + IDE, + ] +sidebar_position: 0 +--- + +# VS Code Noir Debugger Reference + +The Noir debugger enabled by the vscode-noir extension ships with default settings such that the most common scenario should run without any additional configuration steps. + +These defaults can nevertheless be overridden by defining a launch configuration file. This page provides a reference for the properties you can override via a launch configuration file, as well as documenting the Nargo `dap` command, which is a dependency of the VS Code Noir debugger. + + +## Creating and editing launch configuration files + +To create a launch configuration file from VS Code, open the _debug pane_, and click on _create a launch.json file_. + +![Creating a launch configuration file](@site/static/img/debugger/ref1-create-launch.png) + +A `launch.json` file will be created, populated with basic defaults. + +### Noir Debugger launch.json properties + +#### projectFolder + +_String, optional._ + +Absolute path to the Nargo project to debug. By default, it is dynamically determined by looking for the nearest `Nargo.toml` file to the active file at the moment of launching the debugger. + +#### proverName + +_String, optional._ + +Name of the prover input to use. Defaults to `Prover`, which looks for a file named `Prover.toml` at the `projectFolder`. + +#### generateAcir + +_Boolean, optional._ + +If true, generate ACIR opcodes instead of unconstrained opcodes which will be closer to release binaries but less convenient for debugging. Defaults to `false`. + +#### skipInstrumentation + +_Boolean, optional._ + +Skips variables debugging instrumentation of code, making debugging less convenient but the resulting binary smaller and closer to production. Defaults to `false`. + +:::note +Skipping instrumentation causes the debugger to be unable to inspect local variables. +::: + +## `nargo dap [OPTIONS]` + +When run without any option flags, it starts the Nargo Debug Adapter Protocol server, which acts as the debugging backend for the VS Code Noir Debugger. + +All option flags are related to preflight checks. The Debug Adapter Protocol specifies how errors are to be informed from a running DAP server, but it doesn't specify mechanisms to communicate server initialization errors between the DAP server and its client IDE. + +Thus `nargo dap` ships with a _preflight check_ mode. If flag `--preflight-check` and the rest of the `--preflight-*` flags are provided, Nargo will run the same initialization routine except it will not start the DAP server. + +`vscode-noir` will then run `nargo dap` in preflight check mode first before a debugging session starts. If the preflight check ends in error, vscode-noir will present stderr and stdout output from this process through its own Output pane in VS Code. This makes it possible for users to diagnose what pieces of configuration might be wrong or missing in case of initialization errors. + +If the preflight check succeeds, `vscode-noir` proceeds to start the DAP server normally but running `nargo dap` without any additional flags. + +### Options + +| Option | Description | +| --------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | +| `--preflight-check` | If present, dap runs in preflight check mode. | +| `--preflight-project-folder ` | Absolute path to the project to debug for preflight check. | +| `--preflight-prover-name ` | Name of prover file to use for preflight check | +| `--preflight-generate-acir` | Optional. If present, compile in ACIR mode while running preflight check. | +| `--preflight-skip-instrumentation` | Optional. If present, compile without introducing debug instrumentation while running preflight check. | +| `-h, --help` | Print help. | diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/nargo_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/nargo_commands.md new file mode 100644 index 00000000000..519e3dbddc2 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/reference/nargo_commands.md @@ -0,0 +1,397 @@ +--- +title: Nargo +description: + Noir CLI Commands for Noir Prover and Verifier to create, execute, prove and verify programs, + generate Solidity verifier smart contract and compile into JSON file containing ACIR + representation and ABI of circuit. +keywords: + [ + Nargo, + Noir CLI, + Noir Prover, + Noir Verifier, + generate Solidity verifier, + compile JSON file, + ACIR representation, + ABI of circuit, + TypeScript, + ] +sidebar_position: 0 +--- + +# Command-Line Help for `nargo` + +This document contains the help content for the `nargo` command-line program. + +**Command Overview:** + +* [`nargo`↴](#nargo) +* [`nargo backend`↴](#nargo-backend) +* [`nargo backend current`↴](#nargo-backend-current) +* [`nargo backend ls`↴](#nargo-backend-ls) +* [`nargo backend use`↴](#nargo-backend-use) +* [`nargo backend install`↴](#nargo-backend-install) +* [`nargo backend uninstall`↴](#nargo-backend-uninstall) +* [`nargo check`↴](#nargo-check) +* [`nargo fmt`↴](#nargo-fmt) +* [`nargo codegen-verifier`↴](#nargo-codegen-verifier) +* [`nargo compile`↴](#nargo-compile) +* [`nargo new`↴](#nargo-new) +* [`nargo init`↴](#nargo-init) +* [`nargo execute`↴](#nargo-execute) +* [`nargo prove`↴](#nargo-prove) +* [`nargo verify`↴](#nargo-verify) +* [`nargo test`↴](#nargo-test) +* [`nargo info`↴](#nargo-info) +* [`nargo lsp`↴](#nargo-lsp) + +## `nargo` + +Noir's package manager + +**Usage:** `nargo ` + +###### **Subcommands:** + +* `backend` — Install and select custom backends used to generate and verify proofs +* `check` — Checks the constraint system for errors +* `fmt` — Format the Noir files in a workspace +* `codegen-verifier` — Generates a Solidity verifier smart contract for the program +* `compile` — Compile the program and its secret execution trace into ACIR format +* `new` — Create a Noir project in a new directory +* `init` — Create a Noir project in the current directory +* `execute` — Executes a circuit to calculate its return value +* `prove` — Create proof for this program. The proof is returned as a hex encoded string +* `verify` — Given a proof and a program, verify whether the proof is valid +* `test` — Run the tests for this program +* `info` — Provides detailed information on each of a program's function (represented by a single circuit) +* `lsp` — Starts the Noir LSP server + +###### **Options:** + + + + +## `nargo backend` + +Install and select custom backends used to generate and verify proofs + +**Usage:** `nargo backend ` + +###### **Subcommands:** + +* `current` — Prints the name of the currently active backend +* `ls` — Prints the list of currently installed backends +* `use` — Select the backend to use +* `install` — Install a new backend from a URL +* `uninstall` — Uninstalls a backend + + + +## `nargo backend current` + +Prints the name of the currently active backend + +**Usage:** `nargo backend current` + + + +## `nargo backend ls` + +Prints the list of currently installed backends + +**Usage:** `nargo backend ls` + + + +## `nargo backend use` + +Select the backend to use + +**Usage:** `nargo backend use ` + +###### **Arguments:** + +* `` + + + +## `nargo backend install` + +Install a new backend from a URL + +**Usage:** `nargo backend install ` + +###### **Arguments:** + +* `` — The name of the backend to install +* `` — The URL from which to download the backend + + + +## `nargo backend uninstall` + +Uninstalls a backend + +**Usage:** `nargo backend uninstall ` + +###### **Arguments:** + +* `` — The name of the backend to uninstall + + + +## `nargo check` + +Checks the constraint system for errors + +**Usage:** `nargo check [OPTIONS]` + +###### **Options:** + +* `--package ` — The name of the package to check +* `--workspace` — Check all packages in the workspace +* `--overwrite` — Force overwrite of existing files +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings + + + +## `nargo fmt` + +Format the Noir files in a workspace + +**Usage:** `nargo fmt [OPTIONS]` + +###### **Options:** + +* `--check` — Run noirfmt in check mode + + + +## `nargo codegen-verifier` + +Generates a Solidity verifier smart contract for the program + +**Usage:** `nargo codegen-verifier [OPTIONS]` + +###### **Options:** + +* `--package ` — The name of the package to codegen +* `--workspace` — Codegen all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings + + + +## `nargo compile` + +Compile the program and its secret execution trace into ACIR format + +**Usage:** `nargo compile [OPTIONS]` + +###### **Options:** + +* `--package ` — The name of the package to compile +* `--workspace` — Compile all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings + + + +## `nargo new` + +Create a Noir project in a new directory + +**Usage:** `nargo new [OPTIONS] ` + +###### **Arguments:** + +* `` — The path to save the new project + +###### **Options:** + +* `--name ` — Name of the package [default: package directory name] +* `--lib` — Use a library template +* `--bin` — Use a binary template [default] +* `--contract` — Use a contract template + + + +## `nargo init` + +Create a Noir project in the current directory + +**Usage:** `nargo init [OPTIONS]` + +###### **Options:** + +* `--name ` — Name of the package [default: current directory name] +* `--lib` — Use a library template +* `--bin` — Use a binary template [default] +* `--contract` — Use a contract template + + + +## `nargo execute` + +Executes a circuit to calculate its return value + +**Usage:** `nargo execute [OPTIONS] [WITNESS_NAME]` + +###### **Arguments:** + +* `` — Write the execution witness to named file + +###### **Options:** + +* `-p`, `--prover-name ` — The name of the toml file which contains the inputs for the prover + + Default value: `Prover` +* `--package ` — The name of the package to execute +* `--workspace` — Execute all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings +* `--oracle-resolver ` — JSON RPC url to solve oracle calls + + + +## `nargo prove` + +Create proof for this program. The proof is returned as a hex encoded string + +**Usage:** `nargo prove [OPTIONS]` + +###### **Options:** + +* `-p`, `--prover-name ` — The name of the toml file which contains the inputs for the prover + + Default value: `Prover` +* `-v`, `--verifier-name ` — The name of the toml file which contains the inputs for the verifier + + Default value: `Verifier` +* `--verify` — Verify proof after proving +* `--package ` — The name of the package to prove +* `--workspace` — Prove all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings +* `--oracle-resolver ` — JSON RPC url to solve oracle calls + + + +## `nargo verify` + +Given a proof and a program, verify whether the proof is valid + +**Usage:** `nargo verify [OPTIONS]` + +###### **Options:** + +* `-v`, `--verifier-name ` — The name of the toml file which contains the inputs for the verifier + + Default value: `Verifier` +* `--package ` — The name of the package verify +* `--workspace` — Verify all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings + + + +## `nargo test` + +Run the tests for this program + +**Usage:** `nargo test [OPTIONS] [TEST_NAME]` + +###### **Arguments:** + +* `` — If given, only tests with names containing this string will be run + +###### **Options:** + +* `--show-output` — Display output of `println` statements +* `--exact` — Only run tests that match exactly +* `--package ` — The name of the package to test +* `--workspace` — Test all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings +* `--oracle-resolver ` — JSON RPC url to solve oracle calls + + + +## `nargo info` + +Provides detailed information on each of a program's function (represented by a single circuit) + +Current information provided per circuit: 1. The number of ACIR opcodes 2. Counts the final number gates in the circuit used by a backend + +**Usage:** `nargo info [OPTIONS]` + +###### **Options:** + +* `--package ` — The name of the package to detail +* `--workspace` — Detail all packages in the workspace +* `--expression-width ` — Override the expression width requested by the backend + + Default value: `4` +* `--force` — Force a full recompilation +* `--print-acir` — Display the ACIR for compiled circuit +* `--deny-warnings` — Treat all warnings as errors +* `--silence-warnings` — Suppress warnings + + + +## `nargo lsp` + +Starts the Noir LSP server + +Starts an LSP server which allows IDEs such as VS Code to display diagnostics in Noir source. + +VS Code Noir Language Support: https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir + +**Usage:** `nargo lsp` + + + +
+ + + This document was generated automatically by + clap-markdown. + + diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/debugger.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/debugger.md new file mode 100644 index 00000000000..184c436068f --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/debugger.md @@ -0,0 +1,27 @@ +--- +title: Debugger +description: Learn about the Noir Debugger, in its REPL or VS Code versions. +keywords: [Nargo, VSCode, Visual Studio Code, REPL, Debugger] +sidebar_position: 2 +--- + +# Noir Debugger + +There are currently two ways of debugging Noir programs: + +1. From VS Code, via the [vscode-noir](https://github.com/noir-lang/vscode-noir) extension. You can install it via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir). +2. Via the REPL debugger, which ships with Nargo. + +In order to use either version of the debugger, you will need to install recent enough versions of Noir, [Nargo](../getting_started/installation) and vscode-noir: + +- Noir 0.xx +- Nargo 0.xx +- vscode-noir 0.xx + +:::info +At the moment, the debugger supports debugging binary projects, but not contracts. +::: + +We cover the VS Code Noir debugger more in depth in [its VS Code debugger how-to guide](../how_to/debugger/debugging_with_vs_code.md) and [the reference](../reference/debugger/debugger_vscode.md). + +The REPL debugger is discussed at length in [the REPL debugger how-to guide](../how_to/debugger/debugging_with_the_repl.md) and [the reference](../reference/debugger/debugger_repl.md). diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/language_server.md new file mode 100644 index 00000000000..81e0356ef8a --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/language_server.md @@ -0,0 +1,43 @@ +--- +title: Language Server +description: Learn about the Noir Language Server, how to install the components, and configuration that may be required. +keywords: [Nargo, Language Server, LSP, VSCode, Visual Studio Code] +sidebar_position: 0 +--- + +This section helps you install and configure the Noir Language Server. + +The Language Server Protocol (LSP) has two components, the [Server](#language-server) and the [Client](#language-client). Below we describe each in the context of Noir. + +## Language Server + +The Server component is provided by the Nargo command line tool that you installed at the beginning of this guide. +As long as Nargo is installed and you've used it to run other commands in this guide, it should be good to go! + +If you'd like to verify that the `nargo lsp` command is available, you can run `nargo --help` and look for `lsp` in the list of commands. If you see it, you're using a version of Noir with LSP support. + +## Language Client + +The Client component is usually an editor plugin that launches the Server. It communicates LSP messages between the editor and the Server. For example, when you save a file, the Client will alert the Server, so it can try to compile the project and report any errors. + +Currently, Noir provides a Language Client for Visual Studio Code via the [vscode-noir](https://github.com/noir-lang/vscode-noir) extension. You can install it via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir). + +> **Note:** Noir's Language Server Protocol support currently assumes users' VSCode workspace root to be the same as users' Noir project root (i.e. where Nargo.toml lies). +> +> If LSP features seem to be missing / malfunctioning, make sure you are opening your Noir project directly (instead of as a sub-folder) in your VSCode instance. + +When your language server is running correctly and the VSCode plugin is installed, you should see handy codelens buttons for compilation, measuring circuit size, execution, and tests: + +![Compile and Execute](@site/static/img/codelens_compile_execute.png) +![Run test](@site/static/img/codelens_run_test.png) + +You should also see your tests in the `testing` panel: + +![Testing panel](@site/static/img/codelens_testing_panel.png) + +### Configuration + +- **Noir: Enable LSP** - If checked, the extension will launch the Language Server via `nargo lsp` and communicate with it. +- **Noir: Nargo Flags** - Additional flags may be specified if you require them to be added when the extension calls `nargo lsp`. +- **Noir: Nargo Path** - An absolute path to a Nargo binary with the `lsp` command. This may be useful if Nargo is not within the `PATH` of your editor. +- **Noir > Trace: Server** - Setting this to `"messages"` or `"verbose"` will log LSP messages between the Client and Server. Useful for debugging. diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/testing.md new file mode 100644 index 00000000000..d3e0c522473 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tooling/testing.md @@ -0,0 +1,62 @@ +--- +title: Testing in Noir +description: Learn how to use Nargo to test your Noir program in a quick and easy way +keywords: [Nargo, testing, Noir, compile, test] +sidebar_position: 1 +--- + +You can test your Noir programs using Noir circuits. + +Nargo will automatically compile and run any functions which have the decorator `#[test]` on them if +you run `nargo test`. + +For example if you have a program like: + +```rust +fn add(x: u64, y: u64) -> u64 { + x + y +} +#[test] +fn test_add() { + assert(add(2,2) == 4); + assert(add(0,1) == 1); + assert(add(1,0) == 1); +} +``` + +Running `nargo test` will test that the `test_add` function can be executed while satisfying all +the constraints which allows you to test that add returns the expected values. Test functions can't +have any arguments currently. + +### Test fail + +You can write tests that are expected to fail by using the decorator `#[test(should_fail)]`. For example: + +```rust +fn add(x: u64, y: u64) -> u64 { + x + y +} +#[test(should_fail)] +fn test_add() { + assert(add(2,2) == 5); +} +``` + +You can be more specific and make it fail with a specific reason by using `should_fail_with = "`: + +```rust +fn main(african_swallow_avg_speed : Field) { + assert(african_swallow_avg_speed == 65, "What is the airspeed velocity of an unladen swallow"); +} + +#[test] +fn test_king_arthur() { + main(65); +} + +#[test(should_fail_with = "What is the airspeed velocity of an unladen swallow")] +fn test_bridgekeeper() { + main(32); +} + +``` diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tutorials/noirjs_app.md new file mode 100644 index 00000000000..3dd9fe7d2b0 --- /dev/null +++ b/noir/noir-repo/docs/versioned_docs/version-v0.30.0/tutorials/noirjs_app.md @@ -0,0 +1,326 @@ +--- +title: Building a web app with NoirJS +description: Learn how to setup a new app that uses Noir to generate and verify zero-knowledge SNARK proofs in a typescript or javascript environment. +keywords: [how to, guide, javascript, typescript, noir, barretenberg, zero-knowledge, proofs, app] +sidebar_position: 0 +pagination_next: noir/concepts/data_types/index +--- + +NoirJS is a set of packages meant to work both in a browser and a server environment. In this tutorial, we will build a simple web app using them. From here, you should get an idea on how to proceed with your own Noir projects! + +You can find the complete app code for this guide [here](https://github.com/noir-lang/tiny-noirjs-app). + +## Setup + +:::note + +Feel free to use whatever versions, just keep in mind that Nargo and the NoirJS packages are meant to be in sync. For example, Nargo 0.27.x matches `noir_js@0.27.x`, etc. + +In this guide, we will be pinned to 0.27.0. + +::: + +Before we start, we want to make sure we have Node and Nargo installed. + +We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script). + +As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`: + +```sh +curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash +``` + +Easy enough. Onwards! + +## Our project + +ZK is a powerful technology. An app that doesn't reveal one of the inputs to _anyone_ is almost unbelievable, yet Noir makes it as easy as a single line of code. + +In fact, it's so simple that it comes nicely packaged in `nargo`. Let's do that! + +### Nargo + +Run: + +`nargo new circuit` + +And... That's about it. Your program is ready to be compiled and run. + +To compile, let's `cd` into the `circuit` folder to enter our project, and call: + +`nargo compile` + +This compiles our circuit into `json` format and add it to a new `target` folder. + +:::info + +At this point in the tutorial, your folder structure should look like this: + +```tree +. +└── circuit <---- our working directory + ├── Nargo.toml + ├── src + │ └── main.nr + └── target + └── circuit.json +``` + +::: + +### Node and Vite + +If you want to explore Nargo, feel free to go on a side-quest now and follow the steps in the +[getting started](../getting_started/hello_noir/index.md) guide. However, we want our app to run on the browser, so we need Vite. + +Vite is a powerful tool to generate static websites. While it provides all kinds of features, let's just go barebones with some good old vanilla JS. + +To do this this, go back to the previous folder (`cd ..`) and create a new vite project by running `npm create vite` and choosing "Vanilla" and "Javascript". + +A wild `vite-project` directory should now appear in your root folder! Let's not waste any time and dive right in: + +```bash +cd vite-project +``` + +### Setting Up Vite and Configuring the Project + +Before we proceed with any coding, let's get our environment tailored for Noir. We'll start by laying down the foundations with a `vite.config.js` file. This little piece of configuration is our secret sauce for making sure everything meshes well with the NoirJS libraries and other special setups we might need, like handling WebAssembly modules. Here’s how you get that going: + +#### Creating the vite.config.js + +In your freshly minted `vite-project` folder, create a new file named `vite.config.js` and open it in your code editor. Paste the following to set the stage: + +```javascript +import { defineConfig } from "vite"; +import copy from "rollup-plugin-copy"; + +export default defineConfig({ + esbuild: { + target: "esnext", + }, + optimizeDeps: { + esbuildOptions: { + target: "esnext", + }, + }, + plugins: [ + copy({ + targets: [ + { src: "node_modules/**/*.wasm", dest: "node_modules/.vite/dist" }, + ], + copySync: true, + hook: "buildStart", + }), + ], + server: { + port: 3000, + }, +}); +``` + +#### Install Dependencies + +Now that our stage is set, install the necessary NoirJS packages along with our other dependencies: + +```bash +npm install && npm install @noir-lang/backend_barretenberg@0.27.0 @noir-lang/noir_js@0.27.0 +npm install rollup-plugin-copy --save-dev +``` + +:::info + +At this point in the tutorial, your folder structure should look like this: + +```tree +. +└── circuit + └── ...etc... +└── vite-project <---- our working directory + └── ...etc... +``` + +::: + +#### Some cleanup + +`npx create vite` is amazing but it creates a bunch of files we don't really need for our simple example. Actually, let's just delete everything except for `vite.config.js`, `index.html`, `main.js` and `package.json`. I feel lighter already. + +![my heart is ready for you, noir.js](@site/static/img/memes/titanic.jpeg) + +## HTML + +Our app won't run like this, of course. We need some working HTML, at least. Let's open our broken-hearted `index.html` and replace everything with this code snippet: + +```html + + + + + + +

Noir app

+
+ + +
+
+

Logs

+

Proof

+
+ + +``` + +It _could_ be a beautiful UI... Depending on which universe you live in. + +## Some good old vanilla Javascript + +Our love for Noir needs undivided attention, so let's just open `main.js` and delete everything (this is where the romantic scenery becomes a bit creepy). + +Start by pasting in this boilerplate code: + +```js +const setup = async () => { + await Promise.all([ + import('@noir-lang/noirc_abi').then((module) => + module.default(new URL('@noir-lang/noirc_abi/web/noirc_abi_wasm_bg.wasm', import.meta.url).toString()), + ), + import('@noir-lang/acvm_js').then((module) => + module.default(new URL('@noir-lang/acvm_js/web/acvm_js_bg.wasm', import.meta.url).toString()), + ), + ]); +}; + +function display(container, msg) { + const c = document.getElementById(container); + const p = document.createElement('p'); + p.textContent = msg; + c.appendChild(p); +} + +document.getElementById('submitGuess').addEventListener('click', async () => { + try { + // here's where love happens + } catch (err) { + display('logs', 'Oh 💔 Wrong guess'); + } +}); +``` + +The display function doesn't do much. We're simply manipulating our website to see stuff happening. For example, if the proof fails, it will simply log a broken heart 😢 + +As for the `setup` function, it's just a sad reminder that dealing with `wasm` on the browser is not as easy as it should. Just copy, paste, and forget. + +:::info + +At this point in the tutorial, your folder structure should look like this: + +```tree +. +└── circuit + └── ...same as above +└── vite-project + ├── vite.config.js + ├── main.js + ├── package.json + └── index.html +``` + +You'll see other files and folders showing up (like `package-lock.json`, `node_modules`) but you shouldn't have to care about those. + +::: + +## Some NoirJS + +We're starting with the good stuff now. If you've compiled the circuit as described above, you should have a `json` file we want to import at the very top of our `main.js` file: + +```ts +import circuit from '../circuit/target/circuit.json'; +``` + +[Noir is backend-agnostic](../index.mdx#whats-new-about-noir). We write Noir, but we also need a proving backend. That's why we need to import and instantiate the two dependencies we installed above: `BarretenbergBackend` and `Noir`. Let's import them right below: + +```js +import { BarretenbergBackend, BarretenbergVerifier as Verifier } from '@noir-lang/backend_barretenberg'; +import { Noir } from '@noir-lang/noir_js'; +``` + +And instantiate them inside our try-catch block: + +```ts +// try { +const backend = new BarretenbergBackend(circuit); +const noir = new Noir(circuit, backend); +// } +``` + +:::note + +For the remainder of the tutorial, everything will be happening inside the `try` block + +::: + +## Our app + +Now for the app itself. We're capturing whatever is in the input when people press the submit button. Just add this: + +```js +const x = parseInt(document.getElementById('guessInput').value); +const input = { x, y: 2 }; +``` + +Now we're ready to prove stuff! Let's feed some inputs to our circuit and calculate the proof: + +```js +await setup(); // let's squeeze our wasm inits here + +display('logs', 'Generating proof... ⌛'); +const proof = await noir.generateProof(input); +display('logs', 'Generating proof... ✅'); +display('results', proof.proof); +``` + +You're probably eager to see stuff happening, so go and run your app now! + +From your terminal, run `npm run dev`. If it doesn't open a browser for you, just visit `localhost:5173`. You should now see the worst UI ever, with an ugly input. + +![Getting Started 0](@site/static/img/noir_getting_started_1.png) + +Now, our circuit says `fn main(x: Field, y: pub Field)`. This means only the `y` value is public, and it's hardcoded above: `input = { x, y: 2 }`. In other words, you won't need to send your secret`x` to the verifier! + +By inputting any number other than 2 in the input box and clicking "submit", you should get a valid proof. Otherwise the proof won't even generate correctly. By the way, if you're human, you shouldn't be able to understand anything on the "proof" box. That's OK. We like you, human ❤️. + +## Verifying + +Time to celebrate, yes! But we shouldn't trust machines so blindly. Let's add these lines to see our proof being verified: + +```js +display('logs', 'Verifying proof... ⌛'); +const verificationKey = await backend.getVerificationKey(); +const verifier = new Verifier(); +const isValid = await verifier.verifyProof(proof, verificationKey); +if (isValid) display('logs', 'Verifying proof... ✅'); +``` + +You have successfully generated a client-side Noir web app! + +![coded app without math knowledge](@site/static/img/memes/flextape.jpeg) + +## Further Reading + +You can see how noirjs is used in a full stack Next.js hardhat application in the [noir-starter repo here](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat). The example shows how to calculate a proof in the browser and verify it with a deployed Solidity verifier contract from noirjs. + +You should also check out the more advanced examples in the [noir-examples repo](https://github.com/noir-lang/noir-examples), where you'll find reference usage for some cool apps. diff --git a/noir/noir-repo/docs/versioned_sidebars/version-v0.30.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.30.0-sidebars.json new file mode 100644 index 00000000000..b9ad026f69f --- /dev/null +++ b/noir/noir-repo/docs/versioned_sidebars/version-v0.30.0-sidebars.json @@ -0,0 +1,93 @@ +{ + "sidebar": [ + { + "type": "doc", + "id": "index" + }, + { + "type": "category", + "label": "Getting Started", + "items": [ + { + "type": "autogenerated", + "dirName": "getting_started" + } + ] + }, + { + "type": "category", + "label": "The Noir Language", + "items": [ + { + "type": "autogenerated", + "dirName": "noir" + } + ] + }, + { + "type": "html", + "value": "
", + "defaultStyle": true + }, + { + "type": "category", + "label": "How To Guides", + "items": [ + { + "type": "autogenerated", + "dirName": "how_to" + } + ] + }, + { + "type": "category", + "label": "Explainers", + "items": [ + { + "type": "autogenerated", + "dirName": "explainers" + } + ] + }, + { + "type": "category", + "label": "Tutorials", + "items": [ + { + "type": "autogenerated", + "dirName": "tutorials" + } + ] + }, + { + "type": "category", + "label": "Reference", + "items": [ + { + "type": "autogenerated", + "dirName": "reference" + } + ] + }, + { + "type": "category", + "label": "Tooling", + "items": [ + { + "type": "autogenerated", + "dirName": "tooling" + } + ] + }, + { + "type": "html", + "value": "
", + "defaultStyle": true + }, + { + "type": "doc", + "id": "migration_notes", + "label": "Migration notes" + } + ] +} diff --git a/noir/noir-repo/noir_stdlib/src/aes128.nr b/noir/noir-repo/noir_stdlib/src/aes128.nr index ac5c2b48ad8..e6e2a5e4997 100644 --- a/noir/noir-repo/noir_stdlib/src/aes128.nr +++ b/noir/noir-repo/noir_stdlib/src/aes128.nr @@ -1,4 +1,3 @@ - #[foreign(aes128_encrypt)] // docs:start:aes128 pub fn aes128_encrypt(input: [u8; N], iv: [u8; 16], key: [u8; 16]) -> [u8] {} diff --git a/noir/noir-repo/noir_stdlib/src/embedded_curve_ops.nr b/noir/noir-repo/noir_stdlib/src/embedded_curve_ops.nr index 6a1f17dae98..21d658db615 100644 --- a/noir/noir-repo/noir_stdlib/src/embedded_curve_ops.nr +++ b/noir/noir-repo/noir_stdlib/src/embedded_curve_ops.nr @@ -1,4 +1,4 @@ -use crate::ops::{Add, Sub, Neg}; +use crate::ops::arith::{Add, Sub, Neg}; // TODO(https://github.com/noir-lang/noir/issues/4931) struct EmbeddedCurvePoint { @@ -76,7 +76,4 @@ fn embedded_curve_add( } #[foreign(embedded_curve_add)] -fn embedded_curve_add_array_return( - _point1: EmbeddedCurvePoint, - _point2: EmbeddedCurvePoint -) -> [Field; 2] {} +fn embedded_curve_add_array_return(_point1: EmbeddedCurvePoint, _point2: EmbeddedCurvePoint) -> [Field; 2] {} diff --git a/noir/noir-repo/noir_stdlib/src/lib.nr b/noir/noir-repo/noir_stdlib/src/lib.nr index 33504be0b9a..f11b21003ad 100644 --- a/noir/noir-repo/noir_stdlib/src/lib.nr +++ b/noir/noir-repo/noir_stdlib/src/lib.nr @@ -67,3 +67,6 @@ pub fn wrapping_sub(x: T, y: T) -> T { pub fn wrapping_mul(x: T, y: T) -> T { crate::from_field(crate::as_field(x) * crate::as_field(y)) } + +#[builtin(as_witness)] +pub fn as_witness(x: Field) {} diff --git a/noir/noir-repo/noir_stdlib/src/ops.nr b/noir/noir-repo/noir_stdlib/src/ops.nr index e0814267aea..8b1903cff0b 100644 --- a/noir/noir-repo/noir_stdlib/src/ops.nr +++ b/noir/noir-repo/noir_stdlib/src/ops.nr @@ -1,170 +1,5 @@ -// docs:start:add-trait -trait Add { - fn add(self, other: Self) -> Self; -} -// docs:end:add-trait - -impl Add for Field { fn add(self, other: Field) -> Field { self + other } } - -impl Add for u64 { fn add(self, other: u64) -> u64 { self + other } } -impl Add for u32 { fn add(self, other: u32) -> u32 { self + other } } -impl Add for u8 { fn add(self, other: u8) -> u8 { self + other } } - -impl Add for i8 { fn add(self, other: i8) -> i8 { self + other } } -impl Add for i32 { fn add(self, other: i32) -> i32 { self + other } } -impl Add for i64 { fn add(self, other: i64) -> i64 { self + other } } - -// docs:start:sub-trait -trait Sub { - fn sub(self, other: Self) -> Self; -} -// docs:end:sub-trait - -impl Sub for Field { fn sub(self, other: Field) -> Field { self - other } } - -impl Sub for u64 { fn sub(self, other: u64) -> u64 { self - other } } -impl Sub for u32 { fn sub(self, other: u32) -> u32 { self - other } } -impl Sub for u8 { fn sub(self, other: u8) -> u8 { self - other } } - -impl Sub for i8 { fn sub(self, other: i8) -> i8 { self - other } } -impl Sub for i32 { fn sub(self, other: i32) -> i32 { self - other } } -impl Sub for i64 { fn sub(self, other: i64) -> i64 { self - other } } - -// docs:start:mul-trait -trait Mul { - fn mul(self, other: Self) -> Self; -} -// docs:end:mul-trait - -impl Mul for Field { fn mul(self, other: Field) -> Field { self * other } } - -impl Mul for u64 { fn mul(self, other: u64) -> u64 { self * other } } -impl Mul for u32 { fn mul(self, other: u32) -> u32 { self * other } } -impl Mul for u8 { fn mul(self, other: u8) -> u8 { self * other } } - -impl Mul for i8 { fn mul(self, other: i8) -> i8 { self * other } } -impl Mul for i32 { fn mul(self, other: i32) -> i32 { self * other } } -impl Mul for i64 { fn mul(self, other: i64) -> i64 { self * other } } - -// docs:start:div-trait -trait Div { - fn div(self, other: Self) -> Self; -} -// docs:end:div-trait - -impl Div for Field { fn div(self, other: Field) -> Field { self / other } } - -impl Div for u64 { fn div(self, other: u64) -> u64 { self / other } } -impl Div for u32 { fn div(self, other: u32) -> u32 { self / other } } -impl Div for u8 { fn div(self, other: u8) -> u8 { self / other } } - -impl Div for i8 { fn div(self, other: i8) -> i8 { self / other } } -impl Div for i32 { fn div(self, other: i32) -> i32 { self / other } } -impl Div for i64 { fn div(self, other: i64) -> i64 { self / other } } - -// docs:start:rem-trait -trait Rem{ - fn rem(self, other: Self) -> Self; -} -// docs:end:rem-trait - -impl Rem for u64 { fn rem(self, other: u64) -> u64 { self % other } } -impl Rem for u32 { fn rem(self, other: u32) -> u32 { self % other } } -impl Rem for u8 { fn rem(self, other: u8) -> u8 { self % other } } - -impl Rem for i8 { fn rem(self, other: i8) -> i8 { self % other } } -impl Rem for i32 { fn rem(self, other: i32) -> i32 { self % other } } -impl Rem for i64 { fn rem(self, other: i64) -> i64 { self % other } } - -// docs:start:neg-trait -trait Neg { - fn neg(self) -> Self; -} -// docs:end:neg-trait - -// docs:start:neg-trait-impls -impl Neg for Field { fn neg(self) -> Field { -self } } - -impl Neg for i8 { fn neg(self) -> i8 { -self } } -impl Neg for i32 { fn neg(self) -> i32 { -self } } -impl Neg for i64 { fn neg(self) -> i64 { -self } } -// docs:end:neg-trait-impls - -// docs:start:bitor-trait -trait BitOr { - fn bitor(self, other: Self) -> Self; -} -// docs:end:bitor-trait - -impl BitOr for bool { fn bitor(self, other: bool) -> bool { self | other } } - -impl BitOr for u64 { fn bitor(self, other: u64) -> u64 { self | other } } -impl BitOr for u32 { fn bitor(self, other: u32) -> u32 { self | other } } -impl BitOr for u8 { fn bitor(self, other: u8) -> u8 { self | other } } - -impl BitOr for i8 { fn bitor(self, other: i8) -> i8 { self | other } } -impl BitOr for i32 { fn bitor(self, other: i32) -> i32 { self | other } } -impl BitOr for i64 { fn bitor(self, other: i64) -> i64 { self | other } } - -// docs:start:bitand-trait -trait BitAnd { - fn bitand(self, other: Self) -> Self; -} -// docs:end:bitand-trait - -impl BitAnd for bool { fn bitand(self, other: bool) -> bool { self & other } } - -impl BitAnd for u64 { fn bitand(self, other: u64) -> u64 { self & other } } -impl BitAnd for u32 { fn bitand(self, other: u32) -> u32 { self & other } } -impl BitAnd for u8 { fn bitand(self, other: u8) -> u8 { self & other } } - -impl BitAnd for i8 { fn bitand(self, other: i8) -> i8 { self & other } } -impl BitAnd for i32 { fn bitand(self, other: i32) -> i32 { self & other } } -impl BitAnd for i64 { fn bitand(self, other: i64) -> i64 { self & other } } - -// docs:start:bitxor-trait -trait BitXor { - fn bitxor(self, other: Self) -> Self; -} -// docs:end:bitxor-trait - -impl BitXor for bool { fn bitxor(self, other: bool) -> bool { self ^ other } } - -impl BitXor for u64 { fn bitxor(self, other: u64) -> u64 { self ^ other } } -impl BitXor for u32 { fn bitxor(self, other: u32) -> u32 { self ^ other } } -impl BitXor for u8 { fn bitxor(self, other: u8) -> u8 { self ^ other } } - -impl BitXor for i8 { fn bitxor(self, other: i8) -> i8 { self ^ other } } -impl BitXor for i32 { fn bitxor(self, other: i32) -> i32 { self ^ other } } -impl BitXor for i64 { fn bitxor(self, other: i64) -> i64 { self ^ other } } - -// docs:start:shl-trait -trait Shl { - fn shl(self, other: u8) -> Self; -} -// docs:end:shl-trait - -impl Shl for u32 { fn shl(self, other: u8) -> u32 { self << other } } -impl Shl for u64 { fn shl(self, other: u8) -> u64 { self << other } } -impl Shl for u8 { fn shl(self, other: u8) -> u8 { self << other } } -impl Shl for u1 { fn shl(self, other: u8) -> u1 { self << other } } - -impl Shl for i8 { fn shl(self, other: u8) -> i8 { self << other } } -impl Shl for i32 { fn shl(self, other: u8) -> i32 { self << other } } -impl Shl for i64 { fn shl(self, other: u8) -> i64 { self << other } } - -// docs:start:shr-trait -trait Shr { - fn shr(self, other: u8) -> Self; -} -// docs:end:shr-trait - -impl Shr for u64 { fn shr(self, other: u8) -> u64 { self >> other } } -impl Shr for u32 { fn shr(self, other: u8) -> u32 { self >> other } } -impl Shr for u8 { fn shr(self, other: u8) -> u8 { self >> other } } -impl Shr for u1 { fn shr(self, other: u8) -> u1 { self >> other } } - -impl Shr for i8 { fn shr(self, other: u8) -> i8 { self >> other } } -impl Shr for i32 { fn shr(self, other: u8) -> i32 { self >> other } } -impl Shr for i64 { fn shr(self, other: u8) -> i64 { self >> other } } +mod arith; +mod bit; +use arith::{Add, Sub, Mul, Div, Rem, Neg}; +use bit::{Not, BitOr, BitAnd, BitXor, Shl, Shr}; diff --git a/noir/noir-repo/noir_stdlib/src/ops/arith.nr b/noir/noir-repo/noir_stdlib/src/ops/arith.nr new file mode 100644 index 00000000000..df0ff978a7c --- /dev/null +++ b/noir/noir-repo/noir_stdlib/src/ops/arith.nr @@ -0,0 +1,103 @@ +// docs:start:add-trait +trait Add { + fn add(self, other: Self) -> Self; +} +// docs:end:add-trait + +impl Add for Field { fn add(self, other: Field) -> Field { self + other } } + +impl Add for u64 { fn add(self, other: u64) -> u64 { self + other } } +impl Add for u32 { fn add(self, other: u32) -> u32 { self + other } } +impl Add for u16 { fn add(self, other: u16) -> u16 { self + other } } +impl Add for u8 { fn add(self, other: u8) -> u8 { self + other } } + +impl Add for i8 { fn add(self, other: i8) -> i8 { self + other } } +impl Add for i16 { fn add(self, other: i16) -> i16 { self + other } } +impl Add for i32 { fn add(self, other: i32) -> i32 { self + other } } +impl Add for i64 { fn add(self, other: i64) -> i64 { self + other } } + +// docs:start:sub-trait +trait Sub { + fn sub(self, other: Self) -> Self; +} +// docs:end:sub-trait + +impl Sub for Field { fn sub(self, other: Field) -> Field { self - other } } + +impl Sub for u64 { fn sub(self, other: u64) -> u64 { self - other } } +impl Sub for u32 { fn sub(self, other: u32) -> u32 { self - other } } +impl Sub for u16 { fn sub(self, other: u16) -> u16 { self - other } } +impl Sub for u8 { fn sub(self, other: u8) -> u8 { self - other } } + +impl Sub for i8 { fn sub(self, other: i8) -> i8 { self - other } } +impl Sub for i16 { fn sub(self, other: i16) -> i16 { self - other } } +impl Sub for i32 { fn sub(self, other: i32) -> i32 { self - other } } +impl Sub for i64 { fn sub(self, other: i64) -> i64 { self - other } } + +// docs:start:mul-trait +trait Mul { + fn mul(self, other: Self) -> Self; +} +// docs:end:mul-trait + +impl Mul for Field { fn mul(self, other: Field) -> Field { self * other } } + +impl Mul for u64 { fn mul(self, other: u64) -> u64 { self * other } } +impl Mul for u32 { fn mul(self, other: u32) -> u32 { self * other } } +impl Mul for u16 { fn mul(self, other: u16) -> u16 { self * other } } +impl Mul for u8 { fn mul(self, other: u8) -> u8 { self * other } } + +impl Mul for i8 { fn mul(self, other: i8) -> i8 { self * other } } +impl Mul for i16 { fn mul(self, other: i16) -> i16 { self * other } } +impl Mul for i32 { fn mul(self, other: i32) -> i32 { self * other } } +impl Mul for i64 { fn mul(self, other: i64) -> i64 { self * other } } + +// docs:start:div-trait +trait Div { + fn div(self, other: Self) -> Self; +} +// docs:end:div-trait + +impl Div for Field { fn div(self, other: Field) -> Field { self / other } } + +impl Div for u64 { fn div(self, other: u64) -> u64 { self / other } } +impl Div for u32 { fn div(self, other: u32) -> u32 { self / other } } +impl Div for u16 { fn div(self, other: u16) -> u16 { self / other } } +impl Div for u8 { fn div(self, other: u8) -> u8 { self / other } } + +impl Div for i8 { fn div(self, other: i8) -> i8 { self / other } } +impl Div for i16 { fn div(self, other: i16) -> i16 { self / other } } +impl Div for i32 { fn div(self, other: i32) -> i32 { self / other } } +impl Div for i64 { fn div(self, other: i64) -> i64 { self / other } } + +// docs:start:rem-trait +trait Rem{ + fn rem(self, other: Self) -> Self; +} +// docs:end:rem-trait + +impl Rem for u64 { fn rem(self, other: u64) -> u64 { self % other } } +impl Rem for u32 { fn rem(self, other: u32) -> u32 { self % other } } +impl Rem for u16 { fn rem(self, other: u16) -> u16 { self % other } } +impl Rem for u8 { fn rem(self, other: u8) -> u8 { self % other } } + +impl Rem for i8 { fn rem(self, other: i8) -> i8 { self % other } } +impl Rem for i16 { fn rem(self, other: i16) -> i16 { self % other } } +impl Rem for i32 { fn rem(self, other: i32) -> i32 { self % other } } +impl Rem for i64 { fn rem(self, other: i64) -> i64 { self % other } } + +// docs:start:neg-trait +trait Neg { + fn neg(self) -> Self; +} +// docs:end:neg-trait + +// docs:start:neg-trait-impls +impl Neg for Field { fn neg(self) -> Field { -self } } + +impl Neg for i8 { fn neg(self) -> i8 { -self } } +impl Neg for i16 { fn neg(self) -> i16 { -self } } +impl Neg for i32 { fn neg(self) -> i32 { -self } } +impl Neg for i64 { fn neg(self) -> i64 { -self } } +// docs:end:neg-trait-impls + diff --git a/noir/noir-repo/noir_stdlib/src/ops/bit.nr b/noir/noir-repo/noir_stdlib/src/ops/bit.nr new file mode 100644 index 00000000000..a31cfee878c --- /dev/null +++ b/noir/noir-repo/noir_stdlib/src/ops/bit.nr @@ -0,0 +1,109 @@ +// docs:start:not-trait +trait Not { + fn not(self: Self) -> Self; +} +// docs:end:not-trait + +// docs:start:not-trait-impls +impl Not for bool { fn not(self) -> bool { !self } } + +impl Not for u64 { fn not(self) -> u64 { !self } } +impl Not for u32 { fn not(self) -> u32 { !self } } +impl Not for u16 { fn not(self) -> u16 { !self } } +impl Not for u8 { fn not(self) -> u8 { !self } } +impl Not for u1 { fn not(self) -> u1 { !self } } + +impl Not for i8 { fn not(self) -> i8 { !self } } +impl Not for i16 { fn not(self) -> i16 { !self } } +impl Not for i32 { fn not(self) -> i32 { !self } } +impl Not for i64 { fn not(self) -> i64 { !self } } +// docs:end:not-trait-impls + +// docs:start:bitor-trait +trait BitOr { + fn bitor(self, other: Self) -> Self; +} +// docs:end:bitor-trait + +impl BitOr for bool { fn bitor(self, other: bool) -> bool { self | other } } + +impl BitOr for u64 { fn bitor(self, other: u64) -> u64 { self | other } } +impl BitOr for u32 { fn bitor(self, other: u32) -> u32 { self | other } } +impl BitOr for u16 { fn bitor(self, other: u16) -> u16 { self | other } } +impl BitOr for u8 { fn bitor(self, other: u8) -> u8 { self | other } } + +impl BitOr for i8 { fn bitor(self, other: i8) -> i8 { self | other } } +impl BitOr for i16 { fn bitor(self, other: i16) -> i16 { self | other } } +impl BitOr for i32 { fn bitor(self, other: i32) -> i32 { self | other } } +impl BitOr for i64 { fn bitor(self, other: i64) -> i64 { self | other } } + +// docs:start:bitand-trait +trait BitAnd { + fn bitand(self, other: Self) -> Self; +} +// docs:end:bitand-trait + +impl BitAnd for bool { fn bitand(self, other: bool) -> bool { self & other } } + +impl BitAnd for u64 { fn bitand(self, other: u64) -> u64 { self & other } } +impl BitAnd for u32 { fn bitand(self, other: u32) -> u32 { self & other } } +impl BitAnd for u16 { fn bitand(self, other: u16) -> u16 { self & other } } +impl BitAnd for u8 { fn bitand(self, other: u8) -> u8 { self & other } } + +impl BitAnd for i8 { fn bitand(self, other: i8) -> i8 { self & other } } +impl BitAnd for i16 { fn bitand(self, other: i16) -> i16 { self & other } } +impl BitAnd for i32 { fn bitand(self, other: i32) -> i32 { self & other } } +impl BitAnd for i64 { fn bitand(self, other: i64) -> i64 { self & other } } + +// docs:start:bitxor-trait +trait BitXor { + fn bitxor(self, other: Self) -> Self; +} +// docs:end:bitxor-trait + +impl BitXor for bool { fn bitxor(self, other: bool) -> bool { self ^ other } } + +impl BitXor for u64 { fn bitxor(self, other: u64) -> u64 { self ^ other } } +impl BitXor for u32 { fn bitxor(self, other: u32) -> u32 { self ^ other } } +impl BitXor for u16 { fn bitxor(self, other: u16) -> u16 { self ^ other } } +impl BitXor for u8 { fn bitxor(self, other: u8) -> u8 { self ^ other } } + +impl BitXor for i8 { fn bitxor(self, other: i8) -> i8 { self ^ other } } +impl BitXor for i16 { fn bitxor(self, other: i16) -> i16 { self ^ other } } +impl BitXor for i32 { fn bitxor(self, other: i32) -> i32 { self ^ other } } +impl BitXor for i64 { fn bitxor(self, other: i64) -> i64 { self ^ other } } + +// docs:start:shl-trait +trait Shl { + fn shl(self, other: u8) -> Self; +} +// docs:end:shl-trait + +impl Shl for u32 { fn shl(self, other: u8) -> u32 { self << other } } +impl Shl for u64 { fn shl(self, other: u8) -> u64 { self << other } } +impl Shl for u16 { fn shl(self, other: u8) -> u16 { self << other } } +impl Shl for u8 { fn shl(self, other: u8) -> u8 { self << other } } +impl Shl for u1 { fn shl(self, other: u8) -> u1 { self << other } } + +impl Shl for i8 { fn shl(self, other: u8) -> i8 { self << other } } +impl Shl for i16 { fn shl(self, other: u8) -> i16 { self << other } } +impl Shl for i32 { fn shl(self, other: u8) -> i32 { self << other } } +impl Shl for i64 { fn shl(self, other: u8) -> i64 { self << other } } + +// docs:start:shr-trait +trait Shr { + fn shr(self, other: u8) -> Self; +} +// docs:end:shr-trait + +impl Shr for u64 { fn shr(self, other: u8) -> u64 { self >> other } } +impl Shr for u32 { fn shr(self, other: u8) -> u32 { self >> other } } +impl Shr for u16 { fn shr(self, other: u8) -> u16 { self >> other } } +impl Shr for u8 { fn shr(self, other: u8) -> u8 { self >> other } } +impl Shr for u1 { fn shr(self, other: u8) -> u1 { self >> other } } + +impl Shr for i8 { fn shr(self, other: u8) -> i8 { self >> other } } +impl Shr for i16 { fn shr(self, other: u8) -> i16 { self >> other } } +impl Shr for i32 { fn shr(self, other: u8) -> i32 { self >> other } } +impl Shr for i64 { fn shr(self, other: u8) -> i64 { self >> other } } + diff --git a/noir/noir-repo/noir_stdlib/src/uint128.nr b/noir/noir-repo/noir_stdlib/src/uint128.nr index d0f38079e6f..173fa54863a 100644 --- a/noir/noir-repo/noir_stdlib/src/uint128.nr +++ b/noir/noir-repo/noir_stdlib/src/uint128.nr @@ -1,8 +1,9 @@ -use crate::ops::{Add, Sub, Mul, Div, Rem, BitOr, BitAnd, BitXor, Shl, Shr}; +use crate::ops::{Add, Sub, Mul, Div, Rem, Not, BitOr, BitAnd, BitXor, Shl, Shr}; use crate::cmp::{Eq, Ord, Ordering}; +use crate::println; global pow64 : Field = 18446744073709551616; //2^64; - +global pow63 : Field = 9223372036854775808; // 2^63; struct U128 { lo: Field, hi: Field, @@ -20,6 +21,13 @@ impl U128 { U128::from_u64s_le(lo, hi) } + pub fn zero() -> U128 { + U128 { lo: 0, hi: 0 } + } + + pub fn one() -> U128 { + U128 { lo: 1, hi: 0 } + } pub fn from_le_bytes(bytes: [u8; 16]) -> U128 { let mut lo = 0; let mut base = 1; @@ -87,27 +95,44 @@ impl U128 { U128 { lo: lo as Field, hi: hi as Field } } + unconstrained fn uconstrained_check_is_upper_ascii(ascii: u8) -> bool { + ((ascii >= 65) & (ascii <= 90)) // Between 'A' and 'Z' + } + fn decode_ascii(ascii: u8) -> Field { if ascii < 58 { ascii - 48 - } else if ascii < 71 { - ascii - 55 } else { + let ascii = ascii + 32 * (U128::uconstrained_check_is_upper_ascii(ascii) as u8); + assert(ascii >= 97); // enforce >= 'a' + assert(ascii <= 102); // enforce <= 'f' ascii - 87 } as Field } + // TODO: Replace with a faster version. + // A circuit that uses this function can be slow to compute + // (we're doing up to 127 calls to compute the quotient) unconstrained fn unconstrained_div(self: Self, b: U128) -> (U128, U128) { - if self < b { - (U128::from_u64s_le(0, 0), self) + if b == U128::zero() { + // Return 0,0 to avoid eternal loop + (U128::zero(), U128::zero()) + } else if self < b { + (U128::zero(), self) + } else if self == b { + (U128::one(), U128::zero()) } else { - //TODO check if this can overflow? - let (q,r) = self.unconstrained_div(b * U128::from_u64s_le(2, 0)); + let (q,r) = if b.hi as u64 >= pow63 as u64 { + // The result of multiplication by 2 would overflow + (U128::zero(), self) + } else { + self.unconstrained_div(b * U128::from_u64s_le(2, 0)) + }; let q_mul_2 = q * U128::from_u64s_le(2, 0); if r < b { (q_mul_2, r) } else { - (q_mul_2 + U128::from_u64s_le(1, 0), r - b) + (q_mul_2 + U128::one(), r - b) } } } @@ -129,11 +154,7 @@ impl U128 { let low = self.lo * b.lo; let lo = low as u64 as Field; let carry = (low - lo) / pow64; - let high = if crate::field::modulus_num_bits() as u32 > 196 { - (self.lo + self.hi) * (b.lo + b.hi) - low + carry - } else { - self.lo * b.hi + self.hi * b.lo + carry - }; + let high = self.lo * b.hi + self.hi * b.lo + carry; let hi = high as u64 as Field; U128 { lo, hi } } @@ -228,11 +249,20 @@ impl Ord for U128 { } } +impl Not for U128 { + fn not(self) -> U128 { + U128 { + lo: (!(self.lo as u64)) as Field, + hi: (!(self.hi as u64)) as Field + } + } +} + impl BitOr for U128 { fn bitor(self, other: U128) -> U128 { U128 { lo: ((self.lo as u64) | (other.lo as u64)) as Field, - hi: ((self.hi as u64) | (other.hi as u64))as Field + hi: ((self.hi as u64) | (other.hi as u64)) as Field } } } @@ -284,3 +314,213 @@ impl Shr for U128 { self / U128::from_integer(y) } } + +mod tests { + use crate::uint128::{U128, pow64, pow63}; + + #[test] + fn test_not() { + let num = U128::from_u64s_le(0, 0); + let not_num = num.not(); + + let max_u64: Field = pow64 - 1; + assert_eq(not_num.hi, max_u64); + assert_eq(not_num.lo, max_u64); + + let not_not_num = not_num.not(); + assert_eq(num, not_not_num); + } + #[test] + fn test_construction() { + // Check little-endian u64 is inversed with big-endian u64 construction + let a = U128::from_u64s_le(2, 1); + let b = U128::from_u64s_be(1, 2); + assert_eq(a, b); + // Check byte construction is equivalent + let c = U128::from_le_bytes([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]); + let d = U128::from_u64s_le(0x0706050403020100, 0x0f0e0d0c0b0a0908); + assert_eq(c, d); + } + #[test] + fn test_byte_decomposition() { + let a = U128::from_u64s_le(0x0706050403020100, 0x0f0e0d0c0b0a0908); + // Get big-endian and little-endian byte decompostions + let le_bytes_a= a.to_le_bytes(); + let be_bytes_a= a.to_be_bytes(); + + // Check equivalence + for i in 0..16 { + assert_eq(le_bytes_a[i], be_bytes_a[15 - i]); + } + // Reconstruct U128 from byte decomposition + let b= U128::from_le_bytes(le_bytes_a); + // Check that it's the same element + assert_eq(a, b); + } + #[test] + fn test_hex_constuction() { + let a = U128::from_u64s_le(0x1, 0x2); + let b = U128::from_hex("0x20000000000000001"); + assert_eq(a, b); + + let c= U128::from_hex("0xffffffffffffffffffffffffffffffff"); + let d= U128::from_u64s_le(0xffffffffffffffff, 0xffffffffffffffff); + assert_eq(c, d); + + let e= U128::from_hex("0x00000000000000000000000000000000"); + let f= U128::from_u64s_le(0, 0); + assert_eq(e, f); + } + + // Ascii decode tests + + #[test] + fn test_ascii_decode_correct_range() { + // '0'..'9' range + for i in 0..10 { + let decoded= U128::decode_ascii(48 + i); + assert_eq(decoded, i as Field); + } + // 'A'..'F' range + for i in 0..6 { + let decoded = U128::decode_ascii(65 + i); + assert_eq(decoded, (i + 10) as Field); + } + // 'a'..'f' range + for i in 0..6 { + let decoded = U128::decode_ascii(97 + i); + assert_eq(decoded, (i + 10) as Field); + } + } + + #[test(should_fail)] + fn test_ascii_decode_range_less_than_48_fails_0() { + crate::println(U128::decode_ascii(0)); + } + #[test(should_fail)] + fn test_ascii_decode_range_less_than_48_fails_1() { + crate::println(U128::decode_ascii(47)); + } + + #[test(should_fail)] + fn test_ascii_decode_range_58_64_fails_0() { + let _ = U128::decode_ascii(58); + } + #[test(should_fail)] + fn test_ascii_decode_range_58_64_fails_1() { + let _ = U128::decode_ascii(64); + } + #[test(should_fail)] + fn test_ascii_decode_range_71_96_fails_0() { + let _ = U128::decode_ascii(71); + } + #[test(should_fail)] + fn test_ascii_decode_range_71_96_fails_1() { + let _ = U128::decode_ascii(96); + } + #[test(should_fail)] + fn test_ascii_decode_range_greater_than_102_fails() { + let _ = U128::decode_ascii(103); + } + + #[test(should_fail)] + fn test_ascii_decode_regression() { + // This code will actually fail because of ascii_decode, + // but in the past it was possible to create a value > (1<<128) + let a = U128::from_hex("0x~fffffffffffffffffffffffffffffff"); + let b:Field= a.to_integer(); + let c= b.to_le_bytes(17); + assert(c[16] != 0); + } + + #[test] + fn test_unconstrained_div() { + // Test the potential overflow case + let a= U128::from_u64s_le(0x0, 0xffffffffffffffff); + let b= U128::from_u64s_le(0x0, 0xfffffffffffffffe); + let c= U128::one(); + let d= U128::from_u64s_le(0x0, 0x1); + let (q,r) = a.unconstrained_div(b); + assert_eq(q, c); + assert_eq(r, d); + + let a = U128::from_u64s_le(2, 0); + let b = U128::one(); + // Check the case where a is a multiple of b + let (c,d ) = a.unconstrained_div(b); + assert_eq((c, d), (a, U128::zero())); + + // Check where b is a multiple of a + let (c,d) = b.unconstrained_div(a); + assert_eq((c, d), (U128::zero(), b)); + + // Dividing by zero returns 0,0 + let a = U128::from_u64s_le(0x1, 0x0); + let b = U128::zero(); + let (c,d)= a.unconstrained_div(b); + assert_eq((c, d), (U128::zero(), U128::zero())); + + // Dividing 1<<127 by 1<<127 (special case) + let a = U128::from_u64s_le(0x0, pow63 as u64); + let b = U128::from_u64s_le(0x0, pow63 as u64); + let (c,d )= a.unconstrained_div(b); + assert_eq((c, d), (U128::one(), U128::zero())); + } + + #[test] + fn integer_conversions() { + // Maximum + let start:Field = 0xffffffffffffffffffffffffffffffff; + let a = U128::from_integer(start); + let end = a.to_integer(); + assert_eq(start, end); + + // Minimum + let start:Field = 0x0; + let a = U128::from_integer(start); + let end = a.to_integer(); + assert_eq(start, end); + + // Low limb + let start:Field = 0xffffffffffffffff; + let a = U128::from_integer(start); + let end = a.to_integer(); + assert_eq(start, end); + + // High limb + let start:Field = 0xffffffffffffffff0000000000000000; + let a = U128::from_integer(start); + let end = a.to_integer(); + assert_eq(start, end); + } + #[test] + fn test_wrapping_mul() { + // 1*0==0 + assert_eq(U128::zero(), U128::zero().wrapping_mul(U128::one())); + + // 0*1==0 + assert_eq(U128::zero(), U128::one().wrapping_mul(U128::zero())); + + // 1*1==1 + assert_eq(U128::one(), U128::one().wrapping_mul(U128::one())); + + // 0 * ( 1 << 64 ) == 0 + assert_eq(U128::zero(), U128::zero().wrapping_mul(U128::from_u64s_le(0, 1))); + + // ( 1 << 64 ) * 0 == 0 + assert_eq(U128::zero(), U128::from_u64s_le(0, 1).wrapping_mul(U128::zero())); + + // 1 * ( 1 << 64 ) == 1 << 64 + assert_eq(U128::from_u64s_le(0, 1), U128::from_u64s_le(0, 1).wrapping_mul(U128::one())); + + // ( 1 << 64 ) * 1 == 1 << 64 + assert_eq(U128::from_u64s_le(0, 1), U128::one().wrapping_mul(U128::from_u64s_le(0, 1))); + + // ( 1 << 64 ) * ( 1 << 64 ) == 1 << 64 + assert_eq(U128::zero(), U128::from_u64s_le(0, 1).wrapping_mul(U128::from_u64s_le(0, 1))); + // -1 * -1 == 1 + assert_eq( + U128::one(), U128::from_u64s_le(0xffffffffffffffff, 0xffffffffffffffff).wrapping_mul(U128::from_u64s_le(0xffffffffffffffff, 0xffffffffffffffff)) + ); + } +} diff --git a/noir/noir-repo/scripts/count_loc.sh b/noir/noir-repo/scripts/count_loc.sh new file mode 100755 index 00000000000..91565aa6c4a --- /dev/null +++ b/noir/noir-repo/scripts/count_loc.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash +set -eu + +# Run relative to repo root +cd $(dirname "$0")/../ + +if ! command -v "tokei" >/dev/null 2>&1; then + echo "Error: tokei is required but not installed." >&2 + echo "Error: Run \`cargo install --git https://github.com/TomAFrench/tokei --branch tf/add-noir-support tokei\`" >&2 + + exit 1 +fi + +echo "" +echo "Total:" + +tokei ./ --sort code + +echo "" +echo "ACIR/ACVM:" +tokei ./acvm-repo --sort code + +echo "" +echo "Compiler:" +tokei ./compiler --sort code + +echo "" +echo "Tooling:" +tokei ./tooling --sort code + +echo "" +echo "Standard Library:" +tokei ./noir_stdlib --sort code diff --git a/noir/noir-repo/security/insectarium/noir_stdlib.md b/noir/noir-repo/security/insectarium/noir_stdlib.md new file mode 100644 index 00000000000..5ec4eb5f6cd --- /dev/null +++ b/noir/noir-repo/security/insectarium/noir_stdlib.md @@ -0,0 +1,61 @@ +# Bugs found in Noir stdlib + +## U128 + +### decode_ascii +Old **decode_ascii** function didn't check that the values of individual bytes in the string were just in the range of [0-9a-f-A-F]. +```rust +fn decode_ascii(ascii: u8) -> Field { + if ascii < 58 { + ascii - 48 + } else if ascii < 71 { + ascii - 55 + } else { + ascii - 87 + } as Field +} +``` +Since the function used the assumption that decode_ascii returns values in range [0,15] to construct **lo** and **hi** it was possible to overflow these 64-bit limbs. + +### unconstrained_div +```rust + unconstrained fn unconstrained_div(self: Self, b: U128) -> (U128, U128) { + if self < b { + (U128::from_u64s_le(0, 0), self) + } else { + //TODO check if this can overflow? + let (q,r) = self.unconstrained_div(b * U128::from_u64s_le(2, 0)); + let q_mul_2 = q * U128::from_u64s_le(2, 0); + if r < b { + (q_mul_2, r) + } else { + (q_mul_2 + U128::from_u64s_le(1, 0), r - b) + } + } + } +``` +There were 2 issues in unconstrained_div: +1) Attempting to divide by zero resulted in an infinite loop, because there was no check. +2) $a >= 2^{127}$ cause the function to multiply b to such power of 2 that the result would be more than $2^{128}$ and lead to assertion failure even though it was a legitimate input + +N.B. initial fix by Rumata888 also had an edgecase missing for when a==b and b >= (1<<127). + +### wrapping_mul +```rust +fn wrapping_mul(self: Self, b: U128) -> U128 { + let low = self.lo * b.lo; + let lo = low as u64 as Field; + let carry = (low - lo) / pow64; + let high = if crate::field::modulus_num_bits() as u32 > 196 { + (self.lo + self.hi) * (b.lo + b.hi) - low + carry // Bug + } else { + self.lo * b.hi + self.hi * b.lo + carry + }; + let hi = high as u64 as Field; + U128 { lo, hi } + } +``` +Wrapping mul had the code copied from regular mul barring the assertion that the product of high limbs is zero. Because that check was removed, the optimized path for moduli > 196 bits was incorrect, since it included their product (as at least one of them was supposed to be zero originally, but not for wrapping multiplication) + + + diff --git a/noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/Nargo.toml new file mode 100644 index 00000000000..92be7dcb749 --- /dev/null +++ b/noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/Nargo.toml @@ -0,0 +1,7 @@ +[package] +name = "turbofish_generic_count" +type = "bin" +authors = [""] +compiler_version = ">=0.29.0" + +[dependencies] \ No newline at end of file diff --git a/noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/src/main.nr b/noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/src/main.nr new file mode 100644 index 00000000000..a360641fa15 --- /dev/null +++ b/noir/noir-repo/test_programs/compile_failure/turbofish_generic_count/src/main.nr @@ -0,0 +1,22 @@ + +struct Bar { + one: Field, + two: Field, + other: T, +} + +impl Bar { + fn zeroed(_self: Self) -> A { + dep::std::unsafe::zeroed() + } +} + +fn foo(bar: Bar) { + assert(bar.one == bar.two); +} + +fn main(x: Field, y: pub Field) { + let bar1: Bar = Bar { one: x, two: y, other: 0 }; + + assert(bar1.zeroed::() == 0); +} diff --git a/noir/noir-repo/test_programs/execution_success/brillig_embedded_curve/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_embedded_curve/src/main.nr index 1a183bb13d9..8a1a7f08975 100644 --- a/noir/noir-repo/test_programs/execution_success/brillig_embedded_curve/src/main.nr +++ b/noir/noir-repo/test_programs/execution_success/brillig_embedded_curve/src/main.nr @@ -1,10 +1,6 @@ use dep::std; -unconstrained fn main( - priv_key: Field, - pub_x: pub Field, - pub_y: pub Field, -) { +unconstrained fn main(priv_key: Field, pub_x: pub Field, pub_y: pub Field) { let g1_y = 17631683881184975370165255887551781615748388533673675138860; let g1 = std::embedded_curve_ops::EmbeddedCurvePoint { x: 1, y: g1_y }; diff --git a/noir/noir-repo/test_programs/execution_success/generics/src/main.nr b/noir/noir-repo/test_programs/execution_success/generics/src/main.nr index 3edce1ed8e7..c8616960559 100644 --- a/noir/noir-repo/test_programs/execution_success/generics/src/main.nr +++ b/noir/noir-repo/test_programs/execution_success/generics/src/main.nr @@ -31,6 +31,13 @@ impl Bar { } } +impl Bar { + // This is to test that we can use turbofish on methods as well + fn zeroed(_self: Self) -> A { + dep::std::unsafe::zeroed() + } +} + fn main(x: Field, y: Field) { let bar1: Bar = Bar { one: x, two: y, other: 0 }; let bar2 = Bar { one: x, two: y, other: [0] }; @@ -51,6 +58,14 @@ fn main(x: Field, y: Field) { let nested_generics: Bar> = Bar { one, two, other: Bar { one, two, other: 0 } }; assert(nested_generics.other.other == bar1.get_other()); + // Test turbofish operator + foo::(bar1); + + // Test that turbofish works on methods and that it uses the generics on the methods + // While still handling the generic on the impl (T in this case) that is implicitly added + // to the method. + assert(bar1.zeroed::() == 0); + let _ = regression_2055([1, 2, 3]); } diff --git a/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Nargo.toml b/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Nargo.toml new file mode 100644 index 00000000000..328d78c8f99 --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Nargo.toml @@ -0,0 +1,7 @@ +[package] +name = "no_predicates_brillig" +type = "bin" +authors = [""] +compiler_version = ">=0.27.0" + +[dependencies] diff --git a/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Prover.toml b/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Prover.toml new file mode 100644 index 00000000000..93a825f609f --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/Prover.toml @@ -0,0 +1,2 @@ +x = "10" +y = "20" diff --git a/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/src/main.nr b/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/src/main.nr new file mode 100644 index 00000000000..65e2e5d61fe --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/no_predicates_brillig/src/main.nr @@ -0,0 +1,16 @@ +unconstrained fn main(x: u32, y: pub u32) { + intermediate_function(x, y); +} + +fn intermediate_function(x: u32, y: u32) { + basic_checks(x, y); +} + +#[no_predicates] +fn basic_checks(x: u32, y: u32) { + if x > y { + assert(x == 10); + } else { + assert(y == 20); + } +} diff --git a/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Nargo.toml b/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Nargo.toml new file mode 100644 index 00000000000..d2fe9e8e137 --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Nargo.toml @@ -0,0 +1,7 @@ +[package] +name = "trait_method_mut_self" +type = "bin" +authors = [""] +compiler_version = ">=0.29.0" + +[dependencies] \ No newline at end of file diff --git a/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Prover.toml b/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Prover.toml new file mode 100644 index 00000000000..f28f2f8cc48 --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/Prover.toml @@ -0,0 +1,2 @@ +x = "5" +y = "10" diff --git a/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/src/main.nr b/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/src/main.nr new file mode 100644 index 00000000000..fa47fd5d881 --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/trait_method_mut_self/src/main.nr @@ -0,0 +1,74 @@ +use dep::std::hash::Hasher; +use dep::std::hash::poseidon2::Poseidon2Hasher; + +fn main(x: Field, y: pub Field) { + let mut a_mut_ref = AType { x }; + + pass_trait_by_value(a_mut_ref, y); + assert(a_mut_ref.x == x); + + pass_trait_by_value_impl_param(a_mut_ref, y); + assert(a_mut_ref.x == x); + + pass_trait_by_mut_ref(&mut a_mut_ref, y); + assert(a_mut_ref.x == y); + + let mut hasher = Poseidon2Hasher::default(); + hasher.write(x); + hasher.write(y); + let expected_hash = hasher.finish(); + // Check that we get the same result when using the hasher in a + // method that purely uses trait methods without a supplied implementation. + assert(hash_simple_array::([x, y]) == expected_hash); +} + +trait SomeTrait { + fn set_value(&mut self, new_value: Field) -> (); + + fn get_value(self) -> Field; +} + +struct AType { + x: Field +} + +impl SomeTrait for AType { + fn set_value(&mut self, new_value: Field) -> () { + self.x = new_value; + } + + fn get_value(self) -> Field { + self.x + } +} + +fn pass_trait_by_value_impl_param(mut a_mut_ref: impl SomeTrait, value: Field) { + // We auto add a mutable reference to the object type if the method call expects a mutable self + a_mut_ref.set_value(value); + assert(a_mut_ref.get_value() == value); +} + +fn pass_trait_by_value(mut a_mut_ref: T, value: Field) where T: SomeTrait { + // We auto add a mutable reference to the object type if the method call expects a mutable self + a_mut_ref.set_value(value); + assert(a_mut_ref.get_value() == value); +} + +fn pass_trait_by_mut_ref(a_mut_ref: &mut T, value: Field) where T: SomeTrait { + // We auto add a mutable reference to the object type if the method call expects a mutable self + a_mut_ref.set_value(value); +} + +fn hash_simple_array(input: [Field; 2]) -> Field where H: Hasher + Default { + // Check that we can call a trait method instead of a trait implementation + // TODO: Need to remove the need for this type annotation + // TODO: Curently, without the annotation we will get `Expression type is ambiguous` when trying to use the `hasher` + let mut hasher: H = H::default(); + // Regression that the object is converted to a mutable reference type `&mut _`. + // Otherwise will see `Expected type &mut _, found type H`. + // Then we need to make sure to also auto dereference later in the type checking process + // when searching for a matching impl or else we will get `No matching impl found for `&mut H: Hasher` + hasher.write(input[0]); + hasher.write(input[1]); + hasher.finish() +} diff --git a/noir/noir-repo/test_programs/execution_success/u16_support/Nargo.toml b/noir/noir-repo/test_programs/execution_success/u16_support/Nargo.toml new file mode 100644 index 00000000000..1c6b58e01e8 --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/u16_support/Nargo.toml @@ -0,0 +1,7 @@ +[package] +name = "u16_support" +type = "bin" +authors = [""] +compiler_version = ">=0.29.0" + +[dependencies] \ No newline at end of file diff --git a/noir/noir-repo/test_programs/execution_success/u16_support/Prover.toml b/noir/noir-repo/test_programs/execution_success/u16_support/Prover.toml new file mode 100644 index 00000000000..a56a84e61a4 --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/u16_support/Prover.toml @@ -0,0 +1 @@ +x = "2" diff --git a/noir/noir-repo/test_programs/execution_success/u16_support/src/main.nr b/noir/noir-repo/test_programs/execution_success/u16_support/src/main.nr new file mode 100644 index 00000000000..e8b418f16da --- /dev/null +++ b/noir/noir-repo/test_programs/execution_success/u16_support/src/main.nr @@ -0,0 +1,24 @@ +fn main(x: u16) { + test_u16(x); + test_u16_unconstrained(x); +} + +unconstrained fn test_u16_unconstrained(x: u16) { + test_u16(x) +} + +fn test_u16(x: u16) { + let t1: u16 = 1234; + let t2: u16 = 4321; + let t = t1 + t2; + + let t4 = t - t2; + assert(t4 == t1); + + let mut small_int = x as u16; + let shift = small_int << (x as u8); + assert(shift == 8); + assert(shift >> (x as u8) == small_int); + assert(shift >> 15 == 0); + assert(shift << 15 == 0); +} diff --git a/noir/noir-repo/tooling/backend_interface/Cargo.toml b/noir/noir-repo/tooling/backend_interface/Cargo.toml index b731c138c7d..f6b5d5d0132 100644 --- a/noir/noir-repo/tooling/backend_interface/Cargo.toml +++ b/noir/noir-repo/tooling/backend_interface/Cargo.toml @@ -13,7 +13,6 @@ license.workspace = true acvm.workspace = true dirs.workspace = true thiserror.workspace = true -serde.workspace = true serde_json.workspace = true bb_abstraction_leaks.workspace = true tracing.workspace = true diff --git a/noir/noir-repo/tooling/backend_interface/src/cli/info.rs b/noir/noir-repo/tooling/backend_interface/src/cli/info.rs deleted file mode 100644 index 6e6603ce53e..00000000000 --- a/noir/noir-repo/tooling/backend_interface/src/cli/info.rs +++ /dev/null @@ -1,62 +0,0 @@ -use acvm::acir::circuit::ExpressionWidth; - -use serde::Deserialize; -use std::path::{Path, PathBuf}; - -use crate::BackendError; - -use super::string_from_stderr; - -pub(crate) struct InfoCommand { - pub(crate) crs_path: PathBuf, -} - -#[derive(Deserialize)] -struct InfoResponse { - language: LanguageResponse, -} - -#[derive(Deserialize)] -struct LanguageResponse { - name: String, - width: Option, -} - -impl InfoCommand { - pub(crate) fn run(self, binary_path: &Path) -> Result { - let mut command = std::process::Command::new(binary_path); - - command.arg("info").arg("-c").arg(self.crs_path).arg("-o").arg("-"); - - let output = command.output()?; - - if !output.status.success() { - return Err(BackendError::CommandFailed(string_from_stderr(&output.stderr))); - } - - let backend_info: InfoResponse = - serde_json::from_slice(&output.stdout).expect("Backend should return valid json"); - let expression_width: ExpressionWidth = match backend_info.language.name.as_str() { - "PLONK-CSAT" => { - let width = backend_info.language.width.unwrap(); - ExpressionWidth::Bounded { width } - } - "R1CS" => ExpressionWidth::Unbounded, - _ => panic!("Unknown Expression width configuration"), - }; - - Ok(expression_width) - } -} - -#[test] -fn info_command() -> Result<(), BackendError> { - let backend = crate::get_mock_backend()?; - let crs_path = backend.backend_directory(); - - let expression_width = InfoCommand { crs_path }.run(backend.binary_path())?; - - assert!(matches!(expression_width, ExpressionWidth::Bounded { width: 4 })); - - Ok(()) -} diff --git a/noir/noir-repo/tooling/backend_interface/src/cli/mod.rs b/noir/noir-repo/tooling/backend_interface/src/cli/mod.rs index b4dec859839..df43bd5cc2f 100644 --- a/noir/noir-repo/tooling/backend_interface/src/cli/mod.rs +++ b/noir/noir-repo/tooling/backend_interface/src/cli/mod.rs @@ -2,7 +2,6 @@ mod contract; mod gates; -mod info; mod proof_as_fields; mod prove; mod verify; @@ -12,7 +11,6 @@ mod write_vk; pub(crate) use contract::ContractCommand; pub(crate) use gates::GatesCommand; -pub(crate) use info::InfoCommand; pub(crate) use proof_as_fields::ProofAsFieldsCommand; pub(crate) use prove::ProveCommand; pub(crate) use verify::VerifyCommand; diff --git a/noir/noir-repo/tooling/backend_interface/src/proof_system.rs b/noir/noir-repo/tooling/backend_interface/src/proof_system.rs index fa1f82a5722..20a6dcf70f1 100644 --- a/noir/noir-repo/tooling/backend_interface/src/proof_system.rs +++ b/noir/noir-repo/tooling/backend_interface/src/proof_system.rs @@ -3,7 +3,7 @@ use std::io::Write; use std::path::Path; use acvm::acir::{ - circuit::{ExpressionWidth, Program}, + circuit::Program, native_types::{WitnessMap, WitnessStack}, }; use acvm::FieldElement; @@ -11,8 +11,8 @@ use tempfile::tempdir; use tracing::warn; use crate::cli::{ - GatesCommand, InfoCommand, ProofAsFieldsCommand, ProveCommand, VerifyCommand, - VkAsFieldsCommand, WriteVkCommand, + GatesCommand, ProofAsFieldsCommand, ProveCommand, VerifyCommand, VkAsFieldsCommand, + WriteVkCommand, }; use crate::{Backend, BackendError}; @@ -33,25 +33,6 @@ impl Backend { .run(binary_path) } - pub fn get_backend_info(&self) -> Result { - let binary_path = self.assert_binary_exists()?; - self.assert_correct_version()?; - InfoCommand { crs_path: self.crs_directory() }.run(binary_path) - } - - /// If we cannot get a valid backend, returns `ExpressionWidth::Bound { width: 4 }`` - /// The function also prints a message saying we could not find a backend - pub fn get_backend_info_or_default(&self) -> ExpressionWidth { - if let Ok(expression_width) = self.get_backend_info() { - expression_width - } else { - warn!( - "No valid backend found, ExpressionWidth defaulting to Bounded with a width of 4" - ); - ExpressionWidth::Bounded { width: 4 } - } - } - #[tracing::instrument(level = "trace", skip_all)] pub fn prove( &self, diff --git a/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs deleted file mode 100644 index cdaebb95fc9..00000000000 --- a/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs +++ /dev/null @@ -1,40 +0,0 @@ -use clap::Args; -use std::io::Write; -use std::path::PathBuf; - -const INFO_RESPONSE: &str = r#"{ - "language": { - "name": "PLONK-CSAT", - "width": 4 - }, - "opcodes_supported": ["arithmetic", "directive", "brillig", "memory_init", "memory_op"], - "black_box_functions_supported": [ - "and", - "xor", - "range", - "sha256", - "blake2s", - "blake3", - "keccak256", - "schnorr_verify", - "pedersen", - "pedersen_hash", - "ecdsa_secp256k1", - "ecdsa_secp256r1", - "multi_scalar_mul", - "recursive_aggregation" - ] -}"#; - -#[derive(Debug, Clone, Args)] -pub(crate) struct InfoCommand { - #[clap(short = 'c')] - pub(crate) crs_path: Option, - - #[clap(short = 'o')] - pub(crate) info_path: Option, -} - -pub(crate) fn run(_args: InfoCommand) { - std::io::stdout().write_all(INFO_RESPONSE.as_bytes()).unwrap(); -} diff --git a/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/main.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/main.rs index ef8819af94b..74ea82d28f8 100644 --- a/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/main.rs +++ b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/main.rs @@ -7,7 +7,6 @@ use clap::{Parser, Subcommand}; mod contract_cmd; mod gates_cmd; -mod info_cmd; mod prove_cmd; mod verify_cmd; mod write_vk_cmd; @@ -21,7 +20,6 @@ struct BackendCli { #[derive(Subcommand, Clone, Debug)] enum BackendCommand { - Info(info_cmd::InfoCommand), Contract(contract_cmd::ContractCommand), Gates(gates_cmd::GatesCommand), Prove(prove_cmd::ProveCommand), @@ -34,7 +32,6 @@ fn main() { let BackendCli { command } = BackendCli::parse(); match command { - BackendCommand::Info(args) => info_cmd::run(args), BackendCommand::Contract(args) => contract_cmd::run(args), BackendCommand::Gates(args) => gates_cmd::run(args), BackendCommand::Prove(args) => prove_cmd::run(args), diff --git a/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs b/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs index b3dfff9e94c..45da7f9d00c 100644 --- a/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs +++ b/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs @@ -10,7 +10,7 @@ use const_format::formatcp; const USERNAME: &str = "AztecProtocol"; const REPO: &str = "aztec-packages"; -const VERSION: &str = "0.35.1"; +const VERSION: &str = "0.38.0"; const TAG: &str = formatcp!("aztec-packages-v{}", VERSION); const API_URL: &str = diff --git a/noir/noir-repo/tooling/lsp/src/lib.rs b/noir/noir-repo/tooling/lsp/src/lib.rs index be9b83e02f6..05345b96c80 100644 --- a/noir/noir-repo/tooling/lsp/src/lib.rs +++ b/noir/noir-repo/tooling/lsp/src/lib.rs @@ -345,7 +345,7 @@ fn prepare_package_from_source_string() { let mut state = LspState::new(&client, acvm::blackbox_solver::StubbedBlackBoxSolver); let (mut context, crate_id) = crate::prepare_source(source.to_string(), &mut state); - let _check_result = noirc_driver::check_crate(&mut context, crate_id, false, false); + let _check_result = noirc_driver::check_crate(&mut context, crate_id, false, false, false); let main_func_id = context.get_main_function(&crate_id); assert!(main_func_id.is_some()); } diff --git a/noir/noir-repo/tooling/lsp/src/notifications/mod.rs b/noir/noir-repo/tooling/lsp/src/notifications/mod.rs index 355bb7832c4..3856bdc79e9 100644 --- a/noir/noir-repo/tooling/lsp/src/notifications/mod.rs +++ b/noir/noir-repo/tooling/lsp/src/notifications/mod.rs @@ -56,7 +56,7 @@ pub(super) fn on_did_change_text_document( state.input_files.insert(params.text_document.uri.to_string(), text.clone()); let (mut context, crate_id) = prepare_source(text, state); - let _ = check_crate(&mut context, crate_id, false, false); + let _ = check_crate(&mut context, crate_id, false, false, false); let workspace = match resolve_workspace_for_source_path( params.text_document.uri.to_file_path().unwrap().as_path(), @@ -139,7 +139,7 @@ fn process_noir_document( let (mut context, crate_id) = prepare_package(&workspace_file_manager, &parsed_files, package); - let file_diagnostics = match check_crate(&mut context, crate_id, false, false) { + let file_diagnostics = match check_crate(&mut context, crate_id, false, false, false) { Ok(((), warnings)) => warnings, Err(errors_and_warnings) => errors_and_warnings, }; diff --git a/noir/noir-repo/tooling/lsp/src/requests/code_lens_request.rs b/noir/noir-repo/tooling/lsp/src/requests/code_lens_request.rs index 893ba33d845..744bddedd9d 100644 --- a/noir/noir-repo/tooling/lsp/src/requests/code_lens_request.rs +++ b/noir/noir-repo/tooling/lsp/src/requests/code_lens_request.rs @@ -67,7 +67,7 @@ fn on_code_lens_request_inner( let (mut context, crate_id) = prepare_source(source_string, state); // We ignore the warnings and errors produced by compilation for producing code lenses // because we can still get the test functions even if compilation fails - let _ = check_crate(&mut context, crate_id, false, false); + let _ = check_crate(&mut context, crate_id, false, false, false); let collected_lenses = collect_lenses_for_package(&context, crate_id, &workspace, package, None); diff --git a/noir/noir-repo/tooling/lsp/src/requests/goto_declaration.rs b/noir/noir-repo/tooling/lsp/src/requests/goto_declaration.rs index 8e6d519b895..5cff16b2348 100644 --- a/noir/noir-repo/tooling/lsp/src/requests/goto_declaration.rs +++ b/noir/noir-repo/tooling/lsp/src/requests/goto_declaration.rs @@ -46,7 +46,7 @@ fn on_goto_definition_inner( interner = def_interner; } else { // We ignore the warnings and errors produced by compilation while resolving the definition - let _ = noirc_driver::check_crate(&mut context, crate_id, false, false); + let _ = noirc_driver::check_crate(&mut context, crate_id, false, false, false); interner = &context.def_interner; } diff --git a/noir/noir-repo/tooling/lsp/src/requests/goto_definition.rs b/noir/noir-repo/tooling/lsp/src/requests/goto_definition.rs index 88bb667f2e8..32e13ce00f6 100644 --- a/noir/noir-repo/tooling/lsp/src/requests/goto_definition.rs +++ b/noir/noir-repo/tooling/lsp/src/requests/goto_definition.rs @@ -54,7 +54,7 @@ fn on_goto_definition_inner( interner = def_interner; } else { // We ignore the warnings and errors produced by compilation while resolving the definition - let _ = noirc_driver::check_crate(&mut context, crate_id, false, false); + let _ = noirc_driver::check_crate(&mut context, crate_id, false, false, false); interner = &context.def_interner; } diff --git a/noir/noir-repo/tooling/lsp/src/requests/test_run.rs b/noir/noir-repo/tooling/lsp/src/requests/test_run.rs index 1844a3d9bf0..83b05ba06a2 100644 --- a/noir/noir-repo/tooling/lsp/src/requests/test_run.rs +++ b/noir/noir-repo/tooling/lsp/src/requests/test_run.rs @@ -60,7 +60,7 @@ fn on_test_run_request_inner( Some(package) => { let (mut context, crate_id) = prepare_package(&workspace_file_manager, &parsed_files, package); - if check_crate(&mut context, crate_id, false, false).is_err() { + if check_crate(&mut context, crate_id, false, false, false).is_err() { let result = NargoTestRunResult { id: params.id.clone(), result: "error".to_string(), diff --git a/noir/noir-repo/tooling/lsp/src/requests/tests.rs b/noir/noir-repo/tooling/lsp/src/requests/tests.rs index 5b78fcc65c3..cdf4ad338c4 100644 --- a/noir/noir-repo/tooling/lsp/src/requests/tests.rs +++ b/noir/noir-repo/tooling/lsp/src/requests/tests.rs @@ -61,7 +61,7 @@ fn on_tests_request_inner( prepare_package(&workspace_file_manager, &parsed_files, package); // We ignore the warnings and errors produced by compilation for producing tests // because we can still get the test functions even if compilation fails - let _ = check_crate(&mut context, crate_id, false, false); + let _ = check_crate(&mut context, crate_id, false, false, false); // We don't add test headings for a package if it contains no `#[test]` functions get_package_tests_in_crate(&context, &crate_id, &package.name) diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs index 2b729e44b8a..d5313d96076 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs @@ -1,4 +1,3 @@ -use crate::backends::Backend; use crate::errors::CliError; use clap::Args; @@ -42,11 +41,7 @@ pub(crate) struct CheckCommand { compile_options: CompileOptions, } -pub(crate) fn run( - _backend: &Backend, - args: CheckCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: CheckCommand, config: NargoConfig) -> Result<(), CliError> { let toml_path = get_package_manifest(&config.program_dir)?; let default_selection = if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll }; @@ -92,6 +87,7 @@ fn check_package( compile_options.deny_warnings, compile_options.disable_macros, compile_options.silence_warnings, + compile_options.use_elaborator, )?; if package.is_library() || package.is_contract() { @@ -178,8 +174,9 @@ pub(crate) fn check_crate_and_report_errors( deny_warnings: bool, disable_macros: bool, silence_warnings: bool, + use_elaborator: bool, ) -> Result<(), CompileError> { - let result = check_crate(context, crate_id, deny_warnings, disable_macros); + let result = check_crate(context, crate_id, deny_warnings, disable_macros, use_elaborator); report_errors(result, &context.file_manager, deny_warnings, silence_warnings) } diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs index 259e209b65a..8c64d9cd935 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs @@ -44,7 +44,6 @@ pub(crate) fn run( insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager); let parsed_files = parse_all(&workspace_file_manager); - let expression_width = backend.get_backend_info()?; let binary_packages = workspace.into_iter().filter(|package| package.is_binary()); for package in binary_packages { let compilation_result = compile_program( @@ -62,7 +61,7 @@ pub(crate) fn run( args.compile_options.silence_warnings, )?; - let program = nargo::ops::transform_program(program, expression_width); + let program = nargo::ops::transform_program(program, args.compile_options.expression_width); // TODO(https://github.com/noir-lang/noir/issues/4428): // We do not expect to have a smart contract verifier for a foldable program with multiple circuits. diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs index 54e8535f094..2f878406939 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs @@ -20,7 +20,6 @@ use noirc_frontend::hir::ParsedFiles; use notify::{EventKind, RecursiveMode, Watcher}; use notify_debouncer_full::new_debouncer; -use crate::backends::Backend; use crate::errors::CliError; use super::fs::program::only_acir; @@ -47,11 +46,7 @@ pub(crate) struct CompileCommand { watch: bool, } -pub(crate) fn run( - backend: &Backend, - mut args: CompileCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: CompileCommand, config: NargoConfig) -> Result<(), CliError> { let toml_path = get_package_manifest(&config.program_dir)?; let default_selection = if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll }; @@ -63,10 +58,6 @@ pub(crate) fn run( Some(NOIR_ARTIFACT_VERSION_STRING.to_owned()), )?; - if args.compile_options.expression_width.is_none() { - args.compile_options.expression_width = Some(backend.get_backend_info_or_default()); - }; - if args.watch { watch_workspace(&workspace, &args.compile_options) .map_err(|err| CliError::Generic(err.to_string()))?; @@ -128,8 +119,6 @@ fn compile_workspace_full( insert_all_files_for_workspace_into_file_manager(workspace, &mut workspace_file_manager); let parsed_files = parse_all(&workspace_file_manager); - let expression_width = - compile_options.expression_width.expect("expression width should have been set"); let compiled_workspace = compile_workspace(&workspace_file_manager, &parsed_files, workspace, compile_options); @@ -149,12 +138,12 @@ fn compile_workspace_full( // Save build artifacts to disk. let only_acir = compile_options.only_acir; for (package, program) in binary_packages.into_iter().zip(compiled_programs) { - let program = nargo::ops::transform_program(program, expression_width); + let program = nargo::ops::transform_program(program, compile_options.expression_width); save_program(program.clone(), &package, &workspace.target_directory_path(), only_acir); } let circuit_dir = workspace.target_directory_path(); for (package, contract) in contract_packages.into_iter().zip(compiled_contracts) { - let contract = nargo::ops::transform_contract(contract, expression_width); + let contract = nargo::ops::transform_contract(contract, compile_options.expression_width); save_contract(contract, &package, &circuit_dir); } diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/dap_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/dap_cmd.rs index ba4f91609ef..124e30069ae 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/dap_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/dap_cmd.rs @@ -1,6 +1,5 @@ use acvm::acir::circuit::ExpressionWidth; use acvm::acir::native_types::WitnessMap; -use backend_interface::Backend; use clap::Args; use nargo::constants::PROVER_INPUT_FILE; use nargo::workspace::Workspace; @@ -29,8 +28,8 @@ use noir_debugger::errors::{DapError, LoadError}; #[derive(Debug, Clone, Args)] pub(crate) struct DapCommand { /// Override the expression width requested by the backend. - #[arg(long, value_parser = parse_expression_width)] - expression_width: Option, + #[arg(long, value_parser = parse_expression_width, default_value = "4")] + expression_width: ExpressionWidth, #[clap(long)] preflight_check: bool, @@ -249,14 +248,7 @@ fn run_preflight_check( Ok(()) } -pub(crate) fn run( - backend: &Backend, - args: DapCommand, - _config: NargoConfig, -) -> Result<(), CliError> { - let expression_width = - args.expression_width.unwrap_or_else(|| backend.get_backend_info_or_default()); - +pub(crate) fn run(args: DapCommand, _config: NargoConfig) -> Result<(), CliError> { // When the --preflight-check flag is present, we run Noir's DAP server in "pre-flight mode", which test runs // the DAP initialization code without actually starting the DAP server. // @@ -270,12 +262,12 @@ pub(crate) fn run( // the DAP loop is established, which otherwise are considered "out of band" by the maintainers of the DAP spec. // More details here: https://github.com/microsoft/vscode/issues/108138 if args.preflight_check { - return run_preflight_check(expression_width, args).map_err(CliError::DapError); + return run_preflight_check(args.expression_width, args).map_err(CliError::DapError); } let output = BufWriter::new(std::io::stdout()); let input = BufReader::new(std::io::stdin()); let server = Server::new(input, output); - loop_uninitialized_dap(server, expression_width).map_err(CliError::DapError) + loop_uninitialized_dap(server, args.expression_width).map_err(CliError::DapError) } diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs index 7cb5cd7846b..f950cd0405c 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs @@ -24,7 +24,6 @@ use noirc_frontend::hir::ParsedFiles; use super::fs::{inputs::read_inputs_from_file, witness::save_witness_to_dir}; use super::NargoConfig; -use crate::backends::Backend; use crate::errors::CliError; /// Executes a circuit in debug mode @@ -53,11 +52,7 @@ pub(crate) struct DebugCommand { skip_instrumentation: Option, } -pub(crate) fn run( - backend: &Backend, - args: DebugCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: DebugCommand, config: NargoConfig) -> Result<(), CliError> { let acir_mode = args.acir_mode; let skip_instrumentation = args.skip_instrumentation.unwrap_or(acir_mode); @@ -69,10 +64,6 @@ pub(crate) fn run( Some(NOIR_ARTIFACT_VERSION_STRING.to_string()), )?; let target_dir = &workspace.target_directory_path(); - let expression_width = args - .compile_options - .expression_width - .unwrap_or_else(|| backend.get_backend_info_or_default()); let Some(package) = workspace.into_iter().find(|p| p.is_binary()) else { println!( @@ -89,7 +80,8 @@ pub(crate) fn run( args.compile_options.clone(), )?; - let compiled_program = nargo::ops::transform_program(compiled_program, expression_width); + let compiled_program = + nargo::ops::transform_program(compiled_program, args.compile_options.expression_width); run_async(package, compiled_program, &args.prover_name, &args.witness_name, target_dir) } diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs index 854ad559012..68f902dfe33 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs @@ -18,7 +18,6 @@ use noirc_frontend::graph::CrateName; use super::fs::{inputs::read_inputs_from_file, witness::save_witness_to_dir}; use super::NargoConfig; -use crate::backends::Backend; use crate::errors::CliError; /// Executes a circuit to calculate its return value @@ -48,11 +47,7 @@ pub(crate) struct ExecuteCommand { oracle_resolver: Option, } -pub(crate) fn run( - backend: &Backend, - args: ExecuteCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: ExecuteCommand, config: NargoConfig) -> Result<(), CliError> { let toml_path = get_package_manifest(&config.program_dir)?; let default_selection = if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll }; @@ -68,10 +63,6 @@ pub(crate) fn run( insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager); let parsed_files = parse_all(&workspace_file_manager); - let expression_width = args - .compile_options - .expression_width - .unwrap_or_else(|| backend.get_backend_info_or_default()); let binary_packages = workspace.into_iter().filter(|package| package.is_binary()); for package in binary_packages { let compilation_result = compile_program( @@ -89,7 +80,8 @@ pub(crate) fn run( args.compile_options.silence_warnings, )?; - let compiled_program = nargo::ops::transform_program(compiled_program, expression_width); + let compiled_program = + nargo::ops::transform_program(compiled_program, args.compile_options.expression_width); let (return_value, witness_stack) = execute_program_and_decode( compiled_program, diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs index 044c2cb4ebb..324eed340ad 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs @@ -20,7 +20,6 @@ use noirc_frontend::graph::CrateName; use clap::Args; -use crate::backends::Backend; use crate::errors::CliError; use super::check_cmd::check_crate_and_report_errors; @@ -43,11 +42,7 @@ pub(crate) struct ExportCommand { compile_options: CompileOptions, } -pub(crate) fn run( - _backend: &Backend, - args: ExportCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: ExportCommand, config: NargoConfig) -> Result<(), CliError> { let toml_path = get_package_manifest(&config.program_dir)?; let default_selection = if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll }; @@ -94,6 +89,7 @@ fn compile_exported_functions( compile_options.deny_warnings, compile_options.disable_macros, compile_options.silence_warnings, + compile_options.use_elaborator, )?; let exported_functions = context.get_all_exported_functions_in_crate(&crate_id); diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs index 3695fb57d31..cac3c36f904 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs @@ -70,10 +70,6 @@ pub(crate) fn run( insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager); let parsed_files = parse_all(&workspace_file_manager); - let expression_width = args - .compile_options - .expression_width - .unwrap_or_else(|| backend.get_backend_info_or_default()); let compiled_workspace = compile_workspace( &workspace_file_manager, &parsed_files, @@ -89,10 +85,10 @@ pub(crate) fn run( )?; let compiled_programs = vecmap(compiled_programs, |program| { - nargo::ops::transform_program(program, expression_width) + nargo::ops::transform_program(program, args.compile_options.expression_width) }); let compiled_contracts = vecmap(compiled_contracts, |contract| { - nargo::ops::transform_contract(contract, expression_width) + nargo::ops::transform_contract(contract, args.compile_options.expression_width) }); if args.profile_info { @@ -122,13 +118,24 @@ pub(crate) fn run( let program_info = binary_packages .par_bridge() .map(|(package, program)| { - count_opcodes_and_gates_in_program(backend, program, package, expression_width) + count_opcodes_and_gates_in_program( + backend, + program, + package, + args.compile_options.expression_width, + ) }) .collect::>()?; let contract_info = compiled_contracts .into_par_iter() - .map(|contract| count_opcodes_and_gates_in_contract(backend, contract, expression_width)) + .map(|contract| { + count_opcodes_and_gates_in_contract( + backend, + contract, + args.compile_options.expression_width, + ) + }) .collect::>()?; let info_report = InfoReport { programs: program_info, contracts: contract_info }; diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/lsp_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/lsp_cmd.rs index 1428b8070c8..45ac02ea552 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/lsp_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/lsp_cmd.rs @@ -8,7 +8,6 @@ use noir_lsp::NargoLspService; use tower::ServiceBuilder; use super::NargoConfig; -use crate::backends::Backend; use crate::errors::CliError; /// Starts the Noir LSP server @@ -19,12 +18,7 @@ use crate::errors::CliError; #[derive(Debug, Clone, Args)] pub(crate) struct LspCommand; -pub(crate) fn run( - // Backend is currently unused, but we might want to use it to inform the lsp in the future - _backend: &Backend, - _args: LspCommand, - _config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(_args: LspCommand, _config: NargoConfig) -> Result<(), CliError> { use tokio::runtime::Builder; let runtime = Builder::new_current_thread().enable_all().build().unwrap(); diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/mod.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/mod.rs index e8e17893815..ad778549ac0 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/mod.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/mod.rs @@ -107,21 +107,21 @@ pub(crate) fn start_cli() -> eyre::Result<()> { let backend = crate::backends::Backend::new(active_backend); match command { - NargoCommand::New(args) => new_cmd::run(&backend, args, config), + NargoCommand::New(args) => new_cmd::run(args, config), NargoCommand::Init(args) => init_cmd::run(args, config), - NargoCommand::Check(args) => check_cmd::run(&backend, args, config), - NargoCommand::Compile(args) => compile_cmd::run(&backend, args, config), - NargoCommand::Debug(args) => debug_cmd::run(&backend, args, config), - NargoCommand::Execute(args) => execute_cmd::run(&backend, args, config), - NargoCommand::Export(args) => export_cmd::run(&backend, args, config), + NargoCommand::Check(args) => check_cmd::run(args, config), + NargoCommand::Compile(args) => compile_cmd::run(args, config), + NargoCommand::Debug(args) => debug_cmd::run(args, config), + NargoCommand::Execute(args) => execute_cmd::run(args, config), + NargoCommand::Export(args) => export_cmd::run(args, config), NargoCommand::Prove(args) => prove_cmd::run(&backend, args, config), NargoCommand::Verify(args) => verify_cmd::run(&backend, args, config), - NargoCommand::Test(args) => test_cmd::run(&backend, args, config), + NargoCommand::Test(args) => test_cmd::run(args, config), NargoCommand::Info(args) => info_cmd::run(&backend, args, config), NargoCommand::CodegenVerifier(args) => codegen_verifier_cmd::run(&backend, args, config), NargoCommand::Backend(args) => backend_cmd::run(args), - NargoCommand::Lsp(args) => lsp_cmd::run(&backend, args, config), - NargoCommand::Dap(args) => dap_cmd::run(&backend, args, config), + NargoCommand::Lsp(args) => lsp_cmd::run(args, config), + NargoCommand::Dap(args) => dap_cmd::run(args, config), NargoCommand::Fmt(args) => fmt_cmd::run(args, config), }?; diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/new_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/new_cmd.rs index b4c823d0c1e..21951f27260 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/new_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/new_cmd.rs @@ -1,4 +1,3 @@ -use crate::backends::Backend; use crate::errors::CliError; use super::{init_cmd::initialize_project, NargoConfig}; @@ -30,12 +29,7 @@ pub(crate) struct NewCommand { pub(crate) contract: bool, } -pub(crate) fn run( - // Backend is currently unused, but we might want to use it to inform the "new" template in the future - _backend: &Backend, - args: NewCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: NewCommand, config: NargoConfig) -> Result<(), CliError> { let package_dir = config.program_dir.join(&args.path); if package_dir.exists() { diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs index b9e4bca9e69..47c71527fd8 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs @@ -69,10 +69,6 @@ pub(crate) fn run( insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager); let parsed_files = parse_all(&workspace_file_manager); - let expression_width = args - .compile_options - .expression_width - .unwrap_or_else(|| backend.get_backend_info_or_default()); let binary_packages = workspace.into_iter().filter(|package| package.is_binary()); for package in binary_packages { let compilation_result = compile_program( @@ -90,7 +86,8 @@ pub(crate) fn run( args.compile_options.silence_warnings, )?; - let compiled_program = nargo::ops::transform_program(compiled_program, expression_width); + let compiled_program = + nargo::ops::transform_program(compiled_program, args.compile_options.expression_width); prove_package( backend, diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs index 88a804d5cf4..51e21248afd 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs @@ -19,7 +19,7 @@ use noirc_frontend::{ use rayon::prelude::{IntoParallelIterator, ParallelBridge, ParallelIterator}; use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor}; -use crate::{backends::Backend, cli::check_cmd::check_crate_and_report_errors, errors::CliError}; +use crate::{cli::check_cmd::check_crate_and_report_errors, errors::CliError}; use super::NargoConfig; @@ -54,11 +54,7 @@ pub(crate) struct TestCommand { oracle_resolver: Option, } -pub(crate) fn run( - _backend: &Backend, - args: TestCommand, - config: NargoConfig, -) -> Result<(), CliError> { +pub(crate) fn run(args: TestCommand, config: NargoConfig) -> Result<(), CliError> { let toml_path = get_package_manifest(&config.program_dir)?; let default_selection = if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll }; @@ -179,6 +175,7 @@ fn run_test( crate_id, compile_options.deny_warnings, compile_options.disable_macros, + compile_options.use_elaborator, ) .expect("Any errors should have occurred when collecting test functions"); @@ -212,6 +209,7 @@ fn get_tests_in_package( compile_options.deny_warnings, compile_options.disable_macros, compile_options.silence_warnings, + compile_options.use_elaborator, )?; Ok(context diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs index 7202a179aae..a6078f6c1d3 100644 --- a/noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs +++ b/noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs @@ -54,10 +54,6 @@ pub(crate) fn run( insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager); let parsed_files = parse_all(&workspace_file_manager); - let expression_width = args - .compile_options - .expression_width - .unwrap_or_else(|| backend.get_backend_info_or_default()); let binary_packages = workspace.into_iter().filter(|package| package.is_binary()); for package in binary_packages { let compilation_result = compile_program( @@ -75,7 +71,8 @@ pub(crate) fn run( args.compile_options.silence_warnings, )?; - let compiled_program = nargo::ops::transform_program(compiled_program, expression_width); + let compiled_program = + nargo::ops::transform_program(compiled_program, args.compile_options.expression_width); verify_package(backend, &workspace, package, compiled_program, &args.verifier_name)?; } diff --git a/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs b/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs index 9d377cfaee9..70a9354f50a 100644 --- a/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs +++ b/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs @@ -10,8 +10,7 @@ use nargo::{ parse_all, prepare_package, }; -#[test] -fn stdlib_noir_tests() { +fn run_stdlib_tests(use_elaborator: bool) { let mut file_manager = file_manager_with_stdlib(&PathBuf::from(".")); file_manager.add_file_with_source_canonical_path(&PathBuf::from("main.nr"), "".to_owned()); let parsed_files = parse_all(&file_manager); @@ -30,7 +29,7 @@ fn stdlib_noir_tests() { let (mut context, dummy_crate_id) = prepare_package(&file_manager, &parsed_files, &dummy_package); - let result = check_crate(&mut context, dummy_crate_id, true, false); + let result = check_crate(&mut context, dummy_crate_id, true, false, use_elaborator); report_errors(result, &context.file_manager, true, false) .expect("Error encountered while compiling standard library"); @@ -60,3 +59,15 @@ fn stdlib_noir_tests() { assert!(!test_report.is_empty(), "Could not find any tests within the stdlib"); assert!(test_report.iter().all(|(_, status)| !status.failed())); } + +#[test] +fn stdlib_noir_tests() { + run_stdlib_tests(false) +} + +// Once this no longer panics we can use the elaborator by default and remove the old passes +#[test] +#[should_panic] +fn stdlib_elaborator_tests() { + run_stdlib_tests(true) +} diff --git a/noir/noir-repo/tooling/nargo_fmt/src/rewrite/expr.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/expr.rs index 6b7dca6c5c7..e5b30f99b7b 100644 --- a/noir/noir-repo/tooling/nargo_fmt/src/rewrite/expr.rs +++ b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/expr.rs @@ -1,8 +1,9 @@ use noirc_frontend::ast::{ - ArrayLiteral, BlockExpression, Expression, ExpressionKind, Literal, UnaryOp, + ArrayLiteral, BlockExpression, Expression, ExpressionKind, Literal, UnaryOp, UnresolvedType, }; use noirc_frontend::{macros_api::Span, token::Token}; +use crate::rewrite; use crate::visitor::{ expr::{format_brackets, format_parens, NewlineMode}, ExpressionType, FmtVisitor, Indent, Shape, @@ -72,6 +73,7 @@ pub(crate) fn rewrite( let object = rewrite_sub_expr(visitor, shape, method_call_expr.object); let method = method_call_expr.method_name.to_string(); + let turbofish = rewrite_turbofish(visitor, shape, method_call_expr.generics); let args = format_parens( visitor.config.fn_call_width.into(), visitor.fork(), @@ -83,7 +85,7 @@ pub(crate) fn rewrite( NewlineMode::IfContainsNewLineAndWidth, ); - format!("{object}.{method}{args}") + format!("{object}.{method}{turbofish}{args}") } ExpressionKind::MemberAccess(member_access_expr) => { let lhs_str = rewrite_sub_expr(visitor, shape, member_access_expr.lhs); @@ -157,7 +159,13 @@ pub(crate) fn rewrite( visitor.format_if(*if_expr) } - ExpressionKind::Lambda(_) | ExpressionKind::Variable(_) => visitor.slice(span).to_string(), + ExpressionKind::Variable(path, generics) => { + let path_string = visitor.slice(path.span); + + let turbofish = rewrite_turbofish(visitor, shape, generics); + format!("{path_string}{turbofish}") + } + ExpressionKind::Lambda(_) => visitor.slice(span).to_string(), ExpressionKind::Quote(block) => format!("quote {}", rewrite_block(visitor, block, span)), ExpressionKind::Comptime(block) => { format!("comptime {}", rewrite_block(visitor, block, span)) @@ -171,3 +179,24 @@ fn rewrite_block(visitor: &FmtVisitor, block: BlockExpression, span: Span) -> St visitor.visit_block(block, span); visitor.finish() } + +fn rewrite_turbofish( + visitor: &FmtVisitor, + shape: Shape, + generics: Option>, +) -> String { + if let Some(generics) = generics { + let mut turbofish = "".to_owned(); + for (i, generic) in generics.into_iter().enumerate() { + let generic = rewrite::typ(visitor, shape, generic); + turbofish = if i == 0 { + format!("::<{}", generic) + } else { + format!("{turbofish}, {}", generic) + }; + } + format!("{turbofish}>") + } else { + "".to_owned() + } +} diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_call.nr new file mode 100644 index 00000000000..bcf0df9a969 --- /dev/null +++ b/noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_call.nr @@ -0,0 +1,8 @@ +fn foo() { + my_function::(10, some_value, another_func(20, 30)); + + outer_function::( + some_function(), // Original inner function call + another_function() // Original inner function call + ); +} diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_method_call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_method_call.nr new file mode 100644 index 00000000000..52fa3db2ac9 --- /dev/null +++ b/noir/noir-repo/tooling/nargo_fmt/tests/expected/turbofish_method_call.nr @@ -0,0 +1,12 @@ +fn foo() { + my_object.some_method::(10, var_value, inner_method::(20, 30)); + + assert( + p4_affine.eq::( + Gaffine::new::( + 6890855772600357754907169075114257697580319025794532037257385534741338397365, + 4338620300185947561074059802482547481416142213883829469920100239455078257889 + ) + ) + ); +} diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_call.nr new file mode 100644 index 00000000000..03abde789fe --- /dev/null +++ b/noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_call.nr @@ -0,0 +1,7 @@ +fn foo() { + my_function :: ( 10,some_value,another_func( 20 , 30) ); + + outer_function :: (some_function(), // Original inner function call + another_function(), // Original inner function call + ); +} \ No newline at end of file diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_method_call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_method_call.nr new file mode 100644 index 00000000000..aa7ae87f23a --- /dev/null +++ b/noir/noir-repo/tooling/nargo_fmt/tests/input/turbofish_method_call.nr @@ -0,0 +1,5 @@ +fn foo() { + my_object . some_method :: ( 10,var_value,inner_method:: ( 20 , 30) ); + + assert(p4_affine.eq::(Gaffine::new::(6890855772600357754907169075114257697580319025794532037257385534741338397365, 4338620300185947561074059802482547481416142213883829469920100239455078257889))); +} \ No newline at end of file diff --git a/noir/noir-repo/tooling/noir_codegen/package.json b/noir/noir-repo/tooling/noir_codegen/package.json index fa3df8ce101..5d3a7d6315e 100644 --- a/noir/noir-repo/tooling/noir_codegen/package.json +++ b/noir/noir-repo/tooling/noir_codegen/package.json @@ -3,7 +3,7 @@ "contributors": [ "The Noir Team " ], - "version": "0.29.0", + "version": "0.30.0", "packageManager": "yarn@3.5.1", "license": "(MIT OR Apache-2.0)", "type": "module", diff --git a/noir/noir-repo/tooling/noir_js/package.json b/noir/noir-repo/tooling/noir_js/package.json index 325ba0fb9a7..eca3f29957f 100644 --- a/noir/noir-repo/tooling/noir_js/package.json +++ b/noir/noir-repo/tooling/noir_js/package.json @@ -3,7 +3,7 @@ "contributors": [ "The Noir Team " ], - "version": "0.29.0", + "version": "0.30.0", "packageManager": "yarn@3.5.1", "license": "(MIT OR Apache-2.0)", "type": "module", diff --git a/noir/noir-repo/tooling/noir_js/test/node/execute.test.ts b/noir/noir-repo/tooling/noir_js/test/node/execute.test.ts index b2e76e54efc..d047e35035f 100644 --- a/noir/noir-repo/tooling/noir_js/test/node/execute.test.ts +++ b/noir/noir-repo/tooling/noir_js/test/node/execute.test.ts @@ -117,3 +117,15 @@ it('successfully executes a program with multiple acir circuits', async () => { expect(knownError.message).to.equal('Circuit execution failed: Error: Cannot satisfy constraint'); } }); + +it('successfully executes a program with multiple acir circuits', async () => { + const inputs = { + x: '10', + }; + try { + await new Noir(fold_fibonacci_program).execute(inputs); + } catch (error) { + const knownError = error as Error; + expect(knownError.message).to.equal('Circuit execution failed: Error: Cannot satisfy constraint'); + } +}); diff --git a/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json b/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json index c6985f4b037..6adf8749aba 100644 --- a/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json +++ b/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json @@ -3,7 +3,7 @@ "contributors": [ "The Noir Team " ], - "version": "0.29.0", + "version": "0.30.0", "packageManager": "yarn@3.5.1", "license": "(MIT OR Apache-2.0)", "type": "module", @@ -42,7 +42,7 @@ "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" }, "dependencies": { - "@aztec/bb.js": "portal:../../../../barretenberg/ts", + "@aztec/bb.js": "0.38.0", "@noir-lang/types": "workspace:*", "fflate": "^0.8.0" }, diff --git a/noir/noir-repo/tooling/noir_js_types/package.json b/noir/noir-repo/tooling/noir_js_types/package.json index 5332ce20cc7..b2b84b640a5 100644 --- a/noir/noir-repo/tooling/noir_js_types/package.json +++ b/noir/noir-repo/tooling/noir_js_types/package.json @@ -4,7 +4,7 @@ "The Noir Team " ], "packageManager": "yarn@3.5.1", - "version": "0.29.0", + "version": "0.30.0", "license": "(MIT OR Apache-2.0)", "homepage": "https://noir-lang.org/", "repository": { diff --git a/noir/noir-repo/tooling/noirc_abi/src/lib.rs b/noir/noir-repo/tooling/noirc_abi/src/lib.rs index 7e89a102a98..7a1d1787ca5 100644 --- a/noir/noir-repo/tooling/noirc_abi/src/lib.rs +++ b/noir/noir-repo/tooling/noirc_abi/src/lib.rs @@ -471,7 +471,15 @@ impl Abi { .copied() }) { - Some(decode_value(&mut return_witness_values.into_iter(), &return_type.abi_type)?) + // We do not return value for the data bus. + if return_type.visibility == AbiVisibility::DataBus { + None + } else { + Some(decode_value( + &mut return_witness_values.into_iter(), + &return_type.abi_type, + )?) + } } else { // Unlike for the circuit inputs, we tolerate not being able to find the witness values for the return value. // This is because the user may be decoding a partial witness map for which is hasn't been calculated yet. diff --git a/noir/noir-repo/tooling/noirc_abi_wasm/package.json b/noir/noir-repo/tooling/noirc_abi_wasm/package.json index ac7d1606298..399a333f157 100644 --- a/noir/noir-repo/tooling/noirc_abi_wasm/package.json +++ b/noir/noir-repo/tooling/noirc_abi_wasm/package.json @@ -3,7 +3,7 @@ "contributors": [ "The Noir Team " ], - "version": "0.29.0", + "version": "0.30.0", "license": "(MIT OR Apache-2.0)", "homepage": "https://noir-lang.org/", "repository": { diff --git a/noir/noir-repo/yarn.lock b/noir/noir-repo/yarn.lock index b45678f5d8b..85966ce3392 100644 --- a/noir/noir-repo/yarn.lock +++ b/noir/noir-repo/yarn.lock @@ -221,18 +221,19 @@ __metadata: languageName: node linkType: hard -"@aztec/bb.js@portal:../../../../barretenberg/ts::locator=%40noir-lang%2Fbackend_barretenberg%40workspace%3Atooling%2Fnoir_js_backend_barretenberg": - version: 0.0.0-use.local - resolution: "@aztec/bb.js@portal:../../../../barretenberg/ts::locator=%40noir-lang%2Fbackend_barretenberg%40workspace%3Atooling%2Fnoir_js_backend_barretenberg" +"@aztec/bb.js@npm:0.38.0": + version: 0.38.0 + resolution: "@aztec/bb.js@npm:0.38.0" dependencies: comlink: ^4.4.1 commander: ^10.0.1 debug: ^4.3.4 tslib: ^2.4.0 bin: - bb.js: ./dest/node/main.js + bb.js: dest/node/main.js + checksum: 5ebc2850f37993db1d0fe4306ec612e9df14c5d227e1451f1b2f96e63e61c64225c46b32d1e1d2a1a0c37795e50b2875362520e9eb49324312516ec9fd6de2c7 languageName: node - linkType: soft + linkType: hard "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.11, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3": version: 7.23.5 @@ -4395,7 +4396,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg" dependencies: - "@aztec/bb.js": "portal:../../../../barretenberg/ts" + "@aztec/bb.js": 0.38.0 "@noir-lang/types": "workspace:*" "@types/node": ^20.6.2 "@types/prettier": ^3 From 962345ddec6754dbf36203436815b42142a56506 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Tue, 21 May 2024 18:56:50 +0000 Subject: [PATCH 2/4] chore: update cargo.lock --- avm-transpiler/Cargo.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock index e0b11bd742a..2a5b6a37126 100644 --- a/avm-transpiler/Cargo.lock +++ b/avm-transpiler/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "acir" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir_field", "base64 0.21.7", @@ -18,7 +18,7 @@ dependencies = [ [[package]] name = "acir_field" -version = "0.45.0" +version = "0.46.0" dependencies = [ "ark-bn254", "ark-ff", @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "acvm" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "acvm_blackbox_solver", @@ -44,7 +44,7 @@ dependencies = [ [[package]] name = "acvm_blackbox_solver" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "blake2", @@ -320,7 +320,7 @@ dependencies = [ [[package]] name = "aztec_macros" -version = "0.29.0" +version = "0.30.0" dependencies = [ "convert_case", "iter-extended", @@ -431,7 +431,7 @@ dependencies = [ [[package]] name = "brillig" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir_field", "serde", @@ -439,7 +439,7 @@ dependencies = [ [[package]] name = "brillig_vm" -version = "0.45.0" +version = "0.46.0" dependencies = [ "acir", "acvm_blackbox_solver", @@ -851,7 +851,7 @@ dependencies = [ [[package]] name = "fm" -version = "0.29.0" +version = "0.30.0" dependencies = [ "codespan-reporting", "serde", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "iter-extended" -version = "0.29.0" +version = "0.30.0" [[package]] name = "itertools" @@ -1200,7 +1200,7 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "noirc_abi" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "iter-extended", @@ -1216,11 +1216,11 @@ dependencies = [ [[package]] name = "noirc_arena" -version = "0.29.0" +version = "0.30.0" [[package]] name = "noirc_driver" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "aztec_macros", @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "noirc_errors" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "base64 0.21.7", @@ -1259,7 +1259,7 @@ dependencies = [ [[package]] name = "noirc_evaluator" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "chrono", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "noirc_frontend" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "chumsky", @@ -1301,7 +1301,7 @@ dependencies = [ [[package]] name = "noirc_printable_type" -version = "0.29.0" +version = "0.30.0" dependencies = [ "acvm", "iter-extended", From 54711f4cb82909ee0438f586bcd81b18a35fb209 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Tue, 21 May 2024 19:24:01 +0000 Subject: [PATCH 3/4] chore: fmt --- .../compiler/noirc_frontend/src/elaborator/expressions.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs index 9c007f54d61..83b607ca976 100644 --- a/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs +++ b/noir/noir-repo/compiler/noirc_frontend/src/elaborator/expressions.rs @@ -322,7 +322,8 @@ impl<'context> Elaborator<'context> { let generics = method_call.generics.map(|option_inner| { option_inner.into_iter().map(|generic| self.resolve_type(generic)).collect() }); - let method_call = HirMethodCallExpression { method, object, arguments, location, generics }; + let method_call = + HirMethodCallExpression { method, object, arguments, location, generics }; let ((function_id, function_name), function_call) = method_call.into_function_call( &method_ref, object_type, From 6aaa42bee2121d97886b30b0b78e52b30c87fa4f Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Tue, 21 May 2024 19:49:49 +0000 Subject: [PATCH 4/4] chore: update yarn.lock --- yarn-project/yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index f8cd6fc6dc7..04baf783949 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -2873,7 +2873,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A." dependencies: - "@noir-lang/types": 0.29.0 + "@noir-lang/types": 0.30.0 glob: ^10.3.10 ts-command-line-args: ^2.5.1 bin: @@ -2882,13 +2882,13 @@ __metadata: linkType: soft "@noir-lang/noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.": - version: 0.29.0 - resolution: "@noir-lang/noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=edd4c2&locator=%40aztec%2Faztec3-packages%40workspace%3A." + version: 0.30.0 + resolution: "@noir-lang/noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=ae4724&locator=%40aztec%2Faztec3-packages%40workspace%3A." dependencies: - "@noir-lang/acvm_js": 0.45.0 - "@noir-lang/noirc_abi": 0.29.0 - "@noir-lang/types": 0.29.0 - checksum: 33ebaa2b3cabd8fc71c6d07ecd014fde7be0036aed5b56d37ad08241ce41848c2330bafda50eb0c270a57dbc2a795edf88d1d8a129b89a409d4d49a1b835d577 + "@noir-lang/acvm_js": 0.46.0 + "@noir-lang/noirc_abi": 0.30.0 + "@noir-lang/types": 0.30.0 + checksum: 5bb35e8085b52d6be22e5ec4c3f7aac71bafc519a69a6ef157fc166d8b7729f25850ab2838ef92b5b5955e8f74a9782a69669515f8ac85983df76157ca99da2e languageName: node linkType: hard @@ -2896,7 +2896,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A." dependencies: - "@noir-lang/types": 0.29.0 + "@noir-lang/types": 0.30.0 languageName: node linkType: soft