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

Conversation

batconjurer
Copy link
Member

This PR partially closes #420. It adds a merkle tree that will be used for the bridge pool. It also refactors the merkle tree storage to better accomodate multiple types of merkle trees in a uniform way (based off of PR #547 ).

This PR will depend on merging in #547 and #549 once they are approved for main.

This PR does not actually change the vp or wasm code, so the bridge pool is still help under the accounts sub-storage for now. This will be addressed in a subsequent PR.

@batconjurer batconjurer marked this pull request as draft October 10, 2022 13:36
@batconjurer
Copy link
Member Author

pls update wasm

@batconjurer batconjurer marked this pull request as ready for review October 12, 2022 09:22
@batconjurer batconjurer marked this pull request as draft October 12, 2022 09:23
@batconjurer batconjurer marked this pull request as ready for review October 17, 2022 14:18
@batconjurer batconjurer requested review from sug0 and james-chf and removed request for sug0 October 17, 2022 14:18
@batconjurer batconjurer requested a review from james-chf October 20, 2022 12:49
@batconjurer
Copy link
Member Author

pls update wasm

1 similar comment
@batconjurer
Copy link
Member Author

pls update wasm

@batconjurer
Copy link
Member Author

pls update wasm

batconjurer added a commit that referenced this pull request Oct 24, 2022
@batconjurer batconjurer requested a review from james-chf October 24, 2022 15:13
@batconjurer
Copy link
Member Author

pls update wasm

Copy link
Contributor

@james-chf james-chf left a comment

Choose a reason for hiding this comment

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

lgtm!

shared/src/ledger/eth_bridge/storage/bridge_pool.rs Outdated Show resolved Hide resolved
Co-authored-by: James <james@chainfork.com>
@batconjurer batconjurer merged commit 329c87b into eth-bridge-integration Oct 25, 2022
@batconjurer batconjurer deleted the bat/ethbridge/bridge-pool-merkle-tree branch October 25, 2022 08:43
batconjurer added a commit that referenced this pull request Oct 25, 2022
batconjurer added a commit that referenced this pull request Oct 25, 2022
batconjurer added a commit that referenced this pull request Nov 2, 2022
james-chf added a commit that referenced this pull request Nov 4, 2022
…0.9.0

* eth-bridge-integration: (194 commits)
  [c hore]: rebasing
  Update shared/src/types/key/secp256k1.rs
  Update shared/src/types/vote_extensions/validator_set_update.rs
  [fix]: Adding changes from code review
  Update shared/src/types/eth_bridge_pool.rs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [fix]: Removed duplicated code block
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [chore]: rebasing on eth-bridge-integration
  [chore]: Rebase on previous branches
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  rebasing
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [fix]: Removed duplicated code block
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Upgrading to v0.8
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [chore]: rebasing on changes from previous feature prs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  rebasing
  [feat]: Added val set args for relaying to ethereum
  [feat]: Corrected the abi encodings of bridge proofs
  [fix]: Fixed bug that produced proof for values not in the bridge pool and covered with test
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Updated bridge pool vp with the the new merklized storage
  [chore]: Rebased onto PR #573
  [feat]: Changed the bridge pool vp to used the merklized storage
  [feat]: Updated bridge pool vp with the the new merklized storage
  [feat]: Changed the bridge pool vp to used the merklized storage
  [feat]: Updated bridge pool vp with the the new merklized storage
  [chore]: Rebasing on v0.8
  [fix]: Tiny from code review
  [fix]: Some more error logging and formatting
  Update shared/src/ledger/eth_bridge/vp/mod.rs
  [feat]: Added checks the bridge pool vp that erc20 tokens are escrowed to its account
  [feat]: Bridge pool vp now checks that funds to be transferred are escrowed. Needs tests
  [fix]: Tiny from code review
  [fix]: Some more error logging and formatting
  Update shared/src/ledger/eth_bridge/vp/mod.rs
  [feat]: Added a nomralized voting power type
  Update shared/src/types/key/secp256k1.rs
  Update shared/src/types/vote_extensions/validator_set_update.rs
  [fix]: Adding changes from code review
  Update shared/src/types/eth_bridge_pool.rs
  [feat]: Added checks the bridge pool vp that erc20 tokens are escrowed to its account
  Rename fvp to voting_power
  [chore]: Formatting
  [feat]: Bridge pool vp now checks that funds to be transferred are escrowed. Needs tests
  [chore]: Formatting
  [chore]: rebasing on eth-bridge-integration
  Remove TODO item
  [chore]: Rebase on previous branches
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  [feat]: Added recovery ids to secp256k1 signatures
  [chore]: Added unit tests to the queries and fixed bugs it found
  [feat]: Added query end points to get the contents of the eth bridge pool and request merkle proofs
  ...

# Conflicts:
#	Cargo.lock
#	apps/src/lib/node/ledger/rpc.rs
#	apps/src/lib/node/ledger/shell/queries.rs
#	shared/src/ledger/eth_bridge/bridge_pool_vp.rs
#	shared/src/ledger/protocol/transactions/ethereum_events/eth_msgs.rs
#	shared/src/ledger/protocol/transactions/ethereum_events/mod.rs
#	shared/src/ledger/protocol/transactions/votes.rs
#	shared/src/ledger/storage/mod.rs
#	wasm/checksums.json
phy-chain pushed a commit to phy-chain/namada that referenced this pull request Mar 1, 2024
* fix: publish

* fix: build order
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants