diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
index 76e79ad3ce2..865a6fd0999 100644
--- a/docs/ibc/proto-docs.md
+++ b/docs/ibc/proto-docs.md
@@ -4008,7 +4008,7 @@ to preserve uniqueness of different data sign byte encodings.
### ClientState
-ClientState from Ostracon tracks the current validator set, latest height,
+ClientState from Tendermint tracks the current validator set, latest height,
and a possible frozen height.
@@ -4034,7 +4034,7 @@ and a possible frozen height.
### ConsensusState
-ConsensusState defines the consensus state from Ostracon.
+ConsensusState defines the consensus state from Tendermint.
| Field | Type | Label | Description |
@@ -4068,9 +4068,9 @@ supports positive values.
### Header
-Header defines the Ostracon client consensus Header.
+Header defines the Tendermint client consensus Header.
It encapsulates all the information necessary to update from a trusted
-Ostracon ConsensusState. The inclusion of TrustedHeight and
+Tendermint ConsensusState. The inclusion of TrustedHeight and
TrustedValidators allows this update to process correctly, so long as the
ConsensusState for the TrustedHeight exists, this removes race conditions
among relayers The SignedHeader and ValidatorSet are the new untrusted update
@@ -4103,7 +4103,7 @@ that implements Misbehaviour interface expected by ICS-02
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| `client_id` | [string](#string) | | **Deprecated.** ClientID is deprecated |
+| `client_id` | [string](#string) | | |
| `header_1` | [Header](#ibc.lightclients.tendermint.v1.Header) | | |
| `header_2` | [Header](#ibc.lightclients.tendermint.v1.Header) | | |
diff --git a/modules/apps/27-interchain-accounts/host/types/ack.go b/modules/apps/27-interchain-accounts/host/types/ack.go
index d11c241eca0..9d067ce3efa 100644
--- a/modules/apps/27-interchain-accounts/host/types/ack.go
+++ b/modules/apps/27-interchain-accounts/host/types/ack.go
@@ -18,7 +18,7 @@ const (
// the packet acknowledgement.
func NewErrorAcknowledgement(err error) channeltypes.Acknowledgement {
// the ABCI code is included in the abcitypes.ResponseDeliverTx hash
- // constructed in Ostracon and is therefore determinstic
+ // constructed in Tendermint and is therefore determinstic
_, code, _ := sdkerrors.ABCIInfo(err, false) // discard non-deterministic codespace and log values
errorString := fmt.Sprintf("ABCI code: %d: %s", code, ackErrorString)
diff --git a/modules/apps/transfer/spec/01_concepts.md b/modules/apps/transfer/spec/01_concepts.md
index e66f11c83b6..e70185fcae5 100644
--- a/modules/apps/transfer/spec/01_concepts.md
+++ b/modules/apps/transfer/spec/01_concepts.md
@@ -54,7 +54,7 @@ A general pseudo algorithm would look like the following:
3. Query the client state using the identifiers pair. Note that this query will return a `"Not
Found"` response if the current chain is not connected to this channel.
4. Retrieve the the client identifier or chain identifier from the client state (eg: on
- Ostracon clients) and store it locally.
+ Tendermint clients) and store it locally.
Using the gRPC gataway client service the steps above would be, with a given IBC token `ibc/7F1D3FCF4AE79E1554D670D1AD949A9BA4E4A3C76C63093E17E446A46061A7A2` stored on `chainB`:
@@ -101,7 +101,7 @@ In some [exceptional cases](https://github.com/cosmos/ibc-go/blob/main/docs/arch
To mitigate this, a client update governance proposal can be submitted to update the frozen client
with a new valid header. Once the proposal passes the client state will be unfrozen and the funds
from the associated channels will then be unlocked. This mechanism only applies to clients that
-allow updates via governance, such as Ostracon clients.
+allow updates via governance, such as Tendermint clients.
In addition to this, it's important to mention that a token must be sent back along the exact route
that it took originally un order to return it to its original form on the source chain (eg: the
diff --git a/modules/apps/transfer/types/ack.go b/modules/apps/transfer/types/ack.go
index 7412022aee8..9b8cc3c5275 100644
--- a/modules/apps/transfer/types/ack.go
+++ b/modules/apps/transfer/types/ack.go
@@ -18,7 +18,7 @@ const (
// the packet acknowledgement.
func NewErrorAcknowledgement(err error) channeltypes.Acknowledgement {
// the ABCI code is included in the abcitypes.ResponseDeliverTx hash
- // constructed in Ostracon and is therefore deterministic
+ // constructed in Tendermint and is therefore deterministic
_, code, _ := sdkerrors.ABCIInfo(err, false) // discard non-determinstic codespace and log values
errorString := fmt.Sprintf("ABCI code: %d: %s", code, ackErrorString)
diff --git a/modules/core/02-client/client/cli/query.go b/modules/core/02-client/client/cli/query.go
index c3b7dee78a1..c58856acdbc 100644
--- a/modules/core/02-client/client/cli/query.go
+++ b/modules/core/02-client/client/cli/query.go
@@ -260,7 +260,7 @@ func GetCmdQueryHeader() *cobra.Command {
cmd := &cobra.Command{
Use: "header",
Short: "Query the latest header of the running chain",
- Long: "Query the latest Ostracon header of the running chain",
+ Long: "Query the latest Tendermint header of the running chain",
Example: fmt.Sprintf("%s query %s %s header", version.AppName, host.ModuleName, types.SubModuleName),
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, _ []string) error {
@@ -268,7 +268,7 @@ func GetCmdQueryHeader() *cobra.Command {
if err != nil {
return err
}
- header, _, err := utils.QueryOstraconHeader(clientCtx)
+ header, _, err := utils.QueryTendermintHeader(clientCtx)
if err != nil {
return err
}
diff --git a/modules/core/02-client/client/utils/utils.go b/modules/core/02-client/client/utils/utils.go
index b9b740a261a..d44f534e731 100644
--- a/modules/core/02-client/client/utils/utils.go
+++ b/modules/core/02-client/client/utils/utils.go
@@ -39,7 +39,7 @@ func QueryClientStateABCI(
) (*types.QueryClientStateResponse, error) {
key := host.FullClientStateKey(clientID)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -92,7 +92,7 @@ func QueryConsensusStateABCI(
) (*types.QueryConsensusStateResponse, error) {
key := host.FullConsensusStateKey(clientID, height)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -117,9 +117,9 @@ func QueryConsensusStateABCI(
return types.NewQueryConsensusStateResponse(anyConsensusState, proofBz, proofHeight), nil
}
-// QueryOstraconHeader takes a client context and returns the appropriate
-// ostracon header
-func QueryOstraconHeader(clientCtx client.Context) (ibcoctypes.Header, int64, error) {
+// QueryTendermintHeader takes a client context and returns the appropriate
+// tendermint header
+func QueryTendermintHeader(clientCtx client.Context) (ibcoctypes.Header, int64, error) {
node, err := clientCtx.GetNode()
if err != nil {
return ibcoctypes.Header{}, 0, err
@@ -165,7 +165,7 @@ func QueryOstraconHeader(clientCtx client.Context) (ibcoctypes.Header, int64, er
}
// QuerySelfConsensusState takes a client context and returns the appropriate
-// ostracon consensus state
+// tendermint consensus state
func QuerySelfConsensusState(clientCtx client.Context) (*ibcoctypes.ConsensusState, int64, error) {
node, err := clientCtx.GetNode()
if err != nil {
diff --git a/modules/core/02-client/keeper/client.go b/modules/core/02-client/keeper/client.go
index 150a15aa125..16d6eb47186 100644
--- a/modules/core/02-client/keeper/client.go
+++ b/modules/core/02-client/keeper/client.go
@@ -31,7 +31,7 @@ func (k Keeper) CreateClient(
k.Logger(ctx).Info("client created at height", "client-id", clientID, "height", clientState.GetLatestHeight().String())
// verifies initial consensus state against client state and initializes client store with any client-specific metadata
- // e.g. set ProcessedTime in Ostracon clients
+ // e.g. set ProcessedTime in Tendermint clients
if err := clientState.Initialize(ctx, k.cdc, k.ClientStore(ctx, clientID), consensusState); err != nil {
return "", err
}
diff --git a/modules/core/02-client/keeper/client_test.go b/modules/core/02-client/keeper/client_test.go
index e82f9e5a408..e08f2b41221 100644
--- a/modules/core/02-client/keeper/client_test.go
+++ b/modules/core/02-client/keeper/client_test.go
@@ -41,7 +41,7 @@ func (suite *KeeperTestSuite) TestCreateClient() {
}
}
-func (suite *KeeperTestSuite) TestUpdateClientOstracon() {
+func (suite *KeeperTestSuite) TestUpdateClientTendermint() {
var (
path *ibctesting.Path
updateHeader *ibcoctypes.Header
@@ -364,7 +364,7 @@ func (suite *KeeperTestSuite) TestUpgradeClient() {
expPass: false,
},
{
- name: "ostracon client VerifyUpgrade fails",
+ name: "tendermint client VerifyUpgrade fails",
setup: func() {
// last Height is at next block
lastHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1))
diff --git a/modules/core/02-client/keeper/keeper.go b/modules/core/02-client/keeper/keeper.go
index 35e5b67cb21..9f4084d3ced 100644
--- a/modules/core/02-client/keeper/keeper.go
+++ b/modules/core/02-client/keeper/keeper.go
@@ -270,7 +270,7 @@ func (k Keeper) GetSelfConsensusState(ctx sdk.Context, height exported.Height) (
func (k Keeper) ValidateSelfClient(ctx sdk.Context, clientState exported.ClientState) error {
tmClient, ok := clientState.(*ibcoctypes.ClientState)
if !ok {
- return sdkerrors.Wrapf(types.ErrInvalidClient, "client must be a Ostracon client, expected: %T, got: %T",
+ return sdkerrors.Wrapf(types.ErrInvalidClient, "client must be a Tendermint client, expected: %T, got: %T",
&ibcoctypes.ClientState{}, tmClient)
}
diff --git a/modules/core/02-client/keeper/keeper_test.go b/modules/core/02-client/keeper/keeper_test.go
index 580f2863423..3a4dc2b5d13 100644
--- a/modules/core/02-client/keeper/keeper_test.go
+++ b/modules/core/02-client/keeper/keeper_test.go
@@ -31,9 +31,9 @@ const (
testChainID = "gaiahub-0"
testChainIDRevision1 = "gaiahub-1"
- testClientID = "ostracon-0"
- testClientID2 = "ostracon-1"
- testClientID3 = "ostracon-2"
+ testClientID = "tendermint-0"
+ testClientID2 = "tendermint-1"
+ testClientID3 = "tendermint-2"
height = 5
diff --git a/modules/core/02-client/keeper/migrations.go b/modules/core/02-client/keeper/migrations.go
index b4ca0ac49df..a3b703b065d 100644
--- a/modules/core/02-client/keeper/migrations.go
+++ b/modules/core/02-client/keeper/migrations.go
@@ -20,8 +20,8 @@ func NewMigrator(keeper Keeper) Migrator {
// This migration
// - migrates solo machine client states from v1 to v2 protobuf definition
// - prunes solo machine consensus states
-// - prunes expired ostracon consensus states
-// - adds iteration and processed height keys for unexpired ostracon consensus states
+// - prunes expired tendermint consensus states
+// - adds iteration and processed height keys for unexpired tendermint consensus states
func (m Migrator) Migrate1to2(ctx sdk.Context) error {
return v100.MigrateStore(ctx, m.keeper.storeKey, m.keeper.cdc)
}
diff --git a/modules/core/02-client/keeper/proposal_test.go b/modules/core/02-client/keeper/proposal_test.go
index cec816423f4..ec83e532f23 100644
--- a/modules/core/02-client/keeper/proposal_test.go
+++ b/modules/core/02-client/keeper/proposal_test.go
@@ -58,7 +58,7 @@ func (suite *KeeperTestSuite) TestClientUpdateProposal() {
}, false,
},
{
- "cannot use solomachine as substitute for ostracon client", func() {
+ "cannot use solomachine as substitute for tendermint client", func() {
solomachine := ibctesting.NewSolomachine(suite.T(), suite.cdc, "solo machine", "", 1)
solomachine.Sequence = subjectClientState.GetLatestHeight().GetRevisionHeight() + 1
substituteClientState = solomachine.ClientState()
diff --git a/modules/core/02-client/legacy/v100/genesis.go b/modules/core/02-client/legacy/v100/genesis.go
index 0ba27a9eda7..5d6adc8aeb3 100644
--- a/modules/core/02-client/legacy/v100/genesis.go
+++ b/modules/core/02-client/legacy/v100/genesis.go
@@ -17,13 +17,13 @@ import (
//
// - Update solo machine client state protobuf definition (v1 to v2)
// - Remove all solo machine consensus states
-// - Remove all expired ostracon consensus states
-// - Adds ProcessedHeight and Iteration keys for unexpired ostracon consensus states
+// - Remove all expired tendermint consensus states
+// - Adds ProcessedHeight and Iteration keys for unexpired tendermint consensus states
func MigrateGenesis(cdc codec.BinaryCodec, clientGenState *types.GenesisState, genesisBlockTime time.Time, selfHeight exported.Height) (*types.GenesisState, error) {
// To prune the consensus states, we will create new clientsConsensus
// and clientsMetadata. These slices will be filled up with consensus states
// which should not be pruned. No solo machine consensus states should be added
- // and only unexpired consensus states for ostracon clients will be added.
+ // and only unexpired consensus states for tendermint clients will be added.
// The metadata keys for unexpired consensus states will be added to clientsMetadata
var (
clientsConsensus []types.ClientConsensusStates
@@ -93,7 +93,7 @@ func MigrateGenesis(cdc codec.BinaryCodec, clientGenState *types.GenesisState, g
// collect metadata for unexpired consensus states
var clientMetadata []types.GenesisMetadata
- // remove all expired ostracon consensus state metadata by adding only
+ // remove all expired tendermint consensus state metadata by adding only
// unexpired consensus state metadata
for _, consState := range unexpiredConsensusStates {
for _, identifiedGenMetadata := range clientGenState.ClientsMetadata {
diff --git a/modules/core/02-client/legacy/v100/genesis_test.go b/modules/core/02-client/legacy/v100/genesis_test.go
index 09ab0bb81a9..449477b187d 100644
--- a/modules/core/02-client/legacy/v100/genesis_test.go
+++ b/modules/core/02-client/legacy/v100/genesis_test.go
@@ -31,7 +31,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1)
solomachineMulti := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4)
- // create ostracon clients
+ // create tendermint clients
suite.coordinator.SetupClients(path)
err := path.EndpointA.UpdateClient()
suite.Require().NoError(err)
@@ -113,7 +113,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
clientStore.Set(host.ConsensusStateKey(height2), bz)
clientStore.Set(host.ConsensusStateKey(height3), bz)
}
- // solo machine clients must come before ostracon in expected
+ // solo machine clients must come before tendermint in expected
clientGenState.Clients = append(clients, clientGenState.Clients...)
// migrate store get expected genesis
@@ -122,7 +122,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
suite.Require().NoError(err)
expectedClientGenState := ibcclient.ExportGenesis(path.EndpointA.Chain.GetContext(), path.EndpointA.Chain.App.GetIBCKeeper().ClientKeeper)
- // NOTE: genesis time isn't updated since we aren't testing for ostracon consensus state pruning
+ // NOTE: genesis time isn't updated since we aren't testing for tendermint consensus state pruning
migrated, err := v100.MigrateGenesis(codec.NewProtoCodec(clientCtx.InterfaceRegistry), &clientGenState, suite.coordinator.CurrentTime, types.GetSelfHeight(suite.chainA.GetContext()))
suite.Require().NoError(err)
@@ -169,7 +169,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
suite.Require().Equal(string(expectedIndentedBz), string(indentedBz))
}
-func (suite *LegacyTestSuite) TestMigrateGenesisOstracon() {
+func (suite *LegacyTestSuite) TestMigrateGenesisTendermint() {
// create two paths and setup clients
path1 := ibctesting.NewPath(suite.chainA, suite.chainB)
path2 := ibctesting.NewPath(suite.chainA, suite.chainB)
diff --git a/modules/core/02-client/legacy/v100/store.go b/modules/core/02-client/legacy/v100/store.go
index 875895049bc..575eaaae6e5 100644
--- a/modules/core/02-client/legacy/v100/store.go
+++ b/modules/core/02-client/legacy/v100/store.go
@@ -22,8 +22,8 @@ import (
//
// - Migrating solo machine client states from v1 to v2 protobuf definition
// - Pruning all solo machine consensus states
-// - Pruning expired ostracon consensus states
-// - Adds ProcessedHeight and Iteration keys for unexpired ostracon consensus states
+// - Pruning expired tendermint consensus states
+// - Adds ProcessedHeight and Iteration keys for unexpired tendermint consensus states
func MigrateStore(ctx sdk.Context, storeKey sdk.StoreKey, cdc codec.BinaryCodec) (err error) {
store := ctx.KVStore(storeKey)
iterator := sdk.KVStorePrefixIterator(store, host.KeyClientStorePrefix)
@@ -84,12 +84,12 @@ func MigrateStore(ctx sdk.Context, storeKey sdk.StoreKey, cdc codec.BinaryCodec)
case exported.Tendermint:
var clientState exported.ClientState
if err := cdc.UnmarshalInterface(bz, &clientState); err != nil {
- return sdkerrors.Wrap(err, "failed to unmarshal client state bytes into ostracon client state")
+ return sdkerrors.Wrap(err, "failed to unmarshal client state bytes into tendermint client state")
}
tmClientState, ok := clientState.(*ibcoctypes.ClientState)
if !ok {
- return sdkerrors.Wrap(clienttypes.ErrInvalidClient, "client state is not ostracon even though client id contains 07-tendermint")
+ return sdkerrors.Wrap(clienttypes.ErrInvalidClient, "client state is not tendermint even though client id contains 07-tendermint")
}
// add iteration keys so pruning will be successful
@@ -148,7 +148,7 @@ func pruneSolomachineConsensusStates(clientStore sdk.KVStore) {
}
}
-// addConsensusMetadata adds the iteration key and processed height for all ostracon consensus states
+// addConsensusMetadata adds the iteration key and processed height for all tendermint consensus states
// These keys were not included in the previous release of the IBC module. Adding the iteration keys allows
// for pruning iteration.
func addConsensusMetadata(ctx sdk.Context, clientStore sdk.KVStore) {
diff --git a/modules/core/02-client/legacy/v100/store_test.go b/modules/core/02-client/legacy/v100/store_test.go
index 2998299059a..efc654741e2 100644
--- a/modules/core/02-client/legacy/v100/store_test.go
+++ b/modules/core/02-client/legacy/v100/store_test.go
@@ -91,7 +91,7 @@ func (suite *LegacyTestSuite) TestMigrateStoreSolomachine() {
clientStore.Set(host.ConsensusStateKey(height3), bz)
}
- // create ostracon clients
+ // create tendermint clients
suite.coordinator.SetupClients(path)
err := v100.MigrateStore(path.EndpointA.Chain.GetContext(), path.EndpointA.Chain.GetSimApp().GetKey(host.StoreKey), path.EndpointA.Chain.App.AppCodec())
@@ -114,9 +114,9 @@ func (suite *LegacyTestSuite) TestMigrateStoreSolomachine() {
}
}
-// only test migration for ostracon clients
-// ensure all expired consensus states are removed from ostracon client stores
-func (suite *LegacyTestSuite) TestMigrateStoreOstracon() {
+// only test migration for tendermint clients
+// ensure all expired consensus states are removed from tendermint client stores
+func (suite *LegacyTestSuite) TestMigrateStoreTendermint() {
// create path and setup clients
path1 := ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.SetupClients(path1)
diff --git a/modules/core/02-client/types/client_test.go b/modules/core/02-client/types/client_test.go
index 7eeaeb07db1..ac851f833f4 100644
--- a/modules/core/02-client/types/client_test.go
+++ b/modules/core/02-client/types/client_test.go
@@ -23,7 +23,7 @@ func (suite *TypesTestSuite) TestMarshalConsensusStateWithHeight() {
},
},
{
- "ostracon client", func() {
+ "tendermint client", func() {
path := ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.SetupClients(path)
clientState := suite.chainA.GetClientState(path.EndpointA.ClientID)
@@ -63,13 +63,13 @@ func TestValidateClientType(t *testing.T) {
clientType string
expPass bool
}{
- {"valid", "ostracon", true},
+ {"valid", "tendermint", true},
{"valid solomachine", "solomachine-v1", true},
- {"too large", "ostraconostraconostraconostraconostraconostraconostracon", false},
+ {"too large", "tenderminttenderminttenderminttenderminttenderminttenderminttendermint", false},
{"too short", "t", false},
{"blank id", " ", false},
{"empty id", "", false},
- {"ends with dash", "ostracon-", false},
+ {"ends with dash", "tendermint-", false},
}
for _, tc := range testCases {
diff --git a/modules/core/02-client/types/codec_test.go b/modules/core/02-client/types/codec_test.go
index a612e161730..2714e05bbf5 100644
--- a/modules/core/02-client/types/codec_test.go
+++ b/modules/core/02-client/types/codec_test.go
@@ -29,7 +29,7 @@ func (suite *TypesTestSuite) TestPackClientState() {
true,
},
{
- "ostracon client",
+ "tendermint client",
ibcoctypes.NewClientState(chainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false),
true,
},
@@ -81,7 +81,7 @@ func (suite *TypesTestSuite) TestPackConsensusState() {
true,
},
{
- "ostracon consensus",
+ "tendermint consensus",
suite.chainA.LastHeader.ConsensusState(),
true,
},
@@ -127,7 +127,7 @@ func (suite *TypesTestSuite) TestPackHeader() {
true,
},
{
- "ostracon header",
+ "tendermint header",
suite.chainA.LastHeader,
true,
},
@@ -174,8 +174,8 @@ func (suite *TypesTestSuite) TestPackMisbehaviour() {
true,
},
{
- "ostracon misbehaviour",
- ibcoctypes.NewMisbehaviour("ostracon-0", suite.chainA.LastHeader, suite.chainA.LastHeader),
+ "tendermint misbehaviour",
+ ibcoctypes.NewMisbehaviour("tendermint-0", suite.chainA.LastHeader, suite.chainA.LastHeader),
true,
},
{
diff --git a/modules/core/02-client/types/keys_test.go b/modules/core/02-client/types/keys_test.go
index 261d50be5ab..5d38999d01e 100644
--- a/modules/core/02-client/types/keys_test.go
+++ b/modules/core/02-client/types/keys_test.go
@@ -18,23 +18,23 @@ func TestParseClientIdentifier(t *testing.T) {
expSeq uint64
expPass bool
}{
- {"valid 0", "ostracon-0", "ostracon", 0, true},
- {"valid 1", "ostracon-1", "ostracon", 1, true},
+ {"valid 0", "tendermint-0", "tendermint", 0, true},
+ {"valid 1", "tendermint-1", "tendermint", 1, true},
{"valid solemachine", "solomachine-v1-1", "solomachine-v1", 1, true},
- {"valid large sequence", types.FormatClientIdentifier("ostracon", math.MaxUint64), "ostracon", math.MaxUint64, true},
+ {"valid large sequence", types.FormatClientIdentifier("tendermint", math.MaxUint64), "tendermint", math.MaxUint64, true},
{"valid short client type", "t-0", "t", 0, true},
// one above uint64 max
- {"invalid uint64", "ostracon-18446744073709551616", "ostracon", 0, false},
+ {"invalid uint64", "tendermint-18446744073709551616", "tendermint", 0, false},
// uint64 == 20 characters
- {"invalid large sequence", "ostracon-2345682193567182931243", "ostracon", 0, false},
+ {"invalid large sequence", "tendermint-2345682193567182931243", "tendermint", 0, false},
{"invalid newline in clientID", "ostraco\nn-1", "ostraco\nn", 0, false},
- {"invalid newline character before dash", "ostracon\n-1", "ostracon", 0, false},
- {"missing dash", "ostracon0", "ostracon", 0, false},
+ {"invalid newline character before dash", "tendermint\n-1", "tendermint", 0, false},
+ {"missing dash", "tendermint0", "tendermint", 0, false},
{"blank id", " ", " ", 0, false},
{"empty id", "", "", 0, false},
- {"negative sequence", "ostracon--1", "ostracon", 0, false},
- {"invalid format", "ostracon-tm", "ostracon", 0, false},
- {"empty clientype", " -100", "ostracon", 0, false},
+ {"negative sequence", "tendermint--1", "tendermint", 0, false},
+ {"invalid format", "tendermint-tm", "tendermint", 0, false},
+ {"empty clientype", " -100", "tendermint", 0, false},
}
for _, tc := range testCases {
diff --git a/modules/core/02-client/types/msgs_test.go b/modules/core/02-client/types/msgs_test.go
index e39df3c1b30..89f42f41d80 100644
--- a/modules/core/02-client/types/msgs_test.go
+++ b/modules/core/02-client/types/msgs_test.go
@@ -54,9 +54,9 @@ func (suite *TypesTestSuite) TestMarshalMsgCreateClient() {
},
},
{
- "ostracon client", func() {
- ostraconClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
- msg, err = types.NewMsgCreateClient(ostraconClient, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
+ "tendermint client", func() {
+ tendermintClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
+ msg, err = types.NewMsgCreateClient(tendermintClient, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
},
@@ -98,16 +98,16 @@ func (suite *TypesTestSuite) TestMsgCreateClient_ValidateBasic() {
expPass bool
}{
{
- "valid - ostracon client",
+ "valid - tendermint client",
func() {
- ostraconClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
- msg, err = types.NewMsgCreateClient(ostraconClient, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
+ tendermintClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
+ msg, err = types.NewMsgCreateClient(tendermintClient, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
true,
},
{
- "invalid ostracon client",
+ "invalid tendermint client",
func() {
msg, err = types.NewMsgCreateClient(&ibcoctypes.ClientState{}, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
@@ -124,8 +124,8 @@ func (suite *TypesTestSuite) TestMsgCreateClient_ValidateBasic() {
{
"failed to unpack consensus state",
func() {
- ostraconClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
- msg, err = types.NewMsgCreateClient(ostraconClient, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
+ tendermintClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
+ msg, err = types.NewMsgCreateClient(tendermintClient, suite.chainA.CurrentOCClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
msg.ConsensusState = nil
},
@@ -168,9 +168,9 @@ func (suite *TypesTestSuite) TestMsgCreateClient_ValidateBasic() {
{
"invalid - client state and consensus state client types do not match",
func() {
- ostraconClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
+ tendermintClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
soloMachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachine", "", 2)
- msg, err = types.NewMsgCreateClient(ostraconClient, soloMachine.ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
+ msg, err = types.NewMsgCreateClient(tendermintClient, soloMachine.ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
false,
@@ -208,8 +208,8 @@ func (suite *TypesTestSuite) TestMarshalMsgUpdateClient() {
},
},
{
- "ostracon client", func() {
- msg, err = types.NewMsgUpdateClient("ostracon-0", suite.chainA.CurrentOCClientHeader(), suite.chainA.SenderAccount.GetAddress().String())
+ "tendermint client", func() {
+ msg, err = types.NewMsgUpdateClient("tendermint-0", suite.chainA.CurrentOCClientHeader(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
},
@@ -258,17 +258,17 @@ func (suite *TypesTestSuite) TestMsgUpdateClient_ValidateBasic() {
false,
},
{
- "valid - ostracon header",
+ "valid - tendermint header",
func() {
- msg, err = types.NewMsgUpdateClient("ostracon-0", suite.chainA.CurrentOCClientHeader(), suite.chainA.SenderAccount.GetAddress().String())
+ msg, err = types.NewMsgUpdateClient("tendermint-0", suite.chainA.CurrentOCClientHeader(), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
true,
},
{
- "invalid ostracon header",
+ "invalid tendermint header",
func() {
- msg, err = types.NewMsgUpdateClient("ostracon-0", &ibcoctypes.Header{}, suite.chainA.SenderAccount.GetAddress().String())
+ msg, err = types.NewMsgUpdateClient("tendermint-0", &ibcoctypes.Header{}, suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
false,
@@ -336,11 +336,11 @@ func (suite *TypesTestSuite) TestMarshalMsgUpgradeClient() {
malleate func()
}{
{
- "client upgrades to new ostracon client",
+ "client upgrades to new tendermint client",
func() {
- ostraconClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
- ostraconConsState := &ibcoctypes.ConsensusState{NextValidatorsHash: []byte("nextValsHash")}
- msg, err = types.NewMsgUpgradeClient("clientid", ostraconClient, ostraconConsState, []byte("proofUpgradeClient"), []byte("proofUpgradeConsState"), suite.chainA.SenderAccount.GetAddress().String())
+ tendermintClient := ibcoctypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false)
+ tendermintConsState := &ibcoctypes.ConsensusState{NextValidatorsHash: []byte("nextValsHash")}
+ msg, err = types.NewMsgUpgradeClient("clientid", tendermintClient, tendermintConsState, []byte("proofUpgradeClient"), []byte("proofUpgradeConsState"), suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
},
@@ -486,14 +486,14 @@ func (suite *TypesTestSuite) TestMarshalMsgSubmitMisbehaviour() {
},
},
{
- "ostracon client", func() {
+ "tendermint client", func() {
height := types.NewHeight(0, uint64(suite.chainA.CurrentHeader.Height))
heightMinus1 := types.NewHeight(0, uint64(suite.chainA.CurrentHeader.Height)-1)
header1 := suite.chainA.CreateOCClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.CurrentHeader.Time, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
header2 := suite.chainA.CreateOCClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.CurrentHeader.Time.Add(time.Minute), suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
- misbehaviour := ibcoctypes.NewMisbehaviour("ostracon-0", header1, header2)
- msg, err = types.NewMsgSubmitMisbehaviour("ostracon-0", misbehaviour, suite.chainA.SenderAccount.GetAddress().String())
+ misbehaviour := ibcoctypes.NewMisbehaviour("tendermint-0", header1, header2)
+ msg, err = types.NewMsgSubmitMisbehaviour("tendermint-0", misbehaviour, suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
},
@@ -542,23 +542,23 @@ func (suite *TypesTestSuite) TestMsgSubmitMisbehaviour_ValidateBasic() {
false,
},
{
- "valid - ostracon misbehaviour",
+ "valid - tendermint misbehaviour",
func() {
height := types.NewHeight(0, uint64(suite.chainA.CurrentHeader.Height))
heightMinus1 := types.NewHeight(0, uint64(suite.chainA.CurrentHeader.Height)-1)
header1 := suite.chainA.CreateOCClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.CurrentHeader.Time, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
header2 := suite.chainA.CreateOCClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.CurrentHeader.Time.Add(time.Minute), suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
- misbehaviour := ibcoctypes.NewMisbehaviour("ostracon-0", header1, header2)
- msg, err = types.NewMsgSubmitMisbehaviour("ostracon-0", misbehaviour, suite.chainA.SenderAccount.GetAddress().String())
+ misbehaviour := ibcoctypes.NewMisbehaviour("tendermint-0", header1, header2)
+ msg, err = types.NewMsgSubmitMisbehaviour("tendermint-0", misbehaviour, suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
true,
},
{
- "invalid ostracon misbehaviour",
+ "invalid tendermint misbehaviour",
func() {
- msg, err = types.NewMsgSubmitMisbehaviour("ostracon-0", &ibcoctypes.Misbehaviour{}, suite.chainA.SenderAccount.GetAddress().String())
+ msg, err = types.NewMsgSubmitMisbehaviour("tendermint-0", &ibcoctypes.Misbehaviour{}, suite.chainA.SenderAccount.GetAddress().String())
suite.Require().NoError(err)
},
false,
diff --git a/modules/core/03-connection/client/utils/utils.go b/modules/core/03-connection/client/utils/utils.go
index d73464f3ac0..68dd84dc598 100644
--- a/modules/core/03-connection/client/utils/utils.go
+++ b/modules/core/03-connection/client/utils/utils.go
@@ -40,7 +40,7 @@ func QueryConnection(
func queryConnectionABCI(clientCtx client.Context, connectionID string) (*types.QueryConnectionResponse, error) {
key := host.ConnectionKey(connectionID)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -81,7 +81,7 @@ func QueryClientConnections(
func queryClientConnectionsABCI(clientCtx client.Context, clientID string) (*types.QueryClientConnectionsResponse, error) {
key := host.ClientConnectionsKey(clientID)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
diff --git a/modules/core/04-channel/client/utils/utils.go b/modules/core/04-channel/client/utils/utils.go
index 9e79821aa4a..cb443e7857b 100644
--- a/modules/core/04-channel/client/utils/utils.go
+++ b/modules/core/04-channel/client/utils/utils.go
@@ -38,7 +38,7 @@ func QueryChannel(
func queryChannelABCI(clientCtx client.Context, portID, channelID string) (*types.QueryChannelResponse, error) {
key := host.ChannelKey(portID, channelID)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -178,7 +178,7 @@ func QueryNextSequenceReceive(
func queryNextSequenceRecvABCI(clientCtx client.Context, portID, channelID string) (*types.QueryNextSequenceReceiveResponse, error) {
key := host.NextSequenceRecvKey(portID, channelID)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -219,7 +219,7 @@ func queryPacketCommitmentABCI(
) (*types.QueryPacketCommitmentResponse, error) {
key := host.PacketCommitmentKey(portID, channelID, sequence)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -258,7 +258,7 @@ func queryPacketReceiptABCI(
) (*types.QueryPacketReceiptResponse, error) {
key := host.PacketReceiptKey(portID, channelID, sequence)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
@@ -287,7 +287,7 @@ func QueryPacketAcknowledgement(clientCtx client.Context, portID, channelID stri
func queryPacketAcknowledgementABCI(clientCtx client.Context, portID, channelID string, sequence uint64) (*types.QueryPacketAcknowledgementResponse, error) {
key := host.PacketAcknowledgementKey(portID, channelID, sequence)
- value, proofBz, proofHeight, err := ibcclient.QueryOstraconProof(clientCtx, key)
+ value, proofBz, proofHeight, err := ibcclient.QueryTendermintProof(clientCtx, key)
if err != nil {
return nil, err
}
diff --git a/modules/core/23-commitment/types/merkle.go b/modules/core/23-commitment/types/merkle.go
index 8e45fd121c5..59c9ea37935 100644
--- a/modules/core/23-commitment/types/merkle.go
+++ b/modules/core/23-commitment/types/merkle.go
@@ -77,7 +77,7 @@ func NewMerklePath(keyPath ...string) MerklePath {
}
// String implements fmt.Stringer.
-// This represents the path in the same way the ostracon KeyPath will
+// This represents the path in the same way the tendermint KeyPath will
// represent a key path. The backslashes partition the key path into
// the respective stores they belong to.
func (mp MerklePath) String() string {
diff --git a/modules/core/23-commitment/types/utils.go b/modules/core/23-commitment/types/utils.go
index b08297ea780..7400438c97f 100644
--- a/modules/core/23-commitment/types/utils.go
+++ b/modules/core/23-commitment/types/utils.go
@@ -10,7 +10,7 @@ import (
// ConvertProofs converts crypto.ProofOps into MerkleProof
func ConvertProofs(tmProof *crypto.ProofOps) (MerkleProof, error) {
if tmProof == nil {
- return MerkleProof{}, sdkerrors.Wrapf(ErrInvalidMerkleProof, "ostracon proof is nil")
+ return MerkleProof{}, sdkerrors.Wrapf(ErrInvalidMerkleProof, "tendermint proof is nil")
}
// Unmarshal all proof ops to CommitmentProof
proofs := make([]*ics23.CommitmentProof, len(tmProof.Ops))
diff --git a/modules/core/client/query.go b/modules/core/client/query.go
index 74292ad3c42..1529194c767 100644
--- a/modules/core/client/query.go
+++ b/modules/core/client/query.go
@@ -13,16 +13,16 @@ import (
host "github.com/line/ibc-go/v3/modules/core/24-host"
)
-// QueryOstraconProof performs an ABCI query with the given key and returns
+// QueryTendermintProof performs an ABCI query with the given key and returns
// the value of the query, the proto encoded merkle proof, and the height of
-// the Ostracon block containing the state root. The desired ostracon height
+// the Tendermint block containing the state root. The desired tendermint height
// to perform the query should be set in the client context. The query will be
// performed at one below this height (at the IAVL version) in order to obtain
// the correct merkle proof. Proof queries at height less than or equal to 2 are
// not supported. Queries with a client context height of 0 will perform a query
// at the lastest state available.
// Issue: https://github.com/cosmos/cosmos-sdk/issues/6567
-func QueryOstraconProof(clientCtx client.Context, key []byte) ([]byte, []byte, clienttypes.Height, error) {
+func QueryTendermintProof(clientCtx client.Context, key []byte) ([]byte, []byte, clienttypes.Height, error) {
height := clientCtx.Height
// ABCI queries at heights 1, 2 or less than or equal to 0 are not supported.
@@ -33,7 +33,7 @@ func QueryOstraconProof(clientCtx client.Context, key []byte) ([]byte, []byte, c
return nil, nil, clienttypes.Height{}, fmt.Errorf("proof queries at height <= 2 are not supported")
}
- // Use the IAVL height if a valid ostracon height is passed in.
+ // Use the IAVL height if a valid tendermint height is passed in.
// A height of 0 will query with the latest state.
if height != 0 {
height--
diff --git a/modules/core/exported/client.go b/modules/core/exported/client.go
index f6d100d147a..e9d78575857 100644
--- a/modules/core/exported/client.go
+++ b/modules/core/exported/client.go
@@ -16,7 +16,7 @@ const (
// Solomachine is used to indicate that the light client is a solo machine.
Solomachine string = "06-solomachine"
- // Tendermint is used to indicate that the client uses the Tendermint or Ostracon Consensus Algorithm.
+ // Tendermint is used to indicate that the client uses the Tendermint or Tendermint Consensus Algorithm.
Tendermint string = "07-tendermint"
// Localhost is the client type for a localhost client. It is also used as the clientID
diff --git a/modules/core/keeper/migrations.go b/modules/core/keeper/migrations.go
index 5737b3ae231..78153b54d1a 100644
--- a/modules/core/keeper/migrations.go
+++ b/modules/core/keeper/migrations.go
@@ -20,8 +20,8 @@ func NewMigrator(keeper Keeper) Migrator {
// This migration prunes:
// - migrates solo machine client state from protobuf definition v1 to v2
// - prunes solo machine consensus states
-// - prunes expired ostracon consensus states
-// - adds ProcessedHeight and Iteration keys for unexpired ostracon consensus states
+// - prunes expired tendermint consensus states
+// - adds ProcessedHeight and Iteration keys for unexpired tendermint consensus states
func (m Migrator) Migrate1to2(ctx sdk.Context) error {
clientMigrator := clientkeeper.NewMigrator(m.keeper.ClientKeeper)
if err := clientMigrator.Migrate1to2(ctx); err != nil {
diff --git a/modules/core/legacy/v100/genesis.go b/modules/core/legacy/v100/genesis.go
index 689225101ac..2fa92f3e9fe 100644
--- a/modules/core/legacy/v100/genesis.go
+++ b/modules/core/legacy/v100/genesis.go
@@ -17,7 +17,7 @@ import (
//
// - Update solo machine client state protobuf definition (v1 to v2)
// - Remove all solo machine consensus states
-// - Remove all expired ostracon consensus states
+// - Remove all expired tendermint consensus states
func MigrateGenesis(appState genutiltypes.AppMap, clientCtx client.Context, genDoc octypes.GenesisDoc, maxExpectedTimePerBlock uint64) (genutiltypes.AppMap, error) {
if appState[host.ModuleName] != nil {
// ensure legacy solo machines are registered
diff --git a/modules/core/legacy/v100/genesis_test.go b/modules/core/legacy/v100/genesis_test.go
index 1aad8869260..85b33081a96 100644
--- a/modules/core/legacy/v100/genesis_test.go
+++ b/modules/core/legacy/v100/genesis_test.go
@@ -58,7 +58,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1)
solomachineMulti := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4)
- // create ostracon clients
+ // create tendermint clients
// NOTE: only 1 set of metadata is created, we aren't testing ordering
// The purpose of this test is to ensure the genesis states can be marshalled/unmarshalled
suite.coordinator.SetupClients(path)
@@ -140,7 +140,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
clientStore.Set(host.ConsensusStateKey(height2), bz)
clientStore.Set(host.ConsensusStateKey(height3), bz)
}
- // solo machine clients must come before ostracon in expected
+ // solo machine clients must come before tendermint in expected
clientGenState.Clients = append(clients, clientGenState.Clients...)
// migrate store get expected genesis
@@ -162,7 +162,7 @@ func (suite *LegacyTestSuite) TestMigrateGenesisSolomachine() {
InitialHeight: suite.chainA.GetContext().BlockHeight(),
}
- // NOTE: genesis time isn't updated since we aren't testing for ostracon consensus state pruning
+ // NOTE: genesis time isn't updated since we aren't testing for tendermint consensus state pruning
migrated, err := v100.MigrateGenesis(appState, clientCtx, genDoc, uint64(connectiontypes.DefaultTimePerBlock))
suite.Require().NoError(err)
diff --git a/modules/core/spec/01_concepts.md b/modules/core/spec/01_concepts.md
index b3498ab4373..0ab6fa70710 100644
--- a/modules/core/spec/01_concepts.md
+++ b/modules/core/spec/01_concepts.md
@@ -15,9 +15,9 @@ as valid. Upon verifying the misbehaviour the IBC client must freeze at that
height so that any proof verifications for the frozen height or later fail.
Note, there is a difference between the chain-level Misbehaviour that IBC is
-concerned with and the validator-level Evidence that Ostracon is concerned
-with. Ostracon must be able to detect, submit, and punish any evidence of
-individual validators breaking the Ostracon consensus protocol and attempting
+concerned with and the validator-level Evidence that Tendermint is concerned
+with. Tendermint must be able to detect, submit, and punish any evidence of
+individual validators breaking the Tendermint consensus protocol and attempting
to mount an attack. IBC clients must only act when an attack is successful
and the chain has successfully forked. In this case, valid Headers submitted
to the IBC client can no longer be trusted and the client must freeze.
diff --git a/modules/light-clients/06-solomachine/spec/01_concepts.md b/modules/light-clients/06-solomachine/spec/01_concepts.md
index a177a21ed96..75d31bf5340 100644
--- a/modules/light-clients/06-solomachine/spec/01_concepts.md
+++ b/modules/light-clients/06-solomachine/spec/01_concepts.md
@@ -23,7 +23,7 @@ is used on.
## Public Key
The public key can be a single public key or a multi-signature public key. The public key type used
-must fulfill the ostracon public key interface (this will become the SDK public key interface in the
+must fulfill the tendermint public key interface (this will become the SDK public key interface in the
near future). The public key must be registered on the application codec otherwise encoding/decoding
errors will arise. The public key stored in the consensus state is represented as a protobuf `Any`.
This allows for flexibility in what other public key types can be supported in the future.
diff --git a/modules/light-clients/06-solomachine/types/client_state_test.go b/modules/light-clients/06-solomachine/types/client_state_test.go
index dbf5d05c931..cfc26894931 100644
--- a/modules/light-clients/06-solomachine/types/client_state_test.go
+++ b/modules/light-clients/06-solomachine/types/client_state_test.go
@@ -116,7 +116,7 @@ func (suite *SoloMachineTestSuite) TestInitialize() {
false,
},
{
- "invalid consensus state: Ostracon consensus state",
+ "invalid consensus state: Tendermint consensus state",
&ibcoctypes.ConsensusState{},
false,
},
@@ -144,7 +144,7 @@ func (suite *SoloMachineTestSuite) TestInitialize() {
}
func (suite *SoloMachineTestSuite) TestVerifyClientState() {
- // create client for ostracon so we can use client state for verification
+ // create client for tendermint so we can use client state for verification
tmPath := ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.SetupClients(tmPath)
clientState := suite.chainA.GetClientState(tmPath.EndpointA.ClientID)
@@ -262,7 +262,7 @@ func (suite *SoloMachineTestSuite) TestVerifyClientState() {
}
func (suite *SoloMachineTestSuite) TestVerifyClientConsensusState() {
- // create client for ostracon so we can use consensus state for verification
+ // create client for tendermint so we can use consensus state for verification
tmPath := ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.SetupClients(tmPath)
clientState := suite.chainA.GetClientState(tmPath.EndpointA.ClientID)
diff --git a/modules/light-clients/07-tendermint/doc.go b/modules/light-clients/07-tendermint/doc.go
index 548f0066ce5..26aa430a82d 100644
--- a/modules/light-clients/07-tendermint/doc.go
+++ b/modules/light-clients/07-tendermint/doc.go
@@ -1,5 +1,5 @@
/*
-Package ostracon implements a concrete `ConsensusState`, `Header`,
-`Misbehaviour` and `Equivocation` types for the Ostracon consensus light client.
+Package tendermint implements a concrete `ConsensusState`, `Header`,
+`Misbehaviour` and `Equivocation` types for the Tendermint consensus light client.
*/
-package ostracon
+package tendermint
diff --git a/modules/light-clients/07-tendermint/module.go b/modules/light-clients/07-tendermint/module.go
index cdfd37ca03b..e019717bd65 100644
--- a/modules/light-clients/07-tendermint/module.go
+++ b/modules/light-clients/07-tendermint/module.go
@@ -1,4 +1,4 @@
-package ostracon
+package tendermint
import (
"github.com/line/ibc-go/v3/modules/light-clients/07-tendermint/types"
diff --git a/modules/light-clients/07-tendermint/types/tendermint.pb.go b/modules/light-clients/07-tendermint/types/tendermint.pb.go
index 0684af09ca6..89427bd2bb9 100644
--- a/modules/light-clients/07-tendermint/types/tendermint.pb.go
+++ b/modules/light-clients/07-tendermint/types/tendermint.pb.go
@@ -33,7 +33,7 @@ var _ = time.Kitchen
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-// ClientState from Ostracon tracks the current validator set, latest height,
+// ClientState from Tendermint tracks the current validator set, latest height,
// and a possible frozen height.
type ClientState struct {
ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
@@ -98,7 +98,7 @@ func (m *ClientState) XXX_DiscardUnknown() {
var xxx_messageInfo_ClientState proto.InternalMessageInfo
-// ConsensusState defines the consensus state from Ostracon.
+// ConsensusState defines the consensus state from Tendermint.
type ConsensusState struct {
// timestamp that corresponds to the block height in which the ConsensusState
// was stored.
@@ -144,8 +144,7 @@ var xxx_messageInfo_ConsensusState proto.InternalMessageInfo
// Misbehaviour is a wrapper over two conflicting Headers
// that implements Misbehaviour interface expected by ICS-02
type Misbehaviour struct {
- // ClientID is deprecated
- ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // Deprecated: Do not use.
+ ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
Header1 *Header `protobuf:"bytes,2,opt,name=header_1,json=header1,proto3" json:"header_1,omitempty" yaml:"header_1"`
Header2 *Header `protobuf:"bytes,3,opt,name=header_2,json=header2,proto3" json:"header_2,omitempty" yaml:"header_2"`
}
@@ -183,9 +182,9 @@ func (m *Misbehaviour) XXX_DiscardUnknown() {
var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo
-// Header defines the Ostracon client consensus Header.
+// Header defines the Tendermint client consensus Header.
// It encapsulates all the information necessary to update from a trusted
-// Ostracon ConsensusState. The inclusion of TrustedHeight and
+// Tendermint ConsensusState. The inclusion of TrustedHeight and
// TrustedValidators allows this update to process correctly, so long as the
// ConsensusState for the TrustedHeight exists, this removes race conditions
// among relayers The SignedHeader and ValidatorSet are the new untrusted update
@@ -323,75 +322,75 @@ func init() {
}
var fileDescriptor_c6d6cf2b288949be = []byte{
- // 1079 bytes of a gzipped FileDescriptorProto
+ // 1081 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
0x14, 0x6e, 0xda, 0xb2, 0x4d, 0x26, 0xe9, 0x76, 0x31, 0xa5, 0x9b, 0x96, 0x6e, 0x1c, 0x19, 0xa9,
0xe4, 0xb0, 0xb5, 0x49, 0x7a, 0x40, 0xaa, 0xb8, 0xe0, 0x2e, 0xa8, 0x45, 0xac, 0xa8, 0x5c, 0xe0,
0x80, 0xb4, 0x32, 0x13, 0x7b, 0x12, 0x8f, 0xd6, 0xf6, 0x58, 0x9e, 0x71, 0x68, 0xb9, 0x71, 0xe3,
- 0xc6, 0x1e, 0x11, 0xe2, 0xc0, 0x9f, 0xb3, 0xc7, 0x1e, 0x39, 0x19, 0xd4, 0x5e, 0x39, 0xe5, 0xc8,
- 0x09, 0xcd, 0x0f, 0xff, 0x68, 0xb6, 0x4b, 0xb5, 0x5c, 0xa2, 0x79, 0xef, 0x7d, 0xef, 0xfb, 0x32,
- 0x6f, 0xde, 0xbc, 0x31, 0xb0, 0xf0, 0xd8, 0xb3, 0x42, 0x3c, 0x0d, 0x98, 0x17, 0x62, 0x14, 0x33,
- 0x6a, 0x31, 0x14, 0xfb, 0x28, 0x8d, 0x70, 0xcc, 0xac, 0xd9, 0xb0, 0x66, 0x99, 0x49, 0x4a, 0x18,
- 0xd1, 0x7a, 0x78, 0xec, 0x99, 0xf5, 0x04, 0xb3, 0x06, 0x99, 0x0d, 0x77, 0xfa, 0xb5, 0x7c, 0x76,
- 0x91, 0x20, 0x6a, 0xcd, 0x60, 0x88, 0x7d, 0xc8, 0x48, 0x2a, 0x19, 0x76, 0x76, 0x5f, 0x41, 0x88,
- 0x5f, 0x15, 0xed, 0x24, 0x29, 0x21, 0x93, 0xc2, 0xea, 0x4d, 0x09, 0x99, 0x86, 0xc8, 0x12, 0xd6,
- 0x38, 0x9b, 0x58, 0x7e, 0x96, 0x42, 0x86, 0x49, 0xac, 0xe2, 0xfa, 0x62, 0x9c, 0xe1, 0x08, 0x51,
- 0x06, 0xa3, 0xa4, 0x00, 0xf0, 0xfd, 0x79, 0x24, 0x45, 0x96, 0xfc, 0xbb, 0x7c, 0x4f, 0x72, 0xa5,
- 0x00, 0x1f, 0x54, 0x00, 0x12, 0x45, 0x98, 0x45, 0x05, 0xa8, 0xb4, 0x14, 0x70, 0x73, 0x4a, 0xa6,
- 0x44, 0x2c, 0x2d, 0xbe, 0x92, 0x5e, 0xe3, 0xef, 0x35, 0xd0, 0x3e, 0x12, 0x7c, 0x67, 0x0c, 0x32,
- 0xa4, 0x6d, 0x83, 0xa6, 0x17, 0x40, 0x1c, 0xbb, 0xd8, 0xef, 0x36, 0xfa, 0x8d, 0x41, 0xcb, 0x59,
- 0x13, 0xf6, 0x89, 0xaf, 0x21, 0xd0, 0x66, 0x69, 0x46, 0x99, 0x1b, 0xa2, 0x19, 0x0a, 0xbb, 0xcb,
- 0xfd, 0xc6, 0xa0, 0x3d, 0x1a, 0x98, 0xff, 0x5d, 0x4f, 0xf3, 0xb3, 0x14, 0x7a, 0x7c, 0xc3, 0xf6,
- 0xce, 0xcb, 0x5c, 0x5f, 0x9a, 0xe7, 0xba, 0x76, 0x01, 0xa3, 0xf0, 0xd0, 0xa8, 0x51, 0x19, 0x0e,
- 0x10, 0xd6, 0x17, 0xdc, 0xd0, 0x26, 0x60, 0x43, 0x58, 0x38, 0x9e, 0xba, 0x09, 0x4a, 0x31, 0xf1,
- 0xbb, 0x2b, 0x42, 0x6a, 0xdb, 0x94, 0xc5, 0x32, 0x8b, 0x62, 0x99, 0x4f, 0x54, 0x31, 0x6d, 0x43,
- 0x71, 0x6f, 0xd5, 0xb8, 0xab, 0x7c, 0xe3, 0x97, 0x3f, 0xf5, 0x86, 0x73, 0xbf, 0xf0, 0x9e, 0x0a,
- 0xa7, 0x86, 0xc1, 0x83, 0x2c, 0x1e, 0x93, 0xd8, 0xaf, 0x09, 0xad, 0xde, 0x25, 0xf4, 0xbe, 0x12,
- 0x7a, 0x28, 0x85, 0x16, 0x09, 0xa4, 0xd2, 0x46, 0xe9, 0x56, 0x52, 0x08, 0x6c, 0x44, 0xf0, 0xdc,
- 0xf5, 0x42, 0xe2, 0x3d, 0x77, 0xfd, 0x14, 0x4f, 0x58, 0xf7, 0xad, 0x37, 0xdc, 0xd2, 0x42, 0xbe,
- 0x14, 0x5a, 0x8f, 0xe0, 0xf9, 0x11, 0x77, 0x3e, 0xe1, 0x3e, 0xed, 0x19, 0x58, 0x9f, 0xa4, 0xe4,
- 0x07, 0x14, 0xbb, 0x01, 0xe2, 0x07, 0xd2, 0xbd, 0x27, 0x44, 0x76, 0xc4, 0x11, 0xf1, 0x16, 0x31,
- 0x55, 0xe7, 0xcc, 0x86, 0xe6, 0xb1, 0x40, 0xd8, 0xbb, 0x4a, 0x65, 0x53, 0xaa, 0xdc, 0x48, 0x37,
- 0x9c, 0x8e, 0xb4, 0x25, 0x96, 0xd3, 0x87, 0x90, 0x21, 0xca, 0x0a, 0xfa, 0xb5, 0x37, 0xa5, 0xbf,
- 0x91, 0x6e, 0x38, 0x1d, 0x69, 0x2b, 0xfa, 0x13, 0xd0, 0x16, 0x57, 0xc7, 0xa5, 0x09, 0xf2, 0x68,
- 0xb7, 0xd9, 0x5f, 0x19, 0xb4, 0x47, 0x0f, 0x4c, 0xec, 0xd1, 0xd1, 0x81, 0x79, 0xca, 0x23, 0x67,
- 0x09, 0xf2, 0xec, 0xad, 0xaa, 0x85, 0x6a, 0x70, 0xc3, 0x01, 0x49, 0x01, 0xa1, 0xda, 0x21, 0xe8,
- 0x64, 0xc9, 0x34, 0x85, 0x3e, 0x72, 0x13, 0xc8, 0x82, 0x6e, 0xab, 0xbf, 0x32, 0x68, 0xd9, 0x0f,
- 0xe7, 0xb9, 0xfe, 0x8e, 0x3a, 0xb7, 0x5a, 0xd4, 0x70, 0xda, 0xca, 0x3c, 0x85, 0x2c, 0xd0, 0x20,
- 0xd8, 0x86, 0x61, 0x48, 0xbe, 0x77, 0xb3, 0xc4, 0x87, 0x0c, 0xb9, 0x70, 0xc2, 0x50, 0xea, 0xa2,
- 0xf3, 0x04, 0xa7, 0x17, 0x5d, 0xd0, 0x6f, 0x0c, 0x9a, 0xf6, 0xde, 0x3c, 0xd7, 0xfb, 0x92, 0xe8,
- 0xb5, 0x50, 0xa3, 0xdb, 0x70, 0xb6, 0x44, 0xf4, 0x6b, 0x11, 0xfc, 0x84, 0xc7, 0x3e, 0x15, 0x21,
- 0x8d, 0x02, 0xfd, 0x96, 0xbc, 0x08, 0xd3, 0x31, 0x0a, 0xe0, 0x0c, 0x93, 0x2c, 0xed, 0xb6, 0x85,
- 0xd0, 0xe3, 0x79, 0xae, 0xef, 0xbd, 0x56, 0xa8, 0x9e, 0xc0, 0xe5, 0x76, 0x17, 0xe5, 0x9e, 0xd6,
- 0x00, 0x87, 0xab, 0x3f, 0xfd, 0xae, 0x2f, 0x19, 0xbf, 0x2d, 0x83, 0xfb, 0x47, 0x24, 0xa6, 0x28,
- 0xa6, 0x19, 0x95, 0x37, 0xde, 0x06, 0xad, 0x72, 0xe8, 0x88, 0x2b, 0xcf, 0x8f, 0x74, 0xb1, 0x2d,
- 0xbf, 0x2a, 0x10, 0x76, 0x93, 0x1f, 0xe9, 0x0b, 0xde, 0x7d, 0x55, 0x9a, 0xf6, 0x31, 0x58, 0x4d,
- 0x09, 0x61, 0x6a, 0x26, 0x18, 0xb5, 0x8e, 0xa8, 0xa6, 0xd0, 0x6c, 0x68, 0x3e, 0x45, 0xe9, 0xf3,
- 0x10, 0x39, 0x84, 0x30, 0x7b, 0x95, 0xd3, 0x38, 0x22, 0x4b, 0xfb, 0xb1, 0x01, 0x36, 0x63, 0x74,
- 0xce, 0xdc, 0x72, 0xd2, 0x52, 0x37, 0x80, 0x34, 0x10, 0xf7, 0xbe, 0x63, 0x7f, 0x39, 0xcf, 0xf5,
- 0xf7, 0x64, 0x15, 0x6e, 0x43, 0x19, 0xff, 0xe4, 0xfa, 0xe3, 0x29, 0x66, 0x41, 0x36, 0xe6, 0x72,
- 0x56, 0x88, 0x63, 0x64, 0x11, 0xca, 0x52, 0xe8, 0x91, 0xd8, 0x0a, 0xf1, 0x98, 0x5a, 0xe3, 0x0b,
- 0x86, 0xa8, 0x79, 0x8c, 0xce, 0x6d, 0xbe, 0x70, 0x34, 0x4e, 0xf3, 0x4d, 0xc9, 0x72, 0x0c, 0x69,
- 0xa0, 0xca, 0xf3, 0xf3, 0x32, 0xe8, 0xd4, 0xab, 0xa6, 0x1d, 0x80, 0x96, 0x6c, 0xea, 0x72, 0x1e,
- 0x8a, 0x06, 0x7c, 0x20, 0xff, 0x4e, 0x19, 0xe2, 0xe5, 0x6f, 0x4a, 0xeb, 0xc4, 0xd7, 0x20, 0x68,
- 0x06, 0x08, 0xfa, 0x28, 0x75, 0x87, 0xaa, 0x22, 0x7b, 0x77, 0x4d, 0xc9, 0x63, 0x81, 0xb7, 0x7b,
- 0x57, 0xb9, 0xbe, 0x26, 0xd7, 0xc3, 0x79, 0xae, 0x6f, 0x48, 0x99, 0x82, 0xcc, 0x70, 0xd6, 0xe4,
- 0x72, 0x58, 0x93, 0x18, 0xa9, 0xe9, 0xf8, 0x3f, 0x24, 0x46, 0xaf, 0x48, 0x8c, 0x4a, 0x89, 0x91,
- 0xaa, 0xc8, 0xaf, 0x2b, 0xe0, 0x9e, 0x44, 0x6b, 0x10, 0xac, 0x53, 0x3c, 0x8d, 0x91, 0xef, 0x4a,
- 0x88, 0x6a, 0x96, 0x5e, 0x5d, 0x47, 0xbe, 0x84, 0x67, 0x02, 0xa6, 0x04, 0x77, 0x2f, 0x73, 0xbd,
- 0x51, 0xcd, 0x80, 0x1b, 0x14, 0x86, 0xd3, 0xa1, 0x35, 0x2c, 0x1f, 0x31, 0xe5, 0xe9, 0xba, 0x14,
- 0x15, 0x0d, 0x75, 0x8b, 0x44, 0x79, 0x7c, 0x67, 0x88, 0xd9, 0xdd, 0x8a, 0xfe, 0x46, 0xba, 0xe1,
- 0x74, 0x66, 0x35, 0x9c, 0xf6, 0x1d, 0x90, 0x8f, 0x80, 0xd0, 0x17, 0x23, 0x6c, 0xe5, 0xce, 0x11,
- 0xf6, 0x48, 0x8d, 0xb0, 0x77, 0x6b, 0x4f, 0x4b, 0x99, 0x6f, 0x38, 0xeb, 0xca, 0xa1, 0x86, 0x58,
- 0x08, 0xb4, 0x02, 0x51, 0xb5, 0xa9, 0x7a, 0x56, 0xee, 0xda, 0xc5, 0xa3, 0x79, 0xae, 0x6f, 0xdf,
- 0x54, 0xa9, 0x38, 0x0c, 0xe7, 0x6d, 0xe5, 0xac, 0x1a, 0xd7, 0xf8, 0x1c, 0x34, 0x8b, 0xe7, 0x55,
- 0xdb, 0x05, 0xad, 0x38, 0x8b, 0x50, 0xca, 0x23, 0xe2, 0x64, 0x56, 0x9d, 0xca, 0xa1, 0xf5, 0x41,
- 0xdb, 0x47, 0x31, 0x89, 0x70, 0x2c, 0xe2, 0xcb, 0x22, 0x5e, 0x77, 0xd9, 0xcf, 0x5e, 0x5e, 0xf5,
- 0x1a, 0x97, 0x57, 0xbd, 0xc6, 0x5f, 0x57, 0xbd, 0xc6, 0x8b, 0xeb, 0xde, 0xd2, 0xe5, 0x75, 0x6f,
- 0xe9, 0x8f, 0xeb, 0xde, 0xd2, 0xb7, 0x47, 0x8b, 0x97, 0x0b, 0x8f, 0xbd, 0xfd, 0x29, 0xb1, 0x66,
- 0x07, 0x56, 0x44, 0xfc, 0x2c, 0x44, 0x54, 0x7e, 0x80, 0xed, 0x17, 0x5f, 0x60, 0x1f, 0x7e, 0xb4,
- 0xbf, 0xf8, 0x89, 0x34, 0xbe, 0x27, 0x46, 0xc9, 0xc1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a,
- 0x9b, 0x5e, 0xfc, 0xb0, 0x09, 0x00, 0x00,
+ 0x82, 0xb4, 0x47, 0x84, 0x38, 0xf0, 0xe7, 0xec, 0xb1, 0x47, 0x4e, 0x06, 0xb5, 0x57, 0x4e, 0x39,
+ 0x72, 0x42, 0xf3, 0xc3, 0x3f, 0x9a, 0xed, 0x52, 0x2d, 0x97, 0x68, 0xde, 0x7b, 0xdf, 0xfb, 0xbe,
+ 0xcc, 0x9b, 0x37, 0x6f, 0x0c, 0x2c, 0x3c, 0xf6, 0xac, 0x10, 0x4f, 0x03, 0xe6, 0x85, 0x18, 0xc5,
+ 0x8c, 0x5a, 0x0c, 0xc5, 0x3e, 0x4a, 0x23, 0x1c, 0x33, 0x6b, 0x36, 0xac, 0x59, 0x66, 0x92, 0x12,
+ 0x46, 0xb4, 0x1e, 0x1e, 0x7b, 0x66, 0x3d, 0xc1, 0xac, 0x41, 0x66, 0xc3, 0x9d, 0x7e, 0x2d, 0x9f,
+ 0x5d, 0x24, 0x88, 0x5a, 0x33, 0x18, 0x62, 0x1f, 0x32, 0x92, 0x4a, 0x86, 0x9d, 0xdd, 0x57, 0x10,
+ 0xe2, 0x57, 0x45, 0x3b, 0x49, 0x4a, 0xc8, 0xa4, 0xb0, 0x7a, 0x53, 0x42, 0xa6, 0x21, 0xb2, 0x84,
+ 0x35, 0xce, 0x26, 0x96, 0x9f, 0xa5, 0x90, 0x61, 0x12, 0xab, 0xb8, 0xbe, 0x18, 0x67, 0x38, 0x42,
+ 0x94, 0xc1, 0x28, 0x29, 0x00, 0x7c, 0x7f, 0x1e, 0x49, 0x91, 0x25, 0xff, 0x2e, 0xdf, 0x93, 0x5c,
+ 0x29, 0xc0, 0x07, 0x15, 0x80, 0x44, 0x11, 0x66, 0x51, 0x01, 0x2a, 0x2d, 0x05, 0xdc, 0x9c, 0x92,
+ 0x29, 0x11, 0x4b, 0x8b, 0xaf, 0xa4, 0xd7, 0xf8, 0x7b, 0x0d, 0xb4, 0x8f, 0x04, 0xdf, 0x19, 0x83,
+ 0x0c, 0x69, 0xdb, 0xa0, 0xe9, 0x05, 0x10, 0xc7, 0x2e, 0xf6, 0xbb, 0x8d, 0x7e, 0x63, 0xd0, 0x72,
+ 0xd6, 0x84, 0x7d, 0xe2, 0x6b, 0x08, 0xb4, 0x59, 0x9a, 0x51, 0xe6, 0x86, 0x68, 0x86, 0xc2, 0xee,
+ 0x72, 0xbf, 0x31, 0x68, 0x8f, 0x06, 0xe6, 0x7f, 0xd7, 0xd3, 0xfc, 0x2c, 0x85, 0x1e, 0xdf, 0xb0,
+ 0xbd, 0xf3, 0x32, 0xd7, 0x97, 0xe6, 0xb9, 0xae, 0x5d, 0xc0, 0x28, 0x3c, 0x34, 0x6a, 0x54, 0x86,
+ 0x03, 0x84, 0xf5, 0x05, 0x37, 0xb4, 0x09, 0xd8, 0x10, 0x16, 0x8e, 0xa7, 0x6e, 0x82, 0x52, 0x4c,
+ 0xfc, 0xee, 0x8a, 0x90, 0xda, 0x36, 0x65, 0xb1, 0xcc, 0xa2, 0x58, 0xe6, 0x13, 0x55, 0x4c, 0xdb,
+ 0x50, 0xdc, 0x5b, 0x35, 0xee, 0x2a, 0xdf, 0xf8, 0xe5, 0x4f, 0xbd, 0xe1, 0xdc, 0x2f, 0xbc, 0xa7,
+ 0xc2, 0xa9, 0x61, 0xf0, 0x20, 0x8b, 0xc7, 0x24, 0xf6, 0x6b, 0x42, 0xab, 0x77, 0x09, 0xbd, 0xaf,
+ 0x84, 0x1e, 0x4a, 0xa1, 0x45, 0x02, 0xa9, 0xb4, 0x51, 0xba, 0x95, 0x14, 0x02, 0x1b, 0x11, 0x3c,
+ 0x77, 0xbd, 0x90, 0x78, 0xcf, 0x5d, 0x3f, 0xc5, 0x13, 0xd6, 0x7d, 0xeb, 0x0d, 0xb7, 0xb4, 0x90,
+ 0x2f, 0x85, 0xd6, 0x23, 0x78, 0x7e, 0xc4, 0x9d, 0x4f, 0xb8, 0x4f, 0x7b, 0x06, 0xd6, 0x27, 0x29,
+ 0xf9, 0x01, 0xc5, 0x6e, 0x80, 0xf8, 0x81, 0x74, 0xef, 0x09, 0x91, 0x1d, 0x71, 0x44, 0xbc, 0x45,
+ 0x4c, 0xd5, 0x39, 0xb3, 0xa1, 0x79, 0x2c, 0x10, 0xf6, 0xae, 0x52, 0xd9, 0x94, 0x2a, 0x37, 0xd2,
+ 0x0d, 0xa7, 0x23, 0x6d, 0x89, 0xe5, 0xf4, 0x21, 0x64, 0x88, 0xb2, 0x82, 0x7e, 0xed, 0x4d, 0xe9,
+ 0x6f, 0xa4, 0x1b, 0x4e, 0x47, 0xda, 0x8a, 0xfe, 0x04, 0xb4, 0xc5, 0xd5, 0x71, 0x69, 0x82, 0x3c,
+ 0xda, 0x6d, 0xf6, 0x57, 0x06, 0xed, 0xd1, 0x03, 0x13, 0x7b, 0x74, 0x74, 0x60, 0x9e, 0xf2, 0xc8,
+ 0x59, 0x82, 0x3c, 0x7b, 0xab, 0x6a, 0xa1, 0x1a, 0xdc, 0x70, 0x40, 0x52, 0x40, 0xa8, 0x76, 0x08,
+ 0x3a, 0x59, 0x32, 0x4d, 0xa1, 0x8f, 0xdc, 0x04, 0xb2, 0xa0, 0xdb, 0xea, 0xaf, 0x0c, 0x5a, 0xf6,
+ 0xc3, 0x79, 0xae, 0xbf, 0xa3, 0xce, 0xad, 0x16, 0x35, 0x9c, 0xb6, 0x32, 0x4f, 0x21, 0x0b, 0x34,
+ 0x08, 0xb6, 0x61, 0x18, 0x92, 0xef, 0xdd, 0x2c, 0xf1, 0x21, 0x43, 0x2e, 0x9c, 0x30, 0x94, 0xba,
+ 0xe8, 0x3c, 0xc1, 0xe9, 0x45, 0x17, 0xf4, 0x1b, 0x83, 0xa6, 0xbd, 0x37, 0xcf, 0xf5, 0xbe, 0x24,
+ 0x7a, 0x2d, 0xd4, 0xe8, 0x36, 0x9c, 0x2d, 0x11, 0xfd, 0x5a, 0x04, 0x3f, 0xe1, 0xb1, 0x4f, 0x45,
+ 0x48, 0xa3, 0x40, 0xbf, 0x25, 0x2f, 0xc2, 0x74, 0x8c, 0x02, 0x38, 0xc3, 0x24, 0x4b, 0xbb, 0x6d,
+ 0x21, 0xf4, 0x78, 0x9e, 0xeb, 0x7b, 0xaf, 0x15, 0xaa, 0x27, 0x70, 0xb9, 0xdd, 0x45, 0xb9, 0xa7,
+ 0x35, 0xc0, 0xe1, 0xea, 0x4f, 0xbf, 0xeb, 0x4b, 0xc6, 0x6f, 0xcb, 0xe0, 0xfe, 0x11, 0x89, 0x29,
+ 0x8a, 0x69, 0x46, 0xe5, 0x8d, 0xb7, 0x41, 0xab, 0x1c, 0x3a, 0xe2, 0xca, 0xf3, 0x23, 0x5d, 0x6c,
+ 0xcb, 0xaf, 0x0a, 0x84, 0xdd, 0xe4, 0x47, 0xfa, 0x82, 0x77, 0x5f, 0x95, 0xa6, 0x7d, 0x0c, 0x56,
+ 0x53, 0x42, 0x98, 0x9a, 0x09, 0x46, 0xad, 0x23, 0xaa, 0x29, 0x34, 0x1b, 0x9a, 0x4f, 0x51, 0xfa,
+ 0x3c, 0x44, 0x0e, 0x21, 0xcc, 0x5e, 0xe5, 0x34, 0x8e, 0xc8, 0xd2, 0x7e, 0x6c, 0x80, 0xcd, 0x18,
+ 0x9d, 0x33, 0xb7, 0x9c, 0xb4, 0xd4, 0x0d, 0x20, 0x0d, 0xc4, 0xbd, 0xef, 0xd8, 0x5f, 0xce, 0x73,
+ 0xfd, 0x3d, 0x59, 0x85, 0xdb, 0x50, 0xc6, 0x3f, 0xb9, 0xfe, 0x78, 0x8a, 0x59, 0x90, 0x8d, 0xb9,
+ 0x9c, 0x15, 0xe2, 0x18, 0x59, 0x84, 0xb2, 0x14, 0x7a, 0x24, 0xb6, 0x42, 0x3c, 0xa6, 0xd6, 0xf8,
+ 0x82, 0x21, 0x6a, 0x1e, 0xa3, 0x73, 0x9b, 0x2f, 0x1c, 0x8d, 0xd3, 0x7c, 0x53, 0xb2, 0x1c, 0x43,
+ 0x1a, 0xa8, 0xf2, 0xfc, 0xbc, 0x0c, 0x3a, 0xf5, 0xaa, 0x69, 0x43, 0xd0, 0x92, 0x4d, 0x5d, 0xce,
+ 0x43, 0x7b, 0x73, 0x9e, 0xeb, 0x0f, 0xe4, 0xdf, 0x29, 0x43, 0x86, 0xd3, 0x94, 0xeb, 0x13, 0x5f,
+ 0x83, 0xa0, 0x19, 0x20, 0xe8, 0xa3, 0xd4, 0x1d, 0xaa, 0x7a, 0xec, 0xdd, 0x35, 0x23, 0x8f, 0x05,
+ 0xde, 0xee, 0x5d, 0xe5, 0xfa, 0x9a, 0x5c, 0x0f, 0xe7, 0xb9, 0xbe, 0x21, 0x45, 0x0a, 0x32, 0xc3,
+ 0x59, 0x93, 0xcb, 0x61, 0x4d, 0x62, 0xa4, 0x66, 0xe3, 0xff, 0x90, 0x18, 0xbd, 0x22, 0x31, 0x2a,
+ 0x25, 0x46, 0xaa, 0x1e, 0xbf, 0xae, 0x80, 0x7b, 0x12, 0xad, 0x41, 0xb0, 0x4e, 0xf1, 0x34, 0x46,
+ 0xbe, 0x2b, 0x21, 0xaa, 0x55, 0x7a, 0x75, 0x1d, 0xf9, 0x0e, 0x9e, 0x09, 0x98, 0x12, 0xdc, 0xbd,
+ 0xcc, 0xf5, 0x46, 0x35, 0x01, 0x6e, 0x50, 0x18, 0x4e, 0x87, 0xd6, 0xb0, 0x7c, 0xc0, 0x94, 0x67,
+ 0xeb, 0x52, 0x54, 0xb4, 0xd3, 0x2d, 0x12, 0xe5, 0xe1, 0x9d, 0x21, 0x66, 0x77, 0x2b, 0xfa, 0x1b,
+ 0xe9, 0x86, 0xd3, 0x99, 0xd5, 0x70, 0xda, 0x77, 0x40, 0x3e, 0x01, 0x42, 0x5f, 0x0c, 0xb0, 0x95,
+ 0x3b, 0x07, 0xd8, 0x23, 0x35, 0xc0, 0xde, 0xad, 0x3d, 0x2c, 0x65, 0xbe, 0xe1, 0xac, 0x2b, 0x87,
+ 0x1a, 0x61, 0x21, 0xd0, 0x0a, 0x44, 0xd5, 0xa4, 0xea, 0x51, 0xb9, 0x6b, 0x17, 0x8f, 0xe6, 0xb9,
+ 0xbe, 0x7d, 0x53, 0xa5, 0xe2, 0x30, 0x9c, 0xb7, 0x95, 0xb3, 0x6a, 0x5b, 0xe3, 0x73, 0xd0, 0x2c,
+ 0x1e, 0x57, 0x6d, 0x17, 0xb4, 0xe2, 0x2c, 0x42, 0x29, 0x8f, 0x88, 0x93, 0x59, 0x75, 0x2a, 0x87,
+ 0xd6, 0x07, 0x6d, 0x1f, 0xc5, 0x24, 0xc2, 0xb1, 0x88, 0x2f, 0x8b, 0x78, 0xdd, 0x65, 0x3f, 0x7b,
+ 0x79, 0xd5, 0x6b, 0x5c, 0x5e, 0xf5, 0x1a, 0x7f, 0x5d, 0xf5, 0x1a, 0x2f, 0xae, 0x7b, 0x4b, 0x97,
+ 0xd7, 0xbd, 0xa5, 0x3f, 0xae, 0x7b, 0x4b, 0xdf, 0x1e, 0x2d, 0x5e, 0x2d, 0x3c, 0xf6, 0xf6, 0xa7,
+ 0xc4, 0x9a, 0x1d, 0x58, 0x11, 0xf1, 0xb3, 0x10, 0x51, 0xf9, 0xf9, 0xb5, 0x5f, 0x7c, 0x7f, 0x7d,
+ 0xf8, 0xd1, 0xfe, 0xe2, 0x07, 0xd2, 0xf8, 0x9e, 0x18, 0x24, 0x07, 0xff, 0x06, 0x00, 0x00, 0xff,
+ 0xff, 0x92, 0x26, 0x6d, 0x83, 0xae, 0x09, 0x00, 0x00,
}
func (m *ClientState) Marshal() (dAtA []byte, err error) {
diff --git a/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/proto/ibc/lightclients/tendermint/v1/tendermint.proto
index 7b98a08440a..843a64a20fc 100644
--- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto
+++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto
@@ -13,7 +13,7 @@ import "ibc/core/client/v1/client.proto";
import "ibc/core/commitment/v1/commitment.proto";
import "gogoproto/gogo.proto";
-// ClientState from Ostracon tracks the current validator set, latest height,
+// ClientState from Tendermint tracks the current validator set, latest height,
// and a possible frozen height.
message ClientState {
option (gogoproto.goproto_getters) = false;
@@ -59,7 +59,7 @@ message ClientState {
[deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""];
}
-// ConsensusState defines the consensus state from Ostracon.
+// ConsensusState defines the consensus state from Tendermint.
message ConsensusState {
option (gogoproto.goproto_getters) = false;
@@ -79,15 +79,14 @@ message ConsensusState {
message Misbehaviour {
option (gogoproto.goproto_getters) = false;
- // ClientID is deprecated
- string client_id = 1 [deprecated = true, (gogoproto.moretags) = "yaml:\"client_id\""];
+ string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
Header header_1 = 2 [(gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\""];
Header header_2 = 3 [(gogoproto.customname) = "Header2", (gogoproto.moretags) = "yaml:\"header_2\""];
}
-// Header defines the Ostracon client consensus Header.
+// Header defines the Tendermint client consensus Header.
// It encapsulates all the information necessary to update from a trusted
-// Ostracon ConsensusState. The inclusion of TrustedHeight and
+// Tendermint ConsensusState. The inclusion of TrustedHeight and
// TrustedValidators allows this update to process correctly, so long as the
// ConsensusState for the TrustedHeight exists, this removes race conditions
// among relayers The SignedHeader and ValidatorSet are the new untrusted update