diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-11 11:25:32 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-11 11:25:32 +0800 |
| commit | 6bca40274f2056b8516543d8cc1600224789b77f (patch) | |
| tree | f74e9999e5892784dfd134bbc2803a76f0c176ca /javascript | |
| parent | 9ce5229ddfccfccf1215e44477b665de031e4e1e (diff) | |
| parent | 074ee19fe51a025a00bc3814748b268ae74c046c (diff) | |
| download | go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.tar go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.tar.gz go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.tar.bz2 go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.tar.lz go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.tar.xz go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.tar.zst go-tangerine-6bca40274f2056b8516543d8cc1600224789b77f.zip | |
Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/javascript_runtime.go | 1 | ||||
| -rw-r--r-- | javascript/types.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index 36b14a057..0a137f72a 100644 --- a/javascript/javascript_runtime.go +++ b/javascript/javascript_runtime.go @@ -6,6 +6,7 @@ import ( "os" "path" "path/filepath" + "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/xeth" "github.com/obscuren/otto" diff --git a/javascript/types.go b/javascript/types.go index 3921f4843..5f47c1735 100644 --- a/javascript/types.go +++ b/javascript/types.go @@ -70,8 +70,8 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value { return self.toVal(&JSStateObject{self.XEth.State().SafeGet(addr), self}) } -func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value { - r, err := self.XEth.Transact(recipient, valueStr, gasStr, gasPriceStr, dataStr) +func (self *JSEthereum) Transact(fromStr, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value { + r, err := self.XEth.Transact(fromStr, recipient, valueStr, gasStr, gasPriceStr, dataStr) if err != nil { fmt.Println(err) |