FSC update + adjustments

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/hashicorp/go-uuid v1.0.3
-	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250213182503-543f72422157
+	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250214055839-7d5b5ffc30ad
 	github.com/hyperledger-labs/orion-sdk-go v0.2.10
 	github.com/hyperledger-labs/orion-server v0.2.10
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2

go.sum

@@ -1057,8 +1057,8 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250213182503-543f72422157 h1:nv32gdDv1n/ICiHFTCJrX1CQicrFVO75+yP+XNb7q1Y=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250213182503-543f72422157/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250214055839-7d5b5ffc30ad h1:tG516lDRzkK45gAG7Md2/ihSJNjpjLKp14iHjqyscBM=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250214055839-7d5b5ffc30ad/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c=
 github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s=
 github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY=
 github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw=

token/services/network/fabric/finality/deliveryflm.go

@@ -20,6 +20,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault"
 	driver3 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/driver"
 	"github.com/hyperledger/fabric-protos-go/common"
@@ -105,6 +106,7 @@ func (p *deliveryBasedFLMProvider) NewManager(network, channel string) (Listener
 	}
 	mapper := p.newMapper(network, channel)
 	flm, err := events.NewListenerManager[TxInfo](
+		logging.MustGetLogger("token-sdk.network.fabric.finality"),
 		p.config,
 		ch.Delivery(),
 		&DeliveryScanQueryByID{

token/services/network/fabric/lookup/deliveryllm.go

@@ -20,6 +20,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/rwset"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/driver"
 	"github.com/hyperledger/fabric-protos-go/common"
@@ -93,10 +94,15 @@ func newEndorserDeliveryBasedLLMProvider(fnsp *fabric.NetworkServiceProvider, tr
 	if err != nil {
 		panic(err)
 	}
+	setupKey, err := keyTranslator.CreateSetupKey()
+	if err != nil {
+		panic(err)
+	}
 	return NewDeliveryBasedLLMProvider(fnsp, tracerProvider, config, func(network, _ string) events.EventInfoMapper[KeyInfo] {
 		return &endorserTxInfoMapper{
 			network: network,
-			prefix:  prefix,
+			prefix1: prefix,
+			prefix2: setupKey,
 		}
 	})
 }
@@ -111,6 +117,7 @@ func (p *deliveryBasedLLMProvider) NewManager(network, channel string) (Listener
 		return nil, err
 	}
 	flm, err := events.NewListenerManager[KeyInfo](
+		logging.MustGetLogger("token-sdk.network.fabric.llm"),
 		p.config,
 		ch.Delivery(),
 		&DeliveryScanQueryByID{
@@ -149,7 +156,8 @@ func (m *deliveryBasedLLM) RemoveLookupListener(key string, listener Listener) e
 
 type endorserTxInfoMapper struct {
 	network string
-	prefix  string
+	prefix1 string
+	prefix2 string
 }
 
 func (m *endorserTxInfoMapper) MapTxData(ctx context.Context, tx []byte, block *common.BlockMetadata, blockNum driver2.BlockNum, txNum driver2.TxNum) (map[driver2.Namespace]KeyInfo, error) {
@@ -193,9 +201,9 @@ func (m *endorserTxInfoMapper) mapTxInfo(rwSet vault2.ReadWriteSet, txID string)
 	txInfos := make(map[driver2.Namespace]KeyInfo, len(rwSet.WriteSet.Writes))
 	logger.Debugf("TX [%s] has %d namespaces", txID, len(rwSet.WriteSet.Writes))
 	for ns, writes := range rwSet.WriteSet.Writes {
-		logger.Debugf("TX [%s:%s] has %d writes", txID, ns, len(writes))
+		logger.Debugf("TX [%s:%s] has [%d] writes", txID, ns, len(writes))
 		for key, value := range writes {
-			if strings.HasPrefix(key, m.prefix) {
+			if strings.HasPrefix(key, m.prefix1) || strings.HasPrefix(key, m.prefix2) {
 				logger.Debugf("TX [%s:%s] does have key [%s].", txID, ns, key)
 				txInfos[ns] = KeyInfo{
 					Namespace: ns,