Merge upstream/main into extend-issuer-wallet

Signed-off-by: Soumya Mohapatra <mohapatras@microsoft.com>

Author: Soumya Mohapatra

docs/services/ttx.md

@@ -100,21 +100,21 @@ sequenceDiagram
     end
 
     rect rgba(255, 245, 238, 0.5)
-        Note over R: Phase 2 - Responder decision
+        Note over R: Phase 2 - Responder decision and reply
         alt RecipientRequest.RecipientData != nil
             R->>R: Verify wallet contains RecipientData.Identity
-            R-->>I: RecipientData (echo path)
         else RecipientRequest.RecipientData == nil
             R->>R: Generate RecipientData from wallet
-            R-->>I: RecipientData (fresh data path)
         end
+        R->>R: endpoint.Bind(context.Me, RecipientData.Identity)
+        Note over R,I: Bind before send so local resolver wiring fails before the peer receives RecipientData
+        R-->>I: RecipientData (echo or fresh data path)
     end
 
     rect rgba(240, 255, 240, 0.45)
-        Note over I,R: Phase 3 - Local registration and bindings
+        Note over I,R: Phase 3 - Initiator registration and bindings
         I->>I: RegisterRecipientIdentity(RecipientData)
         I->>I: endpoint.Bind(requested FSC identity, RecipientData.Identity)
-        R->>R: endpoint.Bind(context.Me, RecipientData.Identity)
     end
 
     rect rgba(245, 245, 245, 0.55)
@@ -146,14 +146,16 @@ sequenceDiagram
         Note over R: Phase 2 - Responder processing
         R->>R: RegisterRecipientIdentity(request.RecipientData)
         R->>R: GetRecipientData(responder wallet)
+        R->>R: endpoint.Bind(context.Me, responder RecipientData.Identity)
+        R->>R: endpoint.Bind(session caller, request.RecipientData.Identity)
+        Note over R,I: Binds before send so resolver wiring fails before the initiator receives our RecipientData
         R-->>I: RecipientData(responder)
     end
 
     rect rgba(240, 255, 240, 0.45)
-        Note over I,R: Phase 3 - Local registration and bindings
+        Note over I,R: Phase 3 - Initiator registration and bindings
         I->>I: RegisterRecipientIdentity(remote RecipientData)
         I->>I: endpoint.Bind(other FSC identity, remote RecipientData.Identity)
-        R->>R: endpoint.Bind(session caller, request.RecipientData.Identity)
     end
 
     Note over I,R: Full RecipientData on wire today (responder sends local wallet RecipientData)

integration/token/dvp/views/cash/list.go

@@ -11,7 +11,6 @@ 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"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
 
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
@@ -35,7 +34,7 @@ func (p *ListUnspentTokensView) Call(context view.Context) (interface{}, error)
 	assert.NotNil(wallet, "wallet [%s] not found", p.Wallet)
 
 	// Return the list of unspent tokens by type
-	return wallet.ListUnspentTokens(ttx.WithType(p.TokenType), token.WithContext(context.Context()))
+	return wallet.ListUnspentTokens(context.Context(), ttx.WithType(p.TokenType))
 }
 
 type ListUnspentTokensViewFactory struct{}

integration/token/fungible/views/balance.go

@@ -45,7 +45,7 @@ func (b *BalanceView) Call(context view.Context) (interface{}, error) {
 		return nil, fmt.Errorf("wallet %s not found: %w", b.Wallet, err)
 	}
 
-	unspentTokens, err := wallet.ListUnspentTokensIterator(token.WithType(b.Type), token.WithContext(context.Context()))
+	unspentTokens, err := wallet.ListUnspentTokensIterator(context.Context(), token.WithType(b.Type))
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed listing unspent tokens")
 	}

integration/token/fungible/views/list.go

@@ -37,7 +37,7 @@ func (p *ListUnspentTokensView) Call(context view.Context) (interface{}, error)
 	assert.NotNil(wallet, "wallet [%s] not found", p.Wallet)
 
 	// Return the list of unspent tokens by type
-	return wallet.ListUnspentTokens(ttx.WithType(p.TokenType), token.WithContext(context.Context()))
+	return wallet.ListUnspentTokens(context.Context(), ttx.WithType(p.TokenType))
 }
 
 type ListUnspentTokensViewFactory struct{}

token/core/common/driver/mock/network_driver.go

@@ -93,8 +93,6 @@ const (
 type ListTokensOptions struct {
 	// TokenType is the type of token to list
 	TokenType token.Type
-	// Context is used to track the operation
-	Context context.Context
 	// SortBy specifies which field to use for ordering the results.
 	SortBy SortField
 	// SortDirection specifies ascending or descending order.
@@ -162,10 +160,10 @@ type OwnerWallet interface {
 	GetTokenMetadataAuditInfo(id Identity) ([]byte, error)
 
 	// ListTokens returns the list of unspent tokens owned by this wallet filtered using the passed options.
-	ListTokens(opts *ListTokensOptions) (*token.UnspentTokens, error)
+	ListTokens(ctx context.Context, opts *ListTokensOptions) (*token.UnspentTokens, error)
 
 	// ListTokensIterator returns an iterator of unspent tokens owned by this wallet filtered using the passed options.
-	ListTokensIterator(opts *ListTokensOptions) (UnspentTokensIterator, error)
+	ListTokensIterator(ctx context.Context, opts *ListTokensOptions) (UnspentTokensIterator, error)
 
 	// Balance returns the sun of the amounts, with 64 bits of precision, of the tokens with type and EID equal to those passed as arguments.
 	Balance(ctx context.Context, opts *BalanceOpts) (uint64, error)