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

Murisi/restructure tx merge #1313

Closed
wants to merge 79 commits into from
Closed

Murisi/restructure tx merge #1313

wants to merge 79 commits into from

Conversation

murisi
Copy link
Collaborator

@murisi murisi commented Apr 23, 2023

This is an attempt to achieve #1255 with the tip of main merged in. Overall the main changes introduced by this branch are:

  • Instead of having an outer transaction structure containing an inner transaction, there is now a single transaction structure containing a flat list of sections.
  • Instead of wrapping inner transactions in a structure that supplies a signature, the unsigned data is added as a section to the transaction at the same level as it corresponding signature section.
  • The WASM code now receives a Tx object instead of a data byte vector. This is because the data section's signature is stored in a different section, and because the extra data also resides in a separate section.
  • Encryption is now done separately after all signing is complete - in particular this means that there are no longer any signatures over encrypted data.
  • Upgraded the MASP client and validation code to use the latest MASP crate.
  • Added a builder section to Txs where the auxiliary inputs that were used to construct a MASP transaction can be stored. This may be useful for hardware wallets when validating a given Transaction object.

Additional notes:

murisi and others added 30 commits January 27, 2023 12:52
vm_env/src/token.rs Outdated Show resolved Hide resolved
scripts/online_generator.sh Outdated Show resolved Hide resolved
scripts/online_generator.sh Outdated Show resolved Hide resolved
@adrianbrink adrianbrink mentioned this pull request May 12, 2023
10 tasks
murisi and others added 2 commits May 15, 2023 10:56
@murisi
Copy link
Collaborator Author

murisi commented May 15, 2023

I've merged in base in 82961de which should fix the failing jobs in CI

Thanks, this merge is fine. However, if I remember correctly the only failing jobs in the CI were due to the 3 MASP E2E tests failing, and I identified that to be due to the CI configuration. See #1376 .

That being said, there are some E2E tests (that are not executed by the CI) that are failing for me locally:

failures:
    e2e::eth_bridge_tests::test_unauthorized_tx_cannot_write_storage
    e2e::multitoken_tests::test_multitoken_transfer_established_to_established
    e2e::multitoken_tests::test_multitoken_transfer_established_to_implicit
    e2e::multitoken_tests::test_multitoken_transfer_implicit_to_established
    e2e::multitoken_tests::test_multitoken_transfer_implicit_to_implicit

Do you have any ideas on what might be the cause? Thanks!

@juped juped added this to the 0.17 milestone May 15, 2023
@murisi murisi force-pushed the murisi/restructure-tx-merge branch from 2c659dd to 81ac30f Compare May 22, 2023 09:53
@murisi murisi force-pushed the murisi/restructure-tx-merge branch from 81ac30f to db17079 Compare May 22, 2023 09:58
@adrianbrink adrianbrink mentioned this pull request May 24, 2023
@murisi
Copy link
Collaborator Author

murisi commented May 24, 2023

Subsumed by #1462 .

@murisi murisi closed this May 24, 2023
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.

4 participants