From 27bf5a060068832035a5c940f8cbf660a5787dbf Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Wed, 3 Jan 2024 18:20:28 -0400
Subject: [PATCH] go 1.21

---
 Makefile                         |  2 +-
 go.mod                           | 15 +--------------
 services/mailservers/database.go |  2 +-
 shell.nix                        |  6 +++---
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index ebedc3569ce..a16fb2c2b61 100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,7 @@ setup: setup-check setup-build setup-dev tidy
 
 setup-check: ##@setup Check if Go compiler is installed.
 ifeq (, $(shell which go))
-	$(error "No Go compiler found! Make sure to install 1.20.0 or newer.")
+	$(error "No Go compiler found! Make sure to install 1.21.0 or newer.")
 endif
 
 setup-dev: ##@setup Install all necessary tools for development
diff --git a/go.mod b/go.mod
index 33fc2794499..69da81d85c5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/status-im/status-go
 
-go 1.20
+go 1.21
 
 replace github.com/ethereum/go-ethereum v1.10.26 => github.com/status-im/go-ethereum v1.10.25-status.11
 
@@ -21,19 +21,6 @@ require (
 	github.com/cenkalti/backoff/v3 v3.2.2
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.8.0
-	github.com/ethereum/go-ethereum v1.10.26
-	github.com/forPelevin/gomoji v1.1.2
-	github.com/golang/mock v1.6.0
-	github.com/golang/protobuf v1.5.3
-	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-version v1.2.0
-	github.com/imdario/mergo v0.3.12
-	github.com/ipfs/go-cid v0.4.1
-	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/keighl/metabolize v0.0.0-20150915210303-97ab655d4034
-	github.com/kilic/bls12-381 v0.0.0-20200607163746-32e1441c8a9f
-	github.com/lib/pq v1.10.4
-	github.com/libp2p/go-libp2p v0.32.2
 	github.com/libp2p/go-libp2p-pubsub v0.10.0
 	github.com/lucasb-eyer/go-colorful v1.0.3
 	github.com/mat/besticon v0.0.0-20210314201728-1579f269edb7
diff --git a/services/mailservers/database.go b/services/mailservers/database.go
index 0a9e2e6a040..913fd65de33 100644
--- a/services/mailservers/database.go
+++ b/services/mailservers/database.go
@@ -37,7 +37,7 @@ func (m Mailserver) IDBytes() ([]byte, error) {
 		if err != nil {
 			return nil, err
 		}
-		return []byte(id.Pretty()), err
+		return []byte(id.String()), err
 	}
 
 	node, err := enode.ParseV4(m.Address)
diff --git a/shell.nix b/shell.nix
index 82cd66328c2..9d9ed751be4 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,8 @@
 {
   /* This should match Nixpkgs commit in status-mobile. */
   source ? builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/e7603eba51f2c7820c0a182c6bbb351181caa8e7.tar.gz";
-    sha256 = "sha256:0mwck8jyr74wh1b7g6nac1mxy6a0rkppz8n12andsffybsipz5jw";
+    url = "https://github.com/NixOS/nixpkgs/archive/ddf0003c57fb5cbb4a9754f2f6d5ebe9cdae5151.tar.gz";
+    sha256 = "sha256:07dl6m20119qqchjkf2m47zw1ih2r21zl9d073a0w9n4kcl6n0v7";
   },
   pkgs ? import (source){
     config = {
@@ -49,7 +49,7 @@ in pkgs.mkShell {
 
   buildInputs = with pkgs; [
     git jq which
-    go_1_20 golangci-lint go-junit-report gopls go-bindata gomobileMod
+    go_1_21 golangci-lint go-junit-report gopls go-bindata gomobileMod
     mockgen protobuf3_20 protoc-gen-go
   ] ++ lib.optional stdenv.isDarwin xcodeWrapper;