diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-11 05:42:03 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-11 05:42:03 +0800 |
| commit | 73171d18b9ecf7af7c194c0fe3030d3bfbb833e3 (patch) | |
| tree | c2e9e274c64f431f03b9a6b8b3de22585c016027 /javascript | |
| parent | 0542df941f57a75fa7b699089db1d9ae40e4ff71 (diff) | |
| parent | 269cfbb8ace76ddc1f50dbd5b218c499308c8a5c (diff) | |
| download | dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.tar dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.tar.gz dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.tar.bz2 dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.tar.lz dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.tar.xz dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.tar.zst dexon-73171d18b9ecf7af7c194c0fe3030d3bfbb833e3.zip | |
Merge pull request #447 from fjl/accounts-integration
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) |