diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-10 18:04:11 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-10 18:04:11 +0800 |
| commit | 05c9351659e0482aeb29f80903286aefc671f0c5 (patch) | |
| tree | 56132f55a3f826ce852c5d053c7e8984932e7878 /javascript | |
| parent | 0db4a0e898d09ffa7b6b1289e9a334edc0001cfa (diff) | |
| parent | 80985f97da8174576ee227909035a364af2fd6c9 (diff) | |
| download | dexon-05c9351659e0482aeb29f80903286aefc671f0c5.tar dexon-05c9351659e0482aeb29f80903286aefc671f0c5.tar.gz dexon-05c9351659e0482aeb29f80903286aefc671f0c5.tar.bz2 dexon-05c9351659e0482aeb29f80903286aefc671f0c5.tar.lz dexon-05c9351659e0482aeb29f80903286aefc671f0c5.tar.xz dexon-05c9351659e0482aeb29f80903286aefc671f0c5.tar.zst dexon-05c9351659e0482aeb29f80903286aefc671f0c5.zip | |
Merge branch 'accounts-integration' of https://github.com/fjl/go-ethereum into fjl-accounts-integration
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 77e209d19..e07267c8f 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) |