Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
3043b233
Commit
3043b233
authored
Dec 04, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Log is now interface
parent
bff5999e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
75 additions
and
30 deletions
+75
-30
main.go
cmd/evm/main.go
+1
-1
vm_env.go
cmd/utils/vm_env.go
+1
-1
bloom9.go
core/types/bloom9.go
+2
-2
vm_env.go
core/vm_env.go
+1
-1
log.go
state/log.go
+42
-19
state.go
state/state.go
+1
-1
vm.go
tests/helper/vm.go
+1
-1
environment.go
vm/environment.go
+23
-1
vm_debug.go
vm/vm_debug.go
+2
-2
vm_env.go
xeth/vm_env.go
+1
-1
No files found.
cmd/evm/main.go
View file @
3043b233
...
@@ -62,7 +62,7 @@ func main() {
...
@@ -62,7 +62,7 @@ func main() {
logger
.
AddLogSystem
(
logger
.
NewStdLogSystem
(
os
.
Stdout
,
log
.
LstdFlags
,
logger
.
LogLevel
(
*
loglevel
)))
logger
.
AddLogSystem
(
logger
.
NewStdLogSystem
(
os
.
Stdout
,
log
.
LstdFlags
,
logger
.
LogLevel
(
*
loglevel
)))
ethutil
.
ReadConfig
(
"/tm/evmtest"
,
"/tmp/evm"
,
""
)
ethutil
.
ReadConfig
(
"/tm
p
/evmtest"
,
"/tmp/evm"
,
""
)
db
,
_
:=
ethdb
.
NewMemDatabase
()
db
,
_
:=
ethdb
.
NewMemDatabase
()
statedb
:=
state
.
New
(
trie
.
New
(
db
,
""
))
statedb
:=
state
.
New
(
trie
.
New
(
db
,
""
))
...
...
cmd/utils/vm_env.go
View file @
3043b233
...
@@ -41,7 +41,7 @@ func (self *VMEnv) State() *state.StateDB { return self.state }
...
@@ -41,7 +41,7 @@ func (self *VMEnv) State() *state.StateDB { return self.state }
func
(
self
*
VMEnv
)
GasLimit
()
*
big
.
Int
{
return
self
.
block
.
GasLimit
}
func
(
self
*
VMEnv
)
GasLimit
()
*
big
.
Int
{
return
self
.
block
.
GasLimit
}
func
(
self
*
VMEnv
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
VMEnv
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
VMEnv
)
SetDepth
(
i
int
)
{
self
.
depth
=
i
}
func
(
self
*
VMEnv
)
SetDepth
(
i
int
)
{
self
.
depth
=
i
}
func
(
self
*
VMEnv
)
AddLog
(
log
*
state
.
Log
)
{
func
(
self
*
VMEnv
)
AddLog
(
log
state
.
Log
)
{
self
.
state
.
AddLog
(
log
)
self
.
state
.
AddLog
(
log
)
}
}
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
...
...
core/types/bloom9.go
View file @
3043b233
...
@@ -20,8 +20,8 @@ func CreateBloom(receipts Receipts) []byte {
...
@@ -20,8 +20,8 @@ func CreateBloom(receipts Receipts) []byte {
func
LogsBloom
(
logs
state
.
Logs
)
*
big
.
Int
{
func
LogsBloom
(
logs
state
.
Logs
)
*
big
.
Int
{
bin
:=
new
(
big
.
Int
)
bin
:=
new
(
big
.
Int
)
for
_
,
log
:=
range
logs
{
for
_
,
log
:=
range
logs
{
data
:=
[][]
byte
{
log
.
Address
}
data
:=
[][]
byte
{
log
.
Address
()
}
for
_
,
topic
:=
range
log
.
Topics
{
for
_
,
topic
:=
range
log
.
Topics
()
{
data
=
append
(
data
,
topic
)
data
=
append
(
data
,
topic
)
}
}
...
...
core/vm_env.go
View file @
3043b233
...
@@ -35,7 +35,7 @@ func (self *VMEnv) State() *state.StateDB { return self.state }
...
@@ -35,7 +35,7 @@ func (self *VMEnv) State() *state.StateDB { return self.state }
func
(
self
*
VMEnv
)
GasLimit
()
*
big
.
Int
{
return
self
.
block
.
GasLimit
}
func
(
self
*
VMEnv
)
GasLimit
()
*
big
.
Int
{
return
self
.
block
.
GasLimit
}
func
(
self
*
VMEnv
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
VMEnv
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
VMEnv
)
SetDepth
(
i
int
)
{
self
.
depth
=
i
}
func
(
self
*
VMEnv
)
SetDepth
(
i
int
)
{
self
.
depth
=
i
}
func
(
self
*
VMEnv
)
AddLog
(
log
*
state
.
Log
)
{
func
(
self
*
VMEnv
)
AddLog
(
log
state
.
Log
)
{
self
.
state
.
AddLog
(
log
)
self
.
state
.
AddLog
(
log
)
}
}
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
...
...
state/log.go
View file @
3043b233
...
@@ -2,40 +2,63 @@ package state
...
@@ -2,40 +2,63 @@ package state
import
(
import
(
"fmt"
"fmt"
"strings"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/ethutil"
)
)
type
Log
struct
{
type
Log
interface
{
Address
[]
byte
ethutil
.
RlpEncodable
Topics
[][]
byte
Data
[]
byte
Address
()
[]
byte
Topics
()
[][]
byte
Data
()
[]
byte
}
type
StateLog
struct
{
address
[]
byte
topics
[][]
byte
data
[]
byte
}
func
NewLog
(
address
[]
byte
,
topics
[][]
byte
,
data
[]
byte
)
*
StateLog
{
return
&
StateLog
{
address
,
topics
,
data
}
}
func
(
self
*
StateLog
)
Address
()
[]
byte
{
return
self
.
address
}
func
(
self
*
StateLog
)
Topics
()
[][]
byte
{
return
self
.
topics
}
}
func
NewLogFromValue
(
decoder
*
ethutil
.
Value
)
*
Log
{
func
(
self
*
StateLog
)
Data
()
[]
byte
{
log
:=
&
Log
{
return
self
.
data
Address
:
decoder
.
Get
(
0
)
.
Bytes
(),
}
Data
:
decoder
.
Get
(
2
)
.
Bytes
(),
func
NewLogFromValue
(
decoder
*
ethutil
.
Value
)
*
StateLog
{
log
:=
&
StateLog
{
address
:
decoder
.
Get
(
0
)
.
Bytes
(),
data
:
decoder
.
Get
(
2
)
.
Bytes
(),
}
}
it
:=
decoder
.
Get
(
1
)
.
NewIterator
()
it
:=
decoder
.
Get
(
1
)
.
NewIterator
()
for
it
.
Next
()
{
for
it
.
Next
()
{
log
.
Topics
=
append
(
log
.
T
opics
,
it
.
Value
()
.
Bytes
())
log
.
topics
=
append
(
log
.
t
opics
,
it
.
Value
()
.
Bytes
())
}
}
return
log
return
log
}
}
func
(
self
*
Log
)
RlpData
()
interface
{}
{
func
(
self
*
State
Log
)
RlpData
()
interface
{}
{
return
[]
interface
{}{
self
.
Address
,
ethutil
.
ByteSliceToInterface
(
self
.
Topics
),
self
.
D
ata
}
return
[]
interface
{}{
self
.
address
,
ethutil
.
ByteSliceToInterface
(
self
.
topics
),
self
.
d
ata
}
}
}
func
(
self
*
Log
)
String
()
string
{
func
(
self
*
State
Log
)
String
()
string
{
return
fmt
.
Sprintf
(
`log: %x %x %x`
,
self
.
Address
,
self
.
Topics
,
self
.
D
ata
)
return
fmt
.
Sprintf
(
`log: %x %x %x`
,
self
.
address
,
self
.
topics
,
self
.
d
ata
)
}
}
type
Logs
[]
*
Log
type
Logs
[]
Log
func
(
self
Logs
)
RlpData
()
interface
{}
{
func
(
self
Logs
)
RlpData
()
interface
{}
{
data
:=
make
([]
interface
{},
len
(
self
))
data
:=
make
([]
interface
{},
len
(
self
))
...
@@ -46,10 +69,10 @@ func (self Logs) RlpData() interface{} {
...
@@ -46,10 +69,10 @@ func (self Logs) RlpData() interface{} {
return
data
return
data
}
}
func
(
self
Logs
)
String
()
string
{
func
(
self
Logs
)
String
()
(
ret
string
)
{
var
logs
[]
string
for
_
,
log
:=
range
self
{
for
_
,
log
:=
range
self
{
logs
=
append
(
logs
,
log
.
String
()
)
ret
+=
fmt
.
Sprintf
(
"%v"
,
log
)
}
}
return
"[ "
+
strings
.
Join
(
logs
,
", "
)
+
" ]"
return
"["
+
ret
+
"]"
}
}
state/state.go
View file @
3043b233
...
@@ -37,7 +37,7 @@ func (self *StateDB) EmptyLogs() {
...
@@ -37,7 +37,7 @@ func (self *StateDB) EmptyLogs() {
self
.
logs
=
nil
self
.
logs
=
nil
}
}
func
(
self
*
StateDB
)
AddLog
(
log
*
Log
)
{
func
(
self
*
StateDB
)
AddLog
(
log
Log
)
{
self
.
logs
=
append
(
self
.
logs
,
log
)
self
.
logs
=
append
(
self
.
logs
,
log
)
}
}
...
...
tests/helper/vm.go
View file @
3043b233
...
@@ -57,7 +57,7 @@ func (self *Env) Difficulty() *big.Int { return self.difficulty }
...
@@ -57,7 +57,7 @@ func (self *Env) Difficulty() *big.Int { return self.difficulty }
func
(
self
*
Env
)
BlockHash
()
[]
byte
{
return
nil
}
func
(
self
*
Env
)
BlockHash
()
[]
byte
{
return
nil
}
func
(
self
*
Env
)
State
()
*
state
.
StateDB
{
return
self
.
state
}
func
(
self
*
Env
)
State
()
*
state
.
StateDB
{
return
self
.
state
}
func
(
self
*
Env
)
GasLimit
()
*
big
.
Int
{
return
self
.
gasLimit
}
func
(
self
*
Env
)
GasLimit
()
*
big
.
Int
{
return
self
.
gasLimit
}
func
(
self
*
Env
)
AddLog
(
log
*
state
.
Log
)
{
func
(
self
*
Env
)
AddLog
(
log
state
.
Log
)
{
self
.
logs
=
append
(
self
.
logs
,
log
)
self
.
logs
=
append
(
self
.
logs
,
log
)
}
}
func
(
self
*
Env
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
Env
)
Depth
()
int
{
return
self
.
depth
}
...
...
vm/environment.go
View file @
3043b233
...
@@ -20,7 +20,7 @@ type Environment interface {
...
@@ -20,7 +20,7 @@ type Environment interface {
BlockHash
()
[]
byte
BlockHash
()
[]
byte
GasLimit
()
*
big
.
Int
GasLimit
()
*
big
.
Int
Transfer
(
from
,
to
Account
,
amount
*
big
.
Int
)
error
Transfer
(
from
,
to
Account
,
amount
*
big
.
Int
)
error
AddLog
(
*
state
.
Log
)
AddLog
(
state
.
Log
)
Depth
()
int
Depth
()
int
SetDepth
(
i
int
)
SetDepth
(
i
int
)
...
@@ -52,3 +52,25 @@ func Transfer(from, to Account, amount *big.Int) error {
...
@@ -52,3 +52,25 @@ func Transfer(from, to Account, amount *big.Int) error {
return
nil
return
nil
}
}
type
Log
struct
{
address
[]
byte
topics
[][]
byte
data
[]
byte
}
func
(
self
*
Log
)
Address
()
[]
byte
{
return
self
.
address
}
func
(
self
*
Log
)
Topics
()
[][]
byte
{
return
self
.
topics
}
func
(
self
*
Log
)
Data
()
[]
byte
{
return
self
.
data
}
func
(
self
*
Log
)
RlpData
()
interface
{}
{
return
[]
interface
{}{
self
.
address
,
ethutil
.
ByteSliceToInterface
(
self
.
topics
),
self
.
data
}
}
vm/vm_debug.go
View file @
3043b233
...
@@ -35,7 +35,7 @@ func NewDebugVm(env Environment) *DebugVm {
...
@@ -35,7 +35,7 @@ func NewDebugVm(env Environment) *DebugVm {
lt
=
LogTyDiff
lt
=
LogTyDiff
}
}
return
&
DebugVm
{
env
:
env
,
logTy
:
lt
,
Recoverable
:
fals
e
}
return
&
DebugVm
{
env
:
env
,
logTy
:
lt
,
Recoverable
:
tru
e
}
}
}
func
(
self
*
DebugVm
)
Run
(
me
,
caller
ClosureRef
,
code
[]
byte
,
value
,
gas
,
price
*
big
.
Int
,
callData
[]
byte
)
(
ret
[]
byte
,
err
error
)
{
func
(
self
*
DebugVm
)
Run
(
me
,
caller
ClosureRef
,
code
[]
byte
,
value
,
gas
,
price
*
big
.
Int
,
callData
[]
byte
)
(
ret
[]
byte
,
err
error
)
{
...
@@ -750,7 +750,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
...
@@ -750,7 +750,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
topics
[
i
]
=
ethutil
.
LeftPadBytes
(
stack
.
Pop
()
.
Bytes
(),
32
)
topics
[
i
]
=
ethutil
.
LeftPadBytes
(
stack
.
Pop
()
.
Bytes
(),
32
)
}
}
log
:=
&
state
.
Log
{
closure
.
Address
(),
topics
,
data
}
log
:=
&
Log
{
closure
.
Address
(),
topics
,
data
}
self
.
env
.
AddLog
(
log
)
self
.
env
.
AddLog
(
log
)
self
.
Printf
(
" => %v"
,
log
)
self
.
Printf
(
" => %v"
,
log
)
...
...
xeth/vm_env.go
View file @
3043b233
...
@@ -39,7 +39,7 @@ func (self *VMEnv) State() *state.StateDB { return self.state }
...
@@ -39,7 +39,7 @@ func (self *VMEnv) State() *state.StateDB { return self.state }
func
(
self
*
VMEnv
)
GasLimit
()
*
big
.
Int
{
return
self
.
block
.
GasLimit
}
func
(
self
*
VMEnv
)
GasLimit
()
*
big
.
Int
{
return
self
.
block
.
GasLimit
}
func
(
self
*
VMEnv
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
VMEnv
)
Depth
()
int
{
return
self
.
depth
}
func
(
self
*
VMEnv
)
SetDepth
(
i
int
)
{
self
.
depth
=
i
}
func
(
self
*
VMEnv
)
SetDepth
(
i
int
)
{
self
.
depth
=
i
}
func
(
self
*
VMEnv
)
AddLog
(
log
*
state
.
Log
)
{
func
(
self
*
VMEnv
)
AddLog
(
log
state
.
Log
)
{
self
.
state
.
AddLog
(
log
)
self
.
state
.
AddLog
(
log
)
}
}
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
func
(
self
*
VMEnv
)
Transfer
(
from
,
to
vm
.
Account
,
amount
*
big
.
Int
)
error
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment