From 11057a44f214a00d2096d1dc8224a43be6aa6944 Mon Sep 17 00:00:00 2001 From: FelixFan1992 Date: Fri, 5 Jun 2026 12:54:37 -0400 Subject: [PATCH 1/2] NONEVM-5257: remove version check --- .../usdc_token_pool/sources/usdc_token_pool.move | 7 ------- 1 file changed, 7 deletions(-) diff --git a/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move b/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move index 5dc34898c..b77dad7ae 100644 --- a/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move +++ b/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move @@ -53,9 +53,6 @@ fun init(otw: USDC_TOKEN_POOL, ctx: &mut TxContext) { transfer::public_transfer(owner_cap, ctx.sender()); } -// We restrict to the first version. New pool may be required for subsequent versions. -const SUPPORTED_USDC_VERSION_U64: u64 = 0; - /// A domain is a USDC representation of a destination chain. /// @dev Zero is a valid domain identifier. /// @dev The address to mint on the destination chain is the corresponding USDC pool. @@ -96,7 +93,6 @@ const EInvalidArguments: u64 = 2; const EInvalidOwnerCap: u64 = 3; const EZeroChainSelector: u64 = 4; const EEmptyAllowedCaller: u64 = 5; -const EInvalidMessageVersion: u64 = 6; const EDomainMismatch: u64 = 7; const ENonceMismatch: u64 = 8; const EDomainNotFound: u64 = 9; @@ -482,9 +478,6 @@ fun decode_source_pool_data(source_pool_data: vector): (u32, u64) { } fun validate_receipt(receipt: &Receipt, expected_source_domain: u32, expected_nonce: u64) { - let version = receive_message::current_version(receipt); - assert!(version == SUPPORTED_USDC_VERSION_U64, EInvalidMessageVersion); - let source_domain = receive_message::source_domain(receipt); let nonce = receive_message::nonce(receipt); From 91c028aa2d37e096b1c2b73942f8dac9d8287b27 Mon Sep 17 00:00:00 2001 From: FelixFan1992 Date: Fri, 5 Jun 2026 16:19:31 -0400 Subject: [PATCH 2/2] fix --- .../usdc_token_pool/sources/usdc_token_pool.move | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move b/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move index b77dad7ae..8e3bc76d2 100644 --- a/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move +++ b/contracts/ccip/ccip_token_pools/usdc_token_pool/sources/usdc_token_pool.move @@ -93,14 +93,14 @@ const EInvalidArguments: u64 = 2; const EInvalidOwnerCap: u64 = 3; const EZeroChainSelector: u64 = 4; const EEmptyAllowedCaller: u64 = 5; -const EDomainMismatch: u64 = 7; -const ENonceMismatch: u64 = 8; -const EDomainNotFound: u64 = 9; -const EDomainDisabled: u64 = 10; -const ETokenAmountOverflow: u64 = 11; -const EInvalidMintRecipient: u64 = 12; -const EInvalidFunction: u64 = 13; -const EPoolStillRegistered: u64 = 14; +const EDomainMismatch: u64 = 6; +const ENonceMismatch: u64 = 7; +const EDomainNotFound: u64 = 8; +const EDomainDisabled: u64 = 9; +const ETokenAmountOverflow: u64 = 10; +const EInvalidMintRecipient: u64 = 11; +const EInvalidFunction: u64 = 12; +const EPoolStillRegistered: u64 = 13; // ================================================================ // | Init |