Skip to content

Commit 622015b

Browse files
alexandrosfiliosalexandrosfilios
committed
Updated FSC version
Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>
1 parent d7eb643 commit 622015b

File tree

13 files changed

+45
-43
lines changed

13 files changed

+45
-43
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/gin-gonic/gin v1.10.0
1212
github.com/gobuffalo/packr/v2 v2.7.1
1313
github.com/hashicorp/go-uuid v1.0.3
14-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250522090351-f71dcac29580
14+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250527161440-b908f26f9db2
1515
github.com/hyperledger-labs/orion-sdk-go v0.2.10
1616
github.com/hyperledger-labs/orion-server v0.2.10
1717
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2
@@ -35,7 +35,7 @@ require (
3535
go.opentelemetry.io/otel/trace v1.30.0
3636
go.uber.org/dig v1.18.0
3737
go.uber.org/zap v1.27.0
38-
golang.org/x/crypto v0.32.0
38+
golang.org/x/crypto v0.35.0
3939
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
4040
google.golang.org/protobuf v1.36.1
4141
gopkg.in/yaml.v2 v2.4.0
@@ -269,9 +269,9 @@ require (
269269
golang.org/x/mod v0.22.0 // indirect
270270
golang.org/x/net v0.34.0 // indirect
271271
golang.org/x/oauth2 v0.25.0 // indirect
272-
golang.org/x/sync v0.10.0 // indirect
273-
golang.org/x/sys v0.29.0 // indirect
274-
golang.org/x/text v0.21.0 // indirect
272+
golang.org/x/sync v0.11.0 // indirect
273+
golang.org/x/sys v0.30.0 // indirect
274+
golang.org/x/text v0.22.0 // indirect
275275
golang.org/x/time v0.8.0 // indirect
276276
golang.org/x/tools v0.28.0 // indirect
277277
gonum.org/v1/gonum v0.15.0 // indirect

‎go.sum‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,8 +1075,8 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl
10751075
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
10761076
github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
10771077
github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
1078-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250522090351-f71dcac29580 h1:3q4GkL4u4a8epXdZcy9t7DEXq6IVf4RMhD7/k6/K74M=
1079-
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250522090351-f71dcac29580/go.mod h1:+HFjm/d4xpirJN6nJsv8vIrzFPZ50brCe+lRCs3Cp8I=
1078+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250527161440-b908f26f9db2 h1:xFOL+vE0XQsW8RAWAtf5xms+nmCZEsUUS/JNdv2q3QM=
1079+
github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250527161440-b908f26f9db2/go.mod h1:iBMBYR+khPvWSU0I/cqNVUwaoGx29+uXoWXUN37EPn4=
10801080
github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s=
10811081
github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY=
10821082
github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw=
@@ -1358,8 +1358,6 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
13581358
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
13591359
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
13601360
github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
1361-
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
1362-
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
13631361
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
13641362
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
13651363
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -1699,8 +1697,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw
16991697
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
17001698
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
17011699
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
1702-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
1703-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
1700+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
1701+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
17041702
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
17051703
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
17061704
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1886,8 +1884,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
18861884
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
18871885
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
18881886
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1889-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
1890-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1887+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
1888+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
18911889
golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
18921890
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
18931891
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1989,8 +1987,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19891987
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19901988
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19911989
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1992-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
1993-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1990+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
1991+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
19941992
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
19951993
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
19961994
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2003,8 +2001,8 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
20032001
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
20042002
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
20052003
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
2006-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
2007-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
2004+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
2005+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
20082006
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
20092007
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
20102008
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2023,8 +2021,8 @@ golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
20232021
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
20242022
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
20252023
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
2026-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
2027-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
2024+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
2025+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
20282026
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
20292027
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
20302028
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎integration/token/fungible/views/binding.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type SetBindingView struct {
2525

2626
func (s *SetBindingView) Call(context view.Context) (interface{}, error) {
2727
es := view2.GetEndpointService(context)
28-
if err := es.Bind(s.FSCNodeIdentity, s.Alias); err != nil {
28+
if err := es.Bind(context.Context(), s.FSCNodeIdentity, s.Alias); err != nil {
2929
return nil, errors.Wrap(err, `failed to bind fsc node identity`)
3030
}
3131
return nil, nil

‎token/request.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const (
2626
)
2727

2828
type Binder interface {
29-
Bind(longTerm Identity, ephemeral Identity) error
29+
Bind(ctx context.Context, longTerm Identity, ephemeral Identity) error
3030
}
3131

3232
type (
@@ -1118,7 +1118,7 @@ func (r *Request) BindTo(binder Binder, identity Identity) error {
11181118
continue
11191119
}
11201120
r.TokenService.logger.Debugf("bind sender [%s] to [%s]", senderIdentity, identity)
1121-
if err := binder.Bind(identity, senderIdentity); err != nil {
1121+
if err := binder.Bind(context.TODO(), identity, senderIdentity); err != nil {
11221122
return errors.Wrap(err, "failed binding sender identities")
11231123
}
11241124
}
@@ -1131,7 +1131,7 @@ func (r *Request) BindTo(binder Binder, identity Identity) error {
11311131
continue
11321132
}
11331133
r.TokenService.logger.Debugf("bind extra signer [%s] to [%s]", eid, identity)
1134-
if err := binder.Bind(identity, eid); err != nil {
1134+
if err := binder.Bind(context.TODO(), identity, eid); err != nil {
11351135
return errors.Wrap(err, "failed binding sender identities")
11361136
}
11371137
}
@@ -1146,7 +1146,7 @@ func (r *Request) BindTo(binder Binder, identity Identity) error {
11461146
}
11471147

11481148
r.TokenService.logger.Debugf("bind receiver as sender [%s] to [%s]", receiverIdentity, identity)
1149-
if err := binder.Bind(identity, receiverIdentity); err != nil {
1149+
if err := binder.Bind(context.TODO(), identity, receiverIdentity); err != nil {
11501150
return errors.Wrap(err, "failed binding receiver identities")
11511151
}
11521152
}

‎token/services/identity/driver/common.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package driver
88

99
import (
10+
"context"
11+
1012
"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
1113
)
1214

@@ -17,7 +19,7 @@ type SigService interface {
1719
}
1820

1921
type NetworkBinderService interface {
20-
Bind(longTerm driver.Identity, ephemeral driver.Identity) error
22+
Bind(ctx context.Context, longTerm driver.Identity, ephemeral driver.Identity) error
2123
}
2224

2325
type BinderService interface {

‎token/services/identity/provider.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package identity
88

99
import (
10+
"context"
1011
"runtime/debug"
1112
"slices"
1213
"sync"
@@ -218,7 +219,7 @@ func (p *Provider) Bind(longTerm driver.Identity, ephemeral driver.Identity, cop
218219
}
219220

220221
if p.Binder != nil {
221-
if err := p.Binder.Bind(longTerm, ephemeral); err != nil {
222+
if err := p.Binder.Bind(context.TODO(), longTerm, ephemeral); err != nil {
222223
return err
223224
}
224225
}

‎token/services/interop/htlc/transaction.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package htlc
88

99
import (
10+
"context"
1011
"crypto"
1112
"crypto/rand"
1213
"encoding/base64"
@@ -72,7 +73,7 @@ func compileTransferOptions(opts ...token.TransferOption) (*token.TransferOption
7273
}
7374

7475
type Binder interface {
75-
Bind(longTerm view.Identity, ephemeral view.Identity) error
76+
Bind(ctx context.Context, longTerm view.Identity, ephemeral view.Identity) error
7677
}
7778

7879
// Transaction holds a ttx transaction
@@ -232,7 +233,7 @@ func (t *Transaction) Reclaim(wallet *token.OwnerWallet, tok *token2.UnspentToke
232233
return err
233234
}
234235

235-
if err := t.Binder.Bind(script.Sender, tok.Owner); err != nil {
236+
if err := t.Binder.Bind(t.Context, script.Sender, tok.Owner); err != nil {
236237
return err
237238
}
238239

@@ -306,7 +307,7 @@ func (t *Transaction) Claim(wallet *token.OwnerWallet, tok *token2.UnspentToken,
306307
return err
307308
}
308309

309-
if err := t.Binder.Bind(script.Recipient, tok.Owner); err != nil {
310+
if err := t.Binder.Bind(t.Context, script.Recipient, tok.Owner); err != nil {
310311
return err
311312
}
312313

‎token/services/ttx/collect.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (c *collectActionsView) collectLocal(context view.Context, actionTransfer *
7777

7878
// Binds identities
7979
es := view2.GetEndpointService(context)
80-
longTermIdentity, _, _, err := es.Resolve(party)
80+
longTermIdentity, _, _, err := es.Resolve(context.Context(), party)
8181
if err != nil {
8282
return errors.Wrapf(err, "cannot resolve long term network identity for [%s]", party)
8383
}
@@ -139,7 +139,7 @@ func (c *collectActionsView) collectRemote(context view.Context, actionTransfer
139139

140140
// Bind to party
141141
es := view2.GetEndpointService(context)
142-
longTermIdentity, _, _, err := es.Resolve(party)
142+
longTermIdentity, _, _, err := es.Resolve(context.Context(), party)
143143
if err != nil {
144144
return errors.Wrapf(err, "cannot resolve long term network identity for [%s]", party)
145145
}

‎token/services/ttx/endorse.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ func (c *CollectEndorsementsView) prepareDistributionList(context view.Context,
626626
if isMe {
627627
longTermIdentity = view2.GetIdentityProvider(context).DefaultIdentity()
628628
} else {
629-
longTermIdentity, _, _, err = view2.GetEndpointService(context).Resolve(party)
629+
longTermIdentity, _, _, err = view2.GetEndpointService(context).Resolve(context.Context(), party)
630630
if err != nil {
631631
return nil, errors.Wrapf(err, "cannot resolve long term identity for [%s]", party.UniqueID())
632632
}
@@ -672,7 +672,7 @@ func (c *CollectEndorsementsView) prepareDistributionList(context view.Context,
672672
if isMe {
673673
longTermIdentity = view2.GetIdentityProvider(context).DefaultIdentity()
674674
} else {
675-
longTermIdentity, _, _, err = view2.GetEndpointService(context).Resolve(party)
675+
longTermIdentity, _, _, err = view2.GetEndpointService(context).Resolve(context.Context(), party)
676676
if err != nil {
677677
return nil, errors.Wrapf(err, "cannot resolve long term auitor identity for [%s]", party.UniqueID())
678678
}

‎token/services/ttx/recipients.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func (f *RequestRecipientIdentityView) callWithRecipientData(context view.Contex
219219
// Update the Endpoint Resolver
220220
logger.Debugf("update endpoint resolver for [%s], bind to [%s]", recipientData.Identity, recipient.Identity)
221221
span.AddEvent("Bind identity")
222-
if err := view2.GetEndpointService(context).Bind(recipient.Identity, recipientData.Identity); err != nil {
222+
if err := view2.GetEndpointService(context).Bind(context.Context(), recipient.Identity, recipientData.Identity); err != nil {
223223
span.RecordError(err)
224224
return nil, errors.Wrapf(err, "failed binding [%s] to [%s]", recipientData.Identity, recipient.Identity)
225225
}
@@ -356,7 +356,7 @@ func (s *RespondRequestRecipientIdentityView) Call(context view.Context) (interf
356356
resolver := view2.GetEndpointService(context)
357357
logger.Debugf("bind me [%s] to [%s]", context.Me(), recipientData)
358358
span.AddEvent("Bind identity")
359-
err = resolver.Bind(context.Me(), recipientIdentity)
359+
err = resolver.Bind(context.Context(), context.Me(), recipientIdentity)
360360
if err != nil {
361361
return nil, errors.Wrapf(err, "failed to bind me to recipient identity")
362362
}
@@ -446,7 +446,7 @@ func (s *RespondRequestRecipientIdentityView) handleMultisig(
446446
// Update the Endpoint Resolver
447447
resolver := view2.GetEndpointService(context)
448448
for i, node := range multisigRecipientData.Nodes {
449-
err = resolver.Bind(node, multisigRecipientData.Recipients[i])
449+
err = resolver.Bind(context.Context(), node, multisigRecipientData.Recipients[i])
450450
if err != nil {
451451
return errors.Wrapf(err, "failed to bind me to recipient identity")
452452
}
@@ -533,13 +533,13 @@ func (f *ExchangeRecipientIdentitiesView) Call(context view.Context) (interface{
533533
// Update the Endpoint Resolver
534534
logger.Debugf("bind [%s] to other [%s]", remoteRecipientData.Identity, f.Other)
535535
resolver := view2.GetEndpointService(context)
536-
err = resolver.Bind(f.Other, remoteRecipientData.Identity)
536+
err = resolver.Bind(context.Context(), f.Other, remoteRecipientData.Identity)
537537
if err != nil {
538538
return nil, err
539539
}
540540

541541
logger.Debugf("bind me [%s] to [%s]", localRecipientData.Identity, context.Me())
542-
err = resolver.Bind(context.Me(), localRecipientData.Identity)
542+
err = resolver.Bind(context.Context(), context.Me(), localRecipientData.Identity)
543543
if err != nil {
544544
return nil, err
545545
}
@@ -598,11 +598,11 @@ func (s *RespondExchangeRecipientIdentitiesView) Call(context view.Context) (int
598598

599599
// Update the Endpoint Resolver
600600
resolver := view2.GetEndpointService(context)
601-
err = resolver.Bind(context.Me(), recipientData.Identity)
601+
err = resolver.Bind(context.Context(), context.Me(), recipientData.Identity)
602602
if err != nil {
603603
return nil, errors.WithMessagef(err, "failed binding recipient data, wallet [%s]", w.ID())
604604
}
605-
err = resolver.Bind(session.Info().Caller, other)
605+
err = resolver.Bind(context.Context(), session.Info().Caller, other)
606606
if err != nil {
607607
return nil, errors.WithMessagef(err, "failed binding recipient data, wallet [%s]", w.ID())
608608
}

0 commit comments

Comments
 (0)