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.

Sign up for GitHub

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

Jump to bottom

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9b75bea
Add EVM webb anchor contracts w/ CHAIN_ID (#123)
drewstone Mar 22, 2021
40dad79
Adds merkle extension directory (#124)
drewstone Mar 22, 2021
757b4f6
Upload to crates (#120)
Mar 22, 2021
e8b43d2
Improve events (#122)
Mar 22, 2021
9c899dd
Multiasset integration (#119)
Mar 22, 2021
fba0a39
Remove chain id
drewstone Apr 2, 2021
913b5a4
Renames group to tree (#126)
drewstone Apr 5, 2021
75e1ffa
Update rust
drewstone Apr 7, 2021
cb84e68
Give basic weight to create_new
drewstone Apr 7, 2021
fed667c
Add RPC `merkle.treeLeaves` to `Merkle` pallet (#129)
Apr 9, 2021
f27957b
Chain id removal
drewstone Apr 12, 2021
2f709af
New Github actions and Dockerfile (#131)
Apr 12, 2021
bb59c3c
Fix docker build (#132)
Apr 13, 2021
b89233e
fix image name
Apr 13, 2021
f325656
New token pallet (#134)
drewstone Apr 19, 2021
4696152
Adds frontier back (#135)
drewstone Apr 21, 2021
62d57ae
fix failing tests
Apr 22, 2021
2216f64
Update contracts, add mocks
drewstone Apr 22, 2021
66e0aba
Add ts-tests from edgeware/frontier for local anon testing
drewstone Apr 23, 2021
c3ec141
Tsconfig, package.json update
drewstone Apr 23, 2021
8aa83ad
ups
Apr 23, 2021
fedd21c
Merge 'develop' of git@github.com:webb-tools/anon.git
Apr 23, 2021
268534b
Add edgeware types back
drewstone Apr 23, 2021
01db873
Add truffle config
drewstone Apr 26, 2021
3890fc7
Update to master substrate (#137)
drewstone Apr 27, 2021
5b19638
switch to ubuntu as base docker image
Apr 30, 2021
40eaf8b
Add anchor (#140)
drewstone May 4, 2021
e90b2d5
Update
drewstone May 4, 2021
9cea99d
Update toml/lock
drewstone May 4, 2021
c086235
Ups frontier
drewstone May 6, 2021
01fcea6
Merge master
drewstone May 9, 2021
69dc8a4
Up lock
drewstone May 9, 2021
097486e
Merge branch 'master' into develop
drewstone May 10, 2021
dc149de
Fix readme
drewstone May 10, 2021
6d29616
rename scripts to use webb-node (#141)
nepoche May 10, 2021
564ffc6
Merkle bytes interface (#144)
May 17, 2021
035eb65
Merkle arkworks support (#145)
Jun 7, 2021
544ae9c
Remove ts-tests
drewstone Jun 7, 2021
804f60c
Bridge pallet stubbed implementation (#138)
drewstone Jun 10, 2021
27f4596
Verify guard (#147)
Jun 10, 2021
caad6e3
Update verification key storage (#149)
drewstone Jun 13, 2021
9dd20e0
Key storage - Storing verifying key data in runtime using 2-step init…
drewstone Jun 21, 2021
7f250db
Bulletproofs precompiles (#148)
drewstone Jun 23, 2021
2f523fa
Fixes to the CI / benchmarking & cleanup of unused params (#162)
drewstone Jun 24, 2021
da006a0
Add pallet-assets support for a mixer (#163)
drewstone Jun 28, 2021
ae9e248
Merge master
drewstone Jul 5, 2021
5b6a1e0
Fix
drewstone Jul 5, 2021
d1fdfec
Add bn254 support (#165)
drewstone Jul 7, 2021
0aa41a3
Merge branch 'master' into develop
drewstone Jul 7, 2021
8d902af
lock update
drewstone Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 61 additions & 76 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions pallets/merkle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,17 @@ sp-io = { default-features = false, version = "3.0.0", git = "https://github.com
frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.6" }
lazy_static = { version = "1.4.0", features = ["spin_no_std"] }

arkworks-gadgets = { git = "https://github.com/webb-tools/arkworks-gadgets", rev = "ed39192", features = ["r1cs"], default-features = false }
ark-groth16 = {version = "^0.2.0", default-features = false }
ark-serialize = {version = "^0.2.0", default-features = false }
ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false }
ark-groth16 = {version = "^0.3.0", default-features = false }
ark-serialize = {version = "^0.3.0", default-features = false }

[dependencies.arkworks-gadgets]
version = "0.2.5"
default-features = false
features = [
"r1cs",
"default_poseidon",
]

[dependencies.curve25519-dalek]
version = "3.0.0"
Expand Down
Loading