Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.67.3)
description: Sui CLI version to install (e.g., mainnet-v1.69.2)
required: false
default: mainnet-v1.67.3
default: mainnet-v1.69.2

runs:
using: composite
Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/sui-ccip-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,41 @@
matrix:
include:
- test_name: Test_CCIP_Messaging_Sui2EVM
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIP_Messaging_EVM2Sui
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIP_EVM2Sui_ZeroReceiver
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_LockReleaseTokenPool
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool_WithRateLimit
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool_WithAllowlist
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_BurnMintTokenPool_ThenGloballyCursedUncursed
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_ManagedTokenPool_ThenCurseUncurse
sui_version: mainnet-v1.67.3
- test_name: Test_CCIPTokenTransfer_SUI2EVM_ManagedTokenPool_WithRateLimit
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_Sui2EVM_ManagedTokenPool_WithRateLimit
sui_version: mainnet-v1.69.2
- test_name: Test_CCIP_Upgrade_Sui2EVM
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIP_Upgrade_EVM2Sui
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIP_Upgrade_CommonPkg_EVM2Sui
sui_version: mainnet-v1.67.3
sui_version: mainnet-v1.69.2
- test_name: Test_CCIP_Upgrade_NoBlock_EVM2Sui
sui_version: mainnet-v1.67.3
# - test_name: Test_CCIPTokenTransfer_EVM2SUI_BurnMintTokenPool
# sui_version: mainnet-v1.57.2
# - test_name: Test_CCIPPureTokenTransfer_EVM2SUI_BurnMintTokenPool
# sui_version: mainnet-v1.57.2
# - test_name: Test_CCIPProgrammableTokenTransfer_EVM2SUI_BurnMintTokenPool
# sui_version: mainnet-v1.57.2
# - test_name: Test_CCIPZeroGasLimitTokenTransfer_EVM2SUI_BurnMintTokenPool
# sui_version: mainnet-v1.57.2
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPTokenTransfer_EVM2Sui_BurnMintTokenPool
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPPureTokenTransfer_EVM2Sui_BurnMintTokenPool
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPProgrammableTokenTransfer_EVM2Sui_BurnMintTokenPool
sui_version: mainnet-v1.69.2
- test_name: Test_CCIPZeroGasLimitTokenTransfer_EVM2Sui_BurnMintTokenPool
sui_version: mainnet-v1.69.2

env:
DEFAULT_CORE_REF: develop
Expand Down Expand Up @@ -105,7 +105,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 108 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:108:9: shellcheck reported issue in this script: SC2236:style:3:6: Use -n instead of ! -z [shellcheck]

Check failure on line 108 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:108: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 @@ -123,7 +123,7 @@
# 2) Read Go version
- name: Read Go version
id: go-version
run: |

Check failure on line 126 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:126: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 Down
77 changes: 77 additions & 0 deletions contracts/test/Move.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Generated by move; do not edit
# This file should be checked in.

[move]
version = 4

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

[pinned.local.Sui]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "c2428b3aaf9c24270b609001e56d96cb10c76d28" }
use_environment = "local"
manifest_digest = "98EF265044695258DF77084171BC5CCC94248AEEC2463AF6274326433A1512BA"
deps = { MoveStdlib = "MoveStdlib" }

[pinned.local.test]
source = { root = true }
use_environment = "local"
manifest_digest = "4ED73376CE4715AD6C0F6AF3CC7AB9E26B4759A5F31352D0716A5FD6EC6E61F5"
deps = { std = "MoveStdlib", sui = "Sui", test_secondary = "test_secondary" }

[pinned.local.test_secondary]
source = { local = "../test_secondary" }
use_environment = "local"
manifest_digest = "5F75228E403340DD70556AFD567899C8C2E4BB556771AF4C11F408D875984A08"
deps = { std = "MoveStdlib", sui = "Sui" }

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

[pinned.local_9a32b313.Sui]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "c2428b3aaf9c24270b609001e56d96cb10c76d28" }
use_environment = "local_9a32b313"
manifest_digest = "1351CA615D5B149A79F70C9B1A81F81C63785726AD1407C3909489451B7B6511"
deps = { MoveStdlib = "MoveStdlib" }

[pinned.local_9a32b313.test]
source = { root = true }
use_environment = "local_9a32b313"
manifest_digest = "A7B8056EE3CFE149AD5B199BDDAF988579BADD2A8E134BA38CD11D019B21A3B7"
deps = { std = "MoveStdlib", sui = "Sui", test_secondary = "test_secondary" }

[pinned.local_9a32b313.test_secondary]
source = { local = "../test_secondary" }
use_environment = "local_9a32b313"
manifest_digest = "EB78069460D8F989E2D61A6E191C1620B8E678A580A6D038670FD08D974DA704"
deps = { std = "MoveStdlib", sui = "Sui" }

