From 80f095a2ad071e3695f8834a33c5e9ac616485a4 Mon Sep 17 00:00:00 2001 From: marcello33 Date: Wed, 19 Oct 2022 16:17:53 +0200 Subject: [PATCH 1/5] dev: fix: ci --- .github/matic-cli-config.yml | 6 +++++- .github/workflows/ci.yml | 4 ++-- integration-tests/smoke_test.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/matic-cli-config.yml b/.github/matic-cli-config.yml index 2b83b684c6..a8b8fd7046 100644 --- a/.github/matic-cli-config.yml +++ b/.github/matic-cli-config.yml @@ -2,10 +2,14 @@ defaultStake: 10000 defaultFee: 2000 borChainId: "15001" heimdallChainId: heimdall-15001 -contractsBranch: jc/v0.3.1-backport +contractsBranch: mardizzone/revert +sprintSize: +blockNumber: +blockTime: numOfValidators: 3 numOfNonValidators: 0 ethURL: http://ganache:9545 +ethHostUser: ubuntu devnetType: docker borDockerBuildContext: "../../bor" heimdallDockerBuildContext: "https://github.com/maticnetwork/heimdall.git#develop" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 002752d6aa..00fa177069 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,13 +98,13 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.18.x + go-version: 1.19.x - name: Checkout matic-cli uses: actions/checkout@v3 with: repository: maticnetwork/matic-cli - ref: v0.3.0-dev + ref: mardizzone/revert path: matic-cli - name: Install dependencies on Linux diff --git a/integration-tests/smoke_test.sh b/integration-tests/smoke_test.sh index 4181f9f20c..5da1a86399 100644 --- a/integration-tests/smoke_test.sh +++ b/integration-tests/smoke_test.sh @@ -3,7 +3,7 @@ set -e balanceInit=$(docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'Math.round(web3.fromWei(eth.getBalance(eth.accounts[0])))'") -delay=600 +delay=900 echo "Wait ${delay} seconds for state-sync..." sleep $delay From 46e9cf77bec1743bf6b0bc6a01ea8abf0c772677 Mon Sep 17 00:00:00 2001 From: marcello33 Date: Wed, 19 Oct 2022 17:05:13 +0200 Subject: [PATCH 2/5] dev: fix: add default block configs --- .github/matic-cli-config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/matic-cli-config.yml b/.github/matic-cli-config.yml index a8b8fd7046..f974554500 100644 --- a/.github/matic-cli-config.yml +++ b/.github/matic-cli-config.yml @@ -4,8 +4,8 @@ borChainId: "15001" heimdallChainId: heimdall-15001 contractsBranch: mardizzone/revert sprintSize: -blockNumber: -blockTime: +blockNumber: '0' +blockTime: '2' numOfValidators: 3 numOfNonValidators: 0 ethURL: http://ganache:9545 From 536f6860d6908588bca60d7741f08ac71bfd329f Mon Sep 17 00:00:00 2001 From: marcello33 Date: Wed, 19 Oct 2022 18:01:57 +0200 Subject: [PATCH 3/5] dev: fix: add sprintSize --- .github/matic-cli-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/matic-cli-config.yml b/.github/matic-cli-config.yml index f974554500..a7e71db0d1 100644 --- a/.github/matic-cli-config.yml +++ b/.github/matic-cli-config.yml @@ -3,7 +3,7 @@ defaultFee: 2000 borChainId: "15001" heimdallChainId: heimdall-15001 contractsBranch: mardizzone/revert -sprintSize: +sprintSize: 64 blockNumber: '0' blockTime: '2' numOfValidators: 3 From f1bdf4d3a4875236d3177f9265fd62927db4bb31 Mon Sep 17 00:00:00 2001 From: marcello33 Date: Thu, 20 Oct 2022 09:14:18 +0200 Subject: [PATCH 4/5] dev: fix: revert --- .github/matic-cli-config.yml | 2 +- .github/workflows/ci.yml | 4 ++-- integration-tests/smoke_test.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/matic-cli-config.yml b/.github/matic-cli-config.yml index a7e71db0d1..8bdfe82b3b 100644 --- a/.github/matic-cli-config.yml +++ b/.github/matic-cli-config.yml @@ -2,7 +2,7 @@ defaultStake: 10000 defaultFee: 2000 borChainId: "15001" heimdallChainId: heimdall-15001 -contractsBranch: mardizzone/revert +contractsBranch: jc/v0.3.1-backport sprintSize: 64 blockNumber: '0' blockTime: '2' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00fa177069..39cf4f99b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.19.x + go-version: 1.18.x - name: Install dependencies on Linux if: runner.os == 'Linux' @@ -104,7 +104,7 @@ jobs: uses: actions/checkout@v3 with: repository: maticnetwork/matic-cli - ref: mardizzone/revert + ref: v0.3.0-dev path: matic-cli - name: Install dependencies on Linux diff --git a/integration-tests/smoke_test.sh b/integration-tests/smoke_test.sh index 5da1a86399..4181f9f20c 100644 --- a/integration-tests/smoke_test.sh +++ b/integration-tests/smoke_test.sh @@ -3,7 +3,7 @@ set -e balanceInit=$(docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'Math.round(web3.fromWei(eth.getBalance(eth.accounts[0])))'") -delay=900 +delay=600 echo "Wait ${delay} seconds for state-sync..." sleep $delay From f88b14c07fbe46fe419ecb103b671175d228b30c Mon Sep 17 00:00:00 2001 From: marcello33 Date: Thu, 20 Oct 2022 09:16:11 +0200 Subject: [PATCH 5/5] dev: fix: go-versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39cf4f99b0..002752d6aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.18.x + go-version: 1.19.x - name: Install dependencies on Linux if: runner.os == 'Linux' @@ -98,7 +98,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.19.x + go-version: 1.18.x - name: Checkout matic-cli uses: actions/checkout@v3