fix

Author: bukata-sa

deployment/evm/deploy_contracts.go

@@ -72,11 +72,11 @@ var _ deployment.ChangeSetV2[shared.FiredrillConfig] = FiredrillDeployRegisterCh
 type FiredrillDeployRegisterChangeSet struct{}
 
 func (c FiredrillDeployRegisterChangeSet) Apply(e deployment.Environment, config shared.FiredrillConfig) (deployment.ChangesetOutput, error) {
-	firedrillRef, changesetOutput, err := DeployFiredrillContracts(e, config)
+	_, changesetOutput, err := DeployFiredrillContracts(e, config)
 	if err != nil {
 		return deployment.ChangesetOutput{}, err
 	}
-	err = FiredrillRegisterContracts(e.Logger, firedrillRef, e.BlockChains.EVMChains()[config.ChainSelector])
+	err = FiredrillRegisterContracts(e.Logger, changesetOutput.DataStore.Addresses(), e.BlockChains.EVMChains()[config.ChainSelector])
 	if err != nil {
 		return deployment.ChangesetOutput{}, err
 	}
@@ -162,41 +162,53 @@ func DeployFiredrillContracts(e deployment.Environment, config shared.FiredrillC
 	}, nil
 }
 
-func FiredrillRegisterContracts(lggr logger.Logger, firedrillRef datastore.AddressRef, chain cldf_evm.Chain) error {
-	firedrillEntrypoint, err := firedrill_entrypoint.NewFiredrillEntrypoint(common.HexToAddress(firedrillRef.Address), chain.Client)
-	if err != nil {
-		return err
-	}
-	entrypointTokenAddr, err1 := firedrillEntrypoint.Token(nil)
-	entrypointOnRampAddr, err2 := firedrillEntrypoint.OnRamp(nil)
-	entrypointOffRampAddr, err3 := firedrillEntrypoint.OffRamp(nil)
-	entrypointReceiverAddr, err4 := firedrillEntrypoint.Receiver(nil)
-	if err := errors.Join(err1, err2, err3, err4); err != nil {
-		return err
-	}
-	if (entrypointTokenAddr == common.Address{}) {
-		err = errors.New("FiredrillToken address from address book does not match FiredrillEntrypoint.Token()")
-	}
-	if (entrypointOnRampAddr == common.Address{}) {
-		err = errors.Join(err, errors.New("firedrill onramp on entrypoint can't be 0-address"))
-	}
-	if (entrypointOffRampAddr == common.Address{}) {
-		err = errors.Join(err, errors.New("firedrill offramp on entrypoint can't be 0-address"))
-	}
-	if (entrypointReceiverAddr == common.Address{}) {
-		err = errors.Join(err, errors.New("firedrill receiver on entrypoint can't be 0-address"))
-	}
-	if err != nil {
-		return err
-	}
-	tx, err := firedrillEntrypoint.PrepareRegister(chain.DeployerKey)
-	if err != nil {
-		return err
-	}
-	blockNum, err := chain.Confirm(tx)
-	if err != nil {
-		return err
+func FiredrillRegisterContracts(lggr logger.Logger, ab datastore.AddressRefStore, chain cldf_evm.Chain) error {
+	firedrillRefs := ab.Filter(func(refs []datastore.AddressRef) []datastore.AddressRef {
+		res := make([]datastore.AddressRef, 0, len(refs))
+		for _, ref := range refs {
+			if ref.ChainSelector == chain.Selector && ref.Type == datastore.ContractType(shared.FiredrillEntrypointType) {
+				res = append(res, ref)
+			}
+		}
+		return res
+	})
+	for _, ref := range firedrillRefs {
+		firedrillAddress := common.HexToAddress(ref.Address)
+		firedrillEntrypoint, err := firedrill_entrypoint.NewFiredrillEntrypoint(firedrillAddress, chain.Client)
+		if err != nil {
+			return err
+		}
+		entrypointTokenAddr, err1 := firedrillEntrypoint.Token(nil)
+		entrypointOnRampAddr, err2 := firedrillEntrypoint.OnRamp(nil)
+		entrypointOffRampAddr, err3 := firedrillEntrypoint.OffRamp(nil)
+		entrypointReceiverAddr, err4 := firedrillEntrypoint.Receiver(nil)
+		if err := errors.Join(err1, err2, err3, err4); err != nil {
+			return err
+		}
+		if (entrypointTokenAddr == common.Address{}) {
+			err = errors.New("FiredrillToken address from address book does not match FiredrillEntrypoint.Token()")
+		}
+		if (entrypointOnRampAddr == common.Address{}) {
+			err = errors.Join(err, errors.New("firedrill onramp on entrypoint can't be 0-address"))
+		}
+		if (entrypointOffRampAddr == common.Address{}) {
+			err = errors.Join(err, errors.New("firedrill offramp on entrypoint can't be 0-address"))
+		}
+		if (entrypointReceiverAddr == common.Address{}) {
+			err = errors.Join(err, errors.New("firedrill receiver on entrypoint can't be 0-address"))
+		}
+		if err != nil {
+			return err
+		}
+		tx, err := firedrillEntrypoint.PrepareRegister(chain.DeployerKey)
+		if err != nil {
+			return err
+		}
+		blockNum, err := chain.Confirm(tx)
+		if err != nil {
+			return err
+		}
+		lggr.Infof("FiredrillEntrypoint register events mined. Address: %s, tx: %s, blockNum: %d", firedrillAddress.Hex(), tx.Hash(), blockNum)
 	}
-	lggr.Infof("FiredrillEntrypoint register events mined. Address: %s, tx: %s, blockNum: %d", firedrillRef.Address, tx.Hash(), blockNum)
 	return nil
 }

deployment/evm/deploy_contracts_test.go

@@ -64,7 +64,7 @@ func TestRegisterFiredrill(t *testing.T) {
 	require.Len(t, chainSels, 2)
 	chainSel := chainSels[0]
 	sourceChainSel := chainSels[1]
-	firedrillRef, _, err := DeployFiredrillContracts(*env, shared.FiredrillConfig{
+	firedrillRef, output, err := DeployFiredrillContracts(*env, shared.FiredrillConfig{
 		Version:             deploy.Version1_5_0,
 		ChainSelector:       chainSel,
 		SourceChainSelector: sourceChainSel,
@@ -83,7 +83,7 @@ func TestRegisterFiredrill(t *testing.T) {
 	subscription, err := firedrillOffRamp.WatchConfigSet(nil, offRampSetSink)
 	require.NoError(t, err)
 	defer subscription.Unsubscribe()
-	err = FiredrillRegisterContracts(env.Logger, firedrillRef, env.BlockChains.EVMChains()[chainSel])
+	err = FiredrillRegisterContracts(env.Logger, output.DataStore.Addresses(), env.BlockChains.EVMChains()[chainSel])
 	require.NoError(t, err)
 	timer := time.NewTimer(1 * time.Second)
 	for {