-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
deployment/ccip/changeset: add transfer/accept ownership changeset #15409
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
042b5a5
wip
makramkd c11a2f8
Merge branch 'develop' into mk/accept-ownership-proposal
makramkd 7a55173
add test
makramkd 387d972
make the proposal multichain
makramkd ac48a1e
add transfer ownership changeset
makramkd bc716e8
fix add_chain_test.go
makramkd 2edd809
extract common code to func
makramkd 5ad33a0
move changeset to common
makramkd c474490
move transfer ownership cs to common
makramkd ff9caa4
Merge branch 'develop' into mk/accept-ownership-proposal
makramkd 19490c4
fix
makramkd aa68e35
Merge branch 'develop' into mk/accept-ownership-proposal
makramkd 516e161
Merge branch 'develop' into mk/accept-ownership-proposal
makramkd b10a0ad
bump boost significantly
makramkd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| package changeset | ||
|
|
||
| import ( | ||
| "math/big" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi/bind" | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers" | ||
| "github.com/smartcontractkit/chainlink-common/pkg/utils/tests" | ||
| "github.com/smartcontractkit/chainlink/deployment" | ||
| commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset" | ||
| commontypes "github.com/smartcontractkit/chainlink/deployment/common/types" | ||
|
|
||
| "github.com/smartcontractkit/chainlink/v2/core/logger" | ||
| "github.com/stretchr/testify/require" | ||
| "golang.org/x/exp/maps" | ||
| ) | ||
|
|
||
| func Test_NewAcceptOwnershipChangeset(t *testing.T) { | ||
| e := NewMemoryEnvironmentWithJobs(t, logger.TestLogger(t), 2, 4) | ||
| state, err := LoadOnchainState(e.Env) | ||
| require.NoError(t, err) | ||
|
|
||
| allChains := maps.Keys(e.Env.Chains) | ||
| source := allChains[0] | ||
| dest := allChains[1] | ||
|
|
||
| newAddresses := deployment.NewMemoryAddressBook() | ||
| err = deployPrerequisiteChainContracts(e.Env, newAddresses, allChains, nil) | ||
| require.NoError(t, err) | ||
| require.NoError(t, e.Env.ExistingAddresses.Merge(newAddresses)) | ||
|
|
||
| mcmConfig := commontypes.MCMSWithTimelockConfig{ | ||
| Canceller: commonchangeset.SingleGroupMCMS(t), | ||
| Bypasser: commonchangeset.SingleGroupMCMS(t), | ||
| Proposer: commonchangeset.SingleGroupMCMS(t), | ||
| TimelockExecutors: e.Env.AllDeployerKeys(), | ||
| TimelockMinDelay: big.NewInt(0), | ||
| } | ||
| out, err := commonchangeset.DeployMCMSWithTimelock(e.Env, map[uint64]commontypes.MCMSWithTimelockConfig{ | ||
| source: mcmConfig, | ||
| dest: mcmConfig, | ||
| }) | ||
| require.NoError(t, err) | ||
| require.NoError(t, e.Env.ExistingAddresses.Merge(out.AddressBook)) | ||
| newAddresses = deployment.NewMemoryAddressBook() | ||
| tokenConfig := NewTestTokenConfig(state.Chains[e.FeedChainSel].USDFeeds) | ||
| ocrParams := make(map[uint64]CCIPOCRParams) | ||
| for _, chain := range allChains { | ||
| ocrParams[chain] = DefaultOCRParams(e.FeedChainSel, nil) | ||
| } | ||
| err = deployCCIPContracts(e.Env, newAddresses, NewChainsConfig{ | ||
| HomeChainSel: e.HomeChainSel, | ||
| FeedChainSel: e.FeedChainSel, | ||
| ChainsToDeploy: allChains, | ||
| TokenConfig: tokenConfig, | ||
| OCRSecrets: deployment.XXXGenerateTestOCRSecrets(), | ||
| OCRParams: ocrParams, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| // at this point we have the initial deploys done, now we need to transfer ownership | ||
| // to the timelock contract | ||
| state, err = LoadOnchainState(e.Env) | ||
| require.NoError(t, err) | ||
|
|
||
| // compose the transfer ownership and accept ownership changesets | ||
| _, err = commonchangeset.ApplyChangesets(t, e.Env, map[uint64]*gethwrappers.RBACTimelock{ | ||
| source: state.Chains[source].Timelock, | ||
| dest: state.Chains[dest].Timelock, | ||
| }, []commonchangeset.ChangesetApplication{ | ||
| // note this doesn't have proposals. | ||
| { | ||
| Changeset: commonchangeset.WrapChangeSet(commonchangeset.NewTransferOwnershipChangeset), | ||
| Config: genTestTransferOwnershipConfig(e, allChains, state), | ||
| }, | ||
| // this has proposals, ApplyChangesets will sign & execute them. | ||
| // in practice, signing and executing are separated processes. | ||
| { | ||
| Changeset: commonchangeset.WrapChangeSet(commonchangeset.NewAcceptOwnershipChangeset), | ||
| Config: genTestAcceptOwnershipConfig(e, allChains, state), | ||
| }, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| assertTimelockOwnership(t, e, allChains, state) | ||
| } | ||
|
|
||
| func genTestTransferOwnershipConfig( | ||
| e DeployedEnv, | ||
| chains []uint64, | ||
| state CCIPOnChainState, | ||
| ) commonchangeset.TransferOwnershipConfig { | ||
| var ( | ||
| timelocksPerChain = make(map[uint64]common.Address) | ||
| contracts = make(map[uint64][]commonchangeset.OwnershipTransferrer) | ||
| ) | ||
|
|
||
| // chain contracts | ||
| for _, chain := range chains { | ||
| timelocksPerChain[chain] = state.Chains[chain].Timelock.Address() | ||
| contracts[chain] = []commonchangeset.OwnershipTransferrer{ | ||
| state.Chains[chain].OnRamp, | ||
| state.Chains[chain].OffRamp, | ||
| state.Chains[chain].FeeQuoter, | ||
| state.Chains[chain].NonceManager, | ||
| state.Chains[chain].RMNRemote, | ||
| } | ||
| } | ||
|
|
||
| // home chain | ||
| homeChainTimelockAddress := state.Chains[e.HomeChainSel].Timelock.Address() | ||
| timelocksPerChain[e.HomeChainSel] = homeChainTimelockAddress | ||
| contracts[e.HomeChainSel] = append(contracts[e.HomeChainSel], | ||
| state.Chains[e.HomeChainSel].CapabilityRegistry, | ||
| state.Chains[e.HomeChainSel].CCIPHome, | ||
| state.Chains[e.HomeChainSel].RMNHome, | ||
| ) | ||
|
|
||
| return commonchangeset.TransferOwnershipConfig{ | ||
| TimelocksPerChain: timelocksPerChain, | ||
| Contracts: contracts, | ||
| } | ||
| } | ||
|
|
||
| func genTestAcceptOwnershipConfig( | ||
| e DeployedEnv, | ||
| chains []uint64, | ||
| state CCIPOnChainState, | ||
| ) commonchangeset.AcceptOwnershipConfig { | ||
| var ( | ||
| timelocksPerChain = make(map[uint64]common.Address) | ||
| proposerMCMses = make(map[uint64]*gethwrappers.ManyChainMultiSig) | ||
| contracts = make(map[uint64][]commonchangeset.OwnershipAcceptor) | ||
| ) | ||
| for _, chain := range chains { | ||
| timelocksPerChain[chain] = state.Chains[chain].Timelock.Address() | ||
| proposerMCMses[chain] = state.Chains[chain].ProposerMcm | ||
| contracts[chain] = []commonchangeset.OwnershipAcceptor{ | ||
| state.Chains[chain].OnRamp, | ||
| state.Chains[chain].OffRamp, | ||
| state.Chains[chain].FeeQuoter, | ||
| state.Chains[chain].NonceManager, | ||
| state.Chains[chain].RMNRemote, | ||
| } | ||
| } | ||
|
|
||
| // add home chain contracts. | ||
| // this overwrite should be fine. | ||
| timelocksPerChain[e.HomeChainSel] = state.Chains[e.HomeChainSel].Timelock.Address() | ||
| proposerMCMses[e.HomeChainSel] = state.Chains[e.HomeChainSel].ProposerMcm | ||
| contracts[e.HomeChainSel] = append(contracts[e.HomeChainSel], | ||
| state.Chains[e.HomeChainSel].CapabilityRegistry, | ||
| state.Chains[e.HomeChainSel].CCIPHome, | ||
| state.Chains[e.HomeChainSel].RMNHome, | ||
| ) | ||
|
|
||
| return commonchangeset.AcceptOwnershipConfig{ | ||
| TimelocksPerChain: timelocksPerChain, | ||
| ProposerMCMSes: proposerMCMses, | ||
| Contracts: contracts, | ||
| MinDelay: time.Duration(0), | ||
| } | ||
| } | ||
|
|
||
| // assertTimelockOwnership asserts that the ownership of the contracts has been transferred | ||
| // to the appropriate timelock contract on each chain. | ||
| func assertTimelockOwnership( | ||
| t *testing.T, | ||
| e DeployedEnv, | ||
| chains []uint64, | ||
| state CCIPOnChainState, | ||
| ) { | ||
| ctx := tests.Context(t) | ||
| // check that the ownership has been transferred correctly | ||
| for _, chain := range chains { | ||
| for _, contract := range []commonchangeset.OwnershipTransferrer{ | ||
| state.Chains[chain].OnRamp, | ||
| state.Chains[chain].OffRamp, | ||
| state.Chains[chain].FeeQuoter, | ||
| state.Chains[chain].NonceManager, | ||
| state.Chains[chain].RMNRemote, | ||
| } { | ||
| owner, err := contract.Owner(&bind.CallOpts{ | ||
| Context: ctx, | ||
| }) | ||
| require.NoError(t, err) | ||
| require.Equal(t, state.Chains[chain].Timelock.Address(), owner) | ||
| } | ||
| } | ||
|
|
||
| // check home chain contracts ownership | ||
| homeChainTimelockAddress := state.Chains[e.HomeChainSel].Timelock.Address() | ||
| for _, contract := range []commonchangeset.OwnershipTransferrer{ | ||
| state.Chains[e.HomeChainSel].CapabilityRegistry, | ||
| state.Chains[e.HomeChainSel].CCIPHome, | ||
| state.Chains[e.HomeChainSel].RMNHome, | ||
| } { | ||
| owner, err := contract.Owner(&bind.CallOpts{ | ||
| Context: ctx, | ||
| }) | ||
| require.NoError(t, err) | ||
| require.Equal(t, homeChainTimelockAddress, owner) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can just use a generic test for this if you are moving to common changeset
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I kept the CCIP test but moved the changeset to common