Skip to content

Commit

Permalink
Merge pull request #6 from anoma/fraccaman/cleanup
Browse files Browse the repository at this point in the history
Upgrade to 0.38.1
  • Loading branch information
Fraccaman authored Jun 7, 2024
2 parents e6a7d41 + bb83a25 commit 7e9ee26
Show file tree
Hide file tree
Showing 31 changed files with 115 additions and 129 deletions.
221 changes: 103 additions & 118 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ license = "GPL-3.0"
version = "0.1.0"

[workspace.dependencies]
namada_tx_prelude = { git = "https://github.com/anoma/namada", branch = "fraccaman/multitoken-allow-governance-changes" }
namada_proof_of_stake = { git = "https://github.com/anoma/namada", branch = "fraccaman/multitoken-allow-governance-changes" }
namada_core = { git = "https://github.com/anoma/namada", branch = "fraccaman/multitoken-allow-governance-changes" }
wee_alloc = "0.4.5"
namada_tx_prelude = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
namada_proof_of_stake = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
namada_core = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
rlsf = "0.2.1"
getrandom = { version = "0.2", features = ["custom"] }
lazy_static = "1.4.0"

Expand Down
7 changes: 4 additions & 3 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
VERSION --global-cache 0.7
VERSION --global-cache 0.8

IMPORT github.com/earthly/lib/rust AS rust

install:
FROM rust:1.78.0-bookworm
RUN apt-get update && apt-get install -y protobuf-compiler build-essential clang-tools-14

RUN rustup component add clippy rustfmt
RUN rustup target add wasm32-unknown-unknown

# Call +INIT before copying the source file to avoid installing function depencies every time source code changes
# This parametrization will be used in future calls to functions of the library
DO rust+INIT --keep_fingerprints=true
RUN apt-get update && apt-get install -y protobuf-compiler build-essential clang-tools-14

source:
FROM +install
COPY --keep-ts Cargo.toml Cargo.lock ./
COPY --keep-ts --chmod 755 docker/run-wasmopt.sh ./run-wasmopt.sh
COPY --keep-ts --chmod 755 docker/download-wasmopt.sh ./download-wasmopt.sh
COPY --keep-ts --dir block_party shielding_party staking_party shielding_reward_party wasms ./
COPY --keep-ts --dir block_party shielding_party staking_party shielding_reward_party ./

# lint runs cargo clippy on the source code
lint:
Expand Down
2 changes: 1 addition & 1 deletion block_party/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version.workspace = true
namada_tx_prelude.workspace = true
namada_core.workspace = true
namada_proof_of_stake.workspace = true
wee_alloc.workspace = true
rlsf.workspace = true
getrandom.workspace = true

[lib]
Expand Down
2 changes: 1 addition & 1 deletion shielding_party/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version.workspace = true

[dependencies]
namada_tx_prelude.workspace = true
wee_alloc.workspace = true
rlsf.workspace = true
getrandom.workspace = true

[lib]
Expand Down
2 changes: 1 addition & 1 deletion shielding_reward_party/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version.workspace = true

[dependencies]
namada_tx_prelude.workspace = true
wee_alloc.workspace = true
rlsf.workspace = true
getrandom.workspace = true

[lib]
Expand Down
2 changes: 1 addition & 1 deletion staking_party/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version.workspace = true

[dependencies]
namada_tx_prelude.workspace = true
wee_alloc.workspace = true
rlsf.workspace = true
getrandom.workspace = true

[lib]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 7e9ee26

Please sign in to comment.