Feature/banana (#95)

* import contract bindings from cdk-contracts-tooling

* import contract bindings from cdk-contracts-tooling

* Implementation done

* Add E2E test for banana

* Remove integration testing

* fix: lint

* fix: go version

* fix: exclude mocks dir for lint

* fix: yml

* fix: lint

---------

Co-authored-by: Goran Rojovic <[email protected]>

.github/workflows/codeql.yml

@@ -48,6 +48,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Install Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.21.x'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/lint.yml

@@ -15,10 +15,11 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
+          cache: false
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Lint
-        run: |
-          make install-linter
-          make lint
+        uses: golangci/[email protected]
+        with:
+          args: --timeout 10m --verbose

.github/workflows/test-e2e.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:

.github/workflows/test-unit.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:

.golangci.yml

@@ -6,6 +6,7 @@ run:
     - state/runtime/instrumentation
     - test
     - ci
+    - mocks
 
 linters:
   enable:

Dockerfile

@@ -1,5 +1,5 @@
 # CONTAINER FOR BUILDING BINARY
-FROM golang:1.19 AS build
+FROM golang:1.21 AS build
 
 # INSTALL DEPENDENCIES
 RUN go install github.com/gobuffalo/packr/v2/[email protected]

client/client.go

@@ -21,6 +21,7 @@ type Client interface {
 	GetOffChainData(ctx context.Context, hash common.Hash) ([]byte, error)
 	ListOffChainData(ctx context.Context, hashes []common.Hash) (map[common.Hash][]byte, error)
 	SignSequence(ctx context.Context, signedSequence types.SignedSequence) ([]byte, error)
+	SignSequenceBanana(ctx context.Context, signedSequence types.SignedSequenceBanana) ([]byte, error)
 }
 
 // factory is the implementation of the data committee client factory
@@ -87,6 +88,26 @@ func (c *client) SignSequence(ctx context.Context, signedSequence types.SignedSe
 	return result, nil
 }
 
+// SignSequenceBanana sends a request to sign the given sequence by the data committee member
+// if successful returns the signature. The signature should be validated after using this method!
+func (c *client) SignSequenceBanana(ctx context.Context, signedSequence types.SignedSequenceBanana) ([]byte, error) {
+	response, err := rpc.JSONRPCCallWithContext(ctx, c.url, "datacom_signSequenceBanana", signedSequence)
+	if err != nil {
+		return nil, err
+	}
+
+	if response.Error != nil {
+		return nil, fmt.Errorf("%v %v", response.Error.Code, response.Error.Message)
+	}
+
+	var result types.ArgBytes
+	if err = json.Unmarshal(response.Result, &result); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
 // GetOffChainData returns data based on it's hash
 func (c *client) GetOffChainData(ctx context.Context, hash common.Hash) ([]byte, error) {
 	response, err := rpc.JSONRPCCallWithContext(ctx, c.url, "sync_getOffChainData", hash)

etherman/etherman.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygondatacommittee"
+	"github.com/0xPolygon/cdk-contracts-tooling/contracts/etrog/polygonvalidiumetrog"
 	"github.com/0xPolygon/cdk-data-availability/config"
-	"github.com/0xPolygon/cdk-data-availability/etherman/smartcontracts/etrog/polygondatacommittee"
-	"github.com/0xPolygon/cdk-data-availability/etherman/smartcontracts/etrog/polygonvalidium"
 	"github.com/0xPolygon/cdk-data-availability/log"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -41,23 +41,23 @@ type Etherman interface {
 	TrustedSequencer(ctx context.Context) (common.Address, error)
 	WatchSetTrustedSequencer(
 		ctx context.Context,
-		events chan *polygonvalidium.PolygonvalidiumSetTrustedSequencer,
+		events chan *polygonvalidiumetrog.PolygonvalidiumetrogSetTrustedSequencer,
 	) (event.Subscription, error)
 	TrustedSequencerURL(ctx context.Context) (string, error)
 	WatchSetTrustedSequencerURL(
 		ctx context.Context,
-		events chan *polygonvalidium.PolygonvalidiumSetTrustedSequencerURL,
+		events chan *polygonvalidiumetrog.PolygonvalidiumetrogSetTrustedSequencerURL,
 	) (event.Subscription, error)
 	FilterSequenceBatches(
 		opts *bind.FilterOpts,
 		numBatch []uint64,
-	) (*polygonvalidium.PolygonvalidiumSequenceBatchesIterator, error)
+	) (*polygonvalidiumetrog.PolygonvalidiumetrogSequenceBatchesIterator, error)
 }
 
 // etherman is the implementation of EtherMan.
 type etherman struct {
 	EthClient     *ethclient.Client
-	CDKValidium   *polygonvalidium.Polygonvalidium
+	CDKValidium   *polygonvalidiumetrog.Polygonvalidiumetrog
 	DataCommittee *polygondatacommittee.Polygondatacommittee
 }
 
@@ -72,7 +72,7 @@ func New(ctx context.Context, cfg config.L1Config) (Etherman, error) {
 		return nil, err
 	}
 
-	cdkValidium, err := polygonvalidium.NewPolygonvalidium(
+	cdkValidium, err := polygonvalidiumetrog.NewPolygonvalidiumetrog(
 		common.HexToAddress(cfg.PolygonValidiumAddress),
 		ethClient,
 	)
@@ -126,7 +126,7 @@ func (e *etherman) TrustedSequencer(ctx context.Context) (common.Address, error)
 // WatchSetTrustedSequencer watches trusted sequencer address
 func (e *etherman) WatchSetTrustedSequencer(
 	ctx context.Context,
-	events chan *polygonvalidium.PolygonvalidiumSetTrustedSequencer,
+	events chan *polygonvalidiumetrog.PolygonvalidiumetrogSetTrustedSequencer,
 ) (event.Subscription, error) {
 	return e.CDKValidium.WatchSetTrustedSequencer(&bind.WatchOpts{Context: ctx}, events)
 }
@@ -142,14 +142,14 @@ func (e *etherman) TrustedSequencerURL(ctx context.Context) (string, error) {
 // WatchSetTrustedSequencerURL watches trusted sequencer's RPC url
 func (e *etherman) WatchSetTrustedSequencerURL(
 	ctx context.Context,
-	events chan *polygonvalidium.PolygonvalidiumSetTrustedSequencerURL,
+	events chan *polygonvalidiumetrog.PolygonvalidiumetrogSetTrustedSequencerURL,
 ) (event.Subscription, error) {
 	return e.CDKValidium.WatchSetTrustedSequencerURL(&bind.WatchOpts{Context: ctx}, events)
 }
 
 // FilterSequenceBatches retrieves filtered batches on CDK validium
 func (e *etherman) FilterSequenceBatches(opts *bind.FilterOpts,
-	numBatch []uint64) (*polygonvalidium.PolygonvalidiumSequenceBatchesIterator, error) {
+	numBatch []uint64) (*polygonvalidiumetrog.PolygonvalidiumetrogSequenceBatchesIterator, error) {
 	return e.CDKValidium.FilterSequenceBatches(opts, numBatch)
 }