network abstraction

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
 	github.com/google/addlicense v1.0.0 // indirect
 	github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
-	github.com/hyperledger-labs/fabric-smart-client v0.0.0-20211023062436-326ec80b626e
+	github.com/hyperledger-labs/fabric-smart-client v0.0.0-20211024094403-2bc004c5cbe4
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20210722174351-9815a7a8f0f7
 	github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9
 	github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c
@@ -33,6 +33,6 @@ require (
 	github.com/stretchr/testify v1.7.1-0.20210116013205-6990a05d54c2
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00
 	go.uber.org/atomic v1.7.0
-	golang.org/x/sys v0.0.0-20211022215931-8e5104632af7 // indirect
+	golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -572,8 +572,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo=
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
-github.com/hyperledger-labs/fabric-smart-client v0.0.0-20211023062436-326ec80b626e h1:9q5c65Ot9R5e8i/X/T4YLo8FmGFZCHrAKXpXvnMH4J8=
-github.com/hyperledger-labs/fabric-smart-client v0.0.0-20211023062436-326ec80b626e/go.mod h1:iGRusTQNJMc3GhHDpI1uaQRMqt61ZVDEOGjWteVJh8c=
+github.com/hyperledger-labs/fabric-smart-client v0.0.0-20211024094403-2bc004c5cbe4 h1:ZbbJHtPmvWl0Q8T0AXoFUdoVOJcOPOwUn5XLK98v7tE=
+github.com/hyperledger-labs/fabric-smart-client v0.0.0-20211024094403-2bc004c5cbe4/go.mod h1:iGRusTQNJMc3GhHDpI1uaQRMqt61ZVDEOGjWteVJh8c=
 github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3-alpha.1 h1:vBvo0PNm82ht7wpBjlYY4ZHxV3YprCfdVd3T4JG9vBw=
 github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3-alpha.1/go.mod h1:POCGO/RK9YDfgdhuyqjoD9tRNtWfK7Rh5AYYmsb1Chc=
 github.com/hyperledger-labs/weaver-dlt-interoperability/sdks/fabric/go-sdk v1.2.3-alpha.1.0.20210812140206-37f430515b8c h1:pKr8VnHlduEgdInwLWykYAw+lpUizjQJaJ8I5fVoRUo=
@@ -1478,10 +1478,9 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211020174200-9d6173849985 h1:LOlKVhfDyahgmqa97awczplwkjzNaELFg3zRIJ13RYo=
 golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211022215931-8e5104632af7 h1:e2q1CMOFXDvurT2sa2yhJAkuA2n8Rd9tMDd7Tcfvs6M=
-golang.org/x/sys v0.0.0-20211022215931-8e5104632af7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 h1:SeSEfdIxyvwGJliREIJhRPPXvW6sDlLT+UQ3B0hD0NA=
+golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

token/services/network/logger.go

@@ -0,0 +1,11 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package network
+
+import "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
+
+var logger = flogging.MustGetLogger("token-sdk.network")

token/services/network/network.go

@@ -0,0 +1,216 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package network
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/chaincode"
+	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+	"github.com/pkg/errors"
+)
+
+type TxID struct {
+	Nonce   []byte
+	Creator []byte
+}
+
+func (t *TxID) String() string {
+	return fmt.Sprintf("[%s:%s]", base64.StdEncoding.EncodeToString(t.Nonce), base64.StdEncoding.EncodeToString(t.Creator))
+}
+
+type TransientMap map[string][]byte
+
+func (m TransientMap) Set(key string, raw []byte) error {
+	m[key] = raw
+
+	return nil
+}
+
+func (m TransientMap) Get(id string) []byte {
+	return m[id]
+}
+
+func (m TransientMap) IsEmpty() bool {
+	return len(m) == 0
+}
+
+func (m TransientMap) Exists(key string) bool {
+	_, ok := m[key]
+	return ok
+}
+
+func (m TransientMap) SetState(key string, state interface{}) error {
+	raw, err := json.Marshal(state)
+	if err != nil {
+		return err
+	}
+	m[key] = raw
+
+	return nil
+}
+
+func (m TransientMap) GetState(key string, state interface{}) error {
+	value, ok := m[key]
+	if !ok {
+		return errors.Errorf("transient map key [%s] does not exists", key)
+	}
+	if len(value) == 0 {
+		return errors.Errorf("transient map key [%s] is empty", key)
+	}
+
+	return json.Unmarshal(value, state)
+}
+
+type Envelope struct {
+	e *fabric.Envelope
+}
+
+func (e *Envelope) Results() []byte {
+	return e.e.Results()
+}
+
+func (e *Envelope) Bytes() ([]byte, error) {
+	return e.e.Bytes()
+}
+
+func (e *Envelope) TxID() string {
+	return e.e.TxID()
+}
+
+func (e *Envelope) Nonce() []byte {
+	return e.e.Nonce()
+}
+
+func (e *Envelope) Creator() []byte {
+	return e.e.Creator()
+}
+
+func (e *Envelope) MarshalJSON() ([]byte, error) {
+	raw, err := e.e.Bytes()
+	if err != nil {
+		return nil, err
+	}
+	return json.Marshal(raw)
+}
+
+func (e *Envelope) UnmarshalJSON(raw []byte) error {
+	var r []byte
+	err := json.Unmarshal(raw, &r)
+	if err != nil {
+		return err
+	}
+	return e.e.FromBytes(r)
+}
+
+type RWSet struct {
+	rws *fabric.RWSet
+}
+
+func (s *RWSet) Done() {
+	s.rws.Done()
+}
+
+type Network struct {
+	n  *fabric.NetworkService
+	ch *fabric.Channel
+}
+
+func (n *Network) GetRWSet(id string, results []byte) (*RWSet, error) {
+	rws, err := n.ch.Vault().GetRWSet(id, results)
+	if err != nil {
+		return nil, err
+	}
+	return &RWSet{rws: rws}, nil
+}
+
+func (n *Network) StoreEnvelope(id string, env []byte) error {
+	return n.ch.Vault().StoreEnvelope(id, env)
+}
+
+func (n *Network) Broadcast(blob interface{}) error {
+	switch b := blob.(type) {
+	case *Envelope:
+		return n.n.Ordering().Broadcast(b.e)
+	default:
+		return n.n.Ordering().Broadcast(b)
+	}
+}
+
+func (n *Network) IsFinalForParties(id string, endpoints ...view.Identity) error {
+	return n.ch.Finality().IsFinalForParties(id, endpoints...)
+}
+
+func (n *Network) IsFinal(id string) error {
+	return n.ch.Finality().IsFinal(id)
+}
+
+func (n *Network) AnonymousIdentity() view.Identity {
+	return n.n.LocalMembership().AnonymousIdentity()
+}
+
+func (n *Network) NewEnvelope() *Envelope {
+	return &Envelope{e: n.n.TransactionManager().NewEnvelope()}
+}
+
+func (n *Network) StoreTransient(id string, transient TransientMap) error {
+	return n.ch.Vault().StoreTransient(id, fabric.TransientMap(transient))
+}
+
+func (n *Network) RequestApproval(context view.Context, namespace string, requestRaw []byte, signer view.Identity, txID TxID) (*Envelope, error) {
+	env, err := chaincode.NewEndorseView(
+		namespace,
+		"invoke",
+		requestRaw,
+	).WithNetwork(
+		n.n.Name(),
+	).WithChannel(
+		n.ch.Name(),
+	).WithSignerIdentity(
+		signer,
+	).WithTxID(
+		fabric.TxID{
+			Nonce:   txID.Nonce,
+			Creator: txID.Creator,
+		},
+	).Endorse(context)
+	if err != nil {
+		return nil, err
+	}
+	return &Envelope{e: env}, nil
+}
+
+func (n *Network) IsMe(signer view.Identity) bool {
+	return n.n.LocalMembership().IsMe(signer)
+}
+
+func (n *Network) ComputeTxID(id *TxID) string {
+	logger.Debugf("compute tx id for [%s]", id.String())
+	temp := &fabric.TxID{
+		Nonce:   id.Nonce,
+		Creator: id.Creator,
+	}
+	res := n.n.TransactionManager().ComputeTxID(temp)
+	id.Nonce = temp.Nonce
+	id.Creator = temp.Creator
+	return res
+}
+
+func GetInstance(sp view2.ServiceProvider, network, channel string) *Network {
+	n := fabric.GetFabricNetworkService(sp, network)
+	ch, err := n.Channel(channel)
+	if err != nil {
+		// TODO: print error
+		return nil
+	}
+
+	return &Network{n: n, ch: ch}
+}

token/services/ttxcc/accept.go

@@ -8,8 +8,9 @@ package ttxcc
 import (
 	"github.com/pkg/errors"
 
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network"
 )
 
 type acceptView struct {
@@ -19,7 +20,7 @@ type acceptView struct {
 
 func (s *acceptView) Call(context view.Context) (interface{}, error) {
 	// Processes
-	env := s.tx.Payload.FabricEnvelope
+	env := s.tx.Payload.Envelope
 	if env == nil {
 		return nil, errors.Errorf("expected fabric envelope")
 	}
@@ -29,8 +30,8 @@ func (s *acceptView) Call(context view.Context) (interface{}, error) {
 	}
 
 	logger.Debugf("parse rws for id [%s]", s.tx.ID())
-	ch := fabric.GetChannel(context, s.tx.Network(), s.tx.Channel())
-	rws, err := ch.Vault().GetRWSet(s.tx.ID(), env.Results())
+	ch := network.GetInstance(context, s.tx.Network(), s.tx.Channel())
+	rws, err := ch.GetRWSet(s.tx.ID(), env.Results())
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed getting rwset for tx [%s]", s.tx.ID())
 	}
@@ -41,7 +42,7 @@ func (s *acceptView) Call(context view.Context) (interface{}, error) {
 		return nil, errors.WithMessagef(err, "failed marshalling tx env [%s]", s.tx.ID())
 	}
 
-	if err := ch.Vault().StoreEnvelope(env.TxID(), rawEnv); err != nil {
+	if err := ch.StoreEnvelope(env.TxID(), rawEnv); err != nil {
 		return nil, errors.WithMessagef(err, "failed storing tx env [%s]", s.tx.ID())
 	}
 

token/services/ttxcc/auditor.go

@@ -11,14 +11,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
 	"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/auditor"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/auditor/auditdb"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tcc"
 )
 
@@ -198,7 +198,7 @@ func (a *AuditApproveView) waitFabricEnvelope(context view.Context) error {
 
 	// Processes
 	logger.Debugf("Processes Fabric Envelope...")
-	env := tx.Payload.FabricEnvelope
+	env := tx.Payload.Envelope
 	if env == nil {
 		return errors.Errorf("expected fabric envelope")
 	}
@@ -208,8 +208,8 @@ func (a *AuditApproveView) waitFabricEnvelope(context view.Context) error {
 		return errors.Wrapf(err, "failed storing transient")
 	}
 
-	ch := fabric.GetChannel(context, tx.Network(), tx.Channel())
-	rws, err := ch.Vault().GetRWSet(tx.ID(), env.Results())
+	ch := network.GetInstance(context, tx.Network(), tx.Channel())
+	rws, err := ch.GetRWSet(tx.ID(), env.Results())
 	if err != nil {
 		return errors.WithMessagef(err, "failed getting rwset for tx [%s]", tx.ID())
 	}
@@ -219,7 +219,7 @@ func (a *AuditApproveView) waitFabricEnvelope(context view.Context) error {
 	if err != nil {
 		return errors.WithMessagef(err, "failed marshalling tx env [%s]", tx.ID())
 	}
-	if err := ch.Vault().StoreEnvelope(env.TxID(), rawEnv); err != nil {
+	if err := ch.StoreEnvelope(env.TxID(), rawEnv); err != nil {
 		return errors.WithMessagef(err, "failed storing tx env [%s]", tx.ID())
 	}