test tendermint upgrade

scrtlabs · Feb 2, 2024 · 5f69c16 · 5f69c16
1 parent e224c95
commit 5f69c16
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -3,13 +3,12 @@ module github.com/scrtlabs/SecretNetwork
 go 1.21
 
 replace (
-	github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52
 	github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.45.13-0.20230802150248-ea64f27dc58d
 	// Fix OSX Ledger Connection Issues - Premerged https://github.com/cosmos/ledger-cosmos-go/pull/36/files
 	github.com/cosmos/ledger-cosmos-go => github.com/chillyvee/ledger-cosmos-go v0.12.2
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/scrtlabs/tm-secret-enclave => github.com/scrtlabs/tm-secret-enclave v1.11.1
-	github.com/tendermint/tendermint => github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52
+	// github.com/tendermint/tendermint => github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52
 	// enforce grpc version
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )
@@ -164,3 +163,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
 )
+
+replace github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v0.38.2-scrt
+
+replace github.com/tendermint/tendermint => github.com/scrtlabs/tendermint v0.38.2-scrt
diff --git a/go.sum b/go.sum
@@ -937,8 +937,8 @@ github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtm
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/scrtlabs/cosmos-sdk v0.45.13-0.20230802150248-ea64f27dc58d h1:J52TETA52GtOOCBYPfmZoOOSM7Nr/GjhsH6RvdaHKMU=
 github.com/scrtlabs/cosmos-sdk v0.45.13-0.20230802150248-ea64f27dc58d/go.mod h1:kOvNW8eRcR6zcO9yEfDa+iexTXdb+/QxHL1OqSEqfAo=
-github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52 h1:25rvoh2dQgzOOGPj/t1tPKApeeRrcUZtQXZ6wu6mE54=
-github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52/go.mod h1:H9SALxhCLtq/RwZLDUo/A7q7ri4GSDeZzJDx/mqA23E=
+github.com/scrtlabs/tendermint v0.38.2-scrt h1:TO/x2B+EqJikrvuMvdzClUoTiFog36gc15fo6TQsDDw=
+github.com/scrtlabs/tendermint v0.38.2-scrt/go.mod h1:H9SALxhCLtq/RwZLDUo/A7q7ri4GSDeZzJDx/mqA23E=
 github.com/scrtlabs/tm-secret-enclave v1.11.1 h1:UFPMS8XGrgx0SVTcHF0JmM/7nw17sQRMJ3PCg6rlGQA=
 github.com/scrtlabs/tm-secret-enclave v1.11.1/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=

diff --git a/scripts/install-everything.sh b/scripts/install-everything.sh
@@ -9,7 +9,7 @@ else
 fi
 
 # Clone Repo
-git clone https://github.com/scrtlabs/SecretNetwork.git
+git clone --branch alexh/test-cometbft-0.38.2 https://github.com/scrtlabs/SecretNetwork.git
 cd SecretNetwork
 
 # Install Rust