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

refactor: move starknet scripts to their own scripts folder #217

Merged
merged 4 commits into from
Apr 4, 2024
Merged

refactor: move starknet scripts to their own scripts folder #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95b4f76
refactor: move SN/change_pause_state to SN/scripts folder
uri-99 Apr 3, 2024
4a65333
refactor: move SN/upgrades.sh to SN/scripts folder
uri-99 Apr 3, 2024
f004265
refcator: move SN/deploy.sh to SN/scripts/deploy.sh
uri-99 Apr 3, 2024
e0abee6
fix: change_pause_state ande upgrade make targets
uri-99 Apr 3, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:

export STARKNET_RPC=${{vars.STARKNET_RPC}}
source ./contracts/starknet/.env.test
. ./contracts/starknet/deploy.sh
. ./contracts/starknet/scripts/deploy.sh

. ./contracts/ethereum/set_starknet_escrow.sh
. ./contracts/ethereum/set_starknet_claim_payment_selector.sh
Expand Down
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@ starknet-test: starknet-clean
@cd ./contracts/starknet/ && snforge test

starknet-deploy: starknet-build
@. ./contracts/starknet/.env && . ./contracts/starknet/deploy.sh
@. ./contracts/starknet/.env && . ./contracts/starknet/scripts/deploy.sh

starknet-deploy-and-connect: starknet-build
@. ./contracts/ethereum/.env && . ./contracts/starknet/.env && \
. ./contracts/starknet/deploy.sh && \
. ./contracts/starknet/scripts/deploy.sh && \
. ./contracts/ethereum/set_starknet_escrow.sh && \
. ./contracts/ethereum/set_starknet_claim_payment_selector.sh

starknet-upgrade: starknet-build
@. ./contracts/starknet/.env && . ./contracts/starknet/upgrade.sh
@. ./contracts/starknet/.env && . ./contracts/starknet/scripts/upgrade.sh

starknet-pause:
@. ./contracts/starknet/.env && ./contracts/starknet/change_pause_state.sh pause
@. ./contracts/starknet/.env && . ./contracts/starknet/scripts/change_pause_state.sh pause

starknet-unpause:
@. ./contracts/starknet/.env && ./contracts/starknet/change_pause_state.sh unpause
@. ./contracts/starknet/.env && . ./contracts/starknet/scripts/change_pause_state.sh unpause


### ZKSYNC ###
Expand Down Expand Up @@ -132,7 +132,7 @@ ethereum-and-starknet-deploy:
make ethereum-build && \
make starknet-build && \
. ./contracts/ethereum/deploy.sh && \
. ./contracts/starknet/deploy.sh && \
. ./contracts/starknet/scripts/deploy.sh && \
. ./contracts/ethereum/set_starknet_escrow.sh && \
. ./contracts/ethereum/set_starknet_claim_payment_selector.sh && \
. ./contracts/utils/display_info.sh
Expand All @@ -142,7 +142,7 @@ deploy-all:
make ethereum-build && \
. ./contracts/ethereum/deploy.sh && \
make starknet-build && \
. ./contracts/starknet/deploy.sh && \
. ./contracts/starknet/scripts/deploy.sh && \
. ./contracts/ethereum/set_starknet_escrow.sh && \
. ./contracts/ethereum/set_starknet_claim_payment_selector.sh && \
. ./contracts/utils/display_info.sh && \
Expand Down
3 changes: 2 additions & 1 deletion contracts/starknet/change_pause_state.sh → ...ts/starknet/scripts/change_pause_state.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash


if [ -z "$STARKNET_ACCOUNT" ]; then
echo "\n${RED}ERROR:${COLOR_RESET}"
echo "STARKNET_ACCOUNT Variable is empty. Aborting execution.\n"
Expand All @@ -15,7 +16,7 @@ fi
# we avoid adding flags such as --account, --keystore, and --rpc.
export STARKNET_ACCOUNT=$STARKNET_ACCOUNT
export STARKNET_KEYSTORE=$STARKNET_KEYSTORE
# export STARKNET_RPC=$STARKNET_RPC #todo: this must remain commented until we find a reliable and compatible rpc
export STARKNET_RPC=$STARKNET_RPC

if [ -z "$ESCROW_CONTRACT_ADDRESS" ]; then
printf "\n${RED}ERROR:${COLOR_RESET}\n"
Expand Down
0 contracts/starknet/deploy.sh → contracts/starknet/scripts/deploy.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion contracts/starknet/upgrade.sh → contracts/starknet/scripts/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# we avoid adding flags such as --account, --keystore, and --rpc.
export STARKNET_ACCOUNT=$STARKNET_ACCOUNT
export STARKNET_KEYSTORE=$STARKNET_KEYSTORE
# export STARKNET_RPC=$STARKNET_RPC #todo: this must remain commented until we find a reliable and compatible rpc
export STARKNET_RPC=$STARKNET_RPC

if [ -z "$ESCROW_CONTRACT_ADDRESS" ]; then
printf "\n${RED}ERROR:${COLOR_RESET}\n"
Expand Down
Loading