F/public randomness ts (#128)

Author: maurolacy

contracts/op-finality-gadget/schema/op-finality-gadget.json

@@ -500,6 +500,7 @@
           "type": "object",
           "required": [
             "commitment",
+            "height",
             "num_pub_rand",
             "start_height"
           ],
@@ -513,6 +514,12 @@
                 "minimum": 0.0
               }
             },
+            "height": {
+              "description": "`height` defines the height that the commit was submitted",
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
             "num_pub_rand": {
               "description": "`num_pub_rand` is the number of committed public randomness",
               "type": "integer",
@@ -552,6 +559,7 @@
           "type": "object",
           "required": [
             "commitment",
+            "height",
             "num_pub_rand",
             "start_height"
           ],
@@ -565,6 +573,12 @@
                 "minimum": 0.0
               }
             },
+            "height": {
+              "description": "`height` defines the height that the commit was submitted",
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
             "num_pub_rand": {
               "description": "`num_pub_rand` is the number of committed public randomness",
               "type": "integer",

contracts/op-finality-gadget/schema/raw/response_to_first_pub_rand_commit.json

@@ -15,6 +15,7 @@
       "type": "object",
       "required": [
         "commitment",
+        "height",
         "num_pub_rand",
         "start_height"
       ],
@@ -28,6 +29,12 @@
             "minimum": 0.0
           }
         },
+        "height": {
+          "description": "`height` defines the height that the commit was submitted",
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
         "num_pub_rand": {
           "description": "`num_pub_rand` is the number of committed public randomness",
           "type": "integer",

contracts/op-finality-gadget/schema/raw/response_to_last_pub_rand_commit.json

@@ -15,6 +15,7 @@
       "type": "object",
       "required": [
         "commitment",
+        "height",
         "num_pub_rand",
         "start_height"
       ],
@@ -28,6 +29,12 @@
             "minimum": 0.0
           }
         },
+        "height": {
+          "description": "`height` defines the height that the commit was submitted",
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
         "num_pub_rand": {
           "description": "`num_pub_rand` is the number of committed public randomness",
           "type": "integer",

contracts/op-finality-gadget/src/contract.rs

@@ -66,6 +66,7 @@ pub fn execute(
             signature,
         } => handle_public_randomness_commit(
             deps,
+            &env,
             &fp_pubkey_hex,
             start_height,
             num_pub_rand,

contracts/op-finality-gadget/src/exec/finality.rs

@@ -23,6 +23,7 @@ use k256::sha2::{Digest, Sha256};
 // Most logic copied from contracts/btc-staking/src/finality.rs
 pub fn handle_public_randomness_commit(
     deps: DepsMut,
+    env: &Env,
     fp_pubkey_hex: &str,
     start_height: u64,
     num_pub_rand: u64,
@@ -62,6 +63,7 @@ pub fn handle_public_randomness_commit(
     let pr_commit = PubRandCommit {
         start_height,
         num_pub_rand,
+        height: env.block.height,
         commitment: commitment.to_vec(),
     };
 
@@ -396,28 +398,11 @@ pub(crate) mod tests {
     use cosmwasm_std::{from_json, testing::message_info};
     use std::collections::HashMap;
 
-    use babylon_apis::finality_api::PubRandCommit;
-    use hex::ToHex;
     use test_utils::{
-        get_add_finality_sig, get_add_finality_sig_2, get_pub_rand_commit, get_pub_rand_value,
+        get_add_finality_sig, get_add_finality_sig_2, get_pub_rand_value,
+        get_public_randomness_commitment,
     };
 
-    /// Get public randomness public key, commitment, and signature information
-    ///
-    /// Signature is a Schnorr signature over the commitment
-    pub(crate) fn get_public_randomness_commitment() -> (String, PubRandCommit, Vec<u8>) {
-        let pub_rand_commitment_msg = get_pub_rand_commit();
-        (
-            pub_rand_commitment_msg.fp_btc_pk.encode_hex(),
-            PubRandCommit {
-                start_height: pub_rand_commitment_msg.start_height,
-                num_pub_rand: pub_rand_commitment_msg.num_pub_rand,
-                commitment: pub_rand_commitment_msg.commitment.to_vec(),
-            },
-            pub_rand_commitment_msg.sig.to_vec(),
-        )
-    }
-
     #[test]
     fn verify_commitment_signature_works() {
         // Define test values