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: 4 additions & 0 deletions .github/workflows/pull-request-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ jobs:
- name: Setup Nix
uses: smartcontractkit/.github/actions/setup-nix@01d931b0455a754d12e7143cc54a5a3521a8f6f6 # setup-nix@0.3.2

- name: Install latest gomods and modgraph
run: |
nix develop -c go get -tool github.com/jmank88/gomods@latest github.com/jmank88/modgraph@latest

- name: Ensure modules are tidy
run: |
nix develop -c go tool gomods tidy
Expand Down
10 changes: 3 additions & 7 deletions bindings/bind/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ func compilePackageInternal(packageName contracts.Package, namedAddresses map[st
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "lock_release_token_pool"),
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "burn_mint_token_pool"),
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "managed_token_pool"),
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "usdc_token_pool"),
}
for _, depDir := range commonDependencyDirs {
if _, statErr := os.Stat(depDir); statErr == nil {
Expand Down Expand Up @@ -416,7 +415,7 @@ func compilePackageInternal(packageName contracts.Package, namedAddresses map[st
}
}

if packageName == contracts.LockReleaseTokenPool || packageName == contracts.BurnMintTokenPool || packageName == contracts.ManagedTokenPool || packageName == contracts.USDCTokenPool {
if packageName == contracts.LockReleaseTokenPool || packageName == contracts.BurnMintTokenPool || packageName == contracts.ManagedTokenPool {
mcmsAddr := namedAddresses["mcms"]
if !isZeroAddress(mcmsAddr) {
mcmsDir := filepath.Join(dstRoot, "mcms", "mcms")
Expand All @@ -443,9 +442,6 @@ func compilePackageInternal(packageName contracts.Package, namedAddresses map[st
case contracts.ManagedTokenPool:
originalPkgKey = "original_managed_token_pool_pkg"
packageDir = "managed_token_pool"
case contracts.USDCTokenPool:
originalPkgKey = "original_usdc_token_pool_pkg"
packageDir = "usdc_token_pool"
}

originalAddr := namedAddresses[originalPkgKey]
Expand Down Expand Up @@ -839,7 +835,7 @@ func ownPackageAddressKey(packageName contracts.Package) string {
case contracts.CCIP, contracts.CCIPOnramp, contracts.CCIPOfframp,
contracts.CCIPRouter, contracts.CCIPDummyReceiver, contracts.CCIPBrokenReceiver,
contracts.LockReleaseTokenPool, contracts.BurnMintTokenPool,
contracts.ManagedTokenPool, contracts.USDCTokenPool,
contracts.ManagedTokenPool,
contracts.ManagedToken, contracts.ManagedTokenFaucet, contracts.CCIPBnM,
contracts.MCMS, contracts.FastMCMS, contracts.MCMSUser, contracts.MCMSUserV2,
contracts.LINK, contracts.MockLinkToken, contracts.MockEthToken,
Expand All @@ -860,7 +856,7 @@ func requiredPublishDeps(packageName contracts.Package, namedAddresses map[strin
case contracts.CCIPOnramp, contracts.CCIPOfframp,
contracts.CCIPDummyReceiver, contracts.CCIPBrokenReceiver,
contracts.LockReleaseTokenPool, contracts.BurnMintTokenPool,
contracts.ManagedTokenPool, contracts.USDCTokenPool:
contracts.ManagedTokenPool:
return []string{
namedAddresses["mcms"],
namedAddresses["fast_mcms"],
Expand Down
3,139 changes: 0 additions & 3,139 deletions bindings/generated/ccip/ccip_token_pools/usdc_token_pool/usdc_token_pool.go

This file was deleted.

2 changes: 0 additions & 2 deletions bindings/generated/function_info.go

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

24 changes: 0 additions & 24 deletions bindings/mcms_encoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool"
module_lock_release_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/lock_release_token_pool"
module_managed_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/managed_token_pool"
module_usdc_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/usdc_token_pool"
module_managed_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token/managed_token"
)

Expand Down Expand Up @@ -292,29 +291,6 @@ func (e *CCIPEntrypointArgEncoder) EncodeEntryPointArg(executingCallbackParams *
return encodeDefaultWithTypeArgsAndClock()
}

// USDC TOKEN POOL
case "usdc_token_pool":
usdcTokenPool, err := module_usdc_token_pool.NewUsdcTokenPool(target, nil)
if err != nil {
return nil, err
}
switch function {
case "accept_ownership":

return usdcTokenPool.Encoder().McmsAcceptOwnershipWithArgs(typeArgs, stateObj, registryObj, executingCallbackParams)
case "set_allowlist_enabled",
"apply_allowlist_updates",
"apply_chain_updates",
"add_remote_pool",
"remove_remote_pool",
"transfer_ownership":
return encodeDefaultWithTypeArgs()
case "execute_ownership_transfer":
return encodeExecuteOwnershipTransferWithTypeArgs()
case "set_chain_rate_limiter_configs", "set_chain_rate_limiter_config":
return encodeDefaultWithTypeArgsAndClock()
}

// RMN REMOTE
case "rmn_remote":
rmnRemote, err := module_rmn_remote.NewRmnRemote(target, nil)
Expand Down
134 changes: 0 additions & 134 deletions bindings/mcms_encoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -722,140 +722,6 @@ func TestEncodeEntryPointArg_ManagedTokenPool(t *testing.T) {
}
}

func TestEncodeEntryPointArg_UsdcTokenPool(t *testing.T) {
encoder := &CCIPEntrypointArgEncoder{
registryObjID: "0x1234567890123456789012345678901234567890123456789012345678901234",
deployerStateObjID: "0x8888888888888888888888888888888888888888888888888888888888888888",
}

target := "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890"
stateObjID := "0x9999999999999999999999999999999999999999999999999999999999999999"
executingCallbackParams := &transaction.Argument{}

t.Run("accept_ownership", func(t *testing.T) {
data := []byte{}

result, err := encoder.EncodeEntryPointArg(
executingCallbackParams,
target,
"usdc_token_pool",
"accept_ownership",
stateObjID,
data,
[]string{"0x1::sui::SUI"},
)

require.NoError(t, err)
assert.NotNil(t, result)
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
assert.Equal(t, "mcms_accept_ownership", result.Function)
})

typeArgTestCases := []string{
"set_allowlist_enabled",
"apply_allowlist_updates",
"apply_chain_updates",
"add_remote_pool",
"remove_remote_pool",
"transfer_ownership",
}

for _, fn := range typeArgTestCases {
t.Run(fn, func(t *testing.T) {
data := []byte{}

result, err := encoder.EncodeEntryPointArg(
executingCallbackParams,
target,
"usdc_token_pool",
fn,
stateObjID,
data,
[]string{"0x1::sui::SUI"},
)

require.NoError(t, err)
assert.NotNil(t, result)
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
assert.Equal(t, "mcms_"+fn, result.Function)

require.Len(t, result.TypeArgs, 1, "Expected 1 type argument")
require.Len(t, result.CallArgs, 3, "Expected 3 arguments: state, registry, executingCallbackParams")

// Verify the state was deserialized correctly
stateFromResult, err := extractObjectID(result.CallArgs[0])
require.NoError(t, err, "Failed to extract state object ID")
assert.Equal(t, stateObjID, stateFromResult, "State should match stateObjID (from BCS data)")
})
}

t.Run("execute_ownership_transfer", func(t *testing.T) {
data := []byte{}

result, err := encoder.EncodeEntryPointArg(
executingCallbackParams,
target,
"usdc_token_pool",
"execute_ownership_transfer",
stateObjID,
data,
[]string{"0x1::sui::SUI"},
)

require.NoError(t, err)
assert.NotNil(t, result)
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
assert.Equal(t, "mcms_execute_ownership_transfer", result.Function)

require.Len(t, result.TypeArgs, 1, "Expected 1 type argument")
require.Len(t, result.CallArgs, 4, "Expected 4 arguments: state, registry, deployer_state, executingCallbackParams")

// Verify the state was deserialized correctly
stateFromResult, err := extractObjectID(result.CallArgs[0])
require.NoError(t, err, "Failed to extract state object ID")
assert.Equal(t, stateObjID, stateFromResult, "State should match stateObjID")

// Verify the deployer state was set correctly
deployerStateFromResult, err := extractObjectID(result.CallArgs[2])
require.NoError(t, err, "Failed to extract deployer state object ID")
assert.Equal(t, encoder.deployerStateObjID, deployerStateFromResult, "Deployer state should match deployerStateObjID")
})

rateLimiterTestCases := []string{
"set_chain_rate_limiter_configs",
"set_chain_rate_limiter_config",
}

for _, fn := range rateLimiterTestCases {
t.Run(fn, func(t *testing.T) {
data := []byte{}

result, err := encoder.EncodeEntryPointArg(
executingCallbackParams,
target,
"usdc_token_pool",
fn,
stateObjID,
data,
[]string{"0x1::sui::SUI"},
)

require.NoError(t, err)
assert.NotNil(t, result)
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
assert.Equal(t, "mcms_"+fn, result.Function)

require.Len(t, result.TypeArgs, 1, "Expected 1 type argument")
require.Len(t, result.CallArgs, 4, "Expected 4 arguments: state, clock, registry, executingCallbackParams")

// Verify the state was deserialized correctly
stateFromResult, err := extractObjectID(result.CallArgs[0])
require.NoError(t, err, "Failed to extract state object ID")
assert.Equal(t, stateObjID, stateFromResult, "State should match stateObjID (from BCS data)")
})
}
}

func TestEncodeEntryPointArg_ManagedToken(t *testing.T) {
encoder := &CCIPEntrypointArgEncoder{
registryObjID: "0x1234567890123456789012345678901234567890123456789012345678901234",
Expand Down

This file was deleted.

This file was deleted.

34 changes: 0 additions & 34 deletions contracts/ccip/ccip_token_pools/usdc_token_pool/Move.toml

This file was deleted.

Loading
Loading