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

merge queue: embarking main (f08d3f2), #3573, #3507 and #3611 together #3631

Closed
wants to merge 30 commits into from
Closed

merge queue: embarking main (f08d3f2), #3573, #3507 and #3611 together #3631

wants to merge 30 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 13, 2024 •
edited
Loading

✨ Pull requests combination (#3573, #3507) which was ahead in the queue failed to get merged. The pull request #3611 has been re-embarked. ✨

Branch main (f08d3f2), #3573, #3507 and #3611 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #3611.
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:

  • any of [🛡 GitHub branch protection]:
    • check-neutral=test-e2e (2)
    • check-skipped=test-e2e (2)
    • check-success=test-e2e (2)
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-neutral=Mergify Merge Protections
    • check-skipped=Mergify Merge Protections
    • check-success=Mergify Merge Protections
  • 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=build-wasm (wasm, build-wasm-scripts, wasm/tx_*.wasm wasm/vp_*.wasm wasm/checksums.json )
    • check-neutral=build-wasm (wasm, build-wasm-scripts, wasm/tx_*.wasm wasm/vp_*.wasm wasm/checksums.json )
    • check-skipped=build-wasm (wasm, build-wasm-scripts, wasm/tx_*.wasm wasm/vp_*.wasm wasm/checksums.json )
  • any of [🛡 GitHub branch protection]:
    • check-success=lints
    • check-neutral=lints
    • check-skipped=lints
  • any of [🛡 GitHub branch protection]:
    • check-success=test-unit
    • check-neutral=test-unit
    • check-skipped=test-unit
  • 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 (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-wasm
    • check-neutral=test-wasm
    • check-skipped=test-wasm

Required conditions to stay in the queue:

  • #approved-reviews-by >= 1
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • base = main
  • any of [🛡 GitHub branch protection]:
    • check-neutral=Mergify Merge Protections
    • check-skipped=Mergify Merge Protections
    • check-success=Mergify Merge Protections
  • 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=build-wasm (wasm, build-wasm-scripts, wasm/tx_*.wasm wasm/vp_*.wasm wasm/checksums.json )
    • check-neutral=build-wasm (wasm, build-wasm-scripts, wasm/tx_*.wasm wasm/vp_*.wasm wasm/checksums.json )
    • check-skipped=build-wasm (wasm, build-wasm-scripts, wasm/tx_*.wasm wasm/vp_*.wasm wasm/checksums.json )
  • any of [🛡 GitHub branch protection]:
    • check-success=lints
    • check-neutral=lints
    • check-skipped=lints
  • any of [🛡 GitHub branch protection]:
    • check-success=test-unit
    • check-neutral=test-unit
    • check-skipped=test-unit
  • 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-wasm
    • check-neutral=test-wasm
    • check-skipped=test-wasm
---
previous_failed_batches: []
pull_requests:
  - number: 3611
...

yito88 and others added 30 commits August 8, 2024 15:12
@yito88
WIP: add IBC client upgrade test
ce9b1ab
@yito88
WIP: coordinate upgrade height
b2b5021
@yito88
fix the test
22089a6
@yito88
add test file
2b49f80
@yito88
fix after rebasing
ce47855
@yito88
update Hermes
516aaf2
@yito88
fix Cargo.toml for new test wasm
e709d16
@yito88
make test short
7786ad4
@yito88
fix min upgrade height
57539f4
@yito88
adjust time
25e65ad
@yito88
update ibc-rs for upgrade path issue
0a13a2f
@yito88
for CI
31412fc
@yito88
after rebasing
90b52e1
@yito88
update ibc-rs and simplify the key creation with the default path
86368f5
@yito88
fix MIN_UPGRADE_HEIGHT
ea5c0c8
@murisi
Only increase the IBC pre balance if receiving involves minting.
71eab30
@murisi
Make an early exit if non-allowed keys are changed.
1fbca5d
@murisi
Make sure to decode asset types in test vectors.
340bf56
@murisi
Do not display the IBC memo field in normal mode.
77ed56e
@murisi
Increase the determinism in test vector generation.
0b30c2e
@murisi
Added missing fields to the become validator and change metadata tran…
ed81358 
…saction printers.
@murisi
Only print out IBC memo if its non-empty.
f1ca883
@murisi
Added changelog entry.
704af7a
@murisi
Added a changelog entry.
763b5fc
@yito88
remove unused param
c2d4f05
@murisi
Reverted the naming of is_receiver_chain_source_str and is_sender_cha…
d2e4fd9 
…in_source_str.
@yito88
add a test to unescrow a token in IBC shielding transfer
c56cbe1
@mergify
Merge of #3573
0c68830
@mergify
Merge of #3507
80cf9c5
@mergify
Merge of #3611
2f973d2
@mergify mergify bot closed this Aug 13, 2024
@mergify mergify bot deleted the mergify/merge-queue/cd585e1514 branch August 13, 2024 15:27
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.
2 participants
@yito88 @murisi