improve dumps

Author: felipemadero

cmd/blockchaincmd/add_validator.go

@@ -3,7 +3,6 @@
 package blockchaincmd
 
 import (
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"strings"
@@ -13,6 +12,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
+	"github.com/ava-labs/avalanche-cli/pkg/evm"
 	"github.com/ava-labs/avalanche-cli/pkg/keychain"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
@@ -566,13 +566,7 @@ func CallAddValidator(
 		return err
 	}
 	if rawTx != nil {
-		bs, err := rawTx.MarshalBinary()
-		if err != nil {
-			return fmt.Errorf("failure marshalling raw evm tx: %w", err)
-		}
-		ux.Logger.PrintToUser("Raw Tx Dump For Initializing Validator Registration. Please sign and commit it.")
-		ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
-		return nil
+		return evm.TxDump("Initializing Validator Registration", rawTx)
 	}
 	ux.Logger.PrintToUser("ValidationID: %s", validationID)
 
@@ -612,13 +606,7 @@ func CallAddValidator(
 		return err
 	}
 	if rawTx != nil {
-		bs, err := rawTx.MarshalBinary()
-		if err != nil {
-			return fmt.Errorf("failure marshalling raw evm tx: %w", err)
-		}
-		ux.Logger.PrintToUser("Raw Tx Dump For Finish Validator Registration. Please sign and commit it.")
-		ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
-		return nil
+		return evm.TxDump("Finish Validator Registration", rawTx)
 	}
 
 	ux.Logger.PrintToUser("  NodeID: %s", nodeID)

cmd/blockchaincmd/change_weight.go

@@ -3,14 +3,14 @@
 package blockchaincmd
 
 import (
-	"encoding/hex"
 	"fmt"
 	"strings"
 
 	"github.com/ava-labs/avalanche-cli/pkg/blockchain"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
+	"github.com/ava-labs/avalanche-cli/pkg/evm"
 	"github.com/ava-labs/avalanche-cli/pkg/key"
 	"github.com/ava-labs/avalanche-cli/pkg/keychain"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
@@ -383,13 +383,7 @@ func changeWeightACP99(
 		return err
 	}
 	if rawTx != nil {
-		bs, err := rawTx.MarshalBinary()
-		if err != nil {
-			return fmt.Errorf("failure marshalling raw evm tx: %w", err)
-		}
-		ux.Logger.PrintToUser("Raw Tx Dump For Initializing Validator Weight Change. Please sign and commit it.")
-		ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
-		return nil
+		return evm.TxDump("Initializing Validator Weight Change", rawTx)
 	}
 
 	ux.Logger.PrintToUser("ValidationID: %s", validationID)
@@ -440,13 +434,7 @@ func changeWeightACP99(
 		return err
 	}
 	if rawTx != nil {
-		bs, err := rawTx.MarshalBinary()
-		if err != nil {
-			return fmt.Errorf("failure marshalling raw evm tx: %w", err)
-		}
-		ux.Logger.PrintToUser("Raw Tx Dump For Finish Validator Weight Change. Please sign and commit it.")
-		ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
-		return nil
+		return evm.TxDump("Finish Validator Weight Change", rawTx)
 	}
 
 	ux.Logger.GreenCheckmarkToUser("Weight change successfully made")

cmd/blockchaincmd/remove_validator.go

@@ -3,7 +3,6 @@
 package blockchaincmd
 
 import (
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"os"
@@ -13,6 +12,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
+	"github.com/ava-labs/avalanche-cli/pkg/evm"
 	"github.com/ava-labs/avalanche-cli/pkg/keychain"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
@@ -389,13 +389,7 @@ func removeValidatorSOV(
 		return err
 	}
 	if rawTx != nil {
-		bs, err := rawTx.MarshalBinary()
-		if err != nil {
-			return fmt.Errorf("failure marshalling raw evm tx: %w", err)
-		}
-		ux.Logger.PrintToUser("Raw Tx Dump For Initializing Validator Removal. Please sign and commit it.")
-		ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
-		return nil
+		return evm.TxDump("Initializing Validator Removal", rawTx)
 	}
 
 	ux.Logger.PrintToUser("ValidationID: %s", validationID)
@@ -436,13 +430,7 @@ func removeValidatorSOV(
 		return err
 	}
 	if rawTx != nil {
-		bs, err := rawTx.MarshalBinary()
-		if err != nil {
-			return fmt.Errorf("failure marshalling raw evm tx: %w", err)
-		}
-		ux.Logger.PrintToUser("Raw Tx Dump For Finish Validator Removal. Please sign and commit it.")
-		ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
-		return nil
+		return evm.TxDump("Finish Validator Removal", rawTx)
 	}
 
 	ux.Logger.GreenCheckmarkToUser("Validator successfully removed from the Subnet")

pkg/evm/evm.go

@@ -817,3 +817,24 @@ func TransactionError(tx *types.Transaction, err error, msg string, args ...inte
 	args = append(args, err)
 	return fmt.Errorf(msg+msgSuffix, args...)
 }
+
+func TxDump(description string, tx *types.Transaction) error {
+	bs, err := tx.MarshalBinary()
+	if err != nil {
+		return fmt.Errorf("failure marshalling raw evm tx: %w", err)
+	}
+	ux.Logger.PrintToUser("Tx Dump For %s:", description)
+	ux.Logger.PrintToUser("0x%s", hex.EncodeToString(bs))
+	ux.Logger.PrintToUser("Calldata Dump:")
+	ux.Logger.PrintToUser("0x%s", hex.EncodeToString(tx.Data()))
+	if len(tx.AccessList()) > 0 {
+		ux.Logger.PrintToUser("Access List Dump:")
+		for _, t := range tx.AccessList() {
+			ux.Logger.PrintToUser("  Address: %s", t.Address)
+			for _, s := range t.StorageKeys {
+				ux.Logger.PrintToUser("  Storage: %s", s)
+			}
+		}
+	}
+	return nil
+}