add parser for timelock

Author: noel2004

Diff for: applications/util/blockchain/blockchain.go

@@ -16,6 +16,7 @@ type ChainTransaction struct {
 	*client.ChainTransaction
 	//Data for the original protobuf input (Message part) and Detail left for parser
 	ChaincodeModule, Nonce string
+	TimeLock               string      `json:"expiredAt,omitempty"`
 	Detail, Data           interface{} `json:",omitempty"`
 	TxHash                 string      `json:",omitempty"`
 }
@@ -37,7 +38,7 @@ func SetParsers(m map[string]abchainTx.TxArgParser) { registryParsers = m }
 
 func handleTransaction(tx *client.ChainTransaction) *ChainTransaction {
 
-	ret := &ChainTransaction{tx, "", "", nil, nil, ""}
+	ret := &ChainTransaction{tx, "", "", "", nil, nil, ""}
 
 	if len(tx.TxArgs) < 2 {
 		ret.Detail = notHyperledgerTx
@@ -51,6 +52,10 @@ func handleTransaction(tx *client.ChainTransaction) *ChainTransaction {
 	}
 	ret.Nonce = fmt.Sprintf("%X", parser.GetNonce())
 	ret.ChaincodeModule = parser.GetCCname()
+	if parser.GetFlags().IsTimeLock() {
+		ret.TimeLock = parser.GetTxTime().String()
+	}
+
 	ret.Data = tx.TxArgs[1]
 	//we also add the hash of tx, for convinient
 	ret.TxHash = fmt.Sprintf("%X", abchainTx.GetHashOfRawTx(tx.TxArgs[0], tx.TxArgs[1], tx.Method))

Diff for: client/chain_proxy.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	"github.com/spf13/viper"
+	"time"
 )
 
 type Chain struct {
@@ -32,7 +33,7 @@ type ChainBlock struct {
 	Height       int64  `json:",string"`
 	Hash         string `json:",omitempty"`
 	PreviousHash string
-	TimeStamp    string              `json:",omitempty"`
+	TimeStamp    time.Time           `json:",omitempty"`
 	Transactions []*ChainTransaction `json:"-"`
 	TxEvents     []*ChainTxEvents    `json:"-"`
 }

Diff for: client/local/client.go

@@ -176,7 +176,7 @@ func (c *LocalChain) BuildBlock() {
 		blk.PreviousHash = "Genesis"
 	}
 
-	blk.TimeStamp = time.Now().String()
+	blk.TimeStamp = time.Now()
 	//update indexs
 	for _, tx := range c.pendingTxs {
 		tx.Height = blk.Height

Diff for: client/yafabric/chain.go

@@ -120,7 +120,7 @@ func (i blockchainInterpreter) GetBlock(h int64) (*client.ChainBlock, error) {
 	outblk.Height = h
 	outblk.Hash = fmt.Sprintf("%.32X...", blk.GetStateHash())
 	outblk.PreviousHash = fmt.Sprintf("%.32X", blk.GetPreviousBlockHash())
-	outblk.TimeStamp = utils.ConvertPBTimestamp(blk.GetTimestamp()).String()
+	outblk.TimeStamp = utils.ConvertPBTimestamp(blk.GetTimestamp())
 
 	for _, tx := range blk.GetTransactions() {
 		ret := i.resolveTx(tx)