remove block header state

zeta-chain · Apr 9, 2024 · 4d47803 · 4d47803
1 parent 901647e
commit 4d47803
Show file tree

Hide file tree

Showing 14 changed files with 141 additions and 741 deletions.
diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml
@@ -54282,6 +54282,7 @@ definitions:
         type: boolean
       isBtcTypeChainEnabled:
         type: boolean
+    title: 'Deprecated(v16): Use VerificationFlags in the lightclient module instead'
   observerChainNonces:
     type: object
     properties:
@@ -54360,6 +54361,7 @@ definitions:
         $ref: '#/definitions/observerGasPriceIncreaseFlags'
       blockHeaderVerificationFlags:
         $ref: '#/definitions/observerBlockHeaderVerificationFlags'
+        title: 'Deprecated(v16): Use VerificationFlags in the lightclient module instead'
   observerGasPriceIncreaseFlags:
     type: object
     properties:

diff --git a/proto/observer/block_header.proto b/proto/observer/block_header.proto
diff --git a/proto/observer/crosschain_flags.proto b/proto/observer/crosschain_flags.proto
@@ -21,6 +21,8 @@ message GasPriceIncreaseFlags {
   // Maximum number of pending crosschain transactions to check for gas price increase
   uint32 maxPendingCctxs = 5;
 }
+
+// Deprecated(v16): Use VerificationFlags in the lightclient module instead
 message BlockHeaderVerificationFlags {
   bool isEthTypeChainEnabled = 1;
   bool isBtcTypeChainEnabled = 2;
@@ -30,6 +32,8 @@ message CrosschainFlags {
   bool isInboundEnabled = 1;
   bool isOutboundEnabled = 2;
   GasPriceIncreaseFlags gasPriceIncreaseFlags = 3;
+
+  // Deprecated(v16): Use VerificationFlags in the lightclient module instead
   BlockHeaderVerificationFlags blockHeaderVerificationFlags = 4;
 }
 

diff --git a/proto/observer/query.proto b/proto/observer/query.proto
@@ -6,7 +6,6 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "observer/ballot.proto";
 import "observer/blame.proto";
-import "observer/block_header.proto";
 import "observer/chain_nonces.proto";
 import "observer/crosschain_flags.proto";
 import "observer/keygen.proto";

diff --git a/testutil/keeper/mocks/crosschain/observer.go b/testutil/keeper/mocks/crosschain/observer.go
diff --git a/typescript/observer/block_header_pb.d.ts b/typescript/observer/block_header_pb.d.ts
diff --git a/typescript/observer/crosschain_flags_pb.d.ts b/typescript/observer/crosschain_flags_pb.d.ts
@@ -56,6 +56,8 @@ export declare class GasPriceIncreaseFlags extends Message<GasPriceIncreaseFlags
 }
 
 /**
+ * Deprecated(v16): Use VerificationFlags in the lightclient module instead
+ *
  * @generated from message zetachain.zetacore.observer.BlockHeaderVerificationFlags
  */
 export declare class BlockHeaderVerificationFlags extends Message<BlockHeaderVerificationFlags> {
@@ -104,6 +106,8 @@ export declare class CrosschainFlags extends Message<CrosschainFlags> {
   gasPriceIncreaseFlags?: GasPriceIncreaseFlags;
 
   /**
+   * Deprecated(v16): Use VerificationFlags in the lightclient module instead
+   *
    * @generated from field: zetachain.zetacore.observer.BlockHeaderVerificationFlags blockHeaderVerificationFlags = 4;
    */
   blockHeaderVerificationFlags?: BlockHeaderVerificationFlags;

diff --git a/typescript/observer/index.d.ts b/typescript/observer/index.d.ts
@@ -1,6 +1,5 @@
 export * from "./ballot_pb";
 export * from "./blame_pb";
-export * from "./block_header_pb";
 export * from "./chain_nonces_pb";
 export * from "./crosschain_flags_pb";
 export * from "./events_pb";

diff --git a/x/crosschain/types/expected_keepers.go b/x/crosschain/types/expected_keepers.go
@@ -50,7 +50,6 @@ type ObserverKeeper interface {
 	IsNonTombstonedObserver(ctx sdk.Context, address string) bool
 	FindBallot(ctx sdk.Context, index string, chain *chains.Chain, observationType observertypes.ObservationType) (ballot observertypes.Ballot, isNew bool, err error)
 	AddBallotToList(ctx sdk.Context, ballot observertypes.Ballot)
-	GetBlockHeader(ctx sdk.Context, hash []byte) (val proofs.BlockHeader, found bool)
 	CheckIfTssPubkeyHasBeenGenerated(ctx sdk.Context, tssPubkey string) (observertypes.TSS, bool)
 	GetAllTSS(ctx sdk.Context) (list []observertypes.TSS)
 	GetTSS(ctx sdk.Context) (val observertypes.TSS, found bool)

diff --git a/x/observer/keeper/block_header.go b/x/observer/keeper/block_header.go
diff --git a/x/observer/keeper/block_header_test.go b/x/observer/keeper/block_header_test.go