correct nimbus exception names

GeneralStateTests/stTransactionTest/ValueOverflow.json

@@ -2,22 +2,24 @@
     "ValueOverflow" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "Nimbus-t8n 0.1.2",
-            "filling-tool-version" : "retesteth-0.3.1-shanghai+commit.8eac02f7.Linux.g++",
-            "generatedTestHash" : "6c94cdf6c546ef79134c26e22301ffab988b8591268da166ac32cb1cb1a7cf2e",
-            "lllcversion" : "Version: 0.5.14-develop.2023.5.21+commit.a096d7a9.mod.Linux.g++",
-            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
+            "filling-rpc-server" : "evm version 1.13.0-unstable-0bf2d99a-20230901",
+            "filling-tool-version" : "retesteth-0.3.1-cancun+commit.cffe14c5.Linux.g++",
+            "generatedTestHash" : "9a947cfde11ebba088cabeb8f4b073ce26a67d09764afbb6808c1968845e1063",
+            "lllcversion" : "Version: 0.5.14-develop.2023.7.11+commit.c58ab2c6.mod.Linux.g++",
+            "solidity" : "Version: 0.8.20+commit.a1b79de6.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stTransactionTest/ValueOverflowFiller.yml",
             "sourceHash" : "fa6acc202e029dc360fd6d105ac578d91f184f692359decbfe4f9f50af7fbb67"
         },
         "env" : {
             "currentBaseFee" : "0x0a",
+            "currentBeaconRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05500000",
             "currentNumber" : "0x01",
             "currentRandom" : "0x0000000000000000000000000000000000000000000000000000000000020000",
             "currentTimestamp" : "0x03e8",
+            "currentWithdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
@@ -47,19 +49,6 @@
                     "txbytes" : "0xf880806482520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0a1010000000000000000000000000000000000000000000000000000000000000001801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28"
                 }
             ],
-            "Cancun" : [
-                {
-                    "expectException" : "TR_RLP_WRONGVALUE",
-                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf880806482520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0a1010000000000000000000000000000000000000000000000000000000000000001801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28"
-                }
-            ],
             "Constantinople" : [
                 {
                     "expectException" : "TR_RLP_WRONGVALUE",

src/GeneralStateTestsFiller/stTransactionTest/NoSrcAccount1559Filler.yml

@@ -59,10 +59,21 @@ NoSrcAccount1559:
         - '>=Frontier'
       indexes:
         data: !!int -1
-        gas: 0-1
+        gas: !!int 0
         value: !!int -1
       expectException:
-        ">=London" : "Transaction without funds"
+        ">=London" : "TR_NoFundsOrGas"        #Nimbus get different exception type here
+        "<London" : "TR_TypeNotSupported"
+      result: {}
+
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int -1
+        gas: !!int 1
+        value: !!int -1
+      expectException:
+        ">=London" : "TR_NoFunds"
         "<London" : "TR_TypeNotSupported"
       result: {}
 
@@ -75,7 +86,7 @@ NoSrcAccount1559:
         gas: !!int 2
         value: !!int 1
       expectException:
-        ">=London" : "Transaction without funds"
+        ">=London" : "TR_NoFundsOrGas"
         "<London" : "TR_TypeNotSupported"
       result: {}
 

src/GeneralStateTestsFiller/stTransactionTest/NoSrcAccountCreate1559Filler.yml

@@ -58,10 +58,20 @@ NoSrcAccountCreate1559:
         - '>=Frontier'
       indexes:
         data: !!int -1
-        gas: 0-1
+        gas: !!int 0
         value: !!int -1
       expectException:
-        ">=London" : "Transaction without funds"
+        ">=London" : "TR_NoFundsOrGas"
+        "<London" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int -1
+        gas: !!int 1
+        value: !!int -1
+      expectException:
+        ">=London" : "TR_NoFunds"
         "<London" : "TR_TypeNotSupported"
       result: {}
 
@@ -74,7 +84,7 @@ NoSrcAccountCreate1559:
         gas: !!int 2
         value: !!int 1
       expectException:
-        ">=London" : "Transaction without funds"
+        ">=London" : "TR_NoFundsOrGas"
         "<London" : "TR_TypeNotSupported"
       result: {}
 

src/GeneralStateTestsFiller/stTransactionTest/NoSrcAccountCreateFiller.yml

@@ -59,14 +59,33 @@ NoSrcAccountCreate:
 
   expect:
     # Not enough ETH for executing the transaction
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 0
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Homestead" : "TR_NoFundsOrGas"    #nimbus have different exception type here
+        "<Homestead" : "TR_NoFunds"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 1
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Frontier" : "TR_NoFundsOrGas"    #nimbus have different exception type here
+      result: {}
     - network:
         - '>=Frontier'
       indexes:
         data: 0-1
-        gas: 0-1
+        gas: !!int 1
         value: !!int -1
       expectException:
-        ">=Frontier" : "Transaction without funds"
+        ">=Frontier" : "TR_NoFunds"
       result: {}
 
 
@@ -78,7 +97,7 @@ NoSrcAccountCreate:
         gas: !!int 2
         value: !!int 1
       expectException:
-        ">=Frontier" : "Transaction without funds"
+        ">=Frontier" : "TR_NoFundsOrGas"        #nimbus have different exception type here
       result: {}
 
 
@@ -102,10 +121,20 @@ NoSrcAccountCreate:
         - '>=Frontier'
       indexes:
         data: 2-4
-        gas: 0-1
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Berlin" : "TR_NoFundsOrGas"
+        "<Berlin" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: 2-4
+        gas: !!int 1
         value: !!int -1
       expectException:
-        ">=Berlin" : "Transaction without funds"
+        ">=Berlin" : "TR_NoFunds"
         "<Berlin" : "TR_TypeNotSupported"
       result: {}
 
@@ -118,7 +147,7 @@ NoSrcAccountCreate:
         gas: !!int 2
         value: !!int 1
       expectException:
-        ">=Berlin" : "Transaction without funds"
+        ">=Berlin" : "TR_NoFundsOrGas"
         "<Berlin" : "TR_TypeNotSupported"
       result: {}
 

src/GeneralStateTestsFiller/stTransactionTest/NoSrcAccountFiller.yml

@@ -57,18 +57,41 @@ NoSrcAccount:
       - 1
 
   expect:
+
     # Not enough ETH for executing the transaction
     - network:
         - '>=Frontier'
       indexes:
-        data: 0-1
+        data: !!int 0
         gas: 0-1
         value: !!int -1
       expectException:
-        ">=Frontier" : "Transaction without funds"
+        ">=Frontier" : "TR_NoFunds"
+      result: {}
+
+
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 1
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Frontier" : "TR_NoFundsOrGas"            # Nimbus check triggers a different exception in this case
+      result: {}
+
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 1
+        gas: !!int 1
+        value: !!int -1
+      expectException:
+        ">=Frontier" : "TR_NoFunds"
       result: {}
 
 
+
     # Not enough ETH for the value we transfer
     - network:
         - '>=Frontier'
@@ -77,7 +100,7 @@ NoSrcAccount:
         gas: !!int 2
         value: !!int 1
       expectException:
-        ">=Frontier" : "Transaction without funds"
+        ">=Frontier" : "TR_NoFundsOrGas"
       result: {}
 
 
@@ -100,11 +123,61 @@ NoSrcAccount:
     - network:
         - '>=Frontier'
       indexes:
-        data: 2-4
-        gas: 0-1
+        data: !!int 2
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Berlin" : "TR_NoFundsOrGas"  # Nimbus check triggers a different exception in this case
+        "<Berlin" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 2
+        gas: !!int 1
+        value: !!int -1
+      expectException:
+        ">=Berlin" : "TR_NoFunds"
+        "<Berlin" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 3
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Berlin" : "TR_NoFundsOrGas" # Nimbus check triggers a different exception in this case
+        "<Berlin" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 3
+        gas: !!int 1
+        value: !!int -1
+      expectException:
+        ">=Berlin" : "TR_NoFunds"
+        "<Berlin" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 4
+        gas: !!int 0
+        value: !!int -1
+      expectException:
+        ">=Berlin" : "TR_NoFundsOrGas" # Nimbus check triggers a different exception in this case
+        "<Berlin" : "TR_TypeNotSupported"
+      result: {}
+    - network:
+        - '>=Frontier'
+      indexes:
+        data: !!int 4
+        gas: !!int 1
         value: !!int -1
       expectException:
-        ">=Berlin" : "Transaction without funds"
+        ">=Berlin" : "TR_NoFunds"
         "<Berlin" : "TR_TypeNotSupported"
       result: {}
 
@@ -117,7 +190,7 @@ NoSrcAccount:
         gas: !!int 2
         value: !!int 1
       expectException:
-        ">=Berlin" : "Transaction without funds"
+        ">=Berlin" : "TR_NoFundsOrGas"
         "<Berlin" : "TR_TypeNotSupported"
       result: {}