From da8a74338256869d89def9013cb618ad16c6a3da Mon Sep 17 00:00:00 2001 From: Ho Vei Date: Mon, 19 Jun 2023 08:35:38 +0800 Subject: [PATCH 01/13] wip --- rollup/fees/rollup_fee_test.go | 72 +++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 54b77eeb151..90211685bed 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -1,9 +1,14 @@ package fees import ( + "bytes" "math/big" "testing" + "encoding/json" + + "github.com/scroll-tech/go-ethereum/core/types" + "github.com/scroll-tech/go-ethereum/crypto" "github.com/stretchr/testify/assert" ) @@ -14,7 +19,72 @@ func TestCalculateEncodedL1DataFee(t *testing.T) { overhead := new(big.Int).SetUint64(100) scalar := new(big.Int).SetUint64(10) - expected := new(big.Int).SetUint64(184) // 184.2 + expected := new(big.Int).SetUint64(30) // 30.8 actual := calculateEncodedL1DataFee(data, overhead, l1BaseFee, scalar) assert.Equal(t, expected, actual) } + +const example_tx1 = ` + { + "type": 0, + "nonce": 4, + "txHash": "0x8da3fedb103b6da8ccc2514094336d1a76df166238f4d8e8558fbe54cce2516a", + "gas": 53854, + "gasPrice": "0x3b9aca00", + "from": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63", + "to": "0x03f8133dd5ed58838b20af1296f62f44e69baa48", + "chainId": "0xcf55", + "value": "0x0", + "data": "0xa9059cbb000000000000000000000000c0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca200000000000000000000000000000000000000000000000000000000000003e8", + "isCreate": false + } +` +const example_tx2 = ` + { + "type": 0, + "nonce": 20, + "txHash": "0xfef778b40acae6c4f00205f3dafae2af1dff90d402c19b090c4b12cad08e7461", + "gas": 23730, + "gasPrice": "0x3b9aca00", + "from": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63", + "to": "0x58a2239aa5412f78d8f675c4d8ad5102a3fa5837", + "chainId": "0xcf55", + "value": "0x0", + "data": "0xb0f2b72a000000000000000000000000000000000000000000000000000000000000000a", + "isCreate": false + } +` + +func reverseDataToMsg(txdata *types.TransactionData) types.Message { + return types.NewMessage(txdata.From, txdata.To, txdata.Nonce, (*big.Int)(txdata.Value), txdata.Gas, nil, nil, nil, []byte(txdata.Data), nil, false) +} + +func TestCalculateL1DataSize(t *testing.T) { + txdata := new(types.TransactionData) + assert.NoError(t, json.Unmarshal([]byte(example_tx1), txdata), "parse json fail") + + t.Log(txdata) + + msg := reverseDataToMsg(txdata) + + chainID := big.NewInt(53077) //0xcf55 + //eip1559baseFee := new(big.Int).SetUint64(15000000) + signer := types.NewEIP155Signer(chainID) + + unsigned := asUnsignedTx(msg, nil, chainID) + + tx, err := unsigned.WithSignature(signer, append(bytes.Repeat([]byte{0xff}, crypto.SignatureLength-1), 0x01)) + assert.NoError(t, err, "build dummy tx fail") + + raw, err := rlpEncode(tx) + assert.NoError(t, err, "rlp fail") + + assert.Equal(t, 239, len(raw)) + + basefee := big.NewInt(0x64) + overhead := big.NewInt(0x17d4) + scalar := big.NewInt(0x4a42fc80) + + l1DataFee := calculateEncodedL1DataFee(raw, overhead, basefee, scalar) + assert.Equal(t, big.NewInt(0xfffe8), l1DataFee) +} From 39f0496f358df6659560fd088c373431a5941b95 Mon Sep 17 00:00:00 2001 From: Ho Vei Date: Mon, 19 Jun 2023 09:28:34 +0800 Subject: [PATCH 02/13] more fixes --- rollup/fees/rollup_fee_test.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 90211685bed..f178ba45a55 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -7,6 +7,7 @@ import ( "encoding/json" + "github.com/scroll-tech/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/crypto" "github.com/stretchr/testify/assert" @@ -56,7 +57,11 @@ const example_tx2 = ` ` func reverseDataToMsg(txdata *types.TransactionData) types.Message { - return types.NewMessage(txdata.From, txdata.To, txdata.Nonce, (*big.Int)(txdata.Value), txdata.Gas, nil, nil, nil, []byte(txdata.Data), nil, false) + databytes, err := hexutil.Decode(txdata.Data) + if err != nil { + panic(err) + } + return types.NewMessage(txdata.From, txdata.To, txdata.Nonce, (*big.Int)(txdata.Value), txdata.Gas, nil, nil, nil, databytes, nil, false) } func TestCalculateL1DataSize(t *testing.T) { @@ -68,18 +73,20 @@ func TestCalculateL1DataSize(t *testing.T) { msg := reverseDataToMsg(txdata) chainID := big.NewInt(53077) //0xcf55 - //eip1559baseFee := new(big.Int).SetUint64(15000000) - signer := types.NewEIP155Signer(chainID) + var eip1559baseFee *big.Int + eip1559baseFee = new(big.Int).SetUint64(15000000) + signer := types.NewLondonSigner(chainID) + t.Log(msg) - unsigned := asUnsignedTx(msg, nil, chainID) + unsigned := asUnsignedTx(msg, eip1559baseFee, chainID) tx, err := unsigned.WithSignature(signer, append(bytes.Repeat([]byte{0xff}, crypto.SignatureLength-1), 0x01)) assert.NoError(t, err, "build dummy tx fail") - raw, err := rlpEncode(tx) + t.Log(raw) assert.NoError(t, err, "rlp fail") - assert.Equal(t, 239, len(raw)) + assert.Equal(t, 169, len(raw)) basefee := big.NewInt(0x64) overhead := big.NewInt(0x17d4) From 5950b99f81a9b36dd283a665183e7e849cd501a9 Mon Sep 17 00:00:00 2001 From: Ho Vei Date: Mon, 19 Jun 2023 09:50:03 +0800 Subject: [PATCH 03/13] more fixes --- rollup/fees/rollup_fee_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index f178ba45a55..ab7bff2adf6 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -61,7 +61,8 @@ func reverseDataToMsg(txdata *types.TransactionData) types.Message { if err != nil { panic(err) } - return types.NewMessage(txdata.From, txdata.To, txdata.Nonce, (*big.Int)(txdata.Value), txdata.Gas, nil, nil, nil, databytes, nil, false) + return types.NewMessage(txdata.From, txdata.To, txdata.Nonce, (*big.Int)(txdata.Value), txdata.Gas, + (*big.Int)(txdata.GasPrice), (*big.Int)(txdata.GasPrice), (*big.Int)(txdata.GasPrice), databytes, nil, false) } func TestCalculateL1DataSize(t *testing.T) { @@ -74,7 +75,7 @@ func TestCalculateL1DataSize(t *testing.T) { chainID := big.NewInt(53077) //0xcf55 var eip1559baseFee *big.Int - eip1559baseFee = new(big.Int).SetUint64(15000000) + //eip1559baseFee = new(big.Int).SetUint64(15000000) signer := types.NewLondonSigner(chainID) t.Log(msg) @@ -86,7 +87,7 @@ func TestCalculateL1DataSize(t *testing.T) { t.Log(raw) assert.NoError(t, err, "rlp fail") - assert.Equal(t, 169, len(raw)) + assert.Equal(t, 173, len(raw)) basefee := big.NewInt(0x64) overhead := big.NewInt(0x17d4) From fbca6c9ef481b33a9adbc64159147b6f0e2e749b Mon Sep 17 00:00:00 2001 From: Ho Vei Date: Mon, 19 Jun 2023 10:11:21 +0800 Subject: [PATCH 04/13] final refines --- rollup/fees/rollup_fee_test.go | 76 ++++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index ab7bff2adf6..faa3fec2451 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -65,34 +65,74 @@ func reverseDataToMsg(txdata *types.TransactionData) types.Message { (*big.Int)(txdata.GasPrice), (*big.Int)(txdata.GasPrice), (*big.Int)(txdata.GasPrice), databytes, nil, false) } -func TestCalculateL1DataSize(t *testing.T) { - txdata := new(types.TransactionData) - assert.NoError(t, json.Unmarshal([]byte(example_tx1), txdata), "parse json fail") +type l1DataTestCase struct { + TxDataSample string + EIP1559BaseFee *big.Int + L1basefee *big.Int + L1feeOverHead *big.Int + L1feeScalar *big.Int + EncodedExpected int + L1DataFeeExpected *big.Int +} - t.Log(txdata) +func testCalculateL1DataSize(t *testing.T, t_case *l1DataTestCase) { + txdata := new(types.TransactionData) + assert.NoError(t, json.Unmarshal([]byte(t_case.TxDataSample), txdata), "parse json fail") - msg := reverseDataToMsg(txdata) + // we have decomposed EstimateL1DataFeeForMessage here so + // to catch more detail inside the process + var msg types.Message - chainID := big.NewInt(53077) //0xcf55 - var eip1559baseFee *big.Int - //eip1559baseFee = new(big.Int).SetUint64(15000000) + if t_case.EIP1559BaseFee != nil { + //TODO: EIP1559 test + panic("no implement") + } else { + msg = reverseDataToMsg(txdata) + } + chainID := (*big.Int)(txdata.ChainId) signer := types.NewLondonSigner(chainID) - t.Log(msg) - - unsigned := asUnsignedTx(msg, eip1559baseFee, chainID) + unsigned := asUnsignedTx(msg, t_case.EIP1559BaseFee, chainID) tx, err := unsigned.WithSignature(signer, append(bytes.Repeat([]byte{0xff}, crypto.SignatureLength-1), 0x01)) assert.NoError(t, err, "build dummy tx fail") raw, err := rlpEncode(tx) - t.Log(raw) assert.NoError(t, err, "rlp fail") - assert.Equal(t, 173, len(raw)) + if t_case.EncodedExpected != 0 { + assert.Equal(t, t_case.EncodedExpected, len(raw)) + } else { + t.Log("caluldated encoded rlp len:", len(raw)) + } - basefee := big.NewInt(0x64) - overhead := big.NewInt(0x17d4) - scalar := big.NewInt(0x4a42fc80) + l1DataFee := calculateEncodedL1DataFee(raw, t_case.L1feeOverHead, t_case.L1basefee, t_case.L1feeScalar) + if t_case.L1DataFeeExpected != nil { + assert.Equal(t, t_case.L1DataFeeExpected, l1DataFee) + } else { + t.Log("calculated l1data fee:", l1DataFee) + } +} + +func TestCalculateL1DataSize(t *testing.T) { + + for _, tcase := range []*l1DataTestCase{ + { + TxDataSample: example_tx1, + L1basefee: big.NewInt(0x64), + L1feeOverHead: big.NewInt(0x17d4), + L1feeScalar: big.NewInt(0x4a42fc80), + EncodedExpected: 173, + L1DataFeeExpected: big.NewInt(0xfffe8), + }, + { + TxDataSample: example_tx2, + L1basefee: big.NewInt(0x64), + L1feeOverHead: big.NewInt(0x17d4), + L1feeScalar: big.NewInt(0x4a42fc80), + EncodedExpected: 140, + L1DataFeeExpected: big.NewInt(0xf3f2f), + }, + } { + testCalculateL1DataSize(t, tcase) + } - l1DataFee := calculateEncodedL1DataFee(raw, overhead, basefee, scalar) - assert.Equal(t, big.NewInt(0xfffe8), l1DataFee) } From a79e8bd0961987e73c9f7f28e28f67124033c7a3 Mon Sep 17 00:00:00 2001 From: Ho Date: Mon, 19 Jun 2023 11:14:05 +0800 Subject: [PATCH 05/13] Update rollup/fees/rollup_fee_test.go Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> --- rollup/fees/rollup_fee_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index faa3fec2451..5e29ce3a469 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -75,7 +75,7 @@ type l1DataTestCase struct { L1DataFeeExpected *big.Int } -func testCalculateL1DataSize(t *testing.T, t_case *l1DataTestCase) { +func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataTestCase) { txdata := new(types.TransactionData) assert.NoError(t, json.Unmarshal([]byte(t_case.TxDataSample), txdata), "parse json fail") From b35652901a468f4581f64ab6702b2d2d0d4690e0 Mon Sep 17 00:00:00 2001 From: Ho Date: Mon, 19 Jun 2023 11:14:12 +0800 Subject: [PATCH 06/13] Update rollup/fees/rollup_fee_test.go Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> --- rollup/fees/rollup_fee_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 5e29ce3a469..21a847deb51 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -112,7 +112,7 @@ func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataTestCas } } -func TestCalculateL1DataSize(t *testing.T) { +func TestEstimateL1DataFeeForTransactionData(t *testing.T) { for _, tcase := range []*l1DataTestCase{ { From 38d58642437d03d32d9234470ff7474edd97055d Mon Sep 17 00:00:00 2001 From: Ho Date: Mon, 19 Jun 2023 11:14:19 +0800 Subject: [PATCH 07/13] Update rollup/fees/rollup_fee_test.go Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> --- rollup/fees/rollup_fee_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 21a847deb51..45e2b946c8f 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -56,7 +56,7 @@ const example_tx2 = ` } ` -func reverseDataToMsg(txdata *types.TransactionData) types.Message { +func transactionDataToMessage(txdata *types.TransactionData) types.Message { databytes, err := hexutil.Decode(txdata.Data) if err != nil { panic(err) From 75a9344ebd94192cb972485f0e6c6adb2b06e7e1 Mon Sep 17 00:00:00 2001 From: Ho Date: Mon, 19 Jun 2023 11:14:25 +0800 Subject: [PATCH 08/13] Update rollup/fees/rollup_fee_test.go Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> --- rollup/fees/rollup_fee_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 45e2b946c8f..57ba3869963 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -65,7 +65,7 @@ func transactionDataToMessage(txdata *types.TransactionData) types.Message { (*big.Int)(txdata.GasPrice), (*big.Int)(txdata.GasPrice), (*big.Int)(txdata.GasPrice), databytes, nil, false) } -type l1DataTestCase struct { +type l1DataFeeTestCase struct { TxDataSample string EIP1559BaseFee *big.Int L1basefee *big.Int From 908e40d982738c686b3dcbbe12b30a5716229154 Mon Sep 17 00:00:00 2001 From: Ho Date: Tue, 20 Jun 2023 13:54:18 +0800 Subject: [PATCH 09/13] Update rollup/fees/rollup_fee_test.go Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> --- rollup/fees/rollup_fee_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 57ba3869963..0e7aefd64ca 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -85,7 +85,7 @@ func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataTestCas if t_case.EIP1559BaseFee != nil { //TODO: EIP1559 test - panic("no implement") + panic("not implemented") } else { msg = reverseDataToMsg(txdata) } From 9358be2da6fe2e806acd67d7486c54c348f5b67e Mon Sep 17 00:00:00 2001 From: Ho Vei Date: Tue, 20 Jun 2023 14:15:48 +0800 Subject: [PATCH 10/13] lints --- rollup/fees/rollup_fee_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index 0e7aefd64ca..9d301628e72 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -7,10 +7,11 @@ import ( "encoding/json" + "github.com/stretchr/testify/assert" + "github.com/scroll-tech/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/crypto" - "github.com/stretchr/testify/assert" ) func TestCalculateEncodedL1DataFee(t *testing.T) { @@ -75,7 +76,7 @@ type l1DataFeeTestCase struct { L1DataFeeExpected *big.Int } -func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataTestCase) { +func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataFeeTestCase) { txdata := new(types.TransactionData) assert.NoError(t, json.Unmarshal([]byte(t_case.TxDataSample), txdata), "parse json fail") @@ -87,7 +88,7 @@ func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataTestCas //TODO: EIP1559 test panic("not implemented") } else { - msg = reverseDataToMsg(txdata) + msg = transactionDataToMessage(txdata) } chainID := (*big.Int)(txdata.ChainId) signer := types.NewLondonSigner(chainID) @@ -114,7 +115,7 @@ func testEstimateL1DataFeeForTransactionData(t *testing.T, t_case *l1DataTestCas func TestEstimateL1DataFeeForTransactionData(t *testing.T) { - for _, tcase := range []*l1DataTestCase{ + for _, tcase := range []*l1DataFeeTestCase{ { TxDataSample: example_tx1, L1basefee: big.NewInt(0x64), @@ -132,7 +133,7 @@ func TestEstimateL1DataFeeForTransactionData(t *testing.T) { L1DataFeeExpected: big.NewInt(0xf3f2f), }, } { - testCalculateL1DataSize(t, tcase) + testEstimateL1DataFeeForTransactionData(t, tcase) } } From e2c944cc603556c03af1bc0378bcd233acbb3e50 Mon Sep 17 00:00:00 2001 From: Ho Vei Date: Wed, 21 Jun 2023 17:46:48 +0800 Subject: [PATCH 11/13] fix test to mimic CalculateL1DataFee --- rollup/fees/rollup_fee_test.go | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/rollup/fees/rollup_fee_test.go b/rollup/fees/rollup_fee_test.go index faa3fec2451..7ae93a999c5 100644 --- a/rollup/fees/rollup_fee_test.go +++ b/rollup/fees/rollup_fee_test.go @@ -9,7 +9,6 @@ import ( "github.com/scroll-tech/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/core/types" - "github.com/scroll-tech/go-ethereum/crypto" "github.com/stretchr/testify/assert" ) @@ -37,7 +36,10 @@ const example_tx1 = ` "chainId": "0xcf55", "value": "0x0", "data": "0xa9059cbb000000000000000000000000c0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca200000000000000000000000000000000000000000000000000000000000003e8", - "isCreate": false + "isCreate": false, + "v": "0x19ecd", + "r": "0xaaa87d285f44e2683266d83116ee3df09313f38e91393bfe2966e947c31e4002", + "s": "0x9e105efcad78b8e836aa9c588e39f0d81b2d6552d04762d0e02652a9ea94b1d" } ` const example_tx2 = ` @@ -52,7 +54,10 @@ const example_tx2 = ` "chainId": "0xcf55", "value": "0x0", "data": "0xb0f2b72a000000000000000000000000000000000000000000000000000000000000000a", - "isCreate": false + "isCreate": false, + "v": "0x19ece", + "r": "0xa0ed5a985f5b74215ba05b0c3fc2a2af1c26c65d9426867eda637fa5d7d388eb", + "s": "0x81054ba4a31ee6f0715f36d1005393623b97703c061afe5518a7e31ecbfda6f" } ` @@ -79,7 +84,7 @@ func testCalculateL1DataSize(t *testing.T, t_case *l1DataTestCase) { txdata := new(types.TransactionData) assert.NoError(t, json.Unmarshal([]byte(t_case.TxDataSample), txdata), "parse json fail") - // we have decomposed EstimateL1DataFeeForMessage here so + // we have decomposed CalcDataFeeForMessage here so // to catch more detail inside the process var msg types.Message @@ -93,7 +98,16 @@ func testCalculateL1DataSize(t *testing.T, t_case *l1DataTestCase) { signer := types.NewLondonSigner(chainID) unsigned := asUnsignedTx(msg, t_case.EIP1559BaseFee, chainID) - tx, err := unsigned.WithSignature(signer, append(bytes.Repeat([]byte{0xff}, crypto.SignatureLength-1), 0x01)) + // here we have to recover signature + v := big.NewInt(0).Sub(txdata.V.ToInt(), big.NewInt(chainID.Int64()*2)).Uint64() - 35 + assert.True(t, v == 0 || v == 1, "v must be reasonably recovered") + + r := make([]byte, 32) + s := make([]byte, 32) + txdata.R.ToInt().FillBytes(r) + txdata.S.ToInt().FillBytes(s) + + tx, err := unsigned.WithSignature(signer, bytes.Join([][]byte{r, s, {byte(v)}}, nil)) assert.NoError(t, err, "build dummy tx fail") raw, err := rlpEncode(tx) assert.NoError(t, err, "rlp fail") From 8fbef026b225ab07b5653c1b0c594427d1a33a98 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Thu, 25 Apr 2024 23:07:25 +0800 Subject: [PATCH 12/13] Update `make test` --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2a0c148d569..57e18d033d7 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ test: all # genesis test cd ${PWD}/cmd/geth; go test -test.run TestCustomGenesis # module test - $(GORUN) build/ci.go test ./consensus ./core ./eth ./miner ./node ./trie + $(GORUN) build/ci.go test ./consensus ./core ./eth ./miner ./node ./trie ./rollup lint: ## Run linters. $(GORUN) build/ci.go lint From 40c8d8b1600d3addbae4919fd0fc79108bd286a7 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:32:57 +0800 Subject: [PATCH 13/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 57e18d033d7..95b6baae0f7 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ test: all # genesis test cd ${PWD}/cmd/geth; go test -test.run TestCustomGenesis # module test - $(GORUN) build/ci.go test ./consensus ./core ./eth ./miner ./node ./trie ./rollup + $(GORUN) build/ci.go test ./consensus ./core ./eth ./miner ./node ./trie ./rollup/... lint: ## Run linters. $(GORUN) build/ci.go lint