merge main

docs/static/openapi.yml

@@ -27,6 +27,7 @@ paths:
                         - BITCOIN
                         - COSMOS
                         - OTHER
+                        - ZANO
                       default: EVM
                     bridge_address:
                       type: string
@@ -331,6 +332,7 @@ paths:
                       - BITCOIN
                       - COSMOS
                       - OTHER
+                      - ZANO
                     default: EVM
                   bridge_address:
                     type: string
@@ -49257,6 +49259,7 @@ definitions:
           - BITCOIN
           - COSMOS
           - OTHER
+          - ZANO
         default: EVM
       bridge_address:
         type: string
@@ -49271,6 +49274,7 @@ definitions:
       - BITCOIN
       - COSMOS
       - OTHER
+      - ZANO
     default: EVM
   core.bridge.MsgAddTokenInfoResponse:
     type: object
@@ -49309,6 +49313,7 @@ definitions:
               - BITCOIN
               - COSMOS
               - OTHER
+              - ZANO
             default: EVM
           bridge_address:
             type: string
@@ -49333,6 +49338,7 @@ definitions:
                 - BITCOIN
                 - COSMOS
                 - OTHER
+                - ZANO
               default: EVM
             bridge_address:
               type: string

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/armon/go-metrics v0.4.1
 	github.com/btcsuite/btcd v0.22.2
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
-	github.com/cosmos/cosmos-proto v1.0.0-beta.3
 	github.com/cosmos/cosmos-sdk v0.46.13
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/gogoproto v1.5.0
@@ -79,6 +78,7 @@ require (
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/containerd/continuity v0.3.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
+	github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
 	github.com/cosmos/gorocksdb v1.2.0 // indirect
 	github.com/cosmos/iavl v0.19.6 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
@@ -228,7 +228,7 @@ replace (
 	// use cosmos fork of keyring
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 
-	github.com/cosmos/cosmos-sdk => github.com/hyle-team/cosmos-sdk v0.46.28
+	github.com/cosmos/cosmos-sdk => github.com/hyle-team/cosmos-sdk v0.46.29
 	github.com/cosmos/ibc-go/v6 => github.com/hyle-team/ibc-go/v6 v6.0.0-20241031152903-f38c2bf016e9
 
 	// use Evmos geth fork

go.sum

@@ -778,8 +778,8 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK
 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/cosmos-sdk v0.46.28 h1:4UQq4F7KZ83KP04sR6lbnyAQEgxTMkWJS+f7Kmlh4V0=
-github.com/hyle-team/cosmos-sdk v0.46.28/go.mod h1:JkEh06V4aORJl8/nrLelLCzc5xKPoDuIYgaF8M6AwFw=
+github.com/hyle-team/cosmos-sdk v0.46.29 h1:GPM80C/98+r9FS5nhTDT4qSWwhag4E/Z2kio+v3yKoQ=
+github.com/hyle-team/cosmos-sdk v0.46.29/go.mod h1:JkEh06V4aORJl8/nrLelLCzc5xKPoDuIYgaF8M6AwFw=
 github.com/hyle-team/ibc-go/v6 v6.0.0-20241031152903-f38c2bf016e9 h1:TjQXfa93o5NdDOolRfAI58ABI08Jvavp/TqSpIyeFaY=
 github.com/hyle-team/ibc-go/v6 v6.0.0-20241031152903-f38c2bf016e9/go.mod h1:/1tIKulumMapoo5kkxOP7/Zw2zUGYVMsvd2anyiaB6I=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

proto/bridge/models/chain.proto

@@ -13,6 +13,7 @@ enum ChainType {
   BITCOIN = 1;
   COSMOS = 2;
   OTHER = 3;
+  ZANO = 4;
 }
 
 message Chain {

proto/ethermint/crypto/v1/ethsecp256k1/keys.proto

@@ -3,7 +3,7 @@ package ethermint.crypto.v1.ethsecp256k1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/hyle-team/bridgeless-core/v12/xcrypto/ethsecp256k1";
+option go_package = "github.com/hyle-team/bridgeless-core/v12/crypto/ethsecp256k1";
 
 // PubKey defines a type alias for an ecdsa.PublicKey that implements
 // Tendermint's PubKey interface. It represents the 33-byte compressed public

proto/ethermint/types/v1/account.proto

@@ -5,7 +5,7 @@ import "cosmos/auth/v1beta1/auth.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/hyle-team/bridgeless-core/v12/xtypes";
+option go_package = "github.com/hyle-team/bridgeless-core/v12/types";
 
 // EthAccount implements the authtypes.AccountI interface and embeds an
 // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper.

proto/ethermint/types/v1/dynamic_fee.proto

@@ -3,7 +3,7 @@ package ethermint.types.v1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/hyle-team/bridgeless-core/v12/xtypes";
+option go_package = "github.com/hyle-team/bridgeless-core/v12/types";
 
 // ExtensionOptionDynamicFeeTx is an extension option that specifies the maxPrioPrice for cosmos tx
 message ExtensionOptionDynamicFeeTx {

proto/ethermint/types/v1/indexer.proto

@@ -3,7 +3,7 @@ package ethermint.types.v1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/hyle-team/bridgeless-core/v12/xtypes";
+option go_package = "github.com/hyle-team/bridgeless-core/v12/types";
 
 // TxResult is the value stored in eth tx indexer
 message TxResult {

proto/ethermint/types/v1/web3.proto

@@ -3,7 +3,7 @@ package ethermint.types.v1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/hyle-team/bridgeless-core/v12/xtypes";
+option go_package = "github.com/hyle-team/bridgeless-core/v12/types";
 
 // ExtensionOptionsWeb3Tx is an extension option that specifies the typed chain id,
 // the fee payer as well as its signature data.