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

Merge upstream #3

Merged
merged 4 commits into from
Dec 7, 2024
+40 −33
Merged

Merge upstream #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8aa3073
Fix unsupported import error by fixing cc version
iKapitonau Nov 13, 2024
5d504d1
Bump versions to v0.10.1
iKapitonau Nov 13, 2024
9b15d02
Fix clippy
iKapitonau Nov 13, 2024
b35994c
Merge remote-tracking branch 'remotes/slabs/master' into merge-upstream
blake-regalia Dec 7, 2024
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
22 changes: 11 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "LICENSE"
Expand Down Expand Up @@ -37,16 +37,16 @@ viewing-key = ["secret-toolkit-viewing-key"]
notification = ["secret-toolkit-notification"]

[dependencies]
secret-toolkit-crypto = { version = "0.10.0", path = "packages/crypto", optional = true }
secret-toolkit-incubator = { version = "0.10.0", path = "packages/incubator", optional = true }
secret-toolkit-permit = { version = "0.10.0", path = "packages/permit", optional = true }
secret-toolkit-serialization = { version = "0.10.0", path = "packages/serialization", optional = true }
secret-toolkit-snip20 = { version = "0.10.0", path = "packages/snip20", optional = true }
secret-toolkit-snip721 = { version = "0.10.0", path = "packages/snip721", optional = true }
secret-toolkit-storage = { version = "0.10.0", path = "packages/storage", optional = true }
secret-toolkit-utils = { version = "0.10.0", path = "packages/utils", optional = true }
secret-toolkit-viewing-key = { version = "0.10.0", path = "packages/viewing_key", optional = true }
secret-toolkit-notification = { version = "0.10.0", path = "packages/notification", optional = true }
secret-toolkit-crypto = { version = "0.10.1", path = "packages/crypto", optional = true }
secret-toolkit-incubator = { version = "0.10.1", path = "packages/incubator", optional = true }
secret-toolkit-permit = { version = "0.10.1", path = "packages/permit", optional = true }
secret-toolkit-serialization = { version = "0.10.1", path = "packages/serialization", optional = true }
secret-toolkit-snip20 = { version = "0.10.1", path = "packages/snip20", optional = true }
secret-toolkit-snip721 = { version = "0.10.1", path = "packages/snip721", optional = true }
secret-toolkit-storage = { version = "0.10.1", path = "packages/storage", optional = true }
secret-toolkit-utils = { version = "0.10.1", path = "packages/utils", optional = true }
secret-toolkit-viewing-key = { version = "0.10.1", path = "packages/viewing_key", optional = true }
secret-toolkit-notification = { version = "0.10.1", path = "packages/notification", optional = true }

[workspace]
members = ["packages/*"]
Expand Down
6 changes: 6 additions & 0 deletions Releases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

## v0.10.1

### Bug fixes

- Fixed `Wasm contract requires unsupported import: "env.rustsecp256k1_v0_8_1_context_preallocated_size` error by freezing `cc` version to `1.1.10`.

## v0.10.0

### Features
Expand Down
3 changes: 2 additions & 1 deletion packages/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-crypto"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand Down Expand Up @@ -29,6 +29,7 @@ secp256k1 = { version = "0.27.0", default-features = false, features = [
], optional = true }
hkdf = "0.12.3"
cosmwasm-std = { workspace = true }
cc = { version = "=1.1.10" }

