Merge branch 'main' into 1498-key-only-iteration

CosmWasm · Aug 28, 2023 · 1002245 · 1002245
2 parents 4f68dd7 + 05ece0b
commit 1002245
Show file tree

Hide file tree

Showing 45 changed files with 1,973 additions and 114 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,10 +13,12 @@ and this project adheres to
 - cosmwasm-std: Make `abs_diff` const for `Uint{256,512}` and
   `Int{64,128,256,512}`. It is now const for all integer types.
 - cosmwasm-std: Implement `TryFrom<Decimal256>` for `Decimal` ([#1832])
+- cosmwasm-std: Add `StdAck`. ([#1512])
 - cosmwasm-std: Add new imports `db_next_{key, value}` for iterating storage
   keys / values only and make `Storage::{range_keys, range_values}` more
   efficient. This requires the `cosmwasm_1_4` feature to be enabled. ([#1834])
 
+[#1512]: https://github.com/CosmWasm/cosmwasm/issues/1512
 [#1799]: https://github.com/CosmWasm/cosmwasm/pull/1799
 [#1806]: https://github.com/CosmWasm/cosmwasm/pull/1806
 [#1832]: https://github.com/CosmWasm/cosmwasm/pull/1832

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/ibc-reflect-send/schema/ibc/acknowledgement_msg_balances.json b/contracts/ibc-reflect-send/schema/ibc/acknowledgement_msg_balances.json
@@ -0,0 +1,71 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "AcknowledgementMsgBalances",
+  "description": "A custom acknowledgement type. The success type `T` depends on the PacketMsg variant.\n\nThis could be refactored to use [StdAck] at some point. However, it has a different success variant name (\"ok\" vs. \"result\") and a JSON payload instead of a binary payload.\n\n[StdAck]: https://github.com/CosmWasm/cosmwasm/issues/1512",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "ok"
+      ],
+      "properties": {
+        "ok": {
+          "$ref": "#/definitions/BalancesResponse"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "error"
+      ],
+      "properties": {
+        "error": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  ],
+  "definitions": {
+    "BalancesResponse": {
+      "description": "This is the success response we send on ack for PacketMsg::Balance. Just acknowledge success or error",
+      "type": "object",
+      "required": [
+        "account",
+        "balances"
+      ],
+      "properties": {
+        "account": {
+          "type": "string"
+        },
+        "balances": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Coin"
+          }
+        }
+      }
+    },
+    "Coin": {
+      "type": "object",
+      "required": [
+        "amount",
+        "denom"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "denom": {
+          "type": "string"
+        }
+      }
+    },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/contracts/ibc-reflect-send/schema/ibc/acknowledgement_msg_dispatch.json b/contracts/ibc-reflect-send/schema/ibc/acknowledgement_msg_dispatch.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "AcknowledgementMsgDispatch",
+  "description": "A custom acknowledgement type. The success type `T` depends on the PacketMsg variant.\n\nThis could be refactored to use [StdAck] at some point. However, it has a different success variant name (\"ok\" vs. \"result\") and a JSON payload instead of a binary payload.\n\n[StdAck]: https://github.com/CosmWasm/cosmwasm/issues/1512",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "ok"
+      ],
+      "properties": {
+        "ok": {
+          "type": "null"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "error"
+      ],
+      "properties": {
+        "error": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}
diff --git a/contracts/ibc-reflect-send/schema/ibc/acknowledgement_msg_who_am_i.json b/contracts/ibc-reflect-send/schema/ibc/acknowledgement_msg_who_am_i.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "AcknowledgementMsgWhoAmI",
+  "description": "A custom acknowledgement type. The success type `T` depends on the PacketMsg variant.\n\nThis could be refactored to use [StdAck] at some point. However, it has a different success variant name (\"ok\" vs. \"result\") and a JSON payload instead of a binary payload.\n\n[StdAck]: https://github.com/CosmWasm/cosmwasm/issues/1512",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "ok"
+      ],
+      "properties": {
+        "ok": {
+          "$ref": "#/definitions/WhoAmIResponse"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "error"
+      ],
+      "properties": {
+        "error": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  ],
+  "definitions": {
+    "WhoAmIResponse": {
+      "description": "This is the success response we send on ack for PacketMsg::WhoAmI. Return the caller's account address on the remote chain",
+      "type": "object",
+      "required": [
+        "account"
+      ],
+      "properties": {
+        "account": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
diff --git a/...s/ibc-reflect-send/schema/packet_msg.json → ...c-reflect-send/schema/ibc/packet_msg.json b/...s/ibc-reflect-send/schema/packet_msg.json → ...c-reflect-send/schema/ibc/packet_msg.json
diff --git a/contracts/ibc-reflect-send/src/bin/schema.rs b/contracts/ibc-reflect-send/src/bin/schema.rs
@@ -1,8 +1,10 @@
 use std::env::current_dir;
 
-use cosmwasm_schema::{export_schema, schema_for, write_api};
+use cosmwasm_schema::{export_schema, export_schema_with_title, schema_for, write_api};
 
-use ibc_reflect_send::ibc_msg::PacketMsg;
+use ibc_reflect_send::ibc_msg::{
+    AcknowledgementMsg, BalancesResponse, DispatchResponse, PacketMsg, WhoAmIResponse,
+};
 use ibc_reflect_send::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
@@ -16,5 +18,21 @@ fn main() {
     // Schemas for inter-contract communication
     let mut out_dir = current_dir().unwrap();
     out_dir.push("schema");
+    out_dir.push("ibc");
     export_schema(&schema_for!(PacketMsg), &out_dir);
+    export_schema_with_title(
+        &schema_for!(AcknowledgementMsg<BalancesResponse>),
+        &out_dir,
+        "AcknowledgementMsgBalances",
+    );
+    export_schema_with_title(
+        &schema_for!(AcknowledgementMsg<DispatchResponse>),
+        &out_dir,
+        "AcknowledgementMsgDispatch",
+    );
+    export_schema_with_title(
+        &schema_for!(AcknowledgementMsg<WhoAmIResponse>),
+        &out_dir,
+        "AcknowledgementMsgWhoAmI",
+    );
 }