Skip to content

Commit

Permalink
Rename per_sdk folder to tilt-scripts (#303)
Browse files Browse the repository at this point in the history
  • Loading branch information
danimhr authored Dec 26, 2024
1 parent 20375fa commit cd1cea0
Show file tree
Hide file tree
Showing 26 changed files with 687 additions and 904 deletions.
2 changes: 1 addition & 1 deletion .github/actions/python-poetry/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ runs:
- uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: ${{ inputs.poetry-version }}
- run: poetry -C per_sdk install
- run: poetry -C tilt-scripts install
shell: sh
2 changes: 1 addition & 1 deletion .github/workflows/push-services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: .
file: ./per_sdk/Dockerfile
file: ./tilt-scripts/Dockerfile
push: true
tags: ${{ steps.meta_monitor.outputs.tags }}
labels: ${{ steps.meta_monitor.outputs.labels }}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ repos:
# For python files
- id: isort
name: isort
entry: poetry -C per_sdk run isort --profile=black per_sdk
entry: poetry -C tilt-scripts run isort --profile=black tilt-scripts
pass_filenames: false
language: system
- id: black
name: black
entry: poetry -C per_sdk run black per_sdk
entry: poetry -C tilt-scripts run black tilt-scripts
pass_filenames: false
language: system
- id: pyflakes
name: pyflakes
entry: poetry -C per_sdk run pyflakes per_sdk
entry: poetry -C tilt-scripts run pyflakes tilt-scripts
pass_filenames: false
language: system
9 changes: 9 additions & 0 deletions 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 @@ -5,6 +5,7 @@ members = [
"auction-server",
"gas-oracle",
"sdk/rust/simple-searcher",
"sdk/rust/testing-searcher",
"sdk/rust",
"vault-simulator",
]
Expand Down
26 changes: 8 additions & 18 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ cmd_button(
)

local_resource(
"create-server-configs", "poetry -C per_sdk run python3 integration.py %s %s" % (rpc_url_anvil, ws_url_anvil), resource_deps=["evm-deploy-contracts","svm-setup-accounts"]
"create-server-configs", "poetry -C tilt-scripts run python3 integration.py %s %s" % (rpc_url_anvil, ws_url_anvil), resource_deps=["evm-deploy-contracts","svm-setup-accounts"]
)

local_resource(
Expand Down Expand Up @@ -145,8 +145,8 @@ local_resource(

monitor_command = (
"source tilt-resources.env; "
+ "poetry -C per_sdk run "
+ "python3 -m per_sdk.protocols.token_vault_monitor "
+ "poetry -C tilt-scripts run "
+ "python3 -m tilt-scripts.protocols.token_vault_monitor "
+ "--chain-id development "
+ "--rpc-url %s " % (rpc_url_anvil)
+ "--vault-contract $TOKEN_VAULT "
Expand All @@ -163,17 +163,7 @@ local_resource(

evm_searcher_command = (
"source tilt-resources.env;"
+ "poetry -C per_sdk run "
+ "python3 -m per_sdk.searcher.simple_searcher "
+ "--private-key $SEARCHER_SK "
+ "--chain-id development "
+ "--chain-id-num $CHAIN_ID_NUM "
+ "--verbose "
+ "--liquidation-server-url http://localhost:9000 "
+ "--adapter-factory-address $ADAPTER_FACTORY "
+ "--adapter-init-bytecode-hash $ADAPTER_BYTECODE_HASH "
+ "--weth-address $WETH "
+ "--permit2-address $PERMIT2 "
+ "cargo run -p testing-searcher "
)
local_resource(
"evm-searcher",
Expand All @@ -195,27 +185,27 @@ local_resource(

local_resource(
"svm-setup-accounts",
"poetry -C per_sdk run python3 -m per_sdk.svm.setup_accounts --rpc-url %s" % rpc_url_solana,
"poetry -C tilt-scripts run python3 -m tilt-scripts.svm.setup_accounts --rpc-url %s" % rpc_url_solana,
resource_deps=["svm-localnet"],
)

# need to run initialize instructions for the programs one time, script skips if already initialized
local_resource(
"svm-initialize-programs",
"poetry -C per_sdk run python3 -m per_sdk.svm.initialize_programs -v --file-private-key-payer keypairs/searcher_py.json --file-private-key-admin keypairs/admin.json --file-private-key-relayer-signer keypairs/relayer_signer.json --express-relay-program PytERJFhAKuNNuaiXkApLfWzwNwSNDACpigT3LwQfou --rpc-url %s" % rpc_url_solana,
"poetry -C tilt-scripts run python3 -m tilt-scripts.svm.initialize_programs -v --file-private-key-payer keypairs/searcher_py.json --file-private-key-admin keypairs/admin.json --file-private-key-relayer-signer keypairs/relayer_signer.json --express-relay-program PytERJFhAKuNNuaiXkApLfWzwNwSNDACpigT3LwQfou --rpc-url %s" % rpc_url_solana,
resource_deps=["svm-setup-accounts"]
)

# craft dummy tx, submits as a bid to auction server or submits relayer-signed tx directly to solana cluster
local_resource(
"svm-submit-bid",
"poetry -C per_sdk run python3 -m per_sdk.svm.dummy_tx -v --file-private-key-searcher keypairs/searcher_py.json --file-private-key-relayer-signer keypairs/relayer_signer.json --bid 100000000 --auction-server-url http://localhost:9000 --express-relay-program PytERJFhAKuNNuaiXkApLfWzwNwSNDACpigT3LwQfou --dummy-program DUmmYXYFZugRn2DS4REc5F9UbQNoxYsHP1VMZ6j5U7kZ --rpc-url %s --use-lookup-table" % rpc_url_solana,
"poetry -C tilt-scripts run python3 -m tilt-scripts.svm.dummy_tx -v --file-private-key-searcher keypairs/searcher_py.json --file-private-key-relayer-signer keypairs/relayer_signer.json --bid 100000000 --auction-server-url http://localhost:9000 --express-relay-program PytERJFhAKuNNuaiXkApLfWzwNwSNDACpigT3LwQfou --dummy-program DUmmYXYFZugRn2DS4REc5F9UbQNoxYsHP1VMZ6j5U7kZ --rpc-url %s --use-lookup-table" % rpc_url_solana,
resource_deps=["svm-initialize-programs", "auction-server"],
)

local_resource(
"svm-limonade",
serve_cmd="pnpm run --prefix scripts/limonade limonade --global-config $(solana-keygen pubkey keypairs/limo_global_config.json) --endpoint http://127.0.0.1:9000 --chain-id development-solana --api-key $(poetry -C per_sdk run python3 create_limo_profile.py) --rpc-endpoint %s" % rpc_url_solana,
serve_cmd="pnpm run --prefix scripts/limonade limonade --global-config $(solana-keygen pubkey keypairs/limo_global_config.json) --endpoint http://127.0.0.1:9000 --chain-id development-solana --api-key $(poetry -C tilt-scripts run python3 create_limo_profile.py) --rpc-endpoint %s" % rpc_url_solana,
resource_deps=["svm-initialize-programs", "auction-server"],
)

Expand Down
10 changes: 0 additions & 10 deletions per_sdk/searcher/README.md

This file was deleted.

130 changes: 0 additions & 130 deletions per_sdk/searcher/searcher_utils.py

This file was deleted.

Loading

0 comments on commit cd1cea0

Please sign in to comment.