diff --git a/docs/runbook/era-markers/README.md b/docs/runbook/era-markers/README.md index c123fa453d4..4ab816b8e72 100644 --- a/docs/runbook/era-markers/README.md +++ b/docs/runbook/era-markers/README.md @@ -33,7 +33,7 @@ export SCRIPT_TX_VALUE=**MINIUM_SCRIPT_TX_VALUE** A common value for the transaction amount used when a script transaction is made is: ```bash -export SCRIPT_TX_VALUE=2000000 +export SCRIPT_TX_VALUE=2100000 ``` Compute the network magic parameter that handles both the Cardano mainnet and Cardano test networks: @@ -129,7 +129,10 @@ An example output of the command is: Verify that the payment address has funds: ```bash -$CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +``` + +```bash TxHash TxIx Amount -------------------------------------------------------------------------------------- f0c0345f151f9365fbbb4e7afa217e56b987d9e91fd754ca609d9dfec97275c7 0 10000000000 lovelace + TxOutDatumNone @@ -151,6 +154,9 @@ $CARDANO_CLI $CARDANO_ERA transaction build $CARDANO_NETWORK_MAGIC \ --change-address $(cat $CARDANO_WALLET_PATH/payment.addr) \ --out-file $ASSETS_PATH/tx.raw \ --socket-path $CARDANO_NODE_SOCKET_PATH +``` + +```bash Estimated transaction fee: Lovelace 168669 ``` @@ -171,20 +177,29 @@ $CARDANO_CLI $CARDANO_ERA transaction submit \ $CARDANO_NETWORK_MAGIC \ --tx-file $ASSETS_PATH/tx.signed \ --socket-path $CARDANO_NODE_SOCKET_PATH +``` + +```bash Transaction successfully submitted. ``` Also get the transaction id: ```bash -$CARDANO_CLI transaction txid --tx-file $ASSETS_PATH/tx.signed +$CARDANO_CLI $CARDANO_ERA transaction txid --tx-file $ASSETS_PATH/tx.signed +``` + +```bash 6518b3cea0b49b55746ec61148e7c60ab042959d534f6bb6e8f6a844d4af69fb ``` We need to wait a few seconds before the transaction is available and we can see the initial datum for the script address: ```bash -$CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +``` + +```bash TxHash TxIx Amount -------------------------------------------------------------------------------------- 6518b3cea0b49b55746ec61148e7c60ab042959d534f6bb6e8f6a844d4af69fb 0 1500000 lovelace + TxOutDatumInline ReferenceTxInsScriptsInlineDatumsInBabbageEra (ScriptDataConstructor 0 [ScriptDataBytes "[{\"n\":\"thales\",\"e\":1}]",ScriptDataBytes "\165\143\232\227\&6\244e\222\211\187\167\197\167\175\229\181\162o/\182[|Nnt.h\ACKE\241=\242\139\242\182:a\204r\217\200&\190I\SO,\US\DLE\152\217U\223P5\128\164\232\153\181\ETB8\132\227\SO"]) @@ -196,7 +211,10 @@ Optional: We can retrieve the initial value stored in the datum with the cardano The full utxo json representation: ```bash -$CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH --out-file temp.json && cat temp.json | jq '. [] | select(.inlineDatum | . != null and . != "")' +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH --out-file temp.json && cat temp.json | jq '.[] | select(.inlineDatum | . != null and . != "")' +``` + +```bash { "address": "addr_test1qzzngukkj9ydjemqjlgfn42sevy2xnvauay46weushlpuq9thd4ray00csjssf4sxftv04xeequ3xfx72nujg9y4d5ysgkxxlh", "datum": null, @@ -219,6 +237,28 @@ $CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARD } ``` +The parsed era markers json representation: + +```bash +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH --out-file temp.json && cat temp.json | jq -r '.[] | select(.inlineDatum | . != null and . != "")| .inlineDatum.fields[].bytes' | tr '\n' ' ' | xxd -r -p | jq +``` + +```json +{ + "markers": [ + { + "name": "thales", + "epoch": 1 + }, + { + "name": "pythagoras", + "epoch": null + } + ], + "signature": "a83a8dee3b875a7e8d259500a8ce14cc73587ef838899d269ad58aadd16086cfe0486528e54b841b3a1d5aa8b7176d55c0803337ca59fbd3654b2bdd5a480d05" +} +``` + ## Update Era Markers: Write a new version of datum on chain > [!IMPORTANT] @@ -228,7 +268,10 @@ $CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARD Retrieve the utxo of the payment address: ```bash -$CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +``` + +```bash TxHash TxIx Amount -------------------------------------------------------------------------------------- 6518b3cea0b49b55746ec61148e7c60ab042959d534f6bb6e8f6a844d4af69fb 0 1500000 lovelace + TxOutDatumInline ReferenceTxInsScriptsInlineDatumsInBabbageEra (ScriptDataConstructor 0 [ScriptDataBytes "[{\"n\":\"thales\",\"e\":1}]",ScriptDataBytes "\165\143\232\227\&6\244e\222\211\187\167\197\167\175\229\181\162o/\182[|Nnt.h\ACKE\241=\242\139\242\182:a\204r\217\200&\190I\SO,\US\DLE\152\217U\223P5\128\164\232\153\181\ETB8\132\227\SO"]) @@ -284,14 +327,20 @@ Transaction successfully submitted. Also get the transaction id: ```bash -$CARDANO_CLI transaction txid --tx-file $ASSETS_PATH/tx.signed +$CARDANO_CLI $CARDANO_ERA transaction txid --tx-file $ASSETS_PATH/tx.signed +``` + +```bash 1fd4d3e131afe3c8b212772a3f3083d2fbc6b2a7b20e54e4ff08e001598818d8 ``` We need to wait a few seconds before the transaction is available and we can see the updated datum for the script address: ```bash -$CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH +``` + +```bash TxHash TxIx Amount -------------------------------------------------------------------------------------- 1f139b47017c9c90d4622ac768e249d25d37ad4461db44a20486b7da72a78915 0 2000000 lovelace + TxOutDatumInline ReferenceTxInsScriptsInlineDatumsInBabbageEra (ScriptDataConstructor 0 [ScriptDataBytes "[{\"n\":\"thales\",\"e\":1},{\"n\":\"pythagoras\",\"e\":null}]",ScriptDataBytes "^P\EOT\248k3\196/\139\tU\173H\138\FS\194MD\240\153\227\142z\181\134\213\168\&2\222\219i1\246\NAK\\]\247\154U\143-^vmtq\204\207#\236\213\f\201\&1\152\145(\161\ETX;\183\128\195\r"]) @@ -303,7 +352,10 @@ We can retrieve the updated value stored in the datum with the cardano cli: The full utxo json representation: ```bash -$CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH --out-file temp.json && cat temp.json | jq '. [] | select(.inlineDatum | . != null and . != "")' +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH --out-file temp.json && cat temp.json | jq '.[] | select(.inlineDatum | . != null and . != "")' +``` + +```bash { "address": "addr_test1qzzngukkj9ydjemqjlgfn42sevy2xnvauay46weushlpuq9thd4ray00csjssf4sxftv04xeequ3xfx72nujg9y4d5ysgkxxlh", "datum": null, @@ -325,3 +377,25 @@ $CARDANO_CLI query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARD } } ``` + +The parsed era markers json representation: + +```bash +$CARDANO_CLI $CARDANO_ERA query utxo --address $(cat $CARDANO_WALLET_PATH/payment.addr) $CARDANO_NETWORK_MAGIC --socket-path $CARDANO_NODE_SOCKET_PATH --out-file temp.json && cat temp.json | jq -r '.[] | select(.inlineDatum | . != null and . != "")| .inlineDatum.fields[].bytes' | tr '\n' ' ' | xxd -r -p | jq +``` + +```json +{ + "markers": [ + { + "name": "thales", + "epoch": 1 + }, + { + "name": "pythagoras", + "epoch": 123 + } + ], + "signature": "a83a8dee3b875a7e8d259500a8ce14cc73587ef838899d269ad58aadd16086cfe0486528e54b841b3a1d5aa8b7176d55c0803337ca59fbd3654b2bdd5a480d05" +} +``` diff --git a/mithril-infra/README.md b/mithril-infra/README.md index 1e27b1b058a..7fdff90dd47 100644 --- a/mithril-infra/README.md +++ b/mithril-infra/README.md @@ -154,14 +154,14 @@ In order to retire a stake pool: - Retire a stake poool with `retire-stake-pool.sh` -| Script | Description | Usage | -| --------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `create-keys.sh` | Script for creating keys for a Cardano pool (SPO) | `GENESIS_FILE=**YOUR_GENESIS_FILE** ./tools/pool/create-keys.sh` | -| `query-stake-pool.sh` | Script for querying info about a Cardano pool (SPO) | `./tools/pool/query-stake-pool.sh` | -| `register-stake-address.sh` | Script for registering stake address of a Cardano pool (SPO) | `TX_IN=**YOUR_TX_IN** ./tools/pool/register-stake-address.sh` | -| `register-stake-pool.sh` | Script for registering a Cardano stake pool (SPO) | `GENESIS_FILE=**YOUR_GENESIS_FILE** TX_IN=**YOUR_TX_IN** SIGNER_DOMAIN=**YOUR_SIGNER_DOMAIN_NAME** POOL_TICKER=**YOUR_TICKER** ./tools/pool/register-stake-pool.sh` | -| `renew-opcert.sh` | Script for renewing Operational Certificate for a Cardano pool (SPO) | `./tools/pool/renew-opcert.sh` | -| `retire-stake-pool.sh` | Script for retiring a Cardano pool (SPO) | `TX_IN=**YOUR_TX_IN** VALUE_OUT=**YOUR_VALUE_OUT** ./tools/pool/retire-stake-pool.sh` | +| Script | Description | Usage | +| --------------------------- | -------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `create-keys.sh` | Script for creating keys for a Cardano pool (SPO) | `GENESIS_FILE=**YOUR_SHELLEY_GENESIS_FILE** ./tools/pool/create-keys.sh` | +| `query-stake-pool.sh` | Script for querying info about a Cardano pool (SPO) | `./tools/pool/query-stake-pool.sh` | +| `register-stake-address.sh` | Script for registering stake address of a Cardano pool (SPO) | `TX_IN=**YOUR_TX_IN** ./tools/pool/register-stake-address.sh` | +| `register-stake-pool.sh` | Script for registering a Cardano stake pool (SPO) | `GENESIS_FILE=**YOUR_SHELLEY_GENESIS_FILE** TX_IN=**YOUR_TX_IN** SIGNER_DOMAIN=**YOUR_SIGNER_DOMAIN_NAME** POOL_TICKER=**YOUR_TICKER** ./tools/pool/register-stake-pool.sh` | +| `renew-opcert.sh` | Script for renewing Operational Certificate for a Cardano pool (SPO) | `./tools/pool/renew-opcert.sh` | +| `retire-stake-pool.sh` | Script for retiring a Cardano pool (SPO) | `TX_IN=**YOUR_TX_IN** VALUE_OUT=**YOUR_VALUE_OUT** ./tools/pool/retire-stake-pool.sh` | ### Genesis diff --git a/mithril-infra/assets/infra.version b/mithril-infra/assets/infra.version index c2c0004f0e2..449d7e73a96 100644 --- a/mithril-infra/assets/infra.version +++ b/mithril-infra/assets/infra.version @@ -1 +1 @@ -0.3.5 +0.3.6 diff --git a/mithril-infra/assets/tools/pool/_prelude.sh b/mithril-infra/assets/tools/pool/_prelude.sh index 7e5a422b3c1..43125bd231b 100644 --- a/mithril-infra/assets/tools/pool/_prelude.sh +++ b/mithril-infra/assets/tools/pool/_prelude.sh @@ -35,7 +35,7 @@ CARDANO_CLI_CMD() { # Compute current Cardano era if needed if [ -z "${CARDANO_ERA}" ]; then - CARDANO_ERA=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq -r '.era |= ascii_downcase | .era') + CARDANO_ERA=$(CARDANO_CLI_CMD latest query tip --testnet-magic $NETWORK_MAGIC | jq -r '.era |= ascii_downcase | .era') fi # Compute auxiliary env vars diff --git a/mithril-infra/assets/tools/pool/create-keys.sh b/mithril-infra/assets/tools/pool/create-keys.sh index 0c2a3502509..74aa3a73478 100644 --- a/mithril-infra/assets/tools/pool/create-keys.sh +++ b/mithril-infra/assets/tools/pool/create-keys.sh @@ -13,53 +13,53 @@ fi # Create keys and addresses ## Create payment keypair -CARDANO_CLI_CMD address key-gen \ +CARDANO_CLI_CMD ${CARDANO_ERA} address key-gen \ --verification-key-file ${POOL_ARTIFACTS_DIR}/payment.vkey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/payment.skey ## Create stake keypair -CARDANO_CLI_CMD stake-address key-gen \ +CARDANO_CLI_CMD ${CARDANO_ERA} stake-address key-gen \ --verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/stake.skey ## Create payment address -CARDANO_CLI_CMD address build \ +CARDANO_CLI_CMD ${CARDANO_ERA} address build \ --payment-verification-key-file ${POOL_ARTIFACTS_DIR}/payment.vkey \ --stake-verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ --out-file ${POOL_ARTIFACTS_DIR}/payment.addr \ --testnet-magic $NETWORK_MAGIC ## Create stake address -CARDANO_CLI_CMD stake-address build \ +CARDANO_CLI_CMD ${CARDANO_ERA} stake-address build \ --stake-verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ --out-file ${POOL_ARTIFACTS_DIR}/stake.addr \ --testnet-magic $NETWORK_MAGIC # Generate your stake pool keys ## Generate Cold Keys and a Cold_counter -CARDANO_CLI_CMD node key-gen \ +CARDANO_CLI_CMD ${CARDANO_ERA} node key-gen \ --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey \ --cold-signing-key-file ${POOL_ARTIFACTS_DIR}/cold.skey \ --operational-certificate-issue-counter-file ${POOL_ARTIFACTS_DIR}/opcert.counter ## Generate VRF Key pair -CARDANO_CLI_CMD node key-gen-VRF \ +CARDANO_CLI_CMD ${CARDANO_ERA} node key-gen-VRF \ --verification-key-file ${POOL_ARTIFACTS_DIR}/vrf.vkey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/vrf.skey ## Generate the KES Key pair -CARDANO_CLI_CMD node key-gen-KES \ +CARDANO_CLI_CMD ${CARDANO_ERA} node key-gen-KES \ --verification-key-file ${POOL_ARTIFACTS_DIR}/kes.vkey \ --signing-key-file ${POOL_ARTIFACTS_DIR}/kes.skey ## Generate the Operational Certificate ### Compute KES period -SLOT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .slot) +SLOT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query tip --testnet-magic $NETWORK_MAGIC | jq .slot) SLOTS_KES_PERIOD=$(cat $GENESIS_FILE | jq .slotsPerKESPeriod) -KES_PERIOD=`expr $SLOT / $SLOTS_KES_PERIOD` +KES_PERIOD=$(( $SLOT / $SLOTS_KES_PERIOD )) ### Generate Operational Certificate -CARDANO_CLI_CMD node issue-op-cert \ +CARDANO_CLI_CMD ${CARDANO_ERA} node issue-op-cert \ --kes-verification-key-file ${POOL_ARTIFACTS_DIR}/kes.vkey \ --cold-signing-key-file ${POOL_ARTIFACTS_DIR}/cold.skey \ --operational-certificate-issue-counter ${POOL_ARTIFACTS_DIR}/opcert.counter \ @@ -67,23 +67,15 @@ CARDANO_CLI_CMD node issue-op-cert \ --out-file ${POOL_ARTIFACTS_DIR}/opcert.cert ### Create a registration certificate -if [ "${CARDANO_ERA}" == "conway"]; then - KEY_REGISTRATION_DEPOSIT_ANOUNT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query gov-state --testnet-magic ${NETWORK_MAGIC} | jq -r .enactState.curPParams.keyDeposit) - # Conway specific creation of registration certificate - CARDANO_CLI_CMD stake-address registration-certificate \ - --stake-verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ - --out-file ${POOL_ARTIFACTS_DIR}/stake.cert \ - --key-reg-deposit-amt $KEY_REGISTRATION_DEPOSIT_ANOUNT -else - # Legacy creation of registration certificate - CARDANO_CLI_CMD stake-address registration-certificate \ - --stake-verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ - --out-file ${POOL_ARTIFACTS_DIR}/stake.cert -fi +KEY_REGISTRATION_DEPOSIT_AMOUNT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query gov-state --testnet-magic ${NETWORK_MAGIC} | jq -r .currentPParams.stakeAddressDeposit) +CARDANO_CLI_CMD ${CARDANO_ERA} stake-address registration-certificate \ +--stake-verification-key-file ${POOL_ARTIFACTS_DIR}/stake.vkey \ +--out-file ${POOL_ARTIFACTS_DIR}/stake.cert \ +--key-reg-deposit-amt $KEY_REGISTRATION_DEPOSIT_AMOUNT ### Compute Pool Id -POOL_ID=$(CARDANO_CLI_CMD stake-pool id --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey) +POOL_ID=$(CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool id --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey) echo $POOL_ID > ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/pool-id.txt echo POOL_ID=$POOL_ID @@ -91,7 +83,7 @@ echo POOL_ID=$POOL_ID echo Send funds to "$(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr)" at https://docs.cardano.org/cardano-testnet/tools/faucet while true do - UTXO_ROWS_NUMBER=`expr $(CARDANO_CLI_CMD query utxo --address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) --testnet-magic $NETWORK_MAGIC 2> /dev/null | wc -l) - 2` + UTXO_ROWS_NUMBER=$(( $(CARDANO_CLI_CMD ${CARDANO_ERA} query utxo --address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) --testnet-magic $NETWORK_MAGIC 2> /dev/null | wc -l) - 2 )) if [ $UTXO_ROWS_NUMBER -gt 0 ] ; then echo ">>>> Funds Received!" break diff --git a/mithril-infra/assets/tools/pool/query-stake-pool.sh b/mithril-infra/assets/tools/pool/query-stake-pool.sh index 446cd54c890..7b587df2edd 100644 --- a/mithril-infra/assets/tools/pool/query-stake-pool.sh +++ b/mithril-infra/assets/tools/pool/query-stake-pool.sh @@ -10,40 +10,40 @@ CARDANO_CLI_CMD --version # Compute Pool Id -POOL_ID=$(CARDANO_CLI_CMD stake-pool id --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey) +POOL_ID=$(CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool id --cold-verification-key-file ${POOL_ARTIFACTS_DIR}/cold.vkey) echo POOL_ID=$POOL_ID # Query tip -CARDANO_CLI_CMD query tip \ +CARDANO_CLI_CMD ${CARDANO_ERA} query tip \ --testnet-magic $NETWORK_MAGIC | jq . # Payment address utxo -CARDANO_CLI_CMD query utxo \ +CARDANO_CLI_CMD ${CARDANO_ERA} query utxo \ --testnet-magic $NETWORK_MAGIC \ --address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) # Query stake address info -CARDANO_CLI_CMD query stake-address-info \ +CARDANO_CLI_CMD ${CARDANO_ERA} query stake-address-info \ --testnet-magic $NETWORK_MAGIC \ --address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/stake.addr) | jq . # Query stake snapshot -CARDANO_CLI_CMD query stake-snapshot \ +CARDANO_CLI_CMD ${CARDANO_ERA} query stake-snapshot \ --testnet-magic $NETWORK_MAGIC \ --stake-pool-id $POOL_ID | jq . # Query pool params -CARDANO_CLI_CMD query pool-params \ +CARDANO_CLI_CMD ${CARDANO_ERA} query pool-params \ --testnet-magic $NETWORK_MAGIC \ --stake-pool-id $POOL_ID | jq . # Query KES period info -CARDANO_CLI_CMD query kes-period-info \ +CARDANO_CLI_CMD ${CARDANO_ERA} query kes-period-info \ --testnet-magic $NETWORK_MAGIC \ --op-cert-file ${POOL_ARTIFACTS_DIR}/opcert.cert # Query current leadership schedule -CARDANO_CLI_CMD query leadership-schedule \ +CARDANO_CLI_CMD ${CARDANO_ERA} query leadership-schedule \ --testnet-magic $NETWORK_MAGIC \ --genesis /config/genesis/shelley.json \ --stake-pool-id $POOL_ID \ @@ -51,7 +51,7 @@ CARDANO_CLI_CMD query leadership-schedule \ --current # Query next leadership schedule -CARDANO_CLI_CMD query leadership-schedule \ +CARDANO_CLI_CMD ${CARDANO_ERA} query leadership-schedule \ --testnet-magic $NETWORK_MAGIC \ --genesis /config/genesis/shelley.json \ --stake-pool-id $POOL_ID \ diff --git a/mithril-infra/assets/tools/pool/register-stake-address.sh b/mithril-infra/assets/tools/pool/register-stake-address.sh index 17e7cc9c96f..f7a217f09e6 100644 --- a/mithril-infra/assets/tools/pool/register-stake-address.sh +++ b/mithril-infra/assets/tools/pool/register-stake-address.sh @@ -13,7 +13,7 @@ if [ -z "${TX_IN}" ]; then fi # Register stake address on chain -SLOT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .slot) +SLOT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query tip --testnet-magic $NETWORK_MAGIC | jq .slot) ## Build transaction CARDANO_CLI_CMD ${CARDANO_ERA} transaction build \ diff --git a/mithril-infra/assets/tools/pool/register-stake-pool.sh b/mithril-infra/assets/tools/pool/register-stake-pool.sh index 24d8b7e74b1..49bfae8ee41 100644 --- a/mithril-infra/assets/tools/pool/register-stake-pool.sh +++ b/mithril-infra/assets/tools/pool/register-stake-pool.sh @@ -36,7 +36,7 @@ cat > ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_WWW_DIR}/pool-metadata.json << EOF "homepage": "https://mithril.network" } EOF -POOL_METADATA_HASH=$(CARDANO_CLI_CMD stake-pool metadata-hash --pool-metadata-file ${POOL_WWW_DIR}/pool-metadata.json) +POOL_METADATA_HASH=$(CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool metadata-hash --pool-metadata-file ${POOL_WWW_DIR}/pool-metadata.json) # Generate stake pool registration certificate POOL_PLEDGE=$AMOUNT_STAKED @@ -45,7 +45,7 @@ POOL_MARGIN=0.1 POOL_METADATA_URL=$(curl -s https://tinyurl.com/api-create.php?url=https://${SIGNER_NODE}.${SIGNER_DOMAIN}/pool-metadata.json) POOL_RELAY_URL="${SIGNER_NODE}.${SIGNER_DOMAIN}" POOL_RELAY_PORT=$(cat ${POOL_ARTIFACTS_DIR_PREFIX}/pool/port) -SLOT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .slot) +SLOT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query tip --testnet-magic $NETWORK_MAGIC | jq .slot) # Build registration certificate CARDANO_CLI_CMD ${CARDANO_ERA} stake-pool registration-certificate \ diff --git a/mithril-infra/assets/tools/pool/retire-stake-pool.sh b/mithril-infra/assets/tools/pool/retire-stake-pool.sh index af2bd8ff528..de63ccb1c96 100644 --- a/mithril-infra/assets/tools/pool/retire-stake-pool.sh +++ b/mithril-infra/assets/tools/pool/retire-stake-pool.sh @@ -18,8 +18,8 @@ if [ -z "${VALUE_OUT}" ]; then fi # Compute retirement epoch -SLOT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .slot) -EPOCH_CURRENT=$(CARDANO_CLI_CMD query tip --testnet-magic $NETWORK_MAGIC | jq .epoch) +SLOT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query tip --testnet-magic $NETWORK_MAGIC | jq .slot) +EPOCH_CURRENT=$(CARDANO_CLI_CMD ${CARDANO_ERA} query tip --testnet-magic $NETWORK_MAGIC | jq .epoch) EPOCH_RETIREMENT=$(( EPOCH_CURRENT + 1 )) # Build deregistration certificate diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-mithril-delegation.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-mithril-delegation.sh index a5329a5b203..bba340175da 100644 --- a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-mithril-delegation.sh +++ b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-mithril-delegation.sh @@ -41,12 +41,12 @@ version_lte() { # Stake addresses registration certs for ADDR in ${USER_ADDRS}; do if [ "\${CURRENT_CARDANO_ERA}" == "conway" ]; then - KEY_REGISTRATION_DEPOSIT_ANOUNT=\$(CARDANO_NODE_SOCKET_PATH=node-pool${N}/ipc/node.sock $CARDANO_CLI \${CURRENT_CARDANO_ERA} query gov-state --testnet-magic ${NETWORK_MAGIC} | jq .currentPParams.stakeAddressDeposit) + KEY_REGISTRATION_DEPOSIT_AMOUNT=\$(CARDANO_NODE_SOCKET_PATH=node-pool${N}/ipc/node.sock $CARDANO_CLI \${CURRENT_CARDANO_ERA} query gov-state --testnet-magic ${NETWORK_MAGIC} | jq .currentPParams.stakeAddressDeposit) # Conway specific creation of registration certificate $CARDANO_CLI \${CURRENT_CARDANO_ERA} stake-address registration-certificate \ --stake-verification-key-file addresses/\${ADDR}-stake.vkey \ --out-file addresses/\${ADDR}-stake.reg.cert \ - --key-reg-deposit-amt \$KEY_REGISTRATION_DEPOSIT_ANOUNT + --key-reg-deposit-amt \$KEY_REGISTRATION_DEPOSIT_AMOUNT else # Legacy creation of registration certificate $CARDANO_CLI stake-address registration-certificate \