Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
294b4374
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
294b4374
编写于
10月 14, 2014
作者:
O
obscuren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
New VM
上级
03e082d4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
26 addition
and
8 deletion
+26
-8
ethereum/flags.go
ethereum/flags.go
+8
-0
ethereum/main.go
ethereum/main.go
+1
-1
mist/debugger.go
mist/debugger.go
+3
-4
mist/flags.go
mist/flags.go
+8
-0
mist/main.go
mist/main.go
+1
-1
utils/cmd.go
utils/cmd.go
+5
-2
未找到文件。
ethereum/flags.go
浏览文件 @
294b4374
...
@@ -3,11 +3,13 @@ package main
...
@@ -3,11 +3,13 @@ package main
import
(
import
(
"flag"
"flag"
"fmt"
"fmt"
"log"
"os"
"os"
"os/user"
"os/user"
"path"
"path"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethvm"
)
)
var
(
var
(
...
@@ -37,6 +39,7 @@ var (
...
@@ -37,6 +39,7 @@ var (
Dump
bool
Dump
bool
DumpHash
string
DumpHash
string
DumpNumber
int
DumpNumber
int
VmType
int
)
)
// flags specific to cli client
// flags specific to cli client
...
@@ -59,6 +62,7 @@ func Init() {
...
@@ -59,6 +62,7 @@ func Init() {
flag
.
PrintDefaults
()
flag
.
PrintDefaults
()
}
}
flag
.
IntVar
(
&
VmType
,
"vm"
,
0
,
"Virtual Machine type: 0-1: standard, debug"
)
flag
.
StringVar
(
&
Identifier
,
"id"
,
""
,
"Custom client identifier"
)
flag
.
StringVar
(
&
Identifier
,
"id"
,
""
,
"Custom client identifier"
)
flag
.
StringVar
(
&
KeyRing
,
"keyring"
,
""
,
"identifier for keyring to use"
)
flag
.
StringVar
(
&
KeyRing
,
"keyring"
,
""
,
"identifier for keyring to use"
)
flag
.
StringVar
(
&
KeyStore
,
"keystore"
,
"db"
,
"system to store keyrings: db|file (db)"
)
flag
.
StringVar
(
&
KeyStore
,
"keystore"
,
"db"
,
"system to store keyrings: db|file (db)"
)
...
@@ -91,5 +95,9 @@ func Init() {
...
@@ -91,5 +95,9 @@ func Init() {
flag
.
Parse
()
flag
.
Parse
()
if
VmType
>=
int
(
ethvm
.
MaxVmTy
)
{
log
.
Fatal
(
"Invalid VM type "
,
VmType
)
}
InputFile
=
flag
.
Arg
(
0
)
InputFile
=
flag
.
Arg
(
0
)
}
}
ethereum/main.go
浏览文件 @
294b4374
...
@@ -31,7 +31,7 @@ func main() {
...
@@ -31,7 +31,7 @@ func main() {
LogLevel
=
0
LogLevel
=
0
}
}
utils
.
InitConfig
(
ConfigFile
,
Datadir
,
"ETH"
)
utils
.
InitConfig
(
VmType
,
ConfigFile
,
Datadir
,
"ETH"
)
ethutil
.
Config
.
Diff
=
DiffTool
ethutil
.
Config
.
Diff
=
DiffTool
ethutil
.
Config
.
DiffType
=
DiffType
ethutil
.
Config
.
DiffType
=
DiffType
...
...
mist/debugger.go
浏览文件 @
294b4374
...
@@ -20,7 +20,7 @@ type DebuggerWindow struct {
...
@@ -20,7 +20,7 @@ type DebuggerWindow struct {
engine
*
qml
.
Engine
engine
*
qml
.
Engine
lib
*
UiLib
lib
*
UiLib
vm
*
ethvm
.
Vm
vm
*
ethvm
.
Debug
Vm
Db
*
Debugger
Db
*
Debugger
state
*
ethstate
.
State
state
*
ethstate
.
State
...
@@ -37,7 +37,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
...
@@ -37,7 +37,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
win
:=
component
.
CreateWindow
(
nil
)
win
:=
component
.
CreateWindow
(
nil
)
w
:=
&
DebuggerWindow
{
engine
:
engine
,
win
:
win
,
lib
:
lib
,
vm
:
&
ethvm
.
Vm
{}}
w
:=
&
DebuggerWindow
{
engine
:
engine
,
win
:
win
,
lib
:
lib
,
vm
:
&
ethvm
.
Debug
Vm
{}}
w
.
Db
=
NewDebugger
(
w
)
w
.
Db
=
NewDebugger
(
w
)
return
w
return
w
...
@@ -135,8 +135,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
...
@@ -135,8 +135,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
callerClosure
:=
ethvm
.
NewClosure
(
&
ethstate
.
Message
{},
account
,
contract
,
script
,
gas
,
gasPrice
)
callerClosure
:=
ethvm
.
NewClosure
(
&
ethstate
.
Message
{},
account
,
contract
,
script
,
gas
,
gasPrice
)
env
:=
utils
.
NewEnv
(
state
,
block
,
account
.
Address
(),
value
)
env
:=
utils
.
NewEnv
(
state
,
block
,
account
.
Address
(),
value
)
vm
:=
ethvm
.
New
(
env
)
vm
:=
ethvm
.
NewDebugVm
(
env
)
vm
.
Verbose
=
true
vm
.
Dbg
=
self
.
Db
vm
.
Dbg
=
self
.
Db
self
.
vm
=
vm
self
.
vm
=
vm
...
...
mist/flags.go
浏览文件 @
294b4374
...
@@ -3,6 +3,7 @@ package main
...
@@ -3,6 +3,7 @@ package main
import
(
import
(
"flag"
"flag"
"fmt"
"fmt"
"log"
"os"
"os"
"os/user"
"os/user"
"path"
"path"
...
@@ -11,6 +12,7 @@ import (
...
@@ -11,6 +12,7 @@ import (
"bitbucket.org/kardianos/osext"
"bitbucket.org/kardianos/osext"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethvm"
)
)
var
(
var
(
...
@@ -35,6 +37,7 @@ var (
...
@@ -35,6 +37,7 @@ var (
ConfigFile
string
ConfigFile
string
DebugFile
string
DebugFile
string
LogLevel
int
LogLevel
int
VmType
int
)
)
// flags specific to gui client
// flags specific to gui client
...
@@ -78,6 +81,7 @@ func Init() {
...
@@ -78,6 +81,7 @@ func Init() {
flag
.
PrintDefaults
()
flag
.
PrintDefaults
()
}
}
flag
.
IntVar
(
&
VmType
,
"vm"
,
0
,
"Virtual Machine type: 0-1: standard, debug"
)
flag
.
StringVar
(
&
Identifier
,
"id"
,
""
,
"Custom client identifier"
)
flag
.
StringVar
(
&
Identifier
,
"id"
,
""
,
"Custom client identifier"
)
flag
.
StringVar
(
&
KeyRing
,
"keyring"
,
""
,
"identifier for keyring to use"
)
flag
.
StringVar
(
&
KeyRing
,
"keyring"
,
""
,
"identifier for keyring to use"
)
flag
.
StringVar
(
&
KeyStore
,
"keystore"
,
"db"
,
"system to store keyrings: db|file (db)"
)
flag
.
StringVar
(
&
KeyStore
,
"keystore"
,
"db"
,
"system to store keyrings: db|file (db)"
)
...
@@ -101,4 +105,8 @@ func Init() {
...
@@ -101,4 +105,8 @@ func Init() {
flag
.
StringVar
(
&
AssetPath
,
"asset_path"
,
defaultAssetPath
(),
"absolute path to GUI assets directory"
)
flag
.
StringVar
(
&
AssetPath
,
"asset_path"
,
defaultAssetPath
(),
"absolute path to GUI assets directory"
)
flag
.
Parse
()
flag
.
Parse
()
if
VmType
>=
int
(
ethvm
.
MaxVmTy
)
{
log
.
Fatal
(
"Invalid VM type "
,
VmType
)
}
}
}
mist/main.go
浏览文件 @
294b4374
...
@@ -21,7 +21,7 @@ func run() error {
...
@@ -21,7 +21,7 @@ func run() error {
// precedence: code-internal flag default < config file < environment variables < command line
// precedence: code-internal flag default < config file < environment variables < command line
Init
()
// parsing command line
Init
()
// parsing command line
config
:=
utils
.
InitConfig
(
ConfigFile
,
Datadir
,
"ETH"
)
config
:=
utils
.
InitConfig
(
VmType
,
ConfigFile
,
Datadir
,
"ETH"
)
utils
.
InitDataDir
(
Datadir
)
utils
.
InitDataDir
(
Datadir
)
...
...
utils/cmd.go
浏览文件 @
294b4374
...
@@ -118,9 +118,12 @@ func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string)
...
@@ -118,9 +118,12 @@ func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string)
return
sys
return
sys
}
}
func
InitConfig
(
ConfigFile
string
,
Datadir
string
,
EnvPrefix
string
)
*
ethutil
.
ConfigManager
{
func
InitConfig
(
vmType
int
,
ConfigFile
string
,
Datadir
string
,
EnvPrefix
string
)
*
ethutil
.
ConfigManager
{
InitDataDir
(
Datadir
)
InitDataDir
(
Datadir
)
return
ethutil
.
ReadConfig
(
ConfigFile
,
Datadir
,
EnvPrefix
)
cfg
:=
ethutil
.
ReadConfig
(
ConfigFile
,
Datadir
,
EnvPrefix
)
cfg
.
VmType
=
vmType
return
cfg
}
}
func
exit
(
err
error
)
{
func
exit
(
err
error
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录