Skip to content

Commit

Permalink
Merge pull request #30 from FigureTechnologies/v2.2.0
Browse files Browse the repository at this point in the history
v2.2.0 Production Release
  • Loading branch information
wrouten-figure authored Apr 13, 2023
2 parents fb67359 + 94f7f87 commit acf6002
Show file tree
Hide file tree
Showing 18 changed files with 934 additions and 420 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.61.0-x86_64-unknown-linux-gnu
toolchain: 1.67.0-x86_64-unknown-linux-gnu
default: true
components: clippy, rustfmt
- name: cargo format
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "marketpalace-raise-contract"
version = "2.0.0"
version = "2.2.0"
authors = ["Thomas Silva <[email protected]>"]
edition = "2018"

Expand Down
59 changes: 56 additions & 3 deletions schema/handle_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,33 @@
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"update_required_attestations"
],
"properties": {
"update_required_attestations": {
"type": "object",
"required": [
"required_attestations"
],
"properties": {
"required_attestations": {
"type": "array",
"items": {
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true
}
}
}
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
Expand Down Expand Up @@ -177,6 +204,29 @@
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"update_eligible_subscriptions"
],
"properties": {
"update_eligible_subscriptions": {
"type": "object",
"required": [
"subscriptions"
],
"properties": {
"subscriptions": {
"type": "array",
"items": {
"$ref": "#/definitions/Addr"
}
}
}
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
Expand Down Expand Up @@ -326,12 +376,15 @@
"IssueAssetExchange": {
"type": "object",
"required": [
"exchange",
"exchanges",
"subscription"
],
"properties": {
"exchange": {
"$ref": "#/definitions/AssetExchange"
"exchanges": {
"type": "array",
"items": {
"$ref": "#/definitions/AssetExchange"
}
},
"subscription": {
"$ref": "#/definitions/Addr"
Expand Down
25 changes: 17 additions & 8 deletions schema/instantiate_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,13 @@
"title": "InstantiateMsg",
"type": "object",
"required": [
"acceptable_accreditations",
"capital_denom",
"capital_per_share",
"recovery_admin",
"required_attestations",
"subscription_code_id"
],
"properties": {
"acceptable_accreditations": {
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true
},
"capital_denom": {
"type": "string"
},
Expand All @@ -28,6 +21,22 @@
"recovery_admin": {
"$ref": "#/definitions/Addr"
},
"required_attestations": {
"type": "array",
"items": {
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true
}
},
"required_capital_attribute": {
"type": [
"string",
"null"
]
},
"subscription_code_id": {
"type": "integer",
"format": "uint64",
Expand Down
106 changes: 11 additions & 95 deletions schema/migrate_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,109 +3,25 @@
"title": "MigrateMsg",
"type": "object",
"required": [
"asset_exchanges",
"subscription_code_id"
],
"properties": {
"asset_exchanges": {
"type": "array",
"items": {
"$ref": "#/definitions/IssueAssetExchange"
}
"capital_denom": {
"type": [
"string",
"null"
]
},
"required_capital_attribute": {
"type": [
"string",
"null"
]
},
"subscription_code_id": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
},
"definitions": {
"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"
},
"AssetExchange": {
"type": "object",
"properties": {
"cap": {
"type": [
"integer",
"null"
],
"format": "int64"
},
"com": {
"type": [
"integer",
"null"
],
"format": "int64"
},
"date": {
"anyOf": [
{
"$ref": "#/definitions/ExchangeDate"
},
{
"type": "null"
}
]
},
"inv": {
"type": [
"integer",
"null"
],
"format": "int64"
}
}
},
"ExchangeDate": {
"anyOf": [
{
"type": "object",
"required": [
"due"
],
"properties": {
"due": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"avl"
],
"properties": {
"avl": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
},
"additionalProperties": false
}
]
},
"IssueAssetExchange": {
"type": "object",
"required": [
"exchange",
"subscription"
],
"properties": {
"exchange": {
"$ref": "#/definitions/AssetExchange"
},
"subscription": {
"$ref": "#/definitions/Addr"
}
}
}
}
}
25 changes: 17 additions & 8 deletions schema/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@
"title": "State",
"type": "object",
"required": [
"acceptable_accreditations",
"capital_denom",
"capital_per_share",
"commitment_denom",
"gp",
"investment_denom",
"recovery_admin",
"required_attestations",
"subscription_code_id"
],
"properties": {
"acceptable_accreditations": {
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true
},
"capital_denom": {
"type": "string"
},
Expand All @@ -40,6 +33,22 @@
"recovery_admin": {
"$ref": "#/definitions/Addr"
},
"required_attestations": {
"type": "array",
"items": {
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true
}
},
"required_capital_attribute": {
"type": [
"string",
"null"
]
},
"subscription_code_id": {
"type": "integer",
"format": "uint64",
Expand Down
Loading

0 comments on commit acf6002

Please sign in to comment.