conflict

BibliothecaDAO · Oct 21, 2024 · 08be027 · 08be027
2 parents a43f706 + 20b6995
commit 08be027
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 25 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/indexer.sh b/scripts/indexer.sh
@@ -21,6 +21,9 @@ if [[ "$setConfig" == "true" ]]; then
     echo "----- Building Eternum Season Pass Contract ----- "
     printf "\n\n"
 
+    # source .env file in deployment
+    source ./season_pass/scripts/deployment/.env
+
     # build and deploy season pass contract
     cd season_pass/contracts && scarb --release build
     cd ../scripts/deployment && npm run deploy 

diff --git a/season_pass/scripts/deployment/.gitignore b/season_pass/scripts/deployment/.gitignore
@@ -1 +1,2 @@
-.env
+.env
+addresses/*
diff --git a/season_pass/scripts/deployment/addresses/dev/season_pass.json b/season_pass/scripts/deployment/addresses/dev/season_pass.json
diff --git a/season_pass/scripts/deployment/addresses/dev/test_lords.json b/season_pass/scripts/deployment/addresses/dev/test_lords.json
diff --git a/season_pass/scripts/deployment/addresses/dev/test_realms.json b/season_pass/scripts/deployment/addresses/dev/test_realms.json