Adding sender signature details in block

block/block.go

@@ -40,6 +40,7 @@ const (
 	TCSmartContractDataKey string = "9"
 	TCTokenValueKey        string = "10"
 	TCChildTokensKey       string = "11"
+	TCSenderSignatureKey   string = "12"
 )
 
 const (
@@ -57,16 +58,17 @@ const (
 )
 
 type TokenChainBlock struct {
-	TransactionType   string         `json:"transactionType"`
-	TokenOwner        string         `json:"owner"`
-	GenesisBlock      *GenesisBlock  `json:"genesisBlock"`
-	TransInfo         *TransInfo     `json:"transInfo"`
-	PledgeDetails     []PledgeDetail `json:"pledgeDetails"`
-	QuorumSignature   []string       `json:"quorumSignature"`
-	SmartContract     []byte         `json:"smartContract"`
-	SmartContractData string         `json:"smartContractData"`
-	TokenValue        float64        `json:"tokenValue"`
-	ChildTokens       []string       `json:"childTokens"`
+	TransactionType   string            `json:"transactionType"`
+	TokenOwner        string            `json:"owner"`
+	GenesisBlock      *GenesisBlock     `json:"genesisBlock"`
+	TransInfo         *TransInfo        `json:"transInfo"`
+	PledgeDetails     []PledgeDetail    `json:"pledgeDetails"`
+	QuorumSignature   []CreditSignature `json:"quorumSignature"`
+	SmartContract     []byte            `json:"smartContract"`
+	SmartContractData string            `json:"smartContractData"`
+	TokenValue        float64           `json:"tokenValue"`
+	ChildTokens       []string          `json:"childTokens"`
+	SenderSignature   *SenderSignature  `json:"senderSignature"`
 }
 
 type PledgeDetail struct {
@@ -83,6 +85,22 @@ type Block struct {
 	log logger.Logger
 }
 
+type CreditSignature struct {
+	Signature     string `json:"signature"`
+	PrivSignature string `json:"priv_signature"`
+	DID           string `json:"did"`
+	Hash          string `json:"hash"`
+	SignType      string `json:"sign_type"` //represents sign type (PkiSign == 0 or NlssSign==1)
+}
+
+type SenderSignature struct {
+	NLSS_share   string `json:"nlss_share_signature"`
+	Private_sign string `json:"priv_signature"`
+	DID          string `json:"sender_did"`
+	Hash         string `json:"hash"`
+	SignType     int    `json:"sign_type"` //represents sign type (PkiSign == 0 or NlssSign==1)
+}
+
 type BlockOption func(b *Block)
 
 func NoSignature() BlockOption {
@@ -151,6 +169,9 @@ func CreateNewBlock(ctcb map[string]*Block, tcb *TokenChainBlock) *Block {
 	if tcb.SmartContractData != "" {
 		ntcb[TCSmartContractDataKey] = tcb.SmartContractData
 	}
+	if tcb.SenderSignature != nil {
+		ntcb[TCSenderSignatureKey] = tcb.SenderSignature
+	}
 
 	if floatPrecisionToMaxDecimalPlaces(tcb.TokenValue) > floatPrecisionToMaxDecimalPlaces(0) {
 		ntcb[TCTokenValueKey] = floatPrecisionToMaxDecimalPlaces(tcb.TokenValue)

core/quorum_initiator.go

@@ -1,7 +1,6 @@
 package core
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"strconv"
@@ -129,7 +128,7 @@ type CreditSignature struct {
 	PrivSignature string `json:"priv_signature"`
 	DID           string `json:"did"`
 	Hash          string `json:"hash"`
-	SignVersion   string `json:"sign_version"` //represents sign version (PkiSign == 0 or NlssSign==1)
+	SignType      string `json:"sign_type"` //represents sign type (PkiSign == 0 or NlssSign==1)
 }
 
 type TokenArbitrationReq struct {
@@ -739,16 +738,16 @@ func (c *Core) finishConsensus(id string, qt int, p *ipfsport.Peer, status bool,
 	var pledgingDID string
 	if len(pledgingQuorumDID) > 0 {
 		pledgingDID = pledgingQuorumDID[0]
-  }
+	}
 
-	var signVersion string
+	var signType string
 
-	//signVersion = 0 => Pki based sign in lite mode
-	//signVersion = 1 => Nlss based sign in basic mode
+	//signType = 0 => Pki based sign in lite mode
+	//signType = 1 => Nlss based sign in basic mode
 	if util.HexToStr(ss) == "" {
-		signVersion = "0"
+		signType = "0"
 	} else {
-		signVersion = "1"
+		signType = "1"
 	}
 
 	switch qt {
@@ -761,15 +760,15 @@ func (c *Core) finishConsensus(id string, qt int, p *ipfsport.Peer, status bool,
 				PrivSignature: util.HexToStr(ps),
 				DID:           did,
 				Hash:          hash,
-        SignVersion:   signVersion,
+				SignType:      signType,
 			}
 			if cs.Result.SuccessCount < MinConsensusRequired-1 {
 				cs.P[did] = p
 				cs.Credit.Credit = append(cs.Credit.Credit, csig)
 				cs.Result.SuccessCount++
 				if did == pledgingDID {
 					cs.Result.PledgingDIDSignStatus = true
-        }
+				}
 			} else if (did == pledgingDID || cs.Result.PledgingDIDSignStatus) && cs.Result.SuccessCount == MinConsensusRequired-1 {
 				cs.P[did] = p
 				cs.Credit.Credit = append(cs.Credit.Credit, csig)
@@ -929,14 +928,16 @@ func (c *Core) pledgeQuorumToken(cr *ConensusRequest, sc *contract.Contract, tid
 		return nil, fmt.Errorf("invalid pledge request")
 	}
 	ti := sc.GetTransTokenInfo()
-	credit := make([]string, 0)
+	credit := make([]block.CreditSignature, 0)
 	for _, csig := range cs.Credit.Credit {
-		jb, err := json.Marshal(csig)
-		if err != nil {
-			c.log.Error("Failed to parse quorum credit", "err", err)
-			return nil, fmt.Errorf("failed to parse quorum credit")
-		}
-		credit = append(credit, string(jb))
+		credit_ := block.CreditSignature{
+			Signature:     csig.Signature,
+			PrivSignature: csig.PrivSignature,
+			DID:           csig.DID,
+			Hash:          csig.Hash,
+			SignType:      csig.SignType,
+		}
+		credit = append(credit, credit_)
 	}
 	ptds := make([]block.PledgeDetail, 0)
 	for k, v := range pd.PledgedTokens {
@@ -1004,6 +1005,22 @@ func (c *Core) pledgeQuorumToken(cr *ConensusRequest, sc *contract.Contract, tid
 	}
 	//tokenList = append(tokenList, cr.PartTokens...)
 
+	//Fetching sender signature to add it to transaction details
+	senderdid := sc.GetSenderDID()
+	sign_data, sender_share_sign, sender_priv_sign, err := sc.GetHashSig(senderdid)
+	if err != nil {
+		c.log.Error("failed to fetch sender sign", "err", err)
+		return nil, fmt.Errorf("failed to fetch sender sign")
+	}
+	sender_sign_type := dc.GetSignType()
+	sender_sign := &block.SenderSignature{
+		NLSS_share:   sender_share_sign,
+		Private_sign: sender_priv_sign,
+		DID:          senderdid,
+		Hash:         sign_data,
+		SignType:     sender_sign_type,
+	}
+
 	var tcb block.TokenChainBlock
 
 	if cr.Mode == SmartContractDeployMode {
@@ -1062,6 +1079,7 @@ func (c *Core) pledgeQuorumToken(cr *ConensusRequest, sc *contract.Contract, tid
 			QuorumSignature: credit,
 			SmartContract:   sc.GetBlock(),
 			PledgeDetails:   ptds,
+			SenderSignature: sender_sign,
 		}
 	}
 

did/basic.go

@@ -63,6 +63,8 @@ func (d *DIDBasic) GetDID() string {
 	return d.did
 }
 
+// When the did creation and signing is done in Basic mode,
+// this function returns the sign version as NLSSVersion = 1
 func (d *DIDBasic) GetSignType() int {
 	return NlssVersion
 }

did/child.go

@@ -64,6 +64,8 @@ func (d *DIDChild) GetDID() string {
 	return d.did
 }
 
+// When the did creation and signing is done in Child mode,
+// this function returns the sign version as NLSSVersion = 1
 func (d *DIDChild) GetSignType() int {
 	return NlssVersion
 }

did/standard.go

@@ -55,6 +55,8 @@ func (d *DIDStandard) GetDID() string {
 	return d.did
 }
 
+// When the did creation and signing is done in Standard mode,
+// this function returns the sign version as NLSSVersion = 1
 func (d *DIDStandard) GetSignType() int {
 	return NlssVersion
 }

did/wallet.go

@@ -56,6 +56,8 @@ func (d *DIDWallet) GetDID() string {
 	return d.did
 }
 
+// When the did creation and signing is done in wallet mode,
+// this function returns the sign version as NLSSVersion = 1
 func (d *DIDWallet) GetSignType() int {
 	return NlssVersion
 }