Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update neutron sdk to 47 #77

Merged
merged 6 commits into from
Sep 8, 2023
Merged

update neutron sdk to 47 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5cd88ef
Merge pull request #76 from neutron-org/feat/new-schema
pr0n00gler Aug 22, 2023
d5ebd33
f
quasisamurai Aug 24, 2023
69e691a
empty comm
quasisamurai Aug 24, 2023
11ec8d5
upd
quasisamurai Aug 24, 2023
87a83d7
upd-sdk
quasisamurai Aug 24, 2023
291c095
upd-sdk
quasisamurai Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/dao/cwd-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cw20 = "1.1.0"
cw721 = "0.18.0"
cwd-interface = {path = "../../../packages/cwd-interface"}
cwd-macros = {path = "../../../packages/cwd-macros"}
neutron-sdk = {package = "neutron-sdk", version = "0.6.1"}
neutron-sdk = {package = "neutron-sdk", git="https://github.com/neutron-org/neutron-sdk", branch="feat/sdk47"}
schemars = "0.8.8"
serde = {version = "1.0.175", default-features = false, features = ["derive"]}
thiserror = {version = "1.0"}
274 changes: 15 additions & 259 deletions contracts/dao/cwd-core/schema/cwd-core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,30 +413,6 @@
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"software_upgrade_proposal"
],
"properties": {
"software_upgrade_proposal": {
"$ref": "#/definitions/SoftwareUpgradeProposal"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"cancel_software_upgrade_proposal"
],
"properties": {
"cancel_software_upgrade_proposal": {
"$ref": "#/definitions/CancelSoftwareUpgradeProposal"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
Expand Down Expand Up @@ -464,59 +440,11 @@
{
"type": "object",
"required": [
"pin_codes_proposal"
],
"properties": {
"pin_codes_proposal": {
"$ref": "#/definitions/PinCodesProposal"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"unpin_codes_proposal"
],
"properties": {
"unpin_codes_proposal": {
"$ref": "#/definitions/UnpinCodesProposal"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"sudo_contract_proposal"
],
"properties": {
"sudo_contract_proposal": {
"$ref": "#/definitions/SudoContractProposal"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"update_admin_proposal"
],
"properties": {
"update_admin_proposal": {
"$ref": "#/definitions/UpdateAdminProposal"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"clear_admin_proposal"
"proposal_execute_message"
],
"properties": {
"clear_admin_proposal": {
"$ref": "#/definitions/ClearAdminProposal"
"proposal_execute_message": {
"$ref": "#/definitions/ProposalExecuteMessage"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -584,47 +512,6 @@
"description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
"type": "string"
},
"CancelSoftwareUpgradeProposal": {
"description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.",
"type": "object",
"required": [
"description",
"title"
],
"properties": {
"description": {
"description": "*description** is a text description of proposal. Non unique.",
"type": "string"
},
"title": {
"description": "*title** is a text title of proposal. Non unique.",
"type": "string"
}
}
},
"ClearAdminProposal": {
"description": "SudoContractProposal defines the struct for clear admin proposal.",
"type": "object",
"required": [
"contract",
"description",
"title"
],
"properties": {
"contract": {
"description": "*contract** is an address of contract admin will be removed.",
"type": "string"
},
"description": {
"description": "*description** is a text description of proposal.",
"type": "string"
},
"title": {
"description": "*title** is a text title of proposal.",
"type": "string"
}
}
},
"ClientUpdateProposal": {
"description": "ClientUpdateProposal defines the struct for client update proposal.",
"type": "object",
Expand Down Expand Up @@ -1688,34 +1575,6 @@
}
}
},
"PinCodesProposal": {
"description": "PinCodesProposal defines the struct for pin contract codes proposal.",
"type": "object",
"required": [
"code_ids",
"description",
"title"
],
"properties": {
"code_ids": {
"description": "*code_ids** is an array of codes to be pined.",
"type": "array",
"items": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
},
"description": {
"description": "*description** is a text description of proposal.",
"type": "string"
},
"title": {
"description": "*title** is a text title of proposal.",
"type": "string"
}
}
},
"Plan": {
"description": "Plan defines the struct for planned upgrade.",
"type": "object",
Expand All @@ -1740,6 +1599,18 @@
}
}
},
"ProposalExecuteMessage": {
"description": "ProposalExecuteMessage defines the struct for sdk47 compatible update params admin proposal.",
"type": "object",
"required": [
"message"
],
"properties": {
"message": {
"description": "*message** is a json representing a sdk message passed to admin module to execute."
}
}
},
"ProtobufAny": {
"description": "Type for wrapping any protobuf message",
"type": "object",
Expand Down Expand Up @@ -1783,33 +1654,6 @@
}
}
},
"SoftwareUpgradeProposal": {
"description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.",
"type": "object",
"required": [
"description",
"plan",
"title"
],
"properties": {
"description": {
"description": "*description** is a text description of proposal. Non unique.",
"type": "string"
},
"plan": {
"description": "*plan** is a plan of upgrade.",
"allOf": [
{
"$ref": "#/definitions/Plan"
}
]
},
"title": {
"description": "*title** is a text title of proposal. Non unique.",
"type": "string"
}
}
},
"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",
"oneOf": [
Expand Down Expand Up @@ -1913,38 +1757,6 @@
}
}
},
"SudoContractProposal": {
"description": "SudoContractProposal defines the struct for sudo execution proposal.",
"type": "object",
"required": [
"contract",
"description",
"msg",
"title"
],
"properties": {
"contract": {
"description": "*contract** is an address of contract to be executed.",
"type": "string"
},
"description": {
"description": "*description** is a text description of proposal.",
"type": "string"
},
"msg": {
"description": "**msg*** is a sudo message.",
"allOf": [
{
"$ref": "#/definitions/Binary"
}
]
},
"title": {
"description": "*title** is a text title of proposal.",
"type": "string"
}
}
},
"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.\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": [
Expand All @@ -1961,62 +1773,6 @@
"description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 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 `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
"type": "string"
},
"UnpinCodesProposal": {
"description": "UnpinCodesProposal defines the struct for unpin contract codes proposal.",
"type": "object",
"required": [
"code_ids",
"description",
"title"
],
"properties": {
"code_ids": {
"description": "*code_ids** is an array of codes to be unpined.",
"type": "array",
"items": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
},
"description": {
"description": "*description** is a text description of proposal.",
"type": "string"
},
"title": {
"description": "*title** is a text title of proposal.",
"type": "string"
}
}
},
"UpdateAdminProposal": {
"description": "UpdateAdminProposal defines the struct for update admin proposal.",
"type": "object",
"required": [
"contract",
"description",
"new_admin",
"title"
],
"properties": {
"contract": {
"description": "*contract** is an address of contract to update admin.",
"type": "string"
},
"description": {
"description": "*description** is a text description of proposal.",
"type": "string"
},
"new_admin": {
"description": "**new_admin*** is an address of new admin",
"type": "string"
},
"title": {
"description": "*title** is a text title of proposal.",
"type": "string"
}
}
},
"UpgradeProposal": {
"description": "UpgradeProposal defines the struct for upgrade proposal.",
"type": "object",
Expand Down
Loading
Loading