add debug logs to DeployBundleAggregatorProxyChangeset , try to fix nonce issue (#21960)

add debug logs, try to fix nonce issue

Author: karen-stepanyan

deployment/data-feeds/changeset/deploy.go

@@ -1,6 +1,7 @@
 package changeset
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -12,6 +13,7 @@ import (
 
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	"github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink/deployment/data-feeds/changeset/types"
 )
@@ -81,21 +83,87 @@ func DeployAggregatorProxy(chain cldf_evm.Chain, aggregator common.Address, acce
 	return resp, nil
 }
 
-func DeployBundleAggregatorProxy(chain cldf_evm.Chain, aggregator common.Address, owner common.Address, labels []string) (*types.DeployBundleAggregatorProxyResponse, error) {
-	proxyAddr, tx, proxyContract, err := bundleproxy.DeployBundleAggregatorProxy(chain.DeployerKey, chain.Client, aggregator, owner)
+func DeployBundleAggregatorProxy(lggr logger.Logger, chain cldf_evm.Chain, aggregator common.Address, owner common.Address, labels []string) (*types.DeployBundleAggregatorProxyResponse, error) {
+	lggr.Debugw("Deploying BundleAggregatorProxy",
+		"chainSelector", chain.Selector,
+		"aggregator", aggregator.Hex(),
+		"owner", owner.Hex(),
+		"deployer", chain.DeployerKey.From.Hex())
+
+	proxyAddr, tx, _, err := bundleproxy.DeployBundleAggregatorProxy(chain.DeployerKey, chain.Client, aggregator, owner)
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy BundleAggregatorProxy: %w", err)
 	}
 
-	_, err = chain.Confirm(tx)
+	lggr.Debugw("BundleAggregatorProxy deploy tx submitted",
+		"chainSelector", chain.Selector,
+		"txHash", tx.Hash().Hex(),
+		"txNonce", tx.Nonce(),
+		"predictedAddress", proxyAddr.Hex())
+
+	blockNum, err := chain.Confirm(tx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to confirm BundleAggregatorProxy: %w", err)
 	}
 
+	lggr.Debugw("BundleAggregatorProxy deploy tx confirmed",
+		"chainSelector", chain.Selector,
+		"txHash", tx.Hash().Hex(),
+		"blockNumber", blockNum,
+		"predictedAddress", proxyAddr.Hex())
+
+	receipt, err := chain.Client.TransactionReceipt(context.Background(), tx.Hash())
+	if err != nil {
+		return nil, fmt.Errorf("failed to get receipt for BundleAggregatorProxy deploy tx: %w", err)
+	}
+
+	receiptAddr := receipt.ContractAddress
+	if receiptAddr != proxyAddr {
+		lggr.Warnw("BundleAggregatorProxy predicted address does not match receipt address",
+			"chainSelector", chain.Selector,
+			"predictedAddress", proxyAddr.Hex(),
+			"receiptAddress", receiptAddr.Hex(),
+			"txHash", tx.Hash().Hex(),
+			"txNonce", tx.Nonce(),
+			"receiptStatus", receipt.Status)
+		proxyAddr = receiptAddr
+	}
+
+	code, err := chain.Client.CodeAt(context.Background(), proxyAddr, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to check code at BundleAggregatorProxy address %s: %w", proxyAddr, err)
+	}
+	if len(code) == 0 {
+		lggr.Errorw("No contract code found at BundleAggregatorProxy address after confirmed deployment",
+			"chainSelector", chain.Selector,
+			"address", proxyAddr.Hex(),
+			"txHash", tx.Hash().Hex(),
+			"txNonce", tx.Nonce(),
+			"receiptStatus", receipt.Status,
+			"blockNumber", receipt.BlockNumber)
+		return nil, fmt.Errorf("no contract code at BundleAggregatorProxy address %s (tx %s, status %d)", proxyAddr, tx.Hash(), receipt.Status)
+	}
+
+	lggr.Debugw("BundleAggregatorProxy code verified at address",
+		"chainSelector", chain.Selector,
+		"address", proxyAddr.Hex(),
+		"codeSize", len(code))
+
+	proxyContract, err := bundleproxy.NewBundleAggregatorProxy(proxyAddr, chain.Client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to bind BundleAggregatorProxy at %s: %w", proxyAddr, err)
+	}
+
 	tvStr, err := proxyContract.TypeAndVersion(&bind.CallOpts{})
 	if err != nil {
-		return nil, fmt.Errorf("failed to get type and version: %w", err)
+		return nil, fmt.Errorf("failed to get type and version at %s: %w", proxyAddr, err)
 	}
+
+	lggr.Debugw("BundleAggregatorProxy typeAndVersion retrieved",
+		"chainSelector", chain.Selector,
+		"address", proxyAddr.Hex(),
+		"typeAndVersion", tvStr)
+
 	tv, err := cldf.TypeAndVersionFromString(tvStr)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse type and version from %s: %w", tvStr, err)

deployment/data-feeds/changeset/deploy_bundle_aggregator_proxy.go

@@ -30,7 +30,7 @@ func deployBundleAggregatorProxyLogic(env cldf.Environment, c types.DeployBundle
 			return cldf.ChangesetOutput{}, fmt.Errorf("DataFeedsCache contract address not found in addressbook for chain %d", chainSelector)
 		}
 
-		bundleProxyResponse, err := DeployBundleAggregatorProxy(chain, common.HexToAddress(dataFeedsCacheAddress), c.Owners[chainSelector], c.Labels)
+		bundleProxyResponse, err := DeployBundleAggregatorProxy(lggr, chain, common.HexToAddress(dataFeedsCacheAddress), c.Owners[chainSelector], c.Labels)
 		if err != nil {
 			return cldf.ChangesetOutput{}, fmt.Errorf("failed to deploy BundleAggregatorProxy: %w", err)
 		}