Skip to content

[DO NOT PUSH TO THIS] rebuild with 1.63 #319

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

Open
FelixFan1992 wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

[DO NOT PUSH TO THIS] rebuild with 1.63 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
62918b3
rebuild with 1.63
FelixFan1992 Jan 12, 2026
ac89ccf
update
FelixFan1992 Jan 12, 2026
34c70e9
update
FelixFan1992 Jan 12, 2026
86c0813
update
FelixFan1992 Jan 12, 2026
fd2bedf
update
FelixFan1992 Jan 12, 2026
d692be6
update compile
FelixFan1992 Jan 12, 2026
0a6c135
update
FelixFan1992 Jan 12, 2026
37cd0d6
update
FelixFan1992 Jan 12, 2026
5870439
update
FelixFan1992 Jan 12, 2026
7df25ab
update
FelixFan1992 Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/setup-sui/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Setup Sui CLI
description: Install and cache Sui CLI using suiup
inputs:
version:
description: Sui CLI version to install (e.g., mainnet-v1.61.2)
description: Sui CLI version to install (e.g., testnet-v1.63.1)
required: false
default: mainnet-v1.61.2
default: testnet-v1.63.1

runs:
using: composite
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/sui-ccip-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@
matrix:
include:
- test_name: Test_CCIP_Messaging_Sui2EVM
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIP_Messaging_EVM2Sui
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIP_EVM2Sui_ZeroReceiver
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_LockReleaseTokenPool
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool_WithRateLimit
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool_WithAllowlist
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool_ThenGloballyCursedUncursed
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_ManagedTokenPool_ThenCurseUncurse
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIPTokenTransfer_Sui2EVM_ManagedTokenPool_WithRateLimit
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
- test_name: Test_CCIP_Upgrade_Sui2EVM
sui_version: mainnet-v1.60.1
sui_version: testnet-v1.63.1
# - test_name: Test_CCIP_Upgrade_EVM2Sui
# sui_version: mainnet-v1.60.1
# - test_name: Test_CCIP_Upgrade_CommonPkg_EVM2Sui
Expand Down Expand Up @@ -107,7 +107,7 @@
# 1.5) Get core ref from PR body (optional override)
- name: Get core ref from PR body
if: github.event_name == 'pull_request'
run: |

Check failure on line 110 in .github/workflows/sui-ccip-test.yml

View workflow job for this annotation

GitHub Actions / Lint GH Actions and scripts 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2236:style:3:6: Use -n instead of ! -z [shellcheck]

Raw Output:
.github/workflows/sui-ccip-test.yml:110:9: shellcheck reported issue in this script: SC2236:style:3:6: Use -n instead of ! -z [shellcheck]

Check failure on line 110 in .github/workflows/sui-ccip-test.yml

View workflow job for this annotation

GitHub Actions / Lint GH Actions and scripts 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:2:17: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/sui-ccip-test.yml:110:9: shellcheck reported issue in this script: SC2086:info:2:17: Double quote to prevent globbing and word splitting [shellcheck]
comment=$(gh pr view https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }} --json body -q '.body')
core_ref=$(echo $comment | grep -oP 'core ref: \K\S+' || true)
if [ ! -z "$core_ref" ]; then
Expand All @@ -125,7 +125,7 @@
# 2) Read Go version
- name: Read Go version
id: go-version
run: |

Check failure on line 128 in .github/workflows/sui-ccip-test.yml

View workflow job for this annotation

GitHub Actions / Lint GH Actions and scripts 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:2:30: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/sui-ccip-test.yml:128:9: shellcheck reported issue in this script: SC2086:info:2:30: Double quote to prevent globbing and word splitting [shellcheck]
GO_VER=$(grep -E '^golang ' temp/chainlink/.tool-versions | cut -d' ' -f2)
echo "GO_VERSION=$GO_VER" >> $GITHUB_OUTPUT

Expand All @@ -138,7 +138,7 @@

# 4) Configure Git for private modules
- name: Configure Git & GOPRIVATE
run: |

Check failure on line 141 in .github/workflows/sui-ccip-test.yml

View workflow job for this annotation

