Skip to content

Commit 5607c34

Browse files
authored
Add submit_bid instruction existance check for svm bid (#129)
1 parent 63e4013 commit 5607c34

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1595
-482
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"rust-analyzer.linkedProjects": [
33
"./auction-server/Cargo.toml",
44
"./gas-oracle/Cargo.toml",
5-
"./vault-simulator/Cargo.toml"
5+
"./vault-simulator/Cargo.toml",
6+
"./express_relay/programs/express_relay/Cargo.toml"
67
]
78
}

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN rustup default nightly-2024-04-10
1616
RUN curl -L https://foundry.paradigm.xyz | bash
1717
ENV PATH="${PATH}:/root/.foundry/bin/"
1818
RUN foundryup
19+
RUN cargo install --git https://github.com/coral-xyz/anchor --tag v0.30.1 anchor-cli --locked
1920

2021
# Add solidity dependencies
2122
WORKDIR /src
@@ -28,6 +29,12 @@ RUN forge install OpenZeppelin/openzeppelin-contracts-upgradeable@v4.9.6 --no-gi
2829
RUN forge install Uniswap/permit2@0x000000000022D473030F116dDEE9F6B43aC78BA3 --no-git --no-commit
2930
RUN forge install nomad-xyz/ExcessivelySafeCall@be417ab0c26233578b8d8f3a37b87bd1fcb4e286 --no-git --no-commit
3031

32+
# Add solana dependencies
33+
WORKDIR /src
34+
COPY express_relay express_relay
35+
WORKDIR /src/express_relay
36+
RUN anchor build
37+
3138
# Build auction-server
3239
WORKDIR /src
3340
COPY auction-server auction-server

Tiltfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,20 @@ cmd_button(
8080
)
8181

8282
local_resource(
83-
"evm-create-configs", "python3 evm_integration.py %s %s" % (rpc_url_anvil, ws_url_anvil), resource_deps=["evm-deploy-contracts"]
83+
"evm-create-configs", "python3 integration.py %s %s" % (rpc_url_anvil, ws_url_anvil), resource_deps=["evm-deploy-contracts"]
84+
)
85+
86+
local_resource(
87+
"svm-build-programs",
88+
"cargo build-sbf && anchor build",
89+
dir="express_relay",
8490
)
8591

8692
local_resource(
8793
"auction-server",
8894
serve_cmd="source ../tilt-resources.env; source ./.env; cargo run -- run --database-url $DATABASE_URL --subwallet-private-key $RELAYER_PRIVATE_KEY --secret-key $SECRET_KEY",
8995
serve_dir="auction-server",
90-
resource_deps=["evm-create-configs"],
96+
resource_deps=["evm-create-configs", "svm-build-programs"],
9197
readiness_probe=probe(period_secs=5, http_get=http_get_action(port=9000)),
9298
)
9399

@@ -129,14 +135,6 @@ local_resource(
129135
resource_deps=["evm-deploy-contracts", "auction-server", "evm-create-configs"],
130136
)
131137

132-
133-
# svm resources
134-
local_resource(
135-
"svm-build-programs",
136-
"cargo build-sbf",
137-
dir="express_relay",
138-
)
139-
140138
local_resource(
141139
"svm-localnet",
142140
serve_cmd="solana-test-validator $(./test-validator-params.sh)",
@@ -152,7 +150,7 @@ local_resource(
152150
local_resource(
153151
"svm-setup-accounts",
154152
"poetry -C per_sdk run python3 -m per_sdk.svm.setup_accounts --rpc-url %s" % rpc_url_solana,
155-
resource_deps=["svm-localnet"]
153+
resource_deps=["svm-localnet"],
156154
)
157155

158156
# need to run initialize instructions for the programs one time, script skips if already initialized

0 commit comments

Comments
 (0)