Merge branch 'main' into lava_spec

VICHINHOK · Aug 3, 2022 · 30ef2a7 · 30ef2a7
2 parents fdad1ab + 42644b2
commit 30ef2a7
Show file tree

Hide file tree

Showing 86 changed files with 10,103 additions and 801 deletions.
diff --git a/app/app.go b/app/app.go
@@ -502,12 +502,12 @@ func New(
 		ibctransfertypes.ModuleName,
 		specmoduletypes.ModuleName,
 		epochstoragemoduletypes.ModuleName,
+		conflictmoduletypes.ModuleName, //conflict needs to change state before pairing changes stakes
 		pairingmoduletypes.ModuleName,
 		vestingtypes.ModuleName,
 		upgradetypes.ModuleName,
 		feegrant.ModuleName,
-		paramstypes.ModuleName,
-		conflictmoduletypes.ModuleName)
+		paramstypes.ModuleName)
 
 	app.mm.SetOrderEndBlockers(
 		capabilitytypes.ModuleName,
@@ -525,12 +525,12 @@ func New(
 		ibctransfertypes.ModuleName,
 		specmoduletypes.ModuleName,
 		epochstoragemoduletypes.ModuleName,
+		conflictmoduletypes.ModuleName,
 		pairingmoduletypes.ModuleName,
 		vestingtypes.ModuleName,
 		upgradetypes.ModuleName,
 		feegrant.ModuleName,
-		paramstypes.ModuleName,
-		conflictmoduletypes.ModuleName)
+		paramstypes.ModuleName)
 
 	// NOTE: The genutils module must occur after staking so that pools are
 	// properly initialized with tokens from genesis accounts.

diff --git a/cookbook/spec_add_ethereum.json b/cookbook/spec_add_ethereum.json
@@ -36,54 +36,6 @@
             }
           ]
         },
-        {
-          "name": "eth_submitWork",
-          "category": {
-            "deterministic": true,
-            "local": false,
-            "subscription": false,
-            "stateful": 0
-          },
-          "block_parsing": {
-            "parserArg": [
-              ""
-            ],
-            "parserFunc": "EMPTY"
-          },
-          "compute_units": "1",
-          "enabled": true,
-          "apiInterfaces": [
-            {
-              "interface": "jsonrpc",
-              "type": "get",
-              "extra_compute_units": "0"
-            }
-          ]
-        },
-        {
-          "name": "eth_submitHashrate",
-          "category": {
-            "deterministic": true,
-            "local": false,
-            "subscription": false,
-            "stateful": 0
-          },
-          "block_parsing": {
-            "parserArg": [
-              ""
-            ],
-            "parserFunc": "EMPTY"
-          },
-          "compute_units": "1",
-          "enabled": true,
-          "apiInterfaces": [
-            {
-              "interface": "jsonrpc",
-              "type": "get",
-              "extra_compute_units": "0"
-            }
-          ]
-        },
         {
           "name": "net_version",
           "category": {
@@ -385,7 +337,7 @@
         {
           "name": "eth_subscribe",
           "category": {
-            "deterministic": true,
+            "deterministic": false,
             "local": false,
             "subscription": false,
             "stateful": 0
@@ -409,7 +361,7 @@
         {
           "name": "eth_unsubscribe",
           "category": {
-            "deterministic": true,
+            "deterministic": false,
             "local": false,
             "subscription": false,
             "stateful": 0