Skip to content

fix(addressbook): migrate to CLDF #7

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

Closed
graham-chainlink wants to merge 1 commit into from
Closed

fix(addressbook): migrate to CLDF #7

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
13 changes: 7 additions & 6 deletions deployment/deploy_contracts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/smartcontractkit/chainlink-common/pkg/logger"
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
"github.com/smartcontractkit/chainlink/deployment"

firedrill_entrypoint_v1_5 "github.com/smartcontractkit/ccip-firedrill-deployment/chains/evm/generated/v1_5/gethwrappers/firedrill_entrypoint"
"github.com/smartcontractkit/ccip-firedrill-deployment/chains/evm/generated/v1_6/gethwrappers/firedrill_entrypoint"
)

const FiredrillEntrypointType deployment.ContractType = "FiredrillEntrypoint"
const FiredrillEntrypointType cldf.ContractType = "FiredrillEntrypoint"

type FiredrillEntrypoint interface {
Owner(opts *bind.CallOpts) (common.Address, error)
Expand Down Expand Up @@ -74,7 +75,7 @@ func (c FiredrillDeployRegisterChangeSet) VerifyPreconditions(e deployment.Envir
}

func DeployFiredrillContracts(e deployment.Environment, config FiredrillConfig) (deployment.ChangesetOutput, error) {
ab := deployment.NewMemoryAddressBook()
ab := cldf.NewMemoryAddressBook()
switch config.Version {
case deployment.Version1_5_0:
_, err := deployment.DeployContract(e.Logger, e.Chains[config.ChainSelector], ab, deployFiredrillEntrypointV1_5)
Expand All @@ -100,7 +101,7 @@ func deployFiredrillEntrypointV1_5(chain deployment.Chain) deployment.ContractDe
Address: address,
Contract: inst,
Tx: tx,
Tv: deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0),
Tv: cldf.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0),
Err: err,
}
}
Expand All @@ -111,13 +112,13 @@ func deployFiredrillEntrypoint(chain deployment.Chain) deployment.ContractDeploy
Address: address,
Contract: inst,
Tx: tx,
Tv: deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_6_0),
Tv: cldf.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_6_0),
Err: err,
}
}

func FiredrillRegisterContracts(lggr logger.Logger, addressBook deployment.AddressBook, chain deployment.Chain) error {
firedrillEntrypointAddr, err := deployment.SearchAddressBook(addressBook, chain.Selector, FiredrillEntrypointType)
func FiredrillRegisterContracts(lggr logger.Logger, addressBook cldf.AddressBook, chain deployment.Chain) error {
firedrillEntrypointAddr, err := cldf.SearchAddressBook(addressBook, chain.Selector, FiredrillEntrypointType)
if err != nil {
return err
}
Expand Down
20 changes: 16 additions & 4 deletions deployment/deploy_contracts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"time"

"github.com/ethereum/go-ethereum/common"
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
"github.com/smartcontractkit/chainlink/deployment/datastore"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand All @@ -26,9 +28,14 @@ func TestDeployFiredrillContracts(t *testing.T) {
env := *deployment.NewEnvironment(
memory.Memory,
lggr,
deployment.NewMemoryAddressBook(),
cldf.NewMemoryAddressBook(),
datastore.NewMemoryDataStore[
datastore.DefaultMetadata,
datastore.DefaultMetadata,
]().Seal(),
chains,
map[uint64]deployment.SolChain{},
map[uint64]deployment.AptosChain{},
[]string{},
nil,
func() context.Context { return tests.Context(t) },
Expand All @@ -51,7 +58,7 @@ func TestDeployFiredrillContracts(t *testing.T) {
require.NoError(t, err)
assert.Len(t, chainAddr, 1)
typeAndVersionList := slices.Collect(maps.Values(chainAddr))
assert.Contains(t, typeAndVersionList, deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0))
assert.Contains(t, typeAndVersionList, cldf.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0))
}

func TestRegisterFiredrill(t *testing.T) {
Expand All @@ -60,9 +67,14 @@ func TestRegisterFiredrill(t *testing.T) {
env := *deployment.NewEnvironment(
memory.Memory,
lggr,
deployment.NewMemoryAddressBook(),
cldf.NewMemoryAddressBook(),
datastore.NewMemoryDataStore[
datastore.DefaultMetadata,
datastore.DefaultMetadata,
]().Seal(),
chains,
map[uint64]deployment.SolChain{},
map[uint64]deployment.AptosChain{},
[]string{},
nil,
func() context.Context { return tests.Context(t) },
Expand All @@ -80,7 +92,7 @@ func TestRegisterFiredrill(t *testing.T) {
require.NoError(t, err)
err = env.ExistingAddresses.Merge(firedrillChangeset.AddressBook)
require.NoError(t, err)
firedrillEntrypointAddr, err := deployment.SearchAddressBook(firedrillChangeset.AddressBook, chainSel, FiredrillEntrypointType)
firedrillEntrypointAddr, err := cldf.SearchAddressBook(firedrillChangeset.AddressBook, chainSel, FiredrillEntrypointType)
require.NoError(t, err)
firedrillEntrypoint, err := firedrill_entrypoint_v1_5.NewFiredrillEntrypoint(common.HexToAddress(firedrillEntrypointAddr), env.Chains[chainSel].Client)
require.NoError(t, err)
Expand Down
5 changes: 3 additions & 2 deletions deployment/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/ethereum/go-ethereum/common"
chain_selectors "github.com/smartcontractkit/chain-selectors"
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"

"github.com/smartcontractkit/chainlink/deployment"
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
Expand Down Expand Up @@ -68,7 +69,7 @@ func CCIPViewFiredrill(e deployment.Environment) (json.Marshaler, error) {
for addressStr, typeAndVersion := range addresses {
address := common.HexToAddress(addressStr)
switch typeAndVersion.String() {
case deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0).String():
case cldf.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_5_0).String():
contract, err := firedrill_entrypoint_v1_5.NewFiredrillEntrypoint(address, chain.Client)
if err != nil {
return nil, err
Expand All @@ -78,7 +79,7 @@ func CCIPViewFiredrill(e deployment.Environment) (json.Marshaler, error) {
return nil, err
}
chainView.FiredrillEntrypoint[addressStr] = view
case deployment.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_6_0).String():
case cldf.NewTypeAndVersion(FiredrillEntrypointType, deployment.Version1_6_0).String():
contract, err := firedrill_entrypoint.NewFiredrillEntrypoint(address, chain.Client)
if err != nil {
return nil, err
Expand Down
9 changes: 8 additions & 1 deletion deployment/view_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"context"
"testing"

cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
"github.com/smartcontractkit/chainlink/deployment/datastore"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
Expand All @@ -18,9 +20,14 @@ func TestCCIPViewFiredrill(t *testing.T) {
env := *deployment.NewEnvironment(
memory.Memory,
lggr,
deployment.NewMemoryAddressBook(),
cldf.NewMemoryAddressBook(),
datastore.NewMemoryDataStore[
datastore.DefaultMetadata,
datastore.DefaultMetadata,
]().Seal(),
chains,
map[uint64]deployment.SolChain{},
map[uint64]deployment.AptosChain{},
[]string{},
nil,
func() context.Context { return tests.Context(t) },
Expand Down
Loading