From 3dd5af4bc708b44f2eb3bbc714a1fd8da8c95da0 Mon Sep 17 00:00:00 2001
From: Thomas Bruyelle <thomas.bruyelle@tendermint.com>
Date: Tue, 20 Aug 2024 15:42:56 +0200
Subject: [PATCH] chore: remove SDK replace to ics-lsm version

---
 cmd/atomoned/cmd/testnet.go |  1 +
 go.mod                      |  6 ------
 go.sum                      |  4 ++--
 tests/e2e/query.go          | 14 --------------
 tests/e2e/validator.go      |  1 +
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/cmd/atomoned/cmd/testnet.go b/cmd/atomoned/cmd/testnet.go
index f0ae3f72..634a8451 100644
--- a/cmd/atomoned/cmd/testnet.go
+++ b/cmd/atomoned/cmd/testnet.go
@@ -305,6 +305,7 @@ func initTestnetFiles(
 			sdk.NewCoin(sdk.DefaultBondDenom, valTokens),
 			stakingtypes.NewDescription(nodeDirName, "", "", "", ""),
 			stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()),
+			sdk.OneInt(),
 		)
 		if err != nil {
 			return err
diff --git a/go.mod b/go.mod
index ff42852f..7ace0ec5 100644
--- a/go.mod
+++ b/go.mod
@@ -212,12 +212,6 @@ replace (
 	// Use cosmos keyring
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 
-	// Use special SDK v0.47.x release with support for both ICS and LSM
-	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.47.10-ics-lsm
-
-	// Use special ICS v3.3.x release with support for LSM
-	github.com/cosmos/interchain-security/v3 => github.com/cosmos/interchain-security/v3 v3.3.3-lsm
-
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 
diff --git a/go.sum b/go.sum
index bb3547d7..3d244378 100644
--- a/go.sum
+++ b/go.sum
@@ -396,8 +396,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
 github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
 github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU=
 github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co=
-github.com/cosmos/cosmos-sdk v0.47.10-ics-lsm h1:nW5xAl4SQchNExAkcPPTPpgu6CnEHc75g4JIKkVNgAI=
-github.com/cosmos/cosmos-sdk v0.47.10-ics-lsm/go.mod h1:7lymTBqaezjxtEnVMwBNx0rXcOMoP49NUpYugIrjyus=
+github.com/cosmos/cosmos-sdk v0.47.10 h1:Wxf5yEN3jZbG4fftxAMKB6rpd8ME0mxuCVihpz65dt0=
+github.com/cosmos/cosmos-sdk v0.47.10/go.mod h1:UWpgWkhcsBIATS68uUC0del7IiBN4hPv/vqg8Zz23uw=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
diff --git a/tests/e2e/query.go b/tests/e2e/query.go
index a75063a5..45860b80 100644
--- a/tests/e2e/query.go
+++ b/tests/e2e/query.go
@@ -266,17 +266,3 @@ func queryAllEvidence(endpoint string) (evidencetypes.QueryAllEvidenceResponse,
 	}
 	return res, nil
 }
-
-func queryTokenizeShareRecordByID(endpoint string, recordID int) (stakingtypes.TokenizeShareRecord, error) {
-	var res stakingtypes.QueryTokenizeShareRecordByIdResponse
-
-	body, err := httpGet(fmt.Sprintf("%s/cosmos/staking/v1beta1/tokenize_share_record_by_id/%d", endpoint, recordID))
-	if err != nil {
-		return stakingtypes.TokenizeShareRecord{}, fmt.Errorf("failed to execute HTTP request: %w", err)
-	}
-
-	if err := cdc.UnmarshalJSON(body, &res); err != nil {
-		return stakingtypes.TokenizeShareRecord{}, err
-	}
-	return res.Record, nil
-}
diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go
index 8329f27b..4ffb8fb6 100644
--- a/tests/e2e/validator.go
+++ b/tests/e2e/validator.go
@@ -245,6 +245,7 @@ func (v *validator) buildCreateValidatorMsg(amount sdk.Coin) (sdk.Msg, error) {
 		amount,
 		description,
 		commissionRates,
+		sdk.OneInt(),
 	)
 }