Integrated new FSC version

Signed-off-by: Alexandros Filios <[email protected]>

integration/token/fungible/views/auditor.go

@@ -152,7 +152,7 @@ func (a *AuditView) Call(context view.Context) (interface{}, error) {
 		}
 	}
 
-	kvsInstance := kvs.GetService(context)
+	kvsInstance := GetKVS(context)
 
 	for _, rID := range inputs.RevocationHandles() {
 		rh := hash.Hashable(rID).String()

integration/token/fungible/views/revoke.go

@@ -27,7 +27,7 @@ type RevokeUserView struct {
 func (u *RevokeUserView) Call(context view.Context) (interface{}, error) {
 	rh := hash.Hashable(u.RH).String()
 	logger.Infof("revoke [%s][%s]", u.RH, rh)
-	kvsInstance := kvs.GetService(context)
+	kvsInstance := GetKVS(context)
 	k := kvs.CreateCompositeKeyOrPanic("revocationList", []string{rh})
 	assert.False(kvsInstance.Exists(k), "Identity already in revoked state")
 	assert.NoError(kvsInstance.Put(k, rh), "failed to put revocation handle")

integration/token/fungible/views/utils.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"strings"
 
+	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
@@ -51,7 +52,7 @@ type SetKVSEntryView struct {
 }
 
 func (s *SetKVSEntryView) Call(context view.Context) (interface{}, error) {
-	assert.NoError(kvs.GetService(context).Put(s.Key, s.Value), "failed to put in KVS [%s:%s]", s.Key, s.Value)
+	assert.NoError(GetKVS(context).Put(s.Key, s.Value), "failed to put in KVS [%s:%s]", s.Key, s.Value)
 	return nil, nil
 }
 
@@ -81,3 +82,11 @@ func TxOpts(tmsId *token.TMSID) []ttx.TxOption {
 	}
 	return txOpts
 }
+
+func GetKVS(sp view2.ServiceProvider) *kvs.KVS {
+	kvss, err := sp.GetService(&kvs.KVS{})
+	if err != nil {
+		panic(err)
+	}
+	return kvss.(*kvs.KVS)
+}

integration/token/fungible/views/withdraw.go

@@ -12,7 +12,6 @@ import (
 
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
 	"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/ttx"
@@ -126,7 +125,7 @@ func (p *WithdrawalResponderView) Call(context view.Context) (interface{}, error
 		var tx *ttx.Transaction
 		var auditorID string
 		if len(p.Auditor) == 0 {
-			assert.NoError(kvs.GetService(context).Get("auditor", &auditorID), "failed to retrieve auditor id")
+			assert.NoError(GetKVS(context).Get("auditor", &auditorID), "failed to retrieve auditor id")
 		} else {
 			auditorID = p.Auditor
 		}

token/core/zkatdlog/crypto/audit/auditor_test.go

@@ -234,9 +234,10 @@ func (f *fakeProv) TranslatePath(path string) string {
 
 func getIdemixInfo(dir string) (driver.Identity, *msp3.AuditInfo) {
 	registry := registry2.New()
-	Expect(registry.RegisterService(&fakeProv{typ: "memory"})).NotTo(HaveOccurred())
+	configService := &fakeProv{typ: "memory"}
+	Expect(registry.RegisterService(configService)).NotTo(HaveOccurred())
 
-	backend, err := kvs.New(registry, &mem.Driver{}, "")
+	backend, err := kvs.NewWithConfig(&mem.Driver{}, "", configService)
 	Expect(err).NotTo(HaveOccurred())
 	err = registry.RegisterService(backend)
 	Expect(err).NotTo(HaveOccurred())

token/core/zkatdlog/crypto/validator/validator_test.go

@@ -367,9 +367,10 @@ func (f *fakeProv) TranslatePath(path string) string {
 
 func getIdemixInfo(dir string) (driver.Identity, *msp3.AuditInfo, driver.SigningIdentity) {
 	registry := registry2.New()
-	Expect(registry.RegisterService(&fakeProv{typ: "memory"})).NotTo(HaveOccurred())
+	configService := &fakeProv{typ: "memory"}
+	Expect(registry.RegisterService(configService)).NotTo(HaveOccurred())
 
-	backend, err := kvs.New(registry, &mem.Driver{}, "")
+	backend, err := kvs.NewWithConfig(&mem.Driver{}, "", configService)
 	Expect(err).NotTo(HaveOccurred())
 	err = registry.RegisterService(backend)
 	Expect(err).NotTo(HaveOccurred())

token/sdk/dig/sdk.go

@@ -162,6 +162,7 @@ func (p *SDK) Install() error {
 
 	// Backward compatibility with SP
 	err = errors2.Join(
+		digutils.Register[*kvs.KVS](p.Container()),
 		digutils.Register[*network.Provider](p.Container()),
 		digutils.Register[*token.ManagementServiceProvider](p.Container()),
 		digutils.Register[*ttxdb.Manager](p.Container()),

token/services/network/orion/network.go

@@ -241,9 +241,9 @@ func (n *Network) AddFinalityListener(namespace string, txID string, listener dr
 		net:         n,
 		root:        listener,
 		network:     n.n.Name(),
-		sp:          n.n.SP,
 		namespace:   namespace,
 		retryRunner: db.NewRetryRunner(-1, time.Second, true),
+		viewManager: n.viewManager,
 	}
 	n.subscribers.Set(txID, listener, wrapper)
 	return n.n.Committer().AddFinalityListener(txID, wrapper)
@@ -332,10 +332,10 @@ func (l *ledger) Status(id string) (driver.ValidationCode, error) {
 type FinalityListener struct {
 	net         *Network
 	root        driver.FinalityListener
-	sp          token2.ServiceProvider
 	network     string
 	namespace   string
 	retryRunner db.RetryRunner
+	viewManager *view2.Manager
 }
 
 func (t *FinalityListener) OnStatus(txID string, status int, message string) {
@@ -346,7 +346,7 @@ func (t *FinalityListener) OnStatus(txID string, status int, message string) {
 
 func (t *FinalityListener) runOnStatus(txID string, status int, message string) (err error) {
 	defer func() { err = wrapRecover(recover()) }()
-	boxed, err := view2.GetManager(t.sp).InitiateView(NewRequestTxStatusView(t.network, t.namespace, txID), context.TODO())
+	boxed, err := t.viewManager.InitiateView(NewRequestTxStatusView(t.network, t.namespace, txID), context.TODO())
 	if err != nil {
 		return fmt.Errorf("failed retrieving token request [%s]: [%s]", txID, err)
 	}

token/services/nfttx/uniqueness/uniqueness.go

@@ -84,7 +84,9 @@ func (s *Service) ComputeID(state interface{}) (string, error) {
 
 // GetService returns the uniqueness service.
 func GetService(sp token.ServiceProvider) *Service {
-	return &Service{
-		kvs: kvs.GetService(sp),
+	kvss, err := sp.GetService(&kvs.KVS{})
+	if err != nil {
+		panic(err)
 	}
+	return &Service{kvs: kvss.(*kvs.KVS)}
 }

token/services/ttx/accept.go

@@ -96,7 +96,9 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error {
 				return errors.Wrap(err, "failed to generate key to store signature request")
 			}
 			var srRaw []byte
-			if err := kvs.GetService(context).Get(k, &srRaw); err != nil {
+			if kvss, err := context.GetService(&kvs.KVS{}); err != nil {
+				return errors.Wrap(err, "failed to get KVS from context")
+			} else if err := kvss.(*kvs.KVS).Get(k, &srRaw); err != nil {
 				return errors.Wrap(err, "failed to to store signature request")
 			}
 			if err := Unmarshal(srRaw, signatureRequest); err != nil {

token/services/ttx/endorse.go

@@ -666,7 +666,9 @@ func (f *ReceiveTransactionView) unmarshalAsSignatureRequest(context view.Contex
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to generate key to store signature request")
 	}
-	if err := kvs.GetService(context).Put(k, raw); err != nil {
+	if kvss, err := context.GetService(&kvs.KVS{}); err != nil {
+		return nil, errors.Wrap(err, "failed to get KVS from context")
+	} else if err := kvss.(*kvs.KVS).Put(k, raw); err != nil {
 		return nil, errors.Wrap(err, "failed to to store signature request")
 	}
 	return tx, nil