bump bridgeless version

hyle-team · Jan 31, 2025 · adfa81f · adfa81f
1 parent 352d3b8
commit adfa81f
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	gitlab.com/distributed_lab/figure v2.1.2+incompatible
 	gitlab.com/distributed_lab/kit v1.11.3
 	gitlab.com/distributed_lab/logan v3.8.1+incompatible
-	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
+	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
 	google.golang.org/grpc v1.64.1
 	google.golang.org/protobuf v1.34.2
 )
@@ -27,7 +27,7 @@ require (
 	github.com/ethereum/go-ethereum v1.10.26
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/gorilla/websocket v1.5.0
-	github.com/hyle-team/bridgeless-core v0.0.0-20241003084139-414cc4a6f73c
+	github.com/hyle-team/bridgeless-core/v12 v12.1.8-0.20250131090418-e99cf29959ed
 	github.com/lib/pq v1.10.9
 	github.com/rabbitmq/amqp091-go v1.10.0
 	github.com/spf13/cast v1.6.0
@@ -125,6 +125,7 @@ require (
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/regen-network/cosmos-proto v0.3.1 // indirect
 	github.com/rjeczalik/notify v0.9.3 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1797,8 +1797,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
-github.com/hyle-team/bridgeless-core v0.0.0-20241003084139-414cc4a6f73c h1:qb+y1pQTA7TriAWloTozC9uyVGY6z36Qy4wjsaS4/O0=
-github.com/hyle-team/bridgeless-core v0.0.0-20241003084139-414cc4a6f73c/go.mod h1:F0UTxyTcS5Fmu0Ecw+7lU+c5L5A/PhaInaP6wB/RLu0=
+github.com/hyle-team/bridgeless-core/v12 v12.1.8-0.20250131090418-e99cf29959ed h1:eqYJa5/gUI4Sxs7uiPg/uqW5kzipLAMf+p1bGDQ9w2E=
+github.com/hyle-team/bridgeless-core/v12 v12.1.8-0.20250131090418-e99cf29959ed/go.mod h1:l1XnKoWRqpW0e1DuaRes7rGQK971RxkYPgbRWDSxDyU=
 github.com/hyle-team/cosmos-sdk v0.46.20 h1:2pd+6xOEf3c9CgIG2be/Rl3X3wAuTwL+hJT5v+33Db4=
 github.com/hyle-team/cosmos-sdk v0.46.20/go.mod h1:nIfy+qNyHSoV2b901hNglQNVvHGK/9vrnMlgJU6SsIM=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=

diff --git a/internal/bridge/core/account.go b/internal/bridge/core/account.go
@@ -4,7 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	secp256k1 "github.com/hyle-team/bridgeless-core/crypto/ethsecp256k1"
+	secp256k1 "github.com/hyle-team/bridgeless-core/v12/crypto/ethsecp256k1"
 	"github.com/pkg/errors"
 )
 

diff --git a/internal/bridge/core/main.go b/internal/bridge/core/main.go
@@ -12,8 +12,8 @@ import (
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	coretypes "github.com/hyle-team/bridgeless-core/types"
-	bridgetypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	coretypes "github.com/hyle-team/bridgeless-core/v12/types"
+	bridgetypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	"github.com/hyle-team/bridgeless-signer/internal/bridge/types"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"

diff --git a/internal/bridge/core/submit_tx.go b/internal/bridge/core/submit_tx.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	bridgetypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	bridgetypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	"github.com/hyle-team/bridgeless-signer/internal/bridge/types"
 	"github.com/pkg/errors"
 	"strings"

diff --git a/internal/bridge/core/token_info.go b/internal/bridge/core/token_info.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"context"
-	bridgetypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	bridgetypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	"github.com/pkg/errors"
 )
 

diff --git a/internal/bridge/core/token_pair.go b/internal/bridge/core/token_pair.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"context"
-	bridgetypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	bridgetypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	"github.com/hyle-team/bridgeless-signer/internal/bridge/types"
 	"github.com/pkg/errors"
 	"strings"

diff --git a/internal/bridge/processor/submit_transaction.go b/internal/bridge/processor/submit_transaction.go
@@ -1,7 +1,7 @@
 package processor
 
 import (
-	coretypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	coretypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	bridgeTypes "github.com/hyle-team/bridgeless-signer/internal/bridge/types"
 	"github.com/hyle-team/bridgeless-signer/internal/data"
 	"github.com/hyle-team/bridgeless-signer/resources"

diff --git a/internal/bridge/types/core.go b/internal/bridge/types/core.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	coretypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	coretypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	"github.com/pkg/errors"
 )
 

diff --git a/internal/data/deposits.go b/internal/data/deposits.go
@@ -2,7 +2,7 @@ package data
 
 import (
 	"fmt"
-	bridgetypes "github.com/hyle-team/bridgeless-core/x/bridge/types"
+	bridgetypes "github.com/hyle-team/bridgeless-core/v12/x/bridge/types"
 	"github.com/hyle-team/bridgeless-signer/resources"
 	"gitlab.com/distributed_lab/logan/v3/errors"
 	"math/big"
@@ -118,13 +118,13 @@ func (d Deposit) ToStatusResponse() *resources.CheckWithdrawalResponse {
 
 func (d Deposit) ToTransaction() bridgetypes.Transaction {
 	tx := bridgetypes.Transaction{
-		DepositTxHash:    d.TxHash,
-		DepositTxIndex:   uint64(d.TxEventId),
-		DepositChainId:   d.ChainId,
-		WithdrawalTxHash: stringOrEmpty(d.WithdrawalTxHash),
-		Depositor:        stringOrEmpty(d.Depositor),
-		// TODO: separate for deposit/withdrawal amount when added to bridge core
-		Amount:            stringOrEmpty(d.WithdrawalAmount),
+		DepositTxHash:     d.TxHash,
+		DepositTxIndex:    uint64(d.TxEventId),
+		DepositChainId:    d.ChainId,
+		WithdrawalTxHash:  stringOrEmpty(d.WithdrawalTxHash),
+		Depositor:         stringOrEmpty(d.Depositor),
+		DepositAmount:     stringOrEmpty(d.DepositAmount),
+		WithdrawalAmount:  stringOrEmpty(d.WithdrawalAmount),
 		DepositToken:      stringOrEmpty(d.DepositToken),
 		Receiver:          stringOrEmpty(d.Receiver),
 		WithdrawalToken:   stringOrEmpty(d.WithdrawalToken),