From 738dc644bd61bf1094db37441ea298c4fa9cc9e2 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Thu, 3 Jul 2025 23:10:50 +0700 Subject: [PATCH 01/10] Merge branch 'mempool:master' into circleci-project-setup (#3) From d12de7443ef93b88ff77c13541802bfba38fbfcb Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Thu, 3 Jul 2025 23:24:38 +0700 Subject: [PATCH 02/10] Update jekyll-docker.yml Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/jekyll-docker.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jekyll-docker.yml b/.github/workflows/jekyll-docker.yml index 60e57369de..1ead4e909f 100644 --- a/.github/workflows/jekyll-docker.yml +++ b/.github/workflows/jekyll-docker.yml @@ -5,12 +5,10 @@ on: branches: [ "master" ] pull_request: branches: [ "master" ] - + jobs: build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - name: Build the site in the jekyll/builder container @@ -18,3 +16,6 @@ jobs: docker run \ -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" + theme: jekyll-theme-primer + plugins: + jekyll-seo-tag From b1c6adcfa28d2dc798528ac099d421d6c5c7e705 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Thu, 3 Jul 2025 23:46:09 +0700 Subject: [PATCH 03/10] Create jekyll-gh-pages.yml Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/jekyll-gh-pages.yml | 51 +++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/jekyll-gh-pages.yml diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml new file mode 100644 index 0000000000..e31d81c586 --- /dev/null +++ b/.github/workflows/jekyll-gh-pages.yml @@ -0,0 +1,51 @@ +# Sample workflow for building and deploying a Jekyll site to GitHub Pages +name: Deploy Jekyll with GitHub Pages dependencies preinstalled + +on: + # Runs on pushes targeting the default branch + push: + branches: ["main"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Build job + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Build with Jekyll + uses: actions/jekyll-build-pages@v1 + with: + source: ./ + destination: ./_site + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + + # Deployment job + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From 2e40175783ae6db96851585f96c03019e4254422 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Fri, 4 Jul 2025 00:01:49 +0700 Subject: [PATCH 04/10] Potential fix for code scanning alert no. 46: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/jekyll-docker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jekyll-docker.yml b/.github/workflows/jekyll-docker.yml index 1ead4e909f..d702c2867b 100644 --- a/.github/workflows/jekyll-docker.yml +++ b/.github/workflows/jekyll-docker.yml @@ -5,7 +5,10 @@ on: branches: [ "master" ] pull_request: branches: [ "master" ] - + +permissions: + contents: read + jobs: build: runs-on: ubuntu-latest From 0f3a7c6529496d0576a991d4b9a9b9991a8a7cc8 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Fri, 4 Jul 2025 00:08:13 +0700 Subject: [PATCH 05/10] Delete .github/workflows/jekyll-docker.yml Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/jekyll-docker.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/jekyll-docker.yml diff --git a/.github/workflows/jekyll-docker.yml b/.github/workflows/jekyll-docker.yml deleted file mode 100644 index d702c2867b..0000000000 --- a/.github/workflows/jekyll-docker.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Jekyll site CI - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Build the site in the jekyll/builder container - run: | - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" - theme: jekyll-theme-primer - plugins: - jekyll-seo-tag From 04128f27262ebf12341c4edfc45b9b27e5275abe Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Fri, 4 Jul 2025 23:01:38 +0700 Subject: [PATCH 06/10] Delete .github/workflows/jekyll-docker.yml Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/jekyll-docker.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/jekyll-docker.yml diff --git a/.github/workflows/jekyll-docker.yml b/.github/workflows/jekyll-docker.yml deleted file mode 100644 index 60e57369de..0000000000 --- a/.github/workflows/jekyll-docker.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Jekyll site CI - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Build the site in the jekyll/builder container - run: | - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" From 59f9611da12b28adc77a7bdf192dd8349e4cf531 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Fri, 4 Jul 2025 23:04:18 +0700 Subject: [PATCH 07/10] ops: Add more mempool servers to elements.conf & ops: Bump elements to v23.3.0 (#8) * ops: Add more mempool servers to elements.conf * ops: Bump elements to v23.3.0 --------- Co-authored-by: wiz --- production/elements.conf | 16 ++++++++++++++++ production/install | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/production/elements.conf b/production/elements.conf index 14838a5aed..dcbb1856c9 100644 --- a/production/elements.conf +++ b/production/elements.conf @@ -11,6 +11,10 @@ txindex=1 [liquidv1] validatepegin=1 mainchainrpcport=8332 +#addnode=[2401:b140::92:201]:7042 +#addnode=[2401:b140::92:202]:7042 +#addnode=[2401:b140::92:203]:7042 +#addnode=[2401:b140::92:204]:7042 #addnode=[2401:b140:1::92:201]:7042 #addnode=[2401:b140:1::92:202]:7042 #addnode=[2401:b140:1::92:203]:7042 @@ -35,6 +39,10 @@ mainchainrpcport=8332 #addnode=[2401:b140:4::92:204]:7042 #addnode=[2401:b140:4::92:205]:7042 #addnode=[2401:b140:4::92:206]:7042 +#addnode=[2401:b140:5::92:201]:7042 +#addnode=[2401:b140:5::92:202]:7042 +#addnode=[2401:b140:5::92:203]:7042 +#addnode=[2401:b140:5::92:204]:7042 [liquidtestnet] rpcport=7040 @@ -58,6 +66,10 @@ signblockscript=51210217e403ddb181872c32a0cd468c710040b2f53d8cac69f18dad07985ee3 evbparams=dynafed:0::: addnode=liquid-testnet.blockstream.com:18892 addnode=liquidtestnet.com:18891 +#addnode=[2401:b140::92:201]:18891 +#addnode=[2401:b140::92:202]:18891 +#addnode=[2401:b140::92:203]:18891 +#addnode=[2401:b140::92:204]:18891 #addnode=[2401:b140:1::92:201]:18891 #addnode=[2401:b140:1::92:202]:18891 #addnode=[2401:b140:1::92:203]:18891 @@ -82,3 +94,7 @@ addnode=liquidtestnet.com:18891 #addnode=[2401:b140:4::92:204]:18891 #addnode=[2401:b140:4::92:205]:18891 #addnode=[2401:b140:4::92:206]:18891 +#addnode=[2401:b140:5::92:201]:18891 +#addnode=[2401:b140:5::92:202]:18891 +#addnode=[2401:b140:5::92:203]:18891 +#addnode=[2401:b140:5::92:204]:18891 diff --git a/production/install b/production/install index 92945c3105..1318ab3698 100755 --- a/production/install +++ b/production/install @@ -376,7 +376,7 @@ ELEMENTS_REPO_URL=https://github.com/ElementsProject/elements ELEMENTS_REPO_NAME=elements ELEMENTS_REPO_BRANCH=master #ELEMENTS_LATEST_RELEASE=$(curl -s https://api.github.com/repos/ElementsProject/elements/releases/latest|grep tag_name|head -1|cut -d '"' -f4) -ELEMENTS_LATEST_RELEASE=elements-23.2.7 +ELEMENTS_LATEST_RELEASE=elements-23.3.0 echo -n '.' BITCOIN_ELECTRS_REPO_URL=https://github.com/mempool/electrs From 712a47d83eb0be5e19f69e0257acd1c48c56b85c Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Fri, 4 Jul 2025 23:21:30 +0700 Subject: [PATCH 08/10] Create static.yml Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/static.yml | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/static.yml diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 0000000000..0ba82305f8 --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,43 @@ +# Simple workflow for deploying static content to GitHub Pages +name: Deploy static content to Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + # Upload entire repository + path: '.' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From 2a0ce49cbc273b9ef01dd2f7de27c4a537930188 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Sat, 5 Jul 2025 00:10:18 +0700 Subject: [PATCH 09/10] Create docker-image.yml Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000000..793d8e0e39 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 9c4a40e39578ff93f8127c65003bda10bf3df9b8 Mon Sep 17 00:00:00 2001 From: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> Date: Sat, 5 Jul 2025 00:11:37 +0700 Subject: [PATCH 10/10] Potential fix for code scanning alert no. 47: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: AU_gdev_19 <64915515+Dargon789@users.noreply.github.com> --- .github/workflows/docker-image.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 793d8e0e39..2c16d1a612 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,5 +1,8 @@ name: Docker Image CI +permissions: + contents: read + on: push: branches: [ "master" ]