GitHub Actions / Lint GH Actions and scripts 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:2:51: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/sui-ccip-test.yml:141:9: shellcheck reported issue in this script: SC2086:info:2:51: Double quote to prevent globbing and word splitting [shellcheck]
git config --global url."https://${GH_PAT_READ}@github.com/".insteadOf "https://github.com/"
echo "GOPRIVATE=github.com/smartcontractkit/*" >> $GITHUB_ENV
env:
Expand Down
2 changes: 1 addition & 1 deletion bindings/bind/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ func getDynamicSuiRPC() (string, error) {
return envRPC, nil
}

cmd := exec.Command("docker", "ps", "--filter", "ancestor=mysten/sui-tools:devnet-v1.61.0", "--format", "{{.Ports}}")
cmd := exec.Command("docker", "ps", "--filter", "ancestor=mysten/sui-tools:testnet-v1.63.1", "--format", "{{.Ports}}")
out, err := cmd.Output()
if err != nil {
return "", fmt.Errorf("docker ps failed: %w", err)
Expand Down
87 changes: 24 additions & 63 deletions contracts/ccip/ccip/Move.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,29 @@
# @generated by Move, please check-in and do not edit manually.
# Generated by move; do not edit
# This file should be checked in.

[move]
version = 3
manifest_digest = "900D9643E79866AA06ECB351246E58B53497B55977754457AD028BF34C1EE7A9"
deps_digest = "397E6A9F7A624706DBDFEE056CE88391A15876868FD18A88504DA74EB458D697"
dependencies = [
{ id = "Bridge", name = "Bridge" },
{ id = "ChainlinkManyChainMultisig", name = "ChainlinkManyChainMultisig" },
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]
version = 4

[[move.package]]
id = "Bridge"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/bridge" }
[pinned.testnet.ChainlinkCCIP]
source = { root = true }
use_environment = "testnet"
manifest_digest = "84B36231F9B4C76143B3894C4A078FD5F03DBF4F5717C1D43B1EE1C903556574"
deps = { ChainlinkManyChainMultisig = "ChainlinkManyChainMultisig", std = "MoveStdlib", sui = "Sui" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]

[[move.package]]
id = "ChainlinkManyChainMultisig"
[pinned.testnet.ChainlinkManyChainMultisig]
source = { local = "../../mcms/mcms" }

dependencies = [
{ id = "Bridge", name = "Bridge" },
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]

[[move.package]]
id = "MoveStdlib"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/move-stdlib" }

[[move.package]]
id = "Sui"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/sui-framework" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
]

[[move.package]]
id = "SuiSystem"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/sui-system" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
]

[move.toolchain-version]
compiler-version = "1.61.2"
edition = "2024"
flavor = "sui"

[env]

[env.testnet]
chain-id = "4c78adac"
original-published-id = "0x5ef4b483da6644c84aa78eae4f51a9bfb1fb4554d5134ac98892e931fcbdd6bf"
latest-published-id = "0x5ef4b483da6644c84aa78eae4f51a9bfb1fb4554d5134ac98892e931fcbdd6bf"
published-version = "1"
use_environment = "testnet"
manifest_digest = "5745706258F61D6CE210904B3E6AE87A73CE9D31A6F93BE4718C442529332A87"
deps = { std = "MoveStdlib", sui = "Sui" }

[pinned.testnet.MoveStdlib]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/move-stdlib", rev = "22f9fc9781732d651e18384c9a8eb1dabddf73a6" }
use_environment = "testnet"
manifest_digest = "C4FE4C91DE74CBF223B2E380AE40F592177D21870DC2D7EB6227D2D694E05363"
deps = {}

[pinned.testnet.Sui]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "22f9fc9781732d651e18384c9a8eb1dabddf73a6" }
use_environment = "testnet"
manifest_digest = "7AFB66695545775FBFBB2D3078ADFD084244D5002392E837FDE21D9EA1C6D01C"
deps = { MoveStdlib = "MoveStdlib" }
12 changes: 6 additions & 6 deletions contracts/ccip/ccip/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ edition = "2024"

[addresses]
ccip = "0x0"
mcms = "_"
mcms_owner = "_"
# mcms = "_"
# mcms_owner = "_"

