@@ -102,37 +102,39 @@ done
102102
103103# FUND OUR NEWLY CREATED ADDRESSES
104104
105- stakeAddr=" $( cat " ${UTXO_DIR} /utxo1.addr" ) "
106- currentBalance=$( getAddressBalance " $stakeAddr " )
107- echo " Funding stake addresses with ${AMOUNT_PER_DELEGATOR} "
108-
109105for NODE_ID in ${SP_NODES_ID} ; do
110106 sourceAddr=" $( cat " ${UTXO_DIR} /utxo${NODE_ID} .addr" ) "
111- currentBalance=$( getAddressBalance " $sourceAddr " )
107+ destAddr=" $( cat ${DELEGATORS_DIR} /payment${NODE_ID} .addr) "
108+ echo " Funding ${destAddr} with ${AMOUNT_PER_DELEGATOR} "
112109
113110 cardano-cli latest transaction build \
114111 --testnet-magic $NETWORK_MAGIC \
115112 --tx-in " $( cardano-cli query utxo --address " $sourceAddr " --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r ' keys[0]' ) " \
116- --tx-out " $( cat ${DELEGATORS_DIR} /payment ${NODE_ID} .addr ) +${AMOUNT_PER_DELEGATOR} " \
117- --change-address " $( cat ${UTXO_DIR} /utxo ${NODE_ID} .addr ) " \
113+ --tx-out " ${destAddr} +${AMOUNT_PER_DELEGATOR} " \
114+ --change-address " $sourceAddr " \
118115 --out-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .raw"
119116
120- cardano-cli latest transaction sign --testnet-magic $NETWORK_MAGIC \
121- --tx-body-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .raw" \
122- --signing-key-file " ${UTXO_DIR} /utxo${NODE_ID} .skey" \
123- --out-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .signed"
117+ cardano-cli latest transaction sign --testnet-magic $NETWORK_MAGIC \
118+ --tx-body-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .raw" \
119+ --signing-key-file " ${UTXO_DIR} /utxo${NODE_ID} .skey" \
120+ --out-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .signed"
121+
122+ cardano-cli latest transaction submit \
123+ --testnet-magic $NETWORK_MAGIC \
124+ --tx-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .signed"
124125
125- cardano-cli latest transaction submit \
126- --testnet-magic $NETWORK_MAGIC \
127- --tx-file " ${TRANSACTIONS_DIR} /tx${NODE_ID} .signed"
126+ done
128127
129- updatedBalance=$( getAddressBalance " $sourceAddr " )
128+ # Wait for funds to reach destAddr
129+ for NODE_ID in ${SP_NODES_ID} ; do
130+ destAddr=" $( cat ${DELEGATORS_DIR} /payment${NODE_ID} .addr) "
130131
131- while [ " $currentBalance " -eq " $updatedBalance " ]; do
132- echo " ==== Waiting for funding ==="
133- updatedBalance=$( getAddressBalance " $sourceAddr " )
134- sleep 1
135- done
132+ currentBalance=0
133+ while [ " $currentBalance " -lt " $AMOUNT_PER_DELEGATOR " ]; do
134+ echo " ==== Waiting for funding ${currentBalance} < $AMOUNT_PER_DELEGATOR ==="
135+ currentBalance=$( getAddressBalance " $destAddr " )
136+ sleep 10
137+ done
136138done
137139
138140sleep 10
@@ -143,24 +145,27 @@ cardano-cli query utxo --whole-utxo --testnet-magic $NETWORK_MAGIC
143145
144146# REGISTER STAKE ADDRESSES
145147
146- echo " Registering $( cat " ${DELEGATORS_DIR} /payment${NODE_ID} .addr" ) "
147148
148149keyDeposit=2000000
149150stakeAddr=" $( cat " ${DELEGATORS_DIR} /payment1.addr" ) "
150151currentBalance=$( getAddressBalance " $stakeAddr " )
151152
152153for NODE_ID in ${SP_NODES_ID} ; do
154+ stakeAddr=$( cat " ${DELEGATORS_DIR} /payment${NODE_ID} .addr" )
155+ echo " Registering $stakeAddr "
156+
153157 cardano-cli latest stake-address registration-certificate \
154158 --stake-verification-key-file " ${DELEGATORS_DIR} /staking${NODE_ID} .vkey" \
155159 --key-reg-deposit-amt ${keyDeposit} \
156160 --out-file " ${TRANSACTIONS_DIR} /staking${NODE_ID} reg.cert"
157161
158162 # Wait for utxo to become available
159- txIn=" $( cardano-cli latest query utxo --address " $( cat " ${DELEGATORS_DIR} /payment ${NODE_ID} .addr " ) " --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r ' keys[0] ' ) " ;
163+ txIn=" null " ;
160164 while [ " $txIn " == " null" ]; do
161- echo " TxIN is null, retrying..."
162- txIn=" $( cardano-cli latest query utxo --address " $( cat " ${DELEGATORS_DIR} /payment${NODE_ID} .addr" ) " --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout | jq -r ' keys[0]' ) " ;
163- sleep 1
165+ echo " UTxO not found for ${stakeAddr} , retrying..."
166+ txInJson=" $( cardano-cli latest query utxo --address " $stakeAddr " --testnet-magic $NETWORK_MAGIC --out-file /dev/stdout) " ;
167+ txIn=$( jq -r ' keys[0]' <<< " $txInJson" ) ;
168+ sleep 10
164169 done
165170
166171 cardano-cli latest transaction build \
0 commit comments