Skip to content

Commit

Permalink
Merge pull request #1567 from CosmWasm/burn-cleanup
Browse files Browse the repository at this point in the history
Split payout and storage cleanup in burner contract
  • Loading branch information
webmaster128 authored Mar 14, 2023
2 parents 0321e5c + 7c3cf31 commit 50079b4
Show file tree
Hide file tree
Showing 12 changed files with 194 additions and 276 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ jobs:
name: Build development contracts
command: |
echo "Building all contracts under ./contracts"
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.12.9 ./contracts/*/
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.12.11 ./contracts/*/
- run:
name: Check development contracts
command: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ but the quickstart guide is:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9
cosmwasm/rust-optimizer:0.12.11
```

It will output a highly size-optimized build as `contract.wasm` in `$CODE`. With
Expand Down
20 changes: 10 additions & 10 deletions contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,52 +53,52 @@ reason, use the following commands:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_burner",target=/code/contracts/burner/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/burner
cosmwasm/rust-optimizer:0.12.11 ./contracts/burner

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_crypto_verify",target=/code/contracts/crypto-verify/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/crypto-verify
cosmwasm/rust-optimizer:0.12.11 ./contracts/crypto-verify

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_floaty",target=/code/contracts/floaty/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/floaty
cosmwasm/rust-optimizer:0.12.11 ./contracts/floaty

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/hackatom
cosmwasm/rust-optimizer:0.12.11 ./contracts/hackatom

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_ibc_reflect",target=/code/contracts/ibc-reflect/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/ibc-reflect
cosmwasm/rust-optimizer:0.12.11 ./contracts/ibc-reflect

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_ibc_reflect_send",target=/code/contracts/ibc-reflect-send/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/ibc-reflect-send
cosmwasm/rust-optimizer:0.12.11 ./contracts/ibc-reflect-send

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_queue",target=/code/contracts/queue/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/queue
cosmwasm/rust-optimizer:0.12.11 ./contracts/queue

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_reflect",target=/code/contracts/reflect/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/reflect
cosmwasm/rust-optimizer:0.12.11 ./contracts/reflect

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_staking",target=/code/contracts/staking/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/staking
cosmwasm/rust-optimizer:0.12.11 ./contracts/staking

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_virus",target=/code/contracts/virus/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.9 ./contracts/virus
cosmwasm/rust-optimizer:0.12.11 ./contracts/virus
```

## Entry points
Expand Down
2 changes: 1 addition & 1 deletion contracts/burner/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "burner"
version = "0.0.0"
authors = ["Ethan Frey <[email protected]>"]
authors = ["Ethan Frey <[email protected]>", "Simon Warta <[email protected]>"]
edition = "2021"
publish = false
license = "Apache-2.0"
Expand Down
202 changes: 0 additions & 202 deletions contracts/burner/LICENSE

This file was deleted.

13 changes: 0 additions & 13 deletions contracts/burner/NOTICE

This file was deleted.

1 change: 1 addition & 0 deletions contracts/burner/schema/burner.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
],
"properties": {
"payout": {
"description": "The address we send all remaining balance to",
"type": "string"
}
},
Expand Down
1 change: 1 addition & 0 deletions contracts/burner/schema/raw/migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
],
"properties": {
"payout": {
"description": "The address we send all remaining balance to",
"type": "string"
}
},
Expand Down
Loading

0 comments on commit 50079b4

Please sign in to comment.