diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml index aad9777d9..240a08729 100644 --- a/.github/workflows/develop-chives.yaml +++ b/.github/workflows/develop-chives.yaml @@ -39,6 +39,7 @@ jobs: file: docker/dockerfile context: . platforms: linux/amd64 + provenance: false push: true build-args: | "UBUNTU_VER=focal" diff --git a/api/babel.cfg b/api/babel.cfg index 0cc0baca9..155a6fa8d 100644 --- a/api/babel.cfg +++ b/api/babel.cfg @@ -1,3 +1,2 @@ [python: **.py] -[jinja2: **/templates/**.html] -extensions=jinja2.ext.autoescape,jinja2.ext.with_ \ No newline at end of file +[jinja2: **/templates/**.html] \ No newline at end of file diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po index d48de2f23..4db838fee 100755 --- a/api/translations/de_DE/LC_MESSAGES/messages.po +++ b/api/translations/de_DE/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Machinaris VERSION\n" "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris" "/issuesCreation-Date: 2022-02-16 15:00-0700\n" -"POT-Creation-Date: 2023-01-02 17:14-0700\n" +"POT-Creation-Date: 2023-03-21 10:35-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: ApfelBirneKreis\n" "Language: de\n" @@ -16,9 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.12.1\n" -#: commands/chia_cli.py:78 +#: commands/chia_cli.py:79 msgid "Updated config.yaml failed validation!" msgstr "Geupdatete config.yaml hat die Validation nicht bestanden" diff --git a/api/translations/fr_FR/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po index 6ed7fb1ea..c7bd56bd6 100755 --- a/api/translations/fr_FR/LC_MESSAGES/messages.po +++ b/api/translations/fr_FR/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Machinaris VERSION\n" "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris" "/issuesCreation-Date: 2022-02-16 15:00-0700\n" -"POT-Creation-Date: 2023-01-02 17:14-0700\n" +"POT-Creation-Date: 2023-03-21 10:35-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Guy Davis\n" "Language: fr\n" @@ -16,9 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.12.1\n" -#: commands/chia_cli.py:78 +#: commands/chia_cli.py:79 msgid "Updated config.yaml failed validation!" msgstr "Échec de la validation du fichier config.yaml mis à jour!" diff --git a/api/translations/it_IT/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po index 1c5823844..2ef9a7923 100755 --- a/api/translations/it_IT/LC_MESSAGES/messages.po +++ b/api/translations/it_IT/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Machinaris VERSION\n" "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris" "/issuesCreation-Date: 2022-02-16 15:00-0700\n" -"POT-Creation-Date: 2023-01-02 17:14-0700\n" +"POT-Creation-Date: 2023-03-21 10:35-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Fabrizio Cacicia\n" "Language: it\n" @@ -16,9 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.12.1\n" -#: commands/chia_cli.py:78 +#: commands/chia_cli.py:79 msgid "Updated config.yaml failed validation!" msgstr "Validazione del config.yaml aggiornato fallita." diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po index c4cd2d198..34476cc05 100755 --- a/api/translations/nl_NL/LC_MESSAGES/messages.po +++ b/api/translations/nl_NL/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Machinaris VERSION\n" "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-" "Creation-Date: 2022-03-13 10:30-0600\n" -"POT-Creation-Date: 2023-01-02 17:14-0700\n" +"POT-Creation-Date: 2023-03-21 10:35-0600\n" "PO-Revision-Date: 2022-03-13 10:29-0600\n" "Last-Translator: Bernie Deprez\n" "Language: nl_NL\n" @@ -16,9 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.12.1\n" -#: commands/chia_cli.py:78 +#: commands/chia_cli.py:79 msgid "Updated config.yaml failed validation!" msgstr "Gewijzigde config.yaml kon niet gevalideerd worden!" diff --git a/api/translations/pt_PT/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po index cbd25742c..2a3a8a76c 100755 --- a/api/translations/pt_PT/LC_MESSAGES/messages.po +++ b/api/translations/pt_PT/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Machinaris VERSION\n" "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris" "/issuesCreation-Date: 2022-02-16 15:00-0700\n" -"POT-Creation-Date: 2023-01-02 17:14-0700\n" +"POT-Creation-Date: 2023-03-21 10:35-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: Antonio Casqueiro\n" "Language: pt\n" @@ -16,9 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.12.1\n" -#: commands/chia_cli.py:78 +#: commands/chia_cli.py:79 msgid "Updated config.yaml failed validation!" msgstr "A validação do ficheiro config.yaml falhou!" diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po index dde5a8139..29f060697 100755 --- a/api/translations/zh/LC_MESSAGES/messages.po +++ b/api/translations/zh/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Machinaris VERSION\n" "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris" "/issuesCreation-Date: 2022-02-16 15:00-0700\n" -"POT-Creation-Date: 2023-01-02 17:14-0700\n" +"POT-Creation-Date: 2023-03-21 10:35-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Guy Davis\n" "Language: zh\n" @@ -16,9 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.12.1\n" -#: commands/chia_cli.py:78 +#: commands/chia_cli.py:79 msgid "Updated config.yaml failed validation!" msgstr "" diff --git a/common/config/globals.py b/common/config/globals.py index ccaa13ac6..0b900e1f1 100644 --- a/common/config/globals.py +++ b/common/config/globals.py @@ -158,9 +158,9 @@ def is_setup(): logging.info(traceback.format_exc()) return foundKey -# On very first launch of the main Chia container, blockchain DB 7zip is being downloaded so must wait. -CHIA_COMPRESSED_DB_SIZE = 40 * 1024 * 1024 * 1024 # 40 compressed GB in Septemer 2022 -CHIA_BLOCKCHAIN_DB_SIZE = 90 * 1024 * 1024 * 1024 # 90 uncompressed GB in September 2022 +# On very first launch of the main Chia container, blockchain DB gz is being downloaded via torrent so must wait. +CHIA_COMPRESSED_DB_SIZE = 56 * 1024 * 1024 * 1024 # Compressed GB in March 2023 +CHIA_BLOCKCHAIN_DB_SIZE = 106 * 1024 * 1024 * 1024 # Uncompressed GB in March 2023 def blockchain_downloading(): db_path = '/root/.chia/mainnet/db' if path.exists(f"{db_path}/blockchain_v1_mainnet.sqlite") or path.exists(f"{db_path}/blockchain_v2_mainnet.sqlite"): diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh index 604fb694e..546901fb5 100644 --- a/scripts/forks/gigahorse_launch.sh +++ b/scripts/forks/gigahorse_launch.sh @@ -32,15 +32,16 @@ if [[ "${blockchain_db_download}" == 'true' ]] \ echo "Downloading Chia blockchain DB (many GBs in size) on first launch..." echo "Please be patient as takes minutes now, but saves days of syncing time later." mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia - # Latest Blockchain DB download from direct from https://sweetchia.com/ - db_url=$(curl -s https://sweetchia.com | grep -Po "https:.*/blockchain_v2_mainnet-\d{4}-\d{2}-\d{2}-\d{4}.7z" | shuf -n 1) - echo "Please be patient! Downloading blockchain database from: " - echo " ${db_url}" - curl -skLJ -O ${db_url} - p7zip --decompress --force blockchain_v2_mainnet*.7z + # Latest Blockchain DB download + torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent") + echo "Please be patient! Downloading blockchain database (via libtorrent) from: " + echo " ${torrent}" + curl -kLJ -O ${torrent} + python /machinaris/scripts/chiadb_download.py $PWD/$torrent + gunzip *.gz cd /root/.chia/mainnet/db mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.sqlite . - rm -rf /root/.chia/mainnet/db/chia + rm -rf /root/.chia/mainnet/db/chia fi /chia-gigahorse-farmer/chia.bin init >> /root/.chia/mainnet/log/init.log 2>&1 diff --git a/scripts/i18n/extract.sh b/scripts/i18n/extract.sh index 1af7eb4f9..9db12c903 100755 --- a/scripts/i18n/extract.sh +++ b/scripts/i18n/extract.sh @@ -5,8 +5,8 @@ for d in 'web' 'api'; do pushd $d >/dev/null - /chia-blockchain/venv/bin/pybabel extract -F babel.cfg -k _l -o messages.pot . - /chia-blockchain/venv/bin/pybabel update -i messages.pot -d ./translations + /chia-blockchain/venv/bin/pybabel --verbose extract -F babel.cfg -k _l -o messages.pot . + /chia-blockchain/venv/bin/pybabel --verbose update -i messages.pot -d ./translations chmod -R 777 $PWD/translations popd >/dev/null done diff --git a/web/babel.cfg b/web/babel.cfg index 55e88951a..20eaba061 100644 --- a/web/babel.cfg +++ b/web/babel.cfg @@ -1,4 +1,3 @@ [python: **.py] [jinja2: **/templates/**.html] -[jinja2: **/templates/**.js] -extensions=jinja2.ext.autoescape,jinja2.ext.with_ \ No newline at end of file +[jinja2: **/templates/**.js] \ No newline at end of file diff --git a/web/templates/setup.html b/web/templates/setup.html index d4db69676..3f1450417 100644 --- a/web/templates/setup.html +++ b/web/templates/setup.html @@ -61,8 +61,8 @@ {% autoescape false %}
{{_( 'On very first launch, the Chia compressed blockchain database %(compressed)s is being downloaded from %(dl_link)s, then unzipped. At about %(uncompressed)s in uncompressed size, this will take a while. However an hour or two now, will save you multiple days of blockchain syncing later. Please be patient!', - compressed="(~40 GB)", uncompressed="90 GB", - dl_link='https://sweetchia.com' + compressed="(~56 GB)", uncompressed="106 GB", + dl_link='https://www.chia.net/downloads/' )}}