Merge/v0.2.5

cmd/run.go

@@ -396,12 +396,11 @@ func createSequenceSender(cfg config.Config, pool *pool.Pool, etmStorage *ethtxm
 		log.Fatal(err)
 	}
 
-	for _, privateKey := range cfg.SequenceSender.PrivateKeys {
-		_, err := etherman.LoadAuthFromKeyStore(privateKey.Path, privateKey.Password)
-		if err != nil {
-			log.Fatal(err)
-		}
+	auth, err := etherman.LoadAuthFromKeyStore(cfg.SequenceSender.PrivateKey.Path, cfg.SequenceSender.PrivateKey.Password)
+	if err != nil {
+		log.Fatal(err)
 	}
+	cfg.SequenceSender.SenderAddress = auth.From
 
 	cfg.SequenceSender.ForkUpgradeBatchNumber = cfg.ForkUpgradeBatchNumber
 

config/config_test.go

@@ -100,42 +100,6 @@ func Test_Defaults(t *testing.T) {
 			path:          "Sequencer.MaxTxLifetime",
 			expectedValue: types.NewDuration(3 * time.Hour),
 		},
-		{
-			path:          "Sequencer.WeightBatchBytesSize",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightCumulativeGasUsed",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightKeccakHashes",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightPoseidonHashes",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightPoseidonPaddings",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightMemAligns",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightArithmetics",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightBinaries",
-			expectedValue: 1,
-		},
-		{
-			path:          "Sequencer.WeightSteps",
-			expectedValue: 1,
-		},
 		{
 			path:          "Sequencer.Finalizer.GERDeadlineTimeout",
 			expectedValue: types.NewDuration(5 * time.Second),
@@ -208,10 +172,6 @@ func Test_Defaults(t *testing.T) {
 			path:          "Sequencer.DBManager.L2ReorgRetrievalInterval",
 			expectedValue: types.NewDuration(5 * time.Second),
 		},
-		{
-			path:          "Sequencer.Worker.ResourceCostMultiplier",
-			expectedValue: float64(1000),
-		},
 		{
 			path:          "SequenceSender.WaitPeriodSendSequence",
 			expectedValue: types.NewDuration(5 * time.Second),

config/default.go

@@ -85,15 +85,6 @@ MaxMemAligns = 236585
 MaxArithmetics = 236585
 MaxBinaries = 473170
 MaxSteps = 7570538
-WeightBatchBytesSize = 1
-WeightCumulativeGasUsed = 1
-WeightKeccakHashes = 1
-WeightPoseidonHashes = 1
-WeightPoseidonPaddings = 1
-WeightMemAligns = 1
-WeightArithmetics = 1
-WeightBinaries = 1
-WeightSteps = 1
 TxLifetimeCheckTimeout = "10m"
 MaxTxLifetime = "3h"
 	[Sequencer.Finalizer]
@@ -111,8 +102,6 @@ MaxTxLifetime = "3h"
 	[Sequencer.DBManager]
 		PoolRetrievalInterval = "500ms"
 		L2ReorgRetrievalInterval = "5s"
-	[Sequencer.Worker]
-		ResourceCostMultiplier = 1000
 	[Sequencer.EffectiveGasPrice]
 		MaxBreakEvenGasPriceDeviationPercentage = 10
 		L1GasPriceFactor = 0.25
@@ -124,8 +113,8 @@ MaxTxLifetime = "3h"
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 MaxTxSizeForL1 = 131072
-SenderAddress = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
-PrivateKeys = [{Path = "/pk/sequencer.keystore", Password = "testonly"}]
+L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
+PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 
 [Aggregator]
 Host = "0.0.0.0"

config/environments/local/local.node.config.toml

@@ -69,15 +69,6 @@ MaxMemAligns = 236585
 MaxArithmetics = 236585
 MaxBinaries = 473170
 MaxSteps = 7570538
-WeightBatchBytesSize = 1
-WeightCumulativeGasUsed = 1
-WeightKeccakHashes = 1
-WeightPoseidonHashes = 1
-WeightPoseidonPaddings = 1
-WeightMemAligns = 1
-WeightArithmetics = 1
-WeightBinaries = 1
-WeightSteps = 1
 TxLifetimeCheckTimeout = "10m"
 MaxTxLifetime = "3h"
 	[Sequencer.Finalizer]
@@ -95,8 +86,6 @@ MaxTxLifetime = "3h"
 	[Sequencer.DBManager]
 		PoolRetrievalInterval = "500ms"
 		L2ReorgRetrievalInterval = "5s"
-	[Sequencer.Worker]
-		ResourceCostMultiplier = 1000
 	[Sequencer.EffectiveGasPrice]
 		MaxBreakEvenGasPriceDeviationPercentage = 10
 		L1GasPriceFactor = 0.25
@@ -108,8 +97,8 @@ MaxTxLifetime = "3h"
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 MaxTxSizeForL1 = 131072
-SenderAddress = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
-PrivateKeys = [{Path = "/pk/sequencer.keystore", Password = "testonly"}]
+L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
+PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 
 [Aggregator]
 Host = "0.0.0.0"

config/environments/mainnet/prover.config.json

@@ -29,7 +29,7 @@
     "runBlakeTest": false,
 
     "executeInParallel": true,
-    "useMainExecGenerated": false,
+    "useMainExecGenerated": true,
     "saveRequestToFile": false,
     "saveInputToFile": false,
     "saveDbReadsToFile": false,

config/environments/testnet/prover.config.json

@@ -29,7 +29,7 @@
     "runBlakeTest": false,
 
     "executeInParallel": true,
-    "useMainExecGenerated": false,
+    "useMainExecGenerated": true,
     "saveRequestToFile": false,
     "saveInputToFile": false,
     "saveDbReadsToFile": false,

config/gen_json_schema.go

@@ -6,6 +6,8 @@ import (
 	"reflect"
 
 	"github.com/0xPolygonHermez/zkevm-node/config/types"
+	"github.com/0xPolygonHermez/zkevm-node/log"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/invopop/jsonschema"
 	"github.com/urfave/cli/v2"
 )
@@ -200,16 +202,24 @@ func fillDefaultValuesPartial(schema *jsonschema.Schema, default_config interfac
 		return
 	}
 	for _, key := range schema.Properties.Keys() {
+		log.Debugf("fillDefaultValuesPartial: key: %s", key)
 		value, ok := schema.Properties.Get(key)
 		if ok {
 			value_schema, _ := value.(*jsonschema.Schema)
 			default_value := getValueFromStruct(default_config, key)
 			if default_value.IsValid() && variantFieldIsSet(&value_schema.Default) {
 				switch value_schema.Type {
 				case "array":
-					if !default_value.IsZero() && !default_value.IsNil() {
-						def_value := default_value.Interface()
-						value_schema.Default = def_value
+					if default_value.Kind() == reflect.ValueOf(common.Address{}).Kind() {
+						if !default_value.IsZero() {
+							def_value := default_value.Interface()
+							value_schema.Default = def_value
+						}
+					} else {
+						if !default_value.IsZero() && !default_value.IsNil() {
+							def_value := default_value.Interface()
+							value_schema.Default = def_value
+						}
 					}
 				case "object":
 					fillDefaultValuesPartial(value_schema, default_value.Interface())

config/gen_json_schema_test.go

@@ -9,13 +9,18 @@ import (
 	"time"
 
 	"github.com/0xPolygonHermez/zkevm-node/config/types"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/invopop/jsonschema"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 )
 
+type TestConfigWithAddress struct {
+	L2Coinbase common.Address `mapstructure:"L2Coinbase"`
+}
+
 type MySectionConfig struct {
 }
 
@@ -85,6 +90,39 @@ f1_another_name="value_f1"
 f2_another_name=5678
 `
 
+func TestGenerateJsonSchemaWithAEthAddressEmpty(t *testing.T) {
+	cli := cli.NewContext(nil, nil, nil)
+	generator := ConfigJsonSchemaGenerater[TestConfigWithAddress]{
+		repoName:                "github.com/0xPolygonHermez/zkevm-node/config/",
+		cleanRequiredField:      true,
+		addCodeCommentsToSchema: true,
+		pathSourceCode:          "./",
+		repoNameSuffix:          "config/",
+		defaultValues:           &TestConfigWithAddress{},
+	}
+	schema, err := generator.GenerateJsonSchema(cli)
+	require.NoError(t, err)
+	require.NotNil(t, schema)
+}
+
+func TestGenerateJsonSchemaWithAEthAddress(t *testing.T) {
+	cli := cli.NewContext(nil, nil, nil)
+	adr := common.HexToAddress("0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266")
+	generator := ConfigJsonSchemaGenerater[TestConfigWithAddress]{
+		repoName:                "github.com/0xPolygonHermez/zkevm-node/config/",
+		cleanRequiredField:      true,
+		addCodeCommentsToSchema: true,
+		pathSourceCode:          "./",
+		repoNameSuffix:          "config/",
+		defaultValues: &TestConfigWithAddress{
+			L2Coinbase: adr,
+		},
+	}
+	schema, err := generator.GenerateJsonSchema(cli)
+	require.NoError(t, err)
+	require.NotNil(t, schema)
+}
+
 func TestGenerateJsonSchemaCommentsWithDurationItem(t *testing.T) {
 	cli := cli.NewContext(nil, nil, nil)
 	duration, err := time.ParseDuration("1m")

docker-compose.yml

@@ -107,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:v2.1.0-RC2
+    image: hermeznetwork/zkevm-prover:v2.1.0
     depends_on:
       zkevm-state-db:
         condition: service_healthy