diff options
| author | zsfelfoldi <zsfelfoldi@gmail.com> | 2015-04-08 19:22:31 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-04-20 03:57:49 +0800 |
| commit | c4b7d4d3f77160fba1ab3d8366cb2657a90e2282 (patch) | |
| tree | 34f15cad05c00f2ab60f8e0084a1a869030b9a13 /cmd/geth | |
| parent | b46e15217131e4ebe64e1ee55594c3ab0620395c (diff) | |
| download | dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.tar dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.tar.gz dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.tar.bz2 dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.tar.lz dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.tar.xz dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.tar.zst dexon-c4b7d4d3f77160fba1ab3d8366cb2657a90e2282.zip | |
NatSpec cli option, resolver tests passing
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/js.go | 12 | ||||
| -rw-r--r-- | cmd/geth/main.go | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index d5deea93f..6e5a6f1c7 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -143,10 +143,14 @@ var net = web3.net; var ds, _ = docserver.New(utils.JSpathFlag.String()) func (self *jsre) ConfirmTransaction(tx string) bool { - notice := natspec.GetNotice(self.xeth, tx, ds) - fmt.Println(notice) - answer, _ := self.Prompt("Confirm Transaction\n[y/n] ") - return strings.HasPrefix(strings.Trim(answer, " "), "y") + if self.ethereum.NatSpec { + notice := natspec.GetNotice(self.xeth, tx, ds) + fmt.Println(notice) + answer, _ := self.Prompt("Confirm Transaction\n[y/n] ") + return strings.HasPrefix(strings.Trim(answer, " "), "y") + } else { + return true + } } func (self *jsre) UnlockAccount(addr []byte) bool { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index dab167bbb..5b523da3e 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -231,6 +231,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.MinerThreadsFlag, utils.MiningEnabledFlag, utils.NATFlag, + utils.NatspecEnabledFlag, utils.NodeKeyFileFlag, utils.NodeKeyHexFlag, utils.RPCEnabledFlag, |