Skip to content

Commit 57491d7

Browse files
authored
Merge pull request #902 from CosmWasm/std2
Align all crates to the 2.0.0 framework
2 parents df67017 + 0866d9a commit 57491d7

File tree

29 files changed

+1287
-838
lines changed

29 files changed

+1287
-838
lines changed

.circleci/config.yml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ workflows:
4040
jobs:
4141
contract_cw1_subkeys:
4242
docker:
43-
- image: rust:1.67.0
43+
- image: rust:1.76.0
4444
working_directory: ~/project/contracts/cw1-subkeys
4545
steps:
4646
- checkout:
@@ -50,7 +50,7 @@ jobs:
5050
command: rustc --version; cargo --version; rustup --version
5151
- restore_cache:
5252
keys:
53-
- cargocache-cw1-subkeys-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
53+
- cargocache-cw1-subkeys-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
5454
- run:
5555
name: Unit Tests
5656
environment:
@@ -63,11 +63,11 @@ jobs:
6363
paths:
6464
- /usr/local/cargo/registry
6565
- target
66-
key: cargocache-cw1-subkeys-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
66+
key: cargocache-cw1-subkeys-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
6767

6868
contract_cw1_whitelist:
6969
docker:
70-
- image: rust:1.67.0
70+
- image: rust:1.76.0
7171
working_directory: ~/project/contracts/cw1-whitelist
7272
steps:
7373
- checkout:
@@ -77,7 +77,7 @@ jobs:
7777
command: rustc --version; cargo --version; rustup --version
7878
- restore_cache:
7979
keys:
80-
- cargocache-cw1-whitelist-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
80+
- cargocache-cw1-whitelist-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
8181
- run:
8282
name: Unit Tests
8383
environment:
@@ -90,11 +90,11 @@ jobs:
9090
paths:
9191
- /usr/local/cargo/registry
9292
- target
93-
key: cargocache-cw1-whitelist-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
93+
key: cargocache-cw1-whitelist-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
9494

9595
contract_cw3_fixed_multisig:
9696
docker:
97-
- image: rust:1.67.0
97+
- image: rust:1.76.0
9898
working_directory: ~/project/contracts/cw3-fixed-multisig
9999
steps:
100100
- checkout:
@@ -104,7 +104,7 @@ jobs:
104104
command: rustc --version; cargo --version; rustup --version
105105
- restore_cache:
106106
keys:
107-
- cargocache-cw3-fixed-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
107+
- cargocache-cw3-fixed-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
108108
- run:
109109
name: Unit Tests
110110
environment:
@@ -117,11 +117,11 @@ jobs:
117117
paths:
118118
- /usr/local/cargo/registry
119119
- target
120-
key: cargocache-cw3-fixed-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
120+
key: cargocache-cw3-fixed-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
121121

122122
contract_cw3_flex_multisig:
123123
docker:
124-
- image: rust:1.67.0
124+
- image: rust:1.76.0
125125
working_directory: ~/project/contracts/cw3-flex-multisig
126126
steps:
127127
- checkout:
@@ -131,7 +131,7 @@ jobs:
131131
command: rustc --version; cargo --version; rustup --version
132132
- restore_cache:
133133
keys:
134-
- cargocache-cw3-flex-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
134+
- cargocache-cw3-flex-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
135135
- run:
136136
name: Unit Tests
137137
environment:
@@ -144,11 +144,11 @@ jobs:
144144
paths:
145145
- /usr/local/cargo/registry
146146
- target
147-
key: cargocache-cw3-flex-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
147+
key: cargocache-cw3-flex-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
148148

149149
contract_cw4_group:
150150
docker:
151-
- image: rust:1.67.0
151+
- image: rust:1.76.0
152152
working_directory: ~/project/contracts/cw4-group
153153
steps:
154154
- checkout:
@@ -158,7 +158,7 @@ jobs:
158158
command: rustc --version; cargo --version; rustup --version
159159
- restore_cache:
160160
keys:
161-
- cargocache-cw4-group-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
161+
- cargocache-cw4-group-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
162162
- run:
163163
name: Unit Tests
164164
environment:
@@ -171,11 +171,11 @@ jobs:
171171
paths:
172172
- /usr/local/cargo/registry
173173
- target
174-
key: cargocache-cw4-group-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
174+
key: cargocache-cw4-group-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
175175

176176
contract_cw4_stake:
177177
docker:
178-
- image: rust:1.67.0
178+
- image: rust:1.76.0
179179
working_directory: ~/project/contracts/cw4-stake
180180
steps:
181181
- checkout:
@@ -185,7 +185,7 @@ jobs:
185185
command: rustc --version; cargo --version; rustup --version
186186
- restore_cache:
187187
keys:
188-
- cargocache-cw4-stake-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
188+
- cargocache-cw4-stake-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
189189
- run:
190190
name: Unit Tests
191191
environment:
@@ -198,11 +198,11 @@ jobs:
198198
paths:
199199
- /usr/local/cargo/registry
200200
- target
201-
key: cargocache-cw4-stake-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
201+
key: cargocache-cw4-stake-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
202202

