Skip to content

Commit

Permalink
CCIP-5284 ccip 1.6 firedrill prepare: ignore firedrill contract in ad…
Browse files Browse the repository at this point in the history
…dress book (#16655)

* CCIP-5284 ccip 1.6 firedrill prepare: ignore firedrill entrypoint in state generation

* review fixes
  • Loading branch information
bukata-sa authored Mar 10, 2025
1 parent 0d3a43a commit 05732f3
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion deployment/ccip/changeset/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 05732f3

Please sign in to comment.