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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
30402430
Commit
30402430
authored
7 years ago
by
Martin Holst Swende
Committed by
Felix Lange
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
cmd/evm: add --receiver, support code from stdin (#14873)
parent
9facf642
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmd/evm/main.go
+6
-1
6 additions, 1 deletion
cmd/evm/main.go
cmd/evm/runner.go
+33
-26
33 additions, 26 deletions
cmd/evm/runner.go
with
39 additions
and
27 deletions
cmd/evm/main.go
+
6
−
1
View file @
30402430
...
...
@@ -53,7 +53,7 @@ var (
}
CodeFileFlag
=
cli
.
StringFlag
{
Name
:
"codefile"
,
Usage
:
"
f
ile containing EVM code"
,
Usage
:
"
F
ile containing EVM code
. If '-' is specified, code is read from stdin
"
,
}
GasFlag
=
cli
.
Uint64Flag
{
Name
:
"gas"
,
...
...
@@ -102,6 +102,10 @@ var (
Name
:
"sender"
,
Usage
:
"The transaction origin"
,
}
ReceiverFlag
=
cli
.
StringFlag
{
Name
:
"receiver"
,
Usage
:
"The transaction receiver (execution context)"
,
}
DisableMemoryFlag
=
cli
.
BoolFlag
{
Name
:
"nomemory"
,
Usage
:
"disable memory output"
,
...
...
@@ -131,6 +135,7 @@ func init() {
GenesisFlag
,
MachineFlag
,
SenderFlag
,
ReceiverFlag
,
DisableMemoryFlag
,
DisableStackFlag
,
}
...
...
This diff is collapsed.
Click to expand it.
cmd/evm/runner.go
+
33
−
26
View file @
30402430
...
...
@@ -84,6 +84,7 @@ func runCmd(ctx *cli.Context) error {
statedb
*
state
.
StateDB
chainConfig
*
params
.
ChainConfig
sender
=
common
.
StringToAddress
(
"sender"
)
receiver
=
common
.
StringToAddress
(
"receiver"
)
)
if
ctx
.
GlobalBool
(
MachineFlag
.
Name
)
{
tracer
=
NewJSONLogger
(
logconfig
,
os
.
Stdout
)
...
...
@@ -104,46 +105,52 @@ func runCmd(ctx *cli.Context) error {
if
ctx
.
GlobalString
(
SenderFlag
.
Name
)
!=
""
{
sender
=
common
.
HexToAddress
(
ctx
.
GlobalString
(
SenderFlag
.
Name
))
}
statedb
.
CreateAccount
(
sender
)
if
ctx
.
GlobalString
(
ReceiverFlag
.
Name
)
!=
""
{
receiver
=
common
.
HexToAddress
(
ctx
.
GlobalString
(
ReceiverFlag
.
Name
))
}
var
(
code
[]
byte
ret
[]
byte
err
error
)
if
fn
:=
ctx
.
Args
()
.
First
();
len
(
fn
)
>
0
{
// The '--code' or '--codefile' flag overrides code in state
if
ctx
.
GlobalString
(
CodeFileFlag
.
Name
)
!=
""
{
var
hexcode
[]
byte
var
err
error
// If - is specified, it means that code comes from stdin
if
ctx
.
GlobalString
(
CodeFileFlag
.
Name
)
==
"-"
{
//Try reading from stdin
if
hexcode
,
err
=
ioutil
.
ReadAll
(
os
.
Stdin
);
err
!=
nil
{
fmt
.
Printf
(
"Could not load code from stdin: %v
\n
"
,
err
)
os
.
Exit
(
1
)
}
}
else
{
// Codefile with hex assembly
if
hexcode
,
err
=
ioutil
.
ReadFile
(
ctx
.
GlobalString
(
CodeFileFlag
.
Name
));
err
!=
nil
{
fmt
.
Printf
(
"Could not load code from file: %v
\n
"
,
err
)
os
.
Exit
(
1
)
}
}
code
=
common
.
Hex2Bytes
(
string
(
bytes
.
TrimRight
(
hexcode
,
"
\n
"
)))
}
else
if
ctx
.
GlobalString
(
CodeFlag
.
Name
)
!=
""
{
code
=
common
.
Hex2Bytes
(
ctx
.
GlobalString
(
CodeFlag
.
Name
))
}
else
if
fn
:=
ctx
.
Args
()
.
First
();
len
(
fn
)
>
0
{
// EASM-file to compile
src
,
err
:=
ioutil
.
ReadFile
(
fn
)
if
err
!=
nil
{
return
err
}
bin
,
err
:=
compiler
.
Compile
(
fn
,
src
,
false
)
if
err
!=
nil
{
return
err
}
code
=
common
.
Hex2Bytes
(
bin
)
}
else
if
ctx
.
GlobalString
(
CodeFlag
.
Name
)
!=
""
{
code
=
common
.
Hex2Bytes
(
ctx
.
GlobalString
(
CodeFlag
.
Name
))
}
else
{
var
hexcode
[]
byte
if
ctx
.
GlobalString
(
CodeFileFlag
.
Name
)
!=
""
{
var
err
error
hexcode
,
err
=
ioutil
.
ReadFile
(
ctx
.
GlobalString
(
CodeFileFlag
.
Name
))
if
err
!=
nil
{
fmt
.
Printf
(
"Could not load code from file: %v
\n
"
,
err
)
os
.
Exit
(
1
)
}
}
else
{
var
err
error
hexcode
,
err
=
ioutil
.
ReadAll
(
os
.
Stdin
)
if
err
!=
nil
{
fmt
.
Printf
(
"Could not load code from stdin: %v
\n
"
,
err
)
os
.
Exit
(
1
)
}
}
code
=
common
.
Hex2Bytes
(
string
(
bytes
.
TrimRight
(
hexcode
,
"
\n
"
)))
}
initialGas
:=
ctx
.
GlobalUint64
(
GasFlag
.
Name
)
runtimeConfig
:=
runtime
.
Config
{
Origin
:
sender
,
...
...
@@ -180,9 +187,9 @@ func runCmd(ctx *cli.Context) error {
input
:=
append
(
code
,
common
.
Hex2Bytes
(
ctx
.
GlobalString
(
InputFlag
.
Name
))
...
)
ret
,
_
,
leftOverGas
,
err
=
runtime
.
Create
(
input
,
&
runtimeConfig
)
}
else
{
receiver
:=
common
.
StringToAddress
(
"receiver"
)
statedb
.
SetCode
(
receiver
,
code
)
if
len
(
code
)
>
0
{
statedb
.
SetCode
(
receiver
,
code
)
}
ret
,
leftOverGas
,
err
=
runtime
.
Call
(
receiver
,
common
.
Hex2Bytes
(
ctx
.
GlobalString
(
InputFlag
.
Name
)),
&
runtimeConfig
)
}
execTime
:=
time
.
Since
(
tstart
)
...
...
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