[dev-dependencies]
secp256k1 = { version = "0.27.0", default-features = false, features = [
Expand Down
4 changes: 2 additions & 2 deletions packages/crypto/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Add the following to your `cargo.toml` file:

```toml
[dependencies]
secret-toolkit = { version = "0.10.0", features = ["crypto"] }
secret-toolkit-crypto = { version = "0.10.0", features = ["hash", "rand", "ecc-secp256k1"] }
secret-toolkit = { version = "0.10.1", features = ["crypto"] }
secret-toolkit-crypto = { version = "0.10.1", features = ["hash", "rand", "ecc-secp256k1"] }
```

## Example usage
Expand Down
4 changes: 2 additions & 2 deletions packages/incubator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-incubator"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand All @@ -16,7 +16,7 @@ all-features = true
[dependencies]
serde = { workspace = true, optional = true }
cosmwasm-std = { workspace = true, optional = true }
secret-toolkit-serialization = { version = "0.10.0", path = "../serialization", optional = true }
secret-toolkit-serialization = { version = "0.10.1", path = "../serialization", optional = true }

[features]
generational-store = ["secret-toolkit-serialization", "serde", "cosmwasm-std"]
Expand Down
4 changes: 2 additions & 2 deletions packages/permit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-permit"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand All @@ -20,6 +20,6 @@ ripemd = { version = "0.1.3", default-features = false }
schemars = { workspace = true }
bech32 = "0.9.1"
remain = "0.2.8"
secret-toolkit-crypto = { version = "0.10.0", path = "../crypto", features = [
secret-toolkit-crypto = { version = "0.10.1", path = "../crypto", features = [
"hash",
] }
2 changes: 1 addition & 1 deletion packages/serialization/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-serialization"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand Down
4 changes: 2 additions & 2 deletions packages/snip20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-snip20"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand All @@ -17,4 +17,4 @@ all-features = true
serde = { workspace = true }
schemars = { workspace = true }
cosmwasm-std = { workspace = true }
secret-toolkit-utils = { version = "0.10.0", path = "../utils" }
secret-toolkit-utils = { version = "0.10.1", path = "../utils" }
4 changes: 2 additions & 2 deletions packages/snip721/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-snip721"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand All @@ -17,4 +17,4 @@ all-features = true
serde = { workspace = true }
schemars = { workspace = true }
cosmwasm-std = { workspace = true }
secret-toolkit-utils = { version = "0.10.0", path = "../utils" }
secret-toolkit-utils = { version = "0.10.1", path = "../utils" }
8 changes: 4 additions & 4 deletions packages/snip721/src/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ pub struct NumTokens {
/// response for [`AllTokens`](QueryMsg::AllTokens) and [`Tokens`](QueryMsg::Tokens)
///
/// * AllTokens:
/// display an optionally paginated list of all the tokens controlled by the contract.
/// The token supply must either be public, or the querier must be authorized to view
/// display an optionally paginated list of all the tokens controlled by the contract.
/// The token supply must either be public, or the querier must be authorized to view
/// * Tokens:
/// displays a list of all the tokens belonging to the input owner in which the viewer
/// has view_owner permission
/// displays a list of all the tokens belonging to the input owner in which the viewer
/// has view_owner permission
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
pub struct TokenList {
/// list of token IDs
Expand Down
4 changes: 2 additions & 2 deletions packages/storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-storage"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand All @@ -17,4 +17,4 @@ all-features = true
serde = { workspace = true }
cosmwasm-std = { workspace = true }
cosmwasm-storage = { workspace = true }
secret-toolkit-serialization = { version = "0.10.0", path = "../serialization" }
secret-toolkit-serialization = { version = "0.10.1", path = "../serialization" }
2 changes: 1 addition & 1 deletion packages/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-utils"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand Down
6 changes: 3 additions & 3 deletions packages/viewing_key/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secret-toolkit-viewing-key"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["SCRT Labs <[email protected]>"]
license-file = "../../LICENSE"
Expand All @@ -20,8 +20,8 @@ base64 = "0.21.0"
subtle = { version = "2.2.3", default-features = false }
cosmwasm-std = { workspace = true }
cosmwasm-storage = { workspace = true }
secret-toolkit-crypto = { version = "0.10.0", path = "../crypto", features = [
secret-toolkit-crypto = { version = "0.10.1", path = "../crypto", features = [
"hash",
"rand",
] }
secret-toolkit-utils = { version = "0.10.0", path = "../utils" }
secret-toolkit-utils = { version = "0.10.1", path = "../utils" }