[pinned.testnet.MoveStdlib]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/move-stdlib", rev = "c2428b3aaf9c24270b609001e56d96cb10c76d28" }
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 = "c2428b3aaf9c24270b609001e56d96cb10c76d28" }
use_environment = "testnet"
manifest_digest = "7AFB66695545775FBFBB2D3078ADFD084244D5002392E837FDE21D9EA1C6D01C"
deps = { MoveStdlib = "MoveStdlib" }

[pinned.testnet.test]
source = { root = true }
use_environment = "testnet"
manifest_digest = "5B34CE8FD6BAA0524CBA26CBF0BB0A655056EF6526BE5AC719B80ECB56AD43A5"
deps = { std = "MoveStdlib", sui = "Sui", test_secondary = "test_secondary" }

[pinned.testnet.test_secondary]
source = { local = "../test_secondary" }
use_environment = "testnet"
manifest_digest = "5745706258F61D6CE210904B3E6AE87A73CE9D31A6F93BE4718C442529332A87"
deps = { std = "MoveStdlib", sui = "Sui" }
3 changes: 2 additions & 1 deletion contracts/test/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
local = '../test_secondary'

[environments]
local_9a32b313 = '9a32b313'
devnet = 'a9149565'
local = '92d92e5c'
local = '9a32b313'

[package]
edition = '2024'
Expand Down
1 change: 0 additions & 1 deletion contracts/test/Published.toml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
[published]
23 changes: 23 additions & 0 deletions contracts/test_secondary/Move.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by move; do not edit
# This file should be checked in.

[move]
version = 4

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

[pinned.local.Sui]
source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "85400e2bd37b490fcd057776e700d3fdca643396" }
use_environment = "local"
manifest_digest = "98EF265044695258DF77084171BC5CCC94248AEEC2463AF6274326433A1512BA"
deps = { MoveStdlib = "MoveStdlib" }

[pinned.local.test_secondary]
source = { root = true }
use_environment = "local"
manifest_digest = "5F75228E403340DD70556AFD567899C8C2E4BB556771AF4C11F408D875984A08"
deps = { std = "MoveStdlib", sui = "Sui" }
3 changes: 2 additions & 1 deletion contracts/test_secondary/Move.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[environments]
local_9a32b313 = '9a32b313'
devnet = 'a9149565'
local = '92d92e5c'
local = '9a32b313'

[package]
edition = '2024'
Expand Down
1 change: 0 additions & 1 deletion contracts/test_secondary/Published.toml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
[published]
2 changes: 1 addition & 1 deletion deployment/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replace github.com/smartcontractkit/chainlink-sui => ../

