aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilentCicero <silentcicero@outlook.com>2015-06-17 00:28:10 +0800
committerSilentCicero <silentcicero@outlook.com>2015-06-17 00:28:10 +0800
commit7ec8c257ffd90ba4b63e5419ac9b9011af79be07 (patch)
treeaaa41e65927d3d53b39d85ee115ec5b91bb94824
parente952bb65e7f74dc023a983415821b3522cc30746 (diff)
downloaddexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.tar
dexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.tar.gz
dexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.tar.bz2
dexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.tar.lz
dexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.tar.xz
dexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.tar.zst
dexon-7ec8c257ffd90ba4b63e5419ac9b9011af79be07.zip
New DataArgs and eth_sendRawTransaction
-rw-r--r--rpc/api.go2
-rw-r--r--rpc/api/eth.go2
-rw-r--r--rpc/api/eth_args.go29
-rw-r--r--rpc/args.go29
-rw-r--r--xeth/xeth.go5
5 files changed, 64 insertions, 3 deletions
diff --git a/rpc/api.go b/rpc/api.go
index 943d50119..e825accfd 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -171,7 +171,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
*reply = v
case "eth_sendRawTransaction":
- args := new(NewSigArgs)
+ args := new(NewDataArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index bb89615cf..e1e7381f5 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -250,7 +250,7 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) {
func (self *ethApi) PushTx(req *shared.Request) (interface{}, error) {
- args := new(NewSigArgs)
+ args := new(NewDataArgs)
if err := self.codec.Decode(req.Params, &args); err != nil {
return nil, shared.NewDecodeParamError(err.Error())
}
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index ad9a35fa2..70fb18289 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -226,6 +226,35 @@ func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
return nil
}
+type NewDataArgs struct {
+ Data string
+}
+
+func (args *NewDataArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+
+ if err := json.Unmarshal(b, &obj); err != nil {
+ return shared.NewDecodeParamError(err.Error())
+ }
+
+ // Check for sufficient params
+ if len(obj) < 1 {
+ return shared.NewInsufficientParamsError(len(obj), 1)
+ }
+
+ data, ok := obj[0].(string)
+ if !ok {
+ return shared.NewInvalidTypeError("data", "not a string")
+ }
+ args.Data = data
+
+ if len(args.Data) == 0 {
+ return shared.NewValidationError("data", "is required")
+ }
+
+ return nil
+}
+
type NewSigArgs struct {
From string
Data string
diff --git a/rpc/args.go b/rpc/args.go
index 65f0f6043..aa7d20549 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -154,6 +154,35 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
return nil
}
+type NewDataArgs struct {
+ Data string
+}
+
+func (args *NewDataArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+
+ if err := json.Unmarshal(b, &obj); err != nil {
+ return NewDecodeParamError(err.Error())
+ }
+
+ // Check for sufficient params
+ if len(obj) < 1 {
+ return NewInsufficientParamsError(len(obj), 1)
+ }
+
+ data, ok := obj[0].(string)
+ if !ok {
+ return NewInvalidTypeError("data", "not a string")
+ }
+ args.Data = data
+
+ if len(args.Data) == 0 {
+ return NewValidationError("data", "is required")
+ }
+
+ return nil
+}
+
type NewTxArgs struct {
From string
To string
diff --git a/xeth/xeth.go b/xeth/xeth.go
index d2f992084..c64ae71e3 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -787,6 +787,9 @@ func (self *XEth) FromNumber(str string) string {
func (self *XEth) PushTx(encodedTx string) (string, error) {
tx := types.NewTransactionFromBytes(common.FromHex(encodedTx))
+
+ glog.V(logger.Info).Infof("Tx(%x) gas: %x\n", tx.Hash(), tx.Gas())
+
err := self.backend.TxPool().Add(tx)
if err != nil {
return "", err
@@ -965,7 +968,7 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
return core.AddressFromMessage(tx).Hex(), nil
} else {
- glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To())
+ glog.V(logger.Info).Infof("YEYEYE!! Tx(%x) to: %x\n, gas: %x", tx.Hash(), tx.To(), tx.Gas())
}
return tx.Hash().Hex(), nil
}