Adjust WriteAcknowledgement fields

CosmWasm · Oct 13, 2023 · 068845a · 068845a
1 parent 7bb610b
commit 068845a
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 19 deletions.
diff --git a/contracts/ibc-reflect-send/schema/ibc-reflect-send.json b/contracts/ibc-reflect-send/schema/ibc-reflect-send.json
@@ -404,6 +404,21 @@
           }
         }
       },
+      "IbcEndpoint": {
+        "type": "object",
+        "required": [
+          "channel_id",
+          "port_id"
+        ],
+        "properties": {
+          "channel_id": {
+            "type": "string"
+          },
+          "port_id": {
+            "type": "string"
+          }
+        }
+      },
       "IbcMsg": {
         "description": "These are messages in the IBC lifecycle. Only usable by IBC-enabled contracts (contracts that directly speak the IBC protocol via 6 entry points)",
         "oneOf": [
@@ -518,14 +533,26 @@
                 "type": "object",
                 "required": [
                   "ack",
-                  "packet_id"
+                  "dest_channel",
+                  "sequence"
                 ],
                 "properties": {
                   "ack": {
                     "$ref": "#/definitions/IbcAcknowledgement"
                   },
-                  "packet_id": {
-                    "type": "string"
+                  "dest_channel": {
+                    "description": "The channel on the destination chain (the chain this is executed on) to write the acknowledgement to.",
+                    "allOf": [
+                      {
+                        "$ref": "#/definitions/IbcEndpoint"
+                      }
+                    ]
+                  },
+                  "sequence": {
+                    "description": "The sequence number of the packet to acknowledge.",
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
                   }
                 }
               }

diff --git a/contracts/ibc-reflect-send/schema/ibc/packet_msg.json b/contracts/ibc-reflect-send/schema/ibc/packet_msg.json
@@ -342,6 +342,21 @@
         }
       }
     },
+    "IbcEndpoint": {
+      "type": "object",
+      "required": [
+        "channel_id",
+        "port_id"
+      ],
+      "properties": {
+        "channel_id": {
+          "type": "string"
+        },
+        "port_id": {
+          "type": "string"
+        }
+      }
+    },
     "IbcMsg": {
       "description": "These are messages in the IBC lifecycle. Only usable by IBC-enabled contracts (contracts that directly speak the IBC protocol via 6 entry points)",
       "oneOf": [
@@ -456,14 +471,26 @@
               "type": "object",
               "required": [
                 "ack",
-                "packet_id"
+                "dest_channel",
+                "sequence"
               ],
               "properties": {
                 "ack": {
                   "$ref": "#/definitions/IbcAcknowledgement"
                 },
-                "packet_id": {
-                  "type": "string"
+                "dest_channel": {
+                  "description": "The channel on the destination chain (the chain this is executed on) to write the acknowledgement to.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/IbcEndpoint"
+                    }
+                  ]
+                },
+                "sequence": {
+                  "description": "The sequence number of the packet to acknowledge.",
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
                 }
               }
             }

diff --git a/contracts/ibc-reflect-send/schema/raw/execute.json b/contracts/ibc-reflect-send/schema/raw/execute.json
@@ -393,6 +393,21 @@
         }
       }
     },
+    "IbcEndpoint": {
+      "type": "object",
+      "required": [
+        "channel_id",
+        "port_id"
+      ],
+      "properties": {
+        "channel_id": {
+          "type": "string"
+        },
+        "port_id": {
+          "type": "string"
+        }
+      }
+    },
     "IbcMsg": {
       "description": "These are messages in the IBC lifecycle. Only usable by IBC-enabled contracts (contracts that directly speak the IBC protocol via 6 entry points)",
       "oneOf": [
@@ -507,14 +522,26 @@
               "type": "object",
               "required": [
                 "ack",
-                "packet_id"
+                "dest_channel",
+                "sequence"
               ],
               "properties": {
                 "ack": {
                   "$ref": "#/definitions/IbcAcknowledgement"
                 },
-                "packet_id": {
-                  "type": "string"
+                "dest_channel": {
+                  "description": "The channel on the destination chain (the chain this is executed on) to write the acknowledgement to.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/IbcEndpoint"
+                    }
+                  ]
+                },
+                "sequence": {
+                  "description": "The sequence number of the packet to acknowledge.",
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
                 }
               }
             }

diff --git a/contracts/ibc-reflect/schema/ibc/packet_msg.json b/contracts/ibc-reflect/schema/ibc/packet_msg.json
@@ -329,6 +329,21 @@
         }
       }
     },
