Merge pull request #5 from quilt/paygas-mode

Make PAYGAS an invalid opcode in most cases
lightclient · May 27, 2020 · 0d45538 · 0d45538
2 parents bfe712a + bd81e01
commit 0d45538
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 12 deletions.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -903,7 +903,12 @@ func makeLog(size int) executionFunc {
 }
 
 func opPaygas(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]byte, error) {
-	interpreter.evm.snapshots[len(interpreter.evm.snapshots)-1] = interpreter.evm.StateDB.Snapshot()
+
+	// TODO: Store the popped value
+	if interpreter.paygasMode != PaygasNoOp {
+		interpreter.evm.snapshots[len(interpreter.evm.snapshots)-1] = interpreter.evm.StateDB.Snapshot()
+		interpreter.paygasMode = PaygasNoOp
+	}
 	interpreter.intPool.put(callContext.stack.pop())
 	return nil, nil
 }

diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
@@ -106,7 +106,7 @@ func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter {
 		var jt JumpTable
 		switch {
 		case evm.chainRules.IsAccountAbstraction:
-			jt = accountAbstractionInstructionSet
+			jt = newAccountAbstractionInstructionSet(cfg.PaygasMode)
 		case evm.chainRules.IsIstanbul:
 			jt = istanbulInstructionSet
 		case evm.chainRules.IsConstantinople:
@@ -232,6 +232,9 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 		if !operation.valid {
 			return nil, &ErrInvalidOpCode{opcode: op}
 		}
+		if in.paygasMode != PaygasNoOp && operation.internal {
+			return nil, &ErrInvalidOpCode{opcode: op}
+		}
 		// Validate stack
 		if sLen := stack.len(); sLen < operation.minStack {
 			return nil, &ErrStackUnderflow{stackLen: sLen, required: operation.minStack}