Skip to content

Commit 87bc6f7

Browse files
FelixFan1992FelixFan1992
authored
NONEVM-5338: remove cctp v1 (#418)
* remove cctp v1 * fix * mod * format
1 parent a413a07 commit 87bc6f7

74 files changed

Lines changed: 39 additions & 19067 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/pull-request-develop.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ jobs:
174174
- name: Setup Nix
175175
uses: smartcontractkit/.github/actions/setup-nix@01d931b0455a754d12e7143cc54a5a3521a8f6f6 # setup-nix@0.3.2
176176

177+
- name: Install latest gomods and modgraph
178+
run: |
179+
nix develop -c go get -tool github.com/jmank88/gomods@latest github.com/jmank88/modgraph@latest
180+
177181
- name: Ensure modules are tidy
178182
run: |
179183
nix develop -c go tool gomods tidy

‎bindings/bind/compile.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ func compilePackageInternal(packageName contracts.Package, namedAddresses map[st
309309
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "lock_release_token_pool"),
310310
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "burn_mint_token_pool"),
311311
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "managed_token_pool"),
312-
filepath.Join(dstRoot, "ccip", "ccip_token_pools", "usdc_token_pool"),
313312
}
314313
for _, depDir := range commonDependencyDirs {
315314
if _, statErr := os.Stat(depDir); statErr == nil {
@@ -416,7 +415,7 @@ func compilePackageInternal(packageName contracts.Package, namedAddresses map[st
416415
}
417416
}
418417

419-
if packageName == contracts.LockReleaseTokenPool || packageName == contracts.BurnMintTokenPool || packageName == contracts.ManagedTokenPool || packageName == contracts.USDCTokenPool {
418+
if packageName == contracts.LockReleaseTokenPool || packageName == contracts.BurnMintTokenPool || packageName == contracts.ManagedTokenPool {
420419
mcmsAddr := namedAddresses["mcms"]
421420
if !isZeroAddress(mcmsAddr) {
422421
mcmsDir := filepath.Join(dstRoot, "mcms", "mcms")
@@ -443,9 +442,6 @@ func compilePackageInternal(packageName contracts.Package, namedAddresses map[st
443442
case contracts.ManagedTokenPool:
444443
originalPkgKey = "original_managed_token_pool_pkg"
445444
packageDir = "managed_token_pool"
446-
case contracts.USDCTokenPool:
447-
originalPkgKey = "original_usdc_token_pool_pkg"
448-
packageDir = "usdc_token_pool"
449445
}
450446

451447
originalAddr := namedAddresses[originalPkgKey]
@@ -839,7 +835,7 @@ func ownPackageAddressKey(packageName contracts.Package) string {
839835
case contracts.CCIP, contracts.CCIPOnramp, contracts.CCIPOfframp,
840836
contracts.CCIPRouter, contracts.CCIPDummyReceiver, contracts.CCIPBrokenReceiver,
841837
contracts.LockReleaseTokenPool, contracts.BurnMintTokenPool,
842-
contracts.ManagedTokenPool, contracts.USDCTokenPool,
838+
contracts.ManagedTokenPool,
843839
contracts.ManagedToken, contracts.ManagedTokenFaucet, contracts.CCIPBnM,
844840
contracts.MCMS, contracts.FastMCMS, contracts.MCMSUser, contracts.MCMSUserV2,
845841
contracts.LINK, contracts.MockLinkToken, contracts.MockEthToken,
@@ -860,7 +856,7 @@ func requiredPublishDeps(packageName contracts.Package, namedAddresses map[strin
860856
case contracts.CCIPOnramp, contracts.CCIPOfframp,
861857
contracts.CCIPDummyReceiver, contracts.CCIPBrokenReceiver,
862858
contracts.LockReleaseTokenPool, contracts.BurnMintTokenPool,
863-
contracts.ManagedTokenPool, contracts.USDCTokenPool:
859+
contracts.ManagedTokenPool:
864860
return []string{
865861
namedAddresses["mcms"],
866862
namedAddresses["fast_mcms"],

‎bindings/generated/ccip/ccip_token_pools/usdc_token_pool/usdc_token_pool.go‎

Lines changed: 0 additions & 3139 deletions
This file was deleted.

‎bindings/generated/function_info.go‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindings/mcms_encoder.go‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool"
1919
module_lock_release_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/lock_release_token_pool"
2020
module_managed_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/managed_token_pool"
21-
module_usdc_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/usdc_token_pool"
2221
module_managed_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token/managed_token"
2322
)
2423

@@ -292,29 +291,6 @@ func (e *CCIPEntrypointArgEncoder) EncodeEntryPointArg(executingCallbackParams *
292291
return encodeDefaultWithTypeArgsAndClock()
293292
}
294293

295-
// USDC TOKEN POOL
296-
case "usdc_token_pool":
297-
usdcTokenPool, err := module_usdc_token_pool.NewUsdcTokenPool(target, nil)
298-
if err != nil {
299-
return nil, err
300-
}
301-
switch function {
302-
case "accept_ownership":
303-
304-
return usdcTokenPool.Encoder().McmsAcceptOwnershipWithArgs(typeArgs, stateObj, registryObj, executingCallbackParams)
305-
case "set_allowlist_enabled",
306-
"apply_allowlist_updates",
307-
"apply_chain_updates",
308-
"add_remote_pool",
309-
"remove_remote_pool",
310-
"transfer_ownership":
311-
return encodeDefaultWithTypeArgs()
312-
case "execute_ownership_transfer":
313-
return encodeExecuteOwnershipTransferWithTypeArgs()
314-
case "set_chain_rate_limiter_configs", "set_chain_rate_limiter_config":
315-
return encodeDefaultWithTypeArgsAndClock()
316-
}
317-
318294
// RMN REMOTE
319295
case "rmn_remote":
320296
rmnRemote, err := module_rmn_remote.NewRmnRemote(target, nil)

‎bindings/mcms_encoder_test.go‎

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -722,140 +722,6 @@ func TestEncodeEntryPointArg_ManagedTokenPool(t *testing.T) {
722722
}
723723
}
724724

725-
func TestEncodeEntryPointArg_UsdcTokenPool(t *testing.T) {
726-
encoder := &CCIPEntrypointArgEncoder{
727-
registryObjID: "0x1234567890123456789012345678901234567890123456789012345678901234",
728-
deployerStateObjID: "0x8888888888888888888888888888888888888888888888888888888888888888",
729-
}
730-
731-
target := "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890"
732-
stateObjID := "0x9999999999999999999999999999999999999999999999999999999999999999"
733-
executingCallbackParams := &transaction.Argument{}
734-
735-
t.Run("accept_ownership", func(t *testing.T) {
736-
data := []byte{}
737-
738-
result, err := encoder.EncodeEntryPointArg(
739-
executingCallbackParams,
740-
target,
741-
"usdc_token_pool",
742-
"accept_ownership",
743-
stateObjID,
744-
data,
745-
[]string{"0x1::sui::SUI"},
746-
)
747-
748-
require.NoError(t, err)
749-
assert.NotNil(t, result)
750-
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
751-
assert.Equal(t, "mcms_accept_ownership", result.Function)
752-
})
753-
754-
typeArgTestCases := []string{
755-
"set_allowlist_enabled",
756-
"apply_allowlist_updates",
757-
"apply_chain_updates",
758-
"add_remote_pool",
759-
"remove_remote_pool",
760-
"transfer_ownership",
761-
}
762-
763-
for _, fn := range typeArgTestCases {
764-
t.Run(fn, func(t *testing.T) {
765-
data := []byte{}
766-
767-
result, err := encoder.EncodeEntryPointArg(
768-
executingCallbackParams,
769-
target,
770-
"usdc_token_pool",
771-
fn,
772-
stateObjID,
773-
data,
774-
[]string{"0x1::sui::SUI"},
775-
)
776-
777-
require.NoError(t, err)
778-
assert.NotNil(t, result)
779-
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
780-
assert.Equal(t, "mcms_"+fn, result.Function)
781-
782-
require.Len(t, result.TypeArgs, 1, "Expected 1 type argument")
783-
require.Len(t, result.CallArgs, 3, "Expected 3 arguments: state, registry, executingCallbackParams")
784-
785-
// Verify the state was deserialized correctly
786-
stateFromResult, err := extractObjectID(result.CallArgs[0])
787-
require.NoError(t, err, "Failed to extract state object ID")
788-
assert.Equal(t, stateObjID, stateFromResult, "State should match stateObjID (from BCS data)")
789-
})
790-
}
791-
792-
t.Run("execute_ownership_transfer", func(t *testing.T) {
793-
data := []byte{}
794-
795-
result, err := encoder.EncodeEntryPointArg(
796-
executingCallbackParams,
797-
target,
798-
"usdc_token_pool",
799-
"execute_ownership_transfer",
800-
stateObjID,
801-
data,
802-
[]string{"0x1::sui::SUI"},
803-
)
804-
805-
require.NoError(t, err)
806-
assert.NotNil(t, result)
807-
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
808-
assert.Equal(t, "mcms_execute_ownership_transfer", result.Function)
809-
810-
require.Len(t, result.TypeArgs, 1, "Expected 1 type argument")
811-
require.Len(t, result.CallArgs, 4, "Expected 4 arguments: state, registry, deployer_state, executingCallbackParams")
812-
813-
// Verify the state was deserialized correctly
814-
stateFromResult, err := extractObjectID(result.CallArgs[0])
815-
require.NoError(t, err, "Failed to extract state object ID")
816-
assert.Equal(t, stateObjID, stateFromResult, "State should match stateObjID")
817-
818-
// Verify the deployer state was set correctly
819-
deployerStateFromResult, err := extractObjectID(result.CallArgs[2])
820-
require.NoError(t, err, "Failed to extract deployer state object ID")
821-
assert.Equal(t, encoder.deployerStateObjID, deployerStateFromResult, "Deployer state should match deployerStateObjID")
822-
})
823-
824-
rateLimiterTestCases := []string{
825-
"set_chain_rate_limiter_configs",
826-
"set_chain_rate_limiter_config",
827-
}
828-
829-
for _, fn := range rateLimiterTestCases {
830-
t.Run(fn, func(t *testing.T) {
831-
data := []byte{}
832-
833-
result, err := encoder.EncodeEntryPointArg(
834-
executingCallbackParams,
835-
target,
836-
"usdc_token_pool",
837-
fn,
838-
stateObjID,
839-
data,
840-
[]string{"0x1::sui::SUI"},
841-
)
842-
843-
require.NoError(t, err)
844-
assert.NotNil(t, result)
845-
assert.Equal(t, "usdc_token_pool", result.Module.ModuleName)
846-
assert.Equal(t, "mcms_"+fn, result.Function)
847-
848-
require.Len(t, result.TypeArgs, 1, "Expected 1 type argument")
849-
require.Len(t, result.CallArgs, 4, "Expected 4 arguments: state, clock, registry, executingCallbackParams")
850-
851-
// Verify the state was deserialized correctly
852-
stateFromResult, err := extractObjectID(result.CallArgs[0])
853-
require.NoError(t, err, "Failed to extract state object ID")
854-
assert.Equal(t, stateObjID, stateFromResult, "State should match stateObjID (from BCS data)")
855-
})
856-
}
857-
}
858-
859725
func TestEncodeEntryPointArg_ManagedToken(t *testing.T) {
860726
encoder := &CCIPEntrypointArgEncoder{
861727
registryObjID: "0x1234567890123456789012345678901234567890123456789012345678901234",

‎bindings/packages/ccip_token_pools/usdc_token_pool/usdc_token_pool.go‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎contracts/ccip/ccip_token_pools/usdc_token_pool/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎contracts/ccip/ccip_token_pools/usdc_token_pool/Move.toml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)