diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go index 3a9797946c..5c346e2963 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -595,9 +595,10 @@ func FuzzEthProtocolHandlers(f *testing.F) { } func TestGetPooledTransaction(t *testing.T) { - t.Run("blobTx", func(t *testing.T) { - testGetPooledTransaction(t, true) - }) + // bor: skip blobTx + // t.Run("blobTx", func(t *testing.T) { + // testGetPooledTransaction(t, true) + // }) t.Run("legacyTx", func(t *testing.T) { testGetPooledTransaction(t, false) }) @@ -643,7 +644,7 @@ func testGetPooledTransaction(t *testing.T, blobTx bool) { } } else { tx, err = types.SignTx( - types.NewTransaction(0, testAddr, big.NewInt(10_000), params.TxGas, big.NewInt(1_000_000_000), nil), + types.NewTransaction(0, testAddr, big.NewInt(10_000), params.TxGas, big.NewInt(25_000_000_000), nil), signer, testKey, ) diff --git a/eth/tracers/api.go b/eth/tracers/api.go index a19ac14f37..cc8700377f 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -1408,11 +1408,6 @@ func (api *API) traceTx(ctx context.Context, tx *types.Transaction, message *cor config.BorTx = newBoolPtr(false) } - _, err = core.ApplyTransactionWithEVM(message, new(core.GasPool).AddGas(message.GasLimit), statedb, vmctx.BlockNumber, txctx.BlockHash, tx, &usedGas, evm, context.Background()) - if err != nil { - return nil, fmt.Errorf("tracing failed: %w", err) - } - if *config.BorTx { callmsg := prepareCallMessage(*message) // nolint : contextcheck diff --git a/eth/tracers/internal/tracetest/supply_test.go b/eth/tracers/internal/tracetest/supply_test.go index 9580ff2dfb..6ef827d945 100644 --- a/eth/tracers/internal/tracetest/supply_test.go +++ b/eth/tracers/internal/tracetest/supply_test.go @@ -75,6 +75,8 @@ func TestSupplyOmittedFields(t *testing.T) { } ) + gspec.Config.TerminalTotalDifficulty = big.NewInt(0) + out, _, err := testSupplyTracer(t, gspec, func(b *core.BlockGen) { b.SetPoS() }) @@ -83,10 +85,8 @@ func TestSupplyOmittedFields(t *testing.T) { } expected := supplyInfo{ - Number: 0, - // kept the bor hash (commented) for reference. - // Hash: common.HexToHash("0xadeda0a83e337b6c073e3f0e9a17531a04009b397a9588c093b628f21b8bc5a3"), - Hash: common.HexToHash("0x3055fc27d6b4a08eb07033a0d1ee755a4b2988086f28a6189eac1b507525eeb1"), + Number: 0, + Hash: common.HexToHash("0xadeda0a83e337b6c073e3f0e9a17531a04009b397a9588c093b628f21b8bc5a3"), ParentHash: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), } actual := out[expected.Number] diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index a3aab0a3cf..8e524a71a4 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -2631,6 +2631,7 @@ func TestSimulateV1(t *testing.T) { } func TestSimulateV1ChainLinkage(t *testing.T) { + t.Skip("bor: skipping because we use total difficulty and beacon expects 0") var ( acc = newTestAccount() sender = acc.addr diff --git a/miner/worker_test.go b/miner/worker_test.go index 40f1f43bf0..7be14153f6 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -239,7 +239,9 @@ func newTestWorkerBackend(t TensingObject, chainConfig *params.ChainConfig, engi case *clique.Clique: gspec.ExtraData = make([]byte, 32+common.AddressLength+crypto.SignatureLength) copy(gspec.ExtraData[32:32+common.AddressLength], testBankAddress.Bytes()) - e.Authorize(testBankAddress) + e.Authorize(testBankAddress, func(account accounts.Account, s string, data []byte) ([]byte, error) { + return crypto.Sign(crypto.Keccak256(data), testBankKey) + }) case *ethash.Ethash: default: t.Fatalf("unexpected consensus engine type: %T", engine)