cmd/evm: add 256-bit field validations on transactions (t9n) (#23743)

* cmd/evm: add 256-bit field validations on transactions (t9n) * cmd/evm: validate gas*gasPrice, return intrinsic gas usage * cmd/evm: address review comment
ethereum · Oct 18, 2021 · 84d8eb2 · 84d8eb2
1 parent 554b1b9
commit 84d8eb2
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 13 deletions.
diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go
@@ -36,17 +36,19 @@ import (
 )
 
 type result struct {
-	Error   error
-	Address common.Address
-	Hash    common.Hash
+	Error        error
+	Address      common.Address
+	Hash         common.Hash
+	IntrinsicGas uint64
 }
 
 // MarshalJSON marshals as JSON with a hash.
 func (r *result) MarshalJSON() ([]byte, error) {
 	type xx struct {
-		Error   string          `json:"error,omitempty"`
-		Address *common.Address `json:"address,omitempty"`
-		Hash    *common.Hash    `json:"hash,omitempty"`
+		Error        string          `json:"error,omitempty"`
+		Address      *common.Address `json:"address,omitempty"`
+		Hash         *common.Hash    `json:"hash,omitempty"`
+		IntrinsicGas uint64          `json:"intrinsicGas,omitempty"`
 	}
 	var out xx
 	if r.Error != nil {
@@ -58,6 +60,7 @@ func (r *result) MarshalJSON() ([]byte, error) {
 	if r.Hash != (common.Hash{}) {
 		out.Hash = &r.Hash
 	}
+	out.IntrinsicGas = r.IntrinsicGas
 	return json.Marshal(out)
 }
 
@@ -132,12 +135,36 @@ func Transaction(ctx *cli.Context) error {
 		} else {
 			r.Address = sender
 		}
-
+		// Check intrinsic gas
 		if gas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil,
 			chainConfig.IsHomestead(new(big.Int)), chainConfig.IsIstanbul(new(big.Int))); err != nil {
 			r.Error = err
-		} else if tx.Gas() < gas {
-			r.Error = fmt.Errorf("%w: have %d, want %d", core.ErrIntrinsicGas, tx.Gas(), gas)
+			results = append(results, r)
+			continue
+		} else {
+			r.IntrinsicGas = gas
+			if tx.Gas() < gas {
+				r.Error = fmt.Errorf("%w: have %d, want %d", core.ErrIntrinsicGas, tx.Gas(), gas)
+				results = append(results, r)
+				continue
+			}
+		}
+		// Validate <256bit fields
+		switch {
+		case tx.Value().BitLen() > 256:
+			r.Error = errors.New("value exceeds 256 bits")
+		case tx.GasPrice().BitLen() > 256:
+			r.Error = errors.New("gasPrice exceeds 256 bits")
+		case tx.GasTipCap().BitLen() > 256:
+			r.Error = errors.New("maxPriorityFeePerGas exceeds 256 bits")
+		case tx.GasFeeCap().BitLen() > 256:
+			r.Error = errors.New("maxFeePerGas exceeds 256 bits")
+		case tx.GasFeeCap().Cmp(tx.GasTipCap()) < 0:
+			r.Error = errors.New("maxFeePerGas < maxPriorityFeePerGas")
+		case new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas())).BitLen() > 256:
+			r.Error = errors.New("gas * gasPrice exceeds 256 bits")
+		case new(big.Int).Mul(tx.GasFeeCap(), new(big.Int).SetUint64(tx.Gas())).BitLen() > 256:
+			r.Error = errors.New("gas * maxFeePerGas exceeds 256 bits")
 		}
 		results = append(results, r)
 	}

diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go
@@ -257,6 +257,14 @@ func TestT9n(t *testing.T) {
 			},
 			expOut: "exp.json",
 		},
+		{ // Transactions with value exceeding 256 bits
+			base: "./testdata/17",
+			input: t9nInput{
+				inTxs:  "signed_txs.rlp",
+				stFork: "London",
+			},
+			expOut: "exp.json",
+		},
 	} {
 
 		args := []string{"t9n"}

diff --git a/cmd/evm/testdata/15/exp2.json b/cmd/evm/testdata/15/exp2.json
@@ -1,10 +1,12 @@
 [
   {
     "address": "0xd02d72e067e77158444ef2020ff2d325f929b363",
-    "hash": "0xa98a24882ea90916c6a86da650fbc6b14238e46f0af04a131ce92be897507476"
+    "hash": "0xa98a24882ea90916c6a86da650fbc6b14238e46f0af04a131ce92be897507476",
+    "intrinsicGas": 21000
   },
   {
     "address": "0xd02d72e067e77158444ef2020ff2d325f929b363",
-    "hash": "0x36bad80acce7040c45fd32764b5c2b2d2e6f778669fb41791f73f546d56e739a"
+    "hash": "0x36bad80acce7040c45fd32764b5c2b2d2e6f778669fb41791f73f546d56e739a",
+    "intrinsicGas": 21000
   }
 ]
diff --git a/cmd/evm/testdata/16/exp.json b/cmd/evm/testdata/16/exp.json
@@ -1,11 +1,13 @@
 [
   {
     "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-    "hash": "0x7cc3d1a8540a44736750f03bb4d85c0113be4b3472a71bf82241a3b261b479e6"
+    "hash": "0x7cc3d1a8540a44736750f03bb4d85c0113be4b3472a71bf82241a3b261b479e6",
+    "intrinsicGas": 21000
   },
   {
     "error": "intrinsic gas too low: have 82, want 21000",
     "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-    "hash": "0x3b2d2609e4361562edb9169314f4c05afc6dbf5d706bf9dda5abe242ab76a22b"
+    "hash": "0x3b2d2609e4361562edb9169314f4c05afc6dbf5d706bf9dda5abe242ab76a22b",
+    "intrinsicGas": 21000
   }
 ]
diff --git a/cmd/evm/testdata/17/exp.json b/cmd/evm/testdata/17/exp.json
@@ -0,0 +1,22 @@
+ [
+    {
+      "error": "value exceeds 256 bits",
+      "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "hash": "0xfbd91685dcbf8172f0e8c53e2ddbb4d26707840da6b51a74371f62a33868fd82",
+      "intrinsicGas": 21000
+    },
+    {
+      "error": "gasPrice exceeds 256 bits",
+      "address": "0x1b57ccef1fe5fb73f1e64530fb4ebd9cf1655964",
+      "hash": "0x45dc05035cada83748e4c1fe617220106b331eca054f44c2304d5654a9fb29d5",
+      "intrinsicGas": 21000
+    },
+    {
+      "error": "invalid transaction v, r, s values",
+      "hash": "0xf06691c2a803ab7f3c81d06a0c0a896f80f311105c599fc59a9fdbc669356d35"
+    },
+    {
+      "error": "invalid transaction v, r, s values",
+      "hash": "0x84703b697ad5b0db25e4f1f98fb6b1adce85b9edb2232eeba9cedd8c6601694b"
+    }
+]
diff --git a/cmd/evm/testdata/17/rlpdata.txt b/cmd/evm/testdata/17/rlpdata.txt
@@ -0,0 +1,46 @@
+[
+  [
+    "",
+    "d",
+    5208,
+    d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0,
+    010000000000000000000000000000000000000000000000000000000000000001,
+    "",
+    1b,
+    c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549d,
+    6180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28,
+  ],
+  [
+    "",
+    010000000000000000000000000000000000000000000000000000000000000001,
+    5208,
+    d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0,
+    11,
+    "",
+    1b,
+    c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549d,
+    6180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28,
+  ],
+  [
+    "",
+    11,
+    5208,
+    d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0,
+    11,
+    "",
+    1b,
+    c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549daa,
+    6180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28,
+  ],
+  [
+    "",
+    11,
+    5208,
+    d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0,
+    11,
+    "",
+    1b,
+    c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549d,
+    6180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28bb,
+  ],
+]
diff --git a/cmd/evm/testdata/17/signed_txs.rlp b/cmd/evm/testdata/17/signed_txs.rlp
@@ -0,0 +1 @@
+"0xf901c8f880806482520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0a1010000000000000000000000000000000000000000000000000000000000000001801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28f88080a101000000000000000000000000000000000000000000000000000000000000000182520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d011801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28f860801182520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d011801ba1c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549daaa06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28f860801182520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d011801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da16180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28bb"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		"0xf901c8f880806482520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0a1010000000000000000000000000000000000000000000000000000000000000001801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28f88080a101000000000000000000000000000000000000000000000000000000000000000182520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d011801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28f860801182520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d011801ba1c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549daaa06180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28f860801182520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d011801ba0c16787a8e25e941d67691954642876c08f00996163ae7dfadbbfd6cd436f549da16180e5626cae31590f40641fe8f63734316c4bfeb4cdfab6714198c1044d2e28bb"