Skip to content

Commit 78f7dbe

Browse files
committed
Fix crypto_verify
1 parent 2887a69 commit 78f7dbe

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.circleci/config.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ commands:
99
parameters:
1010
min_version:
1111
type: string
12+
skip_cosmwasm_check:
13+
type: boolean
14+
default: false
1215
steps:
1316
- run:
1417
name: Add wasm32 target
@@ -25,12 +28,16 @@ commands:
2528
- run:
2629
name: Build wasm binary
2730
command: cargo wasm --locked
28-
- run:
29-
name: Run cosmwasm-check (<< parameters.min_version >>)
30-
command: |
31-
cargo install cosmwasm-check@~<< parameters.min_version >> --locked
32-
cosmwasm-check --version
33-
cosmwasm-check target/wasm32-unknown-unknown/release/*.wasm
31+
- when:
32+
condition:
33+
not: << parameters.skip_cosmwasm_check >>
34+
steps:
35+
- run:
36+
name: Run cosmwasm-check (<< parameters.min_version >>)
37+
command: |
38+
cargo install cosmwasm-check@~<< parameters.min_version >> --locked
39+
cosmwasm-check --version
40+
cosmwasm-check target/wasm32-unknown-unknown/release/*.wasm
3441
# Run clippy after wasm build to ensure target/wasm32-unknown-unknown/release/<contract>.wasm exists
3542
- run:
3643
name: Clippy
@@ -511,10 +518,10 @@ jobs:
511518
- restore_cache:
512519
keys:
513520
- cargocache-v2-contract_crypto_verify-rust:1.73-{{ checksum "Cargo.lock" }}
521+
# TODO: Enable this once 2.1 has been released to crates.io
514522
- check_contract:
515-
min_version: "1.4"
516-
- check_contract:
517-
min_version: "2.0"
523+
min_version: "2.1"
524+
skip_cosmwasm_check: true
518525
- save_cache:
519526
paths:
520527
- /usr/local/cargo/registry
@@ -601,8 +608,6 @@ jobs:
601608
- restore_cache:
602609
keys:
603610
- cargocache-v2-contract_ibc_reflect-rust:1.73-{{ checksum "Cargo.lock" }}
604-
- check_contract:
605-
min_version: "1.4"
606611
- check_contract:
607612
min_version: "2.0"
608613
- save_cache:
@@ -721,8 +726,6 @@ jobs:
721726
- restore_cache:
722727
keys:
723728
- cargocache-v2-contract_reflect-rust:1.73-{{ checksum "Cargo.lock" }}
724-
- check_contract:
725-
min_version: "1.4"
726729
- check_contract:
727730
min_version: "2.0"
728731
- save_cache:

contracts/crypto-verify/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
3030

3131
[dependencies]
3232
cosmwasm-schema = { path = "../../packages/schema" }
33-
cosmwasm-std = { path = "../../packages/std", features = ["iterator"] }
33+
cosmwasm-std = { path = "../../packages/std", features = ["cosmwasm_2_1", "iterator"] }
3434
hex = "0.4"
3535
rlp = "0.5"
3636
schemars = "0.8.12"

0 commit comments

Comments
 (0)