Skip to content

Commit d59540b

Browse files
committed
Merge branch 'main' into aw/analyze-performance
2 parents 8b1f750 + 6b7c60e commit d59540b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+35917
-234
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ workflows:
8484
- main
8585
- /^[0-9]+\.[0-9]+$/
8686
# Add your branch here if benchmarking matters to your work
87-
- add-noop
87+
- secp256r1-support
8888
- coverage
8989
deploy:
9090
jobs:
@@ -108,7 +108,7 @@ workflows:
108108
jobs:
109109
arm64:
110110
machine:
111-
image: ubuntu-2004:202101-01
111+
image: ubuntu-2204:2024.01.1
112112
resource_class: arm.large
113113
steps:
114114
- checkout
@@ -843,7 +843,7 @@ jobs:
843843
command: apt update && apt install -y python3-pip
844844
- run:
845845
name: Install dependencies
846-
command: pip3 install requests bs4
846+
command: pip3 install requests bs4 --break-system-packages
847847
- run:
848848
name: Check dead links
849849
command: devtools/deadlinks.py
@@ -936,7 +936,7 @@ jobs:
936936
- run:
937937
name: Run vm benchmarks (Singlepass)
938938
working_directory: ~/project/packages/vm
939-
command: cargo bench --no-default-features -- --color never --save-baseline singlepass
939+
command: cargo bench -- --color never --save-baseline singlepass
940940
- run:
941941
name: Run crypto benchmarks
942942
working_directory: ~/project/packages/crypto

CHANGELOG.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,21 @@ and this project adheres to
66

77
## [Unreleased]
88

9+
### Added
10+
11+
- cosmwasm-vm: Add `secp256r1_verify` and `secp256r1_recover_pubkey` imports for
12+
ECDSA signature verification over secp256r1. ([#1983])
13+
14+
[#1983]: https://github.com/CosmWasm/cosmwasm/pull/1983
15+
916
### Changed
1017

1118
- cosmwasm-std: Enable `add_event` and `add_events` functions to process types
1219
implementing `Into<Event>` ([#2044])
1320

1421
[#2044]: https://github.com/CosmWasm/cosmwasm/pull/2044
1522

16-
## [2.0.0-rc.1] - 2023-02-09
23+
## [2.0.0] - 2024-03-12
1724

1825
### Fixed
1926

@@ -760,8 +767,8 @@ and this project adheres to
760767
The CHANGELOG for versions before 1.0.0 was moved to
761768
[CHANGELOG-pre1.0.0.md](./CHANGELOG-pre1.0.0.md).
762769

763-
[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/v2.0.0-rc.1...HEAD
764-
[2.0.0-rc.1]: https://github.com/CosmWasm/cosmwasm/compare/v1.5.0...v2.0.0-rc.1
770+
[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/v2.0.0...HEAD
771+
[2.0.0]: https://github.com/CosmWasm/cosmwasm/compare/v1.5.0...v2.0.0
765772
[1.5.0]: https://github.com/CosmWasm/cosmwasm/compare/v1.4.1...v1.5.0
766773
[1.4.1]: https://github.com/CosmWasm/cosmwasm/compare/v1.4.0...v1.4.1
767774
[1.4.0]: https://github.com/CosmWasm/cosmwasm/compare/v1.3.3...v1.4.0

Cargo.lock

Lines changed: 42 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ exclude = ["contracts"]
55
# Resolver has to be set explicitely in workspaces
66
# due to https://github.com/rust-lang/cargo/issues/9956
77
resolver = "2"
8+
9+
[workspace.dependencies]
10+
schemars = "0.8.4"
11+
serde = { version = "1.0.192", default-features = false, features = ["derive", "alloc"] }

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,18 @@ extern "C" {
227227
recovery_param: u32,
228228
) -> u64;
229229

230+
/// Verifies message hashes against a signature with a public key, using the
231+
/// secp256r1 ECDSA parametrization.
232+
/// Returns 0 on verification success, 1 on verification failure, and values
233+
/// greater than 1 in case of error.
234+
fn secp256r1_verify(message_hash_ptr: u32, signature_ptr: u32, public_key_ptr: u32) -> u32;
235+
236+
fn secp256r1_recover_pubkey(
237+
message_hash_ptr: u32,
238+
signature_ptr: u32,
239+
recovery_param: u32,
240+
) -> u64;
241+
230242
/// Verifies a message against a signature with a public key, using the
231243
/// ed25519 EdDSA scheme.
232244
/// Returns 0 on verification success, 1 on verification failure, and values

contracts/burner/Cargo.lock

Lines changed: 41 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contracts/burner/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
3232
[dependencies]
3333
cosmwasm-schema = { path = "../../packages/schema" }
3434
cosmwasm-std = { path = "../../packages/std", features = ["iterator", "cosmwasm_1_4"] }
35-
schemars = "0.8.3"
35+
schemars = "0.8.12"
3636
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3737

3838
[dev-dependencies]

0 commit comments

Comments
 (0)