diff --git a/rpc/api.go b/rpc/api.go index 943d50119d02f6ee37c999bdafc5a29dd84ab6a4..e825accfd8af0e8b67b448d6503fdc54209214c7 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 bb89615cf472d81f56626281ffeb04a7c7e9925f..e1e7381f5bc030ba98b03050dc4d1793ee38bc53 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 ad9a35fa2ce5ebfe8803ad74469edd0e7043b5f7..70fb1828917e3223d5ec9d3ecf1c5fe581db4e72 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 65f0f604300d9ceef20bbadbd8af6741b59bac8c..aa7d205498bc82279ac223f3b9880ee68b589c6a 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 d2f9920846d43ab70b3fe2bde5c84f0a198fb6e4..c64ae71e32cf930ea7e04b39920d12554fc148b2 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 }