2014-10-31 06:30:08 -07:00
|
|
|
package xeth
|
|
|
|
|
|
|
|
/*
|
|
|
|
* eXtended ETHereum
|
|
|
|
*/
|
2014-08-04 07:25:53 -07:00
|
|
|
|
|
|
|
import (
|
2014-10-31 02:59:17 -07:00
|
|
|
"github.com/ethereum/go-ethereum/chain"
|
2014-11-18 07:58:22 -08:00
|
|
|
"github.com/ethereum/go-ethereum/chain/types"
|
2014-10-31 04:37:43 -07:00
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
2014-10-23 06:01:27 -07:00
|
|
|
"github.com/ethereum/go-ethereum/ethutil"
|
2014-10-31 04:56:05 -07:00
|
|
|
"github.com/ethereum/go-ethereum/logger"
|
2014-10-31 06:43:14 -07:00
|
|
|
"github.com/ethereum/go-ethereum/state"
|
2014-08-04 07:25:53 -07:00
|
|
|
)
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
var pipelogger = logger.NewLogger("XETH")
|
2014-08-04 07:25:53 -07:00
|
|
|
|
2014-08-05 02:10:24 -07:00
|
|
|
type VmVars struct {
|
2014-10-31 06:43:14 -07:00
|
|
|
State *state.State
|
2014-08-05 02:10:24 -07:00
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
type XEth struct {
|
2014-10-31 02:59:17 -07:00
|
|
|
obj chain.EthManager
|
2014-11-04 01:57:02 -08:00
|
|
|
blockManager *chain.BlockManager
|
2014-10-31 02:59:17 -07:00
|
|
|
blockChain *chain.ChainManager
|
2014-08-05 02:30:12 -07:00
|
|
|
world *World
|
2014-08-05 02:10:24 -07:00
|
|
|
|
|
|
|
Vm VmVars
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func New(obj chain.EthManager) *XEth {
|
|
|
|
pipe := &XEth{
|
2014-08-04 07:25:53 -07:00
|
|
|
obj: obj,
|
2014-11-04 01:57:02 -08:00
|
|
|
blockManager: obj.BlockManager(),
|
2014-10-20 02:53:11 -07:00
|
|
|
blockChain: obj.ChainManager(),
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
pipe.world = NewWorld(pipe)
|
|
|
|
|
|
|
|
return pipe
|
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) Balance(addr []byte) *ethutil.Value {
|
2014-08-04 07:25:53 -07:00
|
|
|
return ethutil.NewValue(self.World().safeGet(addr).Balance)
|
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) Nonce(addr []byte) uint64 {
|
2014-08-04 07:25:53 -07:00
|
|
|
return self.World().safeGet(addr).Nonce
|
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) Execute(addr []byte, data []byte, value, gas, price *ethutil.Value) ([]byte, error) {
|
2014-08-05 02:26:12 -07:00
|
|
|
return self.ExecuteObject(&Object{self.World().safeGet(addr)}, data, value, gas, price)
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) ExecuteObject(object *Object, data []byte, value, gas, price *ethutil.Value) ([]byte, error) {
|
2014-08-04 07:25:53 -07:00
|
|
|
var (
|
2014-10-31 06:43:14 -07:00
|
|
|
initiator = state.NewStateObject(self.obj.KeyManager().KeyPair().Address())
|
2014-09-22 05:51:21 -07:00
|
|
|
block = self.blockChain.CurrentBlock
|
2014-08-04 07:25:53 -07:00
|
|
|
)
|
2014-09-22 05:51:21 -07:00
|
|
|
|
|
|
|
self.Vm.State = self.World().State().Copy()
|
2014-08-04 07:25:53 -07:00
|
|
|
|
2014-12-03 08:22:26 -08:00
|
|
|
vmenv := NewEnv(self.Vm.State, block, value.BigInt(), initiator.Address())
|
|
|
|
return vmenv.Call(initiator, object.Address(), data, gas.BigInt(), price.BigInt(), value.BigInt())
|
|
|
|
/*
|
|
|
|
evm := vm.New(, vm.Type(ethutil.Config.VmType))
|
2014-08-04 07:25:53 -07:00
|
|
|
|
2014-12-03 08:22:26 -08:00
|
|
|
msg := vm.NewExecution(evm, object.Address(), data, gas.BigInt(), price.BigInt(), value.BigInt())
|
|
|
|
ret, err := msg.Exec(object.Address(), initiator)
|
2014-09-22 05:51:21 -07:00
|
|
|
|
2014-12-03 08:22:26 -08:00
|
|
|
fmt.Println("returned from call", ret, err)
|
2014-08-04 07:25:53 -07:00
|
|
|
|
2014-12-03 08:22:26 -08:00
|
|
|
return ret, err
|
|
|
|
*/
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
|
2014-11-18 07:58:22 -08:00
|
|
|
func (self *XEth) Block(hash []byte) *types.Block {
|
2014-08-04 07:25:53 -07:00
|
|
|
return self.blockChain.GetBlock(hash)
|
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) Storage(addr, storageAddr []byte) *ethutil.Value {
|
2014-08-04 07:25:53 -07:00
|
|
|
return self.World().safeGet(addr).GetStorage(ethutil.BigD(storageAddr))
|
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) ToAddress(priv []byte) []byte {
|
2014-10-31 04:37:43 -07:00
|
|
|
pair, err := crypto.NewKeyPairFromSec(priv)
|
2014-08-04 07:25:53 -07:00
|
|
|
if err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return pair.Address()
|
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) Exists(addr []byte) bool {
|
2014-08-04 07:34:55 -07:00
|
|
|
return self.World().Get(addr) != nil
|
|
|
|
}
|
|
|
|
|
2014-12-03 05:05:19 -08:00
|
|
|
func (self *XEth) TransactString(key *crypto.KeyPair, rec string, value, gas, price *ethutil.Value, data []byte) (*types.Transaction, error) {
|
2014-08-04 07:25:53 -07:00
|
|
|
// Check if an address is stored by this address
|
|
|
|
var hash []byte
|
|
|
|
addr := self.World().Config().Get("NameReg").StorageString(rec).Bytes()
|
|
|
|
if len(addr) > 0 {
|
|
|
|
hash = addr
|
|
|
|
} else if ethutil.IsHex(rec) {
|
|
|
|
hash = ethutil.Hex2Bytes(rec[2:])
|
|
|
|
} else {
|
|
|
|
hash = ethutil.Hex2Bytes(rec)
|
|
|
|
}
|
|
|
|
|
|
|
|
return self.Transact(key, hash, value, gas, price, data)
|
|
|
|
}
|
|
|
|
|
2014-12-03 05:05:19 -08:00
|
|
|
func (self *XEth) Transact(key *crypto.KeyPair, to []byte, value, gas, price *ethutil.Value, data []byte) (*types.Transaction, error) {
|
2014-08-04 07:25:53 -07:00
|
|
|
var hash []byte
|
|
|
|
var contractCreation bool
|
2014-12-03 05:05:19 -08:00
|
|
|
if types.IsContractAddr(to) {
|
2014-08-04 07:25:53 -07:00
|
|
|
contractCreation = true
|
2014-12-01 11:18:09 -08:00
|
|
|
} else {
|
|
|
|
// Check if an address is stored by this address
|
|
|
|
addr := self.World().Config().Get("NameReg").Storage(to).Bytes()
|
|
|
|
if len(addr) > 0 {
|
|
|
|
hash = addr
|
|
|
|
} else {
|
|
|
|
hash = to
|
|
|
|
}
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
|
2014-11-18 07:58:22 -08:00
|
|
|
var tx *types.Transaction
|
2014-08-04 07:25:53 -07:00
|
|
|
if contractCreation {
|
2014-12-03 05:05:19 -08:00
|
|
|
tx = types.NewContractCreationTx(value.BigInt(), gas.BigInt(), price.BigInt(), data)
|
2014-08-04 07:25:53 -07:00
|
|
|
} else {
|
2014-12-03 05:05:19 -08:00
|
|
|
tx = types.NewTransactionMessage(hash, value.BigInt(), gas.BigInt(), price.BigInt(), data)
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
|
2014-12-01 11:18:09 -08:00
|
|
|
state := self.blockManager.TransState()
|
|
|
|
nonce := state.GetNonce(key.Address())
|
2014-08-04 07:25:53 -07:00
|
|
|
|
2014-12-01 11:18:09 -08:00
|
|
|
tx.Nonce = nonce
|
2014-08-04 07:25:53 -07:00
|
|
|
tx.Sign(key.PrivateKey)
|
2014-12-01 11:18:09 -08:00
|
|
|
err := self.obj.TxPool().Add(tx)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
state.SetNonce(key.Address(), nonce+1)
|
2014-08-04 07:25:53 -07:00
|
|
|
|
|
|
|
if contractCreation {
|
2014-10-02 08:03:15 -07:00
|
|
|
addr := tx.CreationAddress(self.World().State())
|
2014-10-31 04:56:05 -07:00
|
|
|
pipelogger.Infof("Contract addr %x\n", addr)
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
|
|
|
|
2014-12-01 11:18:09 -08:00
|
|
|
return tx, nil
|
|
|
|
|
|
|
|
//acc := self.blockManager.TransState().GetOrNewStateObject(key.Address())
|
|
|
|
//self.obj.TxPool().QueueTransaction(tx)
|
|
|
|
|
|
|
|
//acc.Nonce += 1
|
|
|
|
//self.blockManager.TransState().UpdateStateObject(acc)
|
|
|
|
|
2014-08-04 07:25:53 -07:00
|
|
|
}
|
2014-08-17 03:42:02 -07:00
|
|
|
|
2014-11-18 07:58:22 -08:00
|
|
|
func (self *XEth) PushTx(tx *types.Transaction) ([]byte, error) {
|
2014-12-01 11:18:09 -08:00
|
|
|
err := self.obj.TxPool().Add(tx)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2014-09-22 05:51:21 -07:00
|
|
|
if tx.Recipient == nil {
|
2014-10-02 08:03:15 -07:00
|
|
|
addr := tx.CreationAddress(self.World().State())
|
2014-10-31 04:56:05 -07:00
|
|
|
pipelogger.Infof("Contract addr %x\n", addr)
|
2014-10-02 08:03:15 -07:00
|
|
|
return addr, nil
|
2014-09-22 05:51:21 -07:00
|
|
|
}
|
|
|
|
return tx.Hash(), nil
|
2014-09-06 13:51:13 -07:00
|
|
|
}
|
|
|
|
|
2014-10-31 06:30:08 -07:00
|
|
|
func (self *XEth) CompileMutan(code string) ([]byte, error) {
|
2014-08-17 03:42:02 -07:00
|
|
|
data, err := ethutil.Compile(code, false)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return data, nil
|
|
|
|
}
|