aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-18 20:39:01 +0800
committerFelix Lange <fjl@twurst.com>2015-03-18 20:39:01 +0800
commitd15f90645d5b2e90c441140972d9fe6ecd753643 (patch)
treeb1f024c3c01f25b67bc25ed0452a9b584dad984f /core
parenta59dd393e71cc52b1f96973aef884af619166f38 (diff)
parent0a1eeca41e6ba5920ba65d9b41654768299bc7e3 (diff)
downloaddexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar
dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.gz
dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.bz2
dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.lz
dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.xz
dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.zst
dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.zip
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'core')
-rw-r--r--core/state_transition.go6
-rw-r--r--core/types/common.go4
2 files changed, 10 insertions, 0 deletions
diff --git a/core/state_transition.go b/core/state_transition.go
index 1509a5258..d0b2c5d7c 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -57,6 +57,12 @@ type Message interface {
Data() []byte
}
+func AddressFromMessage(msg Message) common.Address {
+ from, _ := msg.From()
+
+ return crypto.CreateAddress(from, msg.Nonce())
+}
+
func MessageCreatesContract(msg Message) bool {
return msg.To() == nil
}
diff --git a/core/types/common.go b/core/types/common.go
index cb57ef053..ace9c2c4b 100644
--- a/core/types/common.go
+++ b/core/types/common.go
@@ -35,3 +35,7 @@ func (b *Bloom) SetBytes(d []byte) {
func (b Bloom) Big() *big.Int {
return common.Bytes2Big(b[:])
}
+
+func (b Bloom) Bytes() []byte {
+ return b[:]
+}