Genesis icm

cmd/blockchaincmd/create.go

@@ -47,6 +47,7 @@ type CreateFlags struct {
 	useLatestReleasedVMVersion    bool
 	useLatestPreReleasedVMVersion bool
 	useExternalGasToken           bool
+	addICMRegistryToGenesis       bool
 	proofOfStake                  bool
 	proofOfAuthority              bool
 }
@@ -106,6 +107,7 @@ configuration, pass the -f flag.`,
 	cmd.Flags().BoolVar(&createFlags.useWarp, "warp", true, "generate a vm with warp support (needed for teleporter)")
 	cmd.Flags().BoolVar(&createFlags.useTeleporter, "teleporter", false, "interoperate with other blockchains using teleporter")
 	cmd.Flags().BoolVar(&createFlags.useExternalGasToken, "external-gas-token", false, "use a gas token from another blockchain")
+	cmd.Flags().BoolVar(&createFlags.addICMRegistryToGenesis, "icm-registry-at-genesis", false, "setup ICM registry smart contract on genesis [experimental]")
 	cmd.Flags().BoolVar(&createFlags.proofOfAuthority, "proof-of-authority", false, "use proof of authority for validator management")
 	cmd.Flags().BoolVar(&createFlags.proofOfStake, "proof-of-stake", false, "(coming soon) use proof of stake for validator management")
 	return cmd
@@ -291,6 +293,7 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
 				blockchainName,
 				params,
 				teleporterInfo,
+				createFlags.addICMRegistryToGenesis,
 			)
 			if err != nil {
 				return err

cmd/blockchaincmd/deploy.go

@@ -101,7 +101,8 @@ so you can take your locally tested Subnet and deploy it on Fuji or Mainnet.`,
 	cmd.Flags().BoolVar(&icmSpec.SkipICMDeploy, "skip-local-teleporter", false, "skip automatic teleporter deploy on local networks [to be deprecated]")
 	cmd.Flags().BoolVar(&icmSpec.SkipICMDeploy, "skip-teleporter-deploy", false, "skip automatic teleporter deploy")
 	cmd.Flags().BoolVar(&icmSpec.SkipRelayerDeploy, "skip-relayer", false, "skip relayer deploy")
-	cmd.Flags().StringVar(&icmSpec.Version, "teleporter-version", "latest", "teleporter version to deploy")
+	cmd.Flags().StringVar(&icmSpec.ICMVersion, "teleporter-version", "latest", "teleporter version to deploy")
+	cmd.Flags().StringVar(&icmSpec.RelayerVersion, "relayer-version", "latest", "relayer version to deploy")
 	cmd.Flags().StringVar(&icmSpec.MessengerContractAddressPath, "teleporter-messenger-contract-address-path", "", "path to an interchain messenger contract address file")
 	cmd.Flags().StringVar(&icmSpec.MessengerDeployerAddressPath, "teleporter-messenger-deployer-address-path", "", "path to an interchain messenger deployer address file")
 	cmd.Flags().StringVar(&icmSpec.MessengerDeployerTxPath, "teleporter-messenger-deployer-tx-path", "", "path to an interchain messenger deployer tx file")

cmd/blockchaincmd/describe.go

@@ -17,6 +17,7 @@
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
+	icmgenesis "github.com/ava-labs/avalanche-cli/pkg/teleporter/genesis"
 	"github.com/ava-labs/avalanche-cli/pkg/txutils"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
@@ -216,6 +217,7 @@
 		if err := printAllocations(sc, genesis); err != nil {
 			return err
 		}
+		printSmartContracts(genesis)
 		printPrecompiles(genesis)
 	}
 
@@ -275,8 +277,12 @@
 		t.Style().Options.SeparateRows = true
 		t.SetTitle("Initial Token Allocation")
 		t.AppendHeader(table.Row{"Description", "Address and Private Key", "Amount (10^18)", "Amount (wei)"})
