Cleanup

ariesgun · Jun 18, 2024 · d047f2e · d047f2e
1 parent 095b7b2
commit d047f2e
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 53 deletions.
diff --git a/contracts/contract-callback/src/handlers/execute.rs b/contracts/contract-callback/src/handlers/execute.rs
@@ -1,5 +1,9 @@
-use cosmwasm_std::{coins, to_json_binary, BankMsg, Binary, Coin, CosmosMsg, DepsMut, Env, MessageInfo, Response, Timestamp, Uint128, WasmMsg};
-use crate::{msg::{ExecuteMsg, MsgCancelCallback, MsgRequestCallback}, state::{RenewInfo, ACC_JOB_MAP, CONFIG, CUR_BLOCK_ID, DEFAULT_ID, JOBS, RENEW_JOBS_MAP, RENEW_MAP, STATE}, ContractError};
+use cosmwasm_std::{coins, to_json_binary, BankMsg, Binary, Coin, CosmosMsg, Deps, DepsMut, Env, MessageInfo, Response, Timestamp, Uint128, WasmMsg};
+use prost::Message;
+use crate::{msg::{ExecuteMsg, MsgCancelCallback, MsgRequestCallback}, 
+            state::{RenewInfo, ACC_JOB_MAP, CONFIG, CUR_BLOCK_ID, DEFAULT_ID, JOBS, RENEW_JOBS_MAP, RENEW_MAP, STATE}, 
+            ContractError};
+
 
 pub fn execute_handler(
     deps: DepsMut,

diff --git a/contracts/contract-callback/src/handlers/sudo.rs b/contracts/contract-callback/src/handlers/sudo.rs
@@ -1,6 +1,8 @@
 use cosmwasm_std::{Binary, CosmosMsg, DepsMut, Env, Response, SubMsg, Uint128, WasmMsg};
 
-use crate::{msg::{MsgRequestCallback, SudoMsg}, state::{ACC_JOB_MAP, CONFIG, CUR_BLOCK_ID, RENEW_JOBS_MAP, RENEW_MAP, STATE}, ContractError};
+use crate::{msg::{MsgRequestCallback, SudoMsg}, 
+            state::{ACC_JOB_MAP, CONFIG, CUR_BLOCK_ID, RENEW_JOBS_MAP, RENEW_MAP, STATE},
+            ContractError};
 use std::u64;
 
 
@@ -24,7 +26,6 @@ pub fn handle_error(
     _input_payload: String,
     _error_message: String,
 ) -> Result<Response, ContractError> {
-
     Ok(Response::new())
 }
 
@@ -150,4 +151,4 @@ pub fn handle_renew_callback(deps: DepsMut, env: Env, job_id: u64) -> Result<Res
     } else {
         Ok(Response::new())
     }
-}
+}
diff --git a/contracts/contract-callback/src/msg.rs b/contracts/contract-callback/src/msg.rs
@@ -40,7 +40,6 @@ pub enum ExecuteMsg {
     },
     #[payable]
     Deposit {
-
     },
     Withdraw {
     },
@@ -166,4 +165,3 @@ pub struct QueryErrorsRequest {
     #[prost(string, tag = "1")]
     pub contract_address: ::prost::alloc::string::String,
 }
-
diff --git a/schema/contract-callback.json b/schema/contract-callback.json
@@ -53,29 +53,6 @@
         },
         "additionalProperties": false
       },
-      {
-        "type": "object",
-        "required": [
-          "reset"
-        ],
-        "properties": {
-          "reset": {
-            "type": "object",
-            "required": [
-              "count"
-            ],
-            "properties": {
-              "count": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0.0
-              }
-            },
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      },
       {
         "type": "object",
         "required": [
@@ -147,6 +124,14 @@
         "properties": {
           "cancel_auto_renew": {
             "type": "object",
+            "required": [
+              "domain_name"
+            ],
+            "properties": {
+              "domain_name": {
+                "type": "string"
+              }
+            },
             "additionalProperties": false
           }
         },
@@ -186,6 +171,19 @@
         },
         "additionalProperties": false
       },
+      {
+        "type": "object",
+        "required": [
+          "stop_cron_job"
+        ],
+        "properties": {
+          "stop_cron_job": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "type": "object",
         "required": [
@@ -344,6 +342,7 @@
             "callback_height",
             "count",
             "owner",
+            "renew_status",
             "status"
           ],
           "properties": {
@@ -360,6 +359,11 @@
             "owner": {
               "$ref": "#/definitions/Addr"
             },
+            "renew_status": {
+              "type": "integer",
+              "format": "uint8",
+              "minimum": 0.0
+            },
             "status": {
               "type": "integer",
               "format": "uint8",
@@ -499,6 +503,12 @@
             "domain_id": {
               "type": "string"
             },
+            "err_message": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
             "execute_msg": {
               "$ref": "#/definitions/Binary"
             },

diff --git a/schema/raw/execute.json b/schema/raw/execute.json
@@ -15,29 +15,6 @@
       },
       "additionalProperties": false
     },
-    {
-      "type": "object",
-      "required": [
-        "reset"
-      ],
-      "properties": {
-        "reset": {
-          "type": "object",
-          "required": [
-            "count"
-          ],
-          "properties": {
-            "count": {
-              "type": "integer",
-              "format": "uint64",
-              "minimum": 0.0
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
     {
       "type": "object",
       "required": [
@@ -109,6 +86,14 @@
       "properties": {
         "cancel_auto_renew": {
           "type": "object",
+          "required": [
+            "domain_name"
+          ],
+          "properties": {
+            "domain_name": {
+              "type": "string"
+            }
+          },
           "additionalProperties": false
         }
       },
@@ -148,6 +133,19 @@
       },
       "additionalProperties": false
     },
+    {
+      "type": "object",
+      "required": [
+        "stop_cron_job"
+      ],
+      "properties": {
+        "stop_cron_job": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
     {
       "type": "object",
       "required": [

diff --git a/schema/raw/response_to_get_count.json b/schema/raw/response_to_get_count.json
@@ -22,6 +22,7 @@
         "callback_height",
         "count",
         "owner",
+        "renew_status",
         "status"
       ],
       "properties": {
@@ -38,6 +39,11 @@
         "owner": {
           "$ref": "#/definitions/Addr"
         },
+        "renew_status": {
+          "type": "integer",
+          "format": "uint8",
+          "minimum": 0.0
+        },
         "status": {
           "type": "integer",
           "format": "uint8",

diff --git a/schema/raw/response_to_get_ica_state.json b/schema/raw/response_to_get_ica_state.json
@@ -0,0 +1,51 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "GetIcaStateResponse",
+  "type": "object",
+  "required": [
+    "state"
+  ],
+  "properties": {
+    "state": {
+      "$ref": "#/definitions/IcaState"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "IcaState": {
+      "type": "object",
+      "required": [
+        "connection_id",
+        "errors",
+        "ica_address",
+        "owner",
+        "timeout",
+        "voted"
+      ],
+      "properties": {
+        "connection_id": {
+          "type": "string"
+        },
+        "errors": {
+          "type": "string"
+        },
+        "ica_address": {
+          "type": "string"
+        },
+        "owner": {
+          "$ref": "#/definitions/Addr"
+        },
+        "timeout": {
+          "type": "boolean"
+        },
+        "voted": {
+          "type": "boolean"
+        }
+      }
+    }
+  }
+}
diff --git a/schema/raw/response_to_query_renew_map.json b/schema/raw/response_to_query_renew_map.json
@@ -48,6 +48,12 @@
         "domain_id": {
           "type": "string"
         },
+        "err_message": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "execute_msg": {
           "$ref": "#/definitions/Binary"
         },