From 7a7a44357ce6ba76ed1245223768a6f857364d69 Mon Sep 17 00:00:00 2001 From: rdlrt <3169068+rdlrt@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:26:05 +1000 Subject: [PATCH] Bump dbsync version and config options --- files/configs/guild/db-sync-config.json | 21 ++++++++++++++++++++ files/configs/mainnet/db-sync-config.json | 21 ++++++++++++++++++++ files/configs/preprod/db-sync-config.json | 21 ++++++++++++++++++++ files/configs/preview/db-sync-config.json | 21 ++++++++++++++++++++ files/configs/sanchonet/db-sync-config.json | 21 ++++++++++++++++++++ scripts/cnode-helper-scripts/guild-deploy.sh | 16 +++++++-------- 6 files changed, 113 insertions(+), 8 deletions(-) diff --git a/files/configs/guild/db-sync-config.json b/files/configs/guild/db-sync-config.json index cd0ab0c729..f4eb590fc9 100644 --- a/files/configs/guild/db-sync-config.json +++ b/files/configs/guild/db-sync-config.json @@ -14,6 +14,27 @@ "/opt/cardano/cnode/logs/dbsync.json" ] ], + "insert_options": { + "tx_out": { + "value": "consumed" + }, + "ledger": "enable", + "shelley": { + "enable": true + }, + "multi_asset": { + "enable": true + }, + "metadata": { + "enable": true + }, + "plutus": { + "enable": true + }, + "governance": "enable", + "offchain_pool_data": "enable", + "json_type": "text" + }, "minSeverity": "Info", "options": { "cfokey": { diff --git a/files/configs/mainnet/db-sync-config.json b/files/configs/mainnet/db-sync-config.json index c9eda7c0b3..74d16e5bf3 100644 --- a/files/configs/mainnet/db-sync-config.json +++ b/files/configs/mainnet/db-sync-config.json @@ -14,6 +14,27 @@ "/opt/cardano/cnode/logs/dbsync.json" ] ], + "insert_options": { + "tx_out": { + "value": "consumed" + }, + "ledger": "enable", + "shelley": { + "enable": true + }, + "multi_asset": { + "enable": true + }, + "metadata": { + "enable": true + }, + "plutus": { + "enable": true + }, + "governance": "enable", + "offchain_pool_data": "enable", + "json_type": "text" + }, "minSeverity": "Info", "options": { "cfokey": { diff --git a/files/configs/preprod/db-sync-config.json b/files/configs/preprod/db-sync-config.json index 77b77268e0..4868b1dd60 100644 --- a/files/configs/preprod/db-sync-config.json +++ b/files/configs/preprod/db-sync-config.json @@ -14,6 +14,27 @@ "/opt/cardano/cnode/logs/dbsync.json" ] ], + "insert_options": { + "tx_out": { + "value": "consumed" + }, + "ledger": "enable", + "shelley": { + "enable": true + }, + "multi_asset": { + "enable": true + }, + "metadata": { + "enable": true + }, + "plutus": { + "enable": true + }, + "governance": "enable", + "offchain_pool_data": "enable", + "json_type": "text" + }, "minSeverity": "Info", "options": { "cfokey": { diff --git a/files/configs/preview/db-sync-config.json b/files/configs/preview/db-sync-config.json index 41845e9da6..abaee2067a 100644 --- a/files/configs/preview/db-sync-config.json +++ b/files/configs/preview/db-sync-config.json @@ -14,6 +14,27 @@ "/opt/cardano/cnode/logs/dbsync.json" ] ], + "insert_options": { + "tx_out": { + "value": "consumed" + }, + "ledger": "enable", + "shelley": { + "enable": true + }, + "multi_asset": { + "enable": true + }, + "metadata": { + "enable": true + }, + "plutus": { + "enable": true + }, + "governance": "enable", + "offchain_pool_data": "enable", + "json_type": "text" + }, "minSeverity": "Info", "options": { "cfokey": { diff --git a/files/configs/sanchonet/db-sync-config.json b/files/configs/sanchonet/db-sync-config.json index 75bef3626b..460ac4e406 100644 --- a/files/configs/sanchonet/db-sync-config.json +++ b/files/configs/sanchonet/db-sync-config.json @@ -14,6 +14,27 @@ "/opt/cardano/cnode/logs/dbsync.json" ] ], + "insert_options": { + "tx_out": { + "value": "consumed" + }, + "ledger": "enable", + "shelley": { + "enable": true + }, + "multi_asset": { + "enable": true + }, + "metadata": { + "enable": true + }, + "plutus": { + "enable": true + }, + "governance": "enable", + "offchain_pool_data": "enable", + "json_type": "text" + }, "minSeverity": "Info", "options": { "cfokey": { diff --git a/scripts/cnode-helper-scripts/guild-deploy.sh b/scripts/cnode-helper-scripts/guild-deploy.sh index 217adbb561..f08a985d62 100755 --- a/scripts/cnode-helper-scripts/guild-deploy.sh +++ b/scripts/cnode-helper-scripts/guild-deploy.sh @@ -109,7 +109,7 @@ set_defaults() { [[ "${SUDO}" = 'Y' && $(id -u) -eq 0 ]] && err_exit "Please run as non-root user." CNODE_HOME="${CNODE_PATH}/${CNODE_NAME}" CNODE_VNAME=$(echo "$CNODE_NAME" | awk '{print toupper($0)}') - CARDANO_NODE_VERSION="8.9.0" + CARDANO_NODE_VERSION="8.7.3" REPO="https://github.com/${G_ACCOUNT}/guild-operators" REPO_RAW="https://raw.githubusercontent.com/${G_ACCOUNT}/guild-operators" URL_RAW="${REPO_RAW}/${BRANCH}" @@ -340,7 +340,7 @@ build_libblst() { [[ ! -d "./blst" ]] && git clone https://github.com/supranational/blst &>/dev/null pushd blst >/dev/null || err_exit git fetch >/dev/null 2>&1 - [[ -z "${BLST_REF}" ]] && BLST_REF="v0.3.11" + [[ -z "${BLST_REF}" ]] && BLST_REF="v0.3.10" git checkout ${BLST_REF} &>/dev/null ./build.sh >/dev/null 2>&1 cat <<-EOF >libblst.pc @@ -371,19 +371,19 @@ download_cnodebins() { pushd "${HOME}"/tmp >/dev/null || err_exit echo -e "\n Downloading Cardano Node archive created from GitHub.." rm -f cardano-node cardano-address - curl -m 200 -sfL https://github.com/intersectmbo/cardano-node/releases/download/${CARDANO_NODE_VERSION}/cardano-node-${CARDANO_NODE_VERSION}-linux.tar.gz -o cnode.tar.gz || err_exit " Could not download cardano-node release ${CARDANO_NODE_VERSION} from GitHub!" - tar zxf cnode.tar.gz --strip-components 2 ./bin/cardano-node ./bin/cardano-cli ./bin/cardano-submit-api ./bin/bech32 &>/dev/null + curl -m 200 -sfL https://github.com/intersectmbo/cardano-node/releases/download/8.7.3/cardano-node-8.7.3-linux.tar.gz -o cnode.tar.gz || err_exit " Could not download cardano-node release 8.7.3 from GitHub!" + tar zxf cnode.tar.gz ./cardano-node ./cardano-cli ./cardano-submit-api ./bech32 &>/dev/null rm -f cnode.tar.gz [[ -f cardano-node ]] || err_exit " cardano-node archive downloaded but binary (cardano-node) not found after extracting package!" echo -e "\n Downloading Github release package for Cardano Wallet" curl -m 200 -sfL https://github.com/intersectmbo/cardano-addresses/releases/download/3.12.0/cardano-addresses-3.12.0-linux64.tar.gz -o caddress.tar.gz || err_exit " Could not download cardano-wallet's latest release archive from GitHub!" - tar zxf caddress.tar.gz --strip-components 1 bin/cardano-address &>/dev/null + tar zxf caddress.tar.gz --strip-components=1 bin/cardano-address &>/dev/null rm -f caddress.tar.gz - [[ -f cardano-address ]] || err_exit " cardano-address archive downloaded but binary (cardano-address) not found after extracting package!" + [[ -f cardano-address ]] || err_exit " cardano-address archive downloaded but binary (bin/cardano-address) not found after extracting package!" if [[ "${SKIP_DBSYNC_DOWNLOAD}" == "N" ]]; then echo -e "\n Downloading Cardano DB Sync archive created from GitHub.." - curl -m 200 -sfL https://github.com/intersectmbo/cardano-db-sync/releases/download/sancho-4.1.0/cardano-db-sync-13.2.0.1-linux.tar.gz -o cnodedbsync.tar.gz || err_exit " Could not download cardano-db-sync release 13.2.0.0 from GitHub!" - tar zxf cnodedbsync.tar.gz --strip-components 1 ./cardano-db-sync &>/dev/null + curl -m 200 -sfL https://github.com/IntersectMBO/cardano-db-sync/releases/download/sancho-4-2-1/cardano-db-sync-13.2.0.1-linux.tar.gz -o cnodedbsync.tar.gz || err_exit " Could not download cardano-db-sync release 13.2.0.0 from GitHub!" + tar zxf cnodedbsync.tar.gz ./cardano-db-sync &>/dev/null [[ -f cardano-db-sync ]] || err_exit " cardano-db-sync archive downloaded but binary (cardano-db-sync) not found after extracting package!" rm -f cnodedbsync.tar.gz mv -f -t "${HOME}"/.local/bin cardano-db-sync