8000 268 cw20 exchange extended options in startsale struct by joemonem · Pull Request #272 · andromedaprotocol/andromeda-core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

268 cw20 exchange extended options in startsale struct #272

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

Merged
merged 8 commits into from
Feb 14, 2024
Merged

268 cw20 exchange extended options in startsale struct #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9d69e15
added optional start time and duration + unit tests + schema update
joemonem Feb 9, 2024
c60559b
Addresses #269 added start_time in Sale for cw20-exchange
joemonem Feb 11, 2024
588b92d
linting
joemonem Feb 11, 2024
1f2da19
save start_time as current block time + 1 instead of setting it as Ne…
joemonem Feb 12, 2024
1add513
linting and comment adjustment
joemonem Feb 12, 2024
d9e0dea
Addresses #267 refund original token instead of sale token when cance…
joemonem Feb 12, 2024
d339be2
changed claim ownership's new_owner field from Option<Addr> to Option…
joemonem Feb 12, 2024
6d157cb
removed unused commented code
joemonem Feb 14, 2024
File filter

Filter by extension

Filter by extension
10000
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
345 changes: 340 additions & 5 deletions contracts/app/andromeda-app-contract/schema/andromeda-app-contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"new_owner": {
"anyOf": [
{
"$ref": "#/definitions/Addr"
"$ref": "#/definitions/AndrAddr"
},
{
"type": "null"
Expand D 10000 own Expand Up @@ -415,6 +415,73 @@
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"register_module"
],
"properties": {
"register_module": {
"type": "object",
"required": [
"module"
],
"properties": {
"module": {
"$ref": "#/definitions/Module"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"deregister_module"
],
"properties": {
"deregister_module": {
"type": "object",
"required": [
"module_idx"
],
"properties": {
"module_idx": {
"$ref": "#/definitions/Uint64"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"alter_module"
],
"properties": {
"alter_module": {
"type": "object",
"required": [
"module",
"module_idx"
],
"properties": {
"module": {
"$ref": "#/definitions/Module"
},
"module_idx": {
"$ref": "#/definitions/Uint64"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
}
],
"definitions": {
Expand Down Expand Up @@ -562,10 +629,6 @@
},
"additionalProperties": false
},
"Addr": {
"description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
"type": "string"
},
"AndrAddr": {
"description": "An address that can be used within the Andromeda ecosystem. Inspired by the cosmwasm-std `Addr` type. https://github.com/CosmWasm/cosmwasm/blob/2a1c698520a1aacedfe3f4803b0d7d653892217a/packages/std/src/addresses.rs#L33\n\nThis address can be one of two things: 1. A valid human readable address e.g. `cosmos1...` 2. A valid Andromeda VFS path e.g. `/home/user/app/component`\n\nVFS paths can be local in the case of an app and can be done by referencing `./component` they can also contain protocols for cross chain communication. A VFS path is usually structured as so:\n\n`<protocol>://<chain (required if ibc used)>/<path>` or `ibc://cosmoshub-4/user/app/component`",
"type": "string"
Expand Down Expand Up @@ -728,6 +791,29 @@
},
"additionalProperties": false
},
"Module": {
"description": "A struct describing a token module, provided with the instantiation message this struct is used to record the info about the module and how/if it should be instantiated",
"type": "object",
"required": [
"address",
"is_mutable"
],
"properties": {
"address": {
"$ref": "#/definitions/AndrAddr"
},
"is_mutable": {
"type": "boolean"
},
"name": {
"type": [
"string",
"null"
]
}
},
"additionalProperties": false
},
"Permission": {
"description": "An enum to represent a user's permission for an action\n\n- **Blacklisted** - The user cannot perform the action until after the provided expiration - **Limited** - The user can perform the action while uses are remaining and before the provided expiration **for a permissioned action** - **Whitelisted** - The user can perform the action until the provided expiration **for a permissioned action**\n\nExpiration defaults to `Never` if not provided",
"oneOf": [
Expand Down Expand Up @@ -1120,18 +1206,228 @@
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"module"
],
"properties": {
"module": {
"type": "object",
"required": [
"id"
],
"properties": {
"id": {
"$ref": "#/definitions/Uint64"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"module_ids"
],
"properties": {
"module_ids": {
"type": "object",
"additionalProperties": false
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"andr_hook"
],
"properties": {
"andr_hook": {
"$ref": "#/definitions/AndromedaHook"
}
},
"additionalProperties": false
}
],
"definitions": {
"AndrAddr": {
"description": "An address that can be used within the Andromeda ecosystem. Inspired by the cosmwasm-std `Addr` type. https://github.com/CosmWasm/cosmwasm/blob/2a1c698520a1aacedfe3f4803b0d7d653892217a/packages/std/src/addresses.rs#L33\n\nThis address can be one of two things: 1. A valid human readable address e.g. `cosmos1...` 2. A valid Andromeda VFS path e.g. `/home/user/app/component`\n\nVFS paths can be local in the case of an app and can be done by referencing `./component` they can also contain protocols for cross chain communication. A VFS path is usually structured as so:\n\n`<protocol>://<chain (required if ibc used)>/<path>` or `ibc://cosmoshub-4/user/app/component`",
"type": "string"
},
"AndromedaHook": {
"oneOf": [
{
"type": "object",
"required": [
"on_execute"
],
"properties": {
"on_execute": {
"type": "object",
"required": [
"payload",
"sender"
],
"properties": {
"payload": {
"$ref": "#/definitions/Binary"
},
"sender": {
"type": "string"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"on_funds_transfer"
],
"properties": {
"on_funds_transfer": {
"type": "object",
"required": [
"amount",
"payload",
"sender"
],
"properties": {
"amount": {
"$ref": "#/definitions/Funds"
},
"payload": {
"$ref": "#/definitions/Binary"
},
"sender": {
"type": "string"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"on_token_transfer"
],
"properties": {
"on_token_transfer": {
"type": "object",
"required": [
"recipient",
"sender",
"token_id"
],
"properties": {
"recipient": {
"type": "string"
},
"sender": {
"type": "string"
},
"token_id": {
"type": "string"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
}
]
},
"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"
},
"Coin": {
"type": "object",
"required": [
"amount",
"denom"
],
"properties": {
"amount": {
"$ref": "#/definitions/Uint128"
},
"denom": {
"type": "string"
}
}
},
"Cw20Coin": {
"type": "object",
"required": [
"address",
"amount"
],
"properties": {
"address": {
"type": "string"
},
"amount": {
"$ref": "#/definitions/Uint128"
}
},
"additionalProperties": false
},
"Funds": {
"oneOf": [
{
"type": "object",
"required": [
"native"
],
"properties": {
"native": {
"$ref": "#/definitions/Coin"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"cw20"
],
"properties": {
"cw20": {
"$ref": "#/definitions/Cw20Coin"
}
},
"additionalProperties": false
}
]
},
"Uint128": {
"description": "A thin wrapper around u128 that is u F583 sing 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"
},
"Uint64": {
"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"
}
}
},
"migrate": null,
"sudo": null,
"responses": {
"andr_hook": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "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"
},
"balance": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "BalanceResponse",
Expand Down Expand Up @@ -1431,6 +1727,45 @@
}
}
},
"module": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Module",
"description": "A struct describing a token module, provided with the instantiation message this struct is used to record the info about the module and how/if it should be instantiated",
"type": "object",
"required": [
"address",
"is_mutable"
],
"properties": {
"address": {
"$ref": "#/definitions/AndrAddr"
},
"is_mutable": {
"type": "boolean"
},
"name": {
"type": [
"string",
"null"
]
}
},
"additionalProperties": false,
"definitions": {
"AndrAddr": {
"description": "An address that can be used within the Andromeda ecosystem. Inspired by the cosmwasm-std `Addr` type. https://github.com/CosmWasm/cosmwasm/blob/2a1c698520a1aacedfe3f4803b0d7d653892217a/packages/std/src/addresses.rs#L33\n\nThis address can be one of two things: 1. A valid human readable address e.g. `cosmos1...` 2. A valid Andromeda VFS path e.g. `/home/user/app/component`\n\nVFS paths can be local in the case of an app and can be done by referencing `./component` they can also contain protocols for cross chain communication. A VFS path is usually structured as so:\n\n`<protocol>://<chain (required if ibc used)>/<path>` or `ibc://cosmoshub-4/user/app/component`",
"type": "string"
}
}
},
"module_ids": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Array_of_String",
"type": "array",
"items": {
"type": "string"
}
},
"operators": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "OperatorsResponse",
Expand Down
Loading
0