Merge branch 'main' into CNS-delegators-slashing-hook-fix

lavanet · Apr 15, 2024 · 9970a8a · 9970a8a
2 parents e584d32 + 0c0e442
commit 9970a8a
Show file tree

Hide file tree

Showing 58 changed files with 1,201 additions and 490 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -116,23 +116,23 @@ archives:
     builds:
       - lavavisor
     format: binary
-    # use zip for windows archives
+    name_template: '{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}-{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
     format_overrides:
       - goos: windows
         format: zip
   - id: lavap
     builds:
       - lavap
     format: binary
-    # use zip for windows archives
+    name_template: '{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}-{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
     format_overrides:
       - goos: windows
         format: zip
   - id: lavad
     builds:
       - lavad
     format: binary
-    # use zip for windows archives
+    name_template: '{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}-{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
     format_overrides:
       - goos: windows
         format: zip
@@ -185,3 +185,4 @@ release:
   name_template: "Lava v{{.Version}} 🌋"
   mode: replace
   draft: true
+  prerelease: "true"
diff --git a/app/app.go b/app/app.go
@@ -188,6 +188,7 @@ var Upgrades = []upgrades.Upgrade{
 	upgrades.Upgrade_1_0_0,
 	upgrades.Upgrade_1_0_1,
 	upgrades.Upgrade_1_1_0,
+	upgrades.Upgrade_1_2_0,
 }
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals

diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -229,3 +229,9 @@ var Upgrade_1_1_0 = Upgrade{
 	CreateUpgradeHandler: defaultUpgradeHandler,
 	StoreUpgrades:        store.StoreUpgrades{},
 }
+
+var Upgrade_1_2_0 = Upgrade{
+	UpgradeName:          "v1.2.0",
+	CreateUpgradeHandler: defaultUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}
diff --git a/cmd/lavap/main.go b/cmd/lavap/main.go
@@ -16,6 +16,7 @@ import (
 	"github.com/lavanet/lava/protocol/badgeserver"
 	"github.com/lavanet/lava/protocol/monitoring"
 	"github.com/lavanet/lava/protocol/performance/connection"
+	validators "github.com/lavanet/lava/protocol/performance/validators"
 	"github.com/lavanet/lava/protocol/rpcconsumer"
 	"github.com/lavanet/lava/protocol/rpcprovider"
 	"github.com/lavanet/lava/protocol/statetracker"
@@ -42,6 +43,8 @@ func main() {
 	// badge generator cobra command
 	badgeServer := badgeserver.CreateBadgeServerCobraCommand()
 
+	validatorsCmd := validators.CreateValidatorsPerformanceCommand()
+
 	// Add Version Command
 	rootCmd.AddCommand(cmdVersion)
 	// Add RPC Consumer Command
@@ -53,6 +56,9 @@ func main() {
 	// Add Badge Generator Command
 	rootCmd.AddCommand(badgeServer)
 
+	// add command to test validators
+	rootCmd.AddCommand(validatorsCmd)
+
 	testCmd := &cobra.Command{
 		Use:   "test",
 		Short: "Test commands for protocol network",

diff --git a/config/consumer_examples/full_consumer_example.yml b/config/consumer_examples/full_consumer_example.yml
@@ -2,7 +2,7 @@ endpoints:
     - chain-id: ETH1
       api-interface: jsonrpc
       network-address: 127.0.0.1:3333
-    - chain-id: GTH1
+    - chain-id: SEP1
       api-interface: jsonrpc
       network-address: 127.0.0.1:3334
     - chain-id: FTM250
@@ -29,7 +29,7 @@ endpoints:
     - chain-id: OPTM
       api-interface: jsonrpc
       network-address: 127.0.0.1:3352
-    - chain-id: BASET
+    - chain-id: BASES
       api-interface: jsonrpc
       network-address: 127.0.0.1:3353
     - chain-id: OSMOSIS
@@ -152,6 +152,9 @@ endpoints:
     - chain-id: AVAXT
       api-interface: jsonrpc
       network-address: 127.0.0.1:3393
+    - chain-id: HOL1
+      api-interface: jsonrpc
+      network-address: 127.0.0.1:3394
 metrics-listen-address: ":7779"
 # referer-be-address: "http://127.0.0.1:6500"
 # reports-be-address: "http://127.0.0.1:6501"
diff --git a/config/provider_examples/all_endpoints.yml b/config/provider_examples/all_endpoints.yml
@@ -6,7 +6,7 @@ endpoints:
       node-urls:
         - url: <enter-here>
     - api-interface: jsonrpc
-      chain-id: GTH1
+      chain-id: SEP1
       network-address:
         address: "127.0.0.1:2221"
       node-urls:
@@ -60,7 +60,7 @@ endpoints:
       node-urls:
         - url: <enter-here>
     - api-interface: jsonrpc
-      chain-id: BASET
+      chain-id: BASES
       network-address:
         address: "127.0.0.1:2221"
       node-urls:

diff --git a/cookbook/backups/spec_add_optimism_fast_lookup.json b/cookbook/backups/spec_add_optimism_fast_lookup.json
@@ -144,25 +144,6 @@
                         ]
                     }
                 ]
-            },
-            {
-                "index": "OPTMT",
-                "name": "optimism goerli testnet",
-                "enabled": true,
-                "imports": [
-                    "OPTM"
-                ],
-                "reliability_threshold": 268435455,
-                "data_reliability_enabled": true,
-                "block_distance_for_finalized_data": 1,
-                "blocks_in_finalization_proof": 1,
-                "average_block_time": 250,
-                "allowed_block_lag_for_qos_sync": 40,
-                                "shares" : 1,
-                "min_stake_provider": {
-                    "denom": "ulava",
-                    "amount": "50000000000"
-                }
             }
         ]
     },

