diff --git a/.changelog/3657.internal.md b/.changelog/3657.internal.md
new file mode 100644
index 00000000000..3bfda7aafc5
--- /dev/null
+++ b/.changelog/3657.internal.md
@@ -0,0 +1,3 @@
+go: Bump ed25519 for fixes on 32-bit architectures
+
+Note that 32-bit architectures are not supported by Oasis Core.
diff --git a/go/go.mod b/go/go.mod
index cbccd0fc0c3..f4453687205 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -11,9 +11,9 @@ replace (
 	// https://github.com/spf13/cobra/issues/1091
 	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
 
-	github.com/tendermint/tendermint => github.com/oasisprotocol/tendermint v0.34.3-oasis1
-	golang.org/x/crypto/curve25519 => github.com/oasisprotocol/ed25519/extra/x25519 v0.0.0-20201103162138-a1dadbe24dd5
-	golang.org/x/crypto/ed25519 => github.com/oasisprotocol/ed25519 v0.0.0-20201103162138-a1dadbe24dd5
+	github.com/tendermint/tendermint => github.com/oasisprotocol/tendermint v0.34.3-oasis2
+	golang.org/x/crypto/curve25519 => github.com/oasisprotocol/ed25519/extra/x25519 v0.0.0-20210127160119-f7017427c1ea
+	golang.org/x/crypto/ed25519 => github.com/oasisprotocol/ed25519 v0.0.0-20210127160119-f7017427c1ea
 )
 
 require (
@@ -37,7 +37,7 @@ require (
 	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20200527154044-851aec403956
-	github.com/oasisprotocol/ed25519 v0.0.0-20201103162138-a1dadbe24dd5
+	github.com/oasisprotocol/ed25519 v0.0.0-20210127160119-f7017427c1ea
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/prometheus/client_golang v1.9.0
@@ -48,7 +48,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/tendermint v0.34.0-rc6
+	github.com/tendermint/tendermint v0.34.3
 	github.com/tendermint/tm-db v0.6.3
 	github.com/thepudds/fzgo v0.2.2
 	github.com/uber/jaeger-client-go v2.25.0+incompatible
diff --git a/go/go.sum b/go/go.sum
index fa8dbdba484..676213e197b 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -832,12 +832,12 @@ github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oasisprotocol/deoxysii v0.0.0-20200527154044-851aec403956 h1:etZXZf8f2xLJFivW4tTg87nSV3KLszQ7oYot3UNcmF0=
 github.com/oasisprotocol/deoxysii v0.0.0-20200527154044-851aec403956/go.mod h1:cE5EgXTIhq5oAVdZ7LZd1FjTRLALPEzv93CWzBtDkyI=
-github.com/oasisprotocol/ed25519 v0.0.0-20201103162138-a1dadbe24dd5 h1:gYJn5qB/A2HWxD9liWL+YSYDAn8sFToA37M90y+9l7M=
-github.com/oasisprotocol/ed25519 v0.0.0-20201103162138-a1dadbe24dd5/go.mod h1:IZbb50w3AB72BVobEF6qG93NNSrTw/V2QlboxqSu3Xw=
+github.com/oasisprotocol/ed25519 v0.0.0-20210127160119-f7017427c1ea h1:r4MhxgqQ1bed0fQhRINBM50Rbwsgma6oEjG4zQ444Lw=
+github.com/oasisprotocol/ed25519 v0.0.0-20210127160119-f7017427c1ea/go.mod h1:IZbb50w3AB72BVobEF6qG93NNSrTw/V2QlboxqSu3Xw=
 github.com/oasisprotocol/safeopen v0.0.0-20200528085122-e01cfdfc7661 h1:MB73kGMtuMGS+6VDoU/mitzff7Cu+aZo9ta5wabuxVA=
 github.com/oasisprotocol/safeopen v0.0.0-20200528085122-e01cfdfc7661/go.mod h1:SwBxaVibf6Sr2IZ6M3WnUue0yp8dPLAo1riQRNQ60+g=
-github.com/oasisprotocol/tendermint v0.34.3-oasis1 h1:uXHJ6bPznWd7H5y8t47w4nbjLECt2HPVT442RaOyOIA=
-github.com/oasisprotocol/tendermint v0.34.3-oasis1/go.mod h1:l1rbFu7ofj4FAuaf2LLx/2OXWcxbWZWNQ6x7pbenVUM=
+github.com/oasisprotocol/tendermint v0.34.3-oasis2 h1:VmpiLTEB8jusLIetPs4mOUm+xWvGLh5vUec4Tcsf5h0=
+github.com/oasisprotocol/tendermint v0.34.3-oasis2/go.mod h1:EpSef1TGT7k1U4jQ40rI0BHkTHBL1UoGeEAEpbGzdYs=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=