Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 196 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ alloy-signer-gcp = { version = "1.0.41", default-features = false }
alloy-signer-ledger = { version = "1.0.41", default-features = false }
alloy-signer-local = { version = "1.0.41", default-features = false }
alloy-signer-trezor = { version = "1.0.41", default-features = false }
alloy-signer-turnkey = { version = "1.0.41", default-features = false }
alloy-transport = { version = "1.0.41", default-features = false }
alloy-transport-http = { version = "1.0.41", default-features = false }
alloy-transport-ipc = { version = "1.0.41", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY . .
RUN git update-index --force-write-index

RUN --mount=type=cache,target=/root/.cargo/registry --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/opt/foundry/target \
source $HOME/.profile && cargo build --release --features anvil/js-tracer,cast/aws-kms,cast/gcp-kms,forge/aws-kms,forge/gcp-kms \
source $HOME/.profile && cargo build --release --features anvil/js-tracer,cast/aws-kms,cast/gcp-kms,cast/turnkey,forge/aws-kms,forge/gcp-kms,forge/turnkey \
&& mkdir out \
&& mv target/release/forge out/forge \
&& mv target/release/cast out/cast \
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ CARGO_TARGET_DIR ?= target
# List of features to use when building. Can be overridden via the environment.
# No jemalloc on Windows
ifeq ($(OS),Windows_NT)
FEATURES ?= aws-kms gcp-kms cli asm-keccak
FEATURES ?= aws-kms gcp-kms turnkey cli asm-keccak
else
FEATURES ?= jemalloc aws-kms gcp-kms cli asm-keccak
FEATURES ?= jemalloc aws-kms gcp-kms turnkey cli asm-keccak
endif

##@ Help
Expand Down Expand Up @@ -47,15 +47,15 @@ build-%:
.PHONY: docker-build-push
docker-build-push: docker-build-prepare ## Build and push a cross-arch Docker image tagged with DOCKER_IMAGE_NAME.
# Build x86_64-unknown-linux-gnu.
cargo build --target x86_64-unknown-linux-gnu --features "jemalloc aws-kms gcp-kms cli asm-keccak js-tracer" --profile "$(PROFILE)"
cargo build --target x86_64-unknown-linux-gnu --features "jemalloc aws-kms gcp-kms turnkey cli asm-keccak js-tracer" --profile "$(PROFILE)"
mkdir -p $(BIN_DIR)/amd64
for bin in anvil cast chisel forge; do \
cp $(CARGO_TARGET_DIR)/x86_64-unknown-linux-gnu/$(PROFILE)/$$bin $(BIN_DIR)/amd64/; \
done

# Build aarch64-unknown-linux-gnu.
rustup target add aarch64-unknown-linux-gnu
RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build --target aarch64-unknown-linux-gnu --features "aws-kms gcp-kms cli asm-keccak js-tracer" --profile "$(PROFILE)"
RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build --target aarch64-unknown-linux-gnu --features "aws-kms gcp-kms turnkey cli asm-keccak js-tracer" --profile "$(PROFILE)"
mkdir -p $(BIN_DIR)/arm64
for bin in anvil cast chisel forge; do \
cp $(CARGO_TARGET_DIR)/aarch64-unknown-linux-gnu/$(PROFILE)/$$bin $(BIN_DIR)/arm64/; \
Expand Down
1 change: 1 addition & 0 deletions crates/cast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,5 @@ mimalloc = ["foundry-cli/mimalloc"]
tracy-allocator = ["foundry-cli/tracy-allocator"]
aws-kms = ["foundry-wallets/aws-kms"]
gcp-kms = ["foundry-wallets/gcp-kms"]
turnkey = ["foundry-wallets/turnkey"]
isolate-by-default = ["foundry-config/isolate-by-default"]
7 changes: 4 additions & 3 deletions crates/forge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ forge-script.workspace = true
forge-sol-macro-gen.workspace = true
foundry-cli.workspace = true
foundry-debugger.workspace = true
foundry-wallets = { workspace = true, optional = true }

alloy-chains.workspace = true
alloy-dyn-abi.workspace = true
Expand Down Expand Up @@ -101,7 +102,6 @@ alloy-hardforks.workspace = true
anvil.workspace = true
forge-script-sequence.workspace = true
foundry-test-utils.workspace = true
foundry-wallets.workspace = true
futures.workspace = true
reqwest = { workspace = true, features = ["json"] }

Expand All @@ -120,6 +120,7 @@ asm-keccak = ["alloy-primitives/asm-keccak"]
jemalloc = ["foundry-cli/jemalloc"]
mimalloc = ["foundry-cli/mimalloc"]
tracy-allocator = ["foundry-cli/tracy-allocator"]
aws-kms = ["foundry-wallets/aws-kms"]
gcp-kms = ["foundry-wallets/gcp-kms"]
aws-kms = ["dep:foundry-wallets", "foundry-wallets/aws-kms"]
gcp-kms = ["dep:foundry-wallets", "foundry-wallets/gcp-kms"]
turnkey = ["dep:foundry-wallets", "foundry-wallets/turnkey"]
isolate-by-default = ["foundry-config/isolate-by-default"]
Loading
Loading