[CDK-46] Add DAP CLI on Validium node (#69)

* CLI Command

* Remove unnecessary comments

* Small fixes

Author: goran-ethernal

ci/e2e-group-cdk-validium-1/cli_test.go

@@ -0,0 +1,95 @@
+package e2e
+
+import (
+	"context"
+	"os/exec"
+	"regexp"
+	"testing"
+
+	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygondatacommittee"
+	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
+	"github.com/0xPolygonHermez/zkevm-node/test/operations"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSetDataAvailabilityProtocol(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
+	ctx := context.Background()
+	defer func() {
+		require.NoError(t, operations.Teardown())
+	}()
+
+	err := operations.Teardown()
+	require.NoError(t, err)
+
+	opsCfg := operations.GetDefaultOperationsConfig()
+
+	opsman, err := operations.NewManager(ctx, opsCfg)
+	require.NoError(t, err)
+
+	err = opsman.Setup()
+	require.NoError(t, err)
+
+	clientL1, err := ethclient.Dial(operations.DefaultL1NetworkURL)
+	require.NoError(t, err)
+
+	auth, err := operations.GetAuth(operations.DefaultSequencerPrivateKey, operations.DefaultL1ChainID)
+	require.NoError(t, err)
+
+	zkEVM, err := polygonzkevm.NewPolygonzkevm(
+		common.HexToAddress(operations.DefaultL1ZkEVMSmartContract),
+		clientL1,
+	)
+	require.NoError(t, err)
+
+	currentDAPAddr, err := zkEVM.DataAvailabilityProtocol(&bind.CallOpts{Pending: false})
+	require.NoError(t, err)
+	require.Equal(t, common.HexToAddress(operations.DefaultL1DataCommitteeContract), currentDAPAddr)
+
+	// New DAC Setup
+	newDAPAddr, tx, newDA, err := polygondatacommittee.DeployPolygondatacommittee(auth, clientL1)
+	require.NoError(t, err)
+	require.NotEqual(t, newDAPAddr, currentDAPAddr)
+	require.NoError(t, operations.WaitTxToBeMined(ctx, clientL1, tx, operations.DefaultTimeoutTxToBeMined))
+
+	tx, err = newDA.Initialize(auth)
+	require.NoError(t, err)
+	require.NoError(t, operations.WaitTxToBeMined(ctx, clientL1, tx, operations.DefaultTimeoutTxToBeMined))
+
+	cmd := exec.Command("docker", "exec", "zkevm-sequence-sender",
+		"/app/zkevm-node", "set-dap",
+		"--da-addr", newDAPAddr.String(),
+		"--network", "custom",
+		"--custom-network-file", "/app/genesis.json",
+		"--key-store-path", "/pk/sequencer.keystore",
+		"--pw", "testonly",
+		"--cfg", "/app/config.toml")
+
+	output, err := cmd.CombinedOutput()
+	require.NoError(t, err)
+
+	txHash := common.HexToHash(extractHexFromString(string(output)))
+	receipt, err := operations.WaitTxReceipt(ctx, txHash, operations.DefaultTimeoutTxToBeMined, clientL1)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt.Status)
+
+	currentDAPAddr, err = zkEVM.DataAvailabilityProtocol(&bind.CallOpts{Pending: false})
+	require.NoError(t, err)
+	require.Equal(t, newDAPAddr, currentDAPAddr)
+}
+
+func extractHexFromString(output string) string {
+	re := regexp.MustCompile(`Transaction to set new data availability protocol sent. Hash: (0x[0-9a-fA-F]+)`)
+	match := re.FindStringSubmatch(output)
+	if len(match) > 1 {
+		return match[1]
+	}
+	return ""
+}

cmd/main.go

@@ -186,6 +186,13 @@ func main() {
 			Action:  restore,
 			Flags:   restoreFlags,
 		},
+		{
+			Name:    "set-data-availability-protocol",
+			Aliases: []string{"set-dap"},
+			Usage:   "Sets the new data availability protocol",
+			Action:  setDataAvailabilityProtocol,
+			Flags:   setDataAvailabilityProtocolFlags,
+		},
 	}
 
 	err := app.Run(os.Args)

cmd/set_data_availability_protocol.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"github.com/0xPolygonHermez/zkevm-node/config"
+	"github.com/0xPolygonHermez/zkevm-node/log"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/urfave/cli/v2"
+)
+
+const flagDAAddress = "data-availability-address"
+
+var setDataAvailabilityProtocolFlags = []cli.Flag{
+	&cli.StringFlag{
+		Name:     flagDAAddress,
+		Aliases:  []string{"da-addr"},
+		Usage:    "address of the new data availibility protocol",
+		Required: true,
+	},
+	&cli.StringFlag{
+		Name:     config.FlagKeyStorePath,
+		Aliases:  []string{"ksp"},
+		Usage:    "the path of the key store file containing the private key of the account going to set new data availability protocol",
+		Required: true,
+	},
+	&cli.StringFlag{
+		Name:     config.FlagPassword,
+		Aliases:  []string{"pw"},
+		Usage:    "the password do decrypt the key store file",
+		Required: true,
+	},
+	&configFileFlag,
+	&networkFlag,
+	&customNetworkFlag,
+}
+
+func setDataAvailabilityProtocol(ctx *cli.Context) error {
+	c, err := config.Load(ctx, true)
+	if err != nil {
+		return err
+	}
+
+	setupLog(c.Log)
+
+	daAddress := common.HexToAddress(ctx.String(flagDAAddress))
+	addrKeyStorePath := ctx.String(config.FlagKeyStorePath)
+	addrPassword := ctx.String(config.FlagPassword)
+
+	etherman, err := newEtherman(*c, nil)
+	if err != nil {
+		log.Fatal(err)
+		return err
+	}
+
+	auth, _, err := etherman.LoadAuthFromKeyStore(addrKeyStorePath, addrPassword)
+	if err != nil {
+		log.Fatal(err)
+		return err
+	}
+
+	tx, err := etherman.SetDataAvailabilityProtocol(auth.From, daAddress)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("Transaction to set new data availability protocol sent. Hash: %s", tx.Hash())
+
+	return nil
+}

etherman/etherman.go

@@ -1874,3 +1874,13 @@ func (etherMan *Client) GetDAProtocolAddr() (common.Address, error) {
 func (etherMan *Client) GetDAProtocolName() (string, error) {
 	return etherMan.DAProtocol.GetProcotolName(&bind.CallOpts{Pending: false})
 }
+
+// SetDataAvailabilityProtocol sets the address for the new data availability protocol
+func (etherMan *Client) SetDataAvailabilityProtocol(from, daAddress common.Address) (*types.Transaction, error) {
+	auth, err := etherMan.getAuthByAddress(from)
+	if err != nil {
+		return nil, err
+	}
+
+	return etherMan.ZkEVM.SetDataAvailabilityProtocol(&auth, daAddress)
+}