Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add submit bid instruction #318

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Add submit bid instruction #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ebee41
Add submit bid instruction
danimhr Jan 9, 2025
976f139
Fix lint
danimhr Jan 9, 2025
7c6678e
Add create_swap_instruction for svm program
danimhr Jan 9, 2025
0b9631f
Add swap instruction to express relay rust sdk
danimhr Jan 13, 2025
6f7077b
Add more funs
danimhr Jan 13, 2025
238a0d1
Add more to swap
danimhr Jan 14, 2025
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
206 changes: 206 additions & 0 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ url = "2.5.4"
rand = "0.8.5"
anchor-lang = { version = "0.30.1" }
litesvm = { version = "0.3.0" }
borsh = "1.5.1"

# The curve25519-dalek crate is a dependency of solana-sdk.
# This crate relies on a specific version of zeroize that is incompatible with many other packages.
Expand Down
26 changes: 16 additions & 10 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,16 @@ local_resource(
&& spl-token create-account -u localhost keypairs/mint_sell.json --fee-payer keypairs/admin.json --owner keypairs/searcher_js.json \
&& spl-token create-account -u localhost keypairs/mint_buy.json --fee-payer keypairs/admin.json --owner keypairs/searcher_py.json \
&& spl-token create-account -u localhost keypairs/mint_sell.json --fee-payer keypairs/admin.json --owner keypairs/searcher_py.json \
&& spl-token create-account -u localhost keypairs/mint_buy.json --fee-payer keypairs/admin.json --owner keypairs/searcher_rust.json \
&& spl-token create-account -u localhost keypairs/mint_sell.json --fee-payer keypairs/admin.json --owner keypairs/searcher_rust.json \
&& spl-token create-account -u localhost keypairs/mint_buy.json --fee-payer keypairs/admin.json --owner keypairs/admin.json \
&& spl-token create-account -u localhost keypairs/mint_sell.json --fee-payer keypairs/admin.json --owner keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_buy.json 1000000000 --recipient-owner keypairs/searcher_js.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_sell.json 1000000000 --recipient-owner keypairs/searcher_js.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_buy.json 1000000000 --recipient-owner keypairs/searcher_py.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_sell.json 1000000000 --recipient-owner keypairs/searcher_py.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_buy.json 1000000000 --recipient-owner keypairs/searcher_rust.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_sell.json 1000000000 --recipient-owner keypairs/searcher_rust.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_buy.json 1000000000 --recipient-owner keypairs/admin.json --mint-authority keypairs/admin.json \
&& spl-token mint -u localhost keypairs/mint_sell.json 1000000000 --recipient-owner keypairs/admin.json --mint-authority keypairs/admin.json""",
resource_deps=["svm-setup-accounts"]
Expand Down Expand Up @@ -161,16 +165,6 @@ local_resource(
resource_deps=["evm-deploy-contracts", "auction-server", "create-server-configs"],
)

evm_searcher_command = (
"source tilt-resources.env;"
+ "cargo run -p testing-searcher "
)
local_resource(
"evm-searcher",
serve_cmd=evm_searcher_command,
resource_deps=["evm-deploy-contracts", "auction-server", "create-server-configs"],
)

local_resource(
"svm-localnet",
serve_cmd="solana-test-validator $(./test-validator-params.sh)",
Expand Down Expand Up @@ -222,3 +216,15 @@ local_resource(
serve_dir="sdk/js",
resource_deps=["svm-initialize-programs", "auction-server"],
)


rust_searcher_command = (
"source tilt-resources.env;"
+ "export SVM_PRIVATE_KEY_FILE=keypairs/searcher_rust.json;"
+ "cargo run -p testing-searcher"
)
local_resource(
"rust-searcher",
serve_cmd=rust_searcher_command,
resource_deps=["svm-initialize-programs", "evm-deploy-contracts", "auction-server", "create-server-configs"],
)
4 changes: 2 additions & 2 deletions auction-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ bincode = { workspace = true }
serde_with = { workspace = true, features = ["base64"] }
anchor-lang = { workspace = true }
express-relay = { path = "../contracts/svm/programs/express_relay" }
solana-rpc-client ={ workspace = true }
solana-rpc-client = { workspace = true }
solana-transaction-status = { workspace = true }
borsh = "1.5.1"
borsh = { workspace = true }
litesvm = { workspace = true }
express-relay-api-types = { path = "api-types" }
strum.workspace = true
Loading
Loading