From e8cf91f09d75acccea2e39fab89d2a2ca67f8c1a Mon Sep 17 00:00:00 2001 From: v Date: Tue, 26 Nov 2024 15:50:10 +0100 Subject: [PATCH] octez 21 + Quebec --- .github/workflows/containers.yml | 34 +++++++++--------- .github/workflows/release.yml | 36 +++++++++---------- .../protocols/PsQ3NAxQ/protocol.hjson | 6 ---- .../protocols/PsQuebec/protocol.hjson | 6 ++++ .../sandbox-parameters.hjson | 2 +- .../{PsQ3NAxQ => PsQuebec}/vote-file.hjson | 0 configuration/services/template/baker.hjson | 2 +- containers/tezos/Containerfile | 2 +- containers/tzc-tezos/Containerfile | 2 +- readme.md | 30 ++++++++-------- samples/multi-node_multi-dal/readme.md | 2 +- src/version-info.lua | 2 +- 12 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 configuration/protocols/PsQ3NAxQ/protocol.hjson create mode 100644 configuration/protocols/PsQuebec/protocol.hjson rename configuration/protocols/{PsQ3NAxQ => PsQuebec}/sandbox-parameters.hjson (98%) rename configuration/protocols/{PsQ3NAxQ => PsQuebec}/vote-file.hjson (100%) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 101f2be..8202a30 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -48,32 +48,32 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: build tezos v20.3 + - name: build tezos v21.0 uses: docker/build-push-action@v5 with: file: containers/tezos/Containerfile context: . platforms: linux/amd64,linux/arm64 build-args: | - PROTOCOLS=PsParisC - IMAGE_TAG=octez-v20.3 + PROTOCOLS=PsParisC,PsQuebec + IMAGE_TAG=octez-v21.0 GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} - tags: ghcr.io/tez-capital/tezbox:tezos-v20.3.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v20.3,ghcr.io/tez-capital/tezbox:latest + tags: ghcr.io/tez-capital/tezbox:tezos-v21.0.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0,ghcr.io/tez-capital/tezbox:latest push: true provenance: false - - name: build tezos v21.0-rc5 - uses: docker/build-push-action@v5 - with: - file: containers/tzc-tezos/Containerfile - context: . - platforms: linux/amd64,linux/arm64 - build-args: | - PROTOCOLS=PsParisC,PsQ3NAxQ - IMAGE_TAG=latest - GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} - tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 - push: true - provenance: false + # - name: build tezos v21.0-rc5 + # uses: docker/build-push-action@v5 + # with: + # file: containers/tzc-tezos/Containerfile + # context: . + # platforms: linux/amd64,linux/arm64 + # build-args: | + # PROTOCOLS=PsParisC,PsQ3NAxQ + # IMAGE_TAG=latest + # GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} + # tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 + # push: true + # provenance: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 549120c..90186de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: build tezos v20.3 + - name: build tezos v21.0 uses: docker/build-push-action@v5 if: ${{ steps.prep.outputs.NEEDS_RELEASE == 'true'}} with: @@ -71,24 +71,24 @@ jobs: context: . platforms: linux/amd64,linux/arm64 build-args: | - PROTOCOLS=PsParisC - IMAGE_TAG=octez-v20.3 + PROTOCOLS=PsParisC,PsQuebec + IMAGE_TAG=octez-v21.0 GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} - tags: ghcr.io/tez-capital/tezbox:tezos-v20.3.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v20.3,ghcr.io/tez-capital/tezbox:latest + tags: ghcr.io/tez-capital/tezbox:tezos-v21.0.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0,ghcr.io/tez-capital/tezbox:latest push: true provenance: false - - name: build tezos v21.0-rc5 - uses: docker/build-push-action@v5 - if: ${{ steps.prep.outputs.NEEDS_RELEASE == 'true'}} - with: - file: containers/tzc-tezos/Containerfile - context: . - platforms: linux/amd64,linux/arm64 - build-args: | - PROTOCOLS=PsParisC,PsQ3NAxQ - IMAGE_TAG=latest - GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} - tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 - push: true - provenance: false \ No newline at end of file + # - name: build tezos v21.0-rc5 + # uses: docker/build-push-action@v5 + # if: ${{ steps.prep.outputs.NEEDS_RELEASE == 'true'}} + # with: + # file: containers/tzc-tezos/Containerfile + # context: . + # platforms: linux/amd64,linux/arm64 + # build-args: | + # PROTOCOLS=PsParisC,PsQ3NAxQ + # IMAGE_TAG=latest + # GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} + # tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 + # push: true + # provenance: false \ No newline at end of file diff --git a/configuration/protocols/PsQ3NAxQ/protocol.hjson b/configuration/protocols/PsQ3NAxQ/protocol.hjson deleted file mode 100644 index 82b0ef4..0000000 --- a/configuration/protocols/PsQ3NAxQ/protocol.hjson +++ /dev/null @@ -1,6 +0,0 @@ -id: psq3naxq -short: PsQ3NAxQ -hash: PsQ3NAxQC3pXSizDrKEkPHsarkKD78T58X9CXBfYaiXAi2rsvsD -aliases: [ - q3nabox -] \ No newline at end of file diff --git a/configuration/protocols/PsQuebec/protocol.hjson b/configuration/protocols/PsQuebec/protocol.hjson new file mode 100644 index 0000000..ae871d7 --- /dev/null +++ b/configuration/protocols/PsQuebec/protocol.hjson @@ -0,0 +1,6 @@ +id: psquebec +short: PsQuebec +hash: PsQuebecnLByd3JwTiGadoG4nGWi3HYiLXUjkibeFV8dCFeVMUg +aliases: [ + quebecbox +] \ No newline at end of file diff --git a/configuration/protocols/PsQ3NAxQ/sandbox-parameters.hjson b/configuration/protocols/PsQuebec/sandbox-parameters.hjson similarity index 98% rename from configuration/protocols/PsQ3NAxQ/sandbox-parameters.hjson rename to configuration/protocols/PsQuebec/sandbox-parameters.hjson index e2cd374..6ce6b27 100644 --- a/configuration/protocols/PsQ3NAxQ/sandbox-parameters.hjson +++ b/configuration/protocols/PsQuebec/sandbox-parameters.hjson @@ -26,7 +26,7 @@ "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "0", + "liquidity_baking_subsidy": "5000000", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 360, "minimal_block_delay": "5", diff --git a/configuration/protocols/PsQ3NAxQ/vote-file.hjson b/configuration/protocols/PsQuebec/vote-file.hjson similarity index 100% rename from configuration/protocols/PsQ3NAxQ/vote-file.hjson rename to configuration/protocols/PsQuebec/vote-file.hjson diff --git a/configuration/services/template/baker.hjson b/configuration/services/template/baker.hjson index 7a10a98..cb4ccd6 100644 --- a/configuration/services/template/baker.hjson +++ b/configuration/services/template/baker.hjson @@ -6,7 +6,7 @@ TEZOS_LOG: "* -> info" } restart: always - restart_delay: 20 + restart_delay: 10 restart_max_retries: 0 # unlimited stop_timeout: 300 user: ${USER} diff --git a/containers/tezos/Containerfile b/containers/tezos/Containerfile index 0f34dcf..65dfd27 100644 --- a/containers/tezos/Containerfile +++ b/containers/tezos/Containerfile @@ -1,4 +1,4 @@ -ARG IMAGE_TAG=octez-v20.3 +ARG IMAGE_TAG=octez-v21.0 FROM docker.io/tezos/tezos:${IMAGE_TAG} diff --git a/containers/tzc-tezos/Containerfile b/containers/tzc-tezos/Containerfile index 90d7c9e..d9d05f7 100644 --- a/containers/tzc-tezos/Containerfile +++ b/containers/tzc-tezos/Containerfile @@ -1,4 +1,4 @@ -ARG IMAGE_TAG=octez-v20.3 +ARG IMAGE_TAG=octez-v21.0 FROM ghcr.io/tez-capital/tezos:${IMAGE_TAG} diff --git a/readme.md b/readme.md index 474479f..c901fb9 100644 --- a/readme.md +++ b/readme.md @@ -23,23 +23,23 @@ To use TezBox, you need to have OCI compatible container runtime installed on yo ```bash # to run chain with the PsParisC protocol -docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 parisbox +docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 parisbox # or to run in the background -docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 parisbox +docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 parisbox ``` You can list available protocols with the following command: ```bash # docker run -it list-protocols -docker run -it --entrypoint tezbox ghcr.io/tez-capital/tezbox:tezos-v20.3 list-protocols +docker run -it --entrypoint tezbox ghcr.io/tez-capital/tezbox:tezos-v21.0 list-protocols ``` -#### Q3NA +#### Quebec ```bash # to run chain with the Qena42 protocol -docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 q3nabox +docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 quebecbox # or to run in the background -docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 q3nabox +docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 quebecbox ``` #### CI @@ -47,7 +47,7 @@ docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0-rc5 q3 `tezbox` is commonly used in CI pipelines. If you can estimate the expected duration of a specific test and want to prevent CI from getting stuck, you can use the `--timeout=` option to limit how long the instance runs. Supported units: `s` (seconds), `m` (minutes), `h` (hours). In case of a timeout, the container exits with an exit code of `2`. ```bash -docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 --timeout=120s parisbox +docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 --timeout=120s parisbox ``` Note: The timeout specifies how long the sandbox runs, excluding the bootstrap duration. @@ -62,9 +62,9 @@ To run a dal within tezbox start tezbox with `--with-dal` option as follows: ```bash # to run chain with the PsParisC protocol -docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 parisbox --with-dal +docker run -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 parisbox --with-dal # or to run in the background -docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 parisbox --with-dal +docker run -d -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 parisbox --with-dal ``` ### Configuration @@ -83,15 +83,15 @@ minimal_block_delay: "1" // minimal block delay in seconds, has to be quoted ``` and run the container with the following command: ```bash -# docker run -it -v :/tezbox/overrides/protocols//sandbox-parameters.hjson ... ghcr.io/tez-capital/tezbox:tezos-v20.3 oxfordbox -docker run -it -v $(pwd)/sandbox-override-parameters.hjson:/tezbox/overrides/protocols/Proxford/sandbox-parameters.hjson ... ghcr.io/tez-capital/tezbox:tezos-v20.3 oxfordbox +# docker run -it -v :/tezbox/overrides/protocols//sandbox-parameters.hjson ... ghcr.io/tez-capital/tezbox:tezos-v21.0 oxfordbox +docker run -it -v $(pwd)/sandbox-override-parameters.hjson:/tezbox/overrides/protocols/Proxford/sandbox-parameters.hjson ... ghcr.io/tez-capital/tezbox:tezos-v21.0 oxfordbox ``` You can determine path based on folder structure in [configuration directory](https://github.com/tez-capital/tezbox/tree/main/configuration). Optionally you can mount entire overrides/configuration directory to `/tezbox/overrides` or `/tezbox/configuration` to replace the whole configuration. ```bash -docker run -it -v :/tezbox/overrides ... ghcr.io/tez-capital/tezbox:tezos-v20.3 oxfordbox +docker run -it -v :/tezbox/overrides ... ghcr.io/tez-capital/tezbox:tezos-v21.0 oxfordbox ``` NOTE: **Do not edit or mount configuration files in the `/tezbox/context` directory. They are generated automatically and should not be modified manually.** @@ -127,7 +127,7 @@ autostart: false ``` and mount it into overrides directory: ```bash -docker run -it -v $(pwd)/baker.hjson:/tezbox/overrides/services/baker.hjson ... ghcr.io/tez-capital/tezbox:tezos-v20.3 oxfordbox +docker run -it -v $(pwd)/baker.hjson:/tezbox/overrides/services/baker.hjson ... ghcr.io/tez-capital/tezbox:tezos-v21.0 oxfordbox ``` #### Chain Context @@ -136,7 +136,7 @@ Chain and protocol is automatically initialized only once during the first run. e.g. ```bash -docker run -it -v $(pwd)/sandbox-data:/tezbox -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 oxfordbox +docker run -it -v $(pwd)/sandbox-data:/tezbox -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 oxfordbox ``` NOTE: *To reset the state you can remove the `/tezbox/context/data/tezbox-initialized` file. After its removal all chain and client data will be removed and the chain will be reinitialized on the next run.* @@ -157,7 +157,7 @@ To build TezBox follow these steps: 3. build lua sources (you can get eli [here](https://github.com/alis-is/eli/releases)) - `eli build/build.lua` 4. build the image - - `docker build --build-arg="PROTOCOLS=PsParisC" --build-arg="IMAGE_TAG=octez-v20.3" -t tezbox . -f containers/tezos/Containerfile --no-cache` + - `docker build --build-arg="PROTOCOLS=PsParisC" --build-arg="IMAGE_TAG=octez-v21.0" -t tezbox . -f containers/tezos/Containerfile --no-cache` ### Future development diff --git a/samples/multi-node_multi-dal/readme.md b/samples/multi-node_multi-dal/readme.md index 09465ed..b4a3507 100644 --- a/samples/multi-node_multi-dal/readme.md +++ b/samples/multi-node_multi-dal/readme.md @@ -2,4 +2,4 @@ To Run: -`docker run -v $(pwd)/samples/multi-node_multi-dal/overrides:/tezbox/overrides -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v20.3 parisbox --with-dal` \ No newline at end of file +`docker run -v $(pwd)/samples/multi-node_multi-dal/overrides:/tezbox/overrides -it -p 0.0.0.0:8732:8732 ghcr.io/tez-capital/tezbox:tezos-v21.0 parisbox --with-dal` \ No newline at end of file diff --git a/src/version-info.lua b/src/version-info.lua index a014be0..731089e 100644 --- a/src/version-info.lua +++ b/src/version-info.lua @@ -1,4 +1,4 @@ -local TEZBOX_VERSION = "0.5.1" +local TEZBOX_VERSION = "0.6.0" return { VERSION = TEZBOX_VERSION,