cleanup

initia-labs · Sep 3, 2024 · d070aaa · d070aaa
1 parent 47694df
commit d070aaa
Show file tree

Hide file tree

Showing 16 changed files with 197 additions and 223 deletions.
diff --git a/api/opinit/opchild/v1/genesis.pulsar.go b/api/opinit/opchild/v1/genesis.pulsar.go
diff --git a/api/opinit/opchild/v1/query.pulsar.go b/api/opinit/opchild/v1/query.pulsar.go
diff --git a/api/opinit/opchild/v1/tx.pulsar.go b/api/opinit/opchild/v1/tx.pulsar.go
diff --git a/proto/buf.gen.pulsar.yaml b/proto/buf.gen.pulsar.yaml
@@ -17,6 +17,3 @@ plugins:
   - name: go-grpc
     out: ../api
     opt: paths=source_relative
-  - name: go-cosmos-orm
-    out: ../api
-    opt: paths=source_relative
diff --git a/proto/buf.lock b/proto/buf.lock
@@ -1,11 +1,6 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
 deps:
-  - remote: buf.build
-    owner: cometbft
-    repository: cometbft
-    commit: fedbb9acfd2f494b9755949cbb41dfca
-    digest: shake256:c1881013cf98a4833923d74638c3623ac32890fa066eef961986b40e5e86d646fee02f05a5c7fabe596cc81f01108ffb1ae28db39db73a797e7f72e26c289628
   - remote: buf.build
     owner: cosmos
     repository: cosmos-proto

diff --git a/proto/buf.yaml b/proto/buf.yaml
@@ -2,7 +2,6 @@
 version: v1
 name: buf.build/initia-labs/OPinit
 deps:
-  - buf.build/cometbft/cometbft:fedbb9acfd2f494b9755949cbb41dfca 
   - buf.build/cosmos/cosmos-sdk:v0.50.0
   - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31
   - buf.build/cosmos/gogo-proto:5e5b9fdd01804356895f8f79a6f1ddc1

diff --git a/proto/opinit/opchild/v1/genesis.proto b/proto/opinit/opchild/v1/genesis.proto
@@ -20,10 +20,10 @@ message GenesisState {
   // delegations defines the validator set at genesis.
   repeated Validator validators = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
 
-  uint64     next_l2_sequence = 6;
-  uint64     next_l1_sequence = 7;
-  BridgeInfo bridge_info      = 8;
-  bool       exported         = 9;
+  uint64     next_l2_sequence = 4;
+  uint64     next_l1_sequence = 5;
+  BridgeInfo bridge_info      = 6;
+  bool       exported         = 7;
 }
 
 // LastValidatorPower required for validator set update logic.

diff --git a/proto/opinit/opchild/v1/query.proto b/proto/opinit/opchild/v1/query.proto
@@ -3,7 +3,6 @@ package opinit.opchild.v1;
 
 import "amino/amino.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "cosmos/base/v1beta1/coin.proto";
 import "cosmos/query/v1/query.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";

diff --git a/proto/opinit/opchild/v1/tx.proto b/proto/opinit/opchild/v1/tx.proto
@@ -105,7 +105,7 @@ message MsgFinalizeTokenDeposit {
   // from is l1 sender address
   string from = 2;
 
-  // to is l2 recipient address or "hook"
+  // to is l2 recipient address
   string to = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
   // amount is the coin amount to deposit.

diff --git a/x/opchild/keeper/keeper.go b/x/opchild/keeper/keeper.go
@@ -4,10 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"time"
 
 	"cosmossdk.io/collections"
-	collcodec "cosmossdk.io/collections/codec"
 	"cosmossdk.io/core/address"
 	corestoretypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
@@ -54,8 +52,6 @@ type Keeper struct {
 	ValidatorsByConsAddr collections.Map[[]byte, []byte]
 	HistoricalInfos      collections.Map[int64, cosmostypes.HistoricalInfo]
 	DenomPairs           collections.Map[string, string]
-	Commitments          collections.Map[uint64, []byte]
-	CommitmentTimes      collections.Map[uint64, time.Time]
 
 	ExecutorChangePlans map[uint64]types.ExecutorChangePlan
 
@@ -126,8 +122,6 @@ func NewKeeper(
 		ValidatorsByConsAddr:  collections.NewMap(sb, types.ValidatorsByConsAddrPrefix, "validators_by_cons_addr", collections.BytesKey, collections.BytesValue),
 		DenomPairs:            collections.NewMap(sb, types.DenomPairPrefix, "denom_pairs", collections.StringKey, collections.StringValue),
 		HistoricalInfos:       collections.NewMap(sb, types.HistoricalInfoPrefix, "historical_infos", collections.Int64Key, codec.CollValue[cosmostypes.HistoricalInfo](cdc)),
-		Commitments:           collections.NewMap(sb, types.CommitmentPrefix, "commitments", collections.Uint64Key, collections.BytesValue),
-		CommitmentTimes:       collections.NewMap(sb, types.CommitmentTimePrefix, "commitment_times", collections.Uint64Key, collcodec.KeyToValueCodec(sdk.TimeKey)),
 
 		ExecutorChangePlans: make(map[uint64]types.ExecutorChangePlan),
 		HostValidatorStore:  hostValidatorStore,
@@ -159,11 +153,6 @@ func (k Keeper) Router() *baseapp.MsgServiceRouter {
 	return k.router
 }
 
-// StoreService returns the KVStoreService
-func (k Keeper) StoreService() corestoretypes.KVStoreService {
-	return k.storeService
-}
-
 // setDenomMetadata sets an OPinit token's denomination metadata
 func (k Keeper) setDenomMetadata(ctx context.Context, baseDenom, denom string) {
 	metadata := banktypes.Metadata{