good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
2ac292dc
Commit
2ac292dc
authored
May 15, 2014
by
Jeffrey Wilcke
Browse files
Options
Downloads
Plain Diff
Merge branch 'feature/otto' into develop
parents
3a2bddc1
6a78e080
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
ethereal/ethereum.go
+1
-1
1 addition, 1 deletion
ethereal/ethereum.go
ethereum/config.go
+2
-0
2 additions, 0 deletions
ethereum/config.go
ethereum/ethereum.go
+11
-1
11 additions, 1 deletion
ethereum/ethereum.go
ethereum/javascript_console.go
+108
-0
108 additions, 0 deletions
ethereum/javascript_console.go
with
122 additions
and
2 deletions
ethereal/ethereum.go
+
1
−
1
View file @
2ac292dc
...
...
@@ -39,7 +39,7 @@ func main() {
runtime
.
GOMAXPROCS
(
runtime
.
NumCPU
())
ethchain
.
InitFees
()
ethutil
.
ReadConfig
(
DataDir
)
ethutil
.
ReadConfig
(
DataDir
,
ethutil
.
LogFile
|
ethutil
.
LogStd
)
// Instantiated a eth stack
ethereum
,
err
:=
eth
.
New
(
eth
.
CapDefault
,
UseUPnP
)
...
...
This diff is collapsed.
Click to expand it.
ethereum/config.go
+
2
−
0
View file @
2ac292dc
...
...
@@ -20,6 +20,7 @@ var ExportKey bool
var
LogFile
string
var
DataDir
string
var
NonInteractive
bool
var
StartJsConsole
bool
func
Init
()
{
flag
.
BoolVar
(
&
StartConsole
,
"c"
,
false
,
"debug and testing console"
)
...
...
@@ -38,6 +39,7 @@ func Init() {
flag
.
StringVar
(
&
DataDir
,
"dir"
,
".ethereum"
,
"ethereum data directory"
)
flag
.
StringVar
(
&
ImportKey
,
"import"
,
""
,
"imports the given private key (hex)"
)
flag
.
IntVar
(
&
MaxPeer
,
"x"
,
5
,
"maximum desired peers"
)
flag
.
BoolVar
(
&
StartJsConsole
,
"js"
,
false
,
"exp"
)
flag
.
Parse
()
}
This diff is collapsed.
Click to expand it.
ethereum/ethereum.go
+
11
−
1
View file @
2ac292dc
...
...
@@ -52,7 +52,12 @@ func main() {
var
logSys
*
log
.
Logger
flags
:=
log
.
LstdFlags
ethutil
.
ReadConfig
(
DataDir
)
if
StartJsConsole
{
ethutil
.
ReadConfig
(
DataDir
,
ethutil
.
LogFile
)
}
else
{
ethutil
.
ReadConfig
(
DataDir
,
ethutil
.
LogFile
|
ethutil
.
LogStd
)
}
logger
:=
ethutil
.
Config
.
Log
if
LogFile
!=
""
{
...
...
@@ -145,7 +150,12 @@ save these words so you can restore your account later: %s
console
:=
NewConsole
(
ethereum
)
go
console
.
Start
()
}
else
if
StartJsConsole
{
c
:=
NewJSConsole
(
ethereum
)
go
c
.
Start
()
}
if
StartRpc
{
utils
.
DoRpc
(
ethereum
,
RpcPort
)
}
...
...
This diff is collapsed.
Click to expand it.
ethereum/javascript_console.go
0 → 100644
+
108
−
0
View file @
2ac292dc
package
main
import
(
"bufio"
"fmt"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethpub"
"github.com/robertkrimen/otto"
"os"
)
type
JSConsole
struct
{
vm
*
otto
.
Otto
lib
*
ethpub
.
PEthereum
}
func
NewJSConsole
(
ethereum
*
eth
.
Ethereum
)
*
JSConsole
{
return
&
JSConsole
{
vm
:
otto
.
New
(),
lib
:
ethpub
.
NewPEthereum
(
ethereum
)}
}
func
(
self
*
JSConsole
)
Start
()
{
self
.
initBindings
()
fmt
.
Println
(
"Eth JavaScript console"
)
reader
:=
bufio
.
NewReader
(
os
.
Stdin
)
for
{
fmt
.
Printf
(
"eth >>> "
)
str
,
_
,
err
:=
reader
.
ReadLine
()
if
err
!=
nil
{
fmt
.
Println
(
"Error reading input"
,
err
)
}
else
{
self
.
ParseInput
(
string
(
str
))
}
}
}
func
(
self
*
JSConsole
)
ParseInput
(
code
string
)
{
defer
func
()
{
if
r
:=
recover
();
r
!=
nil
{
fmt
.
Println
(
"[native] error"
,
r
)
}
}()
value
,
err
:=
self
.
vm
.
Run
(
code
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
}
fmt
.
Println
(
value
)
}
func
(
self
*
JSConsole
)
initBindings
()
{
t
:=
&
JSWrapper
{
self
.
lib
,
self
.
vm
}
self
.
vm
.
Set
(
"eth"
,
t
)
}
// The JS wrapper attempts to wrap the PEthereum object and returns
// proper javascript objects
type
JSWrapper
struct
{
*
ethpub
.
PEthereum
vm
*
otto
.
Otto
}
func
(
self
*
JSWrapper
)
GetKey
()
otto
.
Value
{
return
self
.
toVal
(
self
.
PEthereum
.
GetKey
())
}
func
(
self
*
JSWrapper
)
GetStateObject
(
addr
string
)
otto
.
Value
{
return
self
.
toVal
(
self
.
PEthereum
.
GetStateObject
(
addr
))
}
func
(
self
*
JSWrapper
)
Transact
(
key
,
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
dataStr
string
)
otto
.
Value
{
r
,
err
:=
self
.
PEthereum
.
Transact
(
key
,
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
dataStr
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
otto
.
UndefinedValue
()
}
return
self
.
toVal
(
r
)
}
func
(
self
*
JSWrapper
)
Create
(
key
,
valueStr
,
gasStr
,
gasPriceStr
,
initStr
,
bodyStr
string
)
otto
.
Value
{
r
,
err
:=
self
.
PEthereum
.
Create
(
key
,
valueStr
,
gasStr
,
gasPriceStr
,
initStr
,
bodyStr
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
otto
.
UndefinedValue
()
}
return
self
.
toVal
(
r
)
}
// Wrapper function
func
(
self
*
JSWrapper
)
toVal
(
v
interface
{})
otto
.
Value
{
result
,
err
:=
self
.
vm
.
ToValue
(
v
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
otto
.
UndefinedValue
()
}
return
result
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment