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

feat!: Replace js feature with wasm32 target #202

Merged
merged 1 commit into from
May 23, 2023

Conversation

phated
Copy link
Contributor

@phated phated commented May 18, 2023

Depends on #198 and #199

This reorganizes the Cargo.toml to tie features to their dependencies and just enables the dependency based on the native or wasm feature of the crate. It also removes the js feature and instead relies on the wasm32 target_arch.

Base automatically changed from acvm-0.12.0 to master May 19, 2023 12:29
@phated phated changed the base branch from master to acvm-0.13.0 May 22, 2023 17:54
@phated phated requested a review from TomAFrench May 22, 2023 18:04
@phated phated marked this pull request as ready for review May 22, 2023 18:04
@TomAFrench TomAFrench changed the title feat!: Replace js feature with wasm32 target feat!: Replace js feature with wasm32 target May 23, 2023
Copy link
Member

@TomAFrench TomAFrench left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@TomAFrench TomAFrench merged commit 86b99c8 into acvm-0.13.0 May 23, 2023
@TomAFrench TomAFrench deleted the phated/wasm32-target branch May 23, 2023 08:55
@TomAFrench
Copy link
Member

Actually, on second thoughts... As people can't currently build for JS with the js flag then surely this is non-breaking?

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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sirasistant <[email protected]>
Co-authored-by: Maxim Vezenov <[email protected]>
Co-authored-by: kevaundray <[email protected]>
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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Blaine Bublitz <[email protected]>
Co-authored-by: sirasistant <[email protected]>
Co-authored-by: kevaundray <[email protected]>
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.

2 participants