From ccea3a862068dcd03bf4b2c532c3128ca827f2fc Mon Sep 17 00:00:00 2001 From: Goran Rojovic Date: Thu, 14 Mar 2024 14:00:37 +0100 Subject: [PATCH] Revert "Merge branch 'develop' into develop" This reverts commit 23c746e365a0c22ec709bb3294dad71d0fe607fb, reversing changes made to 65015161002d71ccda5405cf42251a0e3a601804. --- .github/workflows/lint.yml | 2 +- .github/workflows/load-test.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/notification-deploy-network.yml | 2 +- .github/workflows/notification-destroy-network.yml | 2 +- .github/workflows/notification-load-test.yml | 2 +- .github/workflows/notification-nightly.yml | 2 +- .github/workflows/unit-test.yml | 2 +- .goreleaser.yml | 1 + Dockerfile.release | 2 +- README.md | 2 -- loadtest/scenarios/multiple_EOA.js | 2 +- loadtest/scenarios/multiple_ERC20.js | 2 +- 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9e82515e09..dc28e1178b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -30,4 +30,4 @@ jobs: - name: Lint Failed if: failure() id: lint_failure - run: echo "lint_output=false" >> $GITHUB_OUTPUT \ No newline at end of file + run: echo "lint_output=false" >> $GITHUB_OUTPUT diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml index bb4f8bbdc9..6fa0c7938d 100644 --- a/.github/workflows/load-test.yml +++ b/.github/workflows/load-test.yml @@ -255,4 +255,4 @@ jobs: mode: stop label: ${{ needs.load_test_runner.outputs.load_test_runner_label }} ec2-instance-id: ${{ needs.load_test_runner.outputs.load_test_runner_instance_id }} - github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a9850dda7b..93b311bfda 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -164,4 +164,4 @@ jobs: gas_avg: ${{ needs.load_test_multiple_erc20.outputs.gas_avg }} gas_max: ${{ needs.load_test_multiple_erc20.outputs.gas_max }} secrets: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/notification-deploy-network.yml b/.github/workflows/notification-deploy-network.yml index a3414699f7..bbae04c529 100644 --- a/.github/workflows/notification-deploy-network.yml +++ b/.github/workflows/notification-deploy-network.yml @@ -105,4 +105,4 @@ jobs: ] } ] - } \ No newline at end of file + } diff --git a/.github/workflows/notification-destroy-network.yml b/.github/workflows/notification-destroy-network.yml index 63d89749dc..1f53823765 100644 --- a/.github/workflows/notification-destroy-network.yml +++ b/.github/workflows/notification-destroy-network.yml @@ -97,4 +97,4 @@ jobs: ] } ] - } \ No newline at end of file + } diff --git a/.github/workflows/notification-load-test.yml b/.github/workflows/notification-load-test.yml index 08dfee4225..519cc151af 100644 --- a/.github/workflows/notification-load-test.yml +++ b/.github/workflows/notification-load-test.yml @@ -136,4 +136,4 @@ jobs: ] } ] - } \ No newline at end of file + } diff --git a/.github/workflows/notification-nightly.yml b/.github/workflows/notification-nightly.yml index cf73b09d35..8bdf8967be 100644 --- a/.github/workflows/notification-nightly.yml +++ b/.github/workflows/notification-nightly.yml @@ -204,4 +204,4 @@ jobs: ] } ] - } \ No newline at end of file + } diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 71083bf4da..2d7cfeab75 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -30,4 +30,4 @@ jobs: - name: Run Go Test Failed if: failure() id: run_tests_failure - run: echo "test_output=false" >> $GITHUB_OUTPUT \ No newline at end of file + run: echo "test_output=false" >> $GITHUB_OUTPUT diff --git a/.goreleaser.yml b/.goreleaser.yml index 7f4f9f6d6a..cfcdcf844a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -126,3 +126,4 @@ docker_manifests: - DOCKERHUB_ORGANIZATION/{{ .ProjectName }}:{{ .Version }}-amd64 - DOCKERHUB_ORGANIZATION/{{ .ProjectName }}:{{ .Version }}-arm64 skip_push: auto + \ No newline at end of file diff --git a/Dockerfile.release b/Dockerfile.release index 217268c613..9100d7eb4a 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -9,7 +9,7 @@ COPY blade /usr/local/bin/ EXPOSE 8545 9632 1478 RUN addgroup -S blade-group \ - && adduser -S -u 1001 blade -G blade-group + && adduser -S blade -G blade-group USER blade diff --git a/README.md b/README.md index 75fb6520ec..b6ab6b3662 100644 --- a/README.md +++ b/README.md @@ -11,5 +11,3 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -. diff --git a/loadtest/scenarios/multiple_EOA.js b/loadtest/scenarios/multiple_EOA.js index fcf83cb9f6..60ee16bd3e 100644 --- a/loadtest/scenarios/multiple_EOA.js +++ b/loadtest/scenarios/multiple_EOA.js @@ -103,4 +103,4 @@ export function handleSummary(data) { 'stdout': textSummary(data, { indent: ' ', enableColors: true }), // Show the text summary to stdout... 'summary.json': JSON.stringify(data), }; -} \ No newline at end of file +} diff --git a/loadtest/scenarios/multiple_ERC20.js b/loadtest/scenarios/multiple_ERC20.js index e05d107d1b..4db5d0763a 100644 --- a/loadtest/scenarios/multiple_ERC20.js +++ b/loadtest/scenarios/multiple_ERC20.js @@ -105,4 +105,4 @@ export function handleSummary(data) { 'stdout': textSummary(data, { indent: ' ', enableColors: true }), // Show the text summary to stdout... 'summary.json': JSON.stringify(data), }; -} \ No newline at end of file +}