Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
swelf committed Dec 15, 2022
2 parents f7cb9d1 + 3ad8193 commit a1d3634
Show file tree
Hide file tree
Showing 7 changed files with 194 additions and 61 deletions.
8 changes: 4 additions & 4 deletions artifacts/checksums.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
4d2a9f1b9d6e8181c3ecca744ae5e42667cfe9e4c2dccca1ae08a14235e18508 ibc_transfer.wasm
b6090a21c6683013f7bc329708b837f1d7081d3b45446c7bcc20c2b604108cf2 neutron_interchain_queries.wasm
a34dcff26a3709f5382d526ade65d41384e376eda7a28c07c588f4301554debe neutron_interchain_txs.wasm
8d13b8165b699d9709414c20e41a2adedb0591a00f9be633fb4684b31a016fda neutron_validators_test.wasm
94c97b03bf43e1d2064f7255b0cbdecf9eb3cbb90aee04ac885f11dd744f07d7 ibc_transfer.wasm
115c0b64f0ce6bb2299e9deb35dc238dc059fbf3971c7e4a0f4819e88c687595 neutron_interchain_queries.wasm
94b991497c807fbb3fd9b7c95458029a9fd2c39fe08aff6211a5ef0f3173a087 neutron_interchain_txs.wasm
beecb5de00039e7104117060c66c2ece4ff85ea30ea1bc3c884f15b778e7ea87 neutron_validators_test.wasm
2e7a0f168de97eebf4080df6f9fe23987fc96ac5852f29ca6c489dee7b10e6dd reflect.wasm
Binary file modified artifacts/ibc_transfer.wasm
View file
Binary file not shown.
Binary file modified artifacts/neutron_interchain_queries.wasm
View file
Binary file not shown.
Binary file modified artifacts/neutron_interchain_txs.wasm
View file
Binary file not shown.
Binary file modified artifacts/neutron_validators_test.wasm
View file
Binary file not shown.
135 changes: 111 additions & 24 deletions packages/neutron-sdk/schema/neutron_msg.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "NeutronMsg",
"description": "A number of Custom messages that can call into the Neutron bindings",
"description": "A number of Custom messages that can call into the Neutron bindings.",
"oneOf": [
{
"description": "RegisterInterchainAccount registers an interchain account on remote chain",
"description": "RegisterInterchainAccount registers an interchain account on remote chain.",
"type": "object",
"required": [
"register_interchain_account"
Expand All @@ -18,11 +18,11 @@
],
"properties": {
"connection_id": {
"description": "*connection_id** is an IBC connection identifier between Neutron and remote chain",
"description": "*connection_id** is an IBC connection identifier between Neutron and remote chain.",
"type": "string"
},
"interchain_account_id": {
"description": "**interchain_account_id** is an identifier of your new interchain account. Can be any string This identifier allows contracts to have multiple interchain accounts on remote chains",
"description": "**interchain_account_id** is an identifier of your new interchain account. Can be any string. This identifier allows contracts to have multiple interchain accounts on remote chains.",
"type": "string"
}
}
Expand All @@ -31,7 +31,7 @@
"additionalProperties": false
},
{
"description": "SubmitTx starts the process of executing any Cosmos-SDK *msgs* on remote chain",
"description": "SubmitTx starts the process of executing any Cosmos-SDK *msgs* on remote chain.",
"type": "object",
"required": [
"submit_tx"
Expand All @@ -49,34 +49,34 @@
],
"properties": {
"connection_id": {
"description": "*connection_id** is an IBC connection identifier between Neutron and remote chain",
"description": "*connection_id** is an IBC connection identifier between Neutron and remote chain.",
"type": "string"
},
"fee": {
"description": "**fee** is an ibc fee for the transaction",
"description": "**fee** is an ibc fee for the transaction.",
"allOf": [
{
"$ref": "#/definitions/IbcFee"
}
]
},
"interchain_account_id": {
"description": "*interchain_account_id** is an identifier of your interchain account from which you want to execute msgs",
"description": "*interchain_account_id** is an identifier of your interchain account from which you want to execute msgs.",
"type": "string"
},
"memo": {
"description": "*memo** is a memo you want to attach to your interchain transaction.It behaves like a memo in usual Cosmos transaction",
"description": "*memo** is a memo you want to attach to your interchain transaction.It behaves like a memo in usual Cosmos transaction.",
"type": "string"
},
"msgs": {
"description": "*msgs** is a list of protobuf encoded Cosmos-SDK messages you want to execute on remote chain",
"description": "*msgs** is a list of protobuf encoded Cosmos-SDK messages you want to execute on remote chain.",
"type": "array",
"items": {
"$ref": "#/definitions/ProtobufAny"
}
},
"timeout": {
"description": "*timeout** is a timeout in seconds after which the packet times out",
"description": "*timeout** is a timeout in seconds after which the packet times out.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
Expand All @@ -87,7 +87,7 @@
"additionalProperties": false
},
{
"description": "RegisterInterchainQuery registers an interchain query",
"description": "RegisterInterchainQuery registers an interchain query.",
"type": "object",
"required": [
"register_interchain_query"
Expand All @@ -104,22 +104,22 @@
],
"properties": {
"connection_id": {
"description": "*connection_id** is an IBC connection identifier between Neutron and remote chain",
"description": "*connection_id** is an IBC connection identifier between Neutron and remote chain.",
"type": "string"
},
"keys": {
"description": "*keys** is the KV-storage keys for which we want to get values from remote chain",
"description": "*keys** is the KV-storage keys for which we want to get values from remote chain.",
"type": "array",
"items": {
"$ref": "#/definitions/KVKey"
}
},
"query_type": {
"description": "*query_type** is a query type identifier ('tx' or 'kv' for now)",
"description": "*query_type** is a query type identifier ('tx' or 'kv' for now).",
"type": "string"
},
"transactions_filter": {
"description": "*transactions_filter** is the filter for transaction search ICQ",
"description": "*transactions_filter** is the filter for transaction search ICQ.",
"type": "string"
},
"update_period": {
Expand All @@ -134,7 +134,7 @@
"additionalProperties": false
},
{
"description": "RegisterInterchainQuery updates an interchain query",
"description": "RegisterInterchainQuery updates an interchain query.",
"type": "object",
"required": [
"update_interchain_query"
Expand All @@ -147,7 +147,7 @@
],
"properties": {
"new_keys": {
"description": "*new_keys** is the new query keys to retrive",
"description": "*new_keys** is the new query keys to retrive.",
"type": [
"array",
"null"
Expand All @@ -157,14 +157,14 @@
}
},
"new_transactions_filter": {
"description": "*new_transactions_filter** is a new transactions filter of the query",
"description": "*new_transactions_filter** is a new transactions filter of the query.",
"type": [
"string",
"null"
]
},
"new_update_period": {
"description": "*new_update_period** is a new update period of the query",
"description": "*new_update_period** is a new update period of the query.",
"type": [
"integer",
"null"
Expand All @@ -173,7 +173,7 @@
"minimum": 0.0
},
"query_id": {
"description": "*query_id** is the ID of the query we want to update",
"description": "*query_id** is the ID of the query we want to update.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
Expand All @@ -184,7 +184,7 @@
"additionalProperties": false
},
{
"description": "RemoveInterchainQuery removes as interchain query",
"description": "RemoveInterchainQuery removes as interchain query.",
"type": "object",
"required": [
"remove_interchain_query"
Expand All @@ -197,7 +197,7 @@
],
"properties": {
"query_id": {
"description": "*query_id** is ID of the query we want to remove",
"description": "*query_id** is ID of the query we want to remove.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
Expand All @@ -208,7 +208,7 @@
"additionalProperties": false
},
{
"description": "IbcTransfer sends a fungible token packet over IBC",
"description": "IbcTransfer sends a fungible token packet over IBC.",
"type": "object",
"required": [
"ibc_transfer"
Expand Down Expand Up @@ -257,9 +257,47 @@
}
},
"additionalProperties": false
},
{
"description": "SubmitAdminProposal sends a proposal to neutron's Admin module. This type of messages can be only executed by Neutron DAO.",
"type": "object",
"required": [
"submit_admin_proposal"
],
"properties": {
"submit_admin_proposal": {
"type": "object",
"required": [
"admin_proposal"
],
"properties": {
"admin_proposal": {
"$ref": "#/definitions/AdminProposal"
}
}
}
},
"additionalProperties": false
}
],
"definitions": {
"AdminProposal": {
"description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.",
"type": "object",
"properties": {
"param_change_proposal": {
"description": "*param_change_proposal** is a parameter change proposal field.",
"anyOf": [
{
"$ref": "#/definitions/ParamChangeProposal"
},
{
"type": "null"
}
]
}
}
},
"Binary": {
"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"
Expand Down Expand Up @@ -329,6 +367,55 @@
}
}
},
"ParamChange": {
"description": "ParamChange defines the struct for parameter change request.",
"type": "object",
"required": [
"key",
"subspace",
"value"
],
"properties": {
"key": {
"description": "*key** is a name of parameter. Unique for subspace.",
"type": "string"
},
"subspace": {
"description": "*subspace** is a key of module to which the parameter to change belongs. Unique for each module.",
"type": "string"
},
"value": {
"description": "*value** is a new value for given parameter. Non unique.",
"type": "string"
}
}
},
"ParamChangeProposal": {
"description": "ParamChangeProposal defines the struct for single parameter change proposal.",
"type": "object",
"required": [
"description",
"param_changes",
"title"
],
"properties": {
"description": {
"description": "*descriptionr** is a text description of proposal. Non unique.",
"type": "string"
},
"param_changes": {
"description": "*param_changes** is a vector of params to be changed. Non unique.",
"type": "array",
"items": {
"$ref": "#/definitions/ParamChange"
}
},
"title": {
"description": "*title** is a text title of proposal. Non unique.",
"type": "string"
}
}
},
"ProtobufAny": {
"description": "Type for wrapping any protobuf message",
"type": "object",
Expand Down
Loading

0 comments on commit a1d3634

Please sign in to comment.