update bridge repo path

Author: renauter

bridge/tfchain_bridge/go.mod

@@ -1,4 +1,4 @@
-module github.com/threefoldtech/tfchain_bridge
+module github.com/threefoldtech/tfchain/bridge/tfchain_bridge
 
 go 1.17
 
@@ -52,4 +52,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 
-replace github.com/threefoldtech/tfchain/clients/tfchain-client-go => ../../clients/tfchain-client-go
+replace github.com/threefoldtech/tfchain/clients/tfchain-client-go => ../../clients/tfchain-client-go

bridge/tfchain_bridge/main.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/rs/zerolog/log"
 	flag "github.com/spf13/pflag"
-	"github.com/threefoldtech/tfchain_bridge/pkg"
-	"github.com/threefoldtech/tfchain_bridge/pkg/bridge"
-	"github.com/threefoldtech/tfchain_bridge/pkg/logger"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/bridge"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/logger"
 )
 
 func main() {

bridge/tfchain_bridge/pkg/bridge/bridge.go

@@ -8,9 +8,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"github.com/threefoldtech/tfchain_bridge/pkg"
-	"github.com/threefoldtech/tfchain_bridge/pkg/stellar"
-	subpkg "github.com/threefoldtech/tfchain_bridge/pkg/substrate"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/stellar"
+	subpkg "github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/substrate"
 )
 
 const (

bridge/tfchain_bridge/pkg/bridge/mint.go

@@ -10,9 +10,9 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	hProtocol "github.com/stellar/go/protocols/horizon"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg"
+	_logger "github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/logger"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/tfchain_bridge/pkg"
-	_logger "github.com/threefoldtech/tfchain_bridge/pkg/logger"
 )
 
 // mint handler for stellar

bridge/tfchain_bridge/pkg/bridge/refund.go

@@ -7,9 +7,9 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	hProtocol "github.com/stellar/go/protocols/horizon"
-	"github.com/threefoldtech/tfchain_bridge/pkg"
-	_logger "github.com/threefoldtech/tfchain_bridge/pkg/logger"
-	subpkg "github.com/threefoldtech/tfchain_bridge/pkg/substrate"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg"
+	_logger "github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/logger"
+	subpkg "github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/substrate"
 )
 
 // refund handler for stellar

bridge/tfchain_bridge/pkg/bridge/withdraw.go

@@ -9,9 +9,9 @@ import (
 	"github.com/centrifuge/go-substrate-rpc-client/v4/types"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg"
+	subpkg "github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg/substrate"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/tfchain_bridge/pkg"
-	subpkg "github.com/threefoldtech/tfchain_bridge/pkg/substrate"
 )
 
 func (bridge *Bridge) handleWithdrawCreated(ctx context.Context, withdraw subpkg.WithdrawCreatedEvent) error {

bridge/tfchain_bridge/pkg/stellar/stellar.go

@@ -21,8 +21,8 @@ import (
 	horizoneffects "github.com/stellar/go/protocols/horizon/effects"
 	"github.com/stellar/go/protocols/horizon/operations"
 	"github.com/stellar/go/txnbuild"
+	"github.com/threefoldtech/tfchain/bridge/tfchain_bridge/pkg"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/tfchain_bridge/pkg"
 )
 
 const (
@@ -42,6 +42,8 @@ type StellarWallet struct {
 	sequenceNumber int64
 }
 
+type TraceIdKey struct{}
+
 func NewStellarWallet(ctx context.Context, config *pkg.StellarConfig) (*StellarWallet, error) {
 	kp, err := keypair.ParseFull(config.StellarSeed)
 
@@ -93,7 +95,7 @@ func (w *StellarWallet) CreatePaymentAndReturnSignature(ctx context.Context, tar
 }
 
 func (w *StellarWallet) CreatePaymentWithSignaturesAndSubmit(ctx context.Context, target string, amount uint64, txHash string, signatures []substrate.StellarSignature, sequenceNumber int64) error {
-	ctx_with_trace_id := context.WithValue(ctx, "trace_id", txHash)
+	ctx_with_trace_id := context.WithValue(ctx, TraceIdKey{}, txHash)
 
 	txnBuild, err := w.generatePaymentOperation(amount, target, sequenceNumber)
 	if err != nil {
@@ -122,7 +124,7 @@ func (w *StellarWallet) CreatePaymentWithSignaturesAndSubmit(ctx context.Context
 }
 
 func (w *StellarWallet) CreateRefundPaymentWithSignaturesAndSubmit(ctx context.Context, target string, amount uint64, txHash string, signatures []substrate.StellarSignature, sequenceNumber int64) error {
-	ctx_with_trace_id := context.WithValue(ctx, "trace_id", txHash)
+	ctx_with_trace_id := context.WithValue(ctx, TraceIdKey{}, txHash)
 	txnBuild, err := w.generatePaymentOperation(amount, target, sequenceNumber)
 	if err != nil {
 		return err