CovenantSQL · xq262144 · Jan 4, 2019 · Jan 2, 2019 · Jan 2, 2019 · Jan 2, 2019
diff --git a/blockproducer/interfaces/mixins.go b/blockproducer/interfaces/mixins.go
@@ -16,11 +16,22 @@
 
 package interfaces
 
+import "time"
+
 //go:generate hsp
 
 // TransactionTypeMixin provide type heuristic features to transaction wrapper.
 type TransactionTypeMixin struct {
-	TxType TransactionType
+	TxType    TransactionType
+	Timestamp time.Time
+}
+
+// NewTransactionTypeMixin returns new instance.
+func NewTransactionTypeMixin(txType TransactionType) *TransactionTypeMixin {
+	return &TransactionTypeMixin{
+		TxType:    txType,
+		Timestamp: time.Now(),
+	}
 }
 
 // ContainsTransactionTypeMixin interface defines interface to detect transaction type mixin.
@@ -38,9 +49,12 @@ func (m *TransactionTypeMixin) SetTransactionType(t TransactionType) {
 	m.TxType = t
 }
 
-// NewTransactionTypeMixin returns new instance.
-func NewTransactionTypeMixin(txType TransactionType) *TransactionTypeMixin {
-	return &TransactionTypeMixin{
-		TxType: txType,
-	}
+// GetTimestamp implements Transaciton.GetTimestamp()
+func (m *TransactionTypeMixin) GetTimestamp() time.Time {
+	return m.Timestamp
+}
+
+// SetTimestamp is a helper function for derived types.
+func (m *TransactionTypeMixin) SetTimestamp(t time.Time) {
+	m.Timestamp = t
 }
diff --git a/blockproducer/interfaces/mixins_gen.go b/blockproducer/interfaces/mixins_gen.go
diff --git a/blockproducer/interfaces/mixins_test.go b/blockproducer/interfaces/mixins_test.go
@@ -18,6 +18,7 @@ package interfaces
 
 import (
 	"testing"
+	"time"
 
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -28,5 +29,9 @@ func TestTransactionTypeMixin(t *testing.T) {
 		So(m.GetTransactionType(), ShouldEqual, TransactionTypeBaseAccount)
 		m.SetTransactionType(TransactionTypeTransfer)
 		So(m.GetTransactionType(), ShouldEqual, TransactionTypeTransfer)
+		now := time.Now()
+		So(now.Sub(m.GetTimestamp()).Seconds(), ShouldBeLessThan, 0.1)
+		m.SetTimestamp(now)
+		So(m.GetTimestamp(), ShouldEqual, now)
 	})
 }
diff --git a/blockproducer/interfaces/transaction.go b/blockproducer/interfaces/transaction.go
@@ -18,6 +18,7 @@ package interfaces
 
 import (
 	"encoding/binary"
+	"time"
 
 	"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
 	"github.com/CovenantSQL/CovenantSQL/crypto/hash"
@@ -111,10 +112,11 @@ func (t TransactionType) String() string {
 // Transaction is the interface implemented by an object that can be verified and processed by
 // block producers.
 type Transaction interface {
+	GetTransactionType() TransactionType
 	GetAccountAddress() proto.AccountAddress
 	GetAccountNonce() AccountNonce
+	GetTimestamp() time.Time
 	Hash() hash.Hash
-	GetTransactionType() TransactionType
 	Sign(signer *asymmetric.PrivateKey) error
 	Verify() error
 	MarshalHash() ([]byte, error)

diff --git a/types/init_service_type_gen.go b/types/init_service_type_gen.go
diff --git a/types/request_type_gen.go b/types/request_type_gen.go