diff --git a/cookbook/param_changes/param_change_epoch_params.json b/cookbook/param_changes/param_change_epoch_params.json
@@ -2,16 +2,11 @@
     "title": "Protocol Version Change",
     "description": "Update version",
     "changes": [
-        {
-          "subspace": "protocol",
-          "key": "Version",
-          "value": {
-            "provider_target": "1.18.2",
-            "consumer_target": "1.18.2",
-            "provider_min": "1.16.2",
-            "consumer_min": "1.16.2"
-          }
-        }
+      {
+        "subspace": "epochstorage",
+        "key": "EpochBlocks",
+        "value": "3600"
+      }
     ],
     "deposit": "10000000ulava"
 }
diff --git a/cookbook/projects/policy_all_chains_with_addon.yml b/cookbook/projects/policy_all_chains_with_addon.yml
@@ -29,7 +29,7 @@ Policy:
             api_interface: "jsonrpc"
             type: "POST"
             add_on: "debug"
-    - chain_id: GTH1
+    - chain_id: SEP1
       requirements:
         - collection:
             api_interface: "jsonrpc"

diff --git a/cookbook/projects/policy_all_chains_with_extension.yml b/cookbook/projects/policy_all_chains_with_extension.yml
@@ -14,7 +14,7 @@ Policy:
           extensions:
             - "archive"
           mixed: true
-    - chain_id: GTH1
+    - chain_id: SEP1
       requirements:
         - collection:
             api_interface: "jsonrpc"

diff --git a/cookbook/specs/spec_add_base.json b/cookbook/specs/spec_add_base.json
@@ -68,50 +68,6 @@
                     }
                 ]
             },
-            {
-                "index": "BASET",
-                "name": "base goerli testnet",
-                "enabled": true,
-                "imports": [
-                    "BASE"
-                ],
-                "reliability_threshold": 268435455,
-                "data_reliability_enabled": true,
-                "block_distance_for_finalized_data": 1,
-                "blocks_in_finalization_proof": 1,
-                "average_block_time": 2000,
-                "allowed_block_lag_for_qos_sync": 5,
-                "shares": 1,
-                "min_stake_provider": {
-                    "denom": "ulava",
-                    "amount": "47500000000"
-                },
-                "api_collections": [
-                    {
-                        "enabled": true,
-                        "collection_data": {
-                            "api_interface": "jsonrpc",
-                            "internal_path": "",
-                            "type": "POST",
-                            "add_on": ""
-                        },
-                        "apis": [],
-                        "headers": [],
-                        "inheritance_apis": [],
-                        "parse_directives": [],
-                        "verifications": [
-                            {
-                                "name": "chain-id",
-                                "values": [
-                                    {
-                                        "expected_value": "0x14a33"
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            },
             {
                 "index": "BASES",
                 "name": "base sepolia testnet",

diff --git a/cookbook/specs/spec_add_ethereum.json b/cookbook/specs/spec_add_ethereum.json
@@ -1357,8 +1357,8 @@
                 ]
             },
             {
-                "index": "GTH1",
-                "name": "ethereum testnet goerli",
+                "index": "SEP1",
+                "name": "ethereum testnet sepolia",
                 "enabled": true,
                 "imports": [
                     "ETH1"
@@ -1369,7 +1369,6 @@
                 "blocks_in_finalization_proof": 3,
                 "average_block_time": 13000,
                 "allowed_block_lag_for_qos_sync": 2,
-                "shares": 1,
                 "min_stake_provider": {
                     "denom": "ulava",
                     "amount": "47500000000"
@@ -1392,7 +1391,7 @@
                                 "name": "chain-id",
                                 "values": [
                                     {
-                                        "expected_value": "0x5"
+                                        "expected_value": "0xaa36a7"
                                     }
                                 ]
                             }
@@ -1401,8 +1400,8 @@
                 ]
             },
             {
-                "index": "SEP1",
-                "name": "ethereum testnet sepolia",
+                "index": "HOL1",
+                "name": "ethereum testnet holesky",
                 "enabled": true,
                 "imports": [
                     "ETH1"
@@ -1435,7 +1434,7 @@
                                 "name": "chain-id",
                                 "values": [
                                     {
-                                        "expected_value": "0xaa36a7"
+                                        "expected_value": "0x4268"
                                     }
                                 ]
                             }

diff --git a/cookbook/specs/spec_add_fvm.json b/cookbook/specs/spec_add_fvm.json
@@ -1828,6 +1828,18 @@
                                         "expected_value": "0x13a"
                                     }
                                 ]
+                            },
+                            {
+                              "name": "pruning",
+                              "values": [
+                                {
+                                  "expected_value": ""
+                                },
+                                {
+                                  "extension": "archive",
+                                  "expected_value": ""
+                                }
+                              ]
                             }
                         ]
                     }