Assign Pay to TransactionInterface

Author: Seongjae Choi

core/transaction/pay.go

@@ -1,6 +1,7 @@
 package transaction
 
 import (
+	"github.com/CodeChain-io/codechain-rpc-go/crypto"
 	"github.com/CodeChain-io/codechain-rpc-go/primitives"
 	"github.com/ethereum/go-ethereum/rlp"
 )
@@ -36,7 +37,7 @@ func (p Pay) ToEncodeObject() []interface{} {
 	return []interface{}{byte(p.Seq()), p.Fee().ToEncodeObject(), p.NetworkID(), p.ActionToEncodeObject()}
 }
 
-func (p Pay) ActionToJSON() PayAction {
+func (p Pay) ActionToJSON() interface{} {
 	return PayAction{
 		p.Receiver.Value,
 		p.Quantity.ToJSON()}
@@ -46,3 +47,25 @@ func (p Pay) RlpBytes() []byte {
 	x, _ := rlp.EncodeToBytes(p.ToEncodeObject())
 	return x
 }
+
+func (p Pay) Hash() []byte {
+	x, _ := crypto.Blake256(p.RlpBytes())
+	return x
+}
+
+func (p Pay) UnsignedHash() primitives.H256 {
+	hash, _ := crypto.Blake256(p.RlpBytes())
+
+	var value [32]byte
+	copy(value[:], hash[:32])
+	return primitives.H256(value)
+}
+
+func (p *Pay) Sign(secret primitives.H256, seq uint, fee primitives.U64) SignedTransaction {
+	// Handle error
+	p.SetSeq(seq)
+	p.SetFee(fee)
+	sig := crypto.SignEcdsa(p.UnsignedHash().Bytes(), secret.Bytes())
+
+	return NewSignedTransaction(p, sig, nil, nil, nil)
+}

core/transaction/signedTransaction.go

@@ -1,9 +1,11 @@
 package transaction
 
 import (
+	"encoding/hex"
+
 	"github.com/CodeChain-io/codechain-rpc-go/crypto"
 	"github.com/CodeChain-io/codechain-rpc-go/primitives"
-	// "github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/rlp"
 )
 
 type SignedTransactionJSON struct {
@@ -15,34 +17,34 @@ type SignedTransactionJSON struct {
 }
 
 type SignedTransaction struct {
-	Unsigned         transaction
+	Unsigned         TransactionInterface
 	BlockNumber      *int
 	BlockHash        *primitives.H256
 	TransactionIndex *int
-	signature        string
+	signature        []byte
 }
 
 func NewSignedTransaction(
-	unsigned transaction,
-	signature string,
+	unsigned TransactionInterface,
+	signature []byte,
 	blockNumber *int,
 	blockHash *primitives.H256,
 	transactionIndex *int) SignedTransaction {
 	return SignedTransaction{unsigned, blockNumber, blockHash, transactionIndex, signature}
 }
 
-func (t SignedTransaction) Signature() string {
+func (t SignedTransaction) Signature() []byte {
 	return t.signature
 }
 
-/*func (t SignedTransaction) ToEncodeObject() []interface{} {
-	return []interface{}{t.Unsigned.ToEncodeObject(), t.Signature()}
-}*/
+func (t SignedTransaction) ToEncodeObject() []interface{} {
+	return append(t.Unsigned.ToEncodeObject(), t.Signature())
+}
 
-/*func (t SignedTransaction) RlpBytes() []byte {
+func (t SignedTransaction) RlpBytes() []byte {
 	x, _ := rlp.EncodeToBytes(t.ToEncodeObject())
 	return x
-}*/
+}
 
 func (t SignedTransaction) Hash() primitives.H256 {
 	hash, _ := crypto.Blake256([]byte{0}) //t.RlpBytes())
@@ -73,6 +75,6 @@ func (t SignedTransaction) ToJSON() SignedTransactionJSON {
 		*t.BlockNumber,
 		t.BlockHash.ToString(),
 		*t.TransactionIndex,
-		t.signature,
+		hex.EncodeToString(t.signature),
 		t.Hash().ToJSON()}
 }

core/transaction/transaction.go

@@ -1,8 +1,6 @@
 package transaction
 
 import (
-	"encoding/hex"
-
 	"github.com/CodeChain-io/codechain-rpc-go/crypto"
 	"github.com/CodeChain-io/codechain-rpc-go/primitives"
 )
@@ -20,16 +18,16 @@ type TransactionJSON struct {
 }
 
 type TransactionInterface interface {
-	Seq() int
+	Seq() uint
 	Fee() primitives.U64
-	SetSeq(int)
+	SetSeq(uint)
 	SetFee(primitives.U64)
 	NetworkID() string
-	ToEncodeObject() string
+	ToEncodeObject() []interface{}
 	RlpBytes() []byte
 	UnsignedHash() primitives.H256
-	Sign(primitives.H256, int, primitives.U64) interface{} // FIXME
-	ToJSON() string
+	Sign(primitives.H256, uint, primitives.U64) SignedTransaction
+	ToJSON() TransactionJSON
 	GetType() string
 	ActionToJSON() interface{}
 	ActionToEncodeObject() []interface{}
@@ -73,11 +71,13 @@ func (t transaction) UnsignedHash() primitives.H256 {
 	return primitives.H256(value) // byte
 }
 
-func (t transaction) Sign(secret primitives.H256, seq *int, fee *primitives.U64) SignedTransaction {
+func (t *transaction) Sign(secret primitives.H256, seq uint, fee primitives.U64) SignedTransaction {
 	// Handle error
-	sig := crypto.SignEcdsa([]byte(t.UnsignedHash().ToString()), []byte(secret.ToString()))
 
-	return NewSignedTransaction(t, hex.EncodeToString(sig), nil, nil, nil) // nil
+	sig := crypto.SignEcdsa(t.UnsignedHash().Bytes(), secret.Bytes())
+	t.SetSeq(seq)
+	t.SetFee(fee)
+	return NewSignedTransaction(t, sig, nil, nil, nil) // nil
 }
 
 func (t transaction) ToJSON() TransactionJSON {
@@ -89,5 +89,21 @@ func (t transaction) ToJSON() TransactionJSON {
 }
 
 func (t transaction) GetType() string {
-	return "Transaction"
+	return ""
+}
+
+func (t transaction) ActionToEncodeObject() []interface{} {
+	return nil
+}
+
+func (t transaction) ActionToJSON() interface{} {
+	return nil
+}
+
+func (t transaction) RlpBytes() []byte {
+	return nil
+}
+
+func (t transaction) ToEncodeObject() []interface{} {
+	return nil
 }