Merge remote-tracking branch 'ethereum/conversion' into conversion

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[:]
+}