Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to master: BN254 & more poseidon fns #166

Merged
merged 50 commits into from
Jul 8, 2021
Merged

Develop to master: BN254 & more poseidon fns #166

merged 50 commits into from
Jul 8, 2021

Commits on Mar 22, 2021

  1. Configuration menu
    Copy the full SHA
    9b75bea View commit details
    Browse the repository at this point in the history
  2. Adds merkle extension directory (#124)

    * Add EVM webb anchor contracts w/ CHAIN_ID
    
    * zkutil script
    
    * Add old evm files and wasm project for merkle extension
    
    * update toml
    
    * Add yarn lock
    drewstone committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    40dad79 View commit details
    Browse the repository at this point in the history
  3. Upload to crates (#120)

    * Added orml pallets
    
    * Update config and types
    
    * Added native currency id to config
    
    * Runtime config, benchmark errors
    
    * Testing mixer with non-native currency
    
    * Updated deps, remove wasm-utils
    
    * Using merkle from crates
    
    * Return back to local merkle dep
    Filip Lazovic committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    757b4f6 View commit details
    Browse the repository at this point in the history
  4. Improve events (#122)

    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    Filip Lazovic and Shady Khalifa committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    e8b43d2 View commit details
    Browse the repository at this point in the history
  5. Multiasset integration (#119)

    * Added orml pallets
    
    * Update config and types
    
    * Added native currency id to config
    
    * Runtime config, benchmark errors
    
    * Testing mixer with non-native currency
    
    * Making create_new non-dispatchable
    
    Co-authored-by: Drew Stone <drewstone329@gmail.com>
    Filip Lazovic and drewstone committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    9c899dd View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. Remove chain id

    drewstone committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    fba0a39 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Renames group to tree (#126)

    * Renames group to tree
    
    * Rename more
    
    * Fix naming err
    
    * Update pallets/mixer/src/lib.rs
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    drewstone and Filip Lazovic committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    913b5a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Update rust

    drewstone committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    75e1ffa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cb84e68 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Add RPC merkle.treeLeaves to Merkle pallet (#129)

    * remove yarn.lock
    
    * add rpc crate
    
    * add merkle rpc impl
    
    * fix some tests
    
    * Update runtime/src/lib.rs
    
    * Update pallets/merkle/src/lib.rs
    
    * Update pallets/merkle/src/lib.rs
    
    * Update pallets/merkle/rpc/src/lib.rs
    
    Co-authored-by: Drew Stone <drewstone329@gmail.com>
    Shady Khalifa and drewstone committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    fed667c View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Chain id removal

    drewstone committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    f27957b View commit details
    Browse the repository at this point in the history
  2. New Github actions and Dockerfile (#131)

    * github actions and Dockerfile
    
    * dockerignore
    
    * fmt
    
    * cache lints
    
    * disable clippy for now
    
    * add build to the CI
    
    * remove old actions
    
    * no-override
    Shady Khalifa committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    2f709af View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Fix docker build (#132)

    Shady Khalifa committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    bb59c3c View commit details
    Browse the repository at this point in the history
  2. fix image name

    Shady Khalifa committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    b89233e View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2021

  1. New token pallet (#134)

    * Updates
    
    * Updates
    
    * Merge pallet_assets w/ orml_tokens
    
    * Pallets compile, node doesn't
    
    * [wip] comment out frontier for now
    
    * Comment out EVM/Frontier, get node compiling
    
    * remove frontier service file from git
    
    * Newlines
    
    * ups (#133)
    
    * Test updates
    
    * Fix merge account
    
    * Fix no_op test
    
    * Updates, dust test not working
    
    * Fix all tests
    
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    drewstone and Shady Khalifa committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    f325656 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Adds frontier back (#135)

    * Updates
    
    * Updates
    
    * Merge pallet_assets w/ orml_tokens
    
    * Pallets compile, node doesn't
    
    * [wip] comment out frontier for now
    
    * Comment out EVM/Frontier, get node compiling
    
    * remove frontier service file from git
    
    * Newlines
    
    * ups (#133)
    
    * Test updates
    
    * Fix merge account
    
    * Fix no_op test
    
    * Updates, dust test not working
    
    * Fix all tests
    
    * Toml updates
    
    * Adds frontier, mocks orml for as new local packages
    
    * Add all rpc methods back, fix service
    
    * Change to webb node from template
    
    * Organising
    
    * Optional rpc in toml
    
    * Fix conflict
    
    * Update tests and mocks
    
    * Reverts
    
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    drewstone and Shady Khalifa committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    4696152 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. fix failing tests

    Shady Khalifa committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    62d57ae View commit details
    Browse the repository at this point in the history
  2. Update contracts, add mocks

    drewstone committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    2216f64 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Configuration menu
    Copy the full SHA
    66e0aba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c3ec141 View commit details
    Browse the repository at this point in the history
  3. ups

    Shady Khalifa committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    8aa83ad View commit details
    Browse the repository at this point in the history
  4. Merge 'develop' of git@github.com:webb-tools/anon.git

    Shady Khalifa committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    fedd21c View commit details
    Browse the repository at this point in the history
  5. Add edgeware types back

    drewstone committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    268534b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. Add truffle config

    drewstone committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    01db873 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

  1. Update to master substrate (#137)

    * Update to master substrate
    
    * Fix benchmarks and tests
    
    * Formatting/lint
    drewstone committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    3890fc7 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. switch to ubuntu as base docker image

    Shady Khalifa committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    5b19638 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. Add anchor (#140)

    * Update README.md
    
    * Update README.md (#125)
    
    * Update build.sh
    
    * Develop to master merge (#136)
    
    * Add EVM webb anchor contracts w/ CHAIN_ID (#123)
    
    * Adds merkle extension directory (#124)
    
    * Add EVM webb anchor contracts w/ CHAIN_ID
    
    * zkutil script
    
    * Add old evm files and wasm project for merkle extension
    
    * update toml
    
    * Add yarn lock
    
    * Upload to crates (#120)
    
    * Added orml pallets
    
    * Update config and types
    
    * Added native currency id to config
    
    * Runtime config, benchmark errors
    
    * Testing mixer with non-native currency
    
    * Updated deps, remove wasm-utils
    
    * Using merkle from crates
    
    * Return back to local merkle dep
    
    * Improve events (#122)
    
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    
    * Multiasset integration (#119)
    
    * Added orml pallets
    
    * Update config and types
    
    * Added native currency id to config
    
    * Runtime config, benchmark errors
    
    * Testing mixer with non-native currency
    
    * Making create_new non-dispatchable
    
    Co-authored-by: Drew Stone <drewstone329@gmail.com>
    
    * Remove chain id
    
    * Renames group to tree (#126)
    
    * Renames group to tree
    
    * Rename more
    
    * Fix naming err
    
    * Update pallets/mixer/src/lib.rs
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    
    * Update rust
    
    * Give basic weight to create_new
    
    * Add RPC `merkle.treeLeaves` to `Merkle` pallet (#129)
    
    * remove yarn.lock
    
    * add rpc crate
    
    * add merkle rpc impl
    
    * fix some tests
    
    * Update runtime/src/lib.rs
    
    * Update pallets/merkle/src/lib.rs
    
    * Update pallets/merkle/src/lib.rs
    
    * Update pallets/merkle/rpc/src/lib.rs
    
    Co-authored-by: Drew Stone <drewstone329@gmail.com>
    
    * Chain id removal
    
    * New Github actions and Dockerfile (#131)
    
    * github actions and Dockerfile
    
    * dockerignore
    
    * fmt
    
    * cache lints
    
    * disable clippy for now
    
    * add build to the CI
    
    * remove old actions
    
    * no-override
    
    * Fix docker build (#132)
    
    * fix image name
    
    * New token pallet (#134)
    
    * Updates
    
    * Updates
    
    * Merge pallet_assets w/ orml_tokens
    
    * Pallets compile, node doesn't
    
    * [wip] comment out frontier for now
    
    * Comment out EVM/Frontier, get node compiling
    
    * remove frontier service file from git
    
    * Newlines
    
    * ups (#133)
    
    * Test updates
    
    * Fix merge account
    
    * Fix no_op test
    
    * Updates, dust test not working
    
    * Fix all tests
    
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    
    * Adds frontier back (#135)
    
    * Updates
    
    * Updates
    
    * Merge pallet_assets w/ orml_tokens
    
    * Pallets compile, node doesn't
    
    * [wip] comment out frontier for now
    
    * Comment out EVM/Frontier, get node compiling
    
    * remove frontier service file from git
    
    * Newlines
    
    * ups (#133)
    
    * Test updates
    
    * Fix merge account
    
    * Fix no_op test
    
    * Updates, dust test not working
    
    * Fix all tests
    
    * Toml updates
    
    * Adds frontier, mocks orml for as new local packages
    
    * Add all rpc methods back, fix service
    
    * Change to webb node from template
    
    * Organising
    
    * Optional rpc in toml
    
    * Fix conflict
    
    * Update tests and mocks
    
    * Reverts
    
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    
    * fix failing tests
    
    * Update contracts, add mocks
    
    * Add ts-tests from edgeware/frontier for local anon testing
    
    * Tsconfig,  package.json update
    
    * ups
    
    * Add edgeware types back
    
    * Add truffle config
    
    * Update to master substrate (#137)
    
    * Update to master substrate
    
    * Fix benchmarks and tests
    
    * Formatting/lint
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    
    * Update README.md
    
    * Update README.md
    
    * Add anchor
    
    * Remove old anchor, replace with new submodule
    
    * Update submodule
    
    * Attempting to pass test for circom on locally generated keys
    
    * Get evm tests passing with solidity 0.7.6 on ganache
    
    * Change evm contracts readme
    
    * Link git submodule for anchor contracts and types to anon repo branch add-anchor
    
    * Add contract ABIs for a locally generated circuit
    
    * Update contracts ABI from build folder, still ignore build/circuits
    
    * Remove random seed
    
    * Update README.md
    
    * Update README.md (#125)
    
    * Update build.sh
    
    * Update README.md
    
    * Update README.md
    
    * Add anchor
    
    * Remove old anchor, replace with new submodule
    
    * Update submodule
    
    * Attempting to pass test for circom on locally generated keys
    
    * Get evm tests passing with solidity 0.7.6 on ganache
    
    * Change evm contracts readme
    
    * Link git submodule for anchor contracts and types to anon repo branch add-anchor
    
    * Add contract ABIs for a locally generated circuit
    
    * Update contracts ABI from build folder, still ignore build/circuits
    
    * Remove random seed
    
    * Fix service
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    Co-authored-by: Nathan Barnavon <nepoche@yahoo.com>
    4 people committed May 4, 2021
    Configuration menu
    Copy the full SHA
    40eaf8b View commit details
    Browse the repository at this point in the history
  2. Update

    drewstone committed May 4, 2021
    Configuration menu
    Copy the full SHA
    e90b2d5 View commit details
    Browse the repository at this point in the history
  3. Update toml/lock

    drewstone committed May 4, 2021
    Configuration menu
    Copy the full SHA
    9cea99d View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. Ups frontier

    drewstone committed May 6, 2021
    Configuration menu
    Copy the full SHA
    c086235 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2021

  1. Merge master

    drewstone committed May 9, 2021
    Configuration menu
    Copy the full SHA
    01fcea6 View commit details
    Browse the repository at this point in the history
  2. Up lock

    drewstone committed May 9, 2021
    Configuration menu
    Copy the full SHA
    69dc8a4 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. Configuration menu
    Copy the full SHA
    097486e View commit details
    Browse the repository at this point in the history
  2. Fix readme

    drewstone committed May 10, 2021
    Configuration menu
    Copy the full SHA
    dc149de View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6d29616 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2021

  1. Merkle bytes interface (#144)

    * Moving zk logic outside the pallet
    
    * Moving bulletproofs verification outside the pallet
    
    * Using bytes vec for inputs
    
    * Updated mixer with new types
    
    * Fixed tests
    
    * Updated job hooks, ran cargo fmt
    
    * Fix compile errors
    
    * Removed unused hasher
    
    * Bring back hooks
    Filip Lazovic committed May 17, 2021
    Configuration menu
    Copy the full SHA
    564ffc6 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Merkle arkworks support (#145)

    * Updated job hooks, ran cargo fmt
    
    * Bring back hooks
    
    * Compiling to no_std
    
    * Added arkworks hashing
    
    * Error handling improvements
    
    * Cargo fmt
    
    * Updated cryoto-primitives
    
    * Compiled
    
    * Update zero tree gen, types
    
    * Updated verify function
    
    * Passing test
    
    * Fixed mixer
    
    * Moved to mixer gadget
    
    * Using pallet Error enum
    
    * Updates after review part 1
    
    * Update after review part 2
    
    * Rename args, hasher.rs -> setup.rs
    
    * Added more tests
    Filip Lazovic committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    035eb65 View commit details
    Browse the repository at this point in the history
  2. Remove ts-tests

    drewstone committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    544ae9c View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Bridge pallet stubbed implementation (#138)

    * Update traits for bridge, add bridge wrap fn
    
    * stub deposit
    
    * Unwrap fn for webb wrapped assets on bridge
    
    * More updates
    
    * Stub out more functions
    
    * Tidy up mock
    
    * Change mixer to anchor in bridge docs
    
    * Update branch in bridge toml
    
    * use webb-tools/substrate fork
    
    * Updates frontier dependency (#146)
    
    * Update and add new inherent
    
    * Update
    
    * Update lock
    
    * Ups
    
    * Merge develop
    
    * Updates
    
    * Fixes
    
    Co-authored-by: Shady Khalifa <shekohex@gmail.com>
    drewstone and Shady Khalifa committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    804f60c View commit details
    Browse the repository at this point in the history
  2. Verify guard (#147)

    * Added verification guard
    
    * Updated verifying key storage
    Filip Lazovic committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    27f4596 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2021

  1. Update verification key storage (#149)

    * Fix bridge mock
    
    * Update verification key flow
    
    * Add pallet functions
    
    * Function comment update
    drewstone committed Jun 13, 2021
    Configuration menu
    Copy the full SHA
    caad6e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. Key storage - Storing verifying key data in runtime using 2-step init…

    …ialization. (#157)
    
    * Storing keys in runtime storage, [wip]
    
    * Fix tests, get_mixer requires initialized trees
    
    * Update initialization with new pallet function
    
    * Updates to key storage - master merge (#159)
    
    * Merge master
    
    * Remove contracts
    
    * Ups
    
    * Upds
    
    * Fmt
    
    * Remove warnings for bridge until implemented
    
    * Remove options
    
    * Fmt
    drewstone committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    9dd20e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Bulletproofs precompiles (#148)

    * Added precompiles
    
    * Using chacha
    
    * cargo fmt
    
    * Added tests for invalid casees
    
    * Add precompile test
    
    * Added verify directly test
    
    * Fix comments
    
    * Update frontier fork, substrate deps, rebuild/receive same error
    
    * Toml updates
    
    * More attempts
    
    * Compiles
    
    * Merge dev
    
    * fmt
    
    Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
    drewstone and Filip Lazovic committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    7f250db View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. Fixes to the CI / benchmarking & cleanup of unused params (#162)

    * Fix compile issues
    
    * Ups
    
    * Build benchmarks works
    
    * Build mixer benchmarks
    
    * Fmt
    
    * Fix test script
    drewstone committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    2f523fa View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. Add pallet-assets support for a mixer (#163)

    * Add pallet-assets support for a mixer
    
    * Add pallet
    
    * Fmt
    drewstone committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    da006a0 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. Merge master

    drewstone committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    ae9e248 View commit details
    Browse the repository at this point in the history
  2. Fix

    drewstone committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    5b6a1e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2021

  1. Add bn254 support (#165)

    * Add bn254
    
    * fmt
    
    * fix tests
    
    * Fmt
    drewstone committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    d1fdfec View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0aa41a3 View commit details
    Browse the repository at this point in the history
  3. lock update

    drewstone committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    8d902af View commit details
    Browse the repository at this point in the history