Rm auto register 2 (#89)

A small follow-up to #87
babylonlabs-io · Dec 2, 2024 · 5f5ba8d · 5f5ba8d
1 parent 16f6154
commit 5f5ba8d
Show file tree

Hide file tree

Showing 36 changed files with 405 additions and 180 deletions.
diff --git a/contracts/babylon/schema/babylon-contract.json b/contracts/babylon/schema/babylon-contract.json
@@ -27,7 +27,7 @@
       },
       "btc_confirmation_depth": {
         "type": "integer",
-        "format": "uint64",
+        "format": "uint32",
         "minimum": 0.0
       },
       "btc_finality_code_id": {
@@ -72,7 +72,7 @@
       },
       "checkpoint_finalization_timeout": {
         "type": "integer",
-        "format": "uint64",
+        "format": "uint32",
         "minimum": 0.0
       },
       "consumer_description": {
@@ -351,7 +351,7 @@
             "properties": {
               "height": {
                 "type": "integer",
-                "format": "uint64",
+                "format": "uint32",
                 "minimum": 0.0
               }
             },
@@ -411,7 +411,7 @@
                   "integer",
                   "null"
                 ],
-                "format": "uint64",
+                "format": "uint32",
                 "minimum": 0.0
               }
             },
@@ -836,7 +836,7 @@
         "height": {
           "description": "The height of the block in the BTC blockchain.",
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         }
       },
@@ -928,7 +928,7 @@
         "height": {
           "description": "The height of the block in the BTC blockchain.",
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         }
       },
@@ -1020,7 +1020,7 @@
         "height": {
           "description": "The height of the block in the BTC blockchain.",
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         }
       },
@@ -1174,7 +1174,7 @@
             "height": {
               "description": "The height of the block in the BTC blockchain.",
               "type": "integer",
-              "format": "uint64",
+              "format": "uint32",
               "minimum": 0.0
             }
           },
@@ -1221,7 +1221,7 @@
         "height": {
           "description": "The height of the block in the BTC blockchain.",
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         }
       },
@@ -1300,7 +1300,7 @@
         },
         "btc_confirmation_depth": {
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         },
         "btc_finality": {
@@ -1327,7 +1327,7 @@
         },
         "checkpoint_finalization_timeout": {
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         },
         "consumer_description": {
@@ -1379,7 +1379,7 @@
         "babylon_header_hash",
         "babylon_header_height",
         "babylon_tx_hash",
-        "chain_id",
+        "consumer_id",
         "hash",
         "height"
       ],
@@ -1404,8 +1404,8 @@
           "description": "babylon_tx_hash is the hash of the tx that includes this header. (babylon_block_height, babylon_tx_hash) jointly provides the position of the header in the Babylon ledger. Hex-encoded string of 32 bytes",
           "type": "string"
         },
-        "chain_id": {
-          "description": "chain_id is the unique ID of the chain",
+        "consumer_id": {
+          "description": "consumer_id is the unique ID of the consumer",
           "type": "string"
         },
         "hash": {
@@ -1456,7 +1456,7 @@
         "babylon_header_hash",
         "babylon_header_height",
         "babylon_tx_hash",
-        "chain_id",
+        "consumer_id",
         "hash",
         "height"
       ],
@@ -1481,8 +1481,8 @@
           "description": "babylon_tx_hash is the hash of the tx that includes this header. (babylon_block_height, babylon_tx_hash) jointly provides the position of the header in the Babylon ledger. Hex-encoded string of 32 bytes",
           "type": "string"
         },
-        "chain_id": {
-          "description": "chain_id is the unique ID of the chain",
+        "consumer_id": {
+          "description": "consumer_id is the unique ID of the consumer",
           "type": "string"
         },
         "hash": {

diff --git a/contracts/babylon/schema/raw/instantiate.json b/contracts/babylon/schema/raw/instantiate.json
@@ -23,7 +23,7 @@
     },
     "btc_confirmation_depth": {
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     },
     "btc_finality_code_id": {
@@ -68,7 +68,7 @@
     },
     "checkpoint_finalization_timeout": {
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     },
     "consumer_description": {

diff --git a/contracts/babylon/schema/raw/query.json b/contracts/babylon/schema/raw/query.json
@@ -59,7 +59,7 @@
           "properties": {
             "height": {
               "type": "integer",
-              "format": "uint64",
+              "format": "uint32",
               "minimum": 0.0
             }
           },
@@ -119,7 +119,7 @@
                 "integer",
                 "null"
               ],
-              "format": "uint64",
+              "format": "uint32",
               "minimum": 0.0
             }
           },

diff --git a/contracts/babylon/schema/raw/response_to_btc_base_header.json b/contracts/babylon/schema/raw/response_to_btc_base_header.json
@@ -33,7 +33,7 @@
     "height": {
       "description": "The height of the block in the BTC blockchain.",
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     }
   },

diff --git a/contracts/babylon/schema/raw/response_to_btc_header.json b/contracts/babylon/schema/raw/response_to_btc_header.json
@@ -33,7 +33,7 @@
     "height": {
       "description": "The height of the block in the BTC blockchain.",
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     }
   },

diff --git a/contracts/babylon/schema/raw/response_to_btc_header_by_hash.json b/contracts/babylon/schema/raw/response_to_btc_header_by_hash.json
@@ -33,7 +33,7 @@
     "height": {
       "description": "The height of the block in the BTC blockchain.",
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     }
   },

diff --git a/contracts/babylon/schema/raw/response_to_btc_headers.json b/contracts/babylon/schema/raw/response_to_btc_headers.json
@@ -95,7 +95,7 @@
         "height": {
           "description": "The height of the block in the BTC blockchain.",
           "type": "integer",
-          "format": "uint64",
+          "format": "uint32",
           "minimum": 0.0
         }
       },

diff --git a/contracts/babylon/schema/raw/response_to_btc_tip_header.json b/contracts/babylon/schema/raw/response_to_btc_tip_header.json
@@ -33,7 +33,7 @@
     "height": {
       "description": "The height of the block in the BTC blockchain.",
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     }
   },

diff --git a/contracts/babylon/schema/raw/response_to_config.json b/contracts/babylon/schema/raw/response_to_config.json
@@ -20,7 +20,7 @@
     },
     "btc_confirmation_depth": {
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     },
     "btc_finality": {
@@ -47,7 +47,7 @@
     },
     "checkpoint_finalization_timeout": {
       "type": "integer",
-      "format": "uint64",
+      "format": "uint32",
       "minimum": 0.0
     },
     "consumer_description": {

diff --git a/contracts/babylon/schema/raw/response_to_cz_header.json b/contracts/babylon/schema/raw/response_to_cz_header.json
@@ -8,7 +8,7 @@
     "babylon_header_hash",
     "babylon_header_height",
     "babylon_tx_hash",
-    "chain_id",
+    "consumer_id",
     "hash",
     "height"
   ],
@@ -33,8 +33,8 @@
       "description": "babylon_tx_hash is the hash of the tx that includes this header. (babylon_block_height, babylon_tx_hash) jointly provides the position of the header in the Babylon ledger. Hex-encoded string of 32 bytes",
       "type": "string"
     },
-    "chain_id": {
-      "description": "chain_id is the unique ID of the chain",
+    "consumer_id": {
+      "description": "consumer_id is the unique ID of the consumer",
       "type": "string"
     },
     "hash": {

diff --git a/contracts/babylon/schema/raw/response_to_cz_last_header.json b/contracts/babylon/schema/raw/response_to_cz_last_header.json
@@ -8,7 +8,7 @@
     "babylon_header_hash",
     "babylon_header_height",
     "babylon_tx_hash",
-    "chain_id",
+    "consumer_id",
     "hash",
     "height"
   ],
@@ -33,8 +33,8 @@
       "description": "babylon_tx_hash is the hash of the tx that includes this header. (babylon_block_height, babylon_tx_hash) jointly provides the position of the header in the Babylon ledger. Hex-encoded string of 32 bytes",
       "type": "string"
     },
-    "chain_id": {
-      "description": "chain_id is the unique ID of the chain",
+    "consumer_id": {
+      "description": "consumer_id is the unique ID of the consumer",
       "type": "string"
     },
     "hash": {

diff --git a/contracts/babylon/src/ibc.rs b/contracts/babylon/src/ibc.rs
@@ -7,9 +7,9 @@ use babylon_proto::babylon::zoneconcierge::v1::{
 use crate::state::config::CONFIG;
 use cosmwasm_std::{
     Binary, DepsMut, Env, Event, Ibc3ChannelOpenResponse, IbcBasicResponse, IbcChannel,
-    IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcMsg,
-    IbcOrder, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse,
-    IbcTimeout, Never, StdAck, StdError, StdResult,
+    IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcOrder,
+    IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse, IbcTimeout,
+    Never, StdAck, StdError, StdResult,
 };
 use cw_storage_plus::Item;
 use prost::Message;
@@ -59,7 +59,7 @@ pub fn ibc_channel_open(
 /// Second part of the 4-step handshake, i.e. ChannelOpenAck and ChannelOpenConfirm.
 pub fn ibc_channel_connect(
     deps: DepsMut,
-    env: Env,
+    _env: Env,
     msg: IbcChannelConnectMsg,
 ) -> Result<IbcBasicResponse, ContractError> {
     // Ensure we have no channel yet
@@ -157,18 +157,15 @@ pub fn ibc_packet_receive(
 pub(crate) mod ibc_packet {
     use super::*;
     use crate::state::config::CONFIG;
+    use babylon_apis::btc_staking_api::SlashedBtcDelegation;
     use babylon_apis::btc_staking_api::{
-        ActiveBtcDelegation, BtcUndelegationInfo, CovenantAdaptorSignatures,
-        FinalityProviderDescription, NewFinalityProvider, ProofOfPossessionBtc, SignatureInfo,
-        UnbondedBtcDelegation,
+        ActiveBtcDelegation, NewFinalityProvider, UnbondedBtcDelegation,
     };
-    use babylon_apis::btc_staking_api::{DelegatorUnbondingInfo, SlashedBtcDelegation};
     use babylon_apis::finality_api::Evidence;
     use babylon_proto::babylon::btcstaking::v1::BtcStakingIbcPacket;
     use babylon_proto::babylon::zoneconcierge::v1::zoneconcierge_packet_data::Packet::ConsumerSlashing;
     use babylon_proto::babylon::zoneconcierge::v1::ConsumerSlashingIbcPacket;
-    use cosmwasm_std::{to_json_binary, Decimal, IbcChannel, IbcMsg, WasmMsg};
-    use std::str::FromStr;
+    use cosmwasm_std::{to_json_binary, IbcChannel, IbcMsg, WasmMsg};
 
     pub fn handle_btc_timestamp(
         deps: DepsMut,