[dev-addresses]
ccip = "0x1000"
mcms = "0x4000"
mcms_owner = "0x4010"
# [dev-addresses]
# ccip = "0x1000"
# mcms = "0x4000"
# mcms_owner = "0x4010"

[dependencies]
ChainlinkManyChainMultisig = { local = "../../mcms/mcms" }
9 changes: 9 additions & 0 deletions contracts/ccip/ccip/Published.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Generated by Move
# This file contains metadata about published versions of this package in different environments
# This file SHOULD be committed to source control

[published.testnet]
chain-id = "4c78adac"
published-at = "0x5ef4b483da6644c84aa78eae4f51a9bfb1fb4554d5134ac98892e931fcbdd6bf"
original-id = "0x5ef4b483da6644c84aa78eae4f51a9bfb1fb4554d5134ac98892e931fcbdd6bf"
version = 1
6 changes: 3 additions & 3 deletions contracts/ccip/ccip/tests/token_admin_registry_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,10 @@ public fun test_register() {
&ref,
local_token,
);
assert!(type_proof == type_name::into_string(type_name::with_defining_ids<TypeProof>()));
assert!(
token_type == ascii::string(b"0000000000000000000000000000000000000000000000000000000000001000::token_admin_registry_tests::TOKEN_ADMIN_REGISTRY_TESTS"),
token_type == ascii::string(b"0x5ef4b483da6644c84aa78eae4f51a9bfb1fb4554d5134ac98892e931fcbdd6bf::token_admin_registry_tests::TOKEN_ADMIN_REGISTRY_TESTS"),
);
assert!(type_proof == type_name::into_string(type_name::with_defining_ids<TypeProof>()));

let ctx = scenario.ctx();

Expand Down Expand Up @@ -537,7 +537,7 @@ public fun test_register() {
local_token,
);
assert!(
token_type == ascii::string(b"0000000000000000000000000000000000000000000000000000000000001000::token_admin_registry_tests::TOKEN_ADMIN_REGISTRY_TESTS"),
token_type == ascii::string(b"0x5ef4b483da6644c84aa78eae4f51a9bfb1fb4554d5134ac98892e931fcbdd6bf::token_admin_registry_tests::TOKEN_ADMIN_REGISTRY_TESTS"),
);
// Since TypeProof and TypeProof2 have the same package ID, the type proof should remain as TypeProof
assert!(type_proof == type_name::into_string(type_name::with_defining_ids<TypeProof>()));
Expand Down
67 changes: 21 additions & 46 deletions contracts/ccip/ccip_burn_mint_token/Move.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,23 @@
# @generated by Move, please check-in and do not edit manually.
# Generated by move; do not edit
# This file should be checked in.

[move]
version = 3
manifest_digest = "4DC3326595FABE494E783774185CE31BC6774421E3F52C403324FE448AF7964C"
deps_digest = "F9B494B64F0615AED0E98FC12A85B85ECD2BC5185C22D30E7F67786BB52E507C"
dependencies = [
{ id = "Bridge", name = "Bridge" },
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]

[[move.package]]
id = "Bridge"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "209f0da8e316", subdir = "crates/sui-framework/packages/bridge" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]

[[move.package]]
id = "MoveStdlib"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "209f0da8e316", subdir = "crates/sui-framework/packages/move-stdlib" }

[[move.package]]
id = "Sui"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "209f0da8e316", subdir = "crates/sui-framework/packages/sui-framework" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
]

[[move.package]]
id = "SuiSystem"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "209f0da8e316", subdir = "crates/sui-framework/packages/sui-system" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
]

[move.toolchain-version]
compiler-version = "1.54.1"
edition = "2024"
flavor = "sui"
version = 4

[pinned.testnet.MoveStdlib]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/move-stdlib", rev = "22f9fc9781732d651e18384c9a8eb1dabddf73a6" }
use_environment = "testnet"
manifest_digest = "C4FE4C91DE74CBF223B2E380AE40F592177D21870DC2D7EB6227D2D694E05363"
deps = {}

[pinned.testnet.Sui]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "22f9fc9781732d651e18384c9a8eb1dabddf73a6" }
use_environment = "testnet"
manifest_digest = "7AFB66695545775FBFBB2D3078ADFD084244D5002392E837FDE21D9EA1C6D01C"
deps = { MoveStdlib = "MoveStdlib" }

[pinned.testnet.ccip_burn_mint_token]
source = { root = true }
use_environment = "testnet"
manifest_digest = "5745706258F61D6CE210904B3E6AE87A73CE9D31A6F93BE4718C442529332A87"
deps = { std = "MoveStdlib", sui = "Sui" }
101 changes: 28 additions & 73 deletions contracts/ccip/ccip_dummy_receiver/Move.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,35 @@
# @generated by Move, please check-in and do not edit manually.
# Generated by move; do not edit
# This file should be checked in.

[move]
version = 3
manifest_digest = "55A17C07FF1C2AEA1C159B33184B1E5CB40333982C995EA441CAB37E2C9E9905"
deps_digest = "397E6A9F7A624706DBDFEE056CE88391A15876868FD18A88504DA74EB458D697"
dependencies = [
{ id = "Bridge", name = "Bridge" },
{ id = "ChainlinkCCIP", name = "ChainlinkCCIP" },
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]
version = 4

[[move.package]]
id = "Bridge"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/bridge" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]

[[move.package]]
id = "ChainlinkCCIP"
[pinned.testnet.ChainlinkCCIP]
source = { local = "../ccip" }
use_environment = "testnet"
manifest_digest = "84B36231F9B4C76143B3894C4A078FD5F03DBF4F5717C1D43B1EE1C903556574"
deps = { ChainlinkManyChainMultisig = "ChainlinkManyChainMultisig", std = "MoveStdlib", sui = "Sui" }

dependencies = [
{ id = "Bridge", name = "Bridge" },
{ id = "ChainlinkManyChainMultisig", name = "ChainlinkManyChainMultisig" },
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]
[pinned.testnet.ChainlinkCCIPDummyReceiver]
source = { root = true }
use_environment = "testnet"
manifest_digest = "6E4B7C0B5F9E16D641D4CDB6CD9298B2FA967B1F66313F90DDD6E53479EC7320"
deps = { ChainlinkCCIP = "ChainlinkCCIP", std = "MoveStdlib", sui = "Sui" }

[[move.package]]
id = "ChainlinkManyChainMultisig"
[pinned.testnet.ChainlinkManyChainMultisig]
source = { local = "../../mcms/mcms" }

dependencies = [
{ id = "Bridge", name = "Bridge" },
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
{ id = "SuiSystem", name = "SuiSystem" },
]

[[move.package]]
id = "MoveStdlib"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/move-stdlib" }

[[move.package]]
id = "Sui"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/sui-framework" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
]

[[move.package]]
id = "SuiSystem"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "c1f1ae650fb9f9248b39a569400b4420820868db", subdir = "crates/sui-framework/packages/sui-system" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
{ id = "Sui", name = "Sui" },
]

[move.toolchain-version]
compiler-version = "1.61.2"
edition = "2024"
flavor = "sui"

[env]

[env.testnet]
chain-id = "4c78adac"
original-published-id = "0x89515b65c1794c1665ad2805ebe47543547682e9dbff16b8df82a09f119d1b81"
latest-published-id = "0x89515b65c1794c1665ad2805ebe47543547682e9dbff16b8df82a09f119d1b81"
published-version = "1"
use_environment = "testnet"
manifest_digest = "5745706258F61D6CE210904B3E6AE87A73CE9D31A6F93BE4718C442529332A87"
deps = { std = "MoveStdlib", sui = "Sui" }

[pinned.testnet.MoveStdlib]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/move-stdlib", rev = "22f9fc9781732d651e18384c9a8eb1dabddf73a6" }
use_environment = "testnet"
manifest_digest = "C4FE4C91DE74CBF223B2E380AE40F592177D21870DC2D7EB6227D2D694E05363"
deps = {}

[pinned.testnet.Sui]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "22f9fc9781732d651e18384c9a8eb1dabddf73a6" }
use_environment = "testnet"
manifest_digest = "7AFB66695545775FBFBB2D3078ADFD084244D5002392E837FDE21D9EA1C6D01C"
deps = { MoveStdlib = "MoveStdlib" }
Loading
Loading