aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-18 07:12:51 +0800
committerobscuren <geffobscura@gmail.com>2014-12-18 07:12:51 +0800
commite6fdf0c9f7564b8b08cf428e03af66fc423adcc1 (patch)
tree14fafd42083a9a5d57005b614740294ae0525bef /core
parent52b54631a47dfa46742635be178f2f8d33dd9f41 (diff)
parent4dbdcaecb117d7e1fcaf0869f5d4602312552991 (diff)
downloaddexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar
dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.gz
dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.bz2
dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.lz
dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.xz
dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.zst
dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.zip
Merge branch 'develop' into poc8
Diffstat (limited to 'core')
-rw-r--r--core/chain_manager.go11
-rw-r--r--core/chain_manager_test.go18
-rw-r--r--core/execution.go34
3 files changed, 42 insertions, 21 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go
index f9fb3b3f8..a4ff5cb5c 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -152,6 +152,16 @@ func (bc *ChainManager) Reset() {
bc.TD = ethutil.BigD(ethutil.Config.Db.LastKnownTD())
}
+func (self *ChainManager) Export() []byte {
+ chainlogger.Infoln("exporting", self.CurrentBlock.Number, "blocks")
+
+ blocks := make(types.Blocks, int(self.CurrentBlock.Number.Int64())+1)
+ for block := self.CurrentBlock; block != nil; block = self.GetBlock(block.PrevHash) {
+ blocks[block.Number.Int64()] = block
+ }
+ return ethutil.Encode(blocks)
+}
+
func (bc *ChainManager) insert(block *types.Block) {
encodedBlock := block.RlpEncode()
ethutil.Config.Db.Put([]byte("LastBlock"), encodedBlock)
@@ -185,7 +195,6 @@ func (self *ChainManager) GetBlockHashesFromHash(hash []byte, max uint64) (chain
// XXX Could be optimised by using a different database which only holds hashes (i.e., linked list)
for i := uint64(0); i < max; i++ {
-
chain = append(chain, block.Hash())
if block.Number.Cmp(ethutil.Big0) <= 0 {
diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go
index 9a8bc9592..a84e3ff3b 100644
--- a/core/chain_manager_test.go
+++ b/core/chain_manager_test.go
@@ -1 +1,19 @@
package core
+
+import (
+ "fmt"
+ "path"
+ "testing"
+
+ "github.com/ethereum/go-ethereum/ethutil"
+)
+
+func TestChainInsertions(t *testing.T) {
+ c1, err := ethutil.ReadAllFile(path.Join("..", "_data", "chain1"))
+ if err != nil {
+ fmt.Println(err)
+ t.FailNow()
+ }
+ data1, _ := ethutil.Decode([]byte(c1), 0)
+ fmt.Println(data1)
+}
diff --git a/core/execution.go b/core/execution.go
index a464abc66..827e1ee0e 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -4,7 +4,6 @@ import (
"fmt"
"math/big"
- "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/vm"
)
@@ -36,38 +35,33 @@ func (self *Execution) exec(code, contextAddr []byte, caller vm.ClosureRef) (ret
env := self.vm.Env()
chainlogger.Debugf("pre state %x\n", env.State().Root())
+ if self.vm.Env().Depth() == vm.MaxCallDepth {
+ // Consume all gas (by not returning it) and return a depth error
+ return nil, vm.DepthError{}
+ }
+
from, to := env.State().GetStateObject(caller.Address()), env.State().GetOrNewStateObject(self.address)
// Skipping transfer is used on testing for the initial call
if !self.SkipTransfer {
err = env.Transfer(from, to, self.value)
+ if err != nil {
+ caller.ReturnGas(self.Gas, self.price)
+
+ err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
+ return
+ }
}
snapshot := env.State().Copy()
defer func() {
- if vm.IsDepthErr(err) || vm.IsOOGErr(err) {
+ if /*vm.IsDepthErr(err) ||*/ vm.IsOOGErr(err) {
env.State().Set(snapshot)
}
chainlogger.Debugf("post state %x\n", env.State().Root())
}()
- if err != nil {
- caller.ReturnGas(self.Gas, self.price)
-
- err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
- } else {
- self.object = to
- // Pre-compiled contracts (address.go) 1, 2 & 3.
- naddr := ethutil.BigD(contextAddr).Uint64()
- if p := vm.Precompiled[naddr]; p != nil {
- if self.Gas.Cmp(p.Gas(len(self.input))) >= 0 {
- ret = p.Call(self.input)
- self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
- self.vm.Endl()
- }
- } else {
- ret, err = self.vm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
- }
- }
+ self.object = to
+ ret, err = self.vm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
return
}