fix: a couple of CI issues

gballet · gballet · commit b993a43a47ca · 2023-09-25T17:20:42.000+02:00
diff --git a/core/types/block.go b/core/types/block.go
@@ -309,7 +309,6 @@ func CopyHeader(h *Header) *Header {
 	}
 	if h.ExecutionWitness != nil {
 		cpy.ExecutionWitness = h.ExecutionWitness.Copy()
-
 	}
 	return &cpy
 }
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
@@ -179,7 +179,7 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 			logged, pcCopy, gasCopy = false, pc, contract.Gas
 		}
 
-		if in.evm.chainRules.IsCancun && !contract.IsDeployment {
+		if in.evm.chainRules.IsPrague && !contract.IsDeployment {
 			// if the PC ends up in a new "chunk" of verkleized code, charge the
 			// associated costs.
 			contractAddr := contract.Address()

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,6 @@ func CopyHeader(h Header) Header {`
`309`	`309`	`}`
`310`	`310`	`if h.ExecutionWitness != nil {`
`311`	`311`	`cpy.ExecutionWitness = h.ExecutionWitness.Copy()`
`312`		`-`
`313`	`312`	`}`
`314`	`313`	`return &cpy`
`315`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (in EVMInterpreter) Run(contract Contract, input []byte, readOnly bool) (`
`179`	`179`	`logged, pcCopy, gasCopy = false, pc, contract.Gas`
`180`	`180`	`}`
`181`	`181`
`182`		`- if in.evm.chainRules.IsCancun && !contract.IsDeployment {`
	`182`	`+ if in.evm.chainRules.IsPrague && !contract.IsDeployment {`
`183`	`183`	`// if the PC ends up in a new "chunk" of verkleized code, charge the`
`184`	`184`	`// associated costs.`
`185`	`185`	`contractAddr := contract.Address()`