Skip to content

Commit

Permalink
Update schemas for cw1 contracts
Browse files Browse the repository at this point in the history
  • Loading branch information
@uint
uint committed Jun 29, 2021
1 parent 1c6246a commit 44c2387
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 69 deletions.
2 changes: 1 addition & 1 deletion contracts/cw1-subkeys/schema/all_allowances_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
}
},
"Timestamp": {
"description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.",
"description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
"allOf": [
{
"$ref": "#/definitions/Uint64"
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw1-subkeys/schema/allowance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
}
},
"Timestamp": {
"description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.",
"description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
"allOf": [
{
"$ref": "#/definitions/Uint64"
Expand Down
77 changes: 59 additions & 18 deletions contracts/cw1-subkeys/schema/execute_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"msgs": {
"type": "array",
"items": {
"$ref": "#/definitions/CosmosMsg_for_Empty"
"$ref": "#/definitions/SubMsg_for_Empty"
}
}
}
Expand Down Expand Up @@ -421,6 +421,16 @@
}
}
},
"ReplyOn": {
"description": "Use this to define when the contract gets a response callback. If you only need it for errors or success you can select just those in order to save gas.",
"type": "string",
"enum": [
"always",
"error",
"success",
"never"
]
},
"StakingMsg": {
"description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
"anyOf": [
Expand Down Expand Up @@ -505,8 +515,39 @@
}
]
},
"SubMsg_for_Empty": {
"description": "A submessage that will guarantee a `reply` call on success or error, depending on the `reply_on` setting. If you do not need to process the result, use regular messages instead.\n\nNote: On error the submessage execution will revert any partial state changes due to this message, but not revert any state changes in the calling contract. If this is required, it must be done manually in the `reply` entry point.",
"type": "object",
"required": [
"id",
"msg",
"reply_on"
],
"properties": {
"gas_limit": {
"type": [
"integer",
"null"
],
"format": "uint64",
"minimum": 0.0
},
"id": {
"description": "An arbitrary ID chosen by the contract. This is typically used to match `Reply`s in the `reply` entry point to the submessage.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"msg": {
"$ref": "#/definitions/CosmosMsg_for_Empty"
},
"reply_on": {
"$ref": "#/definitions/ReplyOn"
}
}
},
"Timestamp": {
"description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.",
"description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
"allOf": [
{
"$ref": "#/definitions/Uint64"
Expand Down Expand Up @@ -535,26 +576,26 @@
"type": "object",
"required": [
"contract_addr",
"msg",
"send"
"funds",
"msg"
],
"properties": {
"contract_addr": {
"type": "string"
},
"funds": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"msg": {
"description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
"allOf": [
{
"$ref": "#/definitions/Binary"
}
]
},
"send": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
Expand All @@ -572,9 +613,9 @@
"type": "object",
"required": [
"code_id",
"funds",
"label",
"msg",
"send"
"msg"
],
"properties": {
"admin": {
Expand All @@ -588,6 +629,12 @@
"format": "uint64",
"minimum": 0.0
},
"funds": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"label": {
"description": "A human-readbale label for the contract",
"type": "string"
Expand All @@ -599,12 +646,6 @@
"$ref": "#/definitions/Binary"
}
]
},
"send": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
Expand Down
32 changes: 16 additions & 16 deletions contracts/cw1-subkeys/schema/query_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,26 +437,26 @@
"type": "object",
"required": [
"contract_addr",
"msg",
"send"
"funds",
"msg"
],
"properties": {
"contract_addr": {
"type": "string"
},
"funds": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"msg": {
"description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
"allOf": [
{
"$ref": "#/definitions/Binary"
}
]
},
"send": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
Expand All @@ -474,9 +474,9 @@
"type": "object",
"required": [
"code_id",
"funds",
"label",
"msg",
"send"
"msg"
],
"properties": {
"admin": {
Expand All @@ -490,6 +490,12 @@
"format": "uint64",
"minimum": 0.0
},
"funds": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"label": {
"description": "A human-readbale label for the contract",
"type": "string"
Expand All @@ -501,12 +507,6 @@
"$ref": "#/definitions/Binary"
}
]
},
"send": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
Expand Down
75 changes: 58 additions & 17 deletions contracts/cw1-whitelist/schema/execute_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"msgs": {
"type": "array",
"items": {
"$ref": "#/definitions/CosmosMsg_for_Empty"
"$ref": "#/definitions/SubMsg_for_Empty"
}
}
}
Expand Down Expand Up @@ -258,6 +258,16 @@
"description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
"type": "object"
},
"ReplyOn": {
"description": "Use this to define when the contract gets a response callback. If you only need it for errors or success you can select just those in order to save gas.",
"type": "string",
"enum": [
"always",
"error",
"success",
"never"
]
},
"StakingMsg": {
"description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
"anyOf": [
Expand Down Expand Up @@ -342,6 +352,37 @@
}
]
},
"SubMsg_for_Empty": {
"description": "A submessage that will guarantee a `reply` call on success or error, depending on the `reply_on` setting. If you do not need to process the result, use regular messages instead.\n\nNote: On error the submessage execution will revert any partial state changes due to this message, but not revert any state changes in the calling contract. If this is required, it must be done manually in the `reply` entry point.",
"type": "object",
"required": [
"id",
"msg",
"reply_on"
],
"properties": {
"gas_limit": {
"type": [
"integer",
"null"
],
"format": "uint64",
"minimum": 0.0
},
"id": {
"description": "An arbitrary ID chosen by the contract. This is typically used to match `Reply`s in the `reply` entry point to the submessage.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"msg": {
"$ref": "#/definitions/CosmosMsg_for_Empty"
},
"reply_on": {
"$ref": "#/definitions/ReplyOn"
}
}
},
"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"
Expand All @@ -360,26 +401,26 @@
"type": "object",
"required": [
"contract_addr",
"msg",
"send"
"funds",
"msg"
],
"properties": {
"contract_addr": {
"type": "string"
},
"funds": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"msg": {
"description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
"allOf": [
{
"$ref": "#/definitions/Binary"
}
]
},
"send": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
Expand All @@ -397,9 +438,9 @@
"type": "object",
"required": [
"code_id",
"funds",
"label",
"msg",
"send"
"msg"
],
"properties": {
"admin": {
Expand All @@ -413,6 +454,12 @@
"format": "uint64",
"minimum": 0.0
},
"funds": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"label": {
"description": "A human-readbale label for the contract",
"type": "string"
Expand All @@ -424,12 +471,6 @@
"$ref": "#/definitions/Binary"
}
]
},
"send": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
Expand Down
Loading

0 comments on commit 44c2387

Please sign in to comment.