Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

fix: Add lib crate-type to build #215

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Conversation

vezenovm
Copy link
Collaborator

@vezenovm vezenovm commented May 31, 2023

Description

In the Noir PR that integrates acvm-0.13.0 updates there was a blocker where acvm-backend-barretenberg was not being found.

I followed the hack mentioned in this issue (rust-lang/cargo#4881). That includes an extra crate-type. However, I think this most likely blows up the size of the binary that is created. And I noticed that cargo added a flag a few months ago to specify the crate type (rust-lang/cargo#10083). Should we update our manifest and flake on the Noir repo to handle this @phated ?

I pushed this PR to test the Noir CI with the new dep: acvm-0.13.0-dbg. I will push this branch as a PR on the Noir repo once the final CI passes and a couple other updates are reconciled.

Problem*

Resolves

Summary*

This PR sets out to

Example

Before:


After:


Additional Context

PR Checklist*

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt on default settings.

@vezenovm vezenovm changed the title chore: Add crate-type to build chore: Add lib crate-type to build May 31, 2023
@vezenovm vezenovm changed the title chore: Add lib crate-type to build fix: Add lib crate-type to build May 31, 2023
@phated
Copy link
Contributor

phated commented May 31, 2023

@vezenovm we aren't compiling this to wasm for the browser anymore, so you can probably just remove the [lib] section completely.

@kevaundray kevaundray merged commit f51e196 into acvm-0.13.0 Jun 1, 2023
@kevaundray kevaundray deleted the acvm-0.13.0-dbg branch June 1, 2023 10:17
kevaundray added a commit that referenced this pull request Jun 1, 2023
* feat: update to ACVM 0.13.0

* chore: remove lingering `ComputeMerkleRoot` test

* chore: remove unused `blake2s` dependency

* fix: Allow async functions without send on async trait (#198)

* feat!: Replace `js` feature with `wasm32` target (#202)

feat!: Replace `js` feature with wasm32 target

* chore: bump ACVM commit

* feat!: Add latest BB to acvm 0.13 (#214)

* chore: remove `compute_merkle_root` constraints

* chore: add "Brillig" to cspell

* feat: added keccakvar constraints

* feat!: added keccakvar constraints (#213)

feat: added keccakvar constraints

* chore: update bb sys and bb

* fix: changes to update to latest bb

* fix: fix wasm hash_index

* chore: updated bb-sys pointer

---------

Co-authored-by: TomAFrench <tom@tomfren.ch>

* feat: update acvm pointer

* fix: Add `lib` crate-type to build  (#215)

add lib crate type

* Update Cargo.toml

* Update Cargo.toml

* update cargo lock

* remove original commit from barretenberg in flake.nix and flake.lock

---------

Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com>
Co-authored-by: sirasistant <sirasistant@gmail.com>
Co-authored-by: Maxim Vezenov <mvezenov@gmail.com>
Co-authored-by: kevaundray <kevtheappdev@gmail.com>
kevaundray added a commit that referenced this pull request Jun 7, 2023
* feat: update to ACVM 0.13.0

* chore: remove lingering `ComputeMerkleRoot` test

* chore: remove unused `blake2s` dependency

* fix: Allow async functions without send on async trait (#198)

* feat!: Replace `js` feature with `wasm32` target (#202)

feat!: Replace `js` feature with wasm32 target

* initial cherry-pick of recursion work into acvm-0.13.0

* fix up how we are handling input_aggregation_object in bberg structures

* move over some of the composer and proof system methods for recursion

* bring in pwg verify_proof method

* update recursive composition composer tests and udpate deps to remote versions

* chore: bump ACVM commit

* chore: remove `compute_merkle_root` constraints

* chore: add "Brillig" to cspell

* feat: added keccakvar constraints

* chore: update bb sys and bb

* fix: changes to update to latest bb

* removed verify_proof simulation

* removed unneeded recursion work

* building

* remove unused len func

* remove unused vars

* no RecursionConstraint in bb structures, clean up still required

* feat!: Add latest BB to acvm 0.13 (#214)

* chore: remove `compute_merkle_root` constraints

* chore: add "Brillig" to cspell

* feat: added keccakvar constraints

* feat!: added keccakvar constraints (#213)

feat: added keccakvar constraints

* chore: update bb sys and bb

* fix: changes to update to latest bb

* fix: fix wasm hash_index

* chore: updated bb-sys pointer

---------

Co-authored-by: TomAFrench <tom@tomfren.ch>

* feat: update acvm pointer

* fix: Add `lib` crate-type to build  (#215)

add lib crate type

* Update Cargo.toml

* Update Cargo.toml

* update cargo lock

* remove original commit from barretenberg in flake.nix and flake.lock

* remove all recursion constraints

* remove change to nix flake

* remove recursion constraint serialization

* update acvm commit

* change 0.13.0

* update flake lock and cargo toml to most recent acvm with verify proof

* chagne flake.lok

* new bberg structures containg recursion constraint

* ConstraintSystem public outside of crate

* missing lib update

* update bberg commitment in flake lock

* switch to pub use for constraint system

* error type pub

* use recursion constraint to_bytes

* correct Circuit to ConstraintSystem ser for recursion aggregation

* update rev to commit on acvm-backned-barretenberg branch

* remove debug recursion constraint

* update acvm

* update acvm

* remove unwrap when fetched nested_aggregation_object

* switch to expect

* update to 0.14.0

---------

Co-authored-by: Tom French <tom@tomfren.ch>
Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com>
Co-authored-by: sirasistant <sirasistant@gmail.com>
Co-authored-by: kevaundray <kevtheappdev@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants