forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'arpit/pos-1731' of https://github.com/maticnetwork/bor into arpit/pos-1731

Browse source
This commit is contained in:
Pratik Patil 2023-11-09 22:05:03 +05:30
commit b889327a3a
No known key found for this signature in database
GPG key ID: D883140B4FA928F6
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/vm/eips.go
View file

@ -294,16 +294,16 @@ func opBlobHash(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([
return nil, nil return nil, nil
} }
// enable4844 applies EIP-4844 (DATAHASH opcode) // // enable4844 applies EIP-4844 (DATAHASH opcode)
func enable4844(jt *JumpTable) { // func enable4844(jt *JumpTable) {
// New opcode // // New opcode
jt[BLOBHASH] = &operation{ // jt[BLOBHASH] = &operation{
execute: opBlobHash, // execute: opBlobHash,
constantGas: GasFastestStep, // constantGas: GasFastestStep,
minStack: minStack(1, 1), // minStack: minStack(1, 1),
maxStack: maxStack(1, 1), // maxStack: maxStack(1, 1),
} // }
} // }
// enable6780 applies EIP-6780 (deactivate SELFDESTRUCT) // enable6780 applies EIP-6780 (deactivate SELFDESTRUCT)
func enable6780(jt *JumpTable) { func enable6780(jt *JumpTable) {

3
core/vm/jump_table.go
View file

@ -83,7 +83,8 @@ func validate(jt JumpTable) JumpTable {
func newCancunInstructionSet() JumpTable { func newCancunInstructionSet() JumpTable {
instructionSet := newShanghaiInstructionSet() instructionSet := newShanghaiInstructionSet()
enable4844(&instructionSet) // EIP-4844 (DATAHASH opcode) // Disabled in bor
// enable4844(&instructionSet) // EIP-4844 (DATAHASH opcode)
enable1153(&instructionSet) // EIP-1153 "Transient Storage" enable1153(&instructionSet) // EIP-1153 "Transient Storage"
enable5656(&instructionSet) // EIP-5656 (MCOPY opcode) enable5656(&instructionSet) // EIP-5656 (MCOPY opcode)
enable6780(&instructionSet) // EIP-6780 SELFDESTRUCT only in same transaction enable6780(&instructionSet) // EIP-6780 SELFDESTRUCT only in same transaction