Merge pull request #2271 from CortexFoundation/dev

ucwong · web-flow · commit 6b6b607d5f78 · 2025-02-20T10:30:24.000Z
OP push0 added if nd
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)

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ func newMergeInstructionSet() JumpTable {`
`75`	`75`	`validateStack: makeStackFunc(0, 1),`
`76`	`76`	`}`
`77`	`77`	`enable5656(&instructionSet) // EIP-5656 (MCOPY opcode)`
	`78`	`+ enable3855(&instructionSet) // PUSH0 instruction`
	`79`	`+ //enable3860(&instructionSet) // Limit and meter initcode`
`78`	`80`	`return validate(instructionSet)`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -695,6 +695,7 @@ func (db Database) commit(hash common.Hash, batch ctxcdb.Batch, uncacher clean`
`695`	`695`	`return nil`
`696`	`696`	`}`
`697`	`697`	`var err error`
	`698`	`+`
`698`	`699`	`node.forChildren(func(child common.Hash) {`
`699`	`700`	`if err == nil {`
`700`	`701`	`err = db.commit(child, batch, uncacher)`