Skip to content

Refactor go bindings and deployment evm #1578

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
agusaldasoro wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Refactor go bindings and deployment evm #1578

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9cce7ed
Refactor go bindings and deployment evm
agusaldasoro Jan 19, 2026
c19be75
fix ping pong
agusaldasoro Jan 19, 2026
eaf6084
Merge branch 'main' into fix-tooling
agusaldasoro Jan 19, 2026
c2b710d
Fix tests
agusaldasoro Jan 19, 2026
176fd1e
Fix mock Import
agusaldasoro Jan 21, 2026
9ad4e8c
Merge branch 'main' into fix-tooling
agusaldasoro Jan 21, 2026
7b19576
review comments
b-gopalswami Jan 21, 2026
e3ef7e0
Replace factory bnmerc20 with bnmerc20
b-gopalswami Jan 21, 2026
1e72522
more test has factory bnmerc20
b-gopalswami Jan 21, 2026
169fdb1
Remove option to deploy factory_burn_mint_erc20 directly
b-gopalswami Jan 21, 2026
c4b392d
lint fix
b-gopalswami Jan 21, 2026
6779e78
make generate
b-gopalswami Jan 21, 2026
c31df32
Merge branch 'main' into fix-tooling
agusaldasoro Jan 27, 2026
12fe296
go sum
agusaldasoro Jan 27, 2026
595e9fe
Fix mocks
agusaldasoro Jan 27, 2026
42033fc
Fix imports
agusaldasoro Jan 27, 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
34 changes: 0 additions & 34 deletions chains/evm/deployment/v1_0_0/operations/burn_mint_erc677/burn_mint_erc677.go
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions chains/evm/deployment/v1_0_0/operations/erc677/erc677.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion chains/evm/deployment/v1_0_0/operations/factory_burn_mint_erc20/factory_burn_mint_erc20.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/common"

"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/deployment/utils"
cldf_deployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
)
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/deployment/v1_0_0/sequences/mcms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"
"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/latest/burn_mint_erc677"
"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc677"
"github.com/smartcontractkit/mcms/sdk/evm"
"github.com/smartcontractkit/mcms/sdk/evm/bindings"
"github.com/smartcontractkit/mcms/types"
Expand Down
6 changes: 3 additions & 3 deletions chains/evm/deployment/v1_6_0/operations/ping_pong_dapp/ping_pong_dapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"

"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/ping_pong_demo"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/ping_pong_demo"
cldf_deployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
)

Expand Down Expand Up @@ -49,7 +49,7 @@ var SetCounterpart = contract.NewWrite(contract.WriteParams[SetCounterpartArgs,
IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetCounterpartArgs],
Validate: func(SetCounterpartArgs) error { return nil },
CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetCounterpartArgs) (*types.Transaction, error) {
return pingPong.SetCounterpart(opts, args.CounterpartChainSelector, args.CounterpartAddress)
return pingPong.SetCounterpart(opts, args.CounterpartChainSelector, common.BytesToAddress(args.CounterpartAddress))
},
})

Expand Down Expand Up @@ -87,7 +87,7 @@ var SetCounterpartAddress = contract.NewWrite(contract.WriteParams[SetCounterpar
IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetCounterpartAddressArgs],
Validate: func(SetCounterpartAddressArgs) error { return nil },
CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetCounterpartAddressArgs) (*types.Transaction, error) {
return pingPong.SetCounterpartAddress(opts, args.Address)
return pingPong.SetCounterpartAddress(opts, common.BytesToAddress(args.Address))
},
})

Expand Down
36 changes: 2 additions & 34 deletions chains/evm/deployment/v1_6_0/sequences/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import (
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20_with_drip"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/burn_mint_erc677"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/erc677"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/factory_burn_mint_erc20"
tokenapi "github.com/smartcontractkit/chainlink-ccip/deployment/tokens"
common_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils"
Expand All @@ -26,7 +24,7 @@ import (
)

// tokenSupportsAdminRole returns true if the token type supports AccessControl admin roles.
// ERC20 and ERC677 are basic tokens without role management.
// ERC20 is the basic token without role management.
// BurnMint tokens inherit from AccessControl and support role management.
func tokenSupportsAdminRole(tokenType deployment.ContractType) bool {
switch tokenType {
Expand All @@ -39,7 +37,7 @@ func tokenSupportsAdminRole(tokenType deployment.ContractType) bool {
}

// tokenSupportsCCIPAdmin returns true if the token type supports AccessControl CCIP admin roles.
// ERC20 and ERC677 are basic tokens without role management.
// ERC20 is the basic token without role management.
func tokenSupportsCCIPAdmin(tokenType deployment.ContractType) bool {
switch tokenType {
case burn_mint_erc20.ContractType,
Expand Down Expand Up @@ -77,20 +75,6 @@ var DeployToken = cldf_ops.NewSequence(
return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy ERC20 token: %w", err)
}

case erc677.ContractType:
tokenRef, err = contract.MaybeDeployContract(b, erc677.Deploy, chain, contract.DeployInput[erc677.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(erc677.ContractType, *common_utils.Version_1_0_0),
ChainSelector: chain.Selector,
Args: erc677.ConstructorArgs{
Name: input.Name,
Symbol: input.Symbol,
},
Qualifier: &qualifier,
}, nil)
if err != nil {
return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy ERC677 token: %w", err)
}

case burn_mint_erc20.ContractType:
tokenRef, err = contract.MaybeDeployContract(b, burn_mint_erc20.Deploy, chain, contract.DeployInput[burn_mint_erc20.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20.ContractType, *common_utils.Version_1_0_0),
Expand All @@ -108,22 +92,6 @@ var DeployToken = cldf_ops.NewSequence(
return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy BurnMintERC20 token: %w", err)
}

case burn_mint_erc677.ContractType:
tokenRef, err = contract.MaybeDeployContract(b, burn_mint_erc677.Deploy, chain, contract.DeployInput[burn_mint_erc677.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc677.ContractType, *common_utils.Version_1_0_0),
ChainSelector: chain.Selector,
Args: burn_mint_erc677.ConstructorArgs{
Name: input.Name,
Symbol: input.Symbol,
Decimals: input.Decimals,
MaxSupply: input.Supply,
},
Qualifier: &qualifier,
}, nil)
if err != nil {
return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy BurnMintERC677 token: %w", err)
}

case factory_burn_mint_erc20.ContractType:
tokenRef, err = contract.MaybeDeployContract(b, factory_burn_mint_erc20.Deploy, chain, contract.DeployInput[factory_burn_mint_erc20.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(factory_burn_mint_erc20.ContractType, *common_utils.Version_1_0_0),
Expand Down
21 changes: 1 addition & 20 deletions chains/evm/deployment/v1_6_0/sequences/token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@ import (

"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20_with_drip"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/burn_mint_erc677"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/erc677"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/factory_burn_mint_erc20"
bnm_bindings "github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc20"

tokensapi "github.com/smartcontractkit/chainlink-ccip/deployment/tokens"
)

// TestEVMTokenDeployments tests various EVM token deployments using the DeployToken sequence directly.
// This covers all supported EVM token types: ERC20, ERC677, BurnMintERC20, BurnMintERC677,
// FactoryBurnMintERC20, and BurnMintERC20WithDrip.
// This covers all supported EVM token types: ERC20, BurnMintERC20, FactoryBurnMintERC20, and BurnMintERC20WithDrip.
// Note: The full TokenExpansion changeset is not yet implemented for EVM (DeployTokenPoolForToken,
// RegisterToken, SetPool return nil), so we test token deployment directly via the sequence.
func TestEVMTokenDeployments(t *testing.T) {
Expand Down Expand Up @@ -58,13 +55,6 @@ func TestEVMTokenDeployments(t *testing.T) {
tokenSymbol: "TERC20",
decimals: 18,
},
{
name: "ERC677Token",
tokenType: erc677.ContractType,
tokenName: "Test ERC677",
tokenSymbol: "TERC677",
decimals: 6,
},
{
name: "BurnMintERC20Token",
tokenType: burn_mint_erc20.ContractType,
Expand All @@ -76,15 +66,6 @@ func TestEVMTokenDeployments(t *testing.T) {
preMint: big.NewInt(0).Mul(big.NewInt(1e6), big.NewInt(1e18)), // 1 million tokens
requiresSupply: true,
},
{
name: "BurnMintERC677Token",
tokenType: burn_mint_erc677.ContractType,
tokenName: "Test BurnMint ERC677",
tokenSymbol: "TBMERC677",
decimals: 18,
supply: big.NewInt(0).Mul(big.NewInt(1e9), big.NewInt(1e18)),
requiresSupply: true,
},
{
name: "FactoryBurnMintERC20Token",
tokenType: factory_burn_mint_erc20.ContractType,
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/deployment/v1_6_4/changesets/apply_chain_updates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (

"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/changesets"
token_pool_ops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/operations/token_pool"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/burn_mint_token_pool"
token_pool_bindings "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/token_pool"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_2/factory_burn_mint_erc20"
Copy link

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The factory_burn_mint_erc20 import is using v1_6_2 here, but in modify_remote_pools_test.go (line 25) the same package is imported from v1_5_1. This inconsistency in versioning across test files could lead to unexpected behavior. Consider standardizing to the same version across all test files in the v1_6_4 changesets directory.

Suggested change
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_2/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/factory_burn_mint_erc20"

Copilot uses AI. Check for mistakes.
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/mcms"
)

Expand Down
2 changes: 1 addition & 1 deletion chains/evm/deployment/v1_6_4/changesets/modify_remote_pools_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/ethereum/go-ethereum/accounts/abi/bind"

"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/factory_burn_mint_erc20"
)

func TestModifyRemotePoolsChangeset(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions chains/evm/deployment/v1_6_4/changesets/set_domains_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
contract_utils "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/changesets"
usdc_token_pool_cctp_v2_ops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/operations/usdc_token_pool_cctp_v2"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/cctp_message_transmitter_proxy"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/mock_usdc_token_messenger"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/mock_usdc_token_transmitter"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/mock_usdc_token_messenger"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/mock_usdc_token_transmitter"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_2/cctp_message_transmitter_proxy"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_2/factory_burn_mint_erc20"
usdc_token_pool_cctp_v2_bindings "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_4/usdc_token_pool_cctp_v2"
)

Expand Down
10 changes: 5 additions & 5 deletions chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_cctp_v2_deploy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/changesets"
cctp_message_transmitter_proxy_ops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/operations/cctp_message_transmitter_proxy"
usdc_token_pool_cctp_v2_ops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_4/operations/usdc_token_pool_cctp_v2"
cctp_message_transmitter_proxy_binding "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/cctp_message_transmitter_proxy"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/mock_usdc_token_messenger"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/mock_usdc_token_transmitter"
usdc_token_pool_cctp_v2_binding "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/usdc_token_pool_cctp_v2"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/factory_burn_mint_erc20"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/mock_usdc_token_messenger"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/mock_usdc_token_transmitter"
cctp_message_transmitter_proxy_binding "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_2/cctp_message_transmitter_proxy"
usdc_token_pool_cctp_v2_binding "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_4/usdc_token_pool_cctp_v2"
"github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
"github.com/smartcontractkit/chainlink-ccip/deployment/testhelpers"
deploymentutils "github.com/smartcontractkit/chainlink-ccip/deployment/utils"
Expand Down
Loading
Loading