Skip to content

Commit a23735d

Browse files
committed
clean up whitespace in Makefile
1 parent bdd7d60 commit a23735d

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

Makefile

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ gen-originator-account:
4343
} \
4444
}' "${FLOW_JSON}" > flow.json.tmp && mv flow.json.tmp "${FLOW_JSON}" || { echo "Failed to update ${FLOW_JSON} with jq"; exit 1; }; \
4545
jq --arg address "$$address" '.originators += [$$address]' "${ROSETTA_ENV}.json" > env.json.tmp && mv env.json.tmp "${ROSETTA_ENV}.json"; \
46-
echo "$(ACCOUNT_NAME),$$KEYS,0x$$address" >> $(ACCOUNT_KEYS_FILENAME); \
46+
echo "$(ACCOUNT_NAME),$$KEYS,0x$$address" >> $(ACCOUNT_KEYS_FILENAME); \
4747
echo "Updated $(FLOW_JSON), $(ROSETTA_ENV).json and $(ACCOUNT_KEYS_FILENAME)";
4848

4949
.PHONY: fund-accounts
@@ -67,22 +67,22 @@ create-originator-derived-account:
6767
ROOT_ORIGINATOR_PUBLIC_KEY=$$(grep '$(ORIGINATOR_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f2); \
6868
ROOT_ORIGINATOR_PRIVATE_KEY=$$(grep '$(ORIGINATOR_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f4 ); \
6969
ROOT_ORIGINATOR_ADDRESS=$$(grep '$(ORIGINATOR_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f5); \
70-
echo "Originator address: $$ROOT_ORIGINATOR_ADDRESS"; \
71-
TX_HASH=$$(python3 rosetta_handler.py rosetta-create-derived-account $(ROSETTA_HOST_URL) $$ROOT_ORIGINATOR_ADDRESS $$ROOT_ORIGINATOR_PUBLIC_KEY $$ROOT_ORIGINATOR_PRIVATE_KEY $$NEW_ACCOUNT_PUBLIC_ROSETTA_KEY); \
70+
echo "Originator address: $$ROOT_ORIGINATOR_ADDRESS"; \
71+
TX_HASH=$$(python3 rosetta_handler.py rosetta-create-derived-account $(ROSETTA_HOST_URL) $$ROOT_ORIGINATOR_ADDRESS $$ROOT_ORIGINATOR_PUBLIC_KEY $$ROOT_ORIGINATOR_PRIVATE_KEY $$NEW_ACCOUNT_PUBLIC_ROSETTA_KEY); \
7272
ADDRESS=$$(flow transactions get $$TX_HASH -f $(FLOW_JSON) -n $(ROSETTA_ENV) -o json | jq -r '.events[] | select(.type == "flow.AccountCreated") | .values.value.fields[] | select(.name == "address") | .value.value'); \
7373
echo "TX_HASH: $$TX_HASH , ADDRESS: $$ADDRESS"; \
74-
echo "$(NEW_ACCOUNT_NAME),$$NEW_ACCOUNT_PUBLIC_FLOW_KEY,$$NEW_ACCOUNT_PUBLIC_ROSETTA_KEY,$$NEW_ACCOUNT_PRIVATE_KEY,$$ADDRESS" >> $(ACCOUNT_KEYS_FILENAME);
74+
echo "$(NEW_ACCOUNT_NAME),$$NEW_ACCOUNT_PUBLIC_FLOW_KEY,$$NEW_ACCOUNT_PUBLIC_ROSETTA_KEY,$$NEW_ACCOUNT_PRIVATE_KEY,$$ADDRESS" >> $(ACCOUNT_KEYS_FILENAME);
7575

7676
.PHONY: rosetta-transfer-funds
7777
rosetta-transfer-funds:
7878
PAYER_PUBLIC_KEY=$$(grep '$(PAYER_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f2); \
7979
PAYER_PRIVATE_KEY=$$(grep '$(PAYER_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f4 ); \
8080
PAYER_ADDRESS=$$(grep '$(PAYER_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f5); \
81-
echo "Payer address: $$PAYER_ADDRESS"; \
81+
echo "Payer address: $$PAYER_ADDRESS"; \
8282
RECIPIENT_ADDRESS=$$(grep '$(RECIPIENT_NAME)' $(ACCOUNT_KEYS_FILENAME) | cut -d ',' -f5); \
83-
echo "Recipient address: $$RECIPIENT_ADDRESS"; \
84-
TX_HASH=$$(python3 rosetta_handler.py rosetta-transfer-funds $(ROSETTA_HOST_URL) $$PAYER_ADDRESS $$PAYER_PUBLIC_KEY $$PAYER_PRIVATE_KEY $$RECIPIENT_ADDRESS $$AMOUNT); \
85-
echo "Funding sent: $$TX_HASH";
83+
echo "Recipient address: $$RECIPIENT_ADDRESS"; \
84+
TX_HASH=$$(python3 rosetta_handler.py rosetta-transfer-funds $(ROSETTA_HOST_URL) $$PAYER_ADDRESS $$PAYER_PUBLIC_KEY $$PAYER_PRIVATE_KEY $$RECIPIENT_ADDRESS $$AMOUNT); \
85+
echo "Funding sent: $$TX_HASH";
8686

8787
# Use this target to verify that the accounts configured in the Rosetta environment JSON have the specified contracts deployed
8888
.PHONY: verify-configured-contract-addresses
@@ -92,22 +92,22 @@ verify-configured-contract-addresses:
9292
KEY=$$(echo $$contract | cut -d= -f1); \
9393
VALUE=$$(echo $$contract | cut -d= -f2); \
9494
if [ "$$VALUE" = "0000000000000000" ]; then \
95-
continue; \
96-
fi; \
95+
continue; \
96+
fi; \
9797
CONTRACTS_FOUND=$$(flow accounts get $$VALUE -f $(FLOW_JSON) -n $(ROSETTA_ENV) -o json | \
9898
jq -r '.contracts | join(",") '); \
9999
found=false ; \
100100
for contract in $$(echo $$CONTRACTS_FOUND | tr ',' ' '); do \
101-
lowercase_contract_name=$$(echo $$contract | tr '[:upper:]' '[:lower:]'); \
102-
if [ "$$KEY" = "$$lowercase_contract_name" ]; then \
103-
found=true ; \
104-
break; \
105-
fi; \
106-
done; \
107-
if [ "$$found" = "false" ]; then \
108-
echo "Contract $$KEY configured in $(ROSETTA_ENV).json is not deployed to configured address $$VALUE" ;\
101+
lowercase_contract_name=$$(echo $$contract | tr '[:upper:]' '[:lower:]'); \
102+
if [ "$$KEY" = "$$lowercase_contract_name" ]; then \
103+
found=true ; \
104+
break; \
105+
fi; \
106+
done; \
107+
if [ "$$found" = "false" ]; then \
108+
echo "Contract $$KEY configured in $(ROSETTA_ENV).json is not deployed to configured address $$VALUE" ;\
109109
fi; \
110-
done ; \
110+
done ;
111111

112112
.PHONY: build
113113
build: go-test go-build
@@ -139,4 +139,4 @@ test-reset:
139139
test-cleanup: test-reset
140140
rm -f flow.json
141141
rm -f account-keys.csv
142-
rm -rf flow-go
142+
rm -rf flow-go

0 commit comments

Comments
 (0)