require (
github.com/Masterminds/semver/v3 v3.4.0
github.com/block-vision/sui-go-sdk v1.1.4
github.com/block-vision/sui-go-sdk v1.2.1
github.com/ethereum/go-ethereum v1.17.1
github.com/google/go-cmp v0.7.0
github.com/smartcontractkit/chain-selectors v1.0.97
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
sui:
image: mysten/sui-tools:mainnet-v1.67.3
image: mysten/sui-tools:mainnet-v1.69.2
ports:
- "9000:9000"
command: ["sui", "start"]
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlin
require (
github.com/aptos-labs/aptos-go-sdk v1.7.1-0.20250602153733-bb1facae1d43
github.com/aptos-labs/tree-sitter-move-on-aptos v0.0.0-20250321090037-c820eb4716e1
github.com/block-vision/sui-go-sdk v1.1.3
github.com/block-vision/sui-go-sdk v1.2.1
github.com/ethereum/go-ethereum v1.16.2
github.com/google/uuid v1.6.0
github.com/hashicorp/go-plugin v1.7.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/smartcontractkit/chainlink-sui/integration-tests
go 1.25.5

require (
github.com/block-vision/sui-go-sdk v1.1.4
github.com/block-vision/sui-go-sdk v1.2.1
github.com/ethereum/go-ethereum v1.17.1
github.com/holiman/uint256 v1.3.2
github.com/smartcontractkit/chain-selectors v1.0.97
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions relayer/chainreader/indexer/events_indexer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ func TestEventsIndexer(t *testing.T) {
chainID, err := testutils.GetChainIdentifier(testutils.LocalUrl)
require.NoError(t, err)
testutils.PatchEnvironmentTOML("contracts/test", "local", chainID)

// testutils.PatchContractAddressTOML(t, "contracts/test", "test_secondary", "_")
testutils.PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

contractPath := testutils.BuildSetup(t, "contracts/test")
gasBudget := int(2000000000)
Expand Down
5 changes: 5 additions & 0 deletions relayer/chainreader/indexer/transactions_indexer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ func TestTransactionsIndexer(t *testing.T) {
relayerClient, err := client.NewPTBClient(log, testutils.LocalUrl, nil, 10*time.Second, keystoreInstance, 5, "WaitForLocalExecution")
require.NoError(t, err)

chainID, chainIDErr := testutils.GetChainIdentifier(testutils.LocalUrl)
require.NoError(t, chainIDErr)
testutils.PatchEnvironmentTOML("contracts/test", "local", chainID)
testutils.PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

contractPath := testutils.BuildSetup(t, "contracts/test")
gasBudget := int(2000000000)
packageId, tx, err := testutils.PublishContract(t, "counter", contractPath, accountAddress, &gasBudget)
Expand Down
5 changes: 5 additions & 0 deletions relayer/chainreader/loop/loop_reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ func runLoopChainReaderEchoTest(t *testing.T, log logger.Logger, rpcUrl string)
faucetFundErr := testutils.FundWithFaucet(log, testutils.SuiLocalnet, accountAddress)
require.NoError(t, faucetFundErr)

chainID, err := testutils.GetChainIdentifier(rpcUrl)
require.NoError(t, err)
testutils.PatchEnvironmentTOML("contracts/test", "local", chainID)
testutils.PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

contractPath := testutils.BuildSetup(t, "contracts/test")
gasBudget := int(2000000000)
packageId, tx, err := testutils.PublishContract(t, "counter", contractPath, accountAddress, &gasBudget)
Expand Down
5 changes: 5 additions & 0 deletions relayer/chainreader/reader/chainreader_local_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ func runChainReaderCounterTest(t *testing.T, log logger.Logger, rpcUrl string) {
faucetFundErr := testutils.FundWithFaucet(log, testutils.SuiLocalnet, accountAddress)
require.NoError(t, faucetFundErr)

chainID, chainIDErr := testutils.GetChainIdentifier(rpcUrl)
require.NoError(t, chainIDErr)
testutils.PatchEnvironmentTOML("contracts/test", "local", chainID)
testutils.PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

// Publish test_secondary first (before counter, since counter depends on it)
gasBudget := int(2000000000)
contractPath := testutils.BuildSetup(t, "contracts/test_secondary")
Expand Down
5 changes: 5 additions & 0 deletions relayer/chainwriter/ptb/ptb_constructor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ func setupTestEnvironment(t *testing.T) (
relayerClient, err = client.NewPTBClient(log, testutils.LocalUrl, nil, 10*time.Second, keystoreInstance, 5, "WaitForLocalExecution")
require.NoError(t, err)

chainID, chainIDErr := testutils.GetChainIdentifier(testutils.LocalUrl)
require.NoError(t, chainIDErr)
testutils.PatchEnvironmentTOML("contracts/test", "local", chainID)
testutils.PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

contractPath := testutils.BuildSetup(t, "contracts/test")
gasBudget := int(2000000000)
packageId, tx, err := testutils.PublishContract(t, "counter", contractPath, accountAddress, &gasBudget)
Expand Down
8 changes: 7 additions & 1 deletion relayer/client/ptb_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ func TestPTBClient(t *testing.T) {
err = testutils.FundWithFaucet(log, testutils.SuiLocalnet, accountAddress)
require.NoError(t, err)

chainID, err := testutils.GetChainIdentifier(testutils.LocalUrl)
require.NoError(t, err)
testutils.PatchEnvironmentTOML("contracts/test", "local", chainID)
testutils.PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

contractPath := testutils.BuildSetup(t, "contracts/test")
gasBudget := int(2000000000)
packageId, tx, err := testutils.PublishContract(t, "counter", contractPath, accountAddress, &gasBudget)
Expand Down Expand Up @@ -497,11 +502,12 @@ func TestPTBClient(t *testing.T) {
// create another failed transaction and use the cursor to ignore the previously fetched ones
CreateFailedTransaction(t, relayerClient, packageId, counterObjectId, accountAddress, publicKeyBytes)
cursor := &values.NextCursor
queryLimit := uint64(1)
values, err = relayerClient.QueryTransactions(
context.Background(),
accountAddress,
cursor,
nil,
&queryLimit,
)
require.NoError(t, err)
require.NotNil(t, values)
Expand Down
2 changes: 1 addition & 1 deletion relayer/testutils/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func SetupTestEnv(
PatchEnvironmentTOML("contracts/test_secondary", "local", chainID)

contractPath := BuildSetup(t, "contracts/test")
gasBudget := int(8000000000)
gasBudget := int(2000000000)
packageId, tx, err := PublishContract(t, "counter", contractPath, accountAddress, &gasBudget)
require.NoError(t, err)
require.NotNil(t, packageId)
Expand Down
Loading
Loading