203203
contract_cw20_base:
204204
docker:
205-
- image: rust:1.67.0
205+
- image: rust:1.76.0
206206
working_directory: ~/project/contracts/cw20-base
207207
steps:
208208
- checkout:
@@ -212,7 +212,7 @@ jobs:
212212
command: rustc --version; cargo --version; rustup --version
213213
- restore_cache:
214214
keys:
215-
- cargocache-cw20-base-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
215+
- cargocache-cw20-base-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
216216
- run:
217217
name: Unit Tests
218218
environment:
@@ -225,11 +225,11 @@ jobs:
225225
paths:
226226
- /usr/local/cargo/registry
227227
- target
228-
key: cargocache-cw20-base-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
228+
key: cargocache-cw20-base-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
229229

230230
contract_cw20_ics20:
231231
docker:
232-
- image: rust:1.67.0
232+
- image: rust:1.76.0
233233
working_directory: ~/project/contracts/cw20-ics20
234234
steps:
235235
- checkout:
@@ -239,7 +239,7 @@ jobs:
239239
command: rustc --version; cargo --version; rustup --version
240240
- restore_cache:
241241
keys:
242-
- cargocache-cw20-ics20-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
242+
- cargocache-cw20-ics20-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
243243
- run:
244244
name: Unit Tests
245245
environment:
@@ -252,11 +252,11 @@ jobs:
252252
paths:
253253
- /usr/local/cargo/registry
254254
- target
255-
key: cargocache-cw20-ics20-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
255+
key: cargocache-cw20-ics20-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
256256

257257
package_cw1:
258258
docker:
259-
- image: rust:1.67.0
259+
- image: rust:1.76.0
260260
working_directory: ~/project/packages/cw1
261261
steps:
262262
- checkout:
@@ -266,7 +266,7 @@ jobs:
266266
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
267267
- restore_cache:
268268
keys:
269-
- cargocache-v2-cw1:1.67.0-{{ checksum "~/project/Cargo.lock" }}
269+
- cargocache-v2-cw1:1.76.0-{{ checksum "~/project/Cargo.lock" }}
270270
- run:
271271
name: Build library for native target
272272
command: cargo build --locked
@@ -280,11 +280,11 @@ jobs:
280280
paths:
281281
- /usr/local/cargo/registry
282282
- target
283-
key: cargocache-v2-cw1:1.67.0-{{ checksum "~/project/Cargo.lock" }}
283+
key: cargocache-v2-cw1:1.76.0-{{ checksum "~/project/Cargo.lock" }}
284284

285285
package_cw3:
286286
docker:
287-
- image: rust:1.67.0
287+
- image: rust:1.76.0
288288
working_directory: ~/project/packages/cw3
289289
steps:
290290
- checkout:
@@ -294,7 +294,7 @@ jobs:
294294
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
295295
- restore_cache:
296296
keys:
297-
- cargocache-v2-cw3:1.67.0-{{ checksum "~/project/Cargo.lock" }}
297+
- cargocache-v2-cw3:1.76.0-{{ checksum "~/project/Cargo.lock" }}
298298
- run:
299299
name: Build library for native target
300300
command: cargo build --locked
@@ -308,11 +308,11 @@ jobs:
308308
paths:
309309
- /usr/local/cargo/registry
310310
- target
311-
key: cargocache-v2-cw3:1.67.0-{{ checksum "~/project/Cargo.lock" }}
311+
key: cargocache-v2-cw3:1.76.0-{{ checksum "~/project/Cargo.lock" }}
312312

313313
package_cw4:
314314
docker:
315-
- image: rust:1.67.0
315+
- image: rust:1.76.0
316316
working_directory: ~/project/packages/cw4
317317
steps:
318318
- checkout:
@@ -322,7 +322,7 @@ jobs:
322322
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
323323
- restore_cache:
324324
keys:
325-
- cargocache-v2-cw4:1.67.0-{{ checksum "~/project/Cargo.lock" }}
325+
- cargocache-v2-cw4:1.76.0-{{ checksum "~/project/Cargo.lock" }}
326326
- run:
327327
name: Build library for native target
328328
command: cargo build --locked
@@ -336,11 +336,11 @@ jobs:
336336
paths:
337337
- /usr/local/cargo/registry
338338
- target
339-
key: cargocache-v2-cw4:1.67.0-{{ checksum "~/project/Cargo.lock" }}
339+
key: cargocache-v2-cw4:1.76.0-{{ checksum "~/project/Cargo.lock" }}
340340

341341
package_cw20:
342342
docker:
343-
- image: rust:1.67.0
343+
- image: rust:1.76.0
344344
working_directory: ~/project/packages/cw20
345345
steps:
346346
- checkout:
@@ -350,7 +350,7 @@ jobs:
350350
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
351351
- restore_cache:
352352
keys:
353-
- cargocache-v2-cw20:1.67.0-{{ checksum "~/project/Cargo.lock" }}
353+
- cargocache-v2-cw20:1.76.0-{{ checksum "~/project/Cargo.lock" }}
354354
- run:
355355
name: Build library for native target
356356
command: cargo build --locked
@@ -364,11 +364,11 @@ jobs:
364364
paths:
365365
- /usr/local/cargo/registry
366366
- target
367-
key: cargocache-v2-cw20:1.67.0-{{ checksum "~/project/Cargo.lock" }}
367+
key: cargocache-v2-cw20:1.76.0-{{ checksum "~/project/Cargo.lock" }}
368368

369369
package_cw1155:
370370
docker:
371-
- image: rust:1.67.0
371+
- image: rust:1.76.0
372372
working_directory: ~/project/packages/cw1155
373373
steps:
374374
- checkout:
@@ -378,7 +378,7 @@ jobs:
378378
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
379379
- restore_cache:
380380
keys:
381-
- cargocache-v2-cw1155:1.67.0-{{ checksum "~/project/Cargo.lock" }}
381+
- cargocache-v2-cw1155:1.76.0-{{ checksum "~/project/Cargo.lock" }}
382382
- run:
383383
name: Build library for native target
384384
command: cargo build --locked
@@ -392,19 +392,19 @@ jobs:
392392
paths:
393393
- /usr/local/cargo/registry
394394
- target
395-
key: cargocache-v2-cw1155:1.67.0-{{ checksum "~/project/Cargo.lock" }}
395+
key: cargocache-v2-cw1155:1.76.0-{{ checksum "~/project/Cargo.lock" }}
396396

397397
lint:
398398
docker:
399-
- image: rust:1.67.0
399+
- image: rust:1.76.0
400400
steps:
401401
- checkout
402402
- run:
403403
name: Version information
404404
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
405405
- restore_cache:
406406
keys:
407-
- cargocache-v2-lint-rust:1.67.0-{{ checksum "Cargo.lock" }}
407+
- cargocache-v2-lint-rust:1.76.0-{{ checksum "Cargo.lock" }}
408408
- run:
409409
name: Add rustfmt component
410410
command: rustup component add rustfmt
@@ -423,15 +423,15 @@ jobs:
423423
- target/debug/.fingerprint
424424
- target/debug/build
425425
- target/debug/deps
426-
key: cargocache-v2-lint-rust:1.67.0-{{ checksum "Cargo.lock" }}
426+
key: cargocache-v2-lint-rust:1.76.0-{{ checksum "Cargo.lock" }}
427427

428428
# This runs one time on the top level to ensure all contracts compile properly into wasm.
429429
# We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time
430430
# for all the other tests.
431431
# We also sanity-check the resultant wasm files.
432432
wasm-build:
433433
docker:
434-
- image: rust:1.67.0
434+
- image: rust:1.76.0
435435
steps:
436436
- checkout:
437437
path: ~/project
@@ -440,7 +440,7 @@ jobs:
440440
command: rustc --version; cargo --version; rustup --version
441441
- restore_cache:
442442
keys:
443-
- cargocache-wasm-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
443+
- cargocache-wasm-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
444444
- run:
445445
name: Add wasm32 target
446446
command: rustup target add wasm32-unknown-unknown
@@ -455,12 +455,12 @@ jobs:
455455
- run:
456456
name: Install cosmwasm-check
457457
# Uses --debug for compilation speed
458-
command: cargo install --locked --debug --version 1.4.0 cosmwasm-check
458+
command: cargo install --locked --debug --version 2.0.0-rc.1 cosmwasm-check
459459
- save_cache:
460460
paths:
461461
- /usr/local/cargo/registry
462462
- target
463-
key: cargocache-wasm-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
463+
key: cargocache-wasm-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
464464
- run:
465465
name: Check wasm contracts
466466
command: cosmwasm-check ./target/wasm32-unknown-unknown/release/*.wasm
@@ -528,7 +528,7 @@ jobs:
528528
529529
build_and_upload_schemas:
530530
docker:
531-
- image: rust:1.67.0
531+
- image: rust:1.76.0
532532
working_directory: ~/project
533533
steps:
534534
- checkout:

0 commit comments

Comments
 (0)