-		for address := range genesis.Alloc {
-			amount := genesis.Alloc[address].Balance
+		for address, allocation := range genesis.Alloc {
+			amount := allocation.Balance
+			// we are only interested in supply distribution here
+			if amount == nil || big.NewInt(0).Cmp(amount) == 0 {
+				continue
+			}
 			formattedAmount := new(big.Int).Div(amount, big.NewInt(params.Ether))
 			description := ""
 			privKey := ""
@@ -298,6 +304,33 @@
 	return nil
 }
 
+func printSmartContracts(genesis core.Genesis) {
+	if len(genesis.Alloc) == 0 {
+		return
+	}
+
+	ux.Logger.PrintToUser("")
+	t := table.NewWriter()
+	t.Style().Title.Align = text.AlignCenter
+	t.Style().Title.Format = text.FormatUpper
+	t.Style().Options.SeparateRows = true
+	t.SetTitle("Smart Contracts")
+	t.AppendHeader(table.Row{"Description", "Address", "Deployer"})
+	for address, allocation := range genesis.Alloc {
+		if len(allocation.Code) == 0 {
+			continue
+		}
+		var description, deployer string
+		if address == common.HexToAddress(icmgenesis.MessengerContractAddress) {
+			description = "ICM Messenger"
+			deployer = icmgenesis.MessengerDeployerAddress
+		}
+		t.AppendRow(table.Row{description, address.Hex(), deployer})
+
+	}
+	ux.Logger.PrintToUser(t.Render())
+}
+
 func printPrecompiles(genesis core.Genesis) {
 	ux.Logger.PrintToUser("")
 	t := table.NewWriter()

cmd/nodecmd/wiz.go

@@ -395,6 +395,7 @@ func wiz(cmd *cobra.Command, args []string) error {
 			},
 			DeployMessenger:              deployTeleporterMessenger,
 			DeployRegistry:               deployTeleporterRegistry,
+			ForceRegistryDeploy:          true,
 			Version:                      teleporterVersion,
 			MessengerContractAddressPath: teleporterMessengerContractAddressPath,
 			MessengerDeployerAddressPath: teleporterMessengerDeployerAddressPath,

cmd/teleportercmd/deploy.go

@@ -25,6 +25,7 @@ type DeployFlags struct {
 	GenesisKey                   bool
 	DeployMessenger              bool
 	DeployRegistry               bool
+	ForceRegistryDeploy          bool
 	RPCURL                       string
 	Version                      string
 	MessengerContractAddressPath string
@@ -62,6 +63,7 @@ func newDeployCmd() *cobra.Command {
 	deployFlags.ChainFlags.AddToCmd(cmd, "deploy ICM", true)
 	cmd.Flags().BoolVar(&deployFlags.DeployMessenger, "deploy-messenger", true, "deploy Teleporter Messenger")
 	cmd.Flags().BoolVar(&deployFlags.DeployRegistry, "deploy-registry", true, "deploy Teleporter Registry")
+	cmd.Flags().BoolVar(&deployFlags.ForceRegistryDeploy, "force-registry-deploy", false, "deploy Teleporter Registry even if Messenger has already been deployed")
 	cmd.Flags().StringVar(&deployFlags.RPCURL, "rpc-url", "", "use the given RPC URL to connect to the subnet")
 	cmd.Flags().StringVar(&deployFlags.Version, "version", "latest", "version to deploy")
 	cmd.Flags().StringVar(&deployFlags.MessengerContractAddressPath, "messenger-contract-address-path", "", "path to a messenger contract address file")
@@ -188,6 +190,7 @@ func CallDeploy(_ []string, flags DeployFlags) error {
 		privateKey,
 		flags.DeployMessenger,
 		flags.DeployRegistry,
+		flags.ForceRegistryDeploy,
 	)
 	if err != nil {
 		return err
@@ -224,6 +227,7 @@ func CallDeploy(_ []string, flags DeployFlags) error {
 			ewoq.PrivKeyHex(),
 			flags.DeployMessenger,
 			flags.DeployRegistry,
+			false,
 		)
 		if err != nil {
 			return err

pkg/contract/allocations.go

@@ -235,3 +235,19 @@ func GetEVMSubnetGenesisNativeMinterAdmin(
 	}
 	return getGenesisNativeMinterAdmin(app, network, genesisData)
 }
+
+func ContractAddressIsInGenesisData(
+	genesisData []byte,
+	contractAddress common.Address,
+) (bool, error) {
+	genesis, err := utils.ByteSliceToSubnetEvmGenesis(genesisData)
+	if err != nil {
+		return false, err
+	}
+	for address, allocation := range genesis.Alloc {
+		if address == contractAddress {
+			return len(allocation.Code) > 0, nil
+		}
+	}
+	return false, nil
+}

pkg/contract/allocations_test.go

@@ -0,0 +1,194 @@
+// Copyright (C) 2024, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+package contract
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func TestContractAddressIsInGenesisData(t *testing.T) {
+	require := require.New(t)
+
+	type test struct {
+		desc            string
+		genesisData     []byte
+		contractAddress common.Address
+		expected        bool
+		shouldErr       bool
+	}
+
+	tests := []test{
+		{
+			desc:            "nil data",
+			genesisData:     nil,
+			contractAddress: common.Address{},
+			expected:        false,
+			shouldErr:       true,
+		},
+		{
+			desc:            "not json",
+			genesisData:     []byte("not json"),
+			contractAddress: common.Address{},
+			expected:        false,
+			shouldErr:       true,
+		},
+		{
+			desc:            "not evm",
+			genesisData:     []byte("{}"),
+			contractAddress: common.Address{},
+			expected:        false,
+			shouldErr:       true,
+		},
+		{
+			desc: "no allocs",
+			genesisData: []byte(`
+{
+    "config": {
+        "byzantiumBlock": 0, "chainId": 1, "constantinopleBlock": 0, "eip150Block": 0,
+        "eip155Block": 0, "eip158Block": 0,
+        "feeConfig": {
+            "gasLimit": 12000000, "targetBlockRate": 2, "minBaseFee": 25000000000,
+            "targetGas": 60000000, "baseFeeChangeDenominator": 36, "minBlockGasCost": 0,
+            "maxBlockGasCost": 1000000, "blockGasCostStep": 200000
+        },
+        "homesteadBlock": 0, "istanbulBlock": 0, "muirGlacierBlock": 0, "petersburgBlock": 0,
+        "warpConfig": {
+            "blockTimestamp": 1727309619, "quorumNumerator": 67
+        }
+    },
+    "nonce": "0x0", "timestamp": "0x66f4a733", "extraData": "0x", "gasLimit": "0xb71b00", "difficulty": "0x0",
+    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "airdropHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "airdropAmount": null, "number": "0x0", "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "baseFeePerGas": null, "excessBlobGas": null, "blobGasUsed": null,
+    "alloc": {}
+}
+            `),
+			contractAddress: common.Address{},
+			expected:        false,
+			shouldErr:       false,
+		},
+		{
+			desc: "good path",
+			genesisData: []byte(`
+{
+    "config": {
+        "byzantiumBlock": 0, "chainId": 1, "constantinopleBlock": 0, "eip150Block": 0,
+        "eip155Block": 0, "eip158Block": 0,
+        "feeConfig": {
+            "gasLimit": 12000000, "targetBlockRate": 2, "minBaseFee": 25000000000,
+            "targetGas": 60000000, "baseFeeChangeDenominator": 36, "minBlockGasCost": 0,
+            "maxBlockGasCost": 1000000, "blockGasCostStep": 200000
+        },
+        "homesteadBlock": 0, "istanbulBlock": 0, "muirGlacierBlock": 0, "petersburgBlock": 0,
+        "warpConfig": {
+            "blockTimestamp": 1727309619, "quorumNumerator": 67
+        }
+    },
+    "nonce": "0x0", "timestamp": "0x66f4a733", "extraData": "0x", "gasLimit": "0xb71b00", "difficulty": "0x0",
+    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "airdropHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "airdropAmount": null, "number": "0x0", "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "baseFeePerGas": null, "excessBlobGas": null, "blobGasUsed": null,
+    "alloc": {
+        "253b2784c75e510dd0ff1da844684a1ac0aa5fcf": {
+            "code": "0xfe",
+            "balance": "0x2086ac351052600000"
+        }
+    }
+}
+            `),
+			contractAddress: common.HexToAddress("0x253b2784c75e510dd0ff1da844684a1ac0aa5fcf"),
+			expected:        true,
+			shouldErr:       false,
+		},
+		{
+			desc: "no code",
+			genesisData: []byte(`
+{
+    "config": {
+        "byzantiumBlock": 0, "chainId": 1, "constantinopleBlock": 0, "eip150Block": 0,
+        "eip155Block": 0, "eip158Block": 0,
+        "feeConfig": {
+            "gasLimit": 12000000, "targetBlockRate": 2, "minBaseFee": 25000000000,
+            "targetGas": 60000000, "baseFeeChangeDenominator": 36, "minBlockGasCost": 0,
+            "maxBlockGasCost": 1000000, "blockGasCostStep": 200000
+        },
+        "homesteadBlock": 0, "istanbulBlock": 0, "muirGlacierBlock": 0, "petersburgBlock": 0,
+        "warpConfig": {
+            "blockTimestamp": 1727309619, "quorumNumerator": 67
+        }
+    },
+    "nonce": "0x0", "timestamp": "0x66f4a733", "extraData": "0x", "gasLimit": "0xb71b00", "difficulty": "0x0",
+    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "airdropHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "airdropAmount": null, "number": "0x0", "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "baseFeePerGas": null, "excessBlobGas": null, "blobGasUsed": null,
+    "alloc": {
+        "253b2784c75e510dd0ff1da844684a1ac0aa5fcf": {
+            "balance": "0x2086ac351052600000"
+        }
+    }
+}
+            `),
+			contractAddress: common.HexToAddress("0x253b2784c75e510dd0ff1da844684a1ac0aa5fcf"),
+			expected:        false,
+			shouldErr:       false,
+		},
+		{
+			desc: "diff addr",
+			genesisData: []byte(`
+{
+    "config": {
+        "byzantiumBlock": 0, "chainId": 1, "constantinopleBlock": 0, "eip150Block": 0,
+        "eip155Block": 0, "eip158Block": 0,
+        "feeConfig": {
+            "gasLimit": 12000000, "targetBlockRate": 2, "minBaseFee": 25000000000,
+            "targetGas": 60000000, "baseFeeChangeDenominator": 36, "minBlockGasCost": 0,
+            "maxBlockGasCost": 1000000, "blockGasCostStep": 200000
+        },
+        "homesteadBlock": 0, "istanbulBlock": 0, "muirGlacierBlock": 0, "petersburgBlock": 0,
+        "warpConfig": {
+            "blockTimestamp": 1727309619, "quorumNumerator": 67
+        }
+    },
+    "nonce": "0x0", "timestamp": "0x66f4a733", "extraData": "0x", "gasLimit": "0xb71b00", "difficulty": "0x0",
+    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "airdropHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "airdropAmount": null, "number": "0x0", "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "baseFeePerGas": null, "excessBlobGas": null, "blobGasUsed": null,
+    "alloc": {
+        "253b2784c75e510dd0ff1da844684a1ac0aa5fcf": {
+            "code": "0xfe",
+            "balance": "0x2086ac351052600000"
+        }
+    }
+}
+            `),
+			contractAddress: common.HexToAddress("0x253b2724c75e510dd0ff1da844684a1ac0aa5fcc"),
+			expected:        false,
+			shouldErr:       false,
+		},
+	}
+
+	for _, t := range tests {
+		b, err := ContractAddressIsInGenesisData(t.genesisData, t.contractAddress)
+		if t.shouldErr {
+			require.Error(err, t.desc)
+		} else {
+			require.NoError(err, t.desc)
+		}
+		require.Equal(t.expected, b, t.desc)
+	}
+}