HashEscrow: separate hash-based escrow identity flow (#1657)

integration/token/interop/support.go

@@ -21,6 +21,7 @@ import (
 	common2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/views"
 	views2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/interop/views"
+	hashescrowviews "github.com/hyperledger-labs/fabric-token-sdk/integration/token/interop/views/hashescrow"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/interop/views/htlc"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
@@ -320,6 +321,61 @@ func HTLCLock(network *integration.Infrastructure, tmsID token.TMSID, id *token3
 	}
 }
 
+func HashEscrowLock(network *integration.Infrastructure, tmsID token.TMSID, id *token3.NodeReference, wallet string, typ token2.Type, amount uint64, receiver *token3.NodeReference, auditor *token3.NodeReference, recipientHash []byte, senderHash []byte, hashFunc crypto.Hash, errorMsgs ...string) (string, []byte, []byte, []byte, []byte) {
+	result, err := network.Client(id.ReplicaName()).CallView("hashescrow.lock", common.JSONMarshall(&hashescrowviews.Lock{
+		TMSID:         tmsID,
+		Wallet:        wallet,
+		Type:          typ,
+		Amount:        amount,
+		Recipient:     network.Identity(receiver.Id()),
+		RecipientHash: recipientHash,
+		SenderHash:    senderHash,
+		HashFunc:      hashFunc,
+	}))
+	if len(errorMsgs) == 0 {
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		lockResult := &hashescrowviews.LockInfo{}
+		common.JSONUnmarshal(result.([]byte), lockResult)
+
+		common2.CheckFinality(network, receiver, lockResult.TxID, &tmsID, false)
+		common2.CheckFinality(network, auditor, lockResult.TxID, &tmsID, false)
+
+		if len(recipientHash) == 0 {
+			gomega.Expect(lockResult.RecipientPreImage).NotTo(gomega.BeNil())
+		}
+		if len(senderHash) == 0 {
+			gomega.Expect(lockResult.SenderPreImage).NotTo(gomega.BeNil())
+		}
+		gomega.Expect(lockResult.RecipientHash).NotTo(gomega.BeNil())
+		gomega.Expect(lockResult.SenderHash).NotTo(gomega.BeNil())
+		if len(recipientHash) != 0 {
+			gomega.Expect(lockResult.RecipientHash).To(gomega.BeEquivalentTo(recipientHash))
+		}
+		if len(senderHash) != 0 {
+			gomega.Expect(lockResult.SenderHash).To(gomega.BeEquivalentTo(senderHash))
+		}
+
+		return lockResult.TxID, lockResult.RecipientPreImage, lockResult.SenderPreImage, lockResult.RecipientHash, lockResult.SenderHash
+	}
+
+	gomega.Expect(err).To(gomega.HaveOccurred())
+	for _, msg := range errorMsgs {
+		gomega.Expect(err.Error()).To(gomega.ContainSubstring(msg))
+	}
+	time.Sleep(5 * time.Second)
+
+	errMsg := err.Error()
+	fmt.Printf("Got error message [%s]\n", errMsg)
+	txID := ""
+	index := strings.Index(err.Error(), "<<<[")
+	if index != -1 {
+		txID = errMsg[index+4 : index+strings.Index(err.Error()[index:], "]>>>")]
+	}
+	fmt.Printf("Got error message, extracted tx id [%s]\n", txID)
+
+	return txID, nil, nil, nil, nil
+}
+
 func HTLCReclaimAll(network *integration.Infrastructure, id *token3.NodeReference, wallet string, errorMsgs ...string) {
 	txID, err := network.Client(id.ReplicaName()).CallView("htlc.reclaimAll", common.JSONMarshall(&htlc.ReclaimAll{
 		Wallet: wallet,
@@ -404,6 +460,39 @@ func htlcClaim(network *integration.Infrastructure, tmsID token.TMSID, id *token
 	}
 }
 
+func hashEscrowClaim(network *integration.Infrastructure, tmsID token.TMSID, id *token3.NodeReference, wallet string, preImage []byte, auditor *token3.NodeReference, errorMsgs ...string) string {
+	txIDBoxed, err := network.Client(id.ReplicaName()).CallView("hashescrow.claim", common.JSONMarshall(&hashescrowviews.Claim{
+		TMSID:    tmsID,
+		Wallet:   wallet,
+		PreImage: preImage,
+	}))
+	if len(errorMsgs) == 0 {
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		txID := common.JSONUnmarshalString(txIDBoxed)
+		common2.CheckFinality(network, id, txID, &tmsID, false)
+		common2.CheckFinality(network, auditor, txID, &tmsID, false)
+
+		return txID
+	}
+
+	gomega.Expect(err).To(gomega.HaveOccurred())
+	for _, msg := range errorMsgs {
+		gomega.Expect(err.Error()).To(gomega.ContainSubstring(msg))
+	}
+	time.Sleep(5 * time.Second)
+
+	errMsg := err.Error()
+	fmt.Printf("Got error message [%s]\n", errMsg)
+	txID := ""
+	index := strings.Index(err.Error(), "<<<[")
+	if index != -1 {
+		txID = errMsg[index+4 : index+strings.Index(err.Error()[index:], "]>>>")]
+	}
+	fmt.Printf("Got error message, extracted tx id [%s]\n", txID)
+
+	return txID
+}
+
 func fastExchange(network *integration.Infrastructure, id *token3.NodeReference, recipient *token3.NodeReference, tmsID1 token.TMSID, typ1 token2.Type, amount1 uint64, tmsID2 token.TMSID, typ2 token2.Type, amount2 uint64, deadline time.Duration) {
 	_, err := network.Client(id.ReplicaName()).CallView("htlc.fastExchange", common.JSONMarshall(&htlc.FastExchange{
 		Recipient:           network.Identity(recipient.Id()),

integration/token/interop/tests.go

@@ -25,6 +25,7 @@ import (
 const (
 	EUR = token3.Type("EUR")
 	USD = token3.Type("USD")
+	GBP = token3.Type("GBP")
 )
 
 func TestHTLCSingleNetwork(network *integration.Infrastructure, sel *token2.ReplicaSelector) {
@@ -143,6 +144,43 @@ func TestHTLCSingleNetwork(network *integration.Infrastructure, sel *token2.Repl
 		IDs := ListVaultUnspentTokens(network, defaultTMSID, name)
 		CheckIfExistsInVault(network, defaultTMSID, auditor, IDs)
 	}
+
+	TestHashEscrowSingleNetwork(network, sel)
+}
+
+func TestHashEscrowSingleNetwork(network *integration.Infrastructure, sel *token2.ReplicaSelector) {
+	alice := sel.Get("alice")
+	bob := sel.Get("bob")
+	auditor := sel.Get("auditor")
+
+	defaultTMSID := token.TMSID{}
+
+	IssueCash(network, "", GBP, 20, alice, auditor)
+	CheckBalance(network, alice, "", GBP, 20)
+	CheckBalance(network, bob, "", GBP, 0)
+
+	_, recipientPreImage, _, _, _ := HashEscrowLock(network, defaultTMSID, alice, "", GBP, 10, bob, auditor, nil, nil, crypto.SHA3_256)
+	CheckBalance(network, alice, "", GBP, 10)
+	CheckBalance(network, bob, "", GBP, 0)
+
+	hashEscrowClaim(network, defaultTMSID, bob, "", recipientPreImage, auditor)
+	CheckBalance(network, alice, "", GBP, 10)
+	CheckBalance(network, bob, "", GBP, 10)
+
+	hashEscrowClaim(network, defaultTMSID, bob, "", recipientPreImage, auditor, "expected only one hash escrow script to match")
+	CheckBalance(network, alice, "", GBP, 10)
+	CheckBalance(network, bob, "", GBP, 10)
+
+	_, _, senderPreImage, _, _ := HashEscrowLock(network, defaultTMSID, alice, "", GBP, 7, bob, auditor, nil, nil, crypto.SHA3_256)
+	CheckBalance(network, alice, "", GBP, 3)
+	CheckBalance(network, bob, "", GBP, 10)
+
+	hashEscrowClaim(network, defaultTMSID, bob, "", senderPreImage, auditor)
+	gomega.Eventually(CheckBalanceReturnError).WithArguments(network, alice, "", GBP, uint64(10)).WithTimeout(2 * time.Minute).WithPolling(5 * time.Second).Should(gomega.Succeed())
+	CheckBalance(network, bob, "", GBP, 10)
+
+	CheckOwnerStore(network, defaultTMSID, nil, alice, bob)
+	CheckAuditorStore(network, defaultTMSID, auditor, "", nil)
 }
 
 func TestHTLCTwoNetworks(network *integration.Infrastructure, sel *token2.ReplicaSelector) {

integration/token/interop/topology.go

@@ -19,6 +19,7 @@ import (
 	views3 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/common/views"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/views"
 	views2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/interop/views"
+	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/interop/views/hashescrow"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/interop/views/htlc"
 )
 
@@ -245,6 +246,9 @@ func addAlice(fscTopology *fsc.Topology) *node.Node {
 		RegisterViewFactory("htlc.lock", &htlc.LockViewFactory{}).
 		RegisterViewFactory("htlc.reclaimAll", &htlc.ReclaimAllViewFactory{}).
 		RegisterViewFactory("htlc.fastExchange", &htlc.FastExchangeInitiatorViewFactory{}).
+		RegisterResponder(&hashescrow.LockAcceptView{}, &hashescrow.LockView{}).
+		RegisterViewFactory("hashescrow.lock", &hashescrow.LockViewFactory{}).
+		RegisterViewFactory("hashescrow.claim", &hashescrow.ClaimViewFactory{}).
 		RegisterViewFactory("TxFinality", &views3.TxFinalityViewFactory{})
 }
 
@@ -264,5 +268,8 @@ func addBob(fscTopology *fsc.Topology) *node.Node {
 		RegisterResponder(&htlc.LockAcceptView{}, &htlc.LockView{}).
 		RegisterResponder(&htlc.FastExchangeResponderView{}, &htlc.FastExchangeInitiatorView{}).
 		RegisterViewFactory("htlc.claim", &htlc.ClaimViewFactory{}).
+		RegisterResponder(&hashescrow.LockAcceptView{}, &hashescrow.LockView{}).
+		RegisterViewFactory("hashescrow.lock", &hashescrow.LockViewFactory{}).
+		RegisterViewFactory("hashescrow.claim", &hashescrow.ClaimViewFactory{}).
 		RegisterViewFactory("TxFinality", &views3.TxFinalityViewFactory{})
 }

integration/token/interop/views/auditor.go

@@ -14,6 +14,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/interop/hashescrow"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/interop/htlc"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
 )
@@ -68,26 +69,40 @@ func (a *AuditView) Call(context view.Context) (interface{}, error) {
 	for i := range inputs.Count() {
 		input, err := htlc.ToInput(inputs.At(i))
 		assert.NoError(err, "cannot get htlc input wrapper")
-		if !input.IsHTLC() {
-			continue
+		if input.IsHTLC() {
+			// check script details, for example make sure the hash is set
+			script, err := input.Script()
+			assert.NoError(err, "cannot get htlc script from input")
+			assert.True(len(script.HashInfo.Hash) > 0, "hash is not set")
+		}
+
+		hashEscrowInput, err := hashescrow.ToInput(inputs.At(i))
+		assert.NoError(err, "cannot get hash escrow input wrapper")
+		if hashEscrowInput.IsHashEscrow() {
+			hashEscrowScript, err := hashEscrowInput.Script()
+			assert.NoError(err, "cannot get hash escrow script from input")
+			assert.NoError(hashEscrowScript.Validate(), "hash escrow script is not valid")
 		}
-		// check script details, for example make sure the hash is set
-		script, err := input.Script()
-		assert.NoError(err, "cannot get htlc script from input")
-		assert.True(len(script.HashInfo.Hash) > 0, "hash is not set")
 	}
 
 	now := time.Now()
 	for i := range outputs.Count() {
 		output, err := htlc.ToOutput(outputs.At(i))
 		assert.NoError(err, "cannot get htlc output wrapper")
-		if !output.IsHTLC() {
-			continue
+		if output.IsHTLC() {
+			// check script details
+			script, err := output.Script()
+			assert.NoError(err, "cannot get htlc script from output")
+			assert.NoError(script.Validate(now), "script is not valid")
+		}
+
+		hashEscrowOutput, err := hashescrow.ToOutput(outputs.At(i))
+		assert.NoError(err, "cannot get hash escrow output wrapper")
+		if hashEscrowOutput.IsHashEscrow() {
+			hashEscrowScript, err := hashEscrowOutput.Script()
+			assert.NoError(err, "cannot get hash escrow script from output")
+			assert.NoError(hashEscrowScript.Validate(), "hash escrow script is not valid")
 		}
-		// check script details
-		script, err := output.Script()
-		assert.NoError(err, "cannot get htlc script from output")
-		assert.NoError(script.Validate(now), "script is not valid")
 	}
 
 	return context.RunView(ttx.NewAuditApproveView(w, tx))

integration/token/interop/views/hashescrow/claim.go

@@ -0,0 +1,81 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package hashescrow
+
+import (
+	"encoding/json"
+
+	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/assert"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/id"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+	"github.com/hyperledger-labs/fabric-token-sdk/token"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/interop/hashescrow"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
+)
+
+type Claim struct {
+	TMSID    token.TMSID
+	Wallet   string
+	PreImage []byte
+}
+
+type ClaimView struct {
+	*Claim
+}
+
+func (r *ClaimView) Call(ctx view.Context) (res interface{}, err error) {
+	var tx *hashescrow.Transaction
+	defer func() {
+		if e := recover(); e != nil {
+			txID := "none"
+			if tx != nil {
+				txID = tx.ID()
+			}
+			if err == nil {
+				err = errors.Errorf("<<<[%s]>>>: %s", txID, e)
+			} else {
+				err = errors.Errorf("<<<[%s]>>>: %s", txID, err)
+			}
+		}
+	}()
+
+	claimWallet := hashescrow.GetWallet(ctx, r.Wallet, token.WithTMSID(r.TMSID))
+	assert.NotNil(claimWallet, "wallet [%s] not found", r.Wallet)
+
+	matched, err := hashescrow.Wallet(claimWallet).ListByPreImage(ctx.Context(), r.PreImage)
+	assert.NoError(err, "failed looking up hash escrow script")
+	assert.True(matched.Count() == 1, "expected only one hash escrow script to match [%s], got [%d]", view.Identity(r.PreImage), matched.Count())
+
+	idProvider, err := id.GetProvider(ctx)
+	assert.NoError(err, "failed getting id provider")
+	tx, err = hashescrow.NewAnonymousTransaction(
+		ctx,
+		ttx.WithAuditor(idProvider.Identity("auditor")),
+		ttx.WithTMSID(r.TMSID),
+	)
+	assert.NoError(err, "failed to create a hash escrow transaction")
+	assert.NoError(tx.Claim(claimWallet, matched.At(0), r.PreImage), "failed adding a hash escrow claim for [%s]", matched.At(0).Id)
+
+	_, err = ctx.RunView(ttx.NewCollectEndorsementsView(tx.Transaction))
+	assert.NoError(err, "failed to collect endorsements on hash escrow transaction")
+
+	_, err = ctx.RunView(ttx.NewOrderingAndFinalityView(tx.Transaction))
+	assert.NoError(err, "failed to commit hash escrow transaction")
+
+	return tx.ID(), nil
+}
+
+type ClaimViewFactory struct{}
+
+func (p *ClaimViewFactory) NewView(in []byte) (view.View, error) {
+	f := &ClaimView{Claim: &Claim{}}
+	err := json.Unmarshal(in, f.Claim)
+	assert.NoError(err, "failed unmarshalling input")
+
+	return f, nil
+}