Skip to content

[wip] chore: upgrade cldf to v0.99.0 (and fix breaking changes) #2027

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

Draft
gustavogama-cll wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[wip] chore: upgrade cldf to v0.99.0 (and fix breaking changes) #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions chains/evm/deployment/fastcurse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestFastCurse(t *testing.T) {
chain := env.BlockChains.EVMChains()[chain1]
deployRMNOp, err := cldf_ops.ExecuteOperation(bundle, rmnops1_5.Deploy, chain, contract.DeployInput[rmnops1_5.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(rmnops1_5.ContractType, *semver.MustParse("1.5.0")),
ChainSelector: chain.Selector,
// ChainSelector: chain.Selector,
Args: rmnops1_5.ConstructorArgs{
RMNConfig: rmn_contract.RMNConfig{
BlessWeightThreshold: 2,
Expand Down Expand Up @@ -80,7 +80,7 @@ func TestFastCurse(t *testing.T) {
chain = env.BlockChains.EVMChains()[chain2]
deployRMNRemoteOp, err := cldf_ops.ExecuteOperation(bundle, rmnremoteops1_6.Deploy, chain, contract.DeployInput[rmnremoteops1_6.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(rmnremoteops1_6.ContractType, *semver.MustParse("1.6.0")),
ChainSelector: chain.Selector,
// ChainSelector: chain.Selector,
Args: rmnremoteops1_6.ConstructorArgs{
LocalChainSelector: chain.Selector,
LegacyRMN: utils.RandomAddress(),
Expand All @@ -102,7 +102,7 @@ func TestFastCurse(t *testing.T) {
rmnProxy := utils.RandomAddress()

deployRouterOp, err := cldf_ops.ExecuteOperation(bundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{
ChainSelector: evmChain.Selector,
// ChainSelector: evmChain.Selector,
TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")),
Args: routerops1_2.ConstructorArgs{
WrappedNative: wNative,
Expand All @@ -116,7 +116,7 @@ func TestFastCurse(t *testing.T) {
ChainSelector: sel,
Address: deployRouterOp.Output.Address,
}))
routerAddr := deployRouterOp.Output.Address
// routerAddr := deployRouterOp.Output.Address
// add some dummy onramps to the router so that chain is supported,
// on chain1, add chain2 as supported dest chain and vice versa
onRamp := utils.RandomAddress()
Expand All @@ -128,8 +128,8 @@ func TestFastCurse(t *testing.T) {
destChainSelector = chain1
}
_, err = cldf_ops.ExecuteOperation(bundle, routerops1_2.ApplyRampUpdates, evmChain, contract.FunctionInput[routerops1_2.ApplyRampsUpdatesArgs]{
Address: common.HexToAddress(routerAddr),
ChainSelector: evmChain.Selector,
// Address: common.HexToAddress(routerAddr),
// ChainSelector: evmChain.Selector,
Args: routerops1_2.ApplyRampsUpdatesArgs{
OnRampUpdates: []routerops1_2.OnRamp{
{
Expand Down Expand Up @@ -315,7 +315,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
chain := env.BlockChains.EVMChains()[chain1]
deployRMNOp, err := cldf_ops.ExecuteOperation(bundle, rmnops1_5.Deploy, chain, contract.DeployInput[rmnops1_5.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(rmnops1_5.ContractType, *semver.MustParse("1.5.0")),
ChainSelector: chain.Selector,
// ChainSelector: chain.Selector,
Args: rmnops1_5.ConstructorArgs{
RMNConfig: rmn_contract.RMNConfig{
BlessWeightThreshold: 2,
Expand Down Expand Up @@ -347,7 +347,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
chain = env.BlockChains.EVMChains()[chainSel]
deployRMNRemoteOp, err := cldf_ops.ExecuteOperation(bundle, rmnremoteops1_6.Deploy, chain, contract.DeployInput[rmnremoteops1_6.ConstructorArgs]{
TypeAndVersion: deployment.NewTypeAndVersion(rmnremoteops1_6.ContractType, *semver.MustParse("1.6.0")),
ChainSelector: chain.Selector,
// ChainSelector: chain.Selector,
Args: rmnremoteops1_6.ConstructorArgs{
LocalChainSelector: chain.Selector,
LegacyRMN: utils.RandomAddress(),
Expand All @@ -374,7 +374,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
rmnAddr = rmnRemoteAddresses[sel]
}
deployRMNProxyOp, err := cldf_ops.ExecuteOperation(bundle, rmnproxyops.Deploy, evmChain, contract.DeployInput[rmnproxyops.ConstructorArgs]{
ChainSelector: evmChain.Selector,
// ChainSelector: evmChain.Selector,
TypeAndVersion: deployment.NewTypeAndVersion(rmnproxyops.ContractType, *semver.MustParse("1.0.0")),
Args: rmnproxyops.ConstructorArgs{
RMN: rmnAddr,
Expand All @@ -389,7 +389,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
Address: rmnProxy,
}))
deployRouterOp, err := cldf_ops.ExecuteOperation(bundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{
ChainSelector: evmChain.Selector,
// ChainSelector: evmChain.Selector,
TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")),
Args: routerops1_2.ConstructorArgs{
WrappedNative: wNative,
Expand All @@ -403,7 +403,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
ChainSelector: sel,
Address: deployRouterOp.Output.Address,
}))
routerAddr := deployRouterOp.Output.Address
// routerAddr := deployRouterOp.Output.Address
// add some dummy onramps to the router so that chain is supported,
// on chain1, add chain2 as supported dest chain and vice versa
var onRampUpdates []routerops1_2.OnRamp
Expand All @@ -423,8 +423,8 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
}
}
_, err = cldf_ops.ExecuteOperation(bundle, routerops1_2.ApplyRampUpdates, evmChain, contract.FunctionInput[routerops1_2.ApplyRampsUpdatesArgs]{
Address: common.HexToAddress(routerAddr),
ChainSelector: evmChain.Selector,
// Address: common.HexToAddress(routerAddr),
// ChainSelector: evmChain.Selector,
Args: routerops1_2.ApplyRampsUpdatesArgs{
OnRampUpdates: onRampUpdates,
OffRampAdds: offRampAdds,
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/deployment/utils/operations/contract/write.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type WriteParams[ARGS any, C any] = upstream.WriteParams[ARGS, C]
// NewWrite creates a new write operation.
//
// Deprecated: Import github.com/smartcontractkit/chainlink-deployments-framework/chain/evm/operations/contract directly.
func NewWrite[ARGS any, C any](params WriteParams[ARGS, C]) *operations.Operation[FunctionInput[ARGS], WriteOutput, cldf_evm.Chain] {
func NewWrite[ARGS any, C interface{ Address() common.Address}](params WriteParams[ARGS, C]) *operations.Operation[FunctionInput[ARGS], WriteOutput, cldf_evm.Chain] {
return upstream.NewWrite(params)
}

Expand Down
8 changes: 4 additions & 4 deletions chains/evm/deployment/v1_0_0/adapters/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConf
cancellerAddr := report.Output.Addresses[0]
// deploy timelock
timelockAddr, err := contract.MaybeDeployContract(b, ops.OpDeployTimelock, evmChain, contract.DeployInput[ops.OpDeployTimelockInput]{
ChainSelector: in.ChainSelector,
// ChainSelector: in.ChainSelector,
Qualifier: in.Qualifier,
TypeAndVersion: cldf.NewTypeAndVersion(utils.RBACTimelock, *ops.MCMSVersion),
Args: ops.OpDeployTimelockInput{
Expand All @@ -170,7 +170,7 @@ func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConf
b.Logger.Infof("Deployed Timelock at address %s on chain %s", timelockAddr, evmChain.Name)
// deploy call proxy with timelock
callProxyAddr, err := contract.MaybeDeployContract(b, ops.OpDeployCallProxy, evmChain, contract.DeployInput[ops.OpDeployCallProxyInput]{
ChainSelector: in.ChainSelector,
// ChainSelector: in.ChainSelector,
Qualifier: in.Qualifier,
TypeAndVersion: cldf.NewTypeAndVersion(utils.CallProxy, *ops.MCMSVersion),
Args: ops.OpDeployCallProxyInput{
Expand All @@ -185,8 +185,8 @@ func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConf

// now that call proxy is deployed, we can add it as executor to the timelock
_, err = cldf_ops.ExecuteOperation(b, ops.OpGrantRoleTimelock, evmChain, contract.FunctionInput[ops.OpGrantRoleTimelockInput]{
ChainSelector: in.ChainSelector,
Address: common.HexToAddress(timelockAddr.Address),
// ChainSelector: in.ChainSelector,
// Address: common.HexToAddress(timelockAddr.Address),
Args: ops.OpGrantRoleTimelockInput{
RoleID: ops.EXECUTOR_ROLE.ID,
Account: common.HexToAddress(callProxyAddr.Address),
Expand Down
28 changes: 14 additions & 14 deletions chains/evm/deployment/v1_0_0/adapters/pool_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ func (a *EVMPoolAdapter) DeployTokenPoolForToken() *cldf_ops.Sequence[tokensapi.
report, execErr := cldf_ops.ExecuteOperation(b,
bnmERC20ops.GrantMintAndBurnRoles, chain,
evm_contract.FunctionInput[common.Address]{
ChainSelector: input.ChainSelector,
Address: toknAddr,
// ChainSelector: input.ChainSelector,
// Address: toknAddr,
Args: poolAddr,
},
)
Expand All @@ -365,8 +365,8 @@ func (a *EVMPoolAdapter) DeployTokenPoolForToken() *cldf_ops.Sequence[tokensapi.
report, execErr := cldf_ops.ExecuteOperation(b,
tip20ops.GrantIssuerRole, chain,
evm_contract.FunctionInput[common.Address]{
ChainSelector: input.ChainSelector,
Address: toknAddr,
// ChainSelector: input.ChainSelector,
// Address: toknAddr,
Args: poolAddr,
},
)
Expand Down Expand Up @@ -450,16 +450,16 @@ func tidyTokenRoles(
// BnM ERC-20
case bnmDripERC20ops.ContractType.String(), bnmERC20ops.ContractType.String(), bnmDripOps150.ContractType.String():
defaultAdminRole, err := cldf_ops.ExecuteOperation(b, bnmERC20ops.GetDefaultAdminRole, chain, evm_contract.FunctionInput[struct{}]{
ChainSelector: input.ChainSelector,
Address: tokenAddr,
// ChainSelector: input.ChainSelector,
// Address: tokenAddr,
Args: struct{}{},
})
if err != nil {
return nil, fmt.Errorf("failed to get default admin role for token %q on chain %d: %w", tokenAddr.Hex(), input.ChainSelector, err)
}
grantReport, err := cldf_ops.ExecuteOperation(b, bnmERC20ops.GrantAdminRole, chain, evm_contract.FunctionInput[bnmERC20ops.RoleAssignment]{
ChainSelector: input.ChainSelector,
Address: tokenAddr,
// ChainSelector: input.ChainSelector,
// Address: tokenAddr,
Args: bnmERC20ops.RoleAssignment{
Role: defaultAdminRole.Output,
To: timelockAddr,
Expand All @@ -469,8 +469,8 @@ func tidyTokenRoles(
return nil, fmt.Errorf("failed to grant default admin role to timelock %q for token %q on chain %d: %w", timelockAddr.Hex(), tokenAddr.Hex(), input.ChainSelector, err)
}
revokeReport, err := cldf_ops.ExecuteOperation(b, bnmERC20ops.RevokeAdminRole, chain, evm_contract.FunctionInput[bnmERC20ops.RoleAssignment]{
ChainSelector: input.ChainSelector,
Address: tokenAddr,
// ChainSelector: input.ChainSelector,
// Address: tokenAddr,
Args: bnmERC20ops.RoleAssignment{
Role: defaultAdminRole.Output,
To: chain.DeployerKey.From,
Expand All @@ -484,16 +484,16 @@ func tidyTokenRoles(
// TIP-20
case tip20ops.ContractType.String():
grantReport, err := cldf_ops.ExecuteOperation(b, tip20ops.GrantAdminRole, chain, evm_contract.FunctionInput[common.Address]{
ChainSelector: input.ChainSelector,
Address: tokenAddr,
// ChainSelector: input.ChainSelector,
// Address: tokenAddr,
Args: timelockAddr,
})
if err != nil {
return nil, fmt.Errorf("failed to grant TIP-20 default admin role to timelock %q for token %q on chain %d: %w", timelockAddr.Hex(), tokenAddr.Hex(), input.ChainSelector, err)
}
revokeReport, err := cldf_ops.ExecuteOperation(b, tip20ops.RevokeAdminRole, chain, evm_contract.FunctionInput[common.Address]{
ChainSelector: input.ChainSelector,
Address: tokenAddr,
// ChainSelector: input.ChainSelector,
// Address: tokenAddr,
Args: chain.DeployerKey.From,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func TestTransferOwnership(t *testing.T) {
wNative := utils.RandomAddress()
rmnProxy := utils.RandomAddress()
deployRouterOp, err := cldf_ops.ExecuteOperation(env.OperationsBundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{
ChainSelector: evmChain.Selector,
// ChainSelector: evmChain.Selector,
TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")),
Args: routerops1_2.ConstructorArgs{
WrappedNative: wNative,
Expand Down
12 changes: 6 additions & 6 deletions chains/evm/deployment/v1_0_0/operations/burn_mint_erc20/burn_mint_erc20.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var SetCCIPAdmin = contract.NewWrite(contract.WriteParams[string, *burn_mint_erc
Description: "Set CCIP Admin on BurnMintERC20 token contract",
ContractType: ContractType,
ContractABI: burn_mint_erc20.BurnMintERC20ABI,
NewContract: burn_mint_erc20.NewBurnMintERC20,
// NewContract: burn_mint_erc20.NewBurnMintERC20,
IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input string) (bool, error) {
// SetCCIPAdmin can only be called by the current CCIP admin
currentAdmin, err := token.GetCCIPAdmin(opts)
Expand All @@ -68,7 +68,7 @@ var GrantAdminRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *bur
Description: "Grant admin role on BurnMintERC20 token contract",
ContractType: ContractType,
ContractABI: burn_mint_erc20.BurnMintERC20ABI,
NewContract: burn_mint_erc20.NewBurnMintERC20,
// NewContract: burn_mint_erc20.NewBurnMintERC20,
IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) {
// Check if caller has the admin role for the role being granted
roleAdmin, err := token.GetRoleAdmin(opts, input.Role)
Expand All @@ -89,7 +89,7 @@ var RevokeAdminRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *bu
Description: "Revoke admin role on BurnMintERC20 token contract",
ContractType: ContractType,
ContractABI: burn_mint_erc20.BurnMintERC20ABI,
NewContract: burn_mint_erc20.NewBurnMintERC20,
// NewContract: burn_mint_erc20.NewBurnMintERC20,
IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) {
// Check if caller has the admin role for the role being revoked
roleAdmin, err := token.GetRoleAdmin(opts, input.Role)
Expand All @@ -109,7 +109,7 @@ var GetDefaultAdminRole = contract.NewRead(contract.ReadParams[struct{}, [32]byt
Version: utils.Version_1_0_0,
Description: "Gets the default admin role on BurnMintERC20 token contract",
ContractType: ContractType,
NewContract: burn_mint_erc20.NewBurnMintERC20,
// NewContract: burn_mint_erc20.NewBurnMintERC20,
CallContract: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, input struct{}) ([32]byte, error) {
return token.DEFAULTADMINROLE(opts)
},
Expand All @@ -121,7 +121,7 @@ var RenounceAdminRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *
Description: "Renounce admin role on BurnMintERC20 token contract",
ContractType: ContractType,
ContractABI: burn_mint_erc20.BurnMintERC20ABI,
NewContract: burn_mint_erc20.NewBurnMintERC20,
// NewContract: burn_mint_erc20.NewBurnMintERC20,
IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) {
// For renounce, the caller must be the one renouncing their own role
// The caller can only renounce for themselves
Expand All @@ -139,7 +139,7 @@ var GrantMintAndBurnRoles = contract.NewWrite(contract.WriteParams[common.Addres
Description: "Grant mint and burn role on BurnMintERC20 token contract",
ContractType: ContractType,
ContractABI: burn_mint_erc20.BurnMintERC20ABI,
NewContract: burn_mint_erc20.NewBurnMintERC20,
// NewContract: burn_mint_erc20.NewBurnMintERC20,
IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) {
// Check if caller has the admin role for the role being revoked
roleAdmin, err := token.DEFAULTADMINROLE(opts)
Expand Down
2 changes: 1 addition & 1 deletion chains/evm/deployment/v1_0_0/operations/erc20/erc20.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var Transfer = contract.NewWrite(contract.WriteParams[TransferArgs, *erc20.ERC20
Description: "Transfer ERC20 tokens to a specified address",
ContractType: ContractType,
ContractABI: erc20.ERC20ABI,
NewContract: erc20.NewERC20,
// Contract: erc20.NewERC20,
IsAllowedCaller: contract.AllCallersAllowed[*erc20.ERC20, TransferArgs],
Validate: func(args TransferArgs) error {
if args.Amount == nil || args.Amount.Cmp(big.NewInt(0)) <= 0 {
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/deployment/v1_0_0/operations/link/link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var GrantMintRole = contract.NewWrite(contract.WriteParams[GrantMintRoleArgs, *l
Description: "Grants minting permission to an address",
ContractType: ContractType,
ContractABI: link_token.LinkTokenABI,
NewContract: link_token.NewLinkToken,
// NewContract: link_token.NewLinkToken,
IsAllowedCaller: contract.OnlyOwner[*link_token.LinkToken, GrantMintRoleArgs],
Validate: func(GrantMintRoleArgs) error { return nil },
CallContract: func(linkToken *link_token.LinkToken, opts *bind.TransactOpts, args GrantMintRoleArgs) (*types.Transaction, error) {
Expand All @@ -62,7 +62,7 @@ var Mint = contract.NewWrite(contract.WriteParams[MintArgs, *link_token.LinkToke
Description: "Mints LINK tokens to the specified address",
ContractType: ContractType,
ContractABI: link_token.LinkTokenABI,
NewContract: link_token.NewLinkToken,
// NewContract: link_token.NewLinkToken,
IsAllowedCaller: contract.AllCallersAllowed[*link_token.LinkToken, MintArgs], // Minter check is done on-chain
Validate: func(MintArgs) error { return nil },
CallContract: func(linkToken *link_token.LinkToken, opts *bind.TransactOpts, args MintArgs) (*types.Transaction, error) {
Expand Down
6 changes: 3 additions & 3 deletions chains/evm/deployment/v1_0_0/operations/mcms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ var OpEVMSetConfigMCM = contract.NewWrite(contract.WriteParams[OpSetConfigMCMInp
Description: "Sets Config on the deployed MCM contract",
ContractABI: bindings.ManyChainMultiSigABI,
ContractType: "ManyChainMultiSig",
NewContract: bindings.NewManyChainMultiSig,
// NewContract: bindings.NewManyChainMultiSig,
IsAllowedCaller: contract.OnlyOwner[*bindings.ManyChainMultiSig, OpSetConfigMCMInput],
Validate: func(input OpSetConfigMCMInput) error { return nil },
CallContract: func(mcm *bindings.ManyChainMultiSig, opts *bind.TransactOpts, input OpSetConfigMCMInput) (*types.Transaction, error) {
Expand All @@ -190,7 +190,7 @@ var OpGrantRoleTimelock = contract.NewWrite(contract.WriteParams[OpGrantRoleTime
Description: "Grants role on the deployed Timelock contract",
ContractABI: bindings.RBACTimelockABI,
ContractType: "RBACTimelock",
NewContract: bindings.NewRBACTimelock,
// NewContract: bindings.NewRBACTimelock,
IsAllowedCaller: func(contract *bindings.RBACTimelock, opts *bind.CallOpts, caller common.Address, input OpGrantRoleTimelockInput) (bool, error) {
roleAdmin, err := contract.GetRoleAdmin(opts, input.RoleID)
if err != nil {
Expand Down Expand Up @@ -219,7 +219,7 @@ var OpRenounceRoleTimelock = contract.NewWrite(contract.WriteParams[OpRenounceRo
Description: "Renounces role of the caller key on the deployed Timelock contract",
ContractABI: bindings.RBACTimelockABI,
ContractType: "RBACTimelock",
NewContract: bindings.NewRBACTimelock,
// NewContract: bindings.NewRBACTimelock,
IsAllowedCaller: func(contract *bindings.RBACTimelock, opts *bind.CallOpts, caller common.Address, input OpRenounceRoleTimelockInput) (bool, error) {
roleAdmin, err := contract.GetRoleAdmin(opts, input.RoleID)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions chains/evm/deployment/v1_0_0/operations/rmn_proxy/rmn_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var SetRMN = contract.NewWrite(contract.WriteParams[SetRMNArgs, *rmn_proxy_contr
Description: "Sets the RMN address on the RMNProxy",
ContractType: ContractType,
ContractABI: rmn_proxy_contract.RMNProxyABI,
NewContract: rmn_proxy_contract.NewRMNProxy,
// NewContract: rmn_proxy_contract.NewRMNProxy,
IsAllowedCaller: contract.OnlyOwner[*rmn_proxy_contract.RMNProxy, SetRMNArgs],
Validate: func(SetRMNArgs) error { return nil },
CallContract: func(rmnProxy *rmn_proxy_contract.RMNProxy, opts *bind.TransactOpts, args SetRMNArgs) (*types.Transaction, error) {
Expand All @@ -55,7 +55,7 @@ var GetRMN = contract.NewRead(contract.ReadParams[struct{}, common.Address, *rmn
Version: semver.MustParse("1.0.0"),
Description: "Gets the RMN address set on the RMNProxy",
ContractType: ContractType,
NewContract: rmn_proxy_contract.NewRMNProxy,
// NewContract: rmn_proxy_contract.NewRMNProxy,
CallContract: func(rmnProxy *rmn_proxy_contract.RMNProxy, opts *bind.CallOpts, args struct{}) (common.Address, error) {
return rmnProxy.GetARM(opts)
},
Expand Down
Loading
Loading