Merge pull request #2271 from CortexFoundation/dev

OP push0 added if nd
CortexFoundation · Feb 20, 2025 · 6b6b607 · 6b6b607
2 parents d45daa7 + 60a3bc6
commit 6b6b607
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
@@ -75,6 +75,8 @@ func newMergeInstructionSet() JumpTable {
 		validateStack: makeStackFunc(0, 1),
 	}
 	enable5656(&instructionSet) // EIP-5656 (MCOPY opcode)
+	enable3855(&instructionSet) // PUSH0 instruction
+	//enable3860(&instructionSet) // Limit and meter initcode
 	return validate(instructionSet)
 }
 

diff --git a/trie/database.go b/trie/database.go
@@ -695,6 +695,7 @@ func (db *Database) commit(hash common.Hash, batch ctxcdb.Batch, uncacher *clean
 		return nil
 	}
 	var err error
+
 	node.forChildren(func(child common.Hash) {
 		if err == nil {
 			err = db.commit(child, batch, uncacher)