legacy, cleaup tasks

settlemint · Mar 21, 2024 · a9fd90c · a9fd90c
1 parent 9458609
commit a9fd90c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -43,9 +43,9 @@
       "problemMatcher": []
     },
     {
-      "label": "deploy",
+      "label": "deploy-btp",
       "type": "shell",
-      "command": "EXTRA_ARGS=\"${input:extra-deployment-verify} ${input:extra-deployment-other}\" make deploy",
+      "command": "EXTRA_ARGS=\"${input:extra-deployment-verify} ${input:extra-deployment-other}\" make deploy-btp",
       "problemMatcher": []
     },
     {
@@ -60,12 +60,6 @@
       "command": "EXTRA_ARGS=\"${input:extra-script-broadcast} ${input:extra-script-other}\" make script",
       "problemMatcher": []
     },
-    {
-      "label": "cast",
-      "type": "shell",
-      "command": "make cast",
-      "problemMatcher": []
-    },
     {
       "label": "subgraph",
       "type": "shell",

diff --git a/Makefile b/Makefile
@@ -27,27 +27,24 @@ deploy-anvil:
 	@forge create ./src/Forwarder.sol:Forwarder --rpc-url anvil --interactive | sed 's/Deployed to:/Deployed Forwarder to:/' | tee deployment-anvil.txt
 	@forge create ./src/GenericTokenMeta.sol:GenericTokenMeta --rpc-url anvil --interactive --constructor-args "GenericTokenMeta" "GTM" "$$(grep "Deployed Forwarder to:" deployment-anvil.txt | awk '{print $$4}')" | sed 's/Deployed to:/Deployed GenericTokenMeta to:/' | tee -a deployment-anvil.txt
 
-deploy:
+deploy-btp:
 	@eval $$(curl -H "x-auth-token: $${BTP_SERVICE_TOKEN}" -s $${BTP_CLUSTER_MANAGER_URL}/ide/foundry/$${BTP_SCS_ID}/env | sed 's/^/export /'); \
-	if [ -z "$${BTP_FROM}" ]; then \
+	args=""; \
+	if [ ! -z "$${BTP_FROM}" ]; then \
+		args="--unlocked --from $${BTP_FROM}"; \
+	else \
 		echo "\033[1;33mWARNING: No keys are activated on the node, falling back to interactive mode...\033[0m"; \
 		echo ""; \
-		if [ -z "$${BTP_GAS_PRICE}" ]; then \
-			forge create ./src/Forwarder.sol:Forwarder $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --interactive | sed 's/Deployed to:/Deployed Forwarder to:/' | tee deployment.txt; \
-			forge create ./src/GenericTokenMeta.sol:GenericTokenMeta $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --interactive --constructor-args "GenericTokenMeta" "GTM" "$$(grep "Deployed Forwarder to:" deployment.txt | awk '{print $$4}')" | sed 's/Deployed to:/Deployed GenericTokenMeta to:/' | tee -a deployment.txt; \
-		else \
-			forge create ./src/Forwarder.sol:Forwarder $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --interactive --gas-price $${BTP_GAS_PRICE} | sed 's/Deployed to:/Deployed Forwarder to:/' | tee deployment.txt; \
-			forge create ./src/GenericTokenMeta.sol:GenericTokenMeta $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --interactive --gas-price $${BTP_GAS_PRICE} --constructor-args "GenericTokenMeta" "GTM" "$$(grep "Deployed Forwarder to:" deployment.txt | awk '{print $$4}')" | sed 's/Deployed to:/Deployed GenericTokenMeta to:/' | tee -a deployment.txt; \
-		fi; \
-	else \
-		if [ -z "$${BTP_GAS_PRICE}" ]; then \
-			forge create ./src/Forwarder.sol:Forwarder $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --unlocked --from $${BTP_FROM} | sed 's/Deployed to:/Deployed Forwarder to:/' | tee deployment.txt; \
-			forge create ./src/GenericTokenMeta.sol:GenericTokenMeta $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --unlocked --from $${BTP_FROM} --constructor-args "GenericTokenMeta" "GTM" "$$(grep "Deployed Forwarder to:" deployment.txt | awk '{print $$4}')" | sed 's/Deployed to:/Deployed GenericTokenMeta to:/' | tee -a deployment.txt; \
-		else \
-			forge create ./src/Forwarder.sol:Forwarder $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --unlocked --from $${BTP_FROM} --gas-price $${BTP_GAS_PRICE} | sed 's/Deployed to:/Deployed Forwarder to:/' | tee deployment.txt; \
-			forge create ./src/GenericTokenMeta.sol:GenericTokenMeta $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} --unlocked --from $${BTP_FROM} --gas-price $${BTP_GAS_PRICE} --constructor-args "GenericTokenMeta" "GTM" "$$(grep "Deployed Forwarder to:" deployment.txt | awk '{print $$4}')" | sed 's/Deployed to:/Deployed GenericTokenMeta to:/' | tee -a deployment.txt; \
-		fi; \
-	fi
+		args="--interactive"; \
+	fi; \
+	if [ ! -z "$${BTP_GAS_PRICE}" ]; then \
+		args="$$args --gas-price $${BTP_GAS_PRICE}"; \
+	fi; \
+	if [ "$${BTP_EIP_1559_ENABLED}" = "false" ]; then \
+		args="$$args --legacy"; \
+	fi; \
+	forge create ./src/Forwarder.sol:Forwarder $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} $$args | sed 's/Deployed to:/Deployed Forwarder to:/' | tee deployment.txt; \
+	forge create ./src/GenericTokenMeta.sol:GenericTokenMeta $${EXTRA_ARGS} --rpc-url $${BTP_RPC_URL} $$args --constructor-args "GenericTokenMeta" "GTM" "$$(grep "Deployed Forwarder to:" deployment.txt | awk '{print $$4}')" | sed 's/Deployed to:/Deployed GenericTokenMeta to:/' | tee -a deployment.txt
 
 cast:
 	@echo "Interacting with EVM via Cast..."

diff --git a/README.md b/README.md
@@ -70,12 +70,16 @@ Deploy to a local anvil node:
 $ make deploy-anvil
 ```
 
+When prompted to enter a private key, copy one of the private keys shown in the terminal when you start the anvil node.
+
 Deploy to the connected platform node:
 
 ```shell
 $ make deploy-btp
 ```
 
+If you have a private key activated on the connected node, it will be used automatically. Else, you will be prompted to enter a private key. You can copy-paste a private key from the platform.
+
 ### Cast
 
 ```shell