From e0b6091d7ef709902f534c1a4b57151f0171e03c Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 24 Mar 2014 13:20:34 +0100
Subject: Test fixes and removed old code. Added VM gas fees

---
 ethchain/vm.go | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

(limited to 'ethchain/vm.go')

diff --git a/ethchain/vm.go b/ethchain/vm.go
index 126592b25..9b6807925 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -10,6 +10,17 @@ import (
 	"math/big"
 )
 
+var (
+	GasStep    = big.NewInt(1)
+	GasSha     = big.NewInt(20)
+	GasSLoad   = big.NewInt(20)
+	GasSStore  = big.NewInt(100)
+	GasBalance = big.NewInt(20)
+	GasCreate  = big.NewInt(100)
+	GasCall    = big.NewInt(20)
+	GasMemory  = big.NewInt(1)
+)
+
 type Vm struct {
 	txPool *TxPool
 	// Stack for processing contracts
@@ -70,10 +81,41 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
 		}
 
 		// TODO Get each instruction cost properly
-		fee := new(big.Int)
-		fee.Add(fee, big.NewInt(1000))
+		gas := new(big.Int)
+		useGas := func(amount *big.Int) {
+			gas.Add(gas, amount)
+		}
+
+		switch op {
+		case oSHA3:
+			useGas(GasSha)
+		case oSLOAD:
+			useGas(GasSLoad)
+		case oSSTORE:
+			var mult *big.Int
+			y, x := stack.Peekn()
+			val := closure.GetMem(x)
+			if val.IsEmpty() && len(y.Bytes()) > 0 {
+				mult = ethutil.Big2
+			} else if !val.IsEmpty() && len(y.Bytes()) == 0 {
+				mult = ethutil.Big0
+			} else {
+				mult = ethutil.Big1
+			}
+			useGas(base.Mul(mult, GasSStore))
+		case oBALANCE:
+			useGas(GasBalance)
+		case oCREATE:
+			useGas(GasCreate)
+		case oCALL:
+			useGas(GasCall)
+		case oMLOAD, oMSIZE, oMSTORE8, oMSTORE:
+			useGas(GasMemory)
+		default:
+			useGas(GasStep)
+		}
 
-		if closure.Gas.Cmp(fee) < 0 {
+		if closure.Gas.Cmp(gas) < 0 {
 			return closure.Return(nil)
 		}
 
-- 
cgit v1.2.3


From 43cad6901620ca077e43f195cc5ae4d1c8edb2d0 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 27 Mar 2014 15:42:39 +0100
Subject: Reworked transaction constructors

---
 ethchain/vm.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ethchain/vm.go')

diff --git a/ethchain/vm.go b/ethchain/vm.go
index 9b6807925..aefc8ff0c 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -5,7 +5,6 @@ import (
 	_ "fmt"
 	"github.com/ethereum/eth-go/ethutil"
 	_ "github.com/obscuren/secp256k1-go"
-	"log"
 	_ "math"
 	"math/big"
 )
@@ -359,6 +358,7 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
 	}
 }
 
+/*
 func makeInlineTx(addr []byte, value, from, length *big.Int, contract *Contract, state *State) {
 	ethutil.Config.Log.Debugf(" => creating inline tx %x %v %v %v", addr, value, from, length)
 	j := int64(0)
@@ -395,3 +395,4 @@ func contractMemory(state *State, contractAddr []byte, memAddr *big.Int) *big.In
 
 	return decoder.BigInt()
 }
+*/
-- 
cgit v1.2.3


From 205e33bc831bb44f41dc899ae41bbfe0e44ddc5d Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 30 Mar 2014 18:55:51 +0200
Subject: Fixed bug in stack to expand beyond expectations. Fixed EQ and NOT
 opcode

---
 ethchain/vm.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'ethchain/vm.go')

diff --git a/ethchain/vm.go b/ethchain/vm.go
index aefc8ff0c..18b7fe607 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -2,7 +2,7 @@ package ethchain
 
 import (
 	_ "bytes"
-	_ "fmt"
+	"fmt"
 	"github.com/ethereum/eth-go/ethutil"
 	_ "github.com/obscuren/secp256k1-go"
 	_ "math"
@@ -213,10 +213,17 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
 			} else {
 				stack.Push(ethutil.BigFalse)
 			}
-		case oNOT:
+		case oEQ:
 			x, y := stack.Popn()
-			// x != y
-			if x.Cmp(y) != 0 {
+			// x == y
+			if x.Cmp(y) == 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case oNOT:
+			x := stack.Pop()
+			if x.Cmp(ethutil.BigFalse) == 0 {
 				stack.Push(ethutil.BigTrue)
 			} else {
 				stack.Push(ethutil.BigFalse)
@@ -300,8 +307,8 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
 		case oJUMP:
 			pc = stack.Pop()
 		case oJUMPI:
-			pos, cond := stack.Popn()
-			if cond.Cmp(big.NewInt(0)) > 0 {
+			cond, pos := stack.Popn()
+			if cond.Cmp(ethutil.BigTrue) == 0 {
 				pc = pos
 			}
 		case oPC:
@@ -314,6 +321,7 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
 			retSize, retOffset := stack.Popn()
 			// Pop input size and offset
 			inSize, inOffset := stack.Popn()
+			fmt.Println(inSize, inOffset)
 			// Get the arguments from the memory
 			args := mem.Get(inOffset.Int64(), inSize.Int64())
 			// Pop gas and value of the stack.
-- 
cgit v1.2.3


From 7277c420479239fbea78417e42c43ee0162c2728 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 31 Mar 2014 01:03:28 +0200
Subject: Fixed some state issues

---
 ethchain/vm.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ethchain/vm.go')

diff --git a/ethchain/vm.go b/ethchain/vm.go
index 18b7fe607..98aaa603a 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -115,6 +115,8 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
 		}
 
 		if closure.Gas.Cmp(gas) < 0 {
+			ethutil.Config.Log.Debugln("Insufficient gas", closure.Gas, gas)
+
 			return closure.Return(nil)
 		}
 
-- 
cgit v1.2.3