Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnieeG
AnieeG committed Dec 11, 2024
1 parent a4bebba commit 86d3947
Show file tree
Hide file tree
Showing 5 changed files with 215 additions and 403 deletions.
44 changes: 17 additions & 27 deletions deployment/ccip/changeset/cs_deploy_chain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_proxy_contract"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_remote"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
)
Expand Down Expand Up @@ -205,6 +204,22 @@ func deployChainContracts(
if chainState.Router == nil {
return fmt.Errorf("router not found for chain %s, deploy the prerequisites first", chain.String())
}
rmnProxyContract := chainState.RMNProxy
if chainState.RMNProxy == nil {
e.Logger.Errorw("RMNProxy not found", "chain", chain.String())
return fmt.Errorf("rmn proxy not found for chain %s, deploy the prerequisites first", chain.String())
}
var rmnLegacyAddr common.Address
if chainState.MockRMN != nil {
rmnLegacyAddr = chainState.MockRMN.Address()
}
// If RMN is deployed, set rmnLegacyAddr to the RMN address
if chainState.RMN != nil {
rmnLegacyAddr = chainState.RMN.Address()
}
if rmnLegacyAddr == (common.Address{}) {
e.Logger.Warnf("No legacy RMN contract found for chain %s, will not setRMN in RMNRemote", chain.String())
}
if chainState.Receiver == nil {
_, err := deployment.DeployContract(e.Logger, chain, ab,
func(chain deployment.Chain) deployment.ContractDeploy[*maybe_revert_message_receiver.MaybeRevertMessageReceiver] {
Expand Down Expand Up @@ -233,8 +248,7 @@ func deployChainContracts(
chain.DeployerKey,
chain.Client,
chain.Selector,
// Indicates no legacy RMN contract
common.HexToAddress("0x0"),
rmnLegacyAddr,
)
return deployment.ContractDeploy[*rmn_remote.RMNRemote]{
rmnRemoteAddr, rmnRemote, tx, deployment.NewTypeAndVersion(RMNRemote, deployment.Version1_6_0_dev), err2,
Expand Down Expand Up @@ -267,30 +281,6 @@ func deployChainContracts(
return err
}

// we deploy a new RMNProxy so that RMNRemote can be tested first before pointing it to the main Existing RMNProxy
// To differentiate between the two RMNProxies, we will deploy new one with Version1_6_0_dev
rmnProxyContract := chainState.RMNProxyNew
if chainState.RMNProxyNew == nil {
// we deploy a new rmnproxy contract to test RMNRemote
rmnProxy, err := deployment.DeployContract(e.Logger, chain, ab,
func(chain deployment.Chain) deployment.ContractDeploy[*rmn_proxy_contract.RMNProxyContract] {
rmnProxyAddr, tx, rmnProxy, err2 := rmn_proxy_contract.DeployRMNProxyContract(
chain.DeployerKey,
chain.Client,
rmnRemoteContract.Address(),
)
return deployment.ContractDeploy[*rmn_proxy_contract.RMNProxyContract]{
rmnProxyAddr, rmnProxy, tx, deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_6_0_dev), err2,
}
})
if err != nil {
e.Logger.Errorw("Failed to deploy RMNProxyNew", "chain", chain.String(), "err", err)
return err
}
rmnProxyContract = rmnProxy.Contract
} else {
e.Logger.Infow("rmn proxy already deployed", "chain", chain.String(), "addr", chainState.RMNProxyNew.Address)
}
if chainState.TestRouter == nil {
_, err := deployment.DeployContract(e.Logger, chain, ab,
func(chain deployment.Chain) deployment.ContractDeploy[*router.Router] {
Expand Down
6 changes: 3 additions & 3 deletions deployment/ccip/changeset/cs_prerequisites.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
weth9Contract = chainState.Weth9
tokenAdminReg = chainState.TokenAdminRegistry
registryModule = chainState.RegistryModule
rmnProxy = chainState.RMNProxyExisting
rmnProxy = chainState.RMNProxy
r = chainState.Router
mc3 = chainState.Multicall3
}
if rmnProxy == nil {
// we want to replicate the mainnet scenario where RMNProxy is already deployed with some existing RMN
// This will need us to use two different RMNProxy contracts
// 1. RMNProxyNew with RMNRemote - ( deployed later in chain contracts)
// 2. RMNProxyExisting with mockRMN - ( deployed here, replicating the behavior of existing RMNProxy with already set RMN)
// 2. RMNProxy with mockRMN - ( deployed here, replicating the behavior of existing RMNProxy with already set RMN)
rmn, err := deployment.DeployContract(lggr, chain, ab,
func(chain deployment.Chain) deployment.ContractDeploy[*mock_rmn_contract.MockRMNContract] {
rmnAddr, tx2, rmn, err2 := mock_rmn_contract.DeployMockRMNContract(
Expand All @@ -168,7 +168,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
}
})
if err != nil {
lggr.Errorw("Failed to deploy RMNProxyExisting", "chain", chain.String(), "err", err)
lggr.Errorw("Failed to deploy RMNProxy", "chain", chain.String(), "err", err)
return err
}
rmnProxy = rmnProxyContract.Contract
Expand Down
145 changes: 92 additions & 53 deletions deployment/ccip/changeset/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import (
"fmt"

burn_mint_token_pool "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/burn_mint_token_pool_1_4_0"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/commit_store"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_offramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry_1_2_0"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_contract"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/erc20"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_usdc_token_messenger"
Expand All @@ -15,6 +20,7 @@ import (
"github.com/pkg/errors"

"github.com/smartcontractkit/chainlink/deployment"
legacychangeset "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/v1_5"
"github.com/smartcontractkit/chainlink/deployment/ccip/view"
"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_0"
"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_2"
Expand All @@ -24,7 +30,6 @@ import (
commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
common_v1_0 "github.com/smartcontractkit/chainlink/deployment/common/view/v1_0"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/commit_store"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_rmn_contract"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/registry_module_owner_custom"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home"
Expand Down Expand Up @@ -53,7 +58,6 @@ var (
ARMProxy deployment.ContractType = "ARMProxy"
WETH9 deployment.ContractType = "WETH9"
Router deployment.ContractType = "Router"
CommitStore deployment.ContractType = "CommitStore"
TokenAdminRegistry deployment.ContractType = "TokenAdminRegistry"
RegistryModule deployment.ContractType = "RegistryModuleOwnerCustom"
NonceManager deployment.ContractType = "NonceManager"
Expand All @@ -75,6 +79,11 @@ var (
USDCMockTransmitter deployment.ContractType = "USDCMockTransmitter"
USDCTokenMessenger deployment.ContractType = "USDCTokenMessenger"
USDCTokenPool deployment.ContractType = "USDCTokenPool"

// Legacy contracts
CommitStore deployment.ContractType = "CommitStore"
PriceRegistry deployment.ContractType = "PriceRegistry"
RMN deployment.ContractType = "RMN"
)

// CCIPChainState holds a Go binding for all the currently deployed CCIP contracts
Expand All @@ -83,26 +92,16 @@ type CCIPChainState struct {
commoncs.MCMSWithTimelockState
commoncs.LinkTokenState
commoncs.StaticLinkTokenState
OnRamp *onramp.OnRamp
OffRamp *offramp.OffRamp
FeeQuoter *fee_quoter.FeeQuoter
// We need 2 RMNProxy contracts because we are in the process of migrating to a new version.
// We will switch to the existing one once the migration is complete.
// This is the new RMNProxy contract that will be used for testing RMNRemote before migration.
// Initially RMNProxyNew will point to RMNRemote
RMNProxyNew *rmn_proxy_contract.RMNProxyContract
// Existing RMNProxy contract that is used in production, This already has existing 1.5 RMN set.
// once RMNRemote is tested with RMNProxyNew, as part of migration
// RMNProxyExisting will point to RMNRemote. This will switch over CCIP 1.5 to 1.6
RMNProxyExisting *rmn_proxy_contract.RMNProxyContract
OnRamp *onramp.OnRamp
OffRamp *offramp.OffRamp
FeeQuoter *fee_quoter.FeeQuoter
RMNProxy *rmn_proxy_contract.RMNProxyContract
NonceManager *nonce_manager.NonceManager
TokenAdminRegistry *token_admin_registry.TokenAdminRegistry
RegistryModule *registry_module_owner_custom.RegistryModuleOwnerCustom
Router *router.Router
CommitStore *commit_store.CommitStore
Weth9 *weth9.WETH9
RMNRemote *rmn_remote.RMNRemote
MockRMN *mock_rmn_contract.MockRMNContract
// Map between token Descriptor (e.g. LinkSymbol, WethSymbol)
// and the respective token contract
// This is more of an illustration of how we'll have tokens, and it might need some work later to work properly.
Expand All @@ -127,6 +126,9 @@ type CCIPChainState struct {
MockUSDCTransmitter *mock_usdc_token_transmitter.MockE2EUSDCTransmitter
MockUSDCTokenMessenger *mock_usdc_token_messenger.MockE2EUSDCTokenMessenger
Multicall3 *multicall3.Multicall3

// Legacy contracts
legacychangeset.CCIPChainStateLegacy
}

func (c CCIPChainState) GenerateView() (view.ChainView, error) {
Expand Down Expand Up @@ -190,20 +192,12 @@ func (c CCIPChainState) GenerateView() (view.ChainView, error) {
chainView.OffRamp[c.OffRamp.Address().Hex()] = offRampView
}

if c.CommitStore != nil {
commitStoreView, err := v1_5.GenerateCommitStoreView(c.CommitStore)
if err != nil {
return chainView, errors.Wrapf(err, "failed to generate commit store view for commit store %s", c.CommitStore.Address().String())
}
chainView.CommitStore[c.CommitStore.Address().Hex()] = commitStoreView
}

if c.RMNProxyNew != nil {
rmnProxyView, err := v1_0.GenerateRMNProxyView(c.RMNProxyNew)
if c.RMNProxy != nil {
rmnProxyView, err := v1_0.GenerateRMNProxyView(c.RMNProxy)
if err != nil {
return chainView, errors.Wrapf(err, "failed to generate rmn proxy view for rmn proxy %s", c.RMNProxyNew.Address().String())
return chainView, errors.Wrapf(err, "failed to generate rmn proxy view for rmn proxy %s", c.RMNProxy.Address().String())
}
chainView.RMNProxy[c.RMNProxyNew.Address().Hex()] = rmnProxyView
chainView.RMNProxy[c.RMNProxy.Address().Hex()] = rmnProxyView
}
if c.CapabilityRegistry != nil {
capRegView, err := common_v1_0.GenerateCapabilityRegistryView(c.CapabilityRegistry)
Expand Down Expand Up @@ -233,6 +227,17 @@ func (c CCIPChainState) GenerateView() (view.ChainView, error) {
}
chainView.StaticLinkToken = staticLinkTokenView
}
// Legacy contracts
if c.CommitStore != nil {
for _, commitStore := range c.CommitStore {
commitStoreView, err := v1_5.GenerateCommitStoreView(commitStore)
if err != nil {
return chainView, errors.Wrapf(err, "failed to generate commit store view for commit store %s", commitStore.Address().String())
}
chainView.CommitStore[commitStore.Address().Hex()] = commitStoreView
}
}

return chainView, nil
}

Expand Down Expand Up @@ -341,25 +346,7 @@ func LoadChainState(chain deployment.Chain, addresses map[string]deployment.Type
if err != nil {
return state, err
}
state.RMNProxyExisting = armProxy
case deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_6_0_dev).String():
armProxy, err := rmn_proxy_contract.NewRMNProxyContract(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.RMNProxyNew = armProxy
case deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_6_0_dev).String():
armProxy, err := rmn_proxy_contract.NewRMNProxyContract(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.RMNProxyNew = armProxy
case deployment.NewTypeAndVersion(MockRMN, deployment.Version1_0_0).String():
mockRMN, err := mock_rmn_contract.NewMockRMNContract(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.MockRMN = mockRMN
state.RMNProxy = armProxy
case deployment.NewTypeAndVersion(RMNRemote, deployment.Version1_6_0_dev).String():
rmnRemote, err := rmn_remote.NewRMNRemote(common.HexToAddress(address), chain.Client)
if err != nil {
Expand All @@ -384,12 +371,6 @@ func LoadChainState(chain deployment.Chain, addresses map[string]deployment.Type
return state, err
}
state.NonceManager = nm
case deployment.NewTypeAndVersion(CommitStore, deployment.Version1_5_0).String():
cs, err := commit_store.NewCommitStore(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.CommitStore = cs
case deployment.NewTypeAndVersion(TokenAdminRegistry, deployment.Version1_5_0).String():
tm, err := token_admin_registry.NewTokenAdminRegistry(common.HexToAddress(address), chain.Client)
if err != nil {
Expand Down Expand Up @@ -522,6 +503,64 @@ func LoadChainState(chain deployment.Chain, addresses map[string]deployment.Type
return state, fmt.Errorf("failed to get token symbol of token at %s: %w", address, err)
}
state.BurnMintTokens677[TokenSymbol(symbol)] = tok
// legacy addresses below
case deployment.NewTypeAndVersion(OnRamp, deployment.Version1_5_0).String():
onRampC, err := evm_2_evm_onramp.NewEVM2EVMOnRamp(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
sCfg, err := onRampC.GetStaticConfig(nil)
if err != nil {
return state, fmt.Errorf("failed to get static config chain %s: %w", chain.String(), err)
}
if state.EVM2EVMOnRamp == nil {
state.EVM2EVMOnRamp = make(map[uint64]*evm_2_evm_onramp.EVM2EVMOnRamp)
}
state.EVM2EVMOnRamp[sCfg.DestChainSelector] = onRampC
case deployment.NewTypeAndVersion(OffRamp, deployment.Version1_5_0).String():
offRamp, err := evm_2_evm_offramp.NewEVM2EVMOffRamp(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
sCfg, err := offRamp.GetStaticConfig(nil)
if err != nil {
return state, err
}
if state.EVM2EVMOffRamp == nil {
state.EVM2EVMOffRamp = make(map[uint64]*evm_2_evm_offramp.EVM2EVMOffRamp)
}
state.EVM2EVMOffRamp[sCfg.SourceChainSelector] = offRamp
case deployment.NewTypeAndVersion(CommitStore, deployment.Version1_5_0).String():
commitStore, err := commit_store.NewCommitStore(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
sCfg, err := commitStore.GetStaticConfig(nil)
if err != nil {
return state, err
}
if state.CommitStore == nil {
state.CommitStore = make(map[uint64]*commit_store.CommitStore)
}
state.CommitStore[sCfg.SourceChainSelector] = commitStore
case deployment.NewTypeAndVersion(PriceRegistry, deployment.Version1_2_0).String():
pr, err := price_registry_1_2_0.NewPriceRegistry(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.PriceRegistry = pr
case deployment.NewTypeAndVersion(RMN, deployment.Version1_5_0).String():
rmnC, err := rmn_contract.NewRMNContract(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.RMN = rmnC
case deployment.NewTypeAndVersion(MockRMN, deployment.Version1_0_0).String():
mockRMN, err := mock_rmn_contract.NewMockRMNContract(common.HexToAddress(address), chain.Client)
if err != nil {
return state, err
}
state.MockRMN = mockRMN
default:
return state, fmt.Errorf("unknown contract %s", tvStr)
}
Expand Down
Loading

0 comments on commit 86d3947

Please sign in to comment.