feat: add merkle tree address to message program outputs (#326)

* feat: add merkle tree address to message program outputs

* chore: deference address correctly to satisfy compiler

* tests passing

* update vkeys

* update sha tag for celestia-app

* update events.proto

* use Address type for contract

* tested and good to go

---------

Co-authored-by: jonas089 <jonaspauli089@gmail.com>

Author: damiannolan

crates/celestia-grpc-client/proto/celestia/zkism/v1/events.proto

@@ -20,12 +20,14 @@ message EventCreateInterchainSecurityModule {
   string owner = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // latest state
   string state = 3;
+  // merkle tree address in bytes32 format
+  string merkle_tree_address = 4;
   // the sp1 groth16 verifier key (hex-encoded)
-  string groth16_vkey = 4;
+  string groth16_vkey = 5;
   // hash-based commitment to the verifier key used for state transition (hex-encoded)
-  string state_transition_vkey = 5;
+  string state_transition_vkey = 6;
   // hash-based commitment to the verifier key used for state membership (hex-encoded)
-  string state_membership_vkey = 6;
+  string state_membership_vkey = 7;
 }
 
 // EventUpdateInterchainSecurityModule defines the event type emitted when updating a InterchainSecurityModule.

crates/celestia-grpc-client/proto/celestia/zkism/v1/genesis.proto

@@ -12,6 +12,4 @@ message GenesisState {
   // list of zk execution isms.
   repeated InterchainSecurityModule isms = 1 [(gogoproto.nullable) = false];
   // TODO: add messages to genesis state
-  // params is the module parameters.
-  Params params = 2 [(gogoproto.nullable) = false];
 }

crates/celestia-grpc-client/proto/celestia/zkism/v1/query.proto

@@ -20,11 +20,6 @@ service Query {
   rpc Isms(QueryIsmsRequest) returns (QueryIsmsResponse) {
     option (google.api.http).get = "/celestia/zkism/v1/isms";
   }
-
-  // Params defines an rpc method for querying the module parameters.
-  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/celestia/zkism/v1/params";
-  }
 }
 
 // QueryIsmRequest is the request type for the Ism rpc method.
@@ -50,12 +45,3 @@ message QueryIsmsResponse {
   // pagination defines the pagination in the response.
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
-
-// QueryParamsRequest is the request type for the Params rpc method.
-message QueryParamsRequest {}
-
-// QueryParamsResponse is the response type for the Params rpc method.
-message QueryParamsResponse {
-  // params contains the module parameters
-  Params params = 1 [(gogoproto.nullable) = false];
-}

crates/celestia-grpc-client/proto/celestia/zkism/v1/tx.proto

@@ -2,9 +2,7 @@ syntax = "proto3";
 
 package celestia.zkism.v1;
 
-import "celestia/zkism/v1/types.proto";
 import "cosmos/msg/v1/msg.proto";
-import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
 option go_package = "github.com/celestiaorg/celestia-app/x/zkism/types";
@@ -14,16 +12,15 @@ service Msg {
   option (cosmos.msg.v1.service) = true;
 
   // CreateInterchainSecurityModule defines the rpc method for creating a new zk ISM.
-  rpc CreateInterchainSecurityModule(MsgCreateInterchainSecurityModule) returns (MsgCreateInterchainSecurityModuleResponse);
+  rpc CreateInterchainSecurityModule(MsgCreateInterchainSecurityModule)
+      returns (MsgCreateInterchainSecurityModuleResponse);
 
   // UpdateInterchainSecurityModule defines the rpc method for updating an existing zk ISM.
-  rpc UpdateInterchainSecurityModule(MsgUpdateInterchainSecurityModule) returns (MsgUpdateInterchainSecurityModuleResponse);
+  rpc UpdateInterchainSecurityModule(MsgUpdateInterchainSecurityModule)
+      returns (MsgUpdateInterchainSecurityModuleResponse);
 
   // SubmitMessages defines the rpc method for verifying state membership of messages.
   rpc SubmitMessages(MsgSubmitMessages) returns (MsgSubmitMessagesResponse);
-
-  // UpdateParams defines the rpc method for updating the module parameters.
-  rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
 }
 
 // MsgCreateInterchainSecurityModule is the request type for CreateInterchainSecurityModule.
@@ -33,12 +30,14 @@ message MsgCreateInterchainSecurityModule {
   string creator = 1;
   // initial trusted state
   bytes state = 2;
+  // merkle tree address in byte32 format
+  bytes merkle_tree_address = 3;
   // the sp1 groth16 verifier key
-  bytes groth16_vkey = 3;
+  bytes groth16_vkey = 4;
   // hash-based commitment to the verifier key used for state transition
-  bytes state_transition_vkey = 4;
+  bytes state_transition_vkey = 5;
   // hash-based commitment to the verifier key used for state membership
-  bytes state_membership_vkey = 5;
+  bytes state_membership_vkey = 6;
 }
 
 // MsgCreateInterchainSecurityModuleResponse is the response type for CreateInterchainSecurityModule.
@@ -93,18 +92,3 @@ message MsgSubmitMessages {
 
 // MsgSubmitMessagesResponse is the response type for SubmitMessages.
 message MsgSubmitMessagesResponse {}
-
-// MsgUpdateParams is the request type for UpdateParams.
-message MsgUpdateParams {
-  option (cosmos.msg.v1.signer) = "authority";
-
-  // authority is the address that controls the module (defaults to x/gov unless overwritten).
-  string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  // params defines the x/zkism parameters to update.
-  //
-  // NOTE: All parameters must be supplied.
-  Params params = 2 [(gogoproto.nullable) = false];
-};
-
-// MsgUpdateParamsResponse defines the response type for UpdateParams.
-message MsgUpdateParamsResponse {};

crates/celestia-grpc-client/proto/celestia/zkism/v1/types.proto

@@ -18,19 +18,14 @@ message InterchainSecurityModule {
   ];
   // the owner or creator of the ism
   string owner = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  // current state 
+  // current state
   bytes state = 3;
+  // merkle tree address in bytes32 format
+  bytes merkle_tree_address = 4;
   // the sp1 groth16 verifier key
-  bytes groth16_vkey = 4;
+  bytes groth16_vkey = 5;
   // hash-based commitment to the verifier key used for state transition
-  bytes state_transition_vkey = 5;
+  bytes state_transition_vkey = 6;
   // hash-based commitment to the verifier key used for state membership
-  bytes state_membership_vkey = 6;
-}
-
-// Params defines the zk ism module parameters.
-message Params {
-  option (gogoproto.goproto_getters) = false;
-
-  uint32 max_header_hashes = 1;
+  bytes state_membership_vkey = 7;
 }

crates/celestia-grpc-client/src/proto/celestia.zkism.v1.rs

@@ -13,14 +13,17 @@ pub struct EventCreateInterchainSecurityModule {
     /// latest state
     #[prost(string, tag="3")]
     pub state: ::prost::alloc::string::String,
-    /// the sp1 groth16 verifier key (hex-encoded)
+    /// merkle tree address in bytes32 format
     #[prost(string, tag="4")]
+    pub merkle_tree_address: ::prost::alloc::string::String,
+    /// the sp1 groth16 verifier key (hex-encoded)
+    #[prost(string, tag="5")]
     pub groth16_vkey: ::prost::alloc::string::String,
     /// hash-based commitment to the verifier key used for state transition (hex-encoded)
-    #[prost(string, tag="5")]
+    #[prost(string, tag="6")]
     pub state_transition_vkey: ::prost::alloc::string::String,
     /// hash-based commitment to the verifier key used for state membership (hex-encoded)
-    #[prost(string, tag="6")]
+    #[prost(string, tag="7")]
     pub state_membership_vkey: ::prost::alloc::string::String,
 }
 /// EventUpdateInterchainSecurityModule defines the event type emitted when updating a InterchainSecurityModule.
@@ -58,37 +61,31 @@ pub struct InterchainSecurityModule {
     /// the owner or creator of the ism
     #[prost(string, tag="2")]
     pub owner: ::prost::alloc::string::String,
-    /// current state 
+    /// current state
     #[prost(bytes="vec", tag="3")]
     pub state: ::prost::alloc::vec::Vec<u8>,
-    /// the sp1 groth16 verifier key
+    /// merkle tree address in bytes32 format
     #[prost(bytes="vec", tag="4")]
+    pub merkle_tree_address: ::prost::alloc::vec::Vec<u8>,
+    /// the sp1 groth16 verifier key
+    #[prost(bytes="vec", tag="5")]
     pub groth16_vkey: ::prost::alloc::vec::Vec<u8>,
     /// hash-based commitment to the verifier key used for state transition
-    #[prost(bytes="vec", tag="5")]
+    #[prost(bytes="vec", tag="6")]
     pub state_transition_vkey: ::prost::alloc::vec::Vec<u8>,
     /// hash-based commitment to the verifier key used for state membership
-    #[prost(bytes="vec", tag="6")]
+    #[prost(bytes="vec", tag="7")]
     pub state_membership_vkey: ::prost::alloc::vec::Vec<u8>,
 }
-/// Params defines the zk ism module parameters.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
-pub struct Params {
-    #[prost(uint32, tag="1")]
-    pub max_header_hashes: u32,
-}
 /// GenesisState defines the zkism module's genesis state.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisState {
     /// list of zk execution isms.
+    ///
+    /// TODO: add messages to genesis state
     #[prost(message, repeated, tag="1")]
     pub isms: ::prost::alloc::vec::Vec<InterchainSecurityModule>,
-    /// TODO: add messages to genesis state
-    /// params is the module parameters.
-    #[prost(message, optional, tag="2")]
-    pub params: ::core::option::Option<Params>,
 }
 /// QueryIsmRequest is the request type for the Ism rpc method.
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -123,19 +120,6 @@ pub struct QueryIsmsResponse {
     #[prost(message, optional, tag="2")]
     pub pagination: ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
-/// QueryParamsRequest is the request type for the Params rpc method.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
-pub struct QueryParamsRequest {
-}
-/// QueryParamsResponse is the response type for the Params rpc method.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
-pub struct QueryParamsResponse {
-    /// params contains the module parameters
-    #[prost(message, optional, tag="1")]
-    pub params: ::core::option::Option<Params>,
-}
 /// MsgCreateInterchainSecurityModule is the request type for CreateInterchainSecurityModule.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -146,14 +130,17 @@ pub struct MsgCreateInterchainSecurityModule {
     /// initial trusted state
     #[prost(bytes="vec", tag="2")]
     pub state: ::prost::alloc::vec::Vec<u8>,
-    /// the sp1 groth16 verifier key
+    /// merkle tree address in byte32 format
     #[prost(bytes="vec", tag="3")]
+    pub merkle_tree_address: ::prost::alloc::vec::Vec<u8>,
+    /// the sp1 groth16 verifier key
+    #[prost(bytes="vec", tag="4")]
     pub groth16_vkey: ::prost::alloc::vec::Vec<u8>,
     /// hash-based commitment to the verifier key used for state transition
-    #[prost(bytes="vec", tag="4")]
+    #[prost(bytes="vec", tag="5")]
     pub state_transition_vkey: ::prost::alloc::vec::Vec<u8>,
     /// hash-based commitment to the verifier key used for state membership
-    #[prost(bytes="vec", tag="5")]
+    #[prost(bytes="vec", tag="6")]
     pub state_membership_vkey: ::prost::alloc::vec::Vec<u8>,
 }
 /// MsgCreateInterchainSecurityModuleResponse is the response type for CreateInterchainSecurityModule.
@@ -213,23 +200,5 @@ pub struct MsgSubmitMessages {
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct MsgSubmitMessagesResponse {
 }
-/// MsgUpdateParams is the request type for UpdateParams.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct MsgUpdateParams {
-    /// authority is the address that controls the module (defaults to x/gov unless overwritten).
-    #[prost(string, tag="1")]
-    pub authority: ::prost::alloc::string::String,
-    /// params defines the x/zkism parameters to update.
-    ///
-    /// NOTE: All parameters must be supplied.
-    #[prost(message, optional, tag="2")]
-    pub params: ::core::option::Option<Params>,
-}
-/// MsgUpdateParamsResponse defines the response type for UpdateParams.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
-pub struct MsgUpdateParamsResponse {
-}
 include!("celestia.zkism.v1.tonic.rs");
 // @@protoc_insertion_point(module)