fix_: remove go-ethereum's UnmarshalPubkey usage

fixes: #6330
status-im · Feb 6, 2025 · e803219 · e803219
1 parent a05fa5f
commit e803219
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/appdatabase/database.go b/appdatabase/database.go
@@ -14,10 +14,10 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/status-im/status-go/appdatabase/migrations"
 	migrationsprevnodecfg "github.com/status-im/status-go/appdatabase/migrationsprevnodecfg"
+	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/nodecfg"
 	"github.com/status-im/status-go/services/wallet/bigint"
 	w_common "github.com/status-im/status-go/services/wallet/common"

diff --git a/wakuv1/api.go b/wakuv1/api.go
@@ -28,17 +28,17 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/status-im/status-go/logutils"
-
-	ethtypes "github.com/status-im/status-go/eth-node/types"
-	"github.com/status-im/status-go/waku/types"
-	"github.com/status-im/status-go/wakuv1/common"
-
+	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/rpc"
+
 	gocommon "github.com/status-im/status-go/common"
+	"github.com/status-im/status-go/eth-node/crypto"
+	ethtypes "github.com/status-im/status-go/eth-node/types"
+	"github.com/status-im/status-go/logutils"
+	"github.com/status-im/status-go/waku/types"
+	"github.com/status-im/status-go/wakuv1/common"
 )
 
 // List of errors
@@ -362,7 +362,7 @@ func (api *PublicWakuAPI) Messages(ctx context.Context, crit types.Criteria) (*r
 			return nil, ErrInvalidSymmetricKey
 		}
 		filter.KeySym = key
-		filter.SymKeyHash = crypto.Keccak256Hash(filter.KeySym)
+		filter.SymKeyHash = ethcommon.Hash(crypto.Keccak256Hash(filter.KeySym))
 	}
 
 	// listen for messages that are encrypted with the given public key

diff --git a/wakuv2/api.go b/wakuv2/api.go
@@ -28,21 +28,21 @@ import (
 
 	"go.uber.org/zap"
 
+	"google.golang.org/protobuf/proto"
+
 	"github.com/waku-org/go-waku/waku/v2/payload"
 	"github.com/waku-org/go-waku/waku/v2/protocol/pb"
 
-	ethtypes "github.com/status-im/status-go/eth-node/types"
-	"github.com/status-im/status-go/logutils"
-	"github.com/status-im/status-go/waku/types"
-	"github.com/status-im/status-go/wakuv2/common"
-
+	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"google.golang.org/protobuf/proto"
-
 	gocommon "github.com/status-im/status-go/common"
+	"github.com/status-im/status-go/eth-node/crypto"
+	ethtypes "github.com/status-im/status-go/eth-node/types"
+	"github.com/status-im/status-go/logutils"
+	"github.com/status-im/status-go/waku/types"
+	"github.com/status-im/status-go/wakuv2/common"
 )
 
 // List of errors
@@ -320,7 +320,7 @@ func (api *PublicWakuAPI) Messages(ctx context.Context, crit types.Criteria) (*r
 			return nil, ErrInvalidSymmetricKey
 		}
 		filter.KeySym = key
-		filter.SymKeyHash = crypto.Keccak256Hash(filter.KeySym)
+		filter.SymKeyHash = ethcommon.Hash(crypto.Keccak256Hash(filter.KeySym))
 	}
 
 	// listen for messages that are encrypted with the given public key

diff --git a/wakuv2/persistence/signed_messages.go b/wakuv2/persistence/signed_messages.go
@@ -7,7 +7,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/status-im/status-go/eth-node/crypto"
 )
 
 // DBStore is a MessageProvider that has a *sql.DB connection