From eccee09a5bc2ec4cc6b40629aa58a9a1d450a513 Mon Sep 17 00:00:00 2001
From: Urix <43704209+uri-99@users.noreply.github.com>
Date: Wed, 10 Apr 2024 19:35:28 -0300
Subject: [PATCH] fix: remove decimals from eth get balance

---
 .../workflows/zksync-scripts/claim_payment.sh | 34 -------------------
 .github/workflows/zksync-scripts/set_order.sh | 28 ---------------
 .github/workflows/zksync-scripts/transfer.sh  | 27 ---------------
 contracts/zksync/test/claim_payment.sh        |  4 +--
 4 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100755 .github/workflows/zksync-scripts/claim_payment.sh
 delete mode 100755 .github/workflows/zksync-scripts/set_order.sh
 delete mode 100755 .github/workflows/zksync-scripts/transfer.sh

diff --git a/.github/workflows/zksync-scripts/claim_payment.sh b/.github/workflows/zksync-scripts/claim_payment.sh
deleted file mode 100755
index 5b953584..00000000
--- a/.github/workflows/zksync-scripts/claim_payment.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. contracts/utils/colors.sh #for ANSI colors
-
-printf "${GREEN}\n=> [ETH] Making Claim Payment${COLOR_RESET}\n"
-
-MM_INITIAL_BALANCE_L1=$(cast balance --rpc-url $ETHEREUM_RPC --ether $MM_ETHEREUM_WALLET_ADDRESS)
-echo "Initial MM balance L1:"
-echo "$MM_INITIAL_BALANCE_L1"
-
-echo "Initial MM balance L2:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$MM_ZKSYNC_WALLET" | grep -E -o "\d+(\.\d+)? ETH"
-
-echo "Initial Escrow balance:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$ZKSYNC_ESCROW_CONTRACT_ADDRESS" | grep -E -o "\d+(\.\d+)? ETH"
-
-
-echo "Withdrawing $BRIDGE_AMOUNT_ETH ETH"
-echo "Withdrawing $BRIDGE_AMOUNT_WEI WEI"
-
-cast send --rpc-url $ETHEREUM_RPC --private-key $ETHEREUM_PRIVATE_KEY \
-  $PAYMENT_REGISTRY_PROXY_ADDRESS "claimPaymentZKSync(uint256, address, uint256, uint256, uint256)" \
-  "0" $USER_ETHEREUM_PUBLIC_ADDRESS $BRIDGE_AMOUNT_WEI 2000000 800 \
-  --value 5000000000000000000
-
-MM_INITIAL_BALANCE_L1=$(cast balance --rpc-url $ETHEREUM_RPC --ether $MM_ETHEREUM_WALLET_ADDRESS)
-echo "After MM balance L1:"
-echo "$MM_INITIAL_BALANCE_L1"
-
-echo "After MM balance L2:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$MM_ZKSYNC_WALLET" | grep -E -o "\d+(\.\d+)? ETH"
-
-echo "After Escrow balance:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$ZKSYNC_ESCROW_CONTRACT_ADDRESS" | grep -E -o "\d+(\.\d+)? ETH"
diff --git a/.github/workflows/zksync-scripts/set_order.sh b/.github/workflows/zksync-scripts/set_order.sh
deleted file mode 100755
index 1c2c5d58..00000000
--- a/.github/workflows/zksync-scripts/set_order.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# cast call 0x97589bcE7727f5D0C8082440681DB6092b6Dda1a "getNames()(string)" --rpc-url http://localhost:8545
-# exit
-
-. contracts/utils/colors.sh #for ANSI colors
-
-FEE=10000000000000000 #in WEI
-VALUE=2 #in ETH
-VALUE_WEI=$(echo "scale=0; $VALUE * 10^18" | bc)
-BRIDGE_AMOUNT_WEI=$(echo "scale=0; $VALUE_WEI - $FEE" | bc)
-BRIDGE_AMOUNT_ETH=$(echo "scale=18; $BRIDGE_AMOUNT_WEI / 10^18" | bc)
-# BRIDGE_AMOUNT_WEI=$(printf "%.0f" "$BRIDGE_AMOUNT_WEI")
-
-
-printf "${GREEN}\n=> [SN] Making Set Order on Escrow${COLOR_RESET}\n"
-echo "\nUser ZKSync funds before setOrder:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$USER_ZKSYNC_PUBLIC_ADDRESS" | grep -E -o "\d+(\.\d+)? ETH"
-echo "\nEscrow ZKSync funds before setOrder:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$ZKSYNC_ESCROW_CONTRACT_ADDRESS" | grep -E -o "\d+(\.\d+)? ETH"
-
-
-npx zksync-cli contract write --private-key $USER_ZKSYNC_PRIVATE_ADDRESS --chain "dockerized-node" --contract "$ZKSYNC_ESCROW_CONTRACT_ADDRESS" --method "set_order(address recipient_address, uint256 fee)" --args "$USER_ETHEREUM_PUBLIC_ADDRESS" "$FEE" --value "$VALUE" >> /dev/null
-
-
-echo "\nUser ZKSync funds after setOrder:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$USER_ZKSYNC_PUBLIC_ADDRESS" | grep -E -o "\d+(\.\d+)? ETH"
-echo "\nEscrow ZKSync funds after setOrder:"
-npx zksync-cli wallet balance --chain "dockerized-node" --address "$ZKSYNC_ESCROW_CONTRACT_ADDRESS" | grep -E -o "\d+(\.\d+)? ETH"
diff --git a/.github/workflows/zksync-scripts/transfer.sh b/.github/workflows/zksync-scripts/transfer.sh
deleted file mode 100755
index 28a38f68..00000000
--- a/.github/workflows/zksync-scripts/transfer.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. contracts/utils/colors.sh #for ANSI colors
-
-# export DESTINATION_ADDRESS=0xceee57f2b700c2f37d1476a7974965e149fce2d4
-# export DESTINATION_ADDRESS_UINT=1181367337507422765615536123397692015769584198356
-
-printf "${GREEN}\n=> [ETH] Making transfer to Destination account${COLOR_RESET}\n"
-
-MM_INITIAL_BALANCE=$(cast balance --rpc-url $ETHEREUM_RPC --ether $MM_ETHEREUM_WALLET_ADDRESS)
-DESTINATION_INITIAL_BALANCE=$(cast balance --rpc-url $ETHEREUM_RPC --ether $USER_ETHEREUM_PUBLIC_ADDRESS)
-echo "Initial MM balance: $MM_INITIAL_BALANCE"
-echo "Initial Destination balance: $DESTINATION_INITIAL_BALANCE"
-
-
-echo "Transferring $BRIDGE_AMOUNT_WEI WEI to $USER_ETHEREUM_PUBLIC_ADDRESS"
-
-cast send --rpc-url $ETHEREUM_RPC --private-key $MM_ETHEREUM_PRIVATE_KEY \
-  $PAYMENT_REGISTRY_PROXY_ADDRESS "transfer(uint256, address, uint128)" \
-  "0" $USER_ETHEREUM_PUBLIC_ADDRESS $ZKSYNC_CHAIN_ID \
-  --value $BRIDGE_AMOUNT_WEI >> /dev/null
-
-
-MM_FINAL_BALANCE=$(cast balance --rpc-url $ETHEREUM_RPC --ether $MM_ETHEREUM_WALLET_ADDRESS)
-DESTINATION_FINAL_BALANCE=$(cast balance --rpc-url $ETHEREUM_RPC --ether $USER_ETHEREUM_PUBLIC_ADDRESS)
-echo "Final MM balance: $MM_FINAL_BALANCE"
-echo "Final Destination balance: $DESTINATION_FINAL_BALANCE"
diff --git a/contracts/zksync/test/claim_payment.sh b/contracts/zksync/test/claim_payment.sh
index 8ba75695..f9432c3d 100755
--- a/contracts/zksync/test/claim_payment.sh
+++ b/contracts/zksync/test/claim_payment.sh
@@ -4,7 +4,7 @@
 
 printf "${GREEN}\n=> [ETH] Making Claim Payment${COLOR_RESET}\n"
 
-export MM_INITIAL_BALANCE_L1=$(cast balance --rpc-url $ETHEREUM_RPC --ether $MM_ETHEREUM_WALLET_ADDRESS)
+MM_INITIAL_BALANCE_L1=$(cast balance --rpc-url $ETHEREUM_RPC $MM_ETHEREUM_WALLET_ADDRESS)
 echo "Initial MM balance L1:"
 echo "$MM_INITIAL_BALANCE_L1"
 
@@ -23,7 +23,7 @@ cast send --rpc-url $ETHEREUM_RPC --private-key $ETHEREUM_PRIVATE_KEY --gas-pric
   "0" $USER_ETHEREUM_PUBLIC_ADDRESS $BRIDGE_AMOUNT_WEI 2000000 800 \
   --value 5000000000000000000
 
-export MM_AFTER_BALANCE_L1=$(cast balance --rpc-url $ETHEREUM_RPC --ether $MM_ETHEREUM_WALLET_ADDRESS)
+MM_AFTER_BALANCE_L1=$(cast balance --rpc-url $ETHEREUM_RPC $MM_ETHEREUM_WALLET_ADDRESS)
 echo "After MM balance L1:"
 echo "$MM_AFTER_BALANCE_L1"