Merge main -> develop (10/17/2025) #1297
Open
Conversation
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
* new fq * add zksync too * forge fmt * fix test * fix snapshot * update gowrappers for latest * nit * fixed process chain fam sel * update latest wrappers * nit * rens feedback * rebased * fix dependency version * cleanup * cleanup * remove wrapper dependency version.txt * rebased * make wrappers --------- Co-authored-by: FelixFan1992 <[email protected]>
* remove trailing slash * move MockRouter test * add snapshot * refresh pnpm lock * upgrade foundry and refresh snapshot
* [CCIP-7478] Add README covering CCIP tooling design & usage * Bump * Add lanes example * Add more connections
* add bytecode gen warning * bump to 1.6.3 and bump contract not in scope to 1.6.4 * update changelog * Delete dup chains/evm/bytecode/README.MD * use 1.6.x instead of versions to reduce churn * improve genning bytecode * Update CHANGELOG.md * add 1.6.3 feeQuoter to wrapper folder * remove -dev * include ABI extraction from wrappers * fix inclusion in package * Error on error
* gen zk + metadata * add msg hasher
* define MCM deployment api * fix codegen
* wip * working deploy * go mod * connect test * add go.md * go mod * cr comments * cr comments
Bumps [github.com/btcsuite/btcd](https://github.com/btcsuite/btcd) from 0.24.0 to 0.24.2. - [Release notes](https://github.com/btcsuite/btcd/releases) - [Changelog](https://github.com/btcsuite/btcd/blob/master/CHANGES) - [Commits](btcsuite/btcd@v0.24.0...v0.24.2) --- updated-dependencies: - dependency-name: github.com/btcsuite/btcd dependency-version: 0.24.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rens Rooimans <[email protected]>
* Update .gitignore * Update .gitignore
kylesmartin
commented
Oct 17, 2025
| /// @dev This contract is a variant of BurnMintTokenPool that uses `burn(amount)`. | ||
| contract BurnMintTokenPool is BurnMintTokenPoolAbstract, ITypeAndVersion { | ||
| string public constant override typeAndVersion = "BurnMintTokenPool 1.6.3-dev"; | ||
| string public constant override typeAndVersion = "BurnMintTokenPool 1.7.0-dev"; |
There was a problem hiding this comment.
Updated all the token pool versions, pools on develop are CCV enabled and versions should reflect that.
kylesmartin
commented
Oct 17, 2025
| + 32 // token account belonging to the token receiver, e.g ATA, not included in the token lookup table | ||
| + 32 // per-chain token pool config, not included in the token lookup table | ||
| + 32; // per-chain token billing config, not always included in the token lookup table | ||
| uint256 public constant SUI_TOKEN_TRANSFER_DATA_OVERHEAD = (4 + 32) // source_pool, 4 bytes for length, 32 bytes for address |
There was a problem hiding this comment.
TODO: Remove all Sui references?
|
|
||
| // According to the Sui docs, a set of non-contiguous addresses below 0xdee9 are reserved for system use. | ||
| // https://github.com/MystenLabs/sui/blob/54ae98508569804127bd73d84aa2fb816bdea402/crates/sui-types/src/lib.rs#L141 | ||
| uint256 public constant SUI_PRECOMPILE_SPACE = 0xdee9; |
There was a problem hiding this comment.
TODO: Remove all Sui references?
kylesmartin
requested review from
AmrMohamedRezk,
b-gopalswami and
chris-de-leon-cll
|
winder
approved these changes
Oct 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.
No description provided.