From 05732f377e050b1168c8874892f420954d5070d8 Mon Sep 17 00:00:00 2001 From: Aleksandr Bukata <96521086+bukata-sa@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:18:58 +0000 Subject: [PATCH] CCIP-5284 ccip 1.6 firedrill prepare: ignore firedrill contract in address book (#16655) * CCIP-5284 ccip 1.6 firedrill prepare: ignore firedrill entrypoint in state generation * review fixes --- deployment/ccip/changeset/state.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/deployment/ccip/changeset/state.go b/deployment/ccip/changeset/state.go index b56dcd56c77..3385ad8ba17 100644 --- a/deployment/ccip/changeset/state.go +++ b/deployment/ccip/changeset/state.go @@ -11,7 +11,6 @@ import ( solOffRamp "github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/ccip_offramp" solState "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/state" - "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/v1_5_1/burn_from_mint_token_pool" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/link_token" @@ -115,6 +114,9 @@ var ( USDCTokenMessenger deployment.ContractType = "USDCTokenMessenger" USDCTokenPool deployment.ContractType = "USDCTokenPool" HybridLockReleaseUSDCTokenPool deployment.ContractType = "HybridLockReleaseUSDCTokenPool" + + // Firedrill + FiredrillEntrypointType deployment.ContractType = "FiredrillEntrypoint" ) // CCIPChainState holds a Go binding for all the currently deployed CCIP contracts @@ -1061,6 +1063,10 @@ func LoadChainState(ctx context.Context, chain deployment.Chain, addresses map[s } state.MockRMN = mockRMN state.ABIByAddress[address] = mock_rmn_contract.MockRMNContractABI + case deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0).String(), + deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_6_0).String(): + // Ignore firedrill contracts + // Firedrill contracts are unknown to core and their state is being loaded separately default: // ManyChainMultiSig 1.0.0 can have any of these labels, it can have either 1,2 or 3 of these - // bypasser, proposer and canceller