FSC #963 Dep Update (#1121)

adecaro · web-flow · commit 4fd00f675185 · 2025-06-28T07:07:44.000+02:00
Signed-off-by: Angelo De Caro &lt;adc@zurich.ibm.com&gt;
diff --git a/cmd/tokengen/samples/topology/fungible.go b/cmd/tokengen/samples/topology/fungible.go
@@ -10,15 +10,15 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	api2 "github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	"github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/cmd/tokengen/cobra/artifactgen"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
 	fabric2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/fabric"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/views"
 	tokensdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/dig"
 )
 
-func Topology(tokenSDKDriver string, sdks ...api2.SDK) []api.Topology {
+func Topology(tokenSDKDriver string, sdks ...node.SDK) []api.Topology {
 	// Fabric
 	fabricTopology := fabric.NewDefaultTopology()
 	fabricTopology.EnableIdemix()
diff --git a/go.mod b/go.mod
@@ -12,7 +12,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.20250619184516-0b8322da538b
+	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250627134842-33740afab52d
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
 	github.com/hyperledger/fabric-chaincode-go v0.0.0-20240704073638-9fb89180dc17
 	github.com/hyperledger/fabric-lib-go v1.1.2
diff --git a/go.sum b/go.sum
@@ -1052,8 +1052,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 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.20250619184516-0b8322da538b h1:LNrC1jETuJmWeFhbBEBYrmYCsnbPd16ZUnCPzQRjrho=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250619184516-0b8322da538b/go.mod h1:qYv/trRBFf95pKaYtG1c5K1Zc/zxGI7wJXPBCEG+01M=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250627134842-33740afab52d h1:XTpT/EXYCdePXfPUnSIjilI9uy/xpoY5wMFw4bDJ7Ws=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250627134842-33740afab52d/go.mod h1:qYv/trRBFf95pKaYtG1c5K1Zc/zxGI7wJXPBCEG+01M=
 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2 h1:w5BGxCYEsc9vjdDEdZGrZ5redvs263RYsdT2tqF7cNk=
 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2/go.mod h1:LSwfuRgX/5C2uHkdT3hJtBFu/ALxuL7dFj1pmBby2R4=
 github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=
diff --git a/integration/nwo/token/topology.go b/integration/nwo/token/topology.go
@@ -9,7 +9,7 @@ package token
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric/config"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
@@ -88,7 +88,7 @@ func (t *Topology) AddTMS(fscNodes []*node.Node, backend BackedTopology, channel
 	return tms
 }
 
-func (t *Topology) SetSDK(fscTopology *fsc.Topology, sdk api.SDK) {
+func (t *Topology) SetSDK(fscTopology *fsc.Topology, sdk nodepkg.SDK) {
 	for _, node := range fscTopology.Nodes {
 		node.AddSDK(sdk)
 	}
diff --git a/integration/token/common/sdk/fall/sdk.go b/integration/token/common/sdk/fall/sdk.go
@@ -9,8 +9,8 @@ package fall
 import (
 	"errors"
 
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	dig2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/sdk/dig"
+	digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
 	fabtoken "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/v1/driver"
 	dlog "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/driver"
 	tokensdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/dig"
@@ -22,7 +22,7 @@ type SDK struct {
 	dig2.SDK
 }
 
-func NewSDK(registry node.Registry) *SDK {
+func NewSDK(registry digutils.Registry) *SDK {
 	return &SDK{SDK: tokensdk.NewSDK(registry)}
 }
 
diff --git a/integration/token/common/sdk/fdlog/sdk.go b/integration/token/common/sdk/fdlog/sdk.go
@@ -9,7 +9,7 @@ package fdlog
 import (
 	"errors"
 
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/node"
+	digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
 	dlog "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/driver"
 	tokensdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/dig"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
@@ -20,7 +20,7 @@ type SDK struct {
 	*tokensdk.SDK
 }
 
-func NewSDK(registry node.Registry) *SDK {
+func NewSDK(registry digutils.Registry) *SDK {
 	return &SDK{SDK: tokensdk.NewSDK(registry)}
 }
 
diff --git a/integration/token/common/sdk/ffabtoken/sdk.go b/integration/token/common/sdk/ffabtoken/sdk.go
@@ -9,7 +9,7 @@ package ffabtoken
 import (
 	"errors"
 
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/node"
+	digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
 	fabtoken "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/v1/driver"
 	tokensdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/dig"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
@@ -20,7 +20,7 @@ type SDK struct {
 	*tokensdk.SDK
 }
 
-func NewSDK(registry node.Registry) *SDK {
+func NewSDK(registry digutils.Registry) *SDK {
 	return &SDK{SDK: tokensdk.NewSDK(registry)}
 }
 
diff --git a/integration/token/common/topology.go b/integration/token/common/topology.go
@@ -9,7 +9,7 @@ package common
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/dlog"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric/config"
@@ -36,7 +36,7 @@ type Opts struct {
 	FSCLogSpec          string
 	NoAuditor           bool
 	HSM                 bool
-	SDKs                []api.SDK
+	SDKs                []nodepkg.SDK
 	WebEnabled          bool
 	Monitoring          bool
 	TokenSelector       string
diff --git a/integration/token/dvp/dlog/dlog_test.go b/integration/token/dvp/dlog/dlog_test.go
@@ -8,7 +8,7 @@ package dlog
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	api2 "github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -34,7 +34,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 		CommType:       commType,
 		DefaultTMSOpts: common.TMSOpts{TokenSDKDriver: "dlog"},
 		FSCLogSpec:     "",
-		SDKs:           []api2.SDK{&fdlog.SDK{}},
+		SDKs:           []nodepkg.SDK{&fdlog.SDK{}},
 		Replication:    opts,
 	}))
 	return ts, selector
diff --git a/integration/token/dvp/fabtoken/fabtoken_test.go b/integration/token/dvp/fabtoken/fabtoken_test.go
@@ -8,7 +8,7 @@ package fabtoken
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	api2 "github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -34,7 +34,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 		CommType:       commType,
 		DefaultTMSOpts: common.TMSOpts{TokenSDKDriver: "fabtoken"},
 		// FSCLogSpec:     "token-sdk=debug:fabric-sdk=debug:info",
-		SDKs:        []api2.SDK{&ffabtoken.SDK{}},
+		SDKs:        []nodepkg.SDK{&ffabtoken.SDK{}},
 		Replication: opts,
 	}))
 	return ts, selector
diff --git a/integration/token/dvp/topology.go b/integration/token/dvp/topology.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	api2 "github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
 	fabric2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/fabric"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
@@ -25,7 +25,7 @@ type Opts struct {
 	CommType       fsc.P2PCommunicationType
 	DefaultTMSOpts common.TMSOpts
 	FSCLogSpec     string
-	SDKs           []api2.SDK
+	SDKs           []nodepkg.SDK
 	Replication    token2.ReplicationOpts
 }
 
diff --git a/integration/token/fungible/dlog/dlog_test.go b/integration/token/fungible/dlog/dlog_test.go
@@ -8,7 +8,7 @@ package dlog
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	integration2 "github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -144,7 +144,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, mask int, factor int, token
 			AuditorAsIssuer:     mask&AuditorAsIssuer > 0,
 			HSM:                 mask&HSM > 0,
 			WebEnabled:          mask&WebEnabled > 0,
-			SDKs:                []api.SDK{&fdlog.SDK{}},
+			SDKs:                []nodepkg.SDK{&fdlog.SDK{}},
 			Monitoring:          false,
 			ReplicationOpts:     opts,
 			FSCBasedEndorsement: mask&WithEndorsers > 0,
diff --git a/integration/token/fungible/dloghsm/dlog_test.go b/integration/token/fungible/dloghsm/dlog_test.go
@@ -8,7 +8,7 @@ package dloghsm
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	integration2 "github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -55,7 +55,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, mask int, factor int, names
 			AuditorAsIssuer: mask&AuditorAsIssuer > 0,
 			HSM:             mask&HSM > 0,
 			WebEnabled:      mask&WebEnabled > 0,
-			SDKs:            []api.SDK{&fdlog.SDK{}},
+			SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
 			// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
 			ReplicationOpts: opts,
 		},
diff --git a/integration/token/fungible/dlogstress/dlog_test.go b/integration/token/fungible/dlogstress/dlog_test.go
@@ -8,7 +8,7 @@ package dlog
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common/sdk/fdlog"
@@ -31,7 +31,7 @@ var _ = Describe("Stress EndToEnd", func() {
 	}
 })
 
-var sdks = map[string]api.SDK{
+var sdks = map[string]nodepkg.SDK{
 	"fabric": &fdlog.SDK{},
 }
 
@@ -45,7 +45,7 @@ func newTestSuite(backend string) (*token.TestSuite, *token.ReplicaSelector) {
 			ReplicationOpts: opts,
 			CommType:        fsc.LibP2P,
 			// FSCLogSpec:      "token-sdk=debug:info",
-			SDKs:       []api.SDK{sdks[backend]},
+			SDKs:       []nodepkg.SDK{sdks[backend]},
 			Monitoring: true,
 		},
 	))
diff --git a/integration/token/fungible/fabtoken/fabtoken_test.go b/integration/token/fungible/fabtoken/fabtoken_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	integration2 "github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -64,7 +64,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 			Backend:         "fabric",
 			CommType:        commType,
 			DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "fabtoken", Aries: true},
-			SDKs:            []api.SDK{&ffabtoken.SDK{}},
+			SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
 			ReplicationOpts: opts,
 			WebEnabled:      true, // Needed for the Remote Wallet with websockets
 			// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
diff --git a/integration/token/fungible/mixed/mixed_test.go b/integration/token/fungible/mixed/mixed_test.go
@@ -8,7 +8,7 @@ package mixed
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -33,7 +33,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 	opts, selector := token2.NewReplicationOptions(factor, names...)
 	ts := token2.NewTestSuite(StartPortDlog, Topology(common.Opts{
 		CommType:        commType,
-		SDKs:            []api.SDK{&fall.SDK{}},
+		SDKs:            []nodepkg.SDK{&fall.SDK{}},
 		ReplicationOpts: opts,
 	}))
 	return ts, selector
diff --git a/integration/token/fungible/update/update_test.go b/integration/token/fungible/update/update_test.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -73,7 +73,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, fabtokenPrecision int, extr
 	ts := token2.NewTestSuite(StartPortDlog, topology.Topology(common.Opts{
 		Backend:         "fabric",
 		CommType:        commType,
-		SDKs:            []api.SDK{&fall.SDK{}},
+		SDKs:            []nodepkg.SDK{&fall.SDK{}},
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "fabtoken", PublicParamsGenArgs: []string{strconv.Itoa(fabtokenPrecision)}},
 		ExtraTMSs:       extraTMSs,
diff --git a/integration/token/interop/dlog/dlog_test.go b/integration/token/interop/dlog/dlog_test.go
@@ -8,7 +8,7 @@ package dlog_test
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	api2 "github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	integration2 "github.com/hyperledger-labs/fabric-token-sdk/integration"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
@@ -53,7 +53,7 @@ func newTestSuiteSingleFabric(commType fsc.P2PCommunicationType, factor int, nam
 		CommType:        commType,
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "dlog"},
-		SDKs:            []api2.SDK{&fdlog.SDK{}},
+		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
 		// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
 	}))
 	return ts, selector
@@ -65,7 +65,7 @@ func newTestSuiteTwoFabric(commType fsc.P2PCommunicationType, factor int, names
 		CommType:        commType,
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "dlog"},
-		SDKs:            []api2.SDK{&fdlog.SDK{}},
+		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
 		// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
 	}))
 	return ts, selector
@@ -77,7 +77,7 @@ func newTestSuiteNoCrossClaimFabric(commType fsc.P2PCommunicationType, factor in
 		CommType:        commType,
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "dlog"},
-		SDKs:            []api2.SDK{&fdlog.SDK{}},
+		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
 		// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
 		FinalityType: config.Committer,
 	}))
diff --git a/integration/token/interop/fabtoken/fabtoken_test.go b/integration/token/interop/fabtoken/fabtoken_test.go
@@ -8,7 +8,7 @@ package fabtoken_test
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	api2 "github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	integration2 "github.com/hyperledger-labs/fabric-token-sdk/integration"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
 	token2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token"
@@ -52,7 +52,7 @@ func newTestSuiteSingleFabric(commType fsc.P2PCommunicationType, factor int, nam
 		CommType:        commType,
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "fabtoken"},
-		SDKs:            []api2.SDK{&ffabtoken.SDK{}},
+		SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
 		FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
 	}))
 	return ts, selector
@@ -64,7 +64,7 @@ func newTestSuiteTwoFabric(commType fsc.P2PCommunicationType, factor int, names
 		CommType:        commType,
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "fabtoken"},
-		SDKs:            []api2.SDK{&ffabtoken.SDK{}},
+		SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
 	}))
 	return ts, selector
 }
@@ -75,7 +75,7 @@ func newTestSuiteNoCrossClaimFabric(commType fsc.P2PCommunicationType, factor in
 		CommType:        commType,
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "fabtoken"},
-		SDKs:            []api2.SDK{&ffabtoken.SDK{}},
+		SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
 		FinalityType:    "committer",
 	}))
 	return ts, selector
diff --git a/integration/token/nft/dlog/dlog_test.go b/integration/token/nft/dlog/dlog_test.go
@@ -8,7 +8,7 @@ package dlog
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
-	"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
+	nodepkg "github.com/hyperledger-labs/fabric-smart-client/pkg/node"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
@@ -34,7 +34,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 		Backend:         "fabric",
 		CommType:        commType,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: "dlog"},
-		SDKs:            []api.SDK{&fdlog.SDK{}},
+		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
 		ReplicationOpts: opts,
 	}))
 	return ts, selector
diff --git a/integration/token/nft/fabtoken/fabtoken_test.go b/integration/token/nft/fabtoken/fabtoken_test.go
diff --git a/token/sdk/dig/sdk.go b/token/sdk/dig/sdk.go

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ package fdlog`
`9`	`9`	`import (`
`10`	`10`	`"errors"`
`11`	`11`
`12`		`- "github.com/hyperledger-labs/fabric-smart-client/pkg/node"`
	`12`	`+ digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"`
`13`	`13`	`dlog "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/driver"`
`14`	`14`	`tokensdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/dig"`
`15`	`15`	`"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"`
`@@ -20,7 +20,7 @@ type SDK struct {`
`20`	`20`	`*tokensdk.SDK`
`21`	`21`	`}`
`22`	`22`
`23`		`-func NewSDK(registry node.Registry) *SDK {`
	`23`	`+func NewSDK(registry digutils.Registry) *SDK {`
`24`	`24`	`return &SDK{SDK: tokensdk.NewSDK(registry)}`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ package ffabtoken`
`9`	`9`	`import (`
`10`	`10`	`"errors"`
`11`	`11`
`12`		`- "github.com/hyperledger-labs/fabric-smart-client/pkg/node"`
	`12`	`+ digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"`
`13`	`13`	`fabtoken "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/v1/driver"`
`14`	`14`	`tokensdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/dig"`
`15`	`15`	`"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"`
`@@ -20,7 +20,7 @@ type SDK struct {`
`20`	`20`	`*tokensdk.SDK`
`21`	`21`	`}`
`22`	`22`
`23`		`-func NewSDK(registry node.Registry) *SDK {`
	`23`	`+func NewSDK(registry digutils.Registry) *SDK {`
`24`	`24`	`return &SDK{SDK: tokensdk.NewSDK(registry)}`
`25`	`25`	`}`
`26`	`26`