Few Fixes needed for deployment (#14672)

* few fixes * review comments * more * Logging fixes --------- Co-authored-by: connorwstein <connor.stein@mail.mcgill.ca>
smartcontractkit · Oct 7, 2024 · 176ef4a · 176ef4a
1 parent 5750b11
commit 176ef4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/integration-tests/deployment/ccip/changeset/initial_deploy.go b/integration-tests/deployment/ccip/changeset/initial_deploy.go
@@ -17,11 +17,11 @@ func InitialDeployChangeSet(env deployment.Environment, c ccipdeployment.DeployC
 	err := ccipdeployment.DeployCCIPContracts(env, ab, c)
 	if err != nil {
 		env.Logger.Errorw("Failed to deploy CCIP contracts", "err", err, "addresses", ab)
-		return deployment.ChangesetOutput{}, deployment.MaybeDataErr(err)
+		return deployment.ChangesetOutput{AddressBook: ab}, deployment.MaybeDataErr(err)
 	}
 	js, err := ccipdeployment.NewCCIPJobSpecs(env.NodeIDs, env.Offchain)
 	if err != nil {
-		return deployment.ChangesetOutput{}, err
+		return deployment.ChangesetOutput{AddressBook: ab}, err
 	}
 	return deployment.ChangesetOutput{
 		Proposals:   []timelock.MCMSWithTimelockProposal{},

diff --git a/integration-tests/deployment/ccip/deploy.go b/integration-tests/deployment/ccip/deploy.go
@@ -161,6 +161,7 @@ func DeployCCIPContracts(e deployment.Environment, ab deployment.AddressBook, c
 
 	// Signal to CR that our nodes support CCIP capability.
 	if err := AddNodes(
+		e.Logger,
 		capReg,
 		e.Chains[c.HomeChainSel],
 		nodes.NonBootstraps().PeerIDs(),
@@ -472,7 +473,7 @@ func DeployChainContracts(
 		e.Logger.Errorw("Failed to deploy router", "err", err)
 		return err
 	}
-	e.Logger.Infow("deployed router", "addr", routerContract)
+	e.Logger.Infow("deployed router", "addr", routerContract.Address)
 
 	testRouterContract, err := deployContract(e.Logger, chain, ab,
 		func(chain deployment.Chain) ContractDeploy[*router.Router] {
@@ -519,9 +520,10 @@ func DeployChainContracts(
 			}
 		})
 	if err != nil {
-		e.Logger.Errorw("Failed to deploy router", "err", err)
+		e.Logger.Errorw("Failed to deploy nonce manager", "err", err)
 		return err
 	}
+	e.Logger.Infow("Deployed nonce manager", "addr", nonceManager.Address)
 
 	feeQuoter, err := deployContract(e.Logger, chain, ab,
 		func(chain deployment.Chain) ContractDeploy[*fee_quoter.FeeQuoter] {
@@ -557,6 +559,7 @@ func DeployChainContracts(
 		e.Logger.Errorw("Failed to deploy fee quoter", "err", err)
 		return err
 	}
+	e.Logger.Infow("Deployed fee quoter", "addr", feeQuoter.Address)
 
 	onRamp, err := deployContract(e.Logger, chain, ab,
 		func(chain deployment.Chain) ContractDeploy[*onramp.OnRamp] {
@@ -583,7 +586,7 @@ func DeployChainContracts(
 		e.Logger.Errorw("Failed to deploy onramp", "err", err)
 		return err
 	}
-	e.Logger.Infow("deployed onramp", "addr", onRamp.Address)
+	e.Logger.Infow("Deployed onramp", "addr", onRamp.Address)
 
 	offRamp, err := deployContract(e.Logger, chain, ab,
 		func(chain deployment.Chain) ContractDeploy[*offramp.OffRamp] {
@@ -612,7 +615,7 @@ func DeployChainContracts(
 		e.Logger.Errorw("Failed to deploy offramp", "err", err)
 		return err
 	}
-	e.Logger.Infow("deployed offramp", "addr", offRamp)
+	e.Logger.Infow("Deployed offramp", "addr", offRamp.Address)
 
 	// Basic wiring is always needed.
 	tx, err := feeQuoter.Contract.ApplyAuthorizedCallerUpdates(chain.DeployerKey, fee_quoter.AuthorizedCallersAuthorizedCallerArgs{

diff --git a/integration-tests/deployment/ccip/deploy_home_chain.go b/integration-tests/deployment/ccip/deploy_home_chain.go
@@ -133,6 +133,7 @@ func DeployCapReg(lggr logger.Logger, ab deployment.AddressBook, chain deploymen
 }
 
 func AddNodes(
+	lggr logger.Logger,
 	capReg *capabilities_registry.CapabilitiesRegistry,
 	chain deployment.Chain,
 	p2pIDs [][32]byte,
@@ -153,6 +154,7 @@ func AddNodes(
 	}
 	tx, err := capReg.AddNodes(chain.DeployerKey, nodeParams)
 	if err != nil {
+		lggr.Errorw("Failed to add nodes", "err", deployment.MaybeDataErr(err))
 		return err
 	}
 	_, err = chain.Confirm(tx)