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

Bridge pool merkle tree #573

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d20340f
[tmp]: Refactoring the merkle tree to properly support multistores mo…
batconjurer Sep 26, 2022
ff766b8
[chore]: Merge in keccak hash changes and vext shims
batconjurer Sep 26, 2022
3e01baf
[feat]: Added membership proofs for eth bridge pool
batconjurer Sep 26, 2022
f6a4c15
Merge branch 'bat/ethbridge/keccak-hash-refactor' into bat/ethbridge/…
batconjurer Sep 26, 2022
f4ed195
Merge branch 'bat/ethbridge/keccak-hash-refactor' into bat/ethbridge/…
batconjurer Sep 27, 2022
2c63406
feat: finished base implementation, need to debug
batconjurer Sep 29, 2022
463089d
[chore]: Rebase on eth-bridge-intregration
batconjurer Sep 29, 2022
2970208
[feat]: Added membership proofs for eth bridge pool
batconjurer Sep 26, 2022
9700e1a
feat: finished base implementation, need to debug
batconjurer Sep 29, 2022
5b6e744
[chore]: Rebase on eth-bridge-intregration
batconjurer Sep 29, 2022
55f90a2
[fix]: Rebasing
batconjurer Sep 29, 2022
5be3900
[feat]: Debugged code to compiling. Written for tests for the merkle …
batconjurer Sep 30, 2022
3543b63
[feat]: Added proptests to the bridge tree proofs and corrected the b…
batconjurer Oct 3, 2022
0d15fb3
[feat]: Added multi-store logic and brige pool merkle tree
batconjurer Oct 7, 2022
9bccd81
[chore]: Merging in some changes from code review
batconjurer Oct 10, 2022
35bb9d4
[feat]: Small cleanups. Added the signed merkle tree root to accounts…
batconjurer Oct 10, 2022
4f85abe
Merge branch 'eth-bridge-integration' into bat/ethbridge/bridge-pool-…
batconjurer Oct 10, 2022
f3f1a32
[fix]: Fixed some broken imports
batconjurer Oct 12, 2022
2ef1f95
[fix]: Fixing broken doc link
batconjurer Oct 12, 2022
5b259eb
[ci] wasm checksums update
github-actions[bot] Oct 12, 2022
2ffda58
Merge branch 'eth-bridge-integration' into bat/ethbridge/bridge-pool-…
batconjurer Oct 17, 2022
93000b0
[ci] wasm checksums update
github-actions[bot] Oct 17, 2022
1ccb304
[fix]: Simplified some conversions, avoided unnecessary heap allocations
batconjurer Oct 18, 2022
038360d
[ci] wasm checksums update
github-actions[bot] Oct 18, 2022
118c699
[chore]: Handling code review comments
batconjurer Oct 20, 2022
74dd34d
Merge branch 'eth-bridge-integration' into bat/ethbridge/bridge-pool-…
batconjurer Oct 20, 2022
0f595cc
[fix]: Added asset type to Pending Transfer serialization
batconjurer Oct 20, 2022
fed3e68
Merge branch 'bat/ethbridge/bridge-pool-merkle-tree' of github.com:an…
batconjurer Oct 20, 2022
645bfc2
[fix]: More code review fixes
batconjurer Oct 20, 2022
df52bf7
Merge branch 'eth-bridge-integration' into bat/ethbridge/bridge-pool-…
batconjurer Oct 20, 2022
49e08d0
[fix]: Fixed an import
batconjurer Oct 20, 2022
09677d5
[fix]: Formatting
batconjurer Oct 20, 2022
1d15e12
[ci] wasm checksums update
github-actions[bot] Oct 20, 2022
12847ec
Merge branch 'eth-bridge-integration' into bat/ethbridge/bridge-pool-…
batconjurer Oct 21, 2022
dc283a6
[ci] wasm checksums update
github-actions[bot] Oct 21, 2022
4e208f9
[fix]: Some code review changes
batconjurer Oct 24, 2022
3c0be07
[ci] wasm checksums update
github-actions[bot] Oct 24, 2022
d392d51
Merge branch 'eth-bridge-integration' into bat/ethbridge/bridge-pool-…
batconjurer Oct 25, 2022
c6452ba
Update shared/src/ledger/eth_bridge/storage/bridge_pool.rs
batconjurer Oct 25, 2022
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
4 changes: 4 additions & 0 deletions shared/src/ledger/eth_bridge/bridge_pool_vp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ where
tracing::debug!("The bridge pools escrow was not credited.");
return Ok(false);
}
tracing::info!(
"The Ethereum bridge pool VP accepted the transfer {:?}.",
transfer
);

Ok(true)
}
Expand Down
Loading