Skip to content

merge queue: embarking main (80acb4e), #4303, #4452 and #4454 together#4477

Closed
mergify[bot] wants to merge 20 commits intomainfrom
mergify/merge-queue/0530873282
Closed

merge queue: embarking main (80acb4e), #4303, #4452 and #4454 together#4477
mergify[bot] wants to merge 20 commits intomainfrom
mergify/merge-queue/0530873282

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 18, 2025 •
edited
Loading

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (80acb4e), #4303, #4452 and #4454 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #4454.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue main-queue for merge:

  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success = test-e2e-with-device-automation
    • check-neutral = test-e2e-with-device-automation
    • check-skipped = test-e2e-with-device-automation
  • any of [🛡 GitHub branch protection]:
    • check-success = check-benchmarks
    • check-neutral = check-benchmarks
    • check-skipped = check-benchmarks
  • any of [🛡 GitHub branch protection]:
    • check-success = check-packages
    • check-neutral = check-packages
    • check-skipped = check-packages
  • any of [🛡 GitHub branch protection]:
    • check-success = build-binaries
    • check-neutral = build-binaries
    • check-skipped = build-binaries
  • any of [🛡 GitHub branch protection]:
    • check-success = build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)
    • check-neutral = build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)
    • check-skipped = build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)
  • any of [🛡 GitHub branch protection]:
    • check-success = lints
    • check-neutral = lints
    • check-skipped = lints
  • any of [🛡 GitHub branch protection]:
    • check-success = rust-docs
    • check-neutral = rust-docs
    • check-skipped = rust-docs
  • any of [🛡 GitHub branch protection]:
    • check-success = test-wasm
    • check-neutral = test-wasm
    • check-skipped = test-wasm
  • any of [🛡 GitHub branch protection]:
    • check-success = test-e2e (0)
    • check-neutral = test-e2e (0)
    • check-skipped = test-e2e (0)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-e2e (1)
    • check-neutral = test-e2e (1)
    • check-skipped = test-e2e (1)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-e2e (2)
    • check-neutral = test-e2e (2)
    • check-skipped = test-e2e (2)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-e2e (3)
    • check-neutral = test-e2e (3)
    • check-skipped = test-e2e (3)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-e2e (4)
    • check-neutral = test-e2e (4)
    • check-skipped = test-e2e (4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-integration
    • check-neutral = test-integration
    • check-skipped = test-integration
  • any of [🛡 GitHub branch protection]:
    • check-success = test-unit
    • check-neutral = test-unit
    • check-skipped = test-unit
  • any of [🛡 GitHub branch protection]:
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
    • check-success = Mergify Merge Protections

Required conditions to stay in the queue:

---
previous_failed_batches: []
pull_requests:
  - number: 4454
...

murisi and others added 20 commits March 8, 2025 11:42
@murisi
Make sure that the conversion state is also written into memory.
3fe292b
@murisi
Added a changelog entry.
d89b056
@sug0
Add inner tx hashes to emitted tx wasm events
7d2d33b
@sug0
Cache wrapper hash to emit events in wasm
6d52b45
@sug0
Add new data structure to store inner tx hashes
088ec0c
@sug0
Include wrapper hashes in tx events as well
e4815d5
@sug0
Delete existing attributes from events
c7b16e7
@sug0
Remove unexpected events from the IBC VP
aa061d1 
This fix is not the most robust solution, but it is the one that
involves less code changes. Ideally, we would include the wrapper tx
hash in the native VP execution context, to compute the hash of the
inner transactions that is now being included in each wasm emitted
event, but this change is too invasive.
@tzemanovic @sug0
test/trans_token: fix expected tx events
be9c378
@sug0
Changelog for #4454
7e7cd29
@murisi
Track the balance of undated assets in the MASP and only reward the
4385157 
dated assets.
@murisi
Precompute native token asset types to increase chances of decoding.
e6ce002
@murisi
Added a changelog entry.
288bc27
@murisi
Correcting variable names, documentation, and redundant code.
bd351c6
@murisi
Make tx_ibc update undated balances.
fdca2f3
@murisi
Start tracking the tokens debited/credited by IBC transfers.
e52d56c
@murisi
Factor out extracting tokens from IBC receive packet message into sep…
6e33dcc 
…arate function.
@mergify
Merge of #4303
4871556
@mergify
Merge of #4452
295c72c
@mergify
Merge of #4454
60aee81
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 18, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 74.09201% with 107 lines in your changes missing coverage. Please review.

Project coverage is 74.59%. Comparing base (46a41d2) to head (60aee81).
Report is 27 commits behind head on main.

Files with missing lines Patch % Lines
crates/token/src/tx.rs 8.62% 53 Missing ⚠️
crates/events/src/extend.rs 46.15% 14 Missing ⚠️
wasm/tx_ibc/src/lib.rs 0.00% 13 Missing ⚠️
crates/sdk/src/migrations.rs 0.00% 11 Missing ⚠️
crates/tx_prelude/src/token.rs 0.00% 8 Missing ⚠️
crates/shielded_token/src/vp.rs 92.59% 6 Missing ⚠️
crates/ibc/src/msg.rs 95.65% 1 Missing ⚠️
crates/shielded_token/src/masp/shielded_wallet.rs 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4477      +/-   ##
==========================================
+ Coverage   74.50%   74.59%   +0.09%     
==========================================
  Files         339      339              
  Lines      110808   111164     +356     
==========================================
+ Hits        82556    82923     +367     
+ Misses      28252    28241      -11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@mergify mergify bot closed this Mar 18, 2025
@mergify mergify bot deleted the mergify/merge-queue/0530873282 branch March 18, 2025 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

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

@murisi @sug0 @tzemanovic