diff options
author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-02-24 18:27:22 +0800 |
---|---|---|
committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-02-24 18:27:22 +0800 |
commit | 85f765a533b3be4fd4d44cd58b666adf6e011e17 (patch) | |
tree | 037b11c586b9b7726f41e321296c85da2d5a81b2 /xeth | |
parent | 114c3b4efe7f30ab7be0bec013210e7b4c3d08d7 (diff) | |
parent | 7c510109cdcd6251724df6c7705b27043c3168f8 (diff) | |
download | dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.tar dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.tar.gz dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.tar.bz2 dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.tar.lz dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.tar.xz dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.tar.zst dexon-85f765a533b3be4fd4d44cd58b666adf6e011e17.zip |
Merge remote-tracking branch 'upstream/develop' into evmjit
Diffstat (limited to 'xeth')
-rw-r--r-- | xeth/xeth.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 5907a8329..2985ce982 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -277,7 +277,7 @@ func (self *XEth) Transact(toStr, valueStr, gasStr, gasPriceStr, codeStr string) } var err error - state := self.eth.ChainManager().TransState() + state := self.eth.ChainManager().TxState() if balance := state.GetBalance(key.Address()); balance.Cmp(tx.Value()) < 0 { return "", fmt.Errorf("insufficient balance. balance=%v tx=%v", balance, tx.Value()) } @@ -289,10 +289,10 @@ func (self *XEth) Transact(toStr, valueStr, gasStr, gasPriceStr, codeStr string) //fmt.Printf("create tx: %x %v\n", tx.Hash()[:4], tx.Nonce()) // Do some pre processing for our "pre" events and hooks - block := self.chainManager.NewBlock(key.Address()) - coinbase := state.GetOrNewStateObject(key.Address()) - coinbase.SetGasPool(block.GasLimit()) - self.blockProcessor.ApplyTransactions(coinbase, state, block, types.Transactions{tx}, true) + //block := self.chainManager.NewBlock(key.Address()) + //coinbase := state.GetOrNewStateObject(key.Address()) + //coinbase.SetGasPool(block.GasLimit()) + //self.blockProcessor.ApplyTransactions(coinbase, state, block, types.Transactions{tx}, true) err = self.eth.TxPool().Add(tx) if err != nil { |