improve cdk rollup commands to detect and print validium information (#563)

* improve cdk rollup command to detect and print validium information

* linter fixes

---------

Co-authored-by: John Hilliard <[email protected]>

Author: tclemos

cmd/cdk/cdk.go

@@ -21,18 +21,24 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 
+	banana_committee "github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygondatacommittee"
 	banana_rollup "github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonrollupbaseetrog"
 	banana_rollup_manager "github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonrollupmanager"
+	banana_validium "github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonvalidiumetrog"
 	banana_bridge "github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonzkevmbridgev2"
 	banana_ger "github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonzkevmglobalexitrootv2"
 
+	elderberry_committee "github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygondatacommittee"
 	elderberry_rollup "github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonrollupbaseetrog"
 	elderberry_rollup_manager "github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonrollupmanager"
+	elderberry_validium "github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonvalidiumetrog"
 	elderberry_bridge "github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonzkevmbridgev2"
 	elderberry_ger "github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonzkevmglobalexitrootv2"
 
+	etrog_committee "github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygondatacommittee"
 	etrog_rollup "github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygonrollupbaseetrog"
 	etrog_rollup_manager "github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygonrollupmanager"
+	etrog_validium "github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygonvalidiumetrog"
 	etrog_bridge "github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygonzkevmbridgev2"
 	etrog_ger "github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygonzkevmglobalexitrootv2"
 )
@@ -65,7 +71,10 @@ const (
 	contractRequestInterval = 200 * time.Millisecond
 )
 
-var ErrRollupNotFound = errors.New("rollup not found")
+var (
+	ErrRollupNotFound     = errors.New("rollup not found")
+	ErrMethodNotSupported = errors.New("method not supported")
+)
 
 var (
 	knownRollupManagerAddresses = map[string]string{
@@ -285,13 +294,28 @@ func getRollup(cdkArgs parsedCDKArgs, rpcClient *ethclient.Client, addr common.A
 	var contract *rollup
 	var contractABI *abi.ABI
 	log.Info().Stringer("addr", addr).Msg("Getting rollup")
+
 	switch cdkArgs.forkID {
 	case etrog:
 		contractInstance, err := etrog_rollup.NewPolygonrollupbaseetrog(addr, rpcClient)
 		if err != nil {
 			return nil, nil, err
 		}
-		contract = &rollup{contractInstance, reflect.ValueOf(contractInstance)}
+
+		validiumContractInstance, err := etrog_validium.NewPolygonvalidiumetrog(addr, rpcClient)
+		if err != nil {
+			return nil, nil, err
+		}
+		_, err = validiumContractInstance.DataAvailabilityProtocol(nil)
+		if err != nil {
+			if err.Error() == "execution reverted" {
+				validiumContractInstance = nil
+			} else {
+				return nil, nil, err
+			}
+		}
+
+		contract = &rollup{contractInstance, validiumContractInstance, reflect.ValueOf(contractInstance)}
 		contractABI, err = etrog_rollup.PolygonrollupbaseetrogMetaData.GetAbi()
 		if err != nil {
 			return nil, nil, err
@@ -301,7 +325,21 @@ func getRollup(cdkArgs parsedCDKArgs, rpcClient *ethclient.Client, addr common.A
 		if err != nil {
 			return nil, nil, err
 		}
-		contract = &rollup{contractInstance, reflect.ValueOf(contractInstance)}
+
+		validiumContractInstance, err := elderberry_validium.NewPolygonvalidiumetrog(addr, rpcClient)
+		if err != nil {
+			return nil, nil, err
+		}
+		_, err = validiumContractInstance.DataAvailabilityProtocol(nil)
+		if err != nil {
+			if err.Error() == "execution reverted" {
+				validiumContractInstance = nil
+			} else {
+				return nil, nil, err
+			}
+		}
+
+		contract = &rollup{contractInstance, validiumContractInstance, reflect.ValueOf(contractInstance)}
 		contractABI, err = elderberry_rollup.PolygonrollupbaseetrogMetaData.GetAbi()
 		if err != nil {
 			return nil, nil, err
@@ -311,7 +349,21 @@ func getRollup(cdkArgs parsedCDKArgs, rpcClient *ethclient.Client, addr common.A
 		if err != nil {
 			return nil, nil, err
 		}
-		contract = &rollup{contractInstance, reflect.ValueOf(contractInstance)}
+
+		validiumContractInstance, err := banana_validium.NewPolygonvalidiumetrog(addr, rpcClient)
+		if err != nil {
+			return nil, nil, err
+		}
+		_, err = validiumContractInstance.DataAvailabilityProtocol(nil)
+		if err != nil {
+			if err.Error() == "execution reverted" {
+				validiumContractInstance = nil
+			} else {
+				return nil, nil, err
+			}
+		}
+
+		contract = &rollup{contractInstance, validiumContractInstance, reflect.ValueOf(contractInstance)}
 		contractABI, err = banana_rollup.PolygonrollupbaseetrogMetaData.GetAbi()
 		if err != nil {
 			return nil, nil, err
@@ -322,6 +374,47 @@ func getRollup(cdkArgs parsedCDKArgs, rpcClient *ethclient.Client, addr common.A
 	return contract, contractABI, nil
 }
 
+func getCommittee(cdkArgs parsedCDKArgs, rpcClient *ethclient.Client, addr common.Address) (*committee, *abi.ABI, error) {
+	var contract *committee
+	var contractABI *abi.ABI
+	log.Info().Stringer("addr", addr).Msg("Getting committee")
+	switch cdkArgs.forkID {
+	case etrog:
+		contractInstance, err := etrog_committee.NewPolygondatacommittee(addr, rpcClient)
+		if err != nil {
+			return nil, nil, err
+		}
+		contract = &committee{contractInstance, reflect.ValueOf(contractInstance)}
+		contractABI, err = etrog_committee.PolygondatacommitteeMetaData.GetAbi()
+		if err != nil {
+			return nil, nil, err
+		}
+	case elderberry:
+		contractInstance, err := elderberry_committee.NewPolygondatacommittee(addr, rpcClient)
+		if err != nil {
+			return nil, nil, err
+		}
+		contract = &committee{contractInstance, reflect.ValueOf(contractInstance)}
+		contractABI, err = elderberry_committee.PolygondatacommitteeMetaData.GetAbi()
+		if err != nil {
+			return nil, nil, err
+		}
+	case banana:
+		contractInstance, err := banana_committee.NewPolygondatacommittee(addr, rpcClient)
+		if err != nil {
+			return nil, nil, err
+		}
+		contract = &committee{contractInstance, reflect.ValueOf(contractInstance)}
+		contractABI, err = banana_committee.PolygondatacommitteeMetaData.GetAbi()
+		if err != nil {
+			return nil, nil, err
+		}
+	default:
+		return nil, nil, invalidForkIDErr()
+	}
+	return contract, contractABI, nil
+}
+
 func getBridge(cdkArgs parsedCDKArgs, rpcClient *ethclient.Client, addr common.Address) (*bridge, *abi.ABI, error) {
 	var contract *bridge
 	var contractABI *abi.ABI

cmd/cdk/interfaces.go

@@ -63,18 +63,6 @@ type rollupManagerContractInterface interface {
 }
 
 type rollupContractInterface interface {
-	GLOBALEXITROOTMANAGERL2(opts *bind.CallOpts) (common.Address, error)
-	INITIALIZETXBRIDGELISTLENLEN(opts *bind.CallOpts) (uint8, error)
-	INITIALIZETXBRIDGEPARAMS(opts *bind.CallOpts) ([]byte, error)
-	INITIALIZETXBRIDGEPARAMSAFTERBRIDGEADDRESS(opts *bind.CallOpts) ([]byte, error)
-	INITIALIZETXBRIDGEPARAMSAFTERBRIDGEADDRESSEMPTYMETADATA(opts *bind.CallOpts) ([]byte, error)
-	INITIALIZETXCONSTANTBYTES(opts *bind.CallOpts) (uint16, error)
-	INITIALIZETXCONSTANTBYTESEMPTYMETADATA(opts *bind.CallOpts) (uint16, error)
-	INITIALIZETXDATALENEMPTYMETADATA(opts *bind.CallOpts) (uint8, error)
-	INITIALIZETXEFFECTIVEPERCENTAGE(opts *bind.CallOpts) ([1]byte, error)
-	SIGNATUREINITIALIZETXR(opts *bind.CallOpts) ([32]byte, error)
-	SIGNATUREINITIALIZETXS(opts *bind.CallOpts) ([32]byte, error)
-	SIGNATUREINITIALIZETXV(opts *bind.CallOpts) (uint8, error)
 	Admin(opts *bind.CallOpts) (common.Address, error)
 	BridgeAddress(opts *bind.CallOpts) (common.Address, error)
 	CalculatePolPerForceBatch(opts *bind.CallOpts) (*big.Int, error)
@@ -96,6 +84,23 @@ type rollupContractInterface interface {
 	TrustedSequencerURL(opts *bind.CallOpts) (string, error)
 }
 
+type validiumContractInterface interface {
+	DataAvailabilityProtocol(opts *bind.CallOpts) (common.Address, error)
+	IsSequenceWithDataAvailabilityAllowed(opts *bind.CallOpts) (bool, error)
+}
+
+type committeeContractInterface interface {
+	CommitteeHash(opts *bind.CallOpts) ([32]byte, error)
+	GetAmountOfMembers(opts *bind.CallOpts) (*big.Int, error)
+	GetProcotolName(opts *bind.CallOpts) (string, error)
+	Members(opts *bind.CallOpts, arg0 *big.Int) (struct {
+		Url  string
+		Addr common.Address
+	}, error)
+	Owner(opts *bind.CallOpts) (common.Address, error)
+	RequiredAmountOfSignatures(opts *bind.CallOpts) (*big.Int, error)
+}
+
 type bridgeContractInterface interface {
 	WETHToken(opts *bind.CallOpts) (common.Address, error)
 	DepositCount(opts *bind.CallOpts) (*big.Int, error)