tests

astriaorg · Feb 19, 2025 · 0662f9a · 0662f9a
1 parent 6600018
commit 0662f9a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 1,565 deletions.
diff --git a/cmd/evm/testdata/28/exp.json b/cmd/evm/testdata/28/exp.json
@@ -1,47 +1,31 @@
 {
   "alloc": {
-    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
-      "balance": "0x73c57"
-    },
     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
-      "balance": "0x16345785d80c3a9",
-      "nonce": "0x1"
+      "balance": "0x16345785d8a0000"
     },
     "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
       "code": "0x60004960015500",
-      "storage": {
-        "0x0000000000000000000000000000000000000000000000000000000000000001": "0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
-      },
       "balance": "0x16345785d8a0000"
     }
   },
   "result": {
-    "stateRoot": "0xabcbb1d3be8aee044a219dd181fe6f2c2482749b9da95d15358ba7af9b43c372",
-    "txRoot": "0x4409cc4b699384ba5f8248d92b784713610c5ff9c1de51e9239da0dac76de9ce",
-    "receiptsRoot": "0xbff643da765981266133094092d98c81d2ac8e9a83a7bbda46c3d736f1f874ac",
+    "stateRoot": "0x6839086a373fe6d246824ee3235cd95e05d67071e6aa226835b4ba6f90c670b0",
+    "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+    "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "receipts": [
+    "receipts": [],
+    "rejected": [
       {
-        "type": "0x3",
-        "root": "0x",
-        "status": "0x1",
-        "cumulativeGasUsed": "0xa865",
-        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "logs": null,
-        "transactionHash": "0x7508d7139d002a4b3a26a4f12dec0d87cb46075c78bf77a38b569a133b509262",
-        "contractAddress": "0x0000000000000000000000000000000000000000",
-        "gasUsed": "0xa865",
-        "effectiveGasPrice": null,
-        "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "transactionIndex": "0x0"
+        "index": 0,
+        "error": "transaction type not supported"
       }
     ],
     "currentDifficulty": null,
-    "gasUsed": "0xa865",
+    "gasUsed": "0x0",
     "currentBaseFee": "0x9",
     "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
     "currentExcessBlobGas": "0x0",
-    "blobGasUsed": "0x20000"
+    "blobGasUsed": "0x0"
   }
-}
+}
diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -34,7 +34,6 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/trie"
-	"github.com/holiman/uint256"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -95,22 +94,23 @@ func TestStateProcessorErrors(t *testing.T) {
 		}), signer, key1)
 		return tx
 	}
-	var mkBlobTx = func(nonce uint64, to common.Address, gasLimit uint64, gasTipCap, gasFeeCap, blobGasFeeCap *big.Int, hashes []common.Hash) *types.Transaction {
-		tx, err := types.SignTx(types.NewTx(&types.BlobTx{
-			Nonce:      nonce,
-			GasTipCap:  uint256.MustFromBig(gasTipCap),
-			GasFeeCap:  uint256.MustFromBig(gasFeeCap),
-			Gas:        gasLimit,
-			To:         to,
-			BlobHashes: hashes,
-			BlobFeeCap: uint256.MustFromBig(blobGasFeeCap),
-			Value:      new(uint256.Int),
-		}), signer, key1)
-		if err != nil {
-			t.Fatal(err)
-		}
-		return tx
-	}
+	// Blob txs are disabled
+	//var mkBlobTx = func(nonce uint64, to common.Address, gasLimit uint64, gasTipCap, gasFeeCap, blobGasFeeCap *big.Int, hashes []common.Hash) *types.Transaction {
+	//	tx, err := types.SignTx(types.NewTx(&types.BlobTx{
+	//		Nonce:      nonce,
+	//		GasTipCap:  uint256.MustFromBig(gasTipCap),
+	//		GasFeeCap:  uint256.MustFromBig(gasFeeCap),
+	//		Gas:        gasLimit,
+	//		To:         to,
+	//		BlobHashes: hashes,
+	//		BlobFeeCap: uint256.MustFromBig(blobGasFeeCap),
+	//		Value:      new(uint256.Int),
+	//	}), signer, key1)
+	//	if err != nil {
+	//		t.Fatal(err)
+	//	}
+	//	return tx
+	//}
 
 	{ // Tests against a 'recent' chain definition
 		var (
@@ -246,12 +246,13 @@ func TestStateProcessorErrors(t *testing.T) {
 				},
 				want: "could not apply tx 0 [0xfd49536a9b323769d8472fcb3ebb3689b707a349379baee3e2ee3fe7baae06a1]: intrinsic gas too low: have 54299, want 54300",
 			},
-			{ // ErrBlobFeeCapTooLow
-				txs: []*types.Transaction{
-					mkBlobTx(0, common.Address{}, params.TxGas, big.NewInt(1), big.NewInt(1), big.NewInt(0), []common.Hash{(common.Hash{1})}),
-				},
-				want: "could not apply tx 0 [0x6c11015985ce82db691d7b2d017acda296db88b811c3c60dc71449c76256c716]: max fee per gas less than block base fee: address 0x71562b71999873DB5b286dF957af199Ec94617F7, maxFeePerGas: 1, baseFee: 875000000",
-			},
+			// Blob txs are disabled
+			//{ // ErrBlobFeeCapTooLow
+			//	txs: []*types.Transaction{
+			//		mkBlobTx(0, common.Address{}, params.TxGas, big.NewInt(1), big.NewInt(1), big.NewInt(0), []common.Hash{(common.Hash{1})}),
+			//	},
+			//	want: "could not apply tx 0 [0x6c11015985ce82db691d7b2d017acda296db88b811c3c60dc71449c76256c716]: max fee per gas less than block base fee: address 0x71562b71999873DB5b286dF957af199Ec94617F7, maxFeePerGas: 1, baseFee: 875000000",
+			//},
 		} {
 			block := GenerateBadBlock(gspec.ToBlock(), beacon.New(ethash.NewFaker()), tt.txs, gspec.Config)
 			_, err := blockchain.InsertChain(types.Blocks{block})