Merge 0.9.0 into eth-bridge-integration #723

juped · 2022-11-01T18:46:46Z

wip, still needs rpc reimplemented

Update Namada Specs

This adds a new feature "async-client" and "tendermint-rpc" to shared crate that if enabled generate async client code for all router's handler methods, and implements it for tendermint-rpc client, respectively.

…ker' (#678) * fraccaman/ci-docs-cache: ci: invalide cf cache * fraccaman/ci-linker: ci: use mold linker

…/merge-0.9.0 * tomas/storage-read-height-bug: changelog: add #706 config: add `shell.storage_read_past_height_limit`, use it for queries storage: fix block heights used in read, write and delete rocksdb: fix delete_subspace_val diff write rocksdb: fix read_subspace_val_with_height test/storage: add a test for reading from arbitrary block heights # Conflicts: # apps/src/lib/node/ledger/shell/mod.rs

…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

james-chf · 2022-11-04T12:44:29Z

Current status: refactoring of bridge pool query endpoints to work with the new RPC router is WIP, some tests are still broken. There are still some conflicts with latest eth-bridge-integration that need to be merged in, after those tests are fixed up.

james-chf · 2022-11-04T12:46:08Z

Compiling with abcipp is also broken, though this is also the case on main - have reappropiated #497 as an issue to fix this up in both the branches

james-chf · 2022-11-04T16:14:05Z

pls update wasm

sug0 · 2022-11-07T09:03:27Z

shared/src/ledger/events.rs

@@ -153,7 +162,7 @@ impl From<ProposalEvent> for Event {
 }

 /// Convert our custom event into the necessary tendermint proto type
-impl From<Event> for crate::facade::tendermint_proto::abci::Event {
+impl From<Event> for tendermint_proto::abci::Event {


this should be crate::facade::tendermint_proto::abci::Event, right?

There is no facade module in shared (currently), though there is something similar in shared/lib.rs

namada/shared/src/lib.rs

Lines 9 to 16 in 6cbce4a

#[cfg(not(feature = "abcipp"))]

pub use {ibc, ibc_proto, tendermint, tendermint_proto};

#[cfg(feature = "abcipp")]

pub use {

ibc_abcipp as ibc, ibc_proto_abcipp as ibc_proto,

tendermint_abcipp as tendermint,

tendermint_proto_abcipp as tendermint_proto,

};

oh right, this isn't in apps... yeah, we can use crate::<dep> inside of shared/

Oh yeah, this should be using that, will update

batconjurer · 2022-11-07T09:08:54Z

apps/src/lib/client/rpc.rs

+    // use `storage_has_key` instead of `storage_value`, because `storage_value`
+    // returns 0 bytes when the key is not found.
+    let maybe_unit = T::try_from_slice(&[]);
+    if let Ok(unit) = maybe_unit {


wow. what a hack 😆

batconjurer · 2022-11-07T09:46:42Z

shared/src/types/keccak.rs

@@ -103,13 +104,48 @@ pub fn keccak_hash(bytes: &[u8]) -> KeccakHash {

 /// This module defines encoding methods compatible with Ethereum
 /// smart contracts.
+// TODO: relocate this sub-module to a new home


I've been thinking about this for a while too. Maybe we should just have an ABI mod which has both encode and keccak submods

batconjurer

One question really.

batconjurer · 2022-11-07T09:49:06Z

shared/src/types/keccak.rs

+        _marker: PhantomData<*const T>,
+    }
+
+    impl<T> EncodeCell<T> {


This is interesting. Should we change the return type of the Encode::encode method to return an instance of this struct? @sug0 ?

yeah, we could do that, and introduce an encode_raw() that simply "unwraps" the cell

batconjurer · 2022-11-07T09:50:40Z

tests/src/e2e/helpers.rs

@@ -148,6 +149,63 @@ pub fn get_epoch(test: &Test, ledger_address: &str) -> Result<Epoch> {
    Ok(Epoch(epoch))
 }

+/// Get the last committed block height.
+pub fn get_height(test: &Test, ledger_address: &str) -> Result<u64> {


Gianmarco Fraccaroli and others added 30 commits October 18, 2022 12:22

feat: remove nft

1d9c9d2

[ci] wasm checksums update

d1521f4

[feat]: Added the recovery id to secp256k signatures

8432378

[fix]: Fixed the borsh schema for libsecp256k signatures

381d960

wasm: update checksums.json

e19de01

client: add a block query to print hash, height and time of a block

f787667

changelog: add #658

ca3608d

test/e2e/helpers: add a helper to query and parse block height

ea2d533

Modify specs

83e8331

split back out the core VPs

f5d64a4

fix broken link

74558d7

Merge pull request #333 from anoma/abuzer/specs-update

43c5248

Update Namada Specs

ci: invalide cf cache

d5205e6

move ledger's protocol module into shared crate

9b5a8d9

protocol: update imports and add missing rustdoc

84777a2

add deps for router macro and update Cargo.locks

2b36531

This adds a new feature "async-client" and "tendermint-rpc" to shared crate that if enabled generate async client code for all router's handler methods, and implements it for tendermint-rpc client, respectively.

shared: add new queries router macro to replicate handwritten RPC paths

0c9b0bc

apps: replace RPC module and its handlers with new queries mod

c593917

changelog: add #553

66c632c

wasm: update checksums

6813526

switch to tendermint-rs with consensus timeout

56b385c

add back consensus timeout commit config for abciplus

f8e60cf

changelog: add #671

7918b7c

[ci] wasm checksums update

31084fb

feat: change native token to nam

b91d89e

changelog: add #632

77bfe47

ci: use mold linker

a699404

Merge branches 'fraccaman/ci-docs-cache' (#670) and 'fraccaman/ci-lin…

99945f7

…ker' (#678) * fraccaman/ci-docs-cache: ci: invalide cf cache * fraccaman/ci-linker: ci: use mold linker

fix: namadan should log at info by default

95f6294

some doc comment edits

3b0117e

james-chf added 5 commits November 3, 2022 21:39

"implement" MockDB::read_subspace_val_with_height

de529b8

Fix up the latest merge

b193c40

Compiling (but not yet working

fbfc105

sug0 and others added 5 commits November 4, 2022 14:40

Add an EncodeCell for Eth ABI encoded values

e451ac0

Use correct encoding in RPC calls

62b940b

Fix up docstring

81be1cc

Merge eth-bridge-integration

17f4128

TestClient should propagate errors to caller

f39d36c

wasm checksums update

25c3a3e

james-chf force-pushed the james+ray/ethbridge/merge-0.9.0 branch from ed55261 to 25c3a3e Compare November 4, 2022 16:18

james-chf marked this pull request as ready for review November 4, 2022 16:39

james-chf requested review from Fraccaman, batconjurer and sug0 November 4, 2022 16:41

sug0 approved these changes Nov 7, 2022

View reviewed changes

batconjurer reviewed Nov 7, 2022

View reviewed changes

Make events.rs use the Tendermint facade

3922bf3

batconjurer mentioned this pull request Nov 7, 2022

Bridge pool cli #729

Merged

batconjurer reviewed Nov 7, 2022

View reviewed changes

james-chf mentioned this pull request Nov 7, 2022

Send a validator set update only once per epoch #725

Merged

batconjurer approved these changes Nov 7, 2022

View reviewed changes

james-chf merged commit f5a7a36 into eth-bridge-integration Nov 7, 2022

james-chf deleted the james+ray/ethbridge/merge-0.9.0 branch November 7, 2022 10:11

This was referenced Nov 7, 2022

CI for the eth-bridge-integration branch #394

Closed

fix: use crate::facade for importing tendermint crates #755

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 0.9.0 into eth-bridge-integration #723

Merge 0.9.0 into eth-bridge-integration #723

juped commented Nov 1, 2022

james-chf commented Nov 4, 2022

james-chf commented Nov 4, 2022

james-chf commented Nov 4, 2022

sug0 Nov 7, 2022

james-chf Nov 7, 2022 •

edited

Loading

sug0 Nov 7, 2022

james-chf Nov 7, 2022

batconjurer Nov 7, 2022

batconjurer Nov 7, 2022

batconjurer left a comment

batconjurer Nov 7, 2022

sug0 Nov 7, 2022

batconjurer Nov 7, 2022

batconjurer Nov 7, 2022

	#[cfg(not(feature = "abcipp"))]
	pub use {ibc, ibc_proto, tendermint, tendermint_proto};
	#[cfg(feature = "abcipp")]
	pub use {
	ibc_abcipp as ibc, ibc_proto_abcipp as ibc_proto,
	tendermint_abcipp as tendermint,
	tendermint_proto_abcipp as tendermint_proto,
	};

Merge 0.9.0 into eth-bridge-integration #723

Merge 0.9.0 into eth-bridge-integration #723

Conversation

juped commented Nov 1, 2022

james-chf commented Nov 4, 2022

james-chf commented Nov 4, 2022

james-chf commented Nov 4, 2022

Choose a reason for hiding this comment

james-chf Nov 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

batconjurer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

james-chf Nov 7, 2022 •

edited

Loading