merge queue: embarking main (c5bb50b) and [#2169 + #2038 + #2170] together#2186
Closed
mergify[bot] wants to merge 13 commits intomainfrom
Closed
merge queue: embarking main (c5bb50b) and [#2169 + #2038 + #2170] together#2186mergify[bot] wants to merge 13 commits intomainfrom
mergify[bot] wants to merge 13 commits intomainfrom
Conversation
…ide solidityguides
- Use cTOKEN prefix convention instead of wcTOKEN for wrapped tokens - Remove "experimental library" warning (live on mainnet) - Merge erc7984-tutorial.md into erc7984.md - Rename wrapper entry to "ERC-20 to Wrapped ERC-7984" in SUMMARY - Add OZ-style introductions and 1:1 ratio disclaimers to swap examples - Update README available guides to reflect changes
The 1:1 ERC-7984 to ERC-7984 swap example is non-sensical — real token swaps would go through a DEX contract like an AMM.
Add two-step process explanation (token transfer + confidential minting) as shown in the OZ confidential-contracts documentation.
Resolve merge conflict in SUMMARY.md keeping the renamed integration-guide.md from main and the Auctions section from this branch. Add Hardhat template and OZ confidential contracts repo links to erc7984.md as requested in PR review.
This was referenced Mar 26, 2026
Changed Lines CoverageCoverage of added/modified lines: N/A |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉
Branch main (c5bb50b) and [#2169 + #2038 + #2170] are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of [#2169 + #2038 + #2170].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
mainfor merge:#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]branch-protection-review-decision = APPROVED[🛡 GitHub branch protection]check-success = run-e2e-tests / fhevm-e2e-testcheck-success = common-pull-request/lint (bpr)check-neutral = common-pull-request/lint (bpr)check-skipped = common-pull-request/lint (bpr)check-success = coprocessor-cargo-test/cargo-tests (bpr)check-neutral = coprocessor-cargo-test/cargo-tests (bpr)check-skipped = coprocessor-cargo-test/cargo-tests (bpr)check-success = coprocessor-dependency-analysis/dependencies-check (bpr)check-neutral = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = gateway-contracts-deployment-tests/sc-deploy (bpr)check-neutral = gateway-contracts-deployment-tests/sc-deploy (bpr)check-success = gateway-contracts-deployment-tests/sc-deploy (bpr)check-skipped = kms-connector-tests/test-connector (bpr)check-neutral = kms-connector-tests/test-connector (bpr)check-success = kms-connector-tests/test-connector (bpr)Required conditions to stay in the queue:
#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]base = mainbranch-protection-review-decision = APPROVED[🛡 GitHub branch protection]label!=do-not-mergecheck-success = common-pull-request/lint (bpr)check-neutral = common-pull-request/lint (bpr)check-skipped = common-pull-request/lint (bpr)check-neutral = coprocessor-cargo-test/cargo-tests (bpr)check-skipped = coprocessor-cargo-test/cargo-tests (bpr)check-success = coprocessor-cargo-test/cargo-tests (bpr)check-neutral = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = coprocessor-dependency-analysis/dependencies-check (bpr)check-success = coprocessor-dependency-analysis/dependencies-check (bpr)check-skipped = gateway-contracts-deployment-tests/sc-deploy (bpr)check-neutral = gateway-contracts-deployment-tests/sc-deploy (bpr)check-success = gateway-contracts-deployment-tests/sc-deploy (bpr)check-skipped = kms-connector-tests/test-connector (bpr)check-neutral = kms-connector-tests/test-connector (bpr)check-success = kms-connector-tests/test-connector (bpr)