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

Test bridge pool wasm #737

Merged
merged 22 commits into from
Nov 14, 2022
Merged

Test bridge pool wasm #737

merged 22 commits into from
Nov 14, 2022

Conversation

batconjurer
Copy link
Member

@batconjurer batconjurer commented Nov 4, 2022 •
edited
Loading

This PR depends on #729 and

  • fixes the wasm for submitting a transfer to the ethereum bridge pool.
  • Adds some functionality to a set of testing tools that allow us to test that vps accept changes generated by wasm.
  • Fixes some inconsistencies between erc20 multitoken keys and other multitoken keys (the entirety of which might be addressed later).
  • Adds tests that the wasm changes are accepted by the bridge pool vp.

@batconjurer
[feat]: Ethereum bridge vp allows escrowing nam
bc09908
@batconjurer
Merge branch 'bat/ethbridge/bp-vp-wnam-address-from-storage' into bat…
07a6af3 
…/ethbridge/eth-bridge-vp-escrow-nam
@batconjurer
[feat]: Initialized VP substorage
adaeb0b
@batconjurer
[chore]: Added unit tests checking that the eth bridge vp allows escr…
73abdc9 
…owing nam
@batconjurer
[feat]: Added bridge pool defs to the cli
e03e3fc
@batconjurer
Merge branch 'bat/ethbridge/bp-vp-escrow-wnam' into bat/ethbridge/eth…
123369d 
…-bridge-vp-escrow-nam
@batconjurer
Merge branch 'bat/ethbridge/bp-vp-wnam-address-from-storage' into bat…
c17254f 
…/ethbridge/eth-bridge-vp-escrow-nam
@batconjurer
Merge branch 'bat/ethbridge/query-bridge-merkle-proofs' into bat/ethb…
393527b 
…ridge/eth-bridge-vp-escrow-nam
@batconjurer
[feat]: Added a cli for interacting with the bridge pool. Needs testi…
6831014 
…ng and a couple of small todos
@batconjurer
[chore]: Merging in eth-bridge-integration
31e328c
@batconjurer
Merge branch 'bat/ethbridge/bp-vp-wnam-address-from-storage' into bat…
3f0bc2d 
…/ethbridge/bridge-pool-cli
@batconjurer
[feat]: Added tooling for testing wasms and vps. Adjusted the bridge …
3cd4d7a 
…pool tx wasm and added test
@batconjurer
Merge branch 'bat/ethbridge/bridge-pool-cli' into bat/ethbridge/test-…
3a31cfe 
…bridge-pool-cli
@batconjurer batconjurer requested review from sug0 and james-chf November 4, 2022 15:00
james-chf
james-chf suggested changes Nov 9, 2022
View reviewed changes
Copy link
Contributor

@james-chf james-chf left a comment •
edited
Loading

Choose a reason for hiding this comment

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

some xans need to become nams

shared/src/types/ethereum_events.rs Outdated Show resolved Hide resolved
tests/src/native_vp/eth_bridge_pool.rs Outdated Show resolved Hide resolved
wasm/wasm_source/src/tx_bridge_pool.rs Outdated Show resolved Hide resolved
tests/src/vm_host_env/tx.rs Show resolved Hide resolved
shared/src/ledger/eth_bridge/storage/wrapped_erc20s.rs
@@ -35,7 +35,7 @@ impl Keys {
self.prefix
.push(&BALANCE_KEY_SEGMENT.to_owned())
.expect("should always be able to construct this key")
.push(&format!("#{}", owner.encode()))
.push(&owner.to_db_key())
Copy link
Contributor

Choose a reason for hiding this comment

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

yeah this way is much better, the previous format way was a hack

sug0
sug0 reviewed Nov 9, 2022
View reviewed changes
tests/src/native_vp/eth_bridge_pool.rs
&albert_address(),
&xan(),
None,
BERTHA_WEALTH.into(),
Copy link
Collaborator

Choose a reason for hiding this comment

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

is albert stealing from bertha?

Copy link
Member Author

Choose a reason for hiding this comment

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

That bastard!

wasm/wasm_source/src/tx_bridge_pool.rs Show resolved Hide resolved
@sug0 sug0 self-requested a review November 11, 2022 11:20
james-chf
james-chf suggested changes Nov 11, 2022
View reviewed changes
Copy link
Contributor

@james-chf james-chf left a comment •
edited
Loading

Choose a reason for hiding this comment

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

lgtm, there are a few things to PR back to main:

  • TestTxEnv::execute_tx fn
  • the namadac tx flag changes
  • TestTxEnv::credit_tokens signature change and usages in wasm/wasm_source

shared/src/ledger/eth_bridge/storage/wrapped_erc20s.rs Show resolved Hide resolved
tests/src/e2e/ledger_tests.rs Show resolved Hide resolved
tests/src/vm_host_env/tx.rs Show resolved Hide resolved
@james-chf james-chf mentioned this pull request Nov 11, 2022
Merged
@batconjurer
Copy link
Member Author

lgtm, there are a few things to PR back to main:

* `TestTxEnv::execute_tx` fn

* the `namadac tx` flag changes

* `TestTxEnv::credit_tokens` signature change and usages in `wasm/wasm_source`

Covered by PRs #738 and #775

@batconjurer
Copy link
Member Author

pls update wasm

@batconjurer batconjurer merged commit fdd211a into eth-bridge-integration Nov 14, 2022
@batconjurer batconjurer deleted the bat/ethbridge/test-bridge-pool-wasms branch November 14, 2022 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@james-chf james-chf james-chf approved these changes

@sug0 sug0 sug0 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@batconjurer @sug0 @james-chf