aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-06 18:44:22 +0800
committerobscuren <geffobscura@gmail.com>2015-01-06 18:44:22 +0800
commita26aecdfdb0223b2fb54ca2d40adb2b531512d42 (patch)
tree4bc8e01cbd36d831734be23d9433ea7446ea761e /cmd/utils
parent47e6b2cef8ee0164e82d119c6a9359b55259d645 (diff)
downloadgo-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar
go-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.gz
go-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.bz2
go-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.lz
go-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.xz
go-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.zst
go-tangerine-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.zip
Updated WS API. Fixes #219. Closes #220
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/websockets.go70
1 files changed, 35 insertions, 35 deletions
diff --git a/cmd/utils/websockets.go b/cmd/utils/websockets.go
index e4bc1b185..ef9de192b 100644
--- a/cmd/utils/websockets.go
+++ b/cmd/utils/websockets.go
@@ -33,73 +33,73 @@ func (self *WebSocketServer) Serv() {
data := ethutil.NewValue(msg.Args)
bcode, err := ethutil.Compile(data.Get(0).Str(), false)
if err != nil {
- c.Write(args(nil, err.Error()), msg.Seed)
+ c.Write(args(nil, err.Error()), msg.Id)
}
code := ethutil.Bytes2Hex(bcode)
- c.Write(args(code, nil), msg.Seed)
- case "getBlockByNumber":
+ c.Write(args(code, nil), msg.Id)
+ case "eth_blockByNumber":
args := msg.Arguments()
block := pipe.BlockByNumber(int32(args.Get(0).Uint()))
- c.Write(block, msg.Seed)
+ c.Write(block, msg.Id)
- case "getKey":
- c.Write(pipe.Key().PrivateKey, msg.Seed)
- case "transact":
+ case "eth_blockByHash":
+ args := msg.Arguments()
+
+ c.Write(pipe.BlockByHash(args.Get(0).Str()), msg.Id)
+
+ case "eth_transact":
if mp, ok := msg.Args[0].(map[string]interface{}); ok {
object := mapToTxParams(mp)
c.Write(
- args(pipe.Transact(object["from"], object["to"], object["value"], object["gas"], object["gasPrice"], object["data"])),
- msg.Seed,
+ args(pipe.Transact(pipe.Key().PrivateKey, object["to"], object["value"], object["gas"], object["gasPrice"], object["data"])),
+ msg.Id,
)
}
- case "getCoinBase":
- c.Write(pipe.CoinBase(), msg.Seed)
+ case "eth_gasPrice":
+ c.Write("10000000000000", msg.Id)
+ case "eth_coinbase":
+ c.Write(pipe.CoinBase(), msg.Id)
- case "getIsListening":
- c.Write(pipe.IsListening(), msg.Seed)
+ case "eth_listening":
+ c.Write(pipe.IsListening(), msg.Id)
- case "getIsMining":
- c.Write(pipe.IsMining(), msg.Seed)
-
- case "getPeerCoint":
- c.Write(pipe.PeerCount(), msg.Seed)
-
- case "getCountAt":
- args := msg.Arguments()
+ case "eth_mining":
+ c.Write(pipe.IsMining(), msg.Id)
- c.Write(pipe.TxCountAt(args.Get(0).Str()), msg.Seed)
+ case "eth_peerCount":
+ c.Write(pipe.PeerCount(), msg.Id)
- case "getCodeAt":
+ case "eth_countAt":
args := msg.Arguments()
- c.Write(len(pipe.CodeAt(args.Get(0).Str())), msg.Seed)
+ c.Write(pipe.TxCountAt(args.Get(0).Str()), msg.Id)
- case "getBlockByHash":
+ case "eth_codeAt":
args := msg.Arguments()
- c.Write(pipe.BlockByHash(args.Get(0).Str()), msg.Seed)
+ c.Write(len(pipe.CodeAt(args.Get(0).Str())), msg.Id)
- case "getStorageAt":
+ case "eth_storageAt":
args := msg.Arguments()
- c.Write(pipe.StorageAt(args.Get(0).Str(), args.Get(1).Str()), msg.Seed)
+ c.Write(pipe.StorageAt(args.Get(0).Str(), args.Get(1).Str()), msg.Id)
- case "getBalanceAt":
+ case "eth_balanceAt":
args := msg.Arguments()
- c.Write(pipe.BalanceAt(args.Get(0).Str()), msg.Seed)
+ c.Write(pipe.BalanceAt(args.Get(0).Str()), msg.Id)
- case "getSecretToAddress":
+ case "eth_secretToAddress":
args := msg.Arguments()
- c.Write(pipe.SecretToAddress(args.Get(0).Str()), msg.Seed)
+ c.Write(pipe.SecretToAddress(args.Get(0).Str()), msg.Id)
- case "newFilter":
- case "newFilterString":
- case "messages":
+ case "eth_newFilter":
+ case "eth_newFilterString":
+ case "eth_messages":
// TODO
}