Merge pull request #845 from hermeznetwork/release/v1.3.0

Release/v1.3.0

README.md

@@ -4,6 +4,8 @@ Go implementation of the Hermez node.
 
 ## Developing
 
+To contribute to this codebase you must follow the [branch model and development flow](council/gitflow.md).
+
 ### Go version
 
 The `hermez-node` has been tested with go version 1.14

api/accountcreationauths.go

@@ -30,8 +30,13 @@ func (a *API) postAccountCreationAuth(c *gin.Context) {
 		retSQLErr(err, c)
 		return
 	}
+	type okResponse struct {
+		Success string `json:"success"`
+	}
 	// Return OK
-	c.Status(http.StatusOK)
+	c.JSON(http.StatusOK, &okResponse{
+		Success: "OK",
+	})
 }
 
 func (a *API) getAccountCreationAuth(c *gin.Context) {

api/swagger.yml

@@ -89,6 +89,10 @@ paths:
       responses:
         '200':
           description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccountCreationAuthorizationPostSuccessResponse'
         '400':
           description: Bad request.
           content:
@@ -1786,6 +1790,16 @@ components:
       - hezEthereumAddress
       - bjj
       - signature
+    AccountCreationAuthorizationPostSuccessResponse:
+      type: object
+      properties:
+        success:
+          type: string
+      example:
+        success: 'OK'
+      additionalProperties: false
+      required:
+      - success
     HistoryTransaction:
       type: object
       description: Transaction of the Hermez Network
@@ -2207,6 +2221,10 @@ components:
           type: string
           description: hash of the Ethereum block in which the batch was forged
           example: "0xfe88c94d860f01a17f961bf4bdfb6e0c6cd10d3fda5cc861e805ca1240c58553"
+        ethereumTxHash:
+          type: string
+          description: hash of the Ethereum transaction in which the batch was forged
+          example: "0xae98c94d860f01a17f961bf4bdfb6e0c6cd10d3fda5cc861e805ca1240c58553"
         timestamp:
           type: string
           format: date-time
@@ -2247,6 +2265,7 @@ components:
       required:
           - itemId
           - batchNum
+          - ethereumTxHash
           - ethereumBlockNum
           - ethereumBlockHash
           - timestamp

cmd/heznode/cfg.buidler.toml

@@ -145,7 +145,7 @@ LightScrypt = true
 
 [Coordinator.Etherscan]
 URL = "https://api.etherscan.io"
-APIKey = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+APIKey = ""
 
 [RecommendedFeePolicy]
 # Strategy used to calculate the recommended fee that the API will expose.

cmd/heznode/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -25,13 +26,14 @@ import (
 )
 
 const (
-	flagCfg   = "cfg"
-	flagMode  = "mode"
-	flagSK    = "privatekey"
-	flagYes   = "yes"
-	flagBlock = "block"
-	modeSync  = "sync"
-	modeCoord = "coord"
+	flagCfg     = "cfg"
+	flagMode    = "mode"
+	flagSK      = "privatekey"
+	flagYes     = "yes"
+	flagBlock   = "block"
+	modeSync    = "sync"
+	modeCoord   = "coord"
+	nMigrations = "nMigrations"
 )
 
 var (
@@ -201,7 +203,7 @@ func cmdWipeDBs(c *cli.Context) error {
 		return tracerr.Wrap(err)
 	}
 	log.Info("Wiping SQL DB...")
-	if err := dbUtils.MigrationsDown(db.DB); err != nil {
+	if err := dbUtils.MigrationsDown(db.DB, 0); err != nil {
 		return tracerr.Wrap(fmt.Errorf("dbUtils.MigrationsDown: %w", err))
 	}
 
@@ -212,6 +214,48 @@ func cmdWipeDBs(c *cli.Context) error {
 	return nil
 }
 
+func cmdSQLMigrationDown(c *cli.Context) error {
+	_cfg, err := parseCli(c)
+	if err != nil {
+		return tracerr.Wrap(fmt.Errorf("error parsing flags and config: %w", err))
+	}
+	cfg := _cfg.node
+	yes := c.Bool(flagYes)
+	migrationsToRun := c.Uint(nMigrations)
+	if !yes {
+		fmt.Printf("*WARNING* Are you sure you want to revert "+
+			"%d the SQL migrations? [y/N]: ", migrationsToRun)
+		var input string
+		if _, err := fmt.Scanln(&input); err != nil {
+			return tracerr.Wrap(err)
+		}
+		input = strings.ToLower(input)
+		if !(input == "y" || input == "yes") {
+			return nil
+		}
+	}
+	if migrationsToRun == 0 {
+		return errors.New(nMigrations + "is set to 0, this is equivalent to use wipedbs command. If this is your intention use the other command")
+	}
+	db, err := dbUtils.ConnectSQLDB(
+		cfg.PostgreSQL.PortWrite,
+		cfg.PostgreSQL.HostWrite,
+		cfg.PostgreSQL.UserWrite,
+		cfg.PostgreSQL.PasswordWrite,
+		cfg.PostgreSQL.NameWrite,
+	)
+	if err != nil {
+		return tracerr.Wrap(err)
+	}
+	log.Infof("Reverting %d SQL migrations...", migrationsToRun)
+	if err := dbUtils.MigrationsDown(db.DB, migrationsToRun); err != nil {
+		return tracerr.Wrap(fmt.Errorf("dbUtils.MigrationsDown: %w", err))
+	}
+	log.Info("SQL migrations down successfully")
+
+	return nil
+}
+
 func waitSigInt() {
 	stopCh := make(chan interface{})
 
@@ -473,6 +517,24 @@ func main() {
 					Required: false,
 				}),
 		},
+		{
+			Name:    "migratesqldown",
+			Aliases: []string{},
+			Usage: "Revert migrations of the SQL DB (HistoryDB and L2DB), " +
+				"leaving the SQL schema as in previous versions",
+			Action: cmdSQLMigrationDown,
+			Flags: append(flags,
+				&cli.BoolFlag{
+					Name:     flagYes,
+					Usage:    "automatic yes to the prompt",
+					Required: false,
+				},
+				&cli.UintFlag{
+					Name:     nMigrations,
+					Usage:    "amount of migrations to be reverted",
+					Required: true,
+				}),
+		},
 		{
 			Name:    "run",
 			Aliases: []string{},

common/batch.go

@@ -13,7 +13,8 @@ const batchNumBytesLen = 8
 
 // Batch is a struct that represents Hermez network batch
 type Batch struct {
-	BatchNum BatchNum `meddler:"batch_num"`
+	BatchNum  BatchNum       `meddler:"batch_num"`
+	EthTxHash ethCommon.Hash `meddler:"eth_tx_hash"`
 	// Ethereum block in which the batch is forged
 	EthBlockNum        int64                `meddler:"eth_block_num"`
 	ForgerAddr         ethCommon.Address    `meddler:"forger_addr"`

coordinator/batch.go

@@ -93,8 +93,8 @@ type BatchInfo struct {
 	CoordIdxs             []common.Idx
 	ForgeBatchArgs        *eth.RollupForgeBatchArgs
 	Auth                  *bind.TransactOpts `json:"-"`
-	EthTx                 *types.Transaction
-	EthTxErr              error
+	EthTxs                []*types.Transaction
+	EthTxsErrs            []error
 	// SendTimestamp  the time of batch sent to ethereum
 	SendTimestamp time.Time
 	Receipt       *types.Receipt