diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
| commit | 8e24378cc1acb074b56de75bf0baf6feb7927677 (patch) | |
| tree | 71f866652de6b45da5ad4403b88f5def9a684e36 /cmd/geth/js.go | |
| parent | 7d69679935ff8c04aebb60f27074f08c5e84ac95 (diff) | |
| parent | 8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff) | |
| download | go-tangerine-0.9.20.tar go-tangerine-0.9.20.tar.gz go-tangerine-0.9.20.tar.bz2 go-tangerine-0.9.20.tar.lz go-tangerine-0.9.20.tar.xz go-tangerine-0.9.20.tar.zst go-tangerine-0.9.20.zip | |
Merge branch 'release/0.9.20'v0.9.20
Diffstat (limited to 'cmd/geth/js.go')
| -rw-r--r-- | cmd/geth/js.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 9b0ab0a1b..4ddb3bd9c 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -22,10 +22,11 @@ import ( "fmt" "math/big" "os" - "path" + "path/filepath" "strings" "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/docserver" "github.com/ethereum/go-ethereum/common/natspec" "github.com/ethereum/go-ethereum/eth" @@ -164,7 +165,7 @@ func (self *jsre) UnlockAccount(addr []byte) bool { return false } // TODO: allow retry - if err := self.ethereum.AccountManager().Unlock(addr, pass); err != nil { + if err := self.ethereum.AccountManager().Unlock(common.BytesToAddress(addr), pass); err != nil { return false } else { fmt.Println("Account is now unlocked for this session.") @@ -209,7 +210,7 @@ func (self *jsre) interactive() { } func (self *jsre) withHistory(op func(*os.File)) { - hist, err := os.OpenFile(path.Join(self.ethereum.DataDir, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm) + hist, err := os.OpenFile(filepath.Join(self.ethereum.DataDir, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm) if err != nil { fmt.Printf("unable to open history file: %v\n", err) return |