upstream beta-1

node-real · Jan 22, 2025 · 7a9481d · 7a9481d
1 parent 4746c16
commit 7a9481d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -101,7 +101,7 @@ func ExecuteBlockEphemerallyForBSC(
 	usedGas := new(uint64)
 	usedBlobGas := new(uint64)
 	gp := new(GasPool)
-	gp.AddGas(block.GasLimit()).AddBlobGas(chainConfig.GetMaxBlobGasPerBlock())
+	gp.AddGas(block.GasLimit()).AddBlobGas(chainConfig.GetMaxBlobGasPerBlock(block.Time()))
 
 	var (
 		rejectedTxs []*RejectedTx

diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -233,14 +233,12 @@ var PrecompiledContractsPragueForBSC = map[libcommon.Address]PrecompiledContract
 	libcommon.BytesToAddress([]byte{0x09}): &blake2F{},
 	libcommon.BytesToAddress([]byte{0x0a}): &pointEvaluation{},
 	libcommon.BytesToAddress([]byte{0x0b}): &bls12381G1Add{},
-	libcommon.BytesToAddress([]byte{0x0c}): &bls12381G1Mul{},
-	libcommon.BytesToAddress([]byte{0x0d}): &bls12381G1MultiExp{},
-	libcommon.BytesToAddress([]byte{0x0e}): &bls12381G2Add{},
-	libcommon.BytesToAddress([]byte{0x0f}): &bls12381G2Mul{},
-	libcommon.BytesToAddress([]byte{0x10}): &bls12381G2MultiExp{},
-	libcommon.BytesToAddress([]byte{0x11}): &bls12381Pairing{},
-	libcommon.BytesToAddress([]byte{0x12}): &bls12381MapFpToG1{},
-	libcommon.BytesToAddress([]byte{0x13}): &bls12381MapFp2ToG2{},
+	libcommon.BytesToAddress([]byte{0x0c}): &bls12381G1MultiExp{},
+	libcommon.BytesToAddress([]byte{0x0d}): &bls12381G2Add{},
+	libcommon.BytesToAddress([]byte{0x0e}): &bls12381G2MultiExp{},
+	libcommon.BytesToAddress([]byte{0x0f}): &bls12381Pairing{},
+	libcommon.BytesToAddress([]byte{0x10}): &bls12381MapFpToG1{},
+	libcommon.BytesToAddress([]byte{0x11}): &bls12381MapFp2ToG2{},
 
 	libcommon.BytesToAddress([]byte{100}): &tmHeaderValidate{},
 	libcommon.BytesToAddress([]byte{101}): &iavlMerkleProofValidatePlato{},

diff --git a/turbo/jsonrpc/trace_adhoc.go b/turbo/jsonrpc/trace_adhoc.go
@@ -1563,7 +1563,7 @@ func (api *TraceAPIImpl) doCall(ctx context.Context, dbtx kv.Tx, stateReader sta
 			stateSyncEvents,
 		)
 	} else {
-		ibs.SetTxContext(txIndex)
+		ibs.SetTxContext(txIndex, blockNumber)
 		txCtx := core.NewEVMTxContext(msg)
 		evm := vm.NewEVM(blockCtx, txCtx, ibs, chainConfig, vmConfig)
 		gp := new(core.GasPool).AddGas(msg.Gas()).AddBlobGas(msg.BlobGas())