From 18ed8722da4698c2035c870c3c4efdacab754833 Mon Sep 17 00:00:00 2001 From: Branislav Kojic Date: Thu, 28 Mar 2024 22:27:29 +0100 Subject: [PATCH 01/15] Workflow fixes (#171) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Workflow fixes * Small fixеs * Enable London fork; Disable bridge --- .github/workflows/load-test.yml | 6 ++++++ .github/workflows/nightly.yml | 22 ++++++++++++++++---- .github/workflows/notification-load-test.yml | 8 +++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml index b082959156..d0b7d56942 100644 --- a/.github/workflows/load-test.yml +++ b/.github/workflows/load-test.yml @@ -97,6 +97,9 @@ on: # yamllint disable-line rule:truthy iterations: description: "Number Of Transactions" value: ${{ jobs.load_test_scenario.outputs.iterations }} + dropped_iterations: + description: "Number Of Dropped Transactions" + value: ${{ jobs.load_test_scenario.outputs.dropped_iterations }} block: description: "Block Number" value: ${{ jobs.load_test_scenario.outputs.block }} @@ -187,6 +190,7 @@ jobs: tps_avg: ${{ steps.load_test_results.outputs.tps_avg }} tps_max: ${{ steps.load_test_results.outputs.tps_max }} iterations: ${{ steps.load_test_results.outputs.iterations }} + dropped_iterations: ${{ steps.load_test_results.outputs.dropped_iterations }} block: ${{ steps.load_test_results.outputs.block }} ttm: ${{ steps.load_test_results.outputs.ttm }} gas_avg: ${{ steps.load_test_results.outputs.gas_avg }} @@ -201,6 +205,7 @@ jobs: echo "tps_avg=$(cat summary.json | jq -r '.metrics.ethereum_tps.values.avg')" >> $GITHUB_OUTPUT echo "tps_max=$(cat summary.json | jq -r '.metrics.ethereum_tps.values.max')" >> $GITHUB_OUTPUT echo "iterations=$(cat summary.json | jq -r '.metrics.iterations.values.count')" >> $GITHUB_OUTPUT + echo "dropped_iterations=$(cat summary.json | jq -r '.metrics.dropped_iterations.values.count')" >> $GITHUB_OUTPUT echo "block=$(cat summary.json | jq -r '.metrics.ethereum_block.values.count')" >> $GITHUB_OUTPUT echo "ttm=$(cat summary.json | jq -r '.metrics.ethereum_time_to_mine.values.avg')" >> $GITHUB_OUTPUT echo "gas_avg=$(cat summary.json | jq -r '.metrics.ethereum_gas_used.values.avg')" >> $GITHUB_OUTPUT @@ -236,6 +241,7 @@ jobs: tps_avg: ${{ needs.load_test_scenario.outputs.tps_avg }} tps_max: ${{ needs.load_test_scenario.outputs.tps_max }} iterations: ${{ needs.load_test_scenario.outputs.iterations }} + dropped_iterations: ${{ needs.load_test_scenario.outputs.dropped_iterations }} block: ${{ needs.load_test_scenario.outputs.block }} ttm: ${{ needs.load_test_scenario.outputs.ttm }} gas_avg: ${{ needs.load_test_scenario.outputs.gas_avg }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4f21ac2d65..b13445b70e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -48,8 +48,8 @@ jobs: block_time: "2" max_slots: "276480" max_enqueued: "276480" - is_london_fork_active: false - is_bridge_active: true + is_london_fork_active: true + is_bridge_active: false notification: false secrets: AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }} @@ -125,8 +125,8 @@ jobs: block_time: "2" max_slots: "276480" max_enqueued: "276480" - is_london_fork_active: false - is_bridge_active: true + is_london_fork_active: true + is_bridge_active: false logs: true build_blade_output: ${{ needs.ci.outputs.build-blade }} lint_output: ${{ needs.ci.outputs.lint }} @@ -153,9 +153,16 @@ jobs: with: environment: nightly scenario: EOA + timeout: "1800s" + rate: "3000" + timeUnit: "1s" + duration: "10m" + preAllocatedVUs: "60" + maxVUs: "60" tps_avg: ${{ needs.load_test_multiple_eoa.outputs.tps_avg }} tps_max: ${{ needs.load_test_multiple_eoa.outputs.tps_max }} iterations: ${{ needs.load_test_multiple_eoa.outputs.iterations }} + dropped_iterations: ${{ needs.load_test_multiple_eoa.outputs.dropped_iterations }} block: ${{ needs.load_test_multiple_eoa.outputs.block }} ttm: ${{ needs.load_test_multiple_eoa.outputs.ttm }} gas_avg: ${{ needs.load_test_multiple_eoa.outputs.gas_avg }} @@ -170,9 +177,16 @@ jobs: with: environment: nightly scenario: ERC20 + timeout: "1800s" + rate: "1500" + timeUnit: "1s" + duration: "10m" + preAllocatedVUs: "60" + maxVUs: "60" tps_avg: ${{ needs.load_test_multiple_erc20.outputs.tps_avg }} tps_max: ${{ needs.load_test_multiple_erc20.outputs.tps_max }} iterations: ${{ needs.load_test_multiple_erc20.outputs.iterations }} + dropped_iterations: ${{ needs.load_test_multiple_erc20.outputs.dropped_iterations }} block: ${{ needs.load_test_multiple_erc20.outputs.block }} ttm: ${{ needs.load_test_multiple_erc20.outputs.ttm }} gas_avg: ${{ needs.load_test_multiple_erc20.outputs.gas_avg }} diff --git a/.github/workflows/notification-load-test.yml b/.github/workflows/notification-load-test.yml index 984f37f3d7..fd5121c8e3 100644 --- a/.github/workflows/notification-load-test.yml +++ b/.github/workflows/notification-load-test.yml @@ -47,6 +47,10 @@ on: # yamllint disable-line rule:truthy description: "Number Of Transactions" type: string required: true + dropped_iterations: + description: "Number Of Dropped Transactions" + type: string + required: true block: description: "Block Number" type: string @@ -191,6 +195,10 @@ jobs: "type": "mrkdwn", "text": "*Transactions*\n${{ inputs.iterations }}" }, + { + "type": "mrkdwn", + "text": "*Dropped Transactions*\n${{ inputs.dropped_iterations }}" + }, { "type": "mrkdwn", "text": "*Block Number*\n${{ inputs.block }}" From a99aece182451eb357e6d972cc4e266a67d63fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= <93934272+Stefan-Ethernal@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:21:14 +0100 Subject: [PATCH 02/15] Bump the version to 1.21 (#169) --- .github/workflows/benchmark-test.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/e2e-legacy-test.yml | 2 +- .github/workflows/e2e-polybft-test.yml | 2 +- .github/workflows/fuzz-test.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/property-polybft-test.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/unit-test.yml | 2 +- docker/README.md | 2 +- docker/local/Dockerfile | 2 +- go.mod | 2 +- go.sum | 17 +++++++++++++++++ jsonrpc/web3_endpoint.go | 2 +- scripts/README.md | 2 +- 15 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.github/workflows/benchmark-test.yml b/.github/workflows/benchmark-test.yml index 9f7c385ef8..80bc961f39 100644 --- a/.github/workflows/benchmark-test.yml +++ b/.github/workflows/benchmark-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Run Go Test run: make benchmark-test - name: Run Go Test Failed diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7b73e206a..437fbe0242 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Build Blade run: go build -o blade -tags netgo -ldflags="-s -w -X \"github.com/${GITHUB_REPOSITORY}/versioning.Version=${GITHUB_REF_NAME}\" -X \"github.com/${GITHUB_REPOSITORY}/versioning.Commit=${GITHUB_SHA}\"" && tar -czvf blade.tar.gz blade env: @@ -45,7 +45,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Reproduce builds continue-on-error: true run: | diff --git a/.github/workflows/e2e-legacy-test.yml b/.github/workflows/e2e-legacy-test.yml index 31cbdd0404..59f3e0bdf7 100644 --- a/.github/workflows/e2e-legacy-test.yml +++ b/.github/workflows/e2e-legacy-test.yml @@ -25,7 +25,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Run tests run: make test-e2e-legacy - name: Run tests failed diff --git a/.github/workflows/e2e-polybft-test.yml b/.github/workflows/e2e-polybft-test.yml index 38d44c626e..630862c3a6 100644 --- a/.github/workflows/e2e-polybft-test.yml +++ b/.github/workflows/e2e-polybft-test.yml @@ -23,7 +23,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x check-latest: true - name: Generate OpenSSL certificate run: openssl req -x509 -out localhost.crt -keyout localhost.key -newkey rsa:2048 -nodes -sha256 -subj '/CN=localhost' -extensions EXT -config <(printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth") diff --git a/.github/workflows/fuzz-test.yml b/.github/workflows/fuzz-test.yml index 66cb2cf9fc..b0e64a50ad 100644 --- a/.github/workflows/fuzz-test.yml +++ b/.github/workflows/fuzz-test.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Run Fuzz Test run: make fuzz-test - name: Run fuzz tests failed diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dc28e1178b..d77fe42f0f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,7 +21,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x cache: false - name: Lint uses: golangci/golangci-lint-action@v4.0.0 diff --git a/.github/workflows/property-polybft-test.yml b/.github/workflows/property-polybft-test.yml index 515fe0a024..fe7630336b 100644 --- a/.github/workflows/property-polybft-test.yml +++ b/.github/workflows/property-polybft-test.yml @@ -23,7 +23,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Run tests run: make test-property-polybft - name: Run tests failed diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4cc388ac4..cff2dbbb58 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Prepare id: prepare run: | @@ -53,7 +53,7 @@ jobs: --clean --skip-validate env: PACKAGE_NAME: github.com/${GITHUB_REPOSITORY} - GOLANG_CROSS_VERSION: v1.20.5 + GOLANG_CROSS_VERSION: v1.21.6 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VERSION: ${{ steps.prepare.outputs.tag_name }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 2d7cfeab75..abd7a4473c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5.0.0 with: - go-version: 1.20.x + go-version: 1.21.x - name: Install Dependencies run: ./setup-ci.sh - name: Run Go Test diff --git a/docker/README.md b/docker/README.md index f73dcaf3b9..15f3478e70 100644 --- a/docker/README.md +++ b/docker/README.md @@ -9,7 +9,7 @@ When deploying with `polybft` consensus, there are some additional dependencies: -* [go 1.20.x](https://go.dev/dl/) +* [go 1.21.x](https://go.dev/dl/) ## Local development diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 05b3b5b91b..ffa312a5e1 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine AS builder +FROM golang:1.21-alpine AS builder RUN apk add make git diff --git a/go.mod b/go.mod index 00d26c991e..5ea0dfc8cc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/0xPolygon/polygon-edge -go 1.20 +go 1.21 require ( cloud.google.com/go/secretmanager v1.11.5 diff --git a/go.sum b/go.sum index 7386ed2543..7984a31c13 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= @@ -104,6 +105,7 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= @@ -125,6 +127,7 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8Yc github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= @@ -171,6 +174,7 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= @@ -190,6 +194,7 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw= +github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-toolsmith/astcopy v1.0.2 h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0= github.com/go-toolsmith/astcopy v1.0.2/go.mod h1:4TcEdbElGc9twQEYpVo/aieIXfHhiuLh4aLAck6dO7Y= github.com/go-toolsmith/astequal v1.0.2/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= @@ -242,6 +247,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -271,6 +277,7 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= +github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -302,6 +309,7 @@ github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0S github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -360,11 +368,14 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c= @@ -380,6 +391,7 @@ github.com/libp2p/go-libp2p-kbucket v0.6.3/go.mod h1:RCseT7AH6eJWxxk2ol03xtP9pEH github.com/libp2p/go-libp2p-pubsub v0.10.0 h1:wS0S5FlISavMaAbxyQn3dxMOe2eegMfswM471RuHJwA= github.com/libp2p/go-libp2p-pubsub v0.10.0/go.mod h1:1OxbaT/pFRO5h+Dpze8hdHQ63R0ke55XTs6b6NwLLkw= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= +github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0= github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM= github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk= @@ -486,6 +498,7 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= @@ -561,6 +574,7 @@ github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052 h1:Qp27Id github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052/go.mod h1:uvX/8buq8uVeiZiFht+0lqSLBHF+uGV8BrTv8W/SIwk= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -672,6 +686,7 @@ go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZV go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -685,6 +700,7 @@ go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk= go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -966,6 +982,7 @@ gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/gotraceui v0.2.0 h1:dmNsfQ9Vl3GwbiVD7Z8d/osC6WtGGrasyrC2suc4ZIQ= +honnef.co/go/gotraceui v0.2.0/go.mod h1:qHo4/W75cA3bX0QQoSvDjbJa4R8mAyyFjbWAj63XElc= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/jsonrpc/web3_endpoint.go b/jsonrpc/web3_endpoint.go index e983e5dfae..8477372dd5 100644 --- a/jsonrpc/web3_endpoint.go +++ b/jsonrpc/web3_endpoint.go @@ -16,7 +16,7 @@ type Web3 struct { var clientVersionTemplate = "%s/%s/%s-%s/%s" // ClientVersion returns the version of the web3 client (web3_clientVersion) -// Example: "polygon-edge-53105/v1.1.0/linux-amd64/go1.20.0" +// Example: "polygon-edge-53105/v1.1.0/linux-amd64/go1.21.6" // Spec: https://ethereum.org/en/developers/docs/apis/json-rpc/#web3_clientversion func (w *Web3) ClientVersion() (interface{}, error) { var version string diff --git a/scripts/README.md b/scripts/README.md index 5cf18c276b..1bd12e26d1 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -4,7 +4,7 @@ When deploying with `polybft` consensus, there are some additional dependencies: -* [go 1.20.x](https://go.dev/dl/) +* [go 1.21.x](https://go.dev/dl/) * [jq](https://jqlang.github.io/jq) * [curl](https://everything.curl.dev/get) From 13b3d95af5c1df6999f5a35d6e9d2339197b98cc Mon Sep 17 00:00:00 2001 From: Goran Rojovic <100121253+goran-ethernal@users.noreply.github.com> Date: Mon, 1 Apr 2024 09:07:54 +0200 Subject: [PATCH 03/15] fix (#172) --- gasprice/gasprice.go | 2 +- loadtest/scenarios/multiple_EOA.js | 6 ++++-- loadtest/scenarios/multiple_ERC20.js | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gasprice/gasprice.go b/gasprice/gasprice.go index 06c4631c3b..f2a79a3ec2 100644 --- a/gasprice/gasprice.go +++ b/gasprice/gasprice.go @@ -17,7 +17,7 @@ const couldNotFoundBlockFormat = "could not find block. Number: %d, Hash: %s" // DefaultGasHelperConfig is the default config for gas helper (as per ethereum) var DefaultGasHelperConfig = &Config{ - NumOfBlocksToCheck: 20, + NumOfBlocksToCheck: 5, PricePercentile: 60, SampleNumber: 3, MaxPrice: ethgo.Gwei(500), diff --git a/loadtest/scenarios/multiple_EOA.js b/loadtest/scenarios/multiple_EOA.js index 60ee16bd3e..d2b609ad0d 100644 --- a/loadtest/scenarios/multiple_EOA.js +++ b/loadtest/scenarios/multiple_EOA.js @@ -61,9 +61,11 @@ export async function setup() { mnemonic: mnemonic, }); + var gas_price = client.gasPrice(); + var accounts = await fundTestAccounts(client, root_address); - return { accounts: accounts }; + return { accounts: accounts, gas_price: gas_price }; } var clients = []; @@ -85,7 +87,7 @@ export default function (data) { const tx = { to: "0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF", value: Number(0.00000001 * 1e18), - gas_price: client.gasPrice()*1.2, + gas_price: data.gas_price*1.3, nonce: userData.nonce, }; diff --git a/loadtest/scenarios/multiple_ERC20.js b/loadtest/scenarios/multiple_ERC20.js index 4db5d0763a..c2a9797b01 100644 --- a/loadtest/scenarios/multiple_ERC20.js +++ b/loadtest/scenarios/multiple_ERC20.js @@ -67,11 +67,14 @@ export async function setup() { const receipt = client.deployContract(JSON.stringify(ZexCoin.abi), ZexCoin.bytecode.substring(2), 500000000000, "ZexCoin", "ZEX") + var gas_price = client.gasPrice(); + var accounts = await fundTestAccounts(client, root_address); return { accounts: accounts, - contract_address: data.contract_address + contract_address: data.contract_address, + gas_price: gas_price }; } @@ -93,7 +96,7 @@ export default function (data) { console.log(acc.address); const con = client.newContract(data.contract_address, JSON.stringify(ZexCoin.abi)); - const res = con.txn("transfer", { gas_limit: 100000, nonce: acc.nonce, gas_price: client.gasPrice()*1.3 }, acc.address, 1); + const res = con.txn("transfer", { gas_limit: 100000, nonce: acc.nonce, gas_price: data.gas_price*1.3 }, acc.address, 1); console.log("sender => " + acc.address + " tx hash => " + res + " nonce => " + acc.nonce); acc.nonce++; From 5751c7183a9aeded99e77fb20990ec1f1f279dd5 Mon Sep 17 00:00:00 2001 From: Goran Rojovic <100121253+goran-ethernal@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:16:22 +0200 Subject: [PATCH 04/15] [BLADE-138] Consolidate `TestTxn` to use `TxRelayer` (#174) * fix * lint fix * storage test fix * comments fix * fix * fix --- e2e-polybft/e2e/acls_test.go | 37 +++-------- e2e-polybft/e2e/bridge_test.go | 2 - e2e-polybft/e2e/helpers_test.go | 2 +- e2e-polybft/e2e/jsonrpc_test.go | 43 +++++++++--- e2e-polybft/e2e/storage_test.go | 19 +++--- e2e-polybft/framework/test-cluster.go | 96 ++++----------------------- txrelayer/txrelayer.go | 34 +++++++--- 7 files changed, 91 insertions(+), 142 deletions(-) diff --git a/e2e-polybft/e2e/acls_test.go b/e2e-polybft/e2e/acls_test.go index d71b3fad9e..7ad87eb016 100644 --- a/e2e-polybft/e2e/acls_test.go +++ b/e2e-polybft/e2e/acls_test.go @@ -64,8 +64,8 @@ func TestE2E_AllowList_ContractDeployment(t *testing.T) { { // Step 1. 'targetAddr' can send a normal transaction (non-contract creation). - err := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)).Wait() - require.NoError(t, err) + txn := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)) + require.True(t, txn.Succeed()) } var proxyContract types.Address @@ -75,7 +75,6 @@ func TestE2E_AllowList_ContractDeployment(t *testing.T) { // (The transaction does not fail but the contract is not deployed and all gas // for the transaction is consumed) deployTxn := cluster.Deploy(t, target, bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Reverted()) require.False(t, cluster.ExistsCode(t, types.Address(deployTxn.Receipt().ContractAddress))) } @@ -83,8 +82,6 @@ func TestE2E_AllowList_ContractDeployment(t *testing.T) { { // Step 3. 'adminAddr' can create contracts deployTxn := cluster.Deploy(t, admin, bytecode) - require.NoError(t, deployTxn.Wait()) - proxyContract = types.Address(deployTxn.Receipt().ContractAddress) require.True(t, deployTxn.Succeed()) @@ -96,14 +93,13 @@ func TestE2E_AllowList_ContractDeployment(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{targetAddr}) adminSetTxn := cluster.MethodTxn(t, admin, contracts.AllowListContractsAddr, input) - require.NoError(t, adminSetTxn.Wait()) + require.True(t, adminSetTxn.Succeed()) expectRole(t, cluster, contracts.AllowListContractsAddr, targetAddr, addresslist.EnabledRole) } { // Step 5. 'targetAddr' can create contracts now. deployTxn := cluster.Deploy(t, target, bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Succeed()) require.True(t, cluster.ExistsCode(t, types.Address(deployTxn.Receipt().ContractAddress))) } @@ -114,7 +110,6 @@ func TestE2E_AllowList_ContractDeployment(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{types.ZeroAddress}) adminSetFailTxn := cluster.MethodTxn(t, target, contracts.AllowListContractsAddr, input) - require.NoError(t, adminSetFailTxn.Wait()) require.True(t, adminSetFailTxn.Failed()) expectRole(t, cluster, contracts.AllowListContractsAddr, types.ZeroAddress, addresslist.NoRole) } @@ -160,14 +155,13 @@ func TestE2E_BlockList_ContractDeployment(t *testing.T) { { // Step 1. 'targetAddr' can send a normal transaction (non-contract creation). - err := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)).Wait() - require.NoError(t, err) + txn := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)) + require.True(t, txn.Succeed()) } { // Step 2. 'targetAddr' **can** deploy a contract because it is not blacklisted. deployTxn := cluster.Deploy(t, target, bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Succeed()) require.True(t, cluster.ExistsCode(t, types.Address(deployTxn.Receipt().ContractAddress))) } @@ -175,7 +169,6 @@ func TestE2E_BlockList_ContractDeployment(t *testing.T) { { // Step 3. 'adminAddr' can create contracts deployTxn := cluster.Deploy(t, admin, bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Succeed()) require.True(t, cluster.ExistsCode(t, types.Address(deployTxn.Receipt().ContractAddress))) } @@ -185,14 +178,13 @@ func TestE2E_BlockList_ContractDeployment(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{target.Address()}) adminSetTxn := cluster.MethodTxn(t, admin, contracts.BlockListContractsAddr, input) - require.NoError(t, adminSetTxn.Wait()) + require.True(t, adminSetTxn.Succeed()) expectRole(t, cluster, contracts.BlockListContractsAddr, target.Address(), addresslist.EnabledRole) } { // Step 5. 'targetAddr' **cannot** create contracts now as it's now blacklisted. deployTxn := cluster.Deploy(t, target, bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Reverted()) require.False(t, cluster.ExistsCode(t, types.Address(deployTxn.Receipt().ContractAddress))) } @@ -203,7 +195,6 @@ func TestE2E_BlockList_ContractDeployment(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{types.ZeroAddress}) adminSetFailTxn := cluster.MethodTxn(t, target, contracts.BlockListContractsAddr, input) - require.NoError(t, adminSetFailTxn.Wait()) require.True(t, adminSetFailTxn.Failed()) expectRole(t, cluster, contracts.BlockListContractsAddr, types.ZeroAddress, addresslist.NoRole) } @@ -239,14 +230,12 @@ func TestE2E_AllowList_Transactions(t *testing.T) { { // Step 1. 'otherAddr' can send a normal transaction (non-contract creation). otherTxn := cluster.Transfer(t, other, types.ZeroAddress, big.NewInt(1)) - require.NoError(t, otherTxn.Wait()) require.True(t, otherTxn.Succeed()) } { // Step 2. 'targetAddr' **cannot** send a normal transaction because it is not whitelisted. targetTxn := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)) - require.NoError(t, targetTxn.Wait()) require.True(t, targetTxn.Reverted()) } @@ -255,8 +244,7 @@ func TestE2E_AllowList_Transactions(t *testing.T) { // (The transaction does not fail but the contract is not deployed and all gas // for the transaction is consumed) deployTxn := cluster.Deploy(t, target, bytecode) - require.NoError(t, deployTxn.Wait()) - require.True(t, deployTxn.Reverted()) + require.True(t, deployTxn.Failed()) require.False(t, cluster.ExistsCode(t, types.Address(deployTxn.Receipt().ContractAddress))) } @@ -265,14 +253,13 @@ func TestE2E_AllowList_Transactions(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{target.Address()}) adminSetTxn := cluster.MethodTxn(t, admin, contracts.AllowListTransactionsAddr, input) - require.NoError(t, adminSetTxn.Wait()) + require.True(t, adminSetTxn.Succeed()) expectRole(t, cluster, contracts.AllowListTransactionsAddr, target.Address(), addresslist.EnabledRole) } { // Step 4. 'targetAddr' **can** send a normal transaction because it is whitelisted. targetTxn := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)) - require.NoError(t, targetTxn.Wait()) require.True(t, targetTxn.Succeed()) } @@ -282,7 +269,6 @@ func TestE2E_AllowList_Transactions(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{types.ZeroAddress}) adminSetFailTxn := cluster.MethodTxn(t, target, contracts.AllowListTransactionsAddr, input) - require.NoError(t, adminSetFailTxn.Wait()) require.True(t, adminSetFailTxn.Failed()) expectRole(t, cluster, contracts.AllowListTransactionsAddr, types.ZeroAddress, addresslist.NoRole) } @@ -292,7 +278,6 @@ func TestE2E_AllowList_Transactions(t *testing.T) { input, _ := addresslist.SetNoneFunc.Encode([]interface{}{admin.Address()}) noneSetTxn := cluster.MethodTxn(t, admin, contracts.AllowListTransactionsAddr, input) - require.NoError(t, noneSetTxn.Wait()) require.True(t, noneSetTxn.Failed()) expectRole(t, cluster, contracts.AllowListTransactionsAddr, admin.Address(), addresslist.AdminRole) } @@ -325,14 +310,12 @@ func TestE2E_BlockList_Transactions(t *testing.T) { { // Step 1. 'otherAddr' **cannot** send a normal transaction (non-contract creation) because it is blacklisted. otherTxn := cluster.Transfer(t, other, types.ZeroAddress, big.NewInt(1)) - require.NoError(t, otherTxn.Wait()) require.True(t, otherTxn.Reverted()) } { // Step 2. 'targetAddr' **can** send a normal transaction because it is not blacklisted. targetTxn := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)) - require.NoError(t, targetTxn.Wait()) require.True(t, targetTxn.Succeed()) } @@ -342,7 +325,6 @@ func TestE2E_BlockList_Transactions(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{types.ZeroAddress}) adminSetFailTxn := cluster.MethodTxn(t, target, contracts.BlockListTransactionsAddr, input) - require.NoError(t, adminSetFailTxn.Wait()) require.True(t, adminSetFailTxn.Failed()) expectRole(t, cluster, contracts.BlockListTransactionsAddr, types.ZeroAddress, addresslist.NoRole) } @@ -352,14 +334,13 @@ func TestE2E_BlockList_Transactions(t *testing.T) { input, _ := addresslist.SetEnabledFunc.Encode([]interface{}{target.Address()}) adminSetTxn := cluster.MethodTxn(t, admin, contracts.BlockListTransactionsAddr, input) - require.NoError(t, adminSetTxn.Wait()) + require.True(t, adminSetTxn.Succeed()) expectRole(t, cluster, contracts.BlockListTransactionsAddr, target.Address(), addresslist.EnabledRole) } { // Step 5. 'targetAddr' **cannot** send a normal transaction because it is blacklisted. targetTxn := cluster.Transfer(t, target, types.ZeroAddress, big.NewInt(1)) - require.NoError(t, targetTxn.Wait()) require.True(t, targetTxn.Reverted()) } } diff --git a/e2e-polybft/e2e/bridge_test.go b/e2e-polybft/e2e/bridge_test.go index 0769ece3f2..56ed3db994 100644 --- a/e2e-polybft/e2e/bridge_test.go +++ b/e2e-polybft/e2e/bridge_test.go @@ -856,7 +856,6 @@ func TestE2E_Bridge_ChildchainTokensTransfer(t *testing.T) { initialExitEventID := getLastExitEventID(t, childchainTxRelayer) erc721DeployTxn := cluster.Deploy(t, admin, contractsapi.RootERC721.Bytecode) - require.NoError(t, erc721DeployTxn.Wait()) require.True(t, erc721DeployTxn.Succeed()) rootERC721Token := types.Address(erc721DeployTxn.Receipt().ContractAddress) @@ -867,7 +866,6 @@ func TestE2E_Bridge_ChildchainTokensTransfer(t *testing.T) { require.NoError(t, err) mintTxn := cluster.MethodTxn(t, admin, rootERC721Token, mintInput) - require.NoError(t, mintTxn.Wait()) require.True(t, mintTxn.Succeed()) // add all depositors to bride block list diff --git a/e2e-polybft/e2e/helpers_test.go b/e2e-polybft/e2e/helpers_test.go index b623d5a6c8..59d82e64ab 100644 --- a/e2e-polybft/e2e/helpers_test.go +++ b/e2e-polybft/e2e/helpers_test.go @@ -144,7 +144,7 @@ func setAccessListRole(t *testing.T, cluster *framework.TestCluster, precompile, require.NoError(t, err) enableSetTxn := cluster.MethodTxn(t, aclAdmin, precompile, input) - require.NoError(t, enableSetTxn.Wait()) + require.True(t, enableSetTxn.Succeed()) expectRole(t, cluster, precompile, account, role) } diff --git a/e2e-polybft/e2e/jsonrpc_test.go b/e2e-polybft/e2e/jsonrpc_test.go index ff46c54622..03f22aa30b 100644 --- a/e2e-polybft/e2e/jsonrpc_test.go +++ b/e2e-polybft/e2e/jsonrpc_test.go @@ -31,6 +31,7 @@ func TestE2E_JsonRPC(t *testing.T) { framework.WithEpochSize(int(epochSize)), framework.WithPremine(preminedAcct.Address()), framework.WithBurnContract(&polybft.BurnContractInfo{BlockNumber: 0, Address: types.ZeroAddress}), + framework.WithHTTPS("/etc/ssl/certs/localhost.pem", "/etc/ssl/private/localhost.key"), ) defer cluster.Stop() @@ -99,7 +100,6 @@ func TestE2E_JsonRPC(t *testing.T) { t.Run("eth_getCode", func(t *testing.T) { deployTxn := cluster.Deploy(t, preminedAcct, contractsapi.TestSimple.Bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Succeed()) target := types.Address(deployTxn.Receipt().ContractAddress) @@ -114,11 +114,9 @@ func TestE2E_JsonRPC(t *testing.T) { require.NoError(t, err) txn := cluster.Transfer(t, preminedAcct, key1.Address(), ethgo.Ether(1)) - require.NoError(t, txn.Wait()) require.True(t, txn.Succeed()) txn = cluster.Deploy(t, key1, contractsapi.TestSimple.Bytecode) - require.NoError(t, txn.Wait()) require.True(t, txn.Succeed()) target := types.Address(txn.Receipt().ContractAddress) @@ -135,7 +133,6 @@ func TestE2E_JsonRPC(t *testing.T) { require.NoError(t, err) txn = cluster.SendTxn(t, key1, types.NewTx(types.NewLegacyTx(types.WithInput(input), types.WithTo(&target)))) - require.NoError(t, txn.Wait()) require.True(t, txn.Succeed()) resp, err = newEthClient.GetStorageAt(target, types.Hash{}, bladeRPC.LatestBlockNumberOrHash) @@ -145,7 +142,6 @@ func TestE2E_JsonRPC(t *testing.T) { t.Run("eth_getTransactionByHash and eth_getTransactionReceipt", func(t *testing.T) { txn := cluster.Transfer(t, preminedAcct, types.StringToAddress("0xDEADBEEF"), one) - require.NoError(t, txn.Wait()) require.True(t, txn.Succeed()) ethTxn, err := newEthClient.GetTransactionByHash(types.Hash(txn.Receipt().TransactionHash)) @@ -165,7 +161,6 @@ func TestE2E_JsonRPC(t *testing.T) { require.GreaterOrEqual(t, nonce, uint64(0)) // since we used this account in previous tests txn := cluster.Transfer(t, preminedAcct, types.StringToAddress("0xDEADBEEF"), one) - require.NoError(t, txn.Wait()) require.True(t, txn.Succeed()) newNonce, err := newEthClient.GetNonce(preminedAcct.Address(), bladeRPC.LatestBlockNumberOrHash) @@ -183,7 +178,6 @@ func TestE2E_JsonRPC(t *testing.T) { tokens := ethgo.Ether(1) txn := cluster.Transfer(t, preminedAcct, receiver, tokens) - require.NoError(t, txn.Wait()) require.True(t, txn.Succeed()) newBalance, err := newEthClient.GetBalance(receiver, bladeRPC.LatestBlockNumberOrHash) @@ -193,7 +187,6 @@ func TestE2E_JsonRPC(t *testing.T) { t.Run("eth_estimateGas", func(t *testing.T) { deployTxn := cluster.Deploy(t, preminedAcct, contractsapi.TestSimple.Bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Succeed()) target := types.Address(deployTxn.Receipt().ContractAddress) @@ -216,7 +209,6 @@ func TestE2E_JsonRPC(t *testing.T) { t.Run("eth_call", func(t *testing.T) { deployTxn := cluster.Deploy(t, preminedAcct, contractsapi.TestSimple.Bytecode) - require.NoError(t, deployTxn.Wait()) require.True(t, deployTxn.Succeed()) target := types.Address(deployTxn.Receipt().ContractAddress) @@ -260,7 +252,6 @@ func TestE2E_JsonRPC(t *testing.T) { newAccountKey, newAccountAddr := tests.GenerateKeyAndAddr(t) transferTxn := cluster.Transfer(t, preminedAcct, newAccountAddr, tokenAmount) - require.NoError(t, transferTxn.Wait()) require.True(t, transferTxn.Succeed()) newAccountBalance, err := newEthClient.GetBalance(newAccountAddr, bladeRPC.LatestBlockNumberOrHash) @@ -286,4 +277,36 @@ func TestE2E_JsonRPC(t *testing.T) { require.NoError(t, err) require.NotEqual(t, types.ZeroHash, hash) }) + + t.Run("eth_getHeaderByNumber", func(t *testing.T) { + key1, err := crypto.GenerateECDSAKey() + require.NoError(t, err) + + txn := cluster.Transfer(t, preminedAcct, key1.Address(), one) + require.True(t, txn.Succeed()) + txReceipt := txn.Receipt() + + var header types.Header + err = newEthClient.EndpointCall("eth_getHeaderByNumber", &header, ethgo.BlockNumber(txReceipt.BlockNumber)) + require.NoError(t, err) + + require.Equal(t, txReceipt.BlockNumber, header.Number) + require.Equal(t, txReceipt.BlockHash, ethgo.Hash(header.Hash)) + }) + + t.Run("eth_getHeaderByHash", func(t *testing.T) { + key1, err := crypto.GenerateECDSAKey() + require.NoError(t, err) + + txn := cluster.Transfer(t, preminedAcct, key1.Address(), one) + require.True(t, txn.Succeed()) + txReceipt := txn.Receipt() + + var header types.Header + err = newEthClient.EndpointCall("eth_getHeaderByHash", &header, txReceipt.BlockHash) + require.NoError(t, err) + + require.Equal(t, txReceipt.BlockNumber, header.Number) + require.Equal(t, txReceipt.BlockHash, ethgo.Hash(header.Hash)) + }) } diff --git a/e2e-polybft/e2e/storage_test.go b/e2e-polybft/e2e/storage_test.go index b9ff7424c9..689af5e7af 100644 --- a/e2e-polybft/e2e/storage_test.go +++ b/e2e-polybft/e2e/storage_test.go @@ -50,7 +50,7 @@ func TestE2E_Storage(t *testing.T) { // Send every second transaction as a dynamic fees one var txn *types.Transaction - if i%2 == 10 { // Intentionally disable it since dynamic fee tx not working + if i%2 == 0 { // Intentionally disable it since dynamic fee tx not working chainID, err := client.ChainID() require.NoError(t, err) @@ -72,8 +72,7 @@ func TestE2E_Storage(t *testing.T) { txn.SetNonce(uint64(i)) tx := cluster.SendTxn(t, sender, txn) - err = tx.Wait() - require.NoError(t, err) + require.True(t, tx.Succeed()) txs = append(txs, tx) }(i, receivers[i]) @@ -124,15 +123,17 @@ func checkStorage(t *testing.T, txs []*framework.TestTxn, client *jsonrpc.EthCli assert.Equal(t, tx.Txn().Nonce(), bt.Nonce()) assert.Equal(t, tx.Receipt().TransactionIndex, bt.TxnIndex) v, r, s := bt.RawSignatureValues() - assert.NotEmpty(t, v) - assert.NotEmpty(t, r) - assert.NotEmpty(t, s) + assert.NotNil(t, v) + assert.NotNil(t, r) + assert.NotNil(t, s) assert.Equal(t, tx.Txn().From().Bytes(), bt.From().Bytes()) assert.Equal(t, tx.Txn().To().Bytes(), bt.To().Bytes()) - if i%2 == 10 { // Intentionally disable it since dynamic fee tx not working - assert.Equal(t, ethgo.TransactionDynamicFee, bt.Type()) - assert.Equal(t, uint64(0), bt.GasPrice().Uint64()) + if i%2 == 0 { + assert.Equal(t, types.DynamicFeeTxType, bt.Type()) + assert.Nil(t, bt.GasPrice()) // dynamic txs don't have gasPrice set + assert.NotNil(t, bt.GasFeeCap()) + assert.NotNil(t, bt.GasTipCap()) assert.NotNil(t, bt.ChainID()) } else { // assert.Equal(t, ethgo.TransactionLegacy, bt.Type) diff --git a/e2e-polybft/framework/test-cluster.go b/e2e-polybft/framework/test-cluster.go index 7a4916a615..9f0e3801df 100644 --- a/e2e-polybft/framework/test-cluster.go +++ b/e2e-polybft/framework/test-cluster.go @@ -237,8 +237,6 @@ type TestCluster struct { once sync.Once failCh chan struct{} executionErr error - - sendTxnLock sync.Mutex } type ClusterOption func(*TestClusterConfig) @@ -519,7 +517,7 @@ func NewTestCluster(t *testing.T, validatorsCount int, opts ...ClusterOption) *T testType = "integration" } - t.Skip(fmt.Sprintf("%s tests are disabled.", testType)) + t.Skipf("%s tests are disabled.", testType) } config.TmpDir, err = os.MkdirTemp("/tmp", "e2e-polybft-") @@ -989,7 +987,7 @@ func (c *TestCluster) InitSecrets(prefix string, count int) ([]types.Address, er return nil, err } - re := regexp.MustCompile("\\(address\\) = 0x([a-fA-F0-9]+)") + re := regexp.MustCompile(`\(address\) = 0x([a-fA-F0-9]+)`) parsed := re.FindAllStringSubmatch(b.String(), -1) result := make([]types.Address, len(parsed)) @@ -1081,69 +1079,25 @@ func (c *TestCluster) MethodTxn(t *testing.T, sender *crypto.ECDSAKey, target ty func (c *TestCluster) SendTxn(t *testing.T, sender *crypto.ECDSAKey, txn *types.Transaction) *TestTxn { t.Helper() - // since we might use get nonce to query the latest nonce and that value is only - // updated if the transaction is on the pool, it is recommended to lock the whole - // execution in case we send multiple transactions from the same account and we expect - // to get a sequential nonce order. - c.sendTxnLock.Lock() - defer c.sendTxnLock.Unlock() - - client, err := jsonrpc.NewEthClient(c.Servers[0].JSONRPCAddr()) + txRelayer, err := txrelayer.NewTxRelayer( + txrelayer.WithIPAddress(c.Servers[0].JSONRPCAddr()), + txrelayer.WithReceiptsTimeout(1*time.Minute), + txrelayer.WithEstimateGasFallback(), + ) require.NoError(t, err) - // initialize transaction values if not set - if txn.Nonce() == 0 { - nonce, err := client.GetNonce(sender.Address(), jsonrpc.LatestBlockNumberOrHash) - require.NoError(t, err) - - txn.SetNonce(nonce) - } - - if txn.GasPrice() == nil || txn.GasPrice() == big.NewInt(0) { - gasPrice, err := client.GasPrice() - require.NoError(t, err) - - txn.SetGasPrice(new(big.Int).SetUint64(gasPrice)) - } - - if txn.Gas() == 0 { - callMsg := txrelayer.ConvertTxnToCallMsg(txn) - - gasLimit, err := client.EstimateGas(callMsg) - if err != nil { - // gas estimation can fail in case an account is not allow-listed - // (fallback it to default gas limit in that case) - txn.SetGas(txrelayer.DefaultGasLimit) - } else { - txn.SetGas(gasLimit) - } + receipt, err := txRelayer.SendTransaction(txn, sender) + if err != nil { + t.Errorf("failed to send transaction: %s", err.Error()) } - chainID, err := client.ChainID() - require.NoError(t, err) - - signer := crypto.NewLondonSigner(chainID.Uint64()) - signedTxn, err := signer.SignTxWithCallback(txn, - func(hash types.Hash) (sig []byte, err error) { - return sender.Sign(hash.Bytes()) - }) - require.NoError(t, err) - - rlpTxn := signedTxn.MarshalRLPTo(nil) - - hash, err := client.SendRawTransaction(rlpTxn) - require.NoError(t, err) - return &TestTxn{ - client: client, - txn: txn, - hash: hash, + txn: txn, + receipt: receipt, } } type TestTxn struct { - client *jsonrpc.EthClient - hash types.Hash txn *types.Transaction receipt *ethgo.Receipt } @@ -1174,32 +1128,6 @@ func (t *TestTxn) Reverted() bool { return t.Failed() && t.txn.Gas() == t.receipt.GasUsed } -// Wait waits for the transaction to be executed -func (t *TestTxn) Wait() error { - tt := time.NewTimer(1 * time.Minute) - - for { - select { - case <-time.After(100 * time.Millisecond): - receipt, err := t.client.GetTransactionReceipt(t.hash) - if err != nil { - if err.Error() != "not found" { - return err - } - } - - if receipt != nil { - t.receipt = receipt - - return nil - } - - case <-tt.C: - return fmt.Errorf("timeout") - } - } -} - func sliceAddressToSliceString(addrs []types.Address) []string { res := make([]string, len(addrs)) for indx, addr := range addrs { diff --git a/txrelayer/txrelayer.go b/txrelayer/txrelayer.go index 27fec88889..188279b42a 100644 --- a/txrelayer/txrelayer.go +++ b/txrelayer/txrelayer.go @@ -51,11 +51,12 @@ type TxRelayer interface { var _ TxRelayer = (*TxRelayerImpl)(nil) type TxRelayerImpl struct { - ipAddress string - client *jsonrpc.EthClient - receiptsPollFreq time.Duration - receiptsTimeout time.Duration - noWaitReceipt bool + ipAddress string + client *jsonrpc.EthClient + receiptsPollFreq time.Duration + receiptsTimeout time.Duration + noWaitReceipt bool + estimateGasFallback bool lock sync.Mutex @@ -209,10 +210,17 @@ func (t *TxRelayerImpl) sendTransactionLocked(txn *types.Transaction, key crypto if txn.Gas() == 0 { gasLimit, err := t.client.EstimateGas(ConvertTxnToCallMsg(txn)) if err != nil { - return types.ZeroHash, fmt.Errorf("failed to estimate gas: %w", err) + if !t.estimateGasFallback { + return types.ZeroHash, fmt.Errorf("failed to estimate gas: %w", err) + } + + gasLimit = DefaultGasLimit + } else { + // increase gas limit by certain percentage + gasLimit += (gasLimit * gasLimitIncreasePercentage / 100) } - txn.SetGas(gasLimit + (gasLimit * gasLimitIncreasePercentage / 100)) + txn.SetGas(gasLimit) } signer := crypto.NewLondonSigner( @@ -281,7 +289,11 @@ func (t *TxRelayerImpl) sendTransactionLocalLocked(txn *types.Transaction) (type gasLimit, err := t.client.EstimateGas(ConvertTxnToCallMsg(txn)) if err != nil { - return types.ZeroHash, err + if !t.estimateGasFallback { + return types.ZeroHash, err + } + + gasLimit = DefaultGasLimit } txn.SetGas(gasLimit) @@ -371,3 +383,9 @@ func WithReceiptsTimeout(receiptsTimeout time.Duration) TxRelayerOption { t.receiptsTimeout = receiptsTimeout } } + +func WithEstimateGasFallback() TxRelayerOption { + return func(t *TxRelayerImpl) { + t.estimateGasFallback = true + } +} From 45b455ed4ff75cced3afeb4875e00947f6ed4aa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:10:43 +0200 Subject: [PATCH 05/15] Bump google.golang.org/grpc from 1.62.0 to 1.62.1 (#175) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5ea0dfc8cc..3d119f9bce 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( golang.org/x/sync v0.6.0 golang.org/x/tools v0.18.0 google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/DataDog/dd-trace-go.v1 v1.61.0 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce diff --git a/go.sum b/go.sum index 7984a31c13..62cbd5f063 100644 --- a/go.sum +++ b/go.sum @@ -932,8 +932,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From de0b24db7f566b865f9d7c36667876dcd5d556b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:11:07 +0200 Subject: [PATCH 06/15] Bump github.com/aws/aws-sdk-go from 1.50.8 to 1.51.11 (#176) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3d119f9bce..34472b8f7b 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Ethernal-Tech/blockchain-event-tracker v0.0.0-20231202204931-b886edca635a github.com/Ethernal-Tech/merkle-tree v0.0.0-20231213143318-4db9da419e04 github.com/armon/go-metrics v0.4.1 - github.com/aws/aws-sdk-go v1.50.8 + github.com/aws/aws-sdk-go v1.51.11 github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.5.0 diff --git a/go.sum b/go.sum index 62cbd5f063..59b0d59a46 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.50.8 h1:gY0WoOW+/Wz6XmYSgDH9ge3wnAevYDSQWPxxJvqAkP4= -github.com/aws/aws-sdk-go v1.50.8/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.51.11 h1:El5VypsMIz7sFwAAj/j06JX9UGs4KAbAIEaZ57bNY4s= +github.com/aws/aws-sdk-go v1.51.11/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= From 2cfc3a071e8d57f60e250a75075a12a2decb6597 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:15:48 +0200 Subject: [PATCH 07/15] Bump github.com/valyala/fastjson from 1.6.3 to 1.6.4 (#177) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 34472b8f7b..ee48662884 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/trailofbits/go-fuzz-utils v0.0.0-20210901195358-9657fcfd256c github.com/umbracle/fastrlp v0.1.1-0.20230504065717-58a1b8a9929d github.com/umbracle/go-eth-bn256 v0.0.0-20230125114011-47cb310d9b0b - github.com/valyala/fastjson v1.6.3 + github.com/valyala/fastjson v1.6.4 go.etcd.io/bbolt v1.3.9 golang.org/x/crypto v0.20.0 golang.org/x/sync v0.6.0 diff --git a/go.sum b/go.sum index 59b0d59a46..9add493f62 100644 --- a/go.sum +++ b/go.sum @@ -664,8 +664,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc= -github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= +github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ= +github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From ac1ed52318726ecaf787983e1c28eb302af30b39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:16:26 +0200 Subject: [PATCH 08/15] Bump github.com/multiformats/go-multiaddr from 0.12.2 to 0.12.3 (#178) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ee48662884..97a6735c82 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/libp2p/go-libp2p v0.32.0 github.com/libp2p/go-libp2p-kbucket v0.6.3 github.com/libp2p/go-libp2p-pubsub v0.10.0 - github.com/multiformats/go-multiaddr v0.12.2 + github.com/multiformats/go-multiaddr v0.12.3 github.com/prometheus/client_golang v1.19.0 github.com/quasilyte/go-ruleguard v0.4.2 github.com/quasilyte/go-ruleguard/dsl v0.3.22 diff --git a/go.sum b/go.sum index 9add493f62..aabbddb10b 100644 --- a/go.sum +++ b/go.sum @@ -459,8 +459,8 @@ github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9 github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo= github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= -github.com/multiformats/go-multiaddr v0.12.2 h1:9G9sTY/wCYajKa9lyfWPmpZAwe6oV+Wb1zcmMS1HG24= -github.com/multiformats/go-multiaddr v0.12.2/go.mod h1:GKyaTYjZRdcUhyOetrxTk9z0cW+jA/YrnqTOvKgi44M= +github.com/multiformats/go-multiaddr v0.12.3 h1:hVBXvPRcKG0w80VinQ23P5t7czWgg65BmIvQKjDydU8= +github.com/multiformats/go-multiaddr v0.12.3/go.mod h1:sBXrNzucqkFJhvKOiwwLyqamGa/P5EIXNPLovyhQCII= github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A= github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk= github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E= From fabeafaa8ba00744ca66f87ad75f36db8b25c49b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:17:11 +0200 Subject: [PATCH 09/15] Bump github.com/erigontech/mdbx-go from 0.37.1 to 0.37.2 (#179) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 97a6735c82..fb41131cf9 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.5.0 github.com/envoyproxy/protoc-gen-validate v1.0.4 - github.com/erigontech/mdbx-go v0.37.1 + github.com/erigontech/mdbx-go v0.37.2 github.com/golang/protobuf v1.5.3 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.1 diff --git a/go.sum b/go.sum index aabbddb10b..4ad87bcce8 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= -github.com/erigontech/mdbx-go v0.37.1 h1:Z4gxQrsHds+TcyQYvuEeu4Tia90I9xrrO6iduSfzRXg= -github.com/erigontech/mdbx-go v0.37.1/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= +github.com/erigontech/mdbx-go v0.37.2 h1:KxSHRcbXX9uACoJPuW3Jmu1QB7M68rwjDOkbcNIz8fc= +github.com/erigontech/mdbx-go v0.37.2/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= From d262a7266c740d6bbf343b0470e5dfe7495f7662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:35:36 +0200 Subject: [PATCH 10/15] Bump github.com/hashicorp/vault/api from 1.12.0 to 1.12.2 (#186) --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fb41131cf9..c492f4b888 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 github.com/hashicorp/hcl v1.0.1-vault-5 - github.com/hashicorp/vault/api v1.12.0 + github.com/hashicorp/vault/api v1.12.2 github.com/json-iterator/go v1.1.12 github.com/libp2p/go-libp2p v0.32.0 github.com/libp2p/go-libp2p-kbucket v0.6.3 @@ -89,7 +89,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/ebitengine/purego v0.6.0-alpha.5 // indirect github.com/elastic/gosigar v0.14.2 // indirect - github.com/fatih/color v1.15.0 // indirect + github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/flynn/noise v1.0.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect diff --git a/go.sum b/go.sum index 4ad87bcce8..b004a4d457 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/erigontech/mdbx-go v0.37.2 h1:KxSHRcbXX9uACoJPuW3Jmu1QB7M68rwjDOkbcNI github.com/erigontech/mdbx-go v0.37.2/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -317,8 +317,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvH github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM= github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM= -github.com/hashicorp/vault/api v1.12.0 h1:meCpJSesvzQyao8FCOgk2fGdoADAnbDu2WPJN1lDLJ4= -github.com/hashicorp/vault/api v1.12.0/go.mod h1:si+lJCYO7oGkIoNPAN8j3azBLTn9SjMGS+jFaHd1Cck= +github.com/hashicorp/vault/api v1.12.2 h1:7YkCTE5Ni90TcmYHDBExdt4WGJxhpzaHqR6uGbQb/rE= +github.com/hashicorp/vault/api v1.12.2/go.mod h1:LSGf1NGT1BnvFFnKVtnvcaLBM2Lz+gJdpL6HUYed8KE= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= From 760f638f1a3e7bb19f9c7d3c76be708ea83514c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:54:46 +0200 Subject: [PATCH 11/15] Bump golang.org/x/crypto from 0.20.0 to 0.21.0 (#181) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.20.0 to 0.21.0. - [Commits](https://github.com/golang/crypto/compare/v0.20.0...v0.21.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index c492f4b888..552e2a8d4a 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/umbracle/go-eth-bn256 v0.0.0-20230125114011-47cb310d9b0b github.com/valyala/fastjson v1.6.4 go.etcd.io/bbolt v1.3.9 - golang.org/x/crypto v0.20.0 + golang.org/x/crypto v0.21.0 golang.org/x/sync v0.6.0 golang.org/x/tools v0.18.0 google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 @@ -212,7 +212,7 @@ require ( golang.org/x/mod v0.15.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/go.sum b/go.sum index b004a4d457..58971342de 100644 --- a/go.sum +++ b/go.sum @@ -728,8 +728,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg= -golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= @@ -846,8 +846,9 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= From 2fa376d87541619a5ad44fc9359be498c6cb14eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:55:18 +0200 Subject: [PATCH 12/15] Bump golang.org/x/tools from 0.18.0 to 0.19.0 (#182) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.18.0 to 0.19.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 552e2a8d4a..94d6c7c1f2 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( go.etcd.io/bbolt v1.3.9 golang.org/x/crypto v0.21.0 golang.org/x/sync v0.6.0 - golang.org/x/tools v0.18.0 + golang.org/x/tools v0.19.0 google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 @@ -209,8 +209,8 @@ require ( go.uber.org/zap v1.26.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/exp/typeparams v0.0.0-20240213143201-ec583247a57a // indirect - golang.org/x/mod v0.15.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/mod v0.16.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index 58971342de..762863fd6d 100644 --- a/go.sum +++ b/go.sum @@ -750,8 +750,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -779,8 +779,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -892,8 +892,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 240be23fc280d1e6bf5b1bb9dca6867f2d4fba75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 08:21:56 +0200 Subject: [PATCH 13/15] Bump github.com/golang/protobuf from 1.5.3 to 1.5.4 (#183) Bumps [github.com/golang/protobuf](https://github.com/golang/protobuf) from 1.5.3 to 1.5.4. - [Release notes](https://github.com/golang/protobuf/releases) - [Commits](https://github.com/golang/protobuf/compare/v1.5.3...v1.5.4) --- updated-dependencies: - dependency-name: github.com/golang/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 94d6c7c1f2..a47b3cb1bc 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/envoyproxy/protoc-gen-validate v1.0.4 github.com/erigontech/mdbx-go v0.37.2 - github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.1 github.com/hashicorp/go-hclog v1.6.2 diff --git a/go.sum b/go.sum index 762863fd6d..b993fea670 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= From 118018c60db061888c366092d1a63d76f83e1fbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:07:59 +0200 Subject: [PATCH 14/15] Bump cloud.google.com/go/secretmanager from 1.11.5 to 1.12.0 (#185) Bumps [cloud.google.com/go/secretmanager](https://github.com/googleapis/google-cloud-go) from 1.11.5 to 1.12.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/secretmanager/v1.11.5...dlp/v1.12.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/secretmanager dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 28 ++++++++++++++-------------- go.sum | 58 ++++++++++++++++++++++++++++------------------------------ 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/go.mod b/go.mod index a47b3cb1bc..7dd3d9802b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/0xPolygon/polygon-edge go 1.21 require ( - cloud.google.com/go/secretmanager v1.11.5 + cloud.google.com/go/secretmanager v1.12.0 github.com/0xPolygon/go-ibft v0.4.1-0.20230717081138-628065cf23b6 github.com/Ethernal-Tech/blockchain-event-tracker v0.0.0-20231202204931-b886edca635a github.com/Ethernal-Tech/merkle-tree v0.0.0-20231213143318-4db9da419e04 @@ -44,7 +44,7 @@ require ( golang.org/x/crypto v0.21.0 golang.org/x/sync v0.6.0 golang.org/x/tools v0.19.0 - google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/DataDog/dd-trace-go.v1 v1.61.0 @@ -54,9 +54,9 @@ require ( ) require ( - cloud.google.com/go/compute v1.23.3 // indirect + cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.5 // indirect + cloud.google.com/go/iam v1.1.6 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/DataDog/appsec-internal-go v1.4.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect @@ -108,7 +108,7 @@ require ( github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 // indirect @@ -196,11 +196,11 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.50.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect - go.opentelemetry.io/otel v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.22.0 // indirect - go.opentelemetry.io/otel/trace v1.22.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.17.1 // indirect go.uber.org/fx v1.20.1 // indirect @@ -211,15 +211,15 @@ require ( golang.org/x/exp/typeparams v0.0.0-20240213143201-ec583247a57a // indirect golang.org/x/mod v0.16.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.160.0 // indirect + google.golang.org/api v0.169.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect gotest.tools/v3 v3.0.2 // indirect lukechampine.com/blake3 v1.2.1 // indirect ) diff --git a/go.sum b/go.sum index b993fea670..9e52f884a2 100644 --- a/go.sum +++ b/go.sum @@ -4,14 +4,14 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= -cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= -cloud.google.com/go/secretmanager v1.11.5 h1:82fpF5vBBvu9XW4qj0FU2C6qVMtj1RM/XHwKXUEAfYY= -cloud.google.com/go/secretmanager v1.11.5/go.mod h1:eAGv+DaCHkeVyQi0BeXgAHOU0RdrMeZIASKc+S7VqH4= +cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= +cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= +cloud.google.com/go/secretmanager v1.12.0 h1:e5pIo/QEgiFiHPVJPxM5jbtUr4O/u5h2zLHYtkFQr24= +cloud.google.com/go/secretmanager v1.12.0/go.mod h1:Y1Gne3Ag+fZ2TDTiJc8ZJCMFbi7k1rYT4Rw30GXfvlk= dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= @@ -104,8 +104,6 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= @@ -271,8 +269,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= -github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= -github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= @@ -677,18 +675,18 @@ go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= -go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= -go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= -go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= -go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= -go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= -go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -785,8 +783,8 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -904,8 +902,8 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNq google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= -google.golang.org/api v0.160.0 h1:SEspjXHVqE1m5a1fRy8JFB+5jSu+V0GEDKDghF3ttO4= -google.golang.org/api v0.160.0/go.mod h1:0mu0TpK33qnydLvWqbImq2b1eQ5FHRSDCBzAxX9ZHyw= +google.golang.org/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY= +google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -919,12 +917,12 @@ google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= -google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8= -google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 h1:Xs9lu+tLXxLIfuci70nG4cpwaRC+mRQPUL7LoIeDJC4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= From da15fcff06bb547f963f6db29f07ae889e7a11d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:08:20 +0200 Subject: [PATCH 15/15] Bump gopkg.in/DataDog/dd-trace-go.v1 from 1.61.0 to 1.62.0 (#184) Bumps gopkg.in/DataDog/dd-trace-go.v1 from 1.61.0 to 1.62.0. --- updated-dependencies: - dependency-name: gopkg.in/DataDog/dd-trace-go.v1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 7dd3d9802b..b2d308d7de 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 - gopkg.in/DataDog/dd-trace-go.v1 v1.61.0 + gopkg.in/DataDog/dd-trace-go.v1 v1.62.0 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce gopkg.in/yaml.v3 v3.0.1 pgregory.net/rapid v1.1.0 @@ -58,11 +58,11 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.6 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/DataDog/appsec-internal-go v1.4.1 // indirect + github.com/DataDog/appsec-internal-go v1.5.0 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect github.com/DataDog/datadog-go/v5 v5.3.0 // indirect - github.com/DataDog/go-libddwaf/v2 v2.3.1 // indirect + github.com/DataDog/go-libddwaf/v2 v2.3.2 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/gostackparse v0.7.0 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect diff --git a/go.sum b/go.sum index 9e52f884a2..8d37acc24f 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,8 @@ github.com/0xPolygon/go-ibft v0.4.1-0.20230717081138-628065cf23b6/go.mod h1:0W1B github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.4.1 h1:xpAS/hBo429pVh7rngquAK2DezUaJjfsX7Wd8cw0aIk= -github.com/DataDog/appsec-internal-go v1.4.1/go.mod h1:rmZ+tpq5ZPKmeOUMYjWFg+q1mRd13mxZwSLBG+xa1ik= +github.com/DataDog/appsec-internal-go v1.5.0 h1:8kS5zSx5T49uZ8dZTdT19QVAvC/B8ByyZdhQKYQWHno= +github.com/DataDog/appsec-internal-go v1.5.0/go.mod h1:pEp8gjfNLtEOmz+iZqC8bXhu0h4k7NUsW/qiQb34k1U= github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= @@ -31,8 +31,8 @@ github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.3.0 h1:2q2qjFOb3RwAZNU+ez27ZVDwErJv5/VpbBPprz7Z+s8= github.com/DataDog/datadog-go/v5 v5.3.0/go.mod h1:XRDJk1pTc00gm+ZDiBKsjh7oOOtJfYfglVCmFb8C2+Q= -github.com/DataDog/go-libddwaf/v2 v2.3.1 h1:bujaT5+KnLDFQqVA5ilvVvW+evUSHow9FrTHRgUwN4A= -github.com/DataDog/go-libddwaf/v2 v2.3.1/go.mod h1:gsCdoijYQfj8ce/T2bEDNPZFIYnmHluAgVDpuQOWMZE= +github.com/DataDog/go-libddwaf/v2 v2.3.2 h1:pdi9xjWW57IpOpTeOyPuNveEDFLmmInsHDeuZk3TY34= +github.com/DataDog/go-libddwaf/v2 v2.3.2/go.mod h1:gsCdoijYQfj8ce/T2bEDNPZFIYnmHluAgVDpuQOWMZE= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/IGQh4= @@ -697,8 +697,8 @@ go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk= go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -948,8 +948,8 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -gopkg.in/DataDog/dd-trace-go.v1 v1.61.0 h1:XKO91GwTjpIRhd56Xif/BZ2YgHkQufVTOvtkbRYSPi8= -gopkg.in/DataDog/dd-trace-go.v1 v1.61.0/go.mod h1:NHKX1t9eKmajySb6H+zLdgZizCFzbt5iKvrTyxEyy8w= +gopkg.in/DataDog/dd-trace-go.v1 v1.62.0 h1:jeZxE4ZlfAc+R0zO5TEmJBwOLet3NThsOfYJeSQg1x0= +gopkg.in/DataDog/dd-trace-go.v1 v1.62.0/go.mod h1:YTvYkk3PTsfw0OWrRFxV/IQ5Gy4nZ5TRvxTAP3JcIzs= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=