+    "IbcEndpoint": {
+      "type": "object",
+      "required": [
+        "channel_id",
+        "port_id"
+      ],
+      "properties": {
+        "channel_id": {
+          "type": "string"
+        },
+        "port_id": {
+          "type": "string"
+        }
+      }
+    },
     "IbcMsg": {
       "description": "These are messages in the IBC lifecycle. Only usable by IBC-enabled contracts (contracts that directly speak the IBC protocol via 6 entry points)",
       "oneOf": [
@@ -443,14 +458,26 @@
               "type": "object",
               "required": [
                 "ack",
-                "packet_id"
+                "dest_channel",
+                "sequence"
               ],
               "properties": {
                 "ack": {
                   "$ref": "#/definitions/IbcAcknowledgement"
                 },
-                "packet_id": {
-                  "type": "string"
+                "dest_channel": {
+                  "description": "The channel on the destination chain (the chain this is executed on) to write the acknowledgement to.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/IbcEndpoint"
+                    }
+                  ]
+                },
+                "sequence": {
+                  "description": "The sequence number of the packet to acknowledge.",
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
                 }
               }
             }

diff --git a/contracts/reflect/schema/raw/execute.json b/contracts/reflect/schema/raw/execute.json
@@ -447,6 +447,21 @@
         }
       }
     },
+    "IbcEndpoint": {
+      "type": "object",
+      "required": [
+        "channel_id",
+        "port_id"
+      ],
+      "properties": {
+        "channel_id": {
+          "type": "string"
+        },
+        "port_id": {
+          "type": "string"
+        }
+      }
+    },
     "IbcMsg": {
       "description": "These are messages in the IBC lifecycle. Only usable by IBC-enabled contracts (contracts that directly speak the IBC protocol via 6 entry points)",
       "oneOf": [
@@ -561,14 +576,26 @@
               "type": "object",
               "required": [
                 "ack",
-                "packet_id"
+                "dest_channel",
+                "sequence"
               ],
               "properties": {
                 "ack": {
                   "$ref": "#/definitions/IbcAcknowledgement"
                 },
-                "packet_id": {
-                  "type": "string"
+                "dest_channel": {
+                  "description": "The channel on the destination chain (the chain this is executed on) to write the acknowledgement to.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/IbcEndpoint"
+                    }
+                  ]
+                },
+                "sequence": {
+                  "description": "The sequence number of the packet to acknowledge.",
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
                 }
               }
             }

diff --git a/contracts/reflect/schema/reflect.json b/contracts/reflect/schema/reflect.json
@@ -457,6 +457,21 @@
           }
         }
       },
+      "IbcEndpoint": {
+        "type": "object",
+        "required": [
+          "channel_id",
+          "port_id"
+        ],
+        "properties": {
+          "channel_id": {
+            "type": "string"
+          },
+          "port_id": {
+            "type": "string"
+          }
+        }
+      },
       "IbcMsg": {
         "description": "These are messages in the IBC lifecycle. Only usable by IBC-enabled contracts (contracts that directly speak the IBC protocol via 6 entry points)",
         "oneOf": [
@@ -571,14 +586,26 @@
                 "type": "object",
                 "required": [
                   "ack",
-                  "packet_id"
+                  "dest_channel",
+                  "sequence"
                 ],
                 "properties": {
                   "ack": {
                     "$ref": "#/definitions/IbcAcknowledgement"
                   },
-                  "packet_id": {
-                    "type": "string"
+                  "dest_channel": {
+                    "description": "The channel on the destination chain (the chain this is executed on) to write the acknowledgement to.",
+                    "allOf": [
+                      {
+                        "$ref": "#/definitions/IbcEndpoint"
+                      }
+                    ]
+                  },
+                  "sequence": {
+                    "description": "The sequence number of the packet to acknowledge.",
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
                   }
                 }
               }

diff --git a/packages/std/src/ibc.rs b/packages/std/src/ibc.rs
@@ -53,7 +53,11 @@ pub enum IbcMsg {
     /// In this case, you can return an [`IbcReceiveResponse`] with an acknowledgement of `None`
     /// from `ibc_packet_receive` and call this message later.
     WriteAcknowledgement {
-        packet_id: String,
+        /// The channel on the destination chain (the chain this is executed on)
+        /// to write the acknowledgement to.
+        dest_channel: IbcEndpoint,
+        /// The sequence number of the packet to acknowledge.
+        sequence: u64,
         ack: IbcAcknowledgement,
     },
 }