fix: update pr

This commit is contained in:
darshankabariya 2025-07-24 20:35:09 +05:30
parent 6f7479e3ab
commit accd5ca2db
No known key found for this signature in database
GPG Key ID: 9A92CCD9899F0D22
2 changed files with 54 additions and 66 deletions

View File

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
if test -f ./keystore/keystore.json; then if test -f ./keystore/keystore.json; then
echo "keystore/keystore.json already exists. Use it instead of creating a new one." echo "keystore/keystore.json already exists. Use it instead of creating a new one."
echo "Exiting" echo "Exiting"
@ -27,20 +26,32 @@ if ! command -v cast >/dev/null 2>&1; then
foundryup foundryup
fi fi
# default: do mint/approve
NEED_MINTING=1
for arg in "$@"; do
case "$arg" in
--no-mint) NEED_MINTING=0 ;;
--mint) NEED_MINTING=1 ;;
esac
done
RLN_CONTRACT_ADDRESS=0xB9cd878C90E49F797B4431fBF4fb333108CB90e6 RLN_CONTRACT_ADDRESS=0xB9cd878C90E49F797B4431fBF4fb333108CB90e6
TOKEN_CONTRACT_ADDRESS=0x185A0015aC462a0aECb81beCc0497b649a64B9ea TOKEN_CONTRACT_ADDRESS=0x185A0015aC462a0aECb81beCc0497b649a64B9ea
TTT_AMOUNT_WEI=5000000000000000000 TTT_AMOUNT_WEI=5000000000000000000
# Mint # Mint
echo "\nMinting test token" if [ "$NEED_MINTING" = "1" ]; then
if ! cast send "$TOKEN_CONTRACT_ADDRESS" "mint(address,uint256)" \ echo "\nMinting test token"
"$ETH_TESTNET_ACCOUNT" "$TTT_AMOUNT_WEI" \ if ! cast send "$TOKEN_CONTRACT_ADDRESS" "mint(address,uint256)" \
--private-key "$ETH_TESTNET_KEY" \ "$ETH_TESTNET_ACCOUNT" "$TTT_AMOUNT_WEI" \
--rpc-url "$RLN_RELAY_ETH_CLIENT_ADDRESS" --private-key "$ETH_TESTNET_KEY" \
then --rpc-url "$RLN_RELAY_ETH_CLIENT_ADDRESS"
echo " Mint transaction failed." then
exit 1 echo " Mint transaction failed."
fi exit 1
fi
fi
# Approve # Approve
echo "\nApprove to spend the test tokens" echo "\nApprove to spend the test tokens"

View File

@ -9,36 +9,36 @@ echocol()
RLN_CONTRACT_ADDRESS=0xB9cd878C90E49F797B4431fBF4fb333108CB90e6 RLN_CONTRACT_ADDRESS=0xB9cd878C90E49F797B4431fBF4fb333108CB90e6
TOKEN_CONTRACT_ADDRESS=0x185A0015aC462a0aECb81beCc0497b649a64B9ea TOKEN_CONTRACT_ADDRESS=0x185A0015aC462a0aECb81beCc0497b649a64B9ea
REQUIRED_AMOUNT=5 # REQUIRED_AMOUNT=5
TTT_AMOUNT_WEI=5000000000000000000 # TTT_AMOUNT_WEI=5000000000000000000
mint_tokens() { # mint_tokens() {
echocol "" # echocol ""
echocol "Minting TTT tokens ..." # echocol "Minting TTT tokens ..."
cast send $TOKEN_CONTRACT_ADDRESS "mint(address,uint256)" \ # cast send $TOKEN_CONTRACT_ADDRESS "mint(address,uint256)" \
$ETH_TESTNET_ACCOUNT $TTT_AMOUNT_WEI \ # $ETH_TESTNET_ACCOUNT $TTT_AMOUNT_WEI \
--private-key $ETH_TESTNET_KEY \ # --private-key $ETH_TESTNET_KEY \
--rpc-url $RLN_RELAY_ETH_CLIENT_ADDRESS || { # --rpc-url $RLN_RELAY_ETH_CLIENT_ADDRESS || {
echocol "❌ Mint transaction failed." # echocol "❌ Mint transaction failed."
exit 1 # exit 1
} # }
echocol "✅ Mint complete!" # echocol "✅ Mint complete!"
echocol "" # echocol ""
} # }
approve_tokens() { # approve_tokens() {
echocol "" # echocol ""
echocol "Approving RLN contract to spend your TTT tokens ..." # echocol "Approving RLN contract to spend your TTT tokens ..."
cast send $TOKEN_CONTRACT_ADDRESS "approve(address,uint256)" \ # cast send $TOKEN_CONTRACT_ADDRESS "approve(address,uint256)" \
$RLN_CONTRACT_ADDRESS $TTT_AMOUNT_WEI \ # $RLN_CONTRACT_ADDRESS $TTT_AMOUNT_WEI \
--private-key $ETH_TESTNET_KEY \ # --private-key $ETH_TESTNET_KEY \
--rpc-url $RLN_RELAY_ETH_CLIENT_ADDRESS || { # --rpc-url $RLN_RELAY_ETH_CLIENT_ADDRESS || {
echocol "❌ Approve transaction failed." # echocol "❌ Approve transaction failed."
exit 1 # exit 1
} # }
echocol "✅ Approval complete!" # echocol "✅ Approval complete!"
echocol "" # echocol ""
} # }
check_eth_balance() { check_eth_balance() {
# 0.01 ETH in wei # 0.01 ETH in wei
@ -195,39 +195,16 @@ echocol "Your current TTT token balance is: $USER_BALANCE"
echocol "Required amount: $REQUIRED_AMOUNT" echocol "Required amount: $REQUIRED_AMOUNT"
echocol "" echocol ""
MINT_CHOICE="y"
if [ "$USER_BALANCE" -ge "$REQUIRED_AMOUNT" ]; then if [ "$USER_BALANCE" -ge "$REQUIRED_AMOUNT" ]; then
echocol "You already have enough TTT tokens to register." echocol "You already have enough TTT tokens to register."
read -p "Do you want to mint more tokens? (y/N): " MINT_CHOICE read -p "Do you want to mint more tokens? (y/N): " MINT_CHOICE
if [ "$MINT_CHOICE" = "y" ] || [ "$MINT_CHOICE" = "Y" ]; then
mint_tokens
approve_tokens
else
approve_tokens
fi
else
echocol "Minting and approving required TTT tokens …"
mint_tokens
approve_tokens
fi fi
echocol "🔐 Registering RLN membership..." if [ "$MINT_CHOICE" = "y" ] || [ "$MINT_CHOICE" = "Y" ]; then
read -p "Press ENTER to continue..." foo ./register_rln.sh --no-mint;
else
if ! docker run --rm \ ./register_rln.sh --mint;
-v "$(pwd)/keystore:/keystore":Z \
wakuorg/nwaku:v0.36.0 \
generateRlnKeystore \
--rln-relay-eth-client-address="${RLN_RELAY_ETH_CLIENT_ADDRESS}" \
--rln-relay-eth-private-key="${ETH_TESTNET_KEY}" \
--rln-relay-eth-contract-address="${RLN_RELAY_CONTRACT_ADDRESS}" \
--rln-relay-cred-path=/keystore/keystore.json \
--rln-relay-cred-password="${RLN_RELAY_CRED_PASSWORD}" \
--rln-relay-user-message-limit=100 \
--execute; then
echocol ""
echocol "❌ RLN registration failed (likely gas / RPC issue)."
echocol ""
exit 1
fi fi
echocol "" echocol ""