Skip to content

Commit

Permalink
Node 8.7.3 (#1725)
Browse files Browse the repository at this point in the history
## Description
Breaking updates due to node 8.7.3 release.
Initial commit, untested and most likely incomplete. 

- [x]  Docs update
- [x] Test all touched scripts

---------

Co-authored-by: Greg Beresnev <[email protected]>
Co-authored-by: rdlrt <[email protected]>
  • Loading branch information
3 people authored Jan 20, 2024
1 parent 9c143dd commit a7f25c3
Show file tree
Hide file tree
Showing 11 changed files with 392 additions and 360 deletions.
11 changes: 11 additions & 0 deletions docs/Scripts/cntools-changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ All notable changes to this tool will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [12.0.0] - 2024-01-19
#### Changed
- Minimum version bumps
- node 8.7.3
- cardano-hw-cli 1.14.0
- Ledger 5.0.1
- Trezor 2.6.4
- Send > Funds flow updated to ask for Ada amount after tokens and destination to be able to calculate minimum amount valid to send correctly.
#### Fixed
- Minimum utxo calculation changed to use cardano-cli calculation tool (was broken)

## [11.0.2] - 2023-10-30
#### Fixed
- Fix additional Ada printing. Now omits trailing zeros from fraction part of Ada output.
Expand Down
38 changes: 36 additions & 2 deletions files/conway-genesis-guild.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
{
"genDelegs": {}
}
"poolVotingThresholds": {
"pvtCommitteeNormal": 0.51,
"pvtCommitteeNoConfidence": 0.51,
"pvtHardForkInitiation": 0.51,
"pvtMotionNoConfidence": 0.51
},
"dRepVotingThresholds": {
"dvtMotionNoConfidence": 0.51,
"dvtCommitteeNormal": 0.51,
"dvtCommitteeNoConfidence": 0.51,
"dvtUpdateToConstitution": 0.51,
"dvtHardForkInitiation": 0.51,
"dvtPPNetworkGroup": 0.51,
"dvtPPEconomicGroup": 0.51,
"dvtPPTechnicalGroup": 0.51,
"dvtPPGovGroup": 0.51,
"dvtTreasuryWithdrawal": 0.51
},
"committeeMinSize": 0,
"committeeMaxTermLength": 200,
"govActionLifetime": 10,
"govActionDeposit": 1000000000,
"dRepDeposit": 2000000,
"dRepActivity": 20,
"constitution": {
"anchor": {
"url": "",
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
"committee": {
"members": {
},
"quorum": 0
}
}
26 changes: 13 additions & 13 deletions files/topology-guild-p2p.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"localRoots": [
{
"accessPoints": [
{"address": "127.0.0.1" ,"port": 7000, "valency": 1,"name": "local"}
{"address": "127.0.0.1" ,"port": 7000, "valency": 1, "name": "local"}
],
"advertise": false,
"valency": 1
Expand All @@ -11,18 +11,18 @@
"publicRoots": [
{
"accessPoints": [
{"address": "209.145.50.190" ,"port": 7001, "valency": 1,"name": "rdlrt"},
{"address": "95.216.188.94" ,"port": 7000, "valency": 1,"name": "homer"},
{"address": "relay1-test.ahlnet.nu" ,"port": 2103, "valency": 1,"name": "ahl-1"},
{"address": "guild-relay.bluecheesestakehouse.com","port": 7000,"valency": 1,"name": "westberg"},
{"address": "relay-1.stakepool.at","port": 54326,"valency": 1,"name": "atada"},
{"address": "185.161.193.105","port": 6011,"valency": 1,"name": "clio-1"},
{"address": "148.72.153.168","port": 18000,"valency": 1,"name": "redo" },
{"address": "relay.guild.cryptobounty.org","port": 9198,"valency": 1,"name": "bnty1" },
{"address": "54.93.228.113","port": 4322,"valency": 1,"name": "titan" },
{"address": "195.201.129.190", "port": 6000, "valency": 1, "name": "damjan"},
{"address": "relay-guild.adaplus.io", "port": 6000, "valency": 1, "name": "adaplus"},
{"address": "relays-guild.poolunder.com", "port": 8900, "valency": 1, "name": "TUNDR"}
{"address": "209.145.50.190" ,"port": 7001, "valency": 1, "name": "rdlrt"},
{"address": "95.216.188.94" ,"port": 7000, "valency": 1, "name": "homer"},
{"address": "relay1-test.ahlnet.nu" ,"port": 2103, "valency": 1, "name": "ahl-1"},
{"address": "guild-relay.bluecheesestakehouse.com","port": 7000, "valency": 1, "name": "westberg"},
{"address": "relay-1.stakepool.at" ,"port": 54326,"valency": 1, "name": "atada"},
{"address": "185.161.193.105" ,"port": 6011, "valency": 1, "name": "clio-1"},
{"address": "148.72.153.168" ,"port": 18000,"valency": 1, "name": "redo" },
{"address": "relay.guild.cryptobounty.org" ,"port": 9198, "valency": 1, "name": "bnty1" },
{"address": "54.93.228.113" ,"port": 4322, "valency": 1, "name": "titan" },
{"address": "195.201.129.190" ,"port": 6000, "valency": 1, "name": "damjan"},
{"address": "relay-guild.adaplus.io" ,"port": 6000, "valency": 1, "name": "adaplus"},
{"address": "relays-guild.poolunder.com" ,"port": 8900, "valency": 1, "name": "TUNDR"}
],
"advertise": false
}
Expand Down
12 changes: 6 additions & 6 deletions scripts/cnode-helper-scripts/cncli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ getPoolVrfVkeyCborHex() {
}

getLedgerData() { # getNodeMetrics expected to have been already run
if ! stake_snapshot=$(${CCLI} query stake-snapshot --stake-pool-id ${POOL_ID} ${NETWORK_IDENTIFIER} 2>&1); then
if ! stake_snapshot=$(${CCLI} ${NETWORK_ERA} query stake-snapshot --stake-pool-id ${POOL_ID} ${NETWORK_IDENTIFIER} 2>&1); then
echo "ERROR: stake-snapshot query failed: ${stake_snapshot}"
return 1
fi
Expand Down Expand Up @@ -199,7 +199,7 @@ cncliInit() {

[[ ! -f "${CNCLI}" ]] && echo -e "\nERROR: failed to locate cncli executable, please install with 'guild-deploy.sh'\n" && exit 1
CNCLI_VERSION="v$(cncli -V | cut -d' ' -f2)"
if ! versionCheck "5.1.0" "${CNCLI_VERSION}"; then echo "ERROR: cncli ${CNCLI_VERSION} installed, minimum required version is 5.1.0, please upgrade to latest version!"; exit 1; fi
if ! versionCheck "6.0.0" "${CNCLI_VERSION}"; then echo "ERROR: cncli ${CNCLI_VERSION} installed, minimum required version is 6.0.0, please upgrade to latest version!"; exit 1; fi

[[ -z "${CNCLI_DIR}" ]] && CNCLI_DIR="${CNODE_HOME}/guild-db/cncli"
if ! mkdir -p "${CNCLI_DIR}" 2>/dev/null; then echo "ERROR: Failed to create CNCLI DB directory: ${CNCLI_DIR}"; exit 1; fi
Expand Down Expand Up @@ -266,8 +266,8 @@ cncliLeaderlog() {

[[ ${subarg} != "force" ]] && echo "Node in sync, sleeping for ${SLEEP_RATE}s before running leaderlogs for current epoch" && sleep ${SLEEP_RATE}
getNodeMetrics
getEraIdentifier
if [[ ${NETWORK_ERA} = "Babbage" ]]; then consensus="praos"; else consensus="tpraos"; fi
getProtocolParams
if versionCheck "8.0" "${PROT_VERSION}"; then consensus="praos"; else consensus="tpraos"; fi
curr_epoch=${epochnum}
if [[ $(sqlite3 "${BLOCKLOG_DB}" "SELECT COUNT(*) FROM epochdata WHERE epoch=${curr_epoch};" 2>/dev/null) -eq 1 && ${subarg} != "force" ]]; then
echo "Leaderlogs already calculated for epoch ${curr_epoch}, skipping!"
Expand Down Expand Up @@ -322,8 +322,8 @@ cncliLeaderlog() {
while true; do
[[ ${subarg} != "force" ]] && sleep ${SLEEP_RATE}
getNodeMetrics
getEraIdentifier
if [[ ${NETWORK_ERA} = "Babbage" ]]; then consensus="praos"; else consensus="tpraos"; fi
getProtocolParams
if versionCheck "8.0" "${PROT_VERSION}"; then consensus="praos"; else consensus="tpraos"; fi
if ! cncliDBinSync; then # verify that cncli DB is still in sync
echo "CNCLI DB out of sync :( [$(printf "%2.4f %%" ${cncli_sync_prog})] ... checking again in ${SLEEP_RATE}s"
[[ ${subarg} = force ]] && sleep ${SLEEP_RATE}
Expand Down
Loading

0 comments on commit a7f25c3

Please sign in to comment.