From bbd52d324914d737469e666d5e5279b4ed01f8c6 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 12 May 2023 19:20:54 +0900 Subject: [PATCH] Merge `ethereum/hive/master` (#26) * simulators/ethereum/engine: send `eth_` requests to port 8545 (#752) simulators/ethereum/engine: send `eth_` requests to 8545 * clients/ethereumjs: Update branch (#753) * clients/ethereumjs: Change git branch * clients/ethereumjs: Fix bash script issues * simulators/ethereum/engine: node: unsubscribe from events * simulators/ethereum/engine: clmock: add extra logs * simulators/ethereum/engine: correctly stop secondary clients * simulators/eth2/common: create client interfaces, update mock builder (#738) * simulators/eth2/common: refactor clients * simulators/eth2/engine: fixes due to refactor * simulators/eth2/common: builder: invalidate payloads * simulators/eth2/common: builder readme * simulators/eth2/common: builder: add option to build a payload on an outdated version * simulators/eth2/withdrawals: add invalid built payload version test * simulators/eth2/common: builder: remove check to build invalid payload * simulators/eth2/withdrawals: Fix check * simulators/eth2/withdrawals: test case validation * simulators/eth2/common: builder: fix invalidation * simulators/eth2/withdrawals: fix verifications again * simulators/ethereum/pyspec: Comment Dockerfile to run local fixtures (#755) simulators/ethereum/pyspec: Add Dockerfile comment to run locally generated fixtures * clients/besu: add --data-storage-format=BONSAI (#758) * simulators/ethereum/engine: Unique Payload ID Tests (#757) * simulators/ethereum/engine: expose generic fcu, np * simulators/ethereum/engine: Unique payload id test * simulators/ethereum/engine: Add payload id test * simulators/ethereum/engine: Parallel getPayloadBodies Test (#749) * simulators/ethereum/engine: parallel getpayloadbodies * simulators/ethereum/withdrawals: readme * clients/erigon: --externalcl flag is not supported anymore (#760) * graphql: consistent rule for Long outputs and args (#746) * simulators/eth2: Verify block signatures on blocks sent to builder (#756) * simulators/eth2/common/builder: interfaces changes * simulators/eth2/common/builder: verify signatures * simulators/eth2/withdrawals: Verify block signatures * simulators/eth2/withdrawals: Update README * simulators/eth2/withdrawals: minor nit comment * clients/erigon: explicit --db.size.limit value (#766) * clients/nethermind: Cancun support (#762) * clients/nethermind: Cancun Support * clients/nethermind: Dockerfile args * clients/besu: Cancun Support (#769) * clients/ethereumjs: Cancun Support (#768) clients/ethereumjs: Cancun Support. * clients/go-ethereum: remove deprecated PoW (#773) Remove ethash-related flags and utils from go-ethereum, since they were deprecated upstream. --------- Co-authored-by: Martin Holst Swende * clients/nethermind: Add excessDataGas to genesis mapper. (#771) * sim/pyspec: bubble error (#777) * simulators/devp2p: fix issue causing ethereumjs to crash (#778) sim/devp2p: fix issue causing ethereumjs to crash It seems ethereumjs crashes if the chainid is not present in the genesis. --------- Co-authored-by: Mario Vega Co-authored-by: Gabriel Fukushima Co-authored-by: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> Co-authored-by: Spencer Taylor-Brown Co-authored-by: Martin Holst Swende --- clients/besu/besu.sh | 4 +- clients/besu/mapper.jq | 3 +- clients/erigon/erigon.sh | 3 +- clients/ethereumjs/Dockerfile | 2 +- clients/ethereumjs/ethereumjs.sh | 6 +- clients/ethereumjs/mapper.jq | 1 + clients/go-ethereum/Dockerfile | 5 - clients/go-ethereum/geth.sh | 8 +- clients/go-ethereum/mapper.jq | 1 + clients/nethermind/Dockerfile | 4 +- clients/nethermind/mapper.jq | 4 + clients/nethermind/nethermind.sh | 1 + simulators/devp2p/main.go | 16 +- simulators/eth2/common/builder/builder.go | 2 + simulators/eth2/common/builder/mock/README.md | 53 +- .../eth2/common/builder/mock/mock_builder.go | 749 +++++++++-- .../eth2/common/builder/mock/options.go | 448 ++++++- .../builder/types/bellatrix/bellatrix.go | 13 +- .../common/builder/types/capella/capella.go | 10 +- .../common/builder/types/common/common.go | 6 +- simulators/eth2/common/clients/beacon.go | 345 ++++-- simulators/eth2/common/clients/client.go | 151 +++ simulators/eth2/common/clients/execution.go | 396 +++--- simulators/eth2/common/clients/node.go | 89 +- simulators/eth2/common/clients/validator.go | 79 +- simulators/eth2/common/debug/debug.go | 2 +- simulators/eth2/common/go.mod | 50 +- simulators/eth2/common/go.sum | 117 +- .../eth2/common/testnet/prepared_testnet.go | 285 +++-- .../eth2/common/testnet/running_testnet.go | 73 +- simulators/eth2/engine/Dockerfile | 8 - simulators/eth2/engine/scenarios.go | 38 +- simulators/eth2/go.work.sum | 1101 +++++++++++++---- simulators/eth2/withdrawals/README.md | 15 + simulators/eth2/withdrawals/helper.go | 39 + simulators/eth2/withdrawals/main.go | 26 +- simulators/eth2/withdrawals/scenarios.go | 264 ++-- simulators/eth2/withdrawals/specs.go | 22 +- simulators/ethereum/engine/Dockerfile | 10 - simulators/ethereum/engine/client/engine.go | 14 +- .../engine/client/hive_rpc/hive_rpc.go | 18 +- .../ethereum/engine/client/node/node.go | 31 +- simulators/ethereum/engine/clmock/clmock.go | 4 + .../ethereum/engine/suites/engine/tests.go | 69 ++ .../engine/suites/transition/tests.go | 11 +- .../engine/suites/withdrawals/README.md | 7 + .../engine/suites/withdrawals/tests.go | 89 +- simulators/ethereum/engine/test/expect.go | 25 +- simulators/ethereum/engine/test/spec.go | 4 + .../graphql/testcases/01_eth_blockNumber.json | 4 +- .../graphql/testcases/02_eth_call_Block8.json | 6 +- .../testcases/03_eth_call_BlockLatest.json | 6 +- .../04_eth_estimateGas_contractDeploy.json | 4 +- .../05_eth_estimateGas_noParams.json | 4 +- .../06_eth_estimateGas_transfer.json | 4 +- .../testcases/14_eth_getBlock_byHash.json | 14 +- .../testcases/16_eth_getBlock_byNumber.json | 12 +- ...9_eth_getBlockTransactionCount_byHash.json | 2 +- ...eth_getBlockTransactionCount_byNumber.json | 12 +- .../testcases/23_eth_getLogs_matchTopic.json | 2 +- .../testcases/24_eth_getLogs_range.json | 10 +- .../30_eth_getTransaction_byHash.json | 12 +- .../testcases/32_eth_getTransactionCount.json | 4 +- .../33_eth_getTransactionReceipt.json | 12 +- .../graphql/testcases/35_graphql_pending.json | 10 +- .../testcases/41_graphql_blocks_byFrom.json | 8 +- .../testcases/42_graphql_blocks_byRange.json | 26 +- .../testcases/46_getBlock_byHexNumber.json | 14 + .../testcases/47_eth_getLogs_range_hex.json | 22 + .../48_transaction_fromByHexBlockNumber.json | 18 + simulators/ethereum/pyspec/Dockerfile | 3 + simulators/ethereum/pyspec/main.go | 6 +- simulators/ethereum/pyspec/runner.go | 25 +- simulators/ethereum/pyspec/types.go | 11 +- 74 files changed, 3688 insertions(+), 1284 deletions(-) create mode 100644 simulators/eth2/common/clients/client.go create mode 100644 simulators/ethereum/graphql/testcases/46_getBlock_byHexNumber.json create mode 100644 simulators/ethereum/graphql/testcases/47_eth_getLogs_range_hex.json create mode 100644 simulators/ethereum/graphql/testcases/48_transaction_fromByHexBlockNumber.json diff --git a/clients/besu/besu.sh b/clients/besu/besu.sh index a85096f4c6..5c468b2cc4 100644 --- a/clients/besu/besu.sh +++ b/clients/besu/besu.sh @@ -60,12 +60,12 @@ case "$HIVE_LOGLEVEL" in 4) LOG=DEBUG ;; 5) LOG=TRACE ;; esac -FLAGS="--logging=$LOG" +FLAGS="--logging=$LOG --data-storage-format=BONSAI" # Configure the chain. jq -f /mapper.jq /genesis.json > /besugenesis.json echo -n "Genesis: "; cat /besugenesis.json -FLAGS="$FLAGS --genesis-file=/besugenesis.json" +FLAGS="$FLAGS --genesis-file=/besugenesis.json " # Enable experimental 'berlin' hard-fork features if configured. #if [ -n "$HIVE_FORK_BERLIN" ]; then diff --git a/clients/besu/mapper.jq b/clients/besu/mapper.jq index b356ee63e7..a1d7de11cb 100644 --- a/clients/besu/mapper.jq +++ b/clients/besu/mapper.jq @@ -44,7 +44,8 @@ def to_int: "berlinBlock": env.HIVE_FORK_BERLIN|to_int, "londonBlock": env.HIVE_FORK_LONDON|to_int, "parisBlock": env.HIVE_MERGE_BLOCK_ID|to_int, - "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, + "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, + "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, }|remove_empty } diff --git a/clients/erigon/erigon.sh b/clients/erigon/erigon.sh index 4f54ddc2e8..510a44ca3a 100644 --- a/clients/erigon/erigon.sh +++ b/clients/erigon/erigon.sh @@ -54,6 +54,7 @@ fi # Create the data directory. mkdir /erigon-hive-datadir FLAGS="$FLAGS --datadir /erigon-hive-datadir" +FLAGS="$FLAGS --db.size.limit 2GB" # If a specific network ID is requested, use that if [ "$HIVE_NETWORK_ID" != "" ]; then @@ -135,6 +136,6 @@ if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then fi # Launch the main client. -FLAGS="$FLAGS --nat=none --externalcl" +FLAGS="$FLAGS --nat=none" echo "Running erigon with flags $FLAGS" $erigon $FLAGS diff --git a/clients/ethereumjs/Dockerfile b/clients/ethereumjs/Dockerfile index 3c00c29c76..44386d9bf2 100644 --- a/clients/ethereumjs/Dockerfile +++ b/clients/ethereumjs/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-alpine as build RUN apk update && apk add --no-cache bash git jq curl python3 gcc make g++ && rm -rf /var/cache/apk/* -RUN git clone --depth 1 https://github.com/ethereumjs/ethereumjs-monorepo.git && \ +RUN git clone --depth 1 -b develop-v7 https://github.com/ethereumjs/ethereumjs-monorepo.git && \ (cd ethereumjs-monorepo && npm i) RUN cd ethereumjs-monorepo/packages/client && npm ethereumjs --version > /version.txt diff --git a/clients/ethereumjs/ethereumjs.sh b/clients/ethereumjs/ethereumjs.sh index 2fecac56ea..14e073e57d 100644 --- a/clients/ethereumjs/ethereumjs.sh +++ b/clients/ethereumjs/ethereumjs.sh @@ -64,7 +64,7 @@ cat /genesis.json if [ "$HIVE_CLIQUE_PRIVATEKEY" != "" ]; then # Create password file. echo "Importing clique key..." - echo "$HIVE_CLIQUE_PRIVATEKEY" > ./private_key.txt + echo -n "$HIVE_CLIQUE_PRIVATEKEY" > ./private_key.txt # Ensure password file is used when running ethereumjs in mining mode. if [ "$HIVE_MINER" != "" ]; then FLAGS="$FLAGS --mine --unlock ./private_key.txt --minerCoinbase $HIVE_MINER" @@ -84,6 +84,8 @@ if [ -f /chain.rlp ]; then echo "Warning: chain.rlp not found." fi -FLAGS="$FLAGS --bootnodes=$HIVE_BOOTNODE" +if [ "$HIVE_BOOTNODE" != "" ]; then + FLAGS="$FLAGS --bootnodes=$HIVE_BOOTNODE" +fi echo "Running ethereumjs with flags $FLAGS" $ethereumjs $FLAGS diff --git a/clients/ethereumjs/mapper.jq b/clients/ethereumjs/mapper.jq index 7ff336075c..f948041907 100644 --- a/clients/ethereumjs/mapper.jq +++ b/clients/ethereumjs/mapper.jq @@ -56,5 +56,6 @@ def to_bool: "mergeForkBlock": env.HIVE_MERGE_BLOCK_ID|to_int, "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, + "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, }|remove_empty } diff --git a/clients/go-ethereum/Dockerfile b/clients/go-ethereum/Dockerfile index c9efa87a6a..f703d70413 100644 --- a/clients/go-ethereum/Dockerfile +++ b/clients/go-ethereum/Dockerfile @@ -40,9 +40,4 @@ ADD genesis.json /genesis.json # Export the usual networking ports to allow outside access to the node EXPOSE 8545 8546 8547 8551 30303 30303/udp -# Generate the ethash verification caches -RUN \ - /usr/local/bin/geth makecache 1 ~/.ethereum/geth/ethash && \ - /usr/local/bin/geth makecache 30001 ~/.ethereum/geth/ethash - ENTRYPOINT ["/geth.sh"] diff --git a/clients/go-ethereum/geth.sh b/clients/go-ethereum/geth.sh index afe47ca6f5..d35fba6a20 100644 --- a/clients/go-ethereum/geth.sh +++ b/clients/go-ethereum/geth.sh @@ -58,10 +58,6 @@ fi # It doesn't make sense to dial out, use only a pre-set bootnode. FLAGS="$FLAGS --bootnodes=$HIVE_BOOTNODE" -if [ "$HIVE_SKIP_POW" != "" ]; then - FLAGS="$FLAGS --fakepow" -fi - # If a specific network ID is requested, use that if [ "$HIVE_NETWORK_ID" != "" ]; then FLAGS="$FLAGS --networkid $HIVE_NETWORK_ID" @@ -131,7 +127,7 @@ if [ "$HIVE_CLIQUE_PRIVATEKEY" != "" ]; then # Create password file. echo "Importing clique key..." echo "secret" > /geth-password-file.txt - $geth --nousb account import --password /geth-password-file.txt <(echo "$HIVE_CLIQUE_PRIVATEKEY") + $geth account import --password /geth-password-file.txt <(echo "$HIVE_CLIQUE_PRIVATEKEY") # Ensure password file is used when running geth in mining mode. if [ "$HIVE_MINER" != "" ]; then @@ -141,7 +137,7 @@ fi # Configure any mining operation if [ "$HIVE_MINER" != "" ] && [ "$HIVE_NODETYPE" != "light" ]; then - FLAGS="$FLAGS --mine --miner.threads 1 --miner.etherbase $HIVE_MINER" + FLAGS="$FLAGS --mine --miner.etherbase $HIVE_MINER" fi if [ "$HIVE_MINER_EXTRA" != "" ]; then FLAGS="$FLAGS --miner.extradata $HIVE_MINER_EXTRA" diff --git a/clients/go-ethereum/mapper.jq b/clients/go-ethereum/mapper.jq index bbad21c66a..0434c1f593 100644 --- a/clients/go-ethereum/mapper.jq +++ b/clients/go-ethereum/mapper.jq @@ -55,5 +55,6 @@ def to_bool: "mergeForkBlock": env.HIVE_MERGE_BLOCK_ID|to_int, "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, + "terminalTotalDifficultyPassed": true, }|remove_empty } diff --git a/clients/nethermind/Dockerfile b/clients/nethermind/Dockerfile index 98551f2617..7976a3e95f 100644 --- a/clients/nethermind/Dockerfile +++ b/clients/nethermind/Dockerfile @@ -1,5 +1,7 @@ +ARG user=nethermindeth +ARG repo=hive ARG branch=latest -FROM nethermindeth/hive:$branch +FROM $user/$repo:$branch RUN apt-get update && apt-get install -y wget RUN wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -O /usr/local/bin/jq && \ diff --git a/clients/nethermind/mapper.jq b/clients/nethermind/mapper.jq index 9b5a0f92ff..4d9dedc947 100644 --- a/clients/nethermind/mapper.jq +++ b/clients/nethermind/mapper.jq @@ -142,6 +142,9 @@ def clique_engine: "eip3860TransitionTimestamp": env.HIVE_SHANGHAI_TIMESTAMP|to_hex, "eip4895TransitionTimestamp": env.HIVE_SHANGHAI_TIMESTAMP|to_hex, + # Cancun + "eip4844TransitionTimestamp": env.HIVE_CANCUN_TIMESTAMP|to_hex, + # Other chain parameters "networkID": env.HIVE_NETWORK_ID|to_hex, "chainID": env.HIVE_CHAIN_ID|to_hex, @@ -160,6 +163,7 @@ def clique_engine: "extraData": .extraData, "gasLimit": .gasLimit, "baseFeePerGas": .baseFeePerGas, + "excessDataGas": .excessDataGas, }, "accounts": ((.alloc|with_entries(.key|="0x"+.)) * { "0x0000000000000000000000000000000000000001": { diff --git a/clients/nethermind/nethermind.sh b/clients/nethermind/nethermind.sh index 597057448d..956ab47ca8 100644 --- a/clients/nethermind/nethermind.sh +++ b/clients/nethermind/nethermind.sh @@ -62,6 +62,7 @@ jq . /chainspec/test.json # Generate the config file. mkdir /configs +echo "Supplied genesis state:" jq -n -f /mkconfig.jq > /configs/test.cfg echo "test.cfg" diff --git a/simulators/devp2p/main.go b/simulators/devp2p/main.go index ca0d558aa2..854b58b387 100644 --- a/simulators/devp2p/main.go +++ b/simulators/devp2p/main.go @@ -17,10 +17,18 @@ func main() { Description: "This suite runs Discovery v4 protocol tests.", Tests: []hivesim.AnyTest{ hivesim.ClientTestSpec{ - Role: "eth1", - Parameters: hivesim.Params{"HIVE_LOGLEVEL": "5"}, - AlwaysRun: true, - Run: runDiscoveryTest, + Role: "eth1", + Parameters: hivesim.Params{ + "HIVE_NETWORK_ID": "19763", + "HIVE_CHAIN_ID": "19763", + "HIVE_FORK_HOMESTEAD": "0", + "HIVE_FORK_TANGERINE": "0", + "HIVE_FORK_SPURIOUS": "0", + "HIVE_FORK_BYZANTIUM": "0", + "HIVE_LOGLEVEL": "5", + }, + AlwaysRun: true, + Run: runDiscoveryTest, }, }, } diff --git a/simulators/eth2/common/builder/builder.go b/simulators/eth2/common/builder/builder.go index bf391a631a..268fd223b2 100644 --- a/simulators/eth2/common/builder/builder.go +++ b/simulators/eth2/common/builder/builder.go @@ -2,6 +2,7 @@ package builder import ( api "github.com/ethereum/go-ethereum/beacon/engine" + "github.com/ethereum/hive/simulators/eth2/common/builder/types/common" beacon "github.com/protolambda/zrnt/eth2/beacon/common" ) @@ -10,6 +11,7 @@ type Builder interface { Cancel() error GetBuiltPayloadsCount() int GetSignedBeaconBlockCount() int + GetSignedBeaconBlocks() map[beacon.Slot]common.SignedBeaconBlock GetModifiedPayloads() map[beacon.Slot]*api.ExecutableData GetBuiltPayloads() map[beacon.Slot]*api.ExecutableData } diff --git a/simulators/eth2/common/builder/mock/README.md b/simulators/eth2/common/builder/mock/README.md index 7dd06a343b..4cb2273731 100644 --- a/simulators/eth2/common/builder/mock/README.md +++ b/simulators/eth2/common/builder/mock/README.md @@ -2,6 +2,17 @@ Instantiates a server that listens for Builder API (https://github.com/ethereum/builder-specs/) directives and responds with payloads built using an execution client. +Currently, the builder will produce payloads with the following correct fields: +- PrevRandao +- Timestamp +- SuggestedFeeRecipient +- Withdrawals + +For the builder to function properly, the following parameters are necessary: +- Execution client: Required to build the payloads +- Beacon client: Required to fetch the state of the previous slot, and calculate, e.g., the prevrandao value + +## Mock Payload Building The builder can inject modifications into the built payloads at predefined slots by using configurable callbacks: - Before sending the ForkchoiceUpdated directive to the execution client, by modifying the payload attributes, using `WithPayloadAttributesModifier` option - Before responding with the build payload to the consensus client by modifying the any field in the payload, using `WithPayloadModifier` option @@ -10,6 +21,23 @@ Both callbacks are supplied with either the `PayloadAttributesV1`/`PayloadAttrib The callbacks must respond with a boolean indicating whether any modification was performed, and an error, if any. +Predefined invalidation can also be configured by using `WithPayloadInvalidatorAtEpoch`, `WithPayloadInvalidatorAtSlot`, `WithPayloadAttributesInvalidatorAtEpoch` or `WithPayloadAttributesInvalidatorAtSlot`. + +## Payload Invalidation Types +- `state_root`: Inserts a random state root value in the built payload. Payload can only be deemed invalid after the payload has been unblinded +- `parent_hash`: Inserts a random parent hash value in the built payload. Payload can be deemed invalid without needing to unblind +- `coinbase`: Inserts a random address as coinbase in the built payload. Payload is not invalid +- `base_fee`: Increases the base fee value by 1 in the built payload. Payload can only be deemed invalid after the payload has been unblinded +- `uncle_hash`: Inserts a random uncle hash value in the built payload. Payload can be deemed invalid without needing to unblind +- `receipt_hash`: Inserts a random receipt hash value in the built payload. Payload can only be deemed invalid after the payload has been unblinded + +## Payload Attributes Invalidation Types +- `remove_withdrawal`: Removes a withdrawal from the correct list of expected withdrawals +- `extra_withdrawal`: Inserts an extra withdrawal to the correct list of expected withdrawals +- `withdrawal_address`, `withdrawal_amount`, `withdrawal_validator_index`, `withdrawal_index`: Invalidates a single withdrawal from the correct list of expected withdrawals +- `timestamp`: Modifies the expected timestamp value of the block (-2 epochs) +- `prevrandao`/`random`: Modifies the expected prevrandao + The builder can also be configured to insert an error on: - `/eth/v1/builder/header/{slot}/{parent_hash}/{pubkey}` using `WithErrorOnHeaderRequest` option - `/eth/v1/builder/blinded_blocks` using `WithErrorOnPayloadReveal` option @@ -18,13 +46,20 @@ Both callbacks are supplied with the beacon slot number of the payload/blinded b The callback can then use the slot number to determine whether to throw an error or not. -Currently, the builder will produce payloads with the following correct fields: -- PrevRandao -- Timestamp -- SuggestedFeeRecipient -- Withdrawals +## Mock Builder REST API +### Mock Error +- `DELETE` `/mock/errors/payload_request`: Disables errors on `/eth/v1/builder/header/...` +- `POST` `/mock/errors/payload_request`: Enables errors on `/eth/v1/builder/header/...` +- `POST` `/mock/errors/payload_request//{slot/epoch number}`: Enables errors on `/eth/v1/builder/header/...` starting at the slot or epoch specified +- `DELETE` `/mock/errors/payload_reveal`: Disables errors on `/eth/v1/builder/blinded_blocks` +- `POST` `/mock/errors/payload_reveal`: Enables errors on `/eth/v1/builder/blinded_blocks` +- `POST` `/mock/errors/payload_reveal//{slot/epoch number}`: Enables errors on `/eth/v1/builder/blinded_blocks` starting at the slot or epoch specified -For the builder to function properly, the following parameters are necessary: -- Execution client: Required to build the payloads -- Beacon client: Required to fetch the state of the previous slot, and calculate, e.g., the prevrandao value -- Beacon Spec: Required so the builder is aware of fork specific changes in the built payloads, as well as the beacon blocks \ No newline at end of file +### Mock Built Payloads +- `DELETE` `/mock/invalid/payload_attributes`: Disables any payload attributes modification +- `POST` `/mock/invalid/payload_attributes/{type}`: Enables specified [type](#payload-attributes-invalidation-types) payload attributes modification +- `POST` `/mock/invalid/payload_attributes/{type}//{slot/epoch number}`: Enables specified [type](#payload-attributes-invalidation-types) payload attributes modification starting at the slot or epoch specified + +- `DELETE` `/mock/invalid/payload`: Disables any modification to payload built +- `POST` `/mock/invalid/payload/{type}`: Enables specified [type](#payload-invalidation-types) of modification to payload built +- `POST` `/mock/invalid/payload/{type}//{slot/epoch number}`: Enables specified [type](#payload-invalidation-types) of modification to payload built starting at the slot or epoch specified \ No newline at end of file diff --git a/simulators/eth2/common/builder/mock/mock_builder.go b/simulators/eth2/common/builder/mock/mock_builder.go index cf9a2cf181..dcc8fc7f8a 100644 --- a/simulators/eth2/common/builder/mock/mock_builder.go +++ b/simulators/eth2/common/builder/mock/mock_builder.go @@ -9,11 +9,12 @@ import ( "math/rand" "net" "net/http" + "strconv" "sync" "time" - el_common "github.com/ethereum/go-ethereum/common" api "github.com/ethereum/go-ethereum/beacon/engine" + el_common "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/hive/simulators/eth2/common/builder/types/bellatrix" "github.com/ethereum/hive/simulators/eth2/common/builder/types/capella" @@ -38,24 +39,28 @@ type MockBuilder struct { cl *clients.BeaconClient // General properties - srv *http.Server - sk *blsu.SecretKey - pk *blsu.Pubkey - pkBeacon beacon.BLSPubkey + srv *http.Server + sk *blsu.SecretKey + pk *blsu.Pubkey + pkBeacon beacon.BLSPubkey + builderApiDomain beacon.BLSDomain address string - spec *beacon.Spec cancel context.CancelFunc // Payload/Blocks history maps - suggestedFeeRecipients map[beacon.BLSPubkey]el_common.Address - suggestedFeeRecipientsMutex sync.Mutex - builtPayloads map[beacon.Slot]*api.ExecutableData - builtPayloadsMutex sync.Mutex - modifiedPayloads map[beacon.Slot]*api.ExecutableData - modifiedPayloadsMutex sync.Mutex - signedBeaconBlock map[tree.Root]bool - signedBeaconBlockMutex sync.Mutex + suggestedFeeRecipients map[beacon.BLSPubkey]el_common.Address + suggestedFeeRecipientsMutex sync.Mutex + builtPayloads map[beacon.Slot]*api.ExecutableData + builtPayloadsMutex sync.Mutex + modifiedPayloads map[beacon.Slot]*api.ExecutableData + modifiedPayloadsMutex sync.Mutex + validatorPublicKeys map[beacon.Slot]*beacon.BLSPubkey + validatorPublicKeysMutex sync.Mutex + receivedSignedBeaconBlocks map[beacon.Slot]common.SignedBeaconBlock + receivedSignedBeaconBlocksMutex sync.Mutex + signedBeaconBlock map[tree.Root]bool + signedBeaconBlockMutex sync.Mutex // Configuration object cfg *config @@ -67,9 +72,9 @@ const ( ) func NewMockBuilder( + ctx context.Context, el *clients.ExecutionClient, cl *clients.BeaconClient, - spec *beacon.Spec, opts ...Option, ) (*MockBuilder, error) { if el == nil { @@ -80,23 +85,23 @@ func NewMockBuilder( ) m := &MockBuilder{ - el: el, - cl: cl, - spec: spec, + el: el, + cl: cl, - suggestedFeeRecipients: make(map[beacon.BLSPubkey]el_common.Address), - builtPayloads: make(map[beacon.Slot]*api.ExecutableData), - modifiedPayloads: make(map[beacon.Slot]*api.ExecutableData), - signedBeaconBlock: make(map[tree.Root]bool), + suggestedFeeRecipients: make( + map[beacon.BLSPubkey]el_common.Address, + ), + builtPayloads: make(map[beacon.Slot]*api.ExecutableData), + modifiedPayloads: make(map[beacon.Slot]*api.ExecutableData), + validatorPublicKeys: make(map[beacon.Slot]*beacon.BLSPubkey), + receivedSignedBeaconBlocks: make( + map[beacon.Slot]common.SignedBeaconBlock, + ), + signedBeaconBlock: make(map[tree.Root]bool), cfg: &config{ host: DEFAULT_BUILDER_HOST, port: DEFAULT_BUILDER_PORT, - builderApiDomain: beacon.ComputeDomain( - DOMAIN_APPLICATION_BUILDER, - spec.GENESIS_FORK_VERSION, - tree.Root{}, - ), }, } @@ -106,7 +111,17 @@ func NewMockBuilder( } } - // builder key + if m.cfg.spec == nil { + return nil, fmt.Errorf("no spec configured") + } + m.builderApiDomain = beacon.ComputeDomain( + DOMAIN_APPLICATION_BUILDER, + m.cfg.spec.GENESIS_FORK_VERSION, + tree.Root{}, + ) + + // builder key (not cryptographically secure) + rand.Seed(time.Now().UTC().UnixNano()) skByte := [32]byte{} sk := blsu.SecretKey{} rand.Read(skByte[:]) @@ -119,20 +134,83 @@ func NewMockBuilder( copy(m.pkBeacon[:], pkBytes[:]) router := mux.NewRouter() + + // Builder API router.HandleFunc("/eth/v1/builder/validators", m.HandleValidators). Methods("POST") - router.HandleFunc("/eth/v1/builder/header/{slot}/{parenthash}/{pubkey}", m.HandleGetExecutionPayloadHeader). + router.HandleFunc("/eth/v1/builder/header/{slot:[0-9]+}/{parenthash}/{pubkey}", m.HandleGetExecutionPayloadHeader). Methods("GET") router.HandleFunc("/eth/v1/builder/blinded_blocks", m.HandleSubmitBlindedBlock). Methods("POST") router.HandleFunc("/eth/v1/builder/status", m.HandleStatus).Methods("GET") + // Mock customization + // Error on payload request + router.HandleFunc("/mock/errors/payload_request", m.HandleMockDisableErrorOnHeaderRequest). + Methods("DELETE") + router.HandleFunc("/mock/errors/payload_request", m.HandleMockEnableErrorOnHeaderRequest). + Methods("POST") + router.HandleFunc( + "/mock/errors/payload_request/slot/{slot:[0-9]+}", + m.HandleMockEnableErrorOnHeaderRequest, + ).Methods("POST") + router.HandleFunc( + "/mock/errors/payload_request/epoch/{epoch:[0-9]+}", + m.HandleMockEnableErrorOnHeaderRequest, + ).Methods("POST") + + // Error on block submission + router.HandleFunc("/mock/errors/payload_reveal", m.HandleMockDisableErrorOnPayloadReveal). + Methods("DELETE") + router.HandleFunc("/mock/errors/payload_reveal", m.HandleMockEnableErrorOnPayloadReveal). + Methods("POST") + router.HandleFunc( + "/mock/errors/payload_reveal/slot/{slot:[0-9]+}", + m.HandleMockEnableErrorOnPayloadReveal, + ).Methods("POST") + router.HandleFunc( + "/mock/errors/payload_reveal/epoch/{epoch:[0-9]+}", + m.HandleMockEnableErrorOnPayloadReveal, + ).Methods("POST") + + // Invalidate payload attributes + router.HandleFunc("/mock/invalid/payload_attributes", m.HandleMockDisableInvalidatePayloadAttributes). + Methods("DELETE") + router.HandleFunc( + "/mock/invalid/payload_attributes/{type}", + m.HandleMockEnableInvalidatePayloadAttributes, + ).Methods("POST") + router.HandleFunc( + "/mock/invalid/payload_attributes/{type}/slot/{slot:[0-9]+}", + m.HandleMockEnableInvalidatePayloadAttributes, + ).Methods("POST") + router.HandleFunc( + "/mock/invalid/payload_attributes/{type}/epoch/{epoch:[0-9]+}", + m.HandleMockEnableInvalidatePayloadAttributes, + ).Methods("POST") + + // Invalidate payload + router.HandleFunc("/mock/invalid/payload", m.HandleMockDisableInvalidatePayload). + Methods("DELETE") + router.HandleFunc( + "/mock/invalid/payload/{type}", + m.HandleMockEnableInvalidatePayload, + ).Methods("POST") + router.HandleFunc( + "/mock/invalid/payload/{type}/slot/{slot:[0-9]+}", + m.HandleMockEnableInvalidatePayload, + ).Methods("POST") + router.HandleFunc( + "/mock/invalid/payload/{type}/epoch/{epoch:[0-9]+}", + m.HandleMockEnableInvalidatePayload, + ).Methods("POST") + m.srv = &http.Server{ Handler: router, Addr: fmt.Sprintf("%s:%d", m.cfg.host, m.cfg.port), } - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(ctx) go func() { if err := m.Start(ctx); err != nil && err != context.Canceled { panic(err) @@ -150,22 +228,45 @@ func (m *MockBuilder) Cancel() error { return nil } +func (m *MockBuilder) DefaultBuilderBidVersionResolver( + slot beacon.Slot, +) (builderBid common.BuilderBid, version string, err error) { + if m.cfg.spec.SlotToEpoch(slot) >= m.cfg.spec.CAPELLA_FORK_EPOCH { + return &capella.BuilderBid{}, "capella", nil + } else if m.cfg.spec.SlotToEpoch(slot) >= m.cfg.spec.BELLATRIX_FORK_EPOCH { + return &bellatrix.BuilderBid{}, "bellatrix", nil + } + return nil, "", fmt.Errorf("payload requested from improper fork") +} + // Start a proxy server. func (m *MockBuilder) Start(ctx context.Context) error { m.srv.BaseContext = func(listener net.Listener) context.Context { return ctx } - el_address := "unknown yet" + var ( + el_address = "unknown yet" + cl_address = "unknown yet" + ) - if addr, err := m.el.UserRPCAddress(); err == nil { + if addr, err := m.el.EngineRPCAddress(); err == nil { el_address = addr } - logrus.WithFields(logrus.Fields{ + if addr, err := m.cl.BeaconAPIURL(); err == nil { + cl_address = addr + } + fields := logrus.Fields{ "builder_id": m.cfg.id, "address": m.address, "port": m.cfg.port, + "pubkey": m.pkBeacon.String(), "el_address": el_address, - }).Info("Builder now listening") + "cl_address": cl_address, + } + if m.cfg.extraDataWatermark != "" { + fields["extra-data"] = m.cfg.extraDataWatermark + } + logrus.WithFields(fields).Info("Builder now listening") go func() { if err := m.srv.ListenAndServe(); err != nil { logrus.WithFields(logrus.Fields{ @@ -212,6 +313,16 @@ func (m *MockBuilder) GetModifiedPayloads() map[beacon.Slot]*api.ExecutableData return mapCopy } +func (m *MockBuilder) GetSignedBeaconBlocks() map[beacon.Slot]common.SignedBeaconBlock { + m.receivedSignedBeaconBlocksMutex.Lock() + defer m.receivedSignedBeaconBlocksMutex.Unlock() + mapCopy := make(map[beacon.Slot]common.SignedBeaconBlock) + for k, v := range m.receivedSignedBeaconBlocks { + mapCopy[k] = v + } + return mapCopy +} + func (m *MockBuilder) HandleValidators( w http.ResponseWriter, req *http.Request, @@ -239,7 +350,7 @@ func (m *MockBuilder) HandleValidators( // Verify signature signingRoot := beacon.ComputeSigningRoot( vr.Message.HashTreeRoot(tree.GetHashFn()), - m.cfg.builderApiDomain, + m.builderApiDomain, ) pk, err := vr.Message.PubKey.Pubkey() @@ -307,7 +418,7 @@ func (m *MockBuilder) SlotToTimestamp(slot beacon.Slot) uint64 { m.cfg.beaconGenesisTime + beacon.Timestamp( slot, )*beacon.Timestamp( - m.spec.SECONDS_PER_SLOT, + m.cfg.spec.SECONDS_PER_SLOT, ), ) } @@ -398,6 +509,10 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( }).Info( "Received request for header", ) + // Save the validator public key + m.validatorPublicKeysMutex.Lock() + m.validatorPublicKeys[slot] = &pubkey + m.validatorPublicKeysMutex.Unlock() // Request head state from the CL ctx, cancel := context.WithTimeout(context.Background(), time.Second) defer cancel() @@ -453,12 +568,34 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( ) return } + // Check if we know the latest forkchoice updated - if m.el.LatestForkchoice == nil { + forkchoiceState, err = m.el.GetLatestForkchoiceUpdated(context.Background()) + if err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, - "err": "last fcu is unknown", - }).Error("Unable to respond to header request") + "err": err, + }).Error("error getting the latest forkchoiceUpdated") + http.Error( + w, + "Unable to respond to header request", + http.StatusInternalServerError, + ) + return + } else if forkchoiceState == nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Error("unable to get the latest forkchoiceUpdated") + http.Error( + w, + "Unable to respond to header request", + http.StatusInternalServerError, + ) + return + } else if bytes.Equal(forkchoiceState.HeadBlockHash[:], EMPTY_HASH[:]) { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Error("latest forkchoiceUpdated contains zero'd head") http.Error( w, "Unable to respond to header request", @@ -468,7 +605,7 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( } // Check if the requested parent matches the last fcu - if !bytes.Equal(m.el.LatestForkchoice.HeadBlockHash[:], parentHash[:]) { + if !bytes.Equal(forkchoiceState.HeadBlockHash[:], parentHash[:]) { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, "err": "last fcu head and requested parent don't match", @@ -481,14 +618,13 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( return } - forkchoiceState = m.el.LatestForkchoice } // Build payload attributes // PrevRandao prevRandaoMixes := state.RandaoMixes() - prevRandaoRoot := prevRandaoMixes[m.spec.SlotToEpoch(slot-1)] + prevRandaoRoot := prevRandaoMixes[m.cfg.spec.SlotToEpoch(slot-1)] copy(prevRandao[:], prevRandaoRoot[:]) // Timestamp @@ -499,7 +635,7 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( // Withdrawals var withdrawals types.Withdrawals - if m.spec.SlotToEpoch(slot) >= m.spec.CAPELLA_FORK_EPOCH { + if m.cfg.spec.SlotToEpoch(slot) >= m.cfg.spec.CAPELLA_FORK_EPOCH { wSsz, err := state.NextWithdrawals(slot) if err != nil { logrus.WithFields(logrus.Fields{ @@ -531,8 +667,11 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( Withdrawals: withdrawals, } - if m.cfg.payloadAttrModifier != nil { - if mod, err := m.cfg.payloadAttrModifier(&pAttr, slot); err != nil { + m.cfg.mutex.Lock() + payloadAttrModifier := m.cfg.payloadAttrModifier + m.cfg.mutex.Unlock() + if payloadAttrModifier != nil { + if mod, err := payloadAttrModifier(&pAttr, slot); err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, "err": err, @@ -544,6 +683,10 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( ) return } else if mod { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": slot, + }).Info("Modified payload attributes") payloadModified = true } } @@ -566,10 +709,12 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( 2, ) if err != nil || r.PayloadID == nil { + fcuJson, _ := json.MarshalIndent(forkchoiceState, "", " ") logrus.WithFields(logrus.Fields{ - "builder_id": m.cfg.id, - "err": err, - "payloadID": r.PayloadID, + "builder_id": m.cfg.id, + "err": err, + "forkchoiceState": string(fcuJson), + "payloadID": r.PayloadID, }).Error("Error on ForkchoiceUpdated to EL") http.Error( w, @@ -606,22 +751,28 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( } // Watermark payload - if err := ModifyExtraData(p, []byte("builder payload")); err != nil { - logrus.WithFields(logrus.Fields{ - "builder_id": m.cfg.id, - "err": err, - }).Error("Error modifying payload") - http.Error( - w, - "Unable to respond to header request", - http.StatusInternalServerError, - ) - return + if m.cfg.extraDataWatermark != "" { + if err := ModifyExtraData(p, []byte(m.cfg.extraDataWatermark)); err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Error modifying payload") + http.Error( + w, + "Unable to respond to header request", + http.StatusInternalServerError, + ) + return + } } // Modify the payload if necessary - if m.cfg.payloadModifier != nil { - if mod, err := m.cfg.payloadModifier(p, slot); err != nil { + m.cfg.mutex.Lock() + payloadModifier := m.cfg.payloadModifier + m.cfg.mutex.Unlock() + if payloadModifier != nil { + oldHash := p.BlockHash + if mod, err := payloadModifier(p, slot); err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, "err": err, @@ -633,41 +784,44 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( ) return } else if mod { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": slot, + "previous_hash": oldHash.String(), + "new_hash": p.BlockHash.String(), + }).Info("Modified payload") payloadModified = true } } - logrus.WithFields(logrus.Fields{ - "builder_id": m.cfg.id, - "payload": p.BlockHash.String(), - }).Info("Built payload from EL") - // We are ready to respond to the CL var ( builderBid common.BuilderBid version string ) - if m.spec.SlotToEpoch(slot) >= m.spec.CAPELLA_FORK_EPOCH { - builderBid = &capella.BuilderBid{} - version = "capella" - } else if m.spec.SlotToEpoch(slot) >= m.spec.BELLATRIX_FORK_EPOCH { - builderBid = &bellatrix.BuilderBid{} - version = "bellatrix" - } else { + m.cfg.mutex.Lock() + builderBidVersionResolver := m.cfg.builderBidVersionResolver + m.cfg.mutex.Unlock() + if builderBidVersionResolver == nil { + builderBidVersionResolver = m.DefaultBuilderBidVersionResolver + } + + builderBid, version, err = builderBidVersionResolver(slot) + if err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, - "err": fmt.Errorf("payload requested from improper fork"), - }).Error("Invalid slot requested") + "err": err, + }).Error("Error getting builder bid version") http.Error( w, "Unable to respond to header request", - http.StatusBadRequest, + http.StatusInternalServerError, ) return } - if err := builderBid.FromExecutableData(m.spec, p); err != nil { + if err := builderBid.FromExecutableData(m.cfg.spec, p); err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, "err": err, @@ -680,14 +834,32 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( return } - if m.cfg.payloadWeiValueBump != nil { + if m.cfg.payloadWeiValueModifier != nil { // If requested, fake a higher gwei so the CL always takes the bid - bValue = bValue.Add(bValue, m.cfg.payloadWeiValueBump) + bValue, err = m.cfg.payloadWeiValueModifier(bValue) + if err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Error modifiying bid") + http.Error( + w, + "Unable to respond to header request", + http.StatusInternalServerError, + ) + return + } } builderBid.SetValue(bValue) builderBid.SetPubKey(m.pkBeacon) - signedBid, err := builderBid.Sign(m.cfg.builderApiDomain, m.sk, m.pk) + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "payload": p.BlockHash.String(), + "value": bValue.String(), + }).Info("Built payload from EL") + + signedBid, err := builderBid.Sign(m.builderApiDomain, m.sk, m.pk) if err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, @@ -702,8 +874,11 @@ func (m *MockBuilder) HandleGetExecutionPayloadHeader( } // Check if we are supposed to simulate an error - if m.cfg.errorOnHeaderRequest != nil { - if err := m.cfg.errorOnHeaderRequest(slot); err != nil { + m.cfg.mutex.Lock() + errOnHeadeReq := m.cfg.errorOnHeaderRequest + m.cfg.mutex.Unlock() + if errOnHeadeReq != nil { + if err := errOnHeadeReq(slot); err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, "slot": slot, @@ -781,16 +956,16 @@ func (m *MockBuilder) HandleSubmitBlindedBlock( } var ( - signedBeaconBlock common.SignedBlindedBeacon + signedBeaconBlock common.SignedBeaconBlock executionPayloadResp common.ExecutionPayloadResponse ) - if m.spec.SlotToEpoch( + if m.cfg.spec.SlotToEpoch( messageSlotEnvelope.SlotEnvelope.Slot, - ) >= m.spec.CAPELLA_FORK_EPOCH { + ) >= m.cfg.spec.CAPELLA_FORK_EPOCH { signedBeaconBlock = &capella.SignedBeaconBlock{} executionPayloadResp.Version = "capella" executionPayloadResp.Data = &capella.ExecutionPayload{} - } else if m.spec.SlotToEpoch(messageSlotEnvelope.SlotEnvelope.Slot) >= m.spec.BELLATRIX_FORK_EPOCH { + } else if m.cfg.spec.SlotToEpoch(messageSlotEnvelope.SlotEnvelope.Slot) >= m.cfg.spec.BELLATRIX_FORK_EPOCH { signedBeaconBlock = &bellatrix.SignedBeaconBlock{} executionPayloadResp.Version = "bellatrix" executionPayloadResp.Data = &bellatrix.ExecutionPayload{} @@ -836,16 +1011,82 @@ func (m *MockBuilder) HandleSubmitBlindedBlock( ) // Record the signed beacon block - signedBeaconBlockRoot := signedBeaconBlock.Root(m.spec) + signedBeaconBlockRoot := signedBeaconBlock.Root(m.cfg.spec) m.signedBeaconBlockMutex.Lock() m.signedBeaconBlock[signedBeaconBlockRoot] = true m.signedBeaconBlockMutex.Unlock() + m.receivedSignedBeaconBlocksMutex.Lock() + m.receivedSignedBeaconBlocks[signedBeaconBlock.Slot()] = signedBeaconBlock + m.receivedSignedBeaconBlocksMutex.Unlock() + + // Verify signature + pubkey := m.validatorPublicKeys[signedBeaconBlock.Slot()] + if pubkey == nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": messageSlotEnvelope.SlotEnvelope.Slot, + }).Error("Could not find public key in history") + http.Error( + w, + "Unable to validate signature", + http.StatusInternalServerError, + ) + return + } + if pk, err := pubkey.Pubkey(); err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": messageSlotEnvelope.SlotEnvelope.Slot, + }).Error("Could not convert public key") + http.Error( + w, + "Unable to validate signature", + http.StatusInternalServerError, + ) + return + } else { + root := signedBeaconBlock.Root(m.cfg.spec) + sig := signedBeaconBlock.BlockSignature() + s, err := sig.Signature() + if err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": messageSlotEnvelope.SlotEnvelope.Slot, + "signature": signedBeaconBlock.BlockSignature().String(), + }).Error("Unable to validate signature") + http.Error( + w, + "Unable to validate signature", + http.StatusInternalServerError, + ) + return + } + + dom := beacon.ComputeDomain(beacon.DOMAIN_BEACON_PROPOSER, m.cfg.spec.ForkVersion(signedBeaconBlock.Slot()), *m.cl.Config.GenesisValidatorsRoot) + signingRoot := beacon.ComputeSigningRoot(root, dom) + if !blsu.Verify(pk, signingRoot[:], s) { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": messageSlotEnvelope.SlotEnvelope.Slot, + "pubkey": pubkey.String(), + "signature": signedBeaconBlock.BlockSignature().String(), + }).Error("invalid signature") + http.Error( + w, + "Invalid signature", + http.StatusInternalServerError, + ) + return + } + } logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, - "root": signedBeaconBlock.Root(m.spec).String(), + "root": signedBeaconBlock.Root(m.cfg.spec).String(), "stateRoot": signedBeaconBlock.StateRoot().String(), "slot": signedBeaconBlock.Slot().String(), + "publicKey": pubkey.String(), + "signature": signedBeaconBlock.BlockSignature().String(), }).Info("Received signed beacon block") logrus.WithFields(logrus.Fields{ @@ -854,8 +1095,11 @@ func (m *MockBuilder) HandleSubmitBlindedBlock( }).Info("Built payload sent to CL") // Check if we are supposed to simulate an error - if m.cfg.errorOnPayloadReveal != nil { - if err := m.cfg.errorOnPayloadReveal(messageSlotEnvelope.SlotEnvelope.Slot); err != nil { + m.cfg.mutex.Lock() + errOnPayloadReveal := m.cfg.errorOnPayloadReveal + m.cfg.mutex.Unlock() + if errOnPayloadReveal != nil { + if err := errOnPayloadReveal(messageSlotEnvelope.SlotEnvelope.Slot); err != nil { logrus.WithFields(logrus.Fields{ "builder_id": m.cfg.id, "slot": messageSlotEnvelope.SlotEnvelope.Slot, @@ -895,6 +1139,331 @@ func (m *MockBuilder) HandleStatus( w.WriteHeader(http.StatusOK) } +// mock builder options handlers +func (m *MockBuilder) parseSlotEpochRequest( + vars map[string]string, +) (slot beacon.Slot, errcode int, err error) { + if slotStr, ok := vars["slot"]; ok { + var slotInt uint64 + if slotInt, err = strconv.ParseUint(slotStr, 10, 64); err != nil { + errcode = http.StatusBadRequest + return + } else { + slot = beacon.Slot(slotInt) + } + } else if epochStr, ok := vars["epoch"]; ok { + var epoch uint64 + if epoch, err = strconv.ParseUint(epochStr, 10, 64); err != nil { + errcode = http.StatusBadRequest + return + } else { + if m.cfg.spec == nil { + err = fmt.Errorf("unable to respond: spec not ready") + errcode = http.StatusInternalServerError + return + } + slot, err = m.cfg.spec.EpochStartSlot(beacon.Epoch(epoch)) + if err != nil { + errcode = http.StatusInternalServerError + return + } + } + } + return +} + +func (m *MockBuilder) HandleMockDisableErrorOnHeaderRequest( + w http.ResponseWriter, req *http.Request, +) { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Info( + "Received request to disable error on payload request", + ) + + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.errorOnHeaderRequest = nil + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockEnableErrorOnHeaderRequest( + w http.ResponseWriter, req *http.Request, +) { + var ( + vars = mux.Vars(req) + ) + + slot, code, err := m.parseSlotEpochRequest(vars) + if err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to parse slot/epoch in request") + http.Error( + w, + fmt.Sprintf("Unable to respond request: %v", err), + code, + ) + return + } + + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": slot, + }).Info( + "Received request to enable error on payload request", + ) + + if err = WithErrorOnHeaderRequestAtSlot(slot)(m); err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to respond request") + http.Error( + w, + fmt.Sprintf("Unable to respond request: %v", err), + code, + ) + return + } + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockDisableErrorOnPayloadReveal( + w http.ResponseWriter, req *http.Request, +) { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Info( + "Received request to disable error on payload reveal", + ) + + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.errorOnPayloadReveal = nil + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockEnableErrorOnPayloadReveal( + w http.ResponseWriter, req *http.Request, +) { + var ( + vars = mux.Vars(req) + ) + + slot, code, err := m.parseSlotEpochRequest(vars) + if err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to parse slot/epoch in request") + http.Error( + w, + fmt.Sprintf("Unable to respond request: %v", err), + code, + ) + return + } + + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "slot": slot, + }).Info( + "Received request to enable error on payload reveal", + ) + + if err = WithErrorOnPayloadRevealAtSlot(slot)(m); err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to respond request") + http.Error( + w, + fmt.Sprintf("Unable to respond request: %v", err), + code, + ) + return + } + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockDisableInvalidatePayloadAttributes( + w http.ResponseWriter, req *http.Request, +) { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Info( + "Received request to disable invalidation of payload attributes", + ) + + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.payloadAttrModifier = nil + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockEnableInvalidatePayloadAttributes( + w http.ResponseWriter, req *http.Request, +) { + var ( + vars = mux.Vars(req) + invTyp PayloadAttributesInvalidation + ) + + slot, code, err := m.parseSlotEpochRequest(vars) + if err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to parse slot/epoch in request") + http.Error( + w, + fmt.Sprintf("Unable to respond request: %v", err), + code, + ) + return + } + + if typeStr, ok := vars["type"]; !ok { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Error("Unable to parse request url: missing type var") + http.Error( + w, + "Unable to parse request url: missing type var", + http.StatusBadRequest, + ) + return + } else if invTyp, ok = PayloadAttrInvalidationTypes[typeStr]; !ok { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "type": typeStr, + }).Error("Unable to parse request url: unknown invalidity type") + http.Error( + w, + fmt.Sprintf("Unable to parse request url: unknown invalidity type: %s", typeStr), + http.StatusBadRequest, + ) + return + } + + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "type": invTyp, + "slot": slot, + }).Info( + "Received request to enable payload attributes invalidation", + ) + + if err = WithPayloadAttributesInvalidatorAtSlot(slot, invTyp)(m); err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to enable payload attr invalidation") + http.Error( + w, + "Unable to enable payload attr invalidation", + http.StatusInternalServerError, + ) + return + } + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockDisableInvalidatePayload( + w http.ResponseWriter, req *http.Request, +) { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Info( + "Received request to disable invalidation of payload", + ) + + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.payloadModifier = nil + + w.WriteHeader(http.StatusOK) +} + +func (m *MockBuilder) HandleMockEnableInvalidatePayload( + w http.ResponseWriter, req *http.Request, +) { + var ( + vars = mux.Vars(req) + invTyp PayloadInvalidation + ) + + slot, code, err := m.parseSlotEpochRequest(vars) + if err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to parse slot/epoch in request") + http.Error( + w, + fmt.Sprintf("Unable to respond request: %v", err), + code, + ) + return + } + + if typeStr, ok := vars["type"]; !ok { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + }).Error("Unable to parse request url: missing type var") + http.Error( + w, + "Unable to parse request url: missing type var", + http.StatusBadRequest, + ) + return + } else if invTyp, ok = PayloadInvalidationTypes[typeStr]; !ok { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "type": typeStr, + }).Error("Unable to parse request url: unknown invalidity type") + http.Error( + w, + fmt.Sprintf("Unable to parse request url: unknown invalidity type: %s", typeStr), + http.StatusBadRequest, + ) + return + } + + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "type": invTyp, + "slot": slot, + }).Info( + "Received request to enable payload attributes invalidation", + ) + + if err = WithPayloadInvalidatorAtSlot(slot, invTyp)(m); err != nil { + logrus.WithFields(logrus.Fields{ + "builder_id": m.cfg.id, + "err": err, + }).Error("Unable to enable payload attr invalidation") + http.Error( + w, + "Unable to enable payload attr invalidation", + http.StatusInternalServerError, + ) + return + } + + w.WriteHeader(http.StatusOK) +} + +// helpers + func serveJSON(w http.ResponseWriter, value interface{}) error { resp, err := json.Marshal(value) if err != nil { diff --git a/simulators/eth2/common/builder/mock/options.go b/simulators/eth2/common/builder/mock/options.go index 31a13d00b3..31586b8d35 100644 --- a/simulators/eth2/common/builder/mock/options.go +++ b/simulators/eth2/common/builder/mock/options.go @@ -1,36 +1,51 @@ package mock_builder import ( + "fmt" "math/big" + "math/rand" "net" + "sync" api "github.com/ethereum/go-ethereum/beacon/engine" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/hive/simulators/eth2/common/builder/types/bellatrix" + "github.com/ethereum/hive/simulators/eth2/common/builder/types/common" beacon "github.com/protolambda/zrnt/eth2/beacon/common" ) type PayloadAttributesModifier func(*api.PayloadAttributes, beacon.Slot) (bool, error) type PayloadModifier func(*api.ExecutableData, beacon.Slot) (bool, error) type ErrorProducer func(beacon.Slot) error +type PayloadWeiBidModifier func(*big.Int) (*big.Int, error) +type GetBuilderBidVersion func(beacon.Slot) (common.BuilderBid, string, error) type config struct { - id int - port int - host string - externalIP net.IP - builderApiDomain beacon.BLSDomain - beaconGenesisTime beacon.Timestamp - payloadWeiValueBump *big.Int + id int + port int + host string + extraDataWatermark string + spec *beacon.Spec + externalIP net.IP + beaconGenesisTime beacon.Timestamp + payloadWeiValueModifier PayloadWeiBidModifier payloadAttrModifier PayloadAttributesModifier payloadModifier PayloadModifier errorOnHeaderRequest ErrorProducer errorOnPayloadReveal ErrorProducer + + builderBidVersionResolver GetBuilderBidVersion + + mutex sync.Mutex } type Option func(m *MockBuilder) error func WithID(id int) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.id = id return nil } @@ -38,6 +53,8 @@ func WithID(id int) Option { func WithHost(host string) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.host = host return nil } @@ -45,47 +62,79 @@ func WithHost(host string) Option { func WithPort(port int) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.port = port return nil } } -func WithExternalIP(ip net.IP) Option { +func WithExtraDataWatermark(wm string) Option { return func(m *MockBuilder) error { - m.cfg.externalIP = ip + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.extraDataWatermark = wm return nil } } -func WithExecutionClient() Option { +func WithExternalIP(ip net.IP) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.externalIP = ip return nil } } -func WithBuilderApiDomain(domain beacon.BLSDomain) Option { +func WithSpec(spec *beacon.Spec) Option { return func(m *MockBuilder) error { - m.cfg.builderApiDomain = domain + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.spec = spec return nil } } func WithBeaconGenesisTime(t beacon.Timestamp) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.beaconGenesisTime = t return nil } } -func WithPayloadWeiValueBump(wei *big.Int) Option { +func WithPayloadWeiValueBump(bump *big.Int) Option { return func(m *MockBuilder) error { - m.cfg.payloadWeiValueBump = wei + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.payloadWeiValueModifier = func(orig *big.Int) (*big.Int, error) { + ret := new(big.Int).Set(orig) + ret.Add(ret, bump) + return ret, nil + } + return nil + } +} + +func WithPayloadWeiValueMultiplier(mult *big.Int) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.payloadWeiValueModifier = func(orig *big.Int) (*big.Int, error) { + ret := new(big.Int).Set(orig) + ret.Mul(ret, mult) + return ret, nil + } return nil } } func WithPayloadAttributesModifier(pam PayloadAttributesModifier) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.payloadAttrModifier = pam return nil } @@ -93,6 +142,8 @@ func WithPayloadAttributesModifier(pam PayloadAttributesModifier) Option { func WithPayloadModifier(pm PayloadModifier) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.payloadModifier = pm return nil } @@ -100,14 +151,383 @@ func WithPayloadModifier(pm PayloadModifier) Option { func WithErrorOnHeaderRequest(e ErrorProducer) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.errorOnHeaderRequest = e return nil } } +func WithErrorOnHeaderRequestAtEpoch(epoch beacon.Epoch) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + + var spec = m.cfg.spec + if spec == nil { + return fmt.Errorf("unknown spec") + } + startSlot, err := spec.EpochStartSlot(epoch) + if err != nil { + return err + } + + m.cfg.errorOnHeaderRequest = func(s beacon.Slot) error { + if s >= startSlot { + return fmt.Errorf("error generator") + } + + return nil + } + return nil + } +} + +func WithErrorOnHeaderRequestAtSlot(slot beacon.Slot) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.errorOnHeaderRequest = func(s beacon.Slot) error { + if s >= slot { + return fmt.Errorf("error generator") + } + return nil + } + return nil + } +} + func WithErrorOnPayloadReveal(e ErrorProducer) Option { return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() m.cfg.errorOnPayloadReveal = e return nil } } + +func WithErrorOnPayloadRevealAtEpoch(epoch beacon.Epoch) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + + var spec = m.cfg.spec + if spec == nil { + return fmt.Errorf("unknown spec") + } + startSlot, err := spec.EpochStartSlot(epoch) + if err != nil { + return err + } + + m.cfg.errorOnPayloadReveal = func(s beacon.Slot) error { + if s >= startSlot { + return fmt.Errorf("error generator") + } + return nil + } + return nil + } +} + +func WithErrorOnPayloadRevealAtSlot(slot beacon.Slot) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + + m.cfg.errorOnPayloadReveal = func(s beacon.Slot) error { + if s >= slot { + return fmt.Errorf("error generator") + } + return nil + } + return nil + } +} + +// Specific function modifiers + +type PayloadInvalidation string + +const ( + INVALIDATE_PAYLOAD_STATE_ROOT = "state_root" + INVALIDATE_PAYLOAD_PARENT_HASH = "parent_hash" + INVALIDATE_PAYLOAD_COINBASE = "coinbase" + INVALIDATE_PAYLOAD_BASE_FEE = "base_fee" + INVALIDATE_PAYLOAD_UNCLE_HASH = "uncle_hash" + INVALIDATE_PAYLOAD_RECEIPT_HASH = "receipt_hash" +) + +var PayloadInvalidationTypes = map[string]PayloadInvalidation{ + INVALIDATE_PAYLOAD_STATE_ROOT: INVALIDATE_PAYLOAD_STATE_ROOT, + INVALIDATE_PAYLOAD_PARENT_HASH: INVALIDATE_PAYLOAD_PARENT_HASH, + INVALIDATE_PAYLOAD_COINBASE: INVALIDATE_PAYLOAD_COINBASE, + INVALIDATE_PAYLOAD_BASE_FEE: INVALIDATE_PAYLOAD_BASE_FEE, + INVALIDATE_PAYLOAD_UNCLE_HASH: INVALIDATE_PAYLOAD_UNCLE_HASH, + INVALIDATE_PAYLOAD_RECEIPT_HASH: INVALIDATE_PAYLOAD_RECEIPT_HASH, +} + +func PayloadInvalidationTypeNames() []string { + res := make([]string, len(PayloadInvalidationTypes)) + i := 0 + for k := range PayloadInvalidationTypes { + res[i] = k + i += 1 + } + return res +} + +func genPayloadInvalidator( + slot beacon.Slot, + invType PayloadInvalidation, +) func(*api.ExecutableData, beacon.Slot) (bool, error) { + return func(ed *api.ExecutableData, s beacon.Slot) (bool, error) { + if s >= slot { + if b, err := api.ExecutableDataToBlock(*ed); err != nil { + return false, err + } else { + header := b.Header() + + switch invType { + case INVALIDATE_PAYLOAD_STATE_ROOT: + rand.Read(header.Root[:]) + copy(ed.StateRoot[:], header.Root[:]) + case INVALIDATE_PAYLOAD_PARENT_HASH: + rand.Read(header.ParentHash[:]) + copy(ed.ParentHash[:], header.ParentHash[:]) + case INVALIDATE_PAYLOAD_COINBASE: + rand.Read(header.Coinbase[:]) + copy(ed.FeeRecipient[:], header.Coinbase[:]) + case INVALIDATE_PAYLOAD_BASE_FEE: + header.BaseFee.Add(header.BaseFee, big.NewInt(1)) + ed.BaseFeePerGas = header.BaseFee + case INVALIDATE_PAYLOAD_UNCLE_HASH: + rand.Read(header.UncleHash[:]) + case INVALIDATE_PAYLOAD_RECEIPT_HASH: + rand.Read(header.ReceiptHash[:]) + copy(ed.ReceiptsRoot[:], header.ReceiptHash[:]) + default: + panic(fmt.Errorf( + "unknown invalidation type: %s", + invType, + )) + } + modifiedHash := header.Hash() + copy(ed.BlockHash[:], modifiedHash[:]) + return true, nil + } + } + return false, nil + } +} + +func WithPayloadInvalidatorAtEpoch( + epoch beacon.Epoch, + invType PayloadInvalidation, +) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + + if m.cfg.spec == nil { + return fmt.Errorf("unknown spec") + } + startSlot, err := m.cfg.spec.EpochStartSlot(epoch) + if err != nil { + return err + } + + pm := genPayloadInvalidator(startSlot, invType) + m.cfg.payloadModifier = pm + return nil + } +} + +func WithPayloadInvalidatorAtSlot( + slot beacon.Slot, + invType PayloadInvalidation, +) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + + pm := genPayloadInvalidator(slot, invType) + m.cfg.payloadModifier = pm + return nil + } +} + +type PayloadAttributesInvalidation string + +const ( + INVALIDATE_ATTR_REMOVE_WITHDRAWAL = "remove_withdrawal" + INVALIDATE_ATTR_EXTRA_WITHDRAWAL = "extra_withdrawal" + INVALIDATE_ATTR_WITHDRAWAL_ADDRESS = "withdrawal_address" + INVALIDATE_ATTR_WITHDRAWAL_AMOUNT = "withdrawal_amount" + INVALIDATE_ATTR_WITHDRAWAL_VALIDATOR_INDEX = "withdrawal_validator_index" + INVALIDATE_ATTR_WITHDRAWAL_INDEX = "withdrawal_index" + INVALIDATE_ATTR_TIMESTAMP = "timestamp" + INVALIDATE_ATTR_PREV_RANDAO = "prevrandao" + INVALIDATE_ATTR_RANDOM = "random" +) + +var PayloadAttrInvalidationTypes = map[string]PayloadAttributesInvalidation{ + INVALIDATE_ATTR_REMOVE_WITHDRAWAL: INVALIDATE_ATTR_REMOVE_WITHDRAWAL, + INVALIDATE_ATTR_EXTRA_WITHDRAWAL: INVALIDATE_ATTR_EXTRA_WITHDRAWAL, + INVALIDATE_ATTR_WITHDRAWAL_ADDRESS: INVALIDATE_ATTR_WITHDRAWAL_ADDRESS, + INVALIDATE_ATTR_WITHDRAWAL_AMOUNT: INVALIDATE_ATTR_WITHDRAWAL_AMOUNT, + INVALIDATE_ATTR_WITHDRAWAL_VALIDATOR_INDEX: INVALIDATE_ATTR_WITHDRAWAL_VALIDATOR_INDEX, + INVALIDATE_ATTR_WITHDRAWAL_INDEX: INVALIDATE_ATTR_WITHDRAWAL_INDEX, + INVALIDATE_ATTR_TIMESTAMP: INVALIDATE_ATTR_TIMESTAMP, + INVALIDATE_ATTR_PREV_RANDAO: INVALIDATE_ATTR_PREV_RANDAO, + INVALIDATE_ATTR_RANDOM: INVALIDATE_ATTR_RANDOM, +} + +func PayloadAttrInvalidationTypeNames() []string { + res := make([]string, len(PayloadAttrInvalidationTypes)) + i := 0 + for k := range PayloadAttrInvalidationTypes { + res[i] = k + i += 1 + } + return res +} + +func genPayloadAttributesInvalidator( + slot beacon.Slot, + invType PayloadAttributesInvalidation, + spec *beacon.Spec, +) func(*api.PayloadAttributes, beacon.Slot) (bool, error) { + return func(pa *api.PayloadAttributes, s beacon.Slot) (bool, error) { + if s >= slot { + switch invType { + case INVALIDATE_ATTR_WITHDRAWAL_ADDRESS, + INVALIDATE_ATTR_WITHDRAWAL_AMOUNT, + INVALIDATE_ATTR_WITHDRAWAL_VALIDATOR_INDEX, + INVALIDATE_ATTR_WITHDRAWAL_INDEX, + INVALIDATE_ATTR_REMOVE_WITHDRAWAL: + if len(pa.Withdrawals) > 0 { + switch invType { + case INVALIDATE_ATTR_WITHDRAWAL_ADDRESS: + pa.Withdrawals[0].Address[0]++ + case INVALIDATE_ATTR_WITHDRAWAL_AMOUNT: + pa.Withdrawals[0].Amount++ + case INVALIDATE_ATTR_WITHDRAWAL_VALIDATOR_INDEX: + pa.Withdrawals[0].Validator++ + case INVALIDATE_ATTR_WITHDRAWAL_INDEX: + pa.Withdrawals[0].Index++ + case INVALIDATE_ATTR_REMOVE_WITHDRAWAL: + pa.Withdrawals = pa.Withdrawals[1:] + } + return true, nil + } else { + return false, fmt.Errorf("unable to invalidate: no withdrawals") + } + case INVALIDATE_ATTR_EXTRA_WITHDRAWAL: + if pa.Withdrawals == nil { + pa.Withdrawals = make([]*types.Withdrawal, 0) + } + pa.Withdrawals = append(pa.Withdrawals, &types.Withdrawal{}) + return true, nil + case INVALIDATE_ATTR_TIMESTAMP: + pa.Timestamp = pa.Timestamp - uint64( + spec.SECONDS_PER_SLOT*2, + ) + return true, nil + case INVALIDATE_ATTR_PREV_RANDAO, INVALIDATE_ATTR_RANDOM: + rand.Read(pa.Random[:]) + return true, nil + } + panic(fmt.Errorf( + "unknown invalidation type: %s", + invType, + )) + } + return false, nil + } +} + +func WithPayloadAttributesInvalidatorAtEpoch( + epoch beacon.Epoch, + invType PayloadAttributesInvalidation, +) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + var spec = m.cfg.spec + if spec == nil { + return fmt.Errorf("unknown spec") + } + startSlot, err := spec.EpochStartSlot(epoch) + if err != nil { + return err + } + + pm := genPayloadAttributesInvalidator(startSlot, invType, spec) + m.cfg.payloadAttrModifier = pm + return nil + } +} + +func WithPayloadAttributesInvalidatorAtSlot( + slot beacon.Slot, + invType PayloadAttributesInvalidation, +) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + if m.cfg.spec == nil { + return fmt.Errorf("unknown spec") + } + + pm := genPayloadAttributesInvalidator(slot, invType, m.cfg.spec) + m.cfg.payloadAttrModifier = pm + return nil + } +} + +func WithInvalidBuilderBidVersionAtSlot( + activationSlot beacon.Slot, +) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + m.cfg.builderBidVersionResolver = func(slot beacon.Slot) (common.BuilderBid, string, error) { + if slot >= activationSlot { + // Always return Bellatrix, until theres a new fork that can override capella + return &bellatrix.BuilderBid{}, "bellatrix", nil + } + return m.DefaultBuilderBidVersionResolver(slot) + } + + return nil + } +} + +func WithInvalidBuilderBidVersionAtEpoch( + activationEpoch beacon.Epoch, +) Option { + return func(m *MockBuilder) error { + m.cfg.mutex.Lock() + defer m.cfg.mutex.Unlock() + + var spec = m.cfg.spec + if spec == nil { + return fmt.Errorf("unknown spec") + } + activationSlot, err := spec.EpochStartSlot(activationEpoch) + if err != nil { + return err + } + + m.cfg.builderBidVersionResolver = func(slot beacon.Slot) (common.BuilderBid, string, error) { + if slot >= activationSlot { + // Always return Bellatrix, until theres a new fork that can override capella + return &bellatrix.BuilderBid{}, "bellatrix", nil + } + return m.DefaultBuilderBidVersionResolver(slot) + } + + return nil + } +} diff --git a/simulators/eth2/common/builder/types/bellatrix/bellatrix.go b/simulators/eth2/common/builder/types/bellatrix/bellatrix.go index 2e0717bd59..f95e1a0813 100644 --- a/simulators/eth2/common/builder/types/bellatrix/bellatrix.go +++ b/simulators/eth2/common/builder/types/bellatrix/bellatrix.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - el_common "github.com/ethereum/go-ethereum/common" api "github.com/ethereum/go-ethereum/beacon/engine" + el_common "github.com/ethereum/go-ethereum/common" "github.com/ethereum/hive/simulators/eth2/common/builder/types/common" blsu "github.com/protolambda/bls12-381-util" "github.com/protolambda/zrnt/eth2/beacon/bellatrix" @@ -34,6 +34,14 @@ func (s *SignedBeaconBlock) Slot() beacon.Slot { return s.Message.Slot } +func (s *SignedBeaconBlock) ProposerIndex() beacon.ValidatorIndex { + return s.Message.ProposerIndex +} + +func (s *SignedBeaconBlock) BlockSignature() *beacon.BLSSignature { + return &s.Signature +} + func (s *SignedBeaconBlock) SetExecutionPayload( ep common.ExecutionPayload, ) error { @@ -75,9 +83,6 @@ func (b *BuilderBid) FromExecutableData( if ed == nil { return fmt.Errorf("nil execution payload") } - if ed.Withdrawals != nil { - return fmt.Errorf("execution data contains withdrawals") - } copy(b.Header.ParentHash[:], ed.ParentHash[:]) copy(b.Header.FeeRecipient[:], ed.FeeRecipient[:]) copy(b.Header.StateRoot[:], ed.StateRoot[:]) diff --git a/simulators/eth2/common/builder/types/capella/capella.go b/simulators/eth2/common/builder/types/capella/capella.go index 42cfe02977..9a53462645 100644 --- a/simulators/eth2/common/builder/types/capella/capella.go +++ b/simulators/eth2/common/builder/types/capella/capella.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - el_common "github.com/ethereum/go-ethereum/common" api "github.com/ethereum/go-ethereum/beacon/engine" + el_common "github.com/ethereum/go-ethereum/common" "github.com/ethereum/hive/simulators/eth2/common/builder/types/common" blsu "github.com/protolambda/bls12-381-util" "github.com/protolambda/zrnt/eth2/beacon/capella" @@ -34,6 +34,14 @@ func (s *SignedBeaconBlock) Slot() beacon.Slot { return s.Message.Slot } +func (s *SignedBeaconBlock) ProposerIndex() beacon.ValidatorIndex { + return s.Message.ProposerIndex +} + +func (s *SignedBeaconBlock) BlockSignature() *beacon.BLSSignature { + return &s.Signature +} + func (s *SignedBeaconBlock) SetExecutionPayload( ep common.ExecutionPayload, ) error { diff --git a/simulators/eth2/common/builder/types/common/common.go b/simulators/eth2/common/builder/types/common/common.go index 6033e55e45..4db9a09529 100644 --- a/simulators/eth2/common/builder/types/common/common.go +++ b/simulators/eth2/common/builder/types/common/common.go @@ -3,8 +3,8 @@ package common import ( "math/big" - el_common "github.com/ethereum/go-ethereum/common" api "github.com/ethereum/go-ethereum/beacon/engine" + el_common "github.com/ethereum/go-ethereum/common" blsu "github.com/protolambda/bls12-381-util" "github.com/protolambda/zrnt/eth2/beacon/common" beacon "github.com/protolambda/zrnt/eth2/beacon/common" @@ -61,12 +61,14 @@ type VersionedSignedBuilderBid struct { Data *SignedBuilderBid `json:"data" yaml:"data"` } -type SignedBlindedBeacon interface { +type SignedBeaconBlock interface { ExecutionPayloadHash() el_common.Hash Root(*beacon.Spec) tree.Root StateRoot() tree.Root SetExecutionPayload(ExecutionPayload) error Slot() beacon.Slot + ProposerIndex() beacon.ValidatorIndex + BlockSignature() *common.BLSSignature } type ExecutionPayload interface { diff --git a/simulators/eth2/common/clients/beacon.go b/simulators/eth2/common/clients/beacon.go index 949e5a81c0..09a6ac5918 100644 --- a/simulators/eth2/common/clients/beacon.go +++ b/simulators/eth2/common/clients/beacon.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" "strings" + "sync" "time" ethcommon "github.com/ethereum/go-ethereum/common" api "github.com/ethereum/go-ethereum/beacon/engine" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/hive/hivesim" "github.com/ethereum/hive/simulators/eth2/common/builder" "github.com/ethereum/hive/simulators/eth2/common/utils" @@ -26,6 +26,7 @@ import ( "github.com/protolambda/zrnt/eth2/beacon/capella" "github.com/protolambda/zrnt/eth2/beacon/common" "github.com/protolambda/zrnt/eth2/beacon/phase0" + "github.com/protolambda/zrnt/eth2/configs" "github.com/protolambda/ztyp/tree" ) @@ -40,92 +41,138 @@ const ( var EMPTY_TREE_ROOT = tree.Root{} +type BeaconClientConfig struct { + ClientIndex int + TerminalTotalDifficulty int64 + BeaconAPIPort int + Spec *common.Spec + GenesisValidatorsRoot *tree.Root + GenesisTime *common.Timestamp + Subnet string +} + type BeaconClient struct { - T *hivesim.T - HiveClient *hivesim.Client - ClientType string - OptionsGenerator func() ([]hivesim.StartOption, error) - API *eth2api.Eth2HttpClient - genesisTime common.Timestamp - spec *common.Spec - index int - genesisValidatorsRoot tree.Root - Builder builder.Builder -} - -func NewBeaconClient( - t *hivesim.T, - beaconDef *hivesim.ClientDefinition, - optionsGenerator func() ([]hivesim.StartOption, error), - genesisTime common.Timestamp, - spec *common.Spec, - index int, - genesisValidatorsRoot tree.Root, -) *BeaconClient { - return &BeaconClient{ - T: t, - ClientType: beaconDef.Name, - OptionsGenerator: optionsGenerator, - genesisTime: genesisTime, - spec: spec, - index: index, - genesisValidatorsRoot: genesisValidatorsRoot, - } -} - -func (bn *BeaconClient) Start(extraOptions ...hivesim.StartOption) error { - if bn.HiveClient != nil { - return fmt.Errorf("client already started") - } - bn.T.Logf("Starting client %s", bn.ClientType) - opts, err := bn.OptionsGenerator() - if err != nil { - return fmt.Errorf("unable to get start options: %v", err) - } - opts = append(opts, extraOptions...) + Client + Logger utils.Logging + Config BeaconClientConfig + Builder builder.Builder - if bn.Builder != nil { - opts = append(opts, hivesim.Params{ - "HIVE_ETH2_BUILDER_ENDPOINT": bn.Builder.Address(), - }) + api *eth2api.Eth2HttpClient +} + +func (bn *BeaconClient) Logf(format string, values ...interface{}) { + if l := bn.Logger; l != nil { + l.Logf(format, values...) } +} + +func (bn *BeaconClient) Start() error { + if !bn.IsRunning() { + if managedClient, ok := bn.Client.(ManagedClient); !ok { + return fmt.Errorf("attempted to start an unmanaged client") + } else { + if err := managedClient.Start(); err != nil { + return err + } + } - bn.HiveClient = bn.T.StartClient(bn.ClientType, opts...) - bn.API = ð2api.Eth2HttpClient{ - Addr: fmt.Sprintf("http://%s:%d", bn.HiveClient.IP, PortBeaconAPI), - Cli: &http.Client{}, - Codec: eth2api.JSONCodec{}, } - bn.T.Logf( - "Started client %s, container: %s", - bn.ClientType, - bn.HiveClient.Container, - ) - return nil + + return bn.Init(context.Background()) } -func (bn *BeaconClient) Shutdown() error { - if err := bn.T.Sim.StopClient(bn.T.SuiteID, bn.T.TestID, bn.HiveClient.Container); err != nil { +func (bn *BeaconClient) Init(ctx context.Context) error { + if bn.api == nil { + port := bn.Config.BeaconAPIPort + if port == 0 { + port = PortBeaconAPI + } + bn.api = ð2api.Eth2HttpClient{ + Addr: fmt.Sprintf( + "http://%s:%d", + bn.GetIP(), + port, + ), + Cli: &http.Client{}, + Codec: eth2api.JSONCodec{}, + } + } + + var wg sync.WaitGroup + var errs = make(chan error, 2) + if bn.Config.Spec == nil { + // Try to fetch config directly from the client + wg.Add(1) + go func() { + defer wg.Done() + for { + if cfg, err := bn.BeaconConfig(ctx); err == nil && cfg != nil { + if spec, err := SpecFromConfig(cfg); err != nil { + errs <- err + return + } else { + bn.Config.Spec = spec + return + } + } + select { + case <-ctx.Done(): + errs <- ctx.Err() + return + case <-time.After(time.Second): + } + } + }() + } + + if bn.Config.GenesisTime == nil || bn.Config.GenesisValidatorsRoot == nil { + wg.Add(1) + go func() { + defer wg.Done() + for { + if gen, err := bn.GenesisConfig(ctx); err == nil && + gen != nil { + bn.Config.GenesisTime = &gen.GenesisTime + bn.Config.GenesisValidatorsRoot = &gen.GenesisValidatorsRoot + return + } + select { + case <-ctx.Done(): + errs <- ctx.Err() + return + case <-time.After(time.Second): + } + } + }() + } + wg.Wait() + + select { + case err := <-errs: return err + default: + return nil } - bn.HiveClient = nil - return nil } -func (bn *BeaconClient) IsRunning() bool { - return bn.HiveClient != nil +func (bn *BeaconClient) Shutdown() error { + if managedClient, ok := bn.Client.(ManagedClient); !ok { + return fmt.Errorf("attempted to shutdown an unmanaged client") + } else { + return managedClient.Shutdown() + } } func (bn *BeaconClient) ENR(parentCtx context.Context) (string, error) { ctx, cancel := context.WithTimeout(parentCtx, time.Second*10) defer cancel() var out eth2api.NetworkIdentity - if err := nodeapi.Identity(ctx, bn.API, &out); err != nil { + if err := nodeapi.Identity(ctx, bn.api, &out); err != nil { return "", err } - fmt.Printf("p2p addrs: %v\n", out.P2PAddresses) - fmt.Printf("peer id: %s\n", out.PeerID) - fmt.Printf("enr: %s\n", out.ENR) + bn.Logf("p2p addrs: %v\n", out.P2PAddresses) + bn.Logf("peer id: %s\n", out.PeerID) + bn.Logf("enr: %s\n", out.ENR) return out.ENR, nil } @@ -133,17 +180,24 @@ func (bn *BeaconClient) P2PAddr(parentCtx context.Context) (string, error) { ctx, cancel := context.WithTimeout(parentCtx, time.Second*10) defer cancel() var out eth2api.NetworkIdentity - if err := nodeapi.Identity(ctx, bn.API, &out); err != nil { + if err := nodeapi.Identity(ctx, bn.api, &out); err != nil { return "", err } return fmt.Sprintf( "/ip4/%s/tcp/%d/p2p/%s", - bn.HiveClient.IP.String(), + bn.GetIP().String(), PortBeaconTCP, out.PeerID, ), nil } +func (bn *BeaconClient) BeaconAPIURL() (string, error) { + if bn.api == nil { + return "", fmt.Errorf("api not initialized") + } + return bn.api.Addr, nil +} + func (bn *BeaconClient) EnodeURL() (string, error) { return "", errors.New( "beacon node does not have an discv4 Enode URL, use ENR or multi-address instead", @@ -151,14 +205,78 @@ func (bn *BeaconClient) EnodeURL() (string, error) { } func (bn *BeaconClient) ClientName() string { - name := bn.ClientType + name := bn.ClientType() if len(name) > 3 && name[len(name)-3:] == "-bn" { name = name[:len(name)-3] } return name } +func (bn *BeaconClient) API() *eth2api.Eth2HttpClient { + return bn.api +} + +func SpecFromConfig(cfg *common.Config) (*common.Spec, error) { + if cfg == nil { + return nil, fmt.Errorf("empty cfg") + } + var spec *common.Spec + if cfg.PRESET_BASE == "mainnet" { + specCpy := *configs.Mainnet + spec = &specCpy + } else if cfg.PRESET_BASE == "minimal" { + specCpy := *configs.Minimal + spec = &specCpy + } else { + return nil, fmt.Errorf("invalid preset base: %s", cfg.PRESET_BASE) + } + spec.Config = *cfg + return spec, nil +} + // Beacon API wrappers +func (bn *BeaconClient) BeaconConfig( + parentCtx context.Context, +) (*common.Config, error) { + var ( + cfg = new(common.Config) + exists bool + err error + ) + ctx, cancel := utils.ContextTimeoutRPC(parentCtx) + defer cancel() + exists, err = eth2api.SimpleRequest( + ctx, + bn.api, + eth2api.FmtGET("/eth/v1/config/spec"), + eth2api.Wrap(cfg), + ) + + if !exists { + return nil, fmt.Errorf("endpoint not found on beacon client") + } + return cfg, err +} + +func (bn *BeaconClient) GenesisConfig( + parentCtx context.Context, +) (*eth2api.GenesisResponse, error) { + var ( + dest = new(eth2api.GenesisResponse) + exists bool + err error + ) + ctx, cancel := utils.ContextTimeoutRPC(parentCtx) + defer cancel() + + exists, err = beaconapi.Genesis(ctx, bn.api, dest) + + if !exists { + return nil, fmt.Errorf("endpoint not found on beacon client") + } + return dest, err +} + type VersionedSignedBeaconBlock struct { *eth2api.VersionedSignedBeaconBlock } @@ -301,7 +419,7 @@ func (bn *BeaconClient) BlockV2Root( ) ctx, cancel := utils.ContextTimeoutRPC(parentCtx) defer cancel() - root, exists, err = beaconapi.BlockRoot(ctx, bn.API, blockId) + root, exists, err = beaconapi.BlockRoot(ctx, bn.api, blockId) if !exists { return root, fmt.Errorf( "endpoint not found on beacon client", @@ -321,7 +439,7 @@ func (bn *BeaconClient) BlockV2( ) ctx, cancel := utils.ContextTimeoutRPC(parentCtx) defer cancel() - exists, err = beaconapi.BlockV2(ctx, bn.API, blockId, versionedBlock) + exists, err = beaconapi.BlockV2(ctx, bn.api, blockId, versionedBlock) if !exists { return nil, fmt.Errorf("endpoint not found on beacon client") } @@ -348,7 +466,7 @@ func (bn *BeaconClient) BlockIsOptimistic( defer cancel() exists, err = eth2api.SimpleRequest( ctx, - bn.API, + bn.api, eth2api.FmtGET("/eth/v2/beacon/blocks/%s", blockId.BlockId()), blockOptResp, ) @@ -369,7 +487,7 @@ func (bn *BeaconClient) BlockHeader( ) ctx, cancel := utils.ContextTimeoutRPC(parentCtx) defer cancel() - exists, err = beaconapi.BlockHeader(ctx, bn.API, blockId, headInfo) + exists, err = beaconapi.BlockHeader(ctx, bn.api, blockId, headInfo) if !exists { return nil, fmt.Errorf("endpoint not found on beacon client") } @@ -390,7 +508,7 @@ func (bn *BeaconClient) StateValidator( defer cancel() exists, err = beaconapi.StateValidator( ctx, - bn.API, + bn.api, stateId, validatorId, stateValidatorResponse, @@ -414,7 +532,7 @@ func (bn *BeaconClient) StateFinalityCheckpoints( defer cancel() exists, err = beaconapi.FinalityCheckpoints( ctx, - bn.API, + bn.api, stateId, finalityCheckpointsResponse, ) @@ -726,7 +844,7 @@ func (bn *BeaconClient) BeaconStateV2( defer cancel() exists, err = debugapi.BeaconStateV2( ctx, - bn.API, + bn.api, stateId, versionedBeaconStateResponse, ) @@ -735,7 +853,7 @@ func (bn *BeaconClient) BeaconStateV2( } return &VersionedBeaconStateResponse{ VersionedBeaconState: versionedBeaconStateResponse, - spec: bn.spec, + spec: bn.Config.Spec, }, err } @@ -775,7 +893,7 @@ func (bn *BeaconClient) StateValidators( defer cancel() exists, err = beaconapi.StateValidators( ctx, - bn.API, + bn.api, stateId, validatorIds, statusFilter, @@ -804,7 +922,7 @@ func (bn *BeaconClient) StateValidatorBalances( defer cancel() exists, err = beaconapi.StateValidatorBalances( ctx, - bn.API, + bn.api, stateId, validatorIds, &stateValidatorBalanceResponse, @@ -820,11 +938,14 @@ func (bn *BeaconClient) ComputeDomain( typ common.BLSDomainType, version *common.Version, ) (common.BLSDomain, error) { + if bn.Config.GenesisTime == nil { + panic(fmt.Errorf("init not called yet")) + } if version != nil { return common.ComputeDomain( typ, *version, - bn.genesisValidatorsRoot, + *bn.Config.GenesisValidatorsRoot, ), nil } // We need to request for head state to know current active version @@ -835,7 +956,7 @@ func (bn *BeaconClient) ComputeDomain( return common.ComputeDomain( typ, state.CurrentVersion(), - bn.genesisValidatorsRoot, + *bn.Config.GenesisValidatorsRoot, ), nil } @@ -845,7 +966,7 @@ func (bn *BeaconClient) SubmitPoolBLSToExecutionChange( ) error { ctx, cancel := utils.ContextTimeoutRPC(parentCtx) defer cancel() - return beaconapi.SubmitBLSToExecutionChanges(ctx, bn.API, l) + return beaconapi.SubmitBLSToExecutionChanges(ctx, bn.api, l) } func (bn *BeaconClient) SubmitVoluntaryExit( @@ -854,18 +975,21 @@ func (bn *BeaconClient) SubmitVoluntaryExit( ) error { ctx, cancel := utils.ContextTimeoutRPC(parentCtx) defer cancel() - return beaconapi.SubmitVoluntaryExit(ctx, bn.API, exit) + return beaconapi.SubmitVoluntaryExit(ctx, bn.api, exit) } func (b *BeaconClient) WaitForExecutionPayload( ctx context.Context, ) (ethcommon.Hash, error) { - fmt.Printf( + if b.Config.GenesisTime == nil { + panic(fmt.Errorf("init not called yet")) + } + b.Logf( "Waiting for execution payload on beacon %d (%s)\n", - b.index, + b.Config.ClientIndex, b.ClientName(), ) - slotDuration := time.Duration(b.spec.SECONDS_PER_SLOT) * time.Second + slotDuration := time.Duration(b.Config.Spec.SECONDS_PER_SLOT) * time.Second timer := time.NewTicker(slotDuration) for { @@ -873,9 +997,9 @@ func (b *BeaconClient) WaitForExecutionPayload( case <-ctx.Done(): return ethcommon.Hash{}, ctx.Err() case <-timer.C: - realTimeSlot := b.spec.TimeToSlot( + realTimeSlot := b.Config.Spec.TimeToSlot( common.Timestamp(time.Now().Unix()), - b.genesisTime, + *b.Config.GenesisTime, ) var ( headInfo *eth2api.BeaconBlockHeaderAndInfo @@ -898,9 +1022,9 @@ func (b *BeaconClient) WaitForExecutionPayload( ) } zero := ethcommon.Hash{} - fmt.Printf( + b.Logf( "WaitForExecutionPayload: beacon %d (%s): slot=%d, realTimeSlot=%d, head=%s, exec=%s\n", - b.index, + b.Config.ClientIndex, b.ClientName(), headInfo.Header.Message.Slot, realTimeSlot, @@ -919,11 +1043,12 @@ func (b *BeaconClient) WaitForOptimisticState( blockID eth2api.BlockId, optimistic bool, ) (*eth2api.BeaconBlockHeaderAndInfo, error) { - fmt.Printf("Waiting for optimistic sync on beacon %d (%s)\n", - b.index, + b.Logf("Waiting for optimistic sync on beacon %d (%s)\n", + b.Config.ClientIndex, b.ClientName(), ) - slotDuration := time.Duration(b.spec.SECONDS_PER_SLOT) * time.Second + + slotDuration := time.Duration(b.Config.Spec.SECONDS_PER_SLOT) * time.Second timer := time.NewTicker(slotDuration) for { @@ -932,7 +1057,7 @@ func (b *BeaconClient) WaitForOptimisticState( return nil, ctx.Err() case <-timer.C: var headOptStatus BlockV2OptimisticResponse - if exists, err := eth2api.SimpleRequest(ctx, b.API, eth2api.FmtGET("/eth/v2/beacon/blocks/%s", blockID.BlockId()), &headOptStatus); err != nil { + if exists, err := eth2api.SimpleRequest(ctx, b.api, eth2api.FmtGET("/eth/v2/beacon/blocks/%s", blockID.BlockId()), &headOptStatus); err != nil { // Block still not synced continue } else if !exists { @@ -944,7 +1069,7 @@ func (b *BeaconClient) WaitForOptimisticState( } // Return the block var blockInfo eth2api.BeaconBlockHeaderAndInfo - if exists, err := beaconapi.BlockHeader(ctx, b.API, blockID, &blockInfo); err != nil { + if exists, err := beaconapi.BlockHeader(ctx, b.api, blockID, &blockInfo); err != nil { return nil, fmt.Errorf( "WaitForExecutionPayload: failed to poll block: %v", err, @@ -984,9 +1109,12 @@ func (bn *BeaconClient) GetLatestExecutionBeaconBlock( func (bn *BeaconClient) GetFirstExecutionBeaconBlock( parentCtx context.Context, ) (*VersionedSignedBeaconBlock, error) { - lastSlot := bn.spec.TimeToSlot( + if bn.Config.GenesisTime == nil { + panic(fmt.Errorf("init not called yet")) + } + lastSlot := bn.Config.Spec.TimeToSlot( common.Timestamp(time.Now().Unix()), - bn.genesisTime, + *bn.Config.GenesisTime, ) for slot := common.Slot(0); slot <= lastSlot; slot++ { versionedBlock, err := bn.BlockV2(parentCtx, eth2api.BlockIdSlot(slot)) @@ -1037,7 +1165,7 @@ func (bn *BeaconClient) GetFilledSlotsCountPerEpoch( return nil, fmt.Errorf("failed to poll head: %v", err) } epoch := common.Epoch( - headInfo.Header.Message.Slot / bn.spec.SLOTS_PER_EPOCH, + headInfo.Header.Message.Slot / bn.Config.Spec.SLOTS_PER_EPOCH, ) if prev, ok := epochMap[epoch]; ok { epochMap[epoch] = prev + 1 @@ -1072,6 +1200,20 @@ func (all BeaconClients) Running() BeaconClients { return res } +// Return subset of clients that are part of an specific subnet +func (all BeaconClients) Subnet(subnet string) BeaconClients { + if subnet == "" { + return all + } + res := make(BeaconClients, 0) + for _, bn := range all { + if bn.Config.Subnet == subnet { + res = append(res, bn) + } + } + return res +} + // Returns comma-separated ENRs of all running beacon nodes func (beacons BeaconClients) ENRs(parentCtx context.Context) (string, error) { if len(beacons) == 0 { @@ -1125,7 +1267,6 @@ func (b BeaconClients) GetBeaconBlockByExecutionHash( func (runningBeacons BeaconClients) PrintStatus( ctx context.Context, - l utils.Logging, ) { for i, b := range runningBeacons { var ( @@ -1160,7 +1301,7 @@ func (runningBeacons BeaconClients) PrintStatus( } } - l.Logf( + b.Logf( "beacon %d (%s): fork=%s, slot=%d, head=%s, exec_payload=%s, justified=%s, finalized=%s", i, b.ClientName(), diff --git a/simulators/eth2/common/clients/client.go b/simulators/eth2/common/clients/client.go new file mode 100644 index 0000000000..32732fb5cc --- /dev/null +++ b/simulators/eth2/common/clients/client.go @@ -0,0 +1,151 @@ +package clients + +import ( + "fmt" + "net" + "strconv" + + "github.com/ethereum/hive/hivesim" +) + +type Client interface { + IsRunning() bool + GetIP() net.IP + ClientType() string +} + +type EnodeClient interface { + Client + GetEnodeURL() (string, error) +} + +type ManagedClient interface { + Client + AddStartOption(...interface{}) + Start() error + Shutdown() error +} + +var _ ManagedClient = &HiveManagedClient{} + +type HiveOptionsGenerator func() ([]hivesim.StartOption, error) + +type HiveManagedClient struct { + T *hivesim.T + OptionsGenerator HiveOptionsGenerator + HiveClientDefinition *hivesim.ClientDefinition + + hiveClient *hivesim.Client + extraStartOptions []hivesim.StartOption +} + +func (h *HiveManagedClient) IsRunning() bool { + return h.hiveClient != nil +} + +func (h *HiveManagedClient) Start() error { + h.T.Logf("Starting client %s", h.ClientType()) + opts, err := h.OptionsGenerator() + if err != nil { + return fmt.Errorf("unable to get start options: %v", err) + } + + if opts == nil { + opts = make([]hivesim.StartOption, 0) + } + + if h.extraStartOptions != nil { + opts = append(opts, h.extraStartOptions...) + } + + h.hiveClient = h.T.StartClient(h.HiveClientDefinition.Name, opts...) + if h.hiveClient == nil { + return fmt.Errorf("unable to launch client") + } + h.T.Logf( + "Started client %s, container %s", + h.ClientType(), + h.hiveClient.Container, + ) + return nil +} + +func (h *HiveManagedClient) AddStartOption(opts ...interface{}) { + if h.extraStartOptions == nil { + h.extraStartOptions = make([]hivesim.StartOption, 0) + } + for _, o := range opts { + if o, ok := o.(hivesim.StartOption); ok { + h.extraStartOptions = append(h.extraStartOptions, o) + } + } +} + +func (h *HiveManagedClient) GetIP() net.IP { + if h.hiveClient == nil { + return net.IP{} + } + return h.hiveClient.IP +} + +func (h *HiveManagedClient) Shutdown() error { + if err := h.T.Sim.StopClient(h.T.SuiteID, h.T.TestID, h.hiveClient.Container); err != nil { + return err + } + h.hiveClient = nil + return nil +} + +func (h *HiveManagedClient) GetEnodeURL() (string, error) { + return h.hiveClient.EnodeURL() +} + +func (h *HiveManagedClient) ClientType() string { + return h.HiveClientDefinition.Name +} + +var _ Client = &ExternalClient{} + +type ExternalClient struct { + Type string + IP net.IP + Port int + EnodeURL string +} + +func ExternalClientFromURL(url string, typ string) (*ExternalClient, error) { + ip, portStr, err := net.SplitHostPort(url) + if err != nil { + return nil, err + } + port, err := strconv.ParseInt(portStr, 10, 64) + if err != nil { + return nil, err + } + return &ExternalClient{ + Type: typ, + IP: net.ParseIP(ip), + Port: int(port), + }, nil +} + +func (m *ExternalClient) IsRunning() bool { + // We can try pinging a certain port for status + return true +} + +func (m *ExternalClient) GetIP() net.IP { + return m.IP +} + +func (m *ExternalClient) GetPort() int { + return m.Port +} + +func (m *ExternalClient) ClientType() string { + return m.Type +} + +func (m *ExternalClient) GetEnodeURL() (string, error) { + return m.EnodeURL, nil +} diff --git a/simulators/eth2/common/clients/execution.go b/simulators/eth2/common/clients/execution.go index b8ebbe9eb1..9f1e2a4ffe 100644 --- a/simulators/eth2/common/clients/execution.go +++ b/simulators/eth2/common/clients/execution.go @@ -2,13 +2,13 @@ package clients import ( "context" - "encoding/hex" "encoding/json" "fmt" "math/big" "net" "net/http" "strings" + "sync" "time" api "github.com/ethereum/go-ethereum/beacon/engine" @@ -17,7 +17,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/hive/hivesim" "github.com/ethereum/hive/simulators/eth2/common/spoofing/proxy" "github.com/ethereum/hive/simulators/eth2/common/utils" "github.com/golang-jwt/jwt/v4" @@ -43,204 +42,269 @@ var AllEngineCallsLog = []string{ "engine_newPayloadV2", } +type ExecutionProxyConfig struct { + Host net.IP + Port int + LogEngineCalls bool + TrackForkchoiceUpdated bool +} + +type ExecutionClientConfig struct { + ClientIndex int + ProxyConfig *ExecutionProxyConfig + TerminalTotalDifficulty int64 + EngineAPIPort int + RPCPort int + Subnet string + JWTSecret []byte +} + type ExecutionClient struct { - T *hivesim.T - HiveClient *hivesim.Client - ClientType string - OptionsGenerator func() ([]hivesim.StartOption, error) - LatestForkchoice *api.ForkchoiceStateV1 - trackFcU bool - proxy **proxy.Proxy - proxyPort int - subnet string - ttd *big.Int - clientIndex int - logEngineCalls bool + Client + Logger utils.Logging + Config ExecutionClientConfig + + proxy *proxy.Proxy + latestfcu *api.ForkchoiceStateV1 engineRpcClient *rpc.Client ethRpcClient *rpc.Client eth *ethclient.Client + + startupComplete bool } -func NewExecutionClient( - t *hivesim.T, - eth1Def *hivesim.ClientDefinition, - optionsGenerator func() ([]hivesim.StartOption, error), - clientIndex int, - proxyPort int, - subnet string, - ttd *big.Int, - trackFcu bool, - logEngineCalls bool, -) *ExecutionClient { - return &ExecutionClient{ - T: t, - ClientType: eth1Def.Name, - OptionsGenerator: optionsGenerator, - trackFcU: trackFcu, - proxyPort: proxyPort, - proxy: new(*proxy.Proxy), - subnet: subnet, - ttd: ttd, - clientIndex: clientIndex, - logEngineCalls: logEngineCalls, +func (en *ExecutionClient) Logf(format string, values ...interface{}) { + if l := en.Logger; l != nil { + l.Logf(format, values...) } } func (en *ExecutionClient) UserRPCAddress() (string, error) { - if en.HiveClient == nil { - return "", fmt.Errorf("el hive client not yet launched") + if !en.Client.IsRunning() { + return "", fmt.Errorf("execution client not yet launched") + } + var port = PortUserRPC + if en.Config.RPCPort != 0 { + port = en.Config.RPCPort } - return fmt.Sprintf("http://%v:%d", en.HiveClient.IP, PortUserRPC), nil + return fmt.Sprintf( + "http://%v:%d", + en.Client.GetIP(), + port, + ), nil } func (en *ExecutionClient) EngineRPCAddress() (string, error) { - // TODO what will the default port be? - return fmt.Sprintf("http://%v:%d", en.HiveClient.IP, PortEngineRPC), nil + var port = PortEngineRPC + if en.Config.EngineAPIPort != 0 { + port = en.Config.EngineAPIPort + } + return fmt.Sprintf( + "http://%v:%d", + en.Client.GetIP(), + port, + ), nil } func (en *ExecutionClient) MustGetEnode() string { - addr, err := en.HiveClient.EnodeURL() - if err != nil { + if enodeClient, ok := en.Client.(EnodeClient); ok { + addr, err := enodeClient.GetEnodeURL() + if err == nil { + return addr + } panic(err) } - return addr + panic(fmt.Errorf("invalid client type")) } func (en *ExecutionClient) ConfiguredTTD() *big.Int { - return en.ttd + return big.NewInt(en.Config.TerminalTotalDifficulty) } -func (en *ExecutionClient) Start(extraOptions ...hivesim.StartOption) error { - if en.HiveClient != nil { - return fmt.Errorf("client already started") - } - en.T.Logf("Starting client %s", en.ClientType) - opts, err := en.OptionsGenerator() - if err != nil { - return fmt.Errorf("unable to get start options: %v", err) +func (en *ExecutionClient) Start() error { + if !en.Client.IsRunning() { + if managedClient, ok := en.Client.(ManagedClient); !ok { + return fmt.Errorf("attempted to start an unmanaged client") + } else { + if err := managedClient.Start(); err != nil { + return err + } + } } - opts = append(opts, extraOptions...) - - en.HiveClient = en.T.StartClient(en.ClientType, opts...) - en.T.Logf( - "Started client %s, container: %s", - en.ClientType, - en.HiveClient.Container, - ) - // Prepare Eth/Engine RPCs - engineRPCAddress, err := en.EngineRPCAddress() - if err != nil { - return err - } - client := &http.Client{} - // Prepare HTTP Client - en.engineRpcClient, err = rpc.DialHTTPWithClient(engineRPCAddress, client) - if err != nil { - return err - } + return en.Init(context.Background()) +} - // Prepare ETH Client - client = &http.Client{} +func (en *ExecutionClient) Init(ctx context.Context) error { + if !en.startupComplete { + defer func() { + en.startupComplete = true + }() - userRPCAddress, err := en.UserRPCAddress() - if err != nil { - return err - } - en.ethRpcClient, err = rpc.DialHTTPWithClient(userRPCAddress, client) - if err != nil { - return err - } - en.eth = ethclient.NewClient(en.ethRpcClient) + // Prepare Eth/Engine RPCs + engineRPCAddress, err := en.EngineRPCAddress() + if err != nil { + return err + } + client := &http.Client{} + // Prepare HTTP Client + en.engineRpcClient, err = rpc.DialHTTPWithClient( + engineRPCAddress, + client, + ) + if err != nil { + return err + } - // Prepare proxy - dest, err := en.EngineRPCAddress() - if err != nil { - return err - } + // Prepare ETH Client + client = &http.Client{} - secret, err := hex.DecodeString( - "7365637265747365637265747365637265747365637265747365637265747365", - ) - if err != nil { - panic(err) - } - simIP, err := en.T.Sim.ContainerNetworkIP( - en.T.SuiteID, - "bridge", - "simulation", - ) - if err != nil { - panic(err) - } + userRPCAddress, err := en.UserRPCAddress() + if err != nil { + return err + } + en.ethRpcClient, err = rpc.DialHTTPWithClient(userRPCAddress, client) + if err != nil { + return err + } + en.eth = ethclient.NewClient(en.ethRpcClient) - p := proxy.NewProxy( - net.ParseIP(simIP), - en.proxyPort, - dest, - secret, - ) + // Prepare proxy + dest, err := en.EngineRPCAddress() + if err != nil { + return err + } - if en.trackFcU { - logCallback := func(req []byte) *spoof.Spoof { - var ( - fcState api.ForkchoiceStateV1 - pAttr api.PayloadAttributes - err error + if en.Config.ProxyConfig != nil { + p := proxy.NewProxy( + en.Config.ProxyConfig.Host, + en.Config.ProxyConfig.Port, + dest, + en.Config.JWTSecret, ) - err = proxy.UnmarshalFromJsonRPCRequest(req, &fcState, &pAttr) - if err == nil { - en.LatestForkchoice = &fcState + + if en.Config.ProxyConfig.TrackForkchoiceUpdated { + logCallback := func(req []byte) *spoof.Spoof { + var ( + fcState api.ForkchoiceStateV1 + pAttr api.PayloadAttributes + err error + ) + err = proxy.UnmarshalFromJsonRPCRequest( + req, + &fcState, + &pAttr, + ) + if err == nil { + en.latestfcu = &fcState + } + return nil + } + for _, c := range AllForkchoiceUpdatedCalls { + p.AddRequestCallback(c, logCallback) + } } - return nil - } - for _, c := range AllForkchoiceUpdatedCalls { - p.AddRequestCallback(c, logCallback) - } - } - if en.logEngineCalls { - logCallback := func(res []byte, req []byte) *spoof.Spoof { - en.T.Logf( - "DEBUG: execution client %d, request: %s", - en.clientIndex, - req, - ) - en.T.Logf( - "DEBUG: execution client %d, response: %s", - en.clientIndex, - res, - ) - return nil - } - for _, c := range AllEngineCallsLog { - p.AddResponseCallback(c, logCallback) - } - } + if en.Config.ProxyConfig.LogEngineCalls { + logCallback := func(res []byte, req []byte) *spoof.Spoof { + en.Logf( + "DEBUG: execution client %d, request: %s", + en.Config.ClientIndex, + req, + ) + en.Logf( + "DEBUG: execution client %d, response: %s", + en.Config.ClientIndex, + res, + ) + return nil + } + for _, c := range AllEngineCallsLog { + p.AddResponseCallback(c, logCallback) + } + } - *en.proxy = p + en.proxy = p + } + } return nil } func (en *ExecutionClient) Shutdown() error { - if err := en.T.Sim.StopClient(en.T.SuiteID, en.T.TestID, en.HiveClient.Container); err != nil { - return err + if managedClient, ok := en.Client.(ManagedClient); !ok { + return fmt.Errorf("attempted to shutdown an unmanaged client") + } else { + return managedClient.Shutdown() } - en.HiveClient = nil - return nil } func (en *ExecutionClient) IsRunning() bool { - return en.HiveClient != nil + return en.Client.IsRunning() } func (en *ExecutionClient) Proxy() *proxy.Proxy { - if en.proxy != nil && *en.proxy != nil { - return *en.proxy + return en.proxy +} + +func (en *ExecutionClient) GetLatestForkchoiceUpdated( + ctx context.Context, +) (*api.ForkchoiceStateV1, error) { + if en.latestfcu != nil { + return en.latestfcu, nil + } + // Try to reconstruct by querying it from the client + forkchoiceState := &api.ForkchoiceStateV1{} + errs := make(chan error, 3) + var wg sync.WaitGroup + + type labelBlockHashTask struct { + label string + dest *common.Hash + } + + for _, t := range []*labelBlockHashTask{ + { + label: "latest", + dest: &forkchoiceState.HeadBlockHash, + }, + { + label: "safe", + dest: &forkchoiceState.SafeBlockHash, + }, + { + label: "finalized", + dest: &forkchoiceState.FinalizedBlockHash, + }, + } { + wg.Add(1) + t := t + go func(t *labelBlockHashTask) { + defer wg.Done() + if res, err := en.HeaderByLabel( + ctx, + t.label, + ); err != nil { + en.Logf( + "Error trying to fetch label %s from client: %v", + t.label, + err, + ) + } else if err == nil && res != nil && res.Number != nil { + *t.dest = res.Hash() + } + }(t) } - return nil + wg.Wait() + + select { + case err := <-errs: + return nil, err + default: + } + + return forkchoiceState, nil } // Engine API @@ -273,10 +337,7 @@ func (en *ExecutionClient) PrepareAuthCallToken( } func (en *ExecutionClient) PrepareDefaultAuthCallToken() error { - secret, _ := hex.DecodeString( - "7365637265747365637265747365637265747365637265747365637265747365", - ) - en.PrepareAuthCallToken(secret, time.Now()) + en.PrepareAuthCallToken(en.Config.JWTSecret, time.Now()) return nil } @@ -414,7 +475,7 @@ func (ec *ExecutionClient) CheckTTD(parentCtx context.Context) (bool, error) { if err != nil { return false, err } - if td.Cmp(ec.ttd) >= 0 { + if td.Cmp(big.NewInt(ec.Config.TerminalTotalDifficulty)) >= 0 { return true, nil } return false, nil @@ -531,7 +592,7 @@ func (all ExecutionClients) Subnet(subnet string) ExecutionClients { } res := make(ExecutionClients, 0) for _, ec := range all { - if ec.subnet == subnet { + if ec.Config.Subnet == subnet { res = append(res, ec) } } @@ -546,11 +607,15 @@ func (all ExecutionClients) Enodes() (string, error) { enodes := make([]string, 0) for _, en := range all { if en.IsRunning() { - enode, err := en.HiveClient.EnodeURL() - if err != nil { - return "", err + if enodeClient, ok := en.Client.(EnodeClient); ok { + enode, err := enodeClient.GetEnodeURL() + if err != nil { + return "", err + } + enodes = append(enodes, enode) + } else { + return "", fmt.Errorf("invalid client type") } - enodes = append(enodes, enode) } } return strings.Join(enodes, ","), nil @@ -591,13 +656,16 @@ func (all ExecutionClients) CheckHeads( return true, nil } -type Proxies []**proxy.Proxy +type ProxyProvider interface { + Proxy() *proxy.Proxy +} +type Proxies []ProxyProvider func (all Proxies) Running() []*proxy.Proxy { res := make([]*proxy.Proxy, 0) - for _, p := range all { - if p != nil && *p != nil { - res = append(res, *p) + for _, pp := range all { + if p := pp.Proxy(); p != nil { + res = append(res, p) } } return res diff --git a/simulators/eth2/common/clients/node.go b/simulators/eth2/common/clients/node.go index 7db783340d..2c12aae4e5 100644 --- a/simulators/eth2/common/clients/node.go +++ b/simulators/eth2/common/clients/node.go @@ -9,8 +9,8 @@ import ( "golang.org/x/exp/slices" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/hive/hivesim" cg "github.com/ethereum/hive/simulators/eth2/common/chain_generators" + "github.com/ethereum/hive/simulators/eth2/common/utils" "github.com/protolambda/zrnt/eth2/beacon/common" "github.com/protolambda/zrnt/eth2/beacon/phase0" ) @@ -20,17 +20,30 @@ import ( // - Beacon Client // - Validator Client type NodeDefinition struct { - ExecutionClient string - ConsensusClient string - ValidatorClient string - ValidatorShares uint64 - ExecutionClientTTD *big.Int - BeaconNodeTTD *big.Int + // Client Types + ExecutionClient string + ConsensusClient string + ValidatorClient string + + // Execution Config + ExecutionClientTTD *big.Int + ChainGenerator cg.ChainGenerator + Chain []*types.Block + + // Beacon Config + BeaconNodeTTD *big.Int + + // Validator Config + ValidatorShares uint64 + + // Node Config TestVerificationNode bool DisableStartup bool - ChainGenerator cg.ChainGenerator - Chain []*types.Block - ExecutionSubnet string + + // Subnet Configuration + ExecutionSubnet string + ConsensusSubnet string + Subnet string } func (n *NodeDefinition) String() string { @@ -42,14 +55,34 @@ func (n *NodeDefinition) ExecutionClientName() string { } func (n *NodeDefinition) ConsensusClientName() string { - return fmt.Sprintf("%s", n.ConsensusClient) + return n.ConsensusClient } func (n *NodeDefinition) ValidatorClientName() string { if n.ValidatorClient == "" { return beaconNodeToValidator(n.ConsensusClient) } - return fmt.Sprintf("%s", n.ValidatorClient) + return n.ValidatorClient +} + +func (n *NodeDefinition) GetExecutionSubnet() string { + if n.ExecutionSubnet != "" { + return n.ExecutionSubnet + } + if n.Subnet != "" { + return n.Subnet + } + return "" +} + +func (n *NodeDefinition) GetConsensusSubnet() string { + if n.ConsensusSubnet != "" { + return n.ConsensusSubnet + } + if n.Subnet != "" { + return n.Subnet + } + return "" } func beaconNodeToValidator(name string) string { @@ -118,7 +151,7 @@ func (all NodeDefinitions) FilterByEL(filters []string) NodeDefinitions { // Contains a flag that marks a node that can be used to query // test verification information. type Node struct { - T *hivesim.T + Logging utils.Logging Index int ExecutionClient *ExecutionClient BeaconClient *BeaconClient @@ -126,29 +159,35 @@ type Node struct { Verification bool } +func (n *Node) Logf(format string, values ...interface{}) { + if l := n.Logging; l != nil { + l.Logf(format, values...) + } +} + // Starts all clients included in the bundle -func (n *Node) Start(extraOptions ...hivesim.StartOption) error { - n.T.Logf("Starting validator client bundle %d", n.Index) +func (n *Node) Start() error { + n.Logf("Starting validator client bundle %d", n.Index) if n.ExecutionClient != nil { - if err := n.ExecutionClient.Start(extraOptions...); err != nil { + if err := n.ExecutionClient.Start(); err != nil { return err } } else { - n.T.Logf("No execution client started") + n.Logf("No execution client started") } if n.BeaconClient != nil { - if err := n.BeaconClient.Start(extraOptions...); err != nil { + if err := n.BeaconClient.Start(); err != nil { return err } } else { - n.T.Logf("No beacon client started") + n.Logf("No beacon client started") } if n.ValidatorClient != nil { - if err := n.ValidatorClient.Start(extraOptions...); err != nil { + if err := n.ValidatorClient.Start(); err != nil { return err } } else { - n.T.Logf("No validator client started") + n.Logf("No validator client started") } return nil } @@ -169,7 +208,7 @@ func (n *Node) Shutdown() error { func (n *Node) ClientNames() string { var name string if n.ExecutionClient != nil { - name = n.ExecutionClient.ClientType + name = n.ExecutionClient.ClientType() } if n.BeaconClient != nil { name = fmt.Sprintf("%s/%s", name, n.BeaconClient.ClientName()) @@ -196,7 +235,7 @@ func (n *Node) SignBLSToExecutionChange( if domain, err := bn.ComputeDomain( ctx, common.DOMAIN_BLS_TO_EXECUTION_CHANGE, - &bn.spec.GENESIS_FORK_VERSION, + &bn.Config.Spec.GENESIS_FORK_VERSION, ); err != nil { return nil, err } else { @@ -277,7 +316,7 @@ func (all Nodes) Proxies() Proxies { ps := make(Proxies, 0) for _, n := range all { if n.ExecutionClient != nil { - ps = append(ps, n.ExecutionClient.proxy) + ps = append(ps, n.ExecutionClient) } } return ps @@ -356,7 +395,7 @@ func (all Nodes) FilterByEL(filters []string) Nodes { ret := make(Nodes, 0) for _, n := range all { for _, filter := range filters { - if strings.Contains(n.ExecutionClient.ClientType, filter) { + if strings.Contains(n.ExecutionClient.ClientType(), filter) { ret = append(ret, n) break } diff --git a/simulators/eth2/common/clients/validator.go b/simulators/eth2/common/clients/validator.go index 1090b6b911..e3980510a9 100644 --- a/simulators/eth2/common/clients/validator.go +++ b/simulators/eth2/common/clients/validator.go @@ -3,8 +3,8 @@ package clients import ( "fmt" - "github.com/ethereum/hive/hivesim" consensus_config "github.com/ethereum/hive/simulators/eth2/common/config/consensus" + "github.com/ethereum/hive/simulators/eth2/common/utils" blsu "github.com/protolambda/bls12-381-util" "github.com/protolambda/zrnt/eth2/beacon/common" "github.com/protolambda/zrnt/eth2/beacon/phase0" @@ -12,70 +12,41 @@ import ( ) type ValidatorClient struct { - T *hivesim.T - HiveClient *hivesim.Client - ClientType string - OptionsGenerator func(map[common.ValidatorIndex]*consensus_config.KeyDetails) ([]hivesim.StartOption, error) - Keys map[common.ValidatorIndex]*consensus_config.KeyDetails - beacon *BeaconClient -} + Client + Logger utils.Logging + ClientIndex int -func NewValidatorClient( - t *hivesim.T, - validatorDef *hivesim.ClientDefinition, - optionsGenerator func(map[common.ValidatorIndex]*consensus_config.KeyDetails) ([]hivesim.StartOption, error), - keys map[common.ValidatorIndex]*consensus_config.KeyDetails, - bn *BeaconClient, -) *ValidatorClient { - return &ValidatorClient{ - T: t, - ClientType: validatorDef.Name, - OptionsGenerator: optionsGenerator, - Keys: keys, - beacon: bn, - } + Keys map[common.ValidatorIndex]*consensus_config.KeyDetails + BeaconClient *BeaconClient } -func (vc *ValidatorClient) Start(extraOptions ...hivesim.StartOption) error { - if vc.HiveClient != nil { - return fmt.Errorf("client already started") - } - if len(vc.Keys) == 0 { - vc.T.Logf("Skipping validator because it has 0 validator keys") - return nil +func (vc *ValidatorClient) Logf(format string, values ...interface{}) { + if l := vc.Logger; l != nil { + l.Logf(format, values...) } - vc.T.Logf("Starting client %s", vc.ClientType) - opts, err := vc.OptionsGenerator(vc.Keys) - if err != nil { - return fmt.Errorf("unable to get start options: %v", err) - } - opts = append(opts, extraOptions...) +} - if vc.beacon.Builder != nil { - opts = append(opts, hivesim.Params{ - "HIVE_ETH2_BUILDER_ENDPOINT": vc.beacon.Builder.Address(), - }) +func (vc *ValidatorClient) Start() error { + if !vc.Client.IsRunning() { + if len(vc.Keys) == 0 { + vc.Logf("Skipping validator because it has 0 validator keys") + return nil + } + if managedClient, ok := vc.Client.(ManagedClient); !ok { + return fmt.Errorf("attempted to start an unmanaged client") + } else { + return managedClient.Start() + } } - - vc.HiveClient = vc.T.StartClient(vc.ClientType, opts...) - vc.T.Logf( - "Started client %s, container: %s", - vc.ClientType, - vc.HiveClient.Container, - ) return nil } func (vc *ValidatorClient) Shutdown() error { - if err := vc.T.Sim.StopClient(vc.T.SuiteID, vc.T.TestID, vc.HiveClient.Container); err != nil { - return err + if managedClient, ok := vc.Client.(ManagedClient); !ok { + return fmt.Errorf("attempted to shutdown an unmanaged client") + } else { + return managedClient.Shutdown() } - vc.HiveClient = nil - return nil -} - -func (vc *ValidatorClient) IsRunning() bool { - return vc.HiveClient != nil } func (v *ValidatorClient) ContainsKey(pk [48]byte) bool { diff --git a/simulators/eth2/common/debug/debug.go b/simulators/eth2/common/debug/debug.go index 08edee619d..fc8991de66 100644 --- a/simulators/eth2/common/debug/debug.go +++ b/simulators/eth2/common/debug/debug.go @@ -26,7 +26,7 @@ func PrintAllBeaconBlocks( } l.Logf( "PrintAllBeaconBlocks: Printing beacon chain from %s\n", - b.HiveClient.Container, + b.ClientType(), ) l.Logf( "PrintAllBeaconBlocks: Head, slot %d, root %v\n", diff --git a/simulators/eth2/common/go.mod b/simulators/eth2/common/go.mod index 9d0c9ae79d..2d51656996 100644 --- a/simulators/eth2/common/go.mod +++ b/simulators/eth2/common/go.mod @@ -3,13 +3,13 @@ module github.com/ethereum/hive/simulators/eth2/common go 1.18 require ( - github.com/ethereum/go-ethereum v1.11.4 - github.com/ethereum/hive v0.0.0-20230313141339-8e3200bfc09e - github.com/golang-jwt/jwt/v4 v4.3.0 + github.com/ethereum/go-ethereum v1.11.5 + github.com/ethereum/hive v0.0.0-20230401205547-71595beab31d + github.com/golang-jwt/jwt/v4 v4.5.0 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 - github.com/herumi/bls-eth-go-binary v1.28.1 - github.com/holiman/uint256 v1.2.1 + github.com/herumi/bls-eth-go-binary v1.29.1 + github.com/holiman/uint256 v1.2.2 github.com/pkg/errors v0.9.1 github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7 github.com/protolambda/eth2api v0.0.0-20230316214135-5f8afbd6d05d @@ -19,38 +19,38 @@ require ( github.com/rauljordan/engine-proxy v0.0.0-20230316220057-4c80c36c4c3a github.com/sirupsen/logrus v1.9.0 github.com/tyler-smith/go-bip39 v1.1.0 - github.com/wealdtech/go-eth2-util v1.8.0 - golang.org/x/exp v0.0.0-20230206171751-46f607a40771 + github.com/wealdtech/go-eth2-util v1.8.1 + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/DataDog/zstd v1.5.2 // indirect - github.com/VictoriaMetrics/fastcache v1.12.0 // indirect + github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/errors v1.9.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect + github.com/cockroachdb/pebble v0.0.0-20230404150825-93eff0a72e22 // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/deckarep/golang-set/v2 v2.1.0 // indirect + github.com/deckarep/golang-set/v2 v2.3.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/edsrzf/mmap-go v1.1.0 // indirect - github.com/ferranbt/fastssz v0.1.2 // indirect - github.com/getsentry/sentry-go v0.18.0 // indirect + github.com/ferranbt/fastssz v0.1.3 // indirect + github.com/getsentry/sentry-go v0.20.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/kilic/bls12-381 v0.1.0 // indirect - github.com/klauspost/compress v1.15.15 // indirect - github.com/klauspost/cpuid/v2 v2.2.2 // indirect + github.com/klauspost/compress v1.16.3 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect @@ -60,23 +60,23 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.39.0 // indirect + github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect - github.com/rivo/uniseg v0.4.3 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect - github.com/rs/cors v1.8.2 // indirect + github.com/rivo/uniseg v0.4.4 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect + github.com/rs/cors v1.8.3 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/stretchr/testify v1.8.1 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect - github.com/wealdtech/go-bytesutil v1.2.0 // indirect - github.com/wealdtech/go-eth2-types/v2 v2.8.0 // indirect + github.com/wealdtech/go-bytesutil v1.2.1 // indirect + github.com/wealdtech/go-eth2-types/v2 v2.8.1 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - golang.org/x/crypto v0.4.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.8.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/simulators/eth2/common/go.sum b/simulators/eth2/common/go.sum index 136b0896dd..818ef17947 100644 --- a/simulators/eth2/common/go.sum +++ b/simulators/eth2/common/go.sum @@ -7,8 +7,8 @@ github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= -github.com/VictoriaMetrics/fastcache v1.12.0 h1:vnVi/y9yKDcD9akmc4NqAoqgQhJrOwUF+j9LTgn4QDE= -github.com/VictoriaMetrics/fastcache v1.12.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8= +github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= +github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc= @@ -20,7 +20,6 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -35,8 +34,8 @@ github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZO github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk= -github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lgvnQ2+oGlE/EyZy4+2/CxRh9KfvCXnag1vtpxVM= +github.com/cockroachdb/pebble v0.0.0-20230404150825-93eff0a72e22 h1:2Nwgec/S3FkQW3r807JL9+D2xb2XU9zbRCotvQWLIfY= +github.com/cockroachdb/pebble v0.0.0-20230404150825-93eff0a72e22/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= @@ -50,8 +49,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= -github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/deckarep/golang-set/v2 v2.3.0 h1:qs18EKUfHm2X9fA50Mr/M5hccg2tNnVqsiBImnyDs0g= +github.com/deckarep/golang-set/v2 v2.3.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= @@ -66,14 +65,14 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= -github.com/ethereum/go-ethereum v1.11.4 h1:KG81SnUHXWk8LJB3mBcHg/E2yLvXoiPmRMCIRxgx3cE= -github.com/ethereum/go-ethereum v1.11.4/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo= -github.com/ethereum/hive v0.0.0-20230313141339-8e3200bfc09e h1:3g9cqRqpbZ92tSlGL4PfFoq435axKw6HiZ1Gz3fOkfk= -github.com/ethereum/hive v0.0.0-20230313141339-8e3200bfc09e/go.mod h1:PlpDuxHg6q1jU0K8Ouf+RXlHguignJ7k8Eyukc9RCPQ= +github.com/ethereum/go-ethereum v1.11.5 h1:3M1uan+LAUvdn+7wCEFrcMM4LJTeuxDrPTg/f31a5QQ= +github.com/ethereum/go-ethereum v1.11.5/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo= +github.com/ethereum/hive v0.0.0-20230401205547-71595beab31d h1:aYS/z/WooDYsJKpOoZ/ha8Zg+CwSf9Kp1919rnmmC0s= +github.com/ethereum/hive v0.0.0-20230401205547-71595beab31d/go.mod h1:zKL2DscVzRusnGVpseAvLrXGJ3qrGHuSfOIrv4JfnRk= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= -github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= +github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= +github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -82,8 +81,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= -github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0= -github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ= +github.com/getsentry/sentry-go v0.20.0 h1:bwXW98iMRIWxn+4FgPW7vMrjmbym6HblXALmhjHmQaQ= +github.com/getsentry/sentry-go v0.20.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= @@ -107,8 +106,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= -github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -125,6 +124,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= 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/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -151,13 +152,13 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/herumi/bls-eth-go-binary v1.28.1 h1:fcIZ48y5EE9973k05XjE8+P3YiQgjZz4JI/YabAm8KA= -github.com/herumi/bls-eth-go-binary v1.28.1/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= +github.com/herumi/bls-eth-go-binary v1.29.1 h1:XcNSHYTyNjEUVfWDCE2gtG5r95biTwd7MJUJF09LtSE= +github.com/herumi/bls-eth-go-binary v1.29.1/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= -github.com/holiman/uint256 v1.2.1 h1:XRtyuda/zw2l+Bq/38n5XUoEF72aSOu/77Thd9pPp2o= -github.com/holiman/uint256 v1.2.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= +github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk= +github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ= github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= @@ -187,12 +188,12 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= +github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.2 h1:xPMwiykqNK9VK0NYC3+jTMYv9I6Vl3YdjZgPZKG3zO0= -github.com/klauspost/cpuid/v2 v2.2.2/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -205,6 +206,10 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/marioevz/engine-proxy v0.0.0-20220617181151-e8661eb39eea h1:9ahHMPkNvYf9Nn3+U072ZKMDm05gaXfRESAmwP07Q+M= +github.com/marioevz/engine-proxy v0.0.0-20220617181151-e8661eb39eea/go.mod h1:9OVXfWYnIV+wj1/SqfdREmE5mzN/OANAgdOJRtFtvpo= +github.com/marioevz/eth2api v0.0.0-20230214151319-641a58f39ae4 h1:CN6XoCl13Dnnwn3I7zjwmn2byw2SW7/MfBX52C9Fa54= +github.com/marioevz/eth2api v0.0.0-20230214151319-641a58f39ae4/go.mod h1:4WbGGB4Bv17hKsiytlJY4IQDNpRS234DvFvIBNLnd60= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= @@ -214,7 +219,7 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= @@ -271,8 +276,8 @@ github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQg github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= -github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/protolambda/bls12-381-util v0.0.0-20210720105258-a772f2aac13e/go.mod h1:MPZvj2Pr0N8/dXyTPS5REeg2sdLG7t8DRzC1rLv925w= @@ -287,18 +292,17 @@ github.com/protolambda/zrnt v0.30.0 h1:pHEn69ZgaDFGpLGGYG1oD7DvYI7RDirbMBPfbC+8p github.com/protolambda/zrnt v0.30.0/go.mod h1:qcdX9CXFeVNCQK/q0nswpzhd+31RHMk2Ax/2lMsJ4Jw= github.com/protolambda/ztyp v0.2.2 h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY= github.com/protolambda/ztyp v0.2.2/go.mod h1:9bYgKGqg3wJqT9ac1gI2hnVb0STQq7p/1lapqrqY1dU= -github.com/prysmaticlabs/gohashtree v0.0.1-alpha.0.20220714111606-acbb2962fb48 h1:cSo6/vk8YpvkLbk9v3FO97cakNmUoxwi2KMP8hd5WIw= -github.com/rauljordan/engine-proxy v0.0.0-20230316220057-4c80c36c4c3a h1:ZIfMLprHVdo2vs3WcSqSDEyz2ZsSzDhGeOyxh8VQThA= -github.com/rauljordan/engine-proxy v0.0.0-20230316220057-4c80c36c4c3a/go.mod h1:9OVXfWYnIV+wj1/SqfdREmE5mzN/OANAgdOJRtFtvpo= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= -github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +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/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= +github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -320,8 +324,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -329,9 +331,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI= github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= @@ -344,6 +344,7 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10 h1:CQh33pStIp/E30b7TxDlXfM0145bn2e8boI30IxAhTg= github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -351,12 +352,12 @@ github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBn github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/wealdtech/go-bytesutil v1.2.0 h1:GEIzvAZEIgqOoRfnEAaMRNL73gl8e+YlQzqxhFyR30Y= -github.com/wealdtech/go-bytesutil v1.2.0/go.mod h1:FHQSlwhzfSZGffu1osaUGdnNtl5C8tBKwmqvPdB66pM= -github.com/wealdtech/go-eth2-types/v2 v2.8.0 h1:Cts9J78ryXVp8jwotdSSVU75S+QWJrgVCArXreD2X8A= -github.com/wealdtech/go-eth2-types/v2 v2.8.0/go.mod h1:tJazo9o28kdQs3V/U4VafQ4neG+/sL3OBozQ8J3CWmo= -github.com/wealdtech/go-eth2-util v1.8.0 h1:hhs3h2y3Ldty18lppFdpe46nZpdDAMbY7QqiHO5BvE0= -github.com/wealdtech/go-eth2-util v1.8.0/go.mod h1:rSuE0v5zX+uyZrqW/iUmXOxeDpB7lTvhcZvAVh0KlMU= +github.com/wealdtech/go-bytesutil v1.2.1 h1:TjuRzcG5KaPwaR5JB7L/OgJqMQWvlrblA1n0GfcXFSY= +github.com/wealdtech/go-bytesutil v1.2.1/go.mod h1:RhUDUGT1F4UP4ydqbYp2MWJbAel3M+mKd057Pad7oag= +github.com/wealdtech/go-eth2-types/v2 v2.8.1 h1:y2N3xSIZ3tVqsnvj4AgPkh48U5sM612vhZwlK3k+3lM= +github.com/wealdtech/go-eth2-types/v2 v2.8.1/go.mod h1:3TJShI4oBzG8pCZsfe3NZAq8QAmXrC2rd45q7Vn/XB8= +github.com/wealdtech/go-eth2-util v1.8.1 h1:nb50hygsNoql94akg7GN6im/weg8ZZgJWHgiyrj8qiU= +github.com/wealdtech/go-eth2-util v1.8.1/go.mod h1:vv+8jVgYRXEGty/VLPNn1RYlbQNYmTht3VR6nfh0z4E= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= @@ -380,11 +381,11 @@ 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-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= -golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= -golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -414,7 +415,7 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= 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= @@ -455,14 +456,14 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -471,10 +472,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -518,8 +519,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/simulators/eth2/common/testnet/prepared_testnet.go b/simulators/eth2/common/testnet/prepared_testnet.go index 38638d2fd1..68e28e77b8 100644 --- a/simulators/eth2/common/testnet/prepared_testnet.go +++ b/simulators/eth2/common/testnet/prepared_testnet.go @@ -30,6 +30,7 @@ import ( var ( depositAddress common.Eth1Address DEFAULT_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY = big.NewInt(128) + DEFAULT_MAX_CONSECUTIVE_ERRORS_ON_WAITS = 3 ) func init() { @@ -305,6 +306,9 @@ func (p *PreparedTestnet) createTestnet(t *hivesim.T) *Testnet { spec: p.spec, eth1Genesis: p.eth1Genesis, eth2GenesisState: p.eth2Genesis, + + // Testing + maxConsecutiveErrorsOnWaits: DEFAULT_MAX_CONSECUTIVE_ERRORS_ON_WAITS, } } @@ -315,11 +319,8 @@ func (p *PreparedTestnet) prepareExecutionNode( testnet *Testnet, eth1Def *hivesim.ClientDefinition, consensus el.ExecutionConsensus, - ttd *big.Int, - executionIndex int, chain []*types.Block, - subnet string, - logEngineCalls bool, + config clients.ExecutionClientConfig, ) *clients.ExecutionClient { testnet.Logf( "Preparing execution node: %s (%s)", @@ -327,16 +328,21 @@ func (p *PreparedTestnet) prepareExecutionNode( eth1Def.Version, ) + cm := &clients.HiveManagedClient{ + T: testnet.T, + HiveClientDefinition: eth1Def, + } + // This method will return the options used to run the client. // Requires a method that returns the rest of the currently running // execution clients on the network at startup. - optionsGenerator := func() ([]hivesim.StartOption, error) { + cm.OptionsGenerator = func() ([]hivesim.StartOption, error) { opts := []hivesim.StartOption{p.executionOpts} - opts = append(opts, consensus.HiveParams(executionIndex)) + opts = append(opts, consensus.HiveParams(config.ClientIndex)) currentlyRunningEcs := testnet.ExecutionClients(). Running(). - Subnet(subnet) + Subnet(config.Subnet) if len(currentlyRunningEcs) > 0 { bootnode, err := currentlyRunningEcs.Enodes() if err != nil { @@ -346,39 +352,35 @@ func (p *PreparedTestnet) prepareExecutionNode( // Make the client connect to the first eth1 node, as a bootnode for the eth1 net opts = append(opts, hivesim.Params{"HIVE_BOOTNODE": bootnode}) } - if ttd != nil { + opts = append( + opts, + hivesim.Params{ + "HIVE_TERMINAL_TOTAL_DIFFICULTY": fmt.Sprintf( + "%d", + config.TerminalTotalDifficulty, + ), + }, + ) + genesis := testnet.ExecutionGenesis().ToBlock() + if config.TerminalTotalDifficulty <= genesis.Difficulty().Int64() { opts = append( opts, hivesim.Params{ - "HIVE_TERMINAL_TOTAL_DIFFICULTY": fmt.Sprintf( + "HIVE_TERMINAL_BLOCK_HASH": fmt.Sprintf( + "%s", + genesis.Hash(), + ), + }, + ) + opts = append( + opts, + hivesim.Params{ + "HIVE_TERMINAL_BLOCK_NUMBER": fmt.Sprintf( "%d", - ttd.Int64(), + genesis.NumberU64(), ), }, ) - } else { - genesis := testnet.ExecutionGenesis() - genesisBlock := genesis.ToBlock() - if genesis.Config.TerminalTotalDifficulty.Cmp(genesisBlock.Difficulty()) <= 0 { - opts = append( - opts, - hivesim.Params{ - "HIVE_TERMINAL_BLOCK_HASH": fmt.Sprintf( - "%s", - genesisBlock.Hash(), - ), - }, - ) - opts = append( - opts, - hivesim.Params{ - "HIVE_TERMINAL_BLOCK_NUMBER": fmt.Sprintf( - "%d", - genesisBlock.NumberU64(), - ), - }, - ) - } } if len(chain) > 0 { @@ -391,17 +393,12 @@ func (p *PreparedTestnet) prepareExecutionNode( } return opts, nil } - return clients.NewExecutionClient( - testnet.T, - eth1Def, - optionsGenerator, - executionIndex, - clients.PortEngineRPC+executionIndex, - subnet, - ttd, - true, - logEngineCalls, - ) + + return &clients.ExecutionClient{ + Client: cm, + Logger: testnet.T, + Config: config, + } } // Prepares a beacon client object with all the necessary information @@ -410,10 +407,9 @@ func (p *PreparedTestnet) prepareBeaconNode( parentCtx context.Context, testnet *Testnet, beaconDef *hivesim.ClientDefinition, - ttd *big.Int, - beaconIndex int, enableBuilders bool, builderOptions []mock_builder.Option, + config clients.BeaconClientConfig, eth1Endpoints ...*clients.ExecutionClient, ) *clients.BeaconClient { testnet.Logf( @@ -422,10 +418,60 @@ func (p *PreparedTestnet) prepareBeaconNode( beaconDef.Version, ) + if len(eth1Endpoints) == 0 { + panic(fmt.Errorf("at least 1 execution endpoint is required")) + } + + cm := &clients.HiveManagedClient{ + T: testnet.T, + HiveClientDefinition: beaconDef, + } + + cl := &clients.BeaconClient{ + Client: cm, + Logger: testnet.T, + Config: config, + } + + if enableBuilders { + simIP, err := testnet.T.Sim.ContainerNetworkIP( + testnet.T.SuiteID, + "bridge", + "simulation", + ) + if err != nil { + panic(err) + } + + options := []mock_builder.Option{ + mock_builder.WithExternalIP(net.ParseIP(simIP)), + mock_builder.WithPort( + mock_builder.DEFAULT_BUILDER_PORT + config.ClientIndex, + ), + mock_builder.WithID(config.ClientIndex), + mock_builder.WithBeaconGenesisTime(testnet.genesisTime), + mock_builder.WithSpec(p.spec), + } + + if builderOptions != nil { + options = append(options, builderOptions...) + } + + cl.Builder, err = mock_builder.NewMockBuilder( + context.Background(), + eth1Endpoints[0], + cl, + options..., + ) + if err != nil { + panic(err) + } + } + // This method will return the options used to run the client. // Requires a method that returns the rest of the currently running // beacon clients on the network at startup. - optionsGenerator := func() ([]hivesim.StartOption, error) { + cm.OptionsGenerator = func() ([]hivesim.StartOption, error) { opts := []hivesim.StartOption{p.beaconOpts} // Hook up beacon node to (maybe multiple) eth1 nodes @@ -458,85 +504,57 @@ func (p *PreparedTestnet) prepareBeaconNode( opts = append(opts, hivesim.Params{ "HIVE_ETH2_ETH1_RPC_ADDRS": strings.Join(addrs, ","), "HIVE_ETH2_ETH1_ENGINE_RPC_ADDRS": strings.Join(engineAddrs, ","), - "HIVE_ETH2_BEACON_NODE_INDEX": fmt.Sprintf("%d", beaconIndex), + "HIVE_ETH2_BEACON_NODE_INDEX": fmt.Sprintf( + "%d", + config.ClientIndex, + ), }) - if bootnodeENRs, err := testnet.BeaconClients().Running().ENRs(parentCtx); err != nil { - return nil, fmt.Errorf( - "failed to get ENR as bootnode for every beacon node: %v", - err, - ) - } else if bootnodeENRs != "" { - opts = append(opts, hivesim.Params{"HIVE_ETH2_BOOTNODE_ENRS": bootnodeENRs}) - } - - if staticPeers, err := testnet.BeaconClients().Running().P2PAddrs(parentCtx); err != nil { - return nil, fmt.Errorf( - "failed to get p2paddr for every beacon node: %v", - err, - ) - } else if staticPeers != "" { - opts = append(opts, hivesim.Params{"HIVE_ETH2_STATIC_PEERS": staticPeers}) - } + currentlyRunningBcs := testnet.BeaconClients(). + Running(). + Subnet(config.Subnet) + if len(currentlyRunningBcs) > 0 { + if bootnodeENRs, err := currentlyRunningBcs.ENRs(parentCtx); err != nil { + return nil, fmt.Errorf( + "failed to get ENR as bootnode for every beacon node: %v", + err, + ) + } else if bootnodeENRs != "" { + opts = append(opts, hivesim.Params{"HIVE_ETH2_BOOTNODE_ENRS": bootnodeENRs}) + } - if ttd != nil { - opts = append( - opts, - hivesim.Params{ - "HIVE_TERMINAL_TOTAL_DIFFICULTY": fmt.Sprintf("%d", ttd), - }, - ) + if staticPeers, err := currentlyRunningBcs.P2PAddrs(parentCtx); err != nil { + return nil, fmt.Errorf( + "failed to get p2paddr for every beacon node: %v", + err, + ) + } else if staticPeers != "" { + opts = append(opts, hivesim.Params{"HIVE_ETH2_STATIC_PEERS": staticPeers}) + } } - return opts, nil - } - // TODO - //if p.configName != "mainnet" && hasBuildTarget(beaconDef, p.configName) { - // opts = append(opts, hivesim.WithBuildTarget(p.configName)) - //} - cl := clients.NewBeaconClient( - testnet.T, - beaconDef, - optionsGenerator, - testnet.genesisTime, - testnet.spec, - beaconIndex, - testnet.genesisValidatorsRoot, - ) - - if enableBuilders { - simIP, err := testnet.T.Sim.ContainerNetworkIP( - testnet.T.SuiteID, - "bridge", - "simulation", + opts = append( + opts, + hivesim.Params{ + "HIVE_TERMINAL_TOTAL_DIFFICULTY": fmt.Sprintf( + "%d", + config.TerminalTotalDifficulty, + ), + }, ) - if err != nil { - panic(err) - } - options := []mock_builder.Option{ - mock_builder.WithExternalIP(net.ParseIP(simIP)), - mock_builder.WithPort( - mock_builder.DEFAULT_BUILDER_PORT + beaconIndex, - ), - mock_builder.WithID(beaconIndex), - mock_builder.WithBeaconGenesisTime(testnet.genesisTime), + if cl.Builder != nil { + opts = append(opts, hivesim.Params{ + "HIVE_ETH2_BUILDER_ENDPOINT": cl.Builder.Address(), + }) } - if builderOptions != nil { - options = append(options, builderOptions...) - } + // TODO + //if p.configName != "mainnet" && hasBuildTarget(beaconDef, p.configName) { + // opts = append(opts, hivesim.WithBuildTarget(p.configName)) + //} - mockBuilder, err := mock_builder.NewMockBuilder( - eth1Endpoints[0], - cl, - p.spec, - options..., - ) - if err != nil { - panic(err) - } - cl.Builder = mockBuilder + return opts, nil } return cl @@ -563,9 +581,16 @@ func (p *PreparedTestnet) prepareValidatorClient( keyIndex, ) } + keys := p.keyTranches[keyIndex] + + cm := &clients.HiveManagedClient{ + T: testnet.T, + HiveClientDefinition: validatorDef, + } + // This method will return the options used to run the client. // Requires the beacon client object to which to connect. - optionsGenerator := func(validatorKeys map[common.ValidatorIndex]*cl.KeyDetails) ([]hivesim.StartOption, error) { + cm.OptionsGenerator = func() ([]hivesim.StartOption, error) { if !bn.IsRunning() { return nil, fmt.Errorf( "attempted to start a validator when the beacon node is not running", @@ -573,21 +598,29 @@ func (p *PreparedTestnet) prepareValidatorClient( } // Hook up validator to beacon node bnAPIOpt := hivesim.Params{ - "HIVE_ETH2_BN_API_IP": bn.HiveClient.IP.String(), + "HIVE_ETH2_BN_API_IP": bn.GetIP().String(), } - keysOpt := cl.KeysBundle(validatorKeys) + keysOpt := cl.KeysBundle(keys) opts := []hivesim.StartOption{p.validatorOpts, keysOpt, bnAPIOpt} + + if bn.Builder != nil { + opts = append(opts, hivesim.Params{ + "HIVE_ETH2_BUILDER_ENDPOINT": bn.Builder.Address(), + }) + } + // TODO //if p.configName != "mainnet" && hasBuildTarget(validatorDef, p.configName) { // opts = append(opts, hivesim.WithBuildTarget(p.configName)) //} return opts, nil } - return clients.NewValidatorClient( - testnet.T, - validatorDef, - optionsGenerator, - p.keyTranches[keyIndex], - bn, - ) + + return &clients.ValidatorClient{ + Client: cm, + Logger: testnet.T, + ClientIndex: keyIndex, + Keys: keys, + BeaconClient: bn, + } } diff --git a/simulators/eth2/common/testnet/running_testnet.go b/simulators/eth2/common/testnet/running_testnet.go index 8ade39b3cf..bea9a6652f 100644 --- a/simulators/eth2/common/testnet/running_testnet.go +++ b/simulators/eth2/common/testnet/running_testnet.go @@ -3,8 +3,10 @@ package testnet import ( "bytes" "context" + "encoding/hex" "fmt" "math/big" + "net" "sync" "time" @@ -32,6 +34,9 @@ const ( var ( EMPTY_EXEC_HASH = ethcommon.Hash{} EMPTY_TREE_ROOT = tree.Root{} + JWT_SECRET, _ = hex.DecodeString( + "7365637265747365637265747365637265747365637265747365637265747365", + ) ) type Testnet struct { @@ -134,16 +139,28 @@ func StartTestnet( env *Environment, config *Config, ) *Testnet { - prep := prepareTestnet(t, env, config) - testnet := prep.createTestnet(t) - genesisTime := testnet.GenesisTimeUnix() - countdown := time.Until(genesisTime) + var ( + prep = prepareTestnet(t, env, config) + testnet = prep.createTestnet(t) + genesisTime = testnet.GenesisTimeUnix() + ) t.Logf( "Created new testnet, genesis at %s (%s from now)", genesisTime, - countdown, + time.Until(genesisTime), ) + var simulatorIP net.IP + if simIPStr, err := t.Sim.ContainerNetworkIP( + testnet.T.SuiteID, + "bridge", + "simulation", + ); err != nil { + panic(err) + } else { + simulatorIP = net.ParseIP(simIPStr) + } + testnet.Nodes = make(clients.Nodes, len(config.NodeDefinitions)) // Init all client bundles @@ -172,11 +189,19 @@ func StartTestnet( node.ValidatorClientName(), "validator", ) + executionTTD = int64(0) + beaconTTD = int64(0) ) if executionDef == nil || beaconDef == nil || validatorDef == nil { t.Fatalf("FAIL: Unable to get client") } + if node.ExecutionClientTTD != nil { + executionTTD = node.ExecutionClientTTD.Int64() + } + if node.BeaconNodeTTD != nil { + beaconTTD = node.BeaconNodeTTD.Int64() + } // Prepare the client objects with all the information necessary to // eventually start @@ -185,11 +210,19 @@ func StartTestnet( testnet, executionDef, config.Eth1Consensus, - node.ExecutionClientTTD, - nodeIndex, node.Chain, - node.ExecutionSubnet, - env.LogEngineCalls, + clients.ExecutionClientConfig{ + ClientIndex: nodeIndex, + TerminalTotalDifficulty: executionTTD, + Subnet: node.GetExecutionSubnet(), + JWTSecret: JWT_SECRET, + ProxyConfig: &clients.ExecutionProxyConfig{ + Host: simulatorIP, + Port: clients.PortEngineRPC + nodeIndex, + TrackForkchoiceUpdated: true, + LogEngineCalls: env.LogEngineCalls, + }, + }, ) if node.ConsensusClient != "" { @@ -197,10 +230,16 @@ func StartTestnet( parentCtx, testnet, beaconDef, - node.BeaconNodeTTD, - nodeIndex, config.EnableBuilders, config.BuilderOptions, + clients.BeaconClientConfig{ + ClientIndex: nodeIndex, + TerminalTotalDifficulty: beaconTTD, + Spec: testnet.spec, + GenesisValidatorsRoot: &testnet.genesisValidatorsRoot, + GenesisTime: &testnet.genesisTime, + Subnet: node.GetConsensusSubnet(), + }, nodeClient.ExecutionClient, ) @@ -214,19 +253,17 @@ func StartTestnet( } // Add rest of properties - nodeClient.T = t + nodeClient.Logging = t nodeClient.Index = nodeIndex nodeClient.Verification = node.TestVerificationNode - // Start the node clients if specified so if !node.DisableStartup { - nodeClient.Start() + if err := nodeClient.Start(); err != nil { + t.Fatalf("FAIL: Unable to start node %d: %v", nodeIndex, err) + } } } - // Default config - testnet.maxConsecutiveErrorsOnWaits = 3 - return testnet } @@ -262,7 +299,7 @@ func (t *Testnet) WaitForGenesis(ctx context.Context) { // Wait a certain amount of slots while printing the current status. func (t *Testnet) WaitSlots(ctx context.Context, slots common.Slot) error { for s := common.Slot(0); s < slots; s++ { - t.BeaconClients().Running().PrintStatus(ctx, t) + t.BeaconClients().Running().PrintStatus(ctx) select { case <-time.After(time.Duration(t.spec.SECONDS_PER_SLOT) * time.Second): case <-ctx.Done(): diff --git a/simulators/eth2/engine/Dockerfile b/simulators/eth2/engine/Dockerfile index 7f58423b7c..2a8ee69c5f 100644 --- a/simulators/eth2/engine/Dockerfile +++ b/simulators/eth2/engine/Dockerfile @@ -1,10 +1,3 @@ -# Generate the ethash verification caches. -# Use a static version because this will never need to be updated. -FROM ethereum/client-go:v1.10.20 AS geth -RUN \ - /usr/local/bin/geth makecache 1 /ethash && \ - /usr/local/bin/geth makedag 1 /ethash - # Build the simulator binary FROM golang:1-alpine AS builder RUN apk --no-cache add gcc musl-dev linux-headers cmake make clang build-base clang-static clang-dev @@ -21,6 +14,5 @@ RUN go build -o ./sim . FROM alpine:latest ADD . / COPY --from=builder /source/engine/sim / -COPY --from=geth /ethash /ethash ENTRYPOINT ["./sim"] diff --git a/simulators/eth2/engine/scenarios.go b/simulators/eth2/engine/scenarios.go index 78d0069233..87b75ee0c5 100644 --- a/simulators/eth2/engine/scenarios.go +++ b/simulators/eth2/engine/scenarios.go @@ -1834,18 +1834,13 @@ func SyncingWithChainHavingValidTransitionBlock( ) } - var headOptStatus clients.BlockV2OptimisticResponse - ctxTimeout, cancel = context.WithTimeout(ctx, time.Second*5) - defer cancel() - if exists, err := eth2api.SimpleRequest(ctxTimeout, importer.API, eth2api.FmtGET("/eth/v2/beacon/blocks/%s", eth2api.BlockHead.BlockId()), &headOptStatus); err != nil { + optimistic, err := importer.BlockIsOptimistic(ctx, eth2api.BlockHead) + if err != nil { t.Fatalf("FAIL: Failed to poll head importer head: %v", err) - } else if !exists { - t.Fatalf("FAIL: Failed to poll head importer head: !exists") - } - if headOptStatus.ExecutionOptimistic { + } else if optimistic { t.Fatalf( "FAIL: importer still optimistic: execution_optimistic==%t", - headOptStatus.ExecutionOptimistic, + optimistic, ) } } @@ -1988,26 +1983,9 @@ func SyncingWithChainHavingInvalidTransitionBlock( } if headInfo.Header.Message.Slot != (builderExecutionBlock.Slot() - 1) { - ctxTimeout, cancel := context.WithTimeout(ctx, time.Second*5) - defer cancel() - var headOptStatus clients.BlockV2OptimisticResponse - if exists, err := eth2api.SimpleRequest( - ctxTimeout, importer.API, - eth2api.FmtGET( - "/eth/v2/beacon/blocks/%s", - eth2api.BlockHead.BlockId(), - ), - &headOptStatus, - ); err != nil { - // Block still not synced - fmt.Printf( - "DEBUG: Queried block %s: %v\n", - eth2api.BlockHead.BlockId(), - err, - ) - } else if !exists { - // Block still not synced - fmt.Printf("DEBUG: Queried block %s: %v\n", eth2api.BlockHead.BlockId(), err) + optimistic, err := importer.BlockIsOptimistic(ctx, eth2api.BlockHead) + if err != nil { + t.Fatalf("FAIL: Failed to poll head importer head: %v", err) } t.Fatalf( @@ -2016,7 +1994,7 @@ func SyncingWithChainHavingInvalidTransitionBlock( headInfo.Header.Message.Slot, builderExecutionBlock.StateRoot(), builderExecutionBlock.Slot(), - headOptStatus.ExecutionOptimistic, + optimistic, ) } } diff --git a/simulators/eth2/go.work.sum b/simulators/eth2/go.work.sum index c218fb82b8..85bfe33a66 100644 --- a/simulators/eth2/go.work.sum +++ b/simulators/eth2/go.work.sum @@ -1,3 +1,5 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +cloud.google.com/go v0.0.0-20170206221025-ce650573d812/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= @@ -7,203 +9,468 @@ cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTj cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= +cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= +github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= +github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= +github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/hcsshim v0.9.3/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= +github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= +github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= +github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= +github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= +github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= +github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= +github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= +github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= +github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= +github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= +github.com/Microsoft/hcsshim v0.9.6/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= +github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= +github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/aclements/go-gg v0.0.0-20170118225347-6dbb4e4fefb0/go.mod h1:55qNq4vcpkIuHowELi5C8e+1yUHtoLoOUR9QU5j7Tes= +github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794/go.mod h1:7e+I0LQFUI9AXWxOfsQROs9xPhoJtbsyWcjJqDd4KPY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/ajstarks/svgo v0.0.0-20210923152817-c3b6e2f0c527/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= -github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= +github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= +github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= +github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= +github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= +github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= +github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= +github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= +github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= -github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/consensys/gnark-crypto v0.9.1-0.20230105202408-1a7a29904a7c/go.mod h1:CkbdF9hbRidRJYMRzmfX8TMOr95I2pYXRHF18MzRrvA= -github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= -github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0= +github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= +github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= +github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= +github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= +github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= +github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= +github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= +github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= +github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= +github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= +github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= +github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= +github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= +github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= +github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= +github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= +github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= +github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= +github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns= +github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= +github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= +github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= +github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= +github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= +github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= +github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= +github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= +github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= +github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= +github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= +github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= +github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= +github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= +github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= +github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= +github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= +github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= +github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= +github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= +github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= +github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= +github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= +github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= +github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= +github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= +github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20220523130400-f11357ae11c7/go.mod h1:gFnFS95y8HstDP6P9pPwzrxOOC5TRDkwbM+ao15ChAI= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= +github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= +github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= +github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= +github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= -github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= +github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= +github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= +github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v1.6.2/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= +github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja v0.0.0-20230122112309-96b1610dd4f7/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= -github.com/ethereum/hive/hiveproxy v0.0.0-20220708193637-ec524d7345a1/go.mod h1:XtF0Q/5ESJpak7na/6prPgfpTZ+IAFU2qQzHvnqc5as= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/ethereum/hive/hiveproxy v0.0.0-20230313101845-c7dfe88c8138 h1:Y74Ksk90DLCMWnpOfOEWRLxVjsf/67vY+hX5kWu9UY0= +github.com/ethereum/hive/hiveproxy v0.0.0-20230313101845-c7dfe88c8138/go.mod h1:1LWNU6/EYsIOXZGa2KdklD1ET77gLTeEyhq+WTZ+37o= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanw/esbuild v0.17.6/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= +github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsouza/go-dockerclient v1.8.1 h1:a27vHYqNSZz88nUAurI1o6W5PgEt63nAWilOI+j63RE= +github.com/fsouza/go-dockerclient v1.8.1/go.mod h1:zmA2ogSxRnXmbZcy0Aq7yhRoCdP/bDns/qghCK9SWtM= +github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8= +github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732/go.mod h1:o/XfIXWi4/GqbQirfRm5uTbXMG5NpqxkxblnbZ+QM9I= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= +github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= +github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= +github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= +github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= +github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= +github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= +github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= +github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= +github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= +github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks= +github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A= +github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +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-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -211,60 +478,57 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/safehtml v0.0.2/go.mod h1:L4KWwDsUJdECRAEpZoBn3O64bQaywRscowZjJAzjHnU= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= +github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/guptarohit/asciigraph v0.5.5/go.mod h1:dYl5wwK4gNsnFf9Zp+l06rFiDZ5YtXM6x7SRWZ3KGag= +github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= @@ -273,350 +537,564 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= +github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= +github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= +github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= +github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= +github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= +github.com/kataras/golog v0.1.8/go.mod h1:rGPAin4hYROfk1qT9wZP6VY2rsb4zzc37QpdPjdkqVw= +github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= +github.com/kataras/iris/v12 v12.2.0/go.mod h1:BLzBpEunc41GbE68OUaQlqX4jzi791mx5HU04uPb90Y= +github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= +github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= +github.com/kataras/pio v0.0.11/go.mod h1:38hH6SWH6m4DKSYmRhlrCJ5WItwWgCVrTNU62XZyUvI= +github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= +github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= +github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ= +github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= +github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= +github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= -github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= +github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= +github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= +github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= +github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/sys/mount v0.3.3 h1:fX1SVkXFJ47XWDoeFW4Sq7PdQJnV2QIDZAqjNqgEjUs= +github.com/moby/sys/mount v0.3.3/go.mod h1:PBaEorSNTLG5t/+4EgukEQVlAvVEc6ZjTySwKdqp5K0= +github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= +github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= +github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= -github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= -github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= -github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +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.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= +github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= +github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= +github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= +github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= +github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= +github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= +github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/protolambda/zrnt v0.29.0/go.mod h1:qcdX9CXFeVNCQK/q0nswpzhd+31RHMk2Ax/2lMsJ4Jw= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= -github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= 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= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= +github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= +github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= +github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= +github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/supranational/blst v0.3.8-0.20220526154634-513d2456b344/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= +github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= +github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk= +github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= +github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10/go.mod h1:x/Pa0FF5Te9kdrlZKJK82YmAkvL8+f989USgz6Jiw7M= +github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/urfave/cli/v2 v2.5.1/go.mod h1:oDzoM7pVwz6wHn5ogWgFUU1s4VJayeQS+aEZDqXIEJs= github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI= +github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= +github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= +github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= +github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= +go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.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= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.4.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.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/oauth2 v0.0.0-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5/go.mod h1:UBKtEnL8aqnd+0JHqZ+2qoMDwtuy6cYhhKNoHLBiTQc= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -624,43 +1102,59 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= +gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= +gonum.org/v1/plot v0.10.0/go.mod h1:JWIHJ7U20drSQb/aDpTetJzfC1KlAPldJLpkSy88dvQ= +google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20170206182103-3d017632ea10/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -668,21 +1162,26 @@ google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -691,44 +1190,118 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= -gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20200109203555-b30bc20e4fd1/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= +k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= +k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= +k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= +k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= +k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= +k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= +k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= +k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/simulators/eth2/withdrawals/README.md b/simulators/eth2/withdrawals/README.md index 3c50f389f6..fa84528579 100644 --- a/simulators/eth2/withdrawals/README.md +++ b/simulators/eth2/withdrawals/README.md @@ -164,6 +164,21 @@ document. ### Builder API Fallback for Withdrawals +* [x] Builder API Constructs Payloads with Valid Withdrawals List +
+ Click for details + + - Start two validating nodes on Bellatrix/Paris genesis + - Total of 128 Validators, 64 for each validating node + - All genesis validators have BLS withdrawal credentials + - Both validating nodes are connected to a builder API mock server + - Builder API server is configured to return payloads with the correct withdrawals list, starting from capella + - Wait for capella and verify that the payloads are correctly included in the canonical chain + - Wait for finalization, and verify at least one block was built by the builder API on each node + - Verify that all signed beacon blocks delivered to the builder were correctly constructed and signed + +
+ * [x] Builder API Constructs Payloads with Invalid Withdrawals List
Click for details diff --git a/simulators/eth2/withdrawals/helper.go b/simulators/eth2/withdrawals/helper.go index 1f408d7298..0cdccbf0a0 100644 --- a/simulators/eth2/withdrawals/helper.go +++ b/simulators/eth2/withdrawals/helper.go @@ -190,6 +190,7 @@ func PrintWithdrawalHistory(c BeaconCache) error { // Helper struct to keep track of current status of a validator withdrawal state type Validator struct { Index beacon.ValidatorIndex + PubKey *beacon.BLSPubkey WithdrawAddress *common.Address Exited bool ExitCondition string @@ -329,6 +330,29 @@ func (v *Validator) VerifyWithdrawnBalance( return false, nil } +func (v *Validator) VerifySignature( + signature *beacon.BLSSignature, + root tree.Root, + domain beacon.BLSDomain, +) (bool, error) { + if signature == nil { + return false, fmt.Errorf("no signature to verify") + } + // Convert to blsu pubkey + pk, err := v.PubKey.Pubkey() + if err != nil { + return false, err + } + // Convert signature to blsu + s, err := signature.Signature() + if err != nil { + return false, nil + } + // Compute signing root + signingRoot := beacon.ComputeSigningRoot(root, domain) + return blsu.Verify(pk, signingRoot[:], s), nil +} + // Signs the BLS-to-execution-change for the given address func (v *Validator) SignBLSToExecutionChange( executionAddress common.Address, @@ -387,6 +411,15 @@ func (v *Validator) SignSendBLSToExecutionChange( type Validators []*Validator +func (vs Validators) GetValidatorByIndex(i beacon.ValidatorIndex) *Validator { + for _, v := range vs { + if v.Index == i { + return v + } + } + return nil +} + // Verify all validators have withdrawn func (vs Validators) VerifyWithdrawnBalance( ctx context.Context, @@ -481,6 +514,12 @@ func ValidatorFromBeaconValidator( v.BLSToExecutionChangeDomain = domain v.BlockStateCache = beaconCache + pk, err := source.Pubkey() + if err != nil { + return nil, err + } + v.PubKey = &pk + wc, err := source.WithdrawalCredentials() if err != nil { return nil, err diff --git a/simulators/eth2/withdrawals/main.go b/simulators/eth2/withdrawals/main.go index 8cd34932f6..d060bf86c7 100644 --- a/simulators/eth2/withdrawals/main.go +++ b/simulators/eth2/withdrawals/main.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/hive/hivesim" + mock_builder "github.com/ethereum/hive/simulators/eth2/common/builder/mock" "github.com/ethereum/hive/simulators/eth2/common/clients" consensus_config "github.com/ethereum/hive/simulators/eth2/common/config/consensus" "github.com/ethereum/hive/simulators/eth2/common/testnet" @@ -101,7 +102,7 @@ var builderTests = []TestSpec{ // All validators can withdraw from the start GenesisExecutionWithdrawalCredentialsShares: 1, }, - BuilderTestError: INVALID_WITHDRAWALS, + InvalidatePayloadAttributes: mock_builder.INVALIDATE_ATTR_EXTRA_WITHDRAWAL, }, BuilderWithdrawalsTestSpec{ BaseWithdrawalsTestSpec: BaseWithdrawalsTestSpec{ @@ -113,7 +114,7 @@ var builderTests = []TestSpec{ // All validators can withdraw from the start GenesisExecutionWithdrawalCredentialsShares: 1, }, - BuilderTestError: ERROR_ON_HEADER_REQUEST, + ErrorOnHeaderRequest: true, }, BuilderWithdrawalsTestSpec{ BaseWithdrawalsTestSpec: BaseWithdrawalsTestSpec{ @@ -125,7 +126,19 @@ var builderTests = []TestSpec{ // All validators can withdraw from the start GenesisExecutionWithdrawalCredentialsShares: 1, }, - BuilderTestError: ERROR_ON_UNBLINDED_PAYLOAD_REQUEST, + ErrorOnPayloadReveal: true, + }, + BuilderWithdrawalsTestSpec{ + BaseWithdrawalsTestSpec: BaseWithdrawalsTestSpec{ + Name: "test-builders-capella-invalid-payload-version", + Description: ` + Test consensus clients correctly reject a built payload if the + version is outdated (bellatrix instead of capella). + `, + // All validators can withdraw from the start + GenesisExecutionWithdrawalCredentialsShares: 1, + }, + InvalidPayloadVersion: true, }, BuilderWithdrawalsTestSpec{ BaseWithdrawalsTestSpec: BaseWithdrawalsTestSpec{ @@ -141,7 +154,7 @@ var builderTests = []TestSpec{ // All validators can withdraw from the start GenesisExecutionWithdrawalCredentialsShares: 1, }, - BuilderTestError: VALID_WITHDRAWALS_INVALID_STATE_ROOT, + InvalidatePayload: mock_builder.INVALIDATE_PAYLOAD_STATE_ROOT, }, BuilderWithdrawalsTestSpec{ BaseWithdrawalsTestSpec: BaseWithdrawalsTestSpec{ @@ -149,10 +162,9 @@ var builderTests = []TestSpec{ Description: ` Test canonical chain includes capella payloads built by the builder api. `, - // All validators can withdraw from the start - GenesisExecutionWithdrawalCredentialsShares: 1, + // All validators start with BLS withdrawal credentials + GenesisExecutionWithdrawalCredentialsShares: 0, }, - BuilderTestError: NO_ERROR, }, } diff --git a/simulators/eth2/withdrawals/scenarios.go b/simulators/eth2/withdrawals/scenarios.go index b19e0f063a..06c2019c4f 100644 --- a/simulators/eth2/withdrawals/scenarios.go +++ b/simulators/eth2/withdrawals/scenarios.go @@ -3,14 +3,10 @@ package main import ( "bytes" "context" - "crypto/rand" - "fmt" "math/big" "time" - api "github.com/ethereum/go-ethereum/beacon/engine" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/hive/hivesim" mock_builder "github.com/ethereum/hive/simulators/eth2/common/builder/mock" "github.com/ethereum/hive/simulators/eth2/common/clients" @@ -236,7 +232,7 @@ loop: t.Fatalf("FAIL: Timeout waiting on all accounts to withdraw") case <-time.After(time.Duration(testnet.Spec().SECONDS_PER_SLOT) * time.Second): // Print all info - testnet.BeaconClients().Running().PrintStatus(slotCtx, t) + testnet.BeaconClients().Running().PrintStatus(slotCtx) // Check all accounts for _, n := range testnet.Nodes.Running() { @@ -296,10 +292,6 @@ func (ts BuilderWithdrawalsTestSpec) Execute( config := ts.GetTestnetConfig(n) ctx := context.Background() - capellaSlot := beacon.Slot( - config.CapellaForkEpoch.Uint64() * slotsPerEpoch, - ) - // Configure the builder according to the error config.BuilderOptions = make([]mock_builder.Option, 0) @@ -307,133 +299,64 @@ func (ts BuilderWithdrawalsTestSpec) Execute( config.BuilderOptions = append( config.BuilderOptions, mock_builder.WithPayloadWeiValueBump(big.NewInt(10000)), + mock_builder.WithExtraDataWatermark("builder payload tst"), ) // Inject test error - switch ts.BuilderTestError { - case INVALID_WITHDRAWALS: + capellaEpoch := beacon.Epoch(config.CapellaForkEpoch.Uint64()) + if ts.ErrorOnHeaderRequest { config.BuilderOptions = append( config.BuilderOptions, - mock_builder.WithPayloadAttributesModifier( - func(pa *api.PayloadAttributes, s beacon.Slot) (bool, error) { - // Only modify once we reached capella - if s >= capellaSlot { - // Create a list of invalid (random) withdrawals within the length limit - pa.Withdrawals = make( - []*types.Withdrawal, - withdrawalsPerInvalidList, - ) - for i := uint64(0); i < withdrawalsPerInvalidList; i++ { - w := types.Withdrawal{} - w.Index = i + (uint64(s-capellaSlot) * withdrawalsPerInvalidList) - w.Validator = i + 1 - w.Amount = i + 1 - rand.Read(w.Address[:]) - pa.Withdrawals[i] = &w - } - return true, nil - } - return false, nil - }, - ), + mock_builder.WithErrorOnHeaderRequestAtEpoch(capellaEpoch), ) - case INVALIDATE_SINGLE_WITHDRAWAL_ADDRESS, - INVALIDATE_SINGLE_WITHDRAWAL_AMOUNT, - INVALIDATE_SINGLE_WITHDRAWAL_VALIDATOR_INDEX, - INVALIDATE_SINGLE_WITHDRAWAL_INDEX: + } + if ts.ErrorOnPayloadReveal { config.BuilderOptions = append( config.BuilderOptions, - mock_builder.WithPayloadAttributesModifier( - func(pa *api.PayloadAttributes, s beacon.Slot) (bool, error) { - // Only modify once we reached capella - if s >= capellaSlot { - // We need to invalidate a single withdrawal - if len(pa.Withdrawals) > 0 { - switch ts.BuilderTestError { - case INVALIDATE_SINGLE_WITHDRAWAL_ADDRESS: - pa.Withdrawals[0].Address[0]++ - case INVALIDATE_SINGLE_WITHDRAWAL_AMOUNT: - pa.Withdrawals[0].Amount++ - case INVALIDATE_SINGLE_WITHDRAWAL_VALIDATOR_INDEX: - pa.Withdrawals[0].Validator++ - case INVALIDATE_SINGLE_WITHDRAWAL_INDEX: - pa.Withdrawals[0].Index++ - } - return true, nil - } - } - return false, nil - }, - ), + mock_builder.WithErrorOnPayloadRevealAtEpoch(capellaEpoch), ) - case VALID_WITHDRAWALS_INVALID_STATE_ROOT: + } + if ts.InvalidatePayload != "" { config.BuilderOptions = append( config.BuilderOptions, - mock_builder.WithPayloadModifier( - func(ed *api.ExecutableData, s beacon.Slot) (bool, error) { - // Only modify once we reached capella - if s >= capellaSlot { - var ( - originalHash = ed.BlockHash - originalStateRoot = ed.StateRoot - modifiedStateRoot = common.Hash{} - ) - // We need to simulate the builder producing an invalid - // execution payload by modifying its state root - rand.Read(modifiedStateRoot[:]) - if b, err := api.ExecutableDataToBlock(*ed); err != nil { - return false, err - } else { - header := b.Header() - header.Root = modifiedStateRoot - modifiedHash := header.Hash() - copy(ed.BlockHash[:], modifiedHash[:]) - copy(ed.StateRoot[:], modifiedStateRoot[:]) - } - t.Logf( - "INFO: Modified payload %d: hash:%s->%s, stateRoot:%s->%s, parentHash:%s", - ed.Number, - originalHash, - ed.BlockHash, - originalStateRoot, - ed.StateRoot, - ed.ParentHash, - ) - return true, nil - } - return false, nil - }, + mock_builder.WithPayloadInvalidatorAtEpoch( + capellaEpoch, + ts.InvalidatePayload, ), ) - case ERROR_ON_HEADER_REQUEST: + } + if ts.InvalidatePayloadAttributes != "" { config.BuilderOptions = append( config.BuilderOptions, - mock_builder.WithErrorOnHeaderRequest( - func(s beacon.Slot) error { - if s >= capellaSlot { - return fmt.Errorf("error produced by test") - } - return nil - }, + mock_builder.WithPayloadAttributesInvalidatorAtEpoch( + capellaEpoch, + ts.InvalidatePayloadAttributes, ), ) - case ERROR_ON_UNBLINDED_PAYLOAD_REQUEST: + } + if ts.InvalidPayloadVersion { config.BuilderOptions = append( config.BuilderOptions, - mock_builder.WithErrorOnPayloadReveal( - func(s beacon.Slot) error { - if s >= capellaSlot { - return fmt.Errorf("error produced by test") - } - return nil - }, - ), + mock_builder.WithInvalidBuilderBidVersionAtEpoch(capellaEpoch), ) } testnet := tn.StartTestnet(ctx, t, env, config) defer testnet.Stop() + blsDomain := ComputeBLSToExecutionDomain(testnet) + + // Get all validators info + allValidators, err := ValidatorsFromBeaconState( + testnet.GenesisBeaconState(), + *testnet.Spec().Spec, + env.Keys, + &blsDomain, + ) + if err != nil { + t.Fatalf("FAIL: Error parsing validators from beacon state") + } + go func() { lastNonce := uint64(0) txPerIteration := 5 @@ -488,6 +411,32 @@ func (ts BuilderWithdrawalsTestSpec) Execute( } } + // If there are any remaining validators that cannot withdraw yet, send + // BLS-to-execution-changes now. + nonWithdrawableValidators := allValidators.NonWithdrawable() + if len(nonWithdrawableValidators) > 0 { + beaconClients := testnet.BeaconClients() + for i := 0; i < len(nonWithdrawableValidators); i++ { + b := beaconClients[i%len(beaconClients)] + v := nonWithdrawableValidators[i] + if err := v.SignSendBLSToExecutionChange( + ctx, + b, + common.Address{byte(v.Index + 0x100)}, + ); err != nil { + t.Fatalf( + "FAIL: Unable to submit bls-to-execution changes: %v", + err, + ) + } else { + t.Logf("INFO: Sent validator %d BLS-To-Exec-Change on Capella (%s)", v.Index, b.ClientName()) + } + } + + } else { + t.Logf("INFO: no validators left on BLS credentials") + } + // Wait for finalization, to verify that builder modifications // did not affect the network finalityCtx, cancel := testnet.Spec().EpochTimeoutContext(ctx, 5) @@ -498,8 +447,10 @@ func (ts BuilderWithdrawalsTestSpec) Execute( // Verify any modified payloads did not make it into the // canonical chain - switch ts.BuilderTestError { - case NO_ERROR: + if !ts.ErrorOnHeaderRequest && !ts.ErrorOnPayloadReveal && + !ts.InvalidPayloadVersion && + ts.InvalidatePayload == "" && + ts.InvalidatePayloadAttributes == "" { // Simply verify that builder's capella payloads were included in the // canonical chain for i, n := range testnet.Nodes.Running() { @@ -529,11 +480,7 @@ func (ts BuilderWithdrawalsTestSpec) Execute( ) } } - case INVALID_WITHDRAWALS, - INVALIDATE_SINGLE_WITHDRAWAL_ADDRESS, - INVALIDATE_SINGLE_WITHDRAWAL_AMOUNT, - INVALIDATE_SINGLE_WITHDRAWAL_VALIDATOR_INDEX, - INVALIDATE_SINGLE_WITHDRAWAL_INDEX: + } else if ts.InvalidatePayloadAttributes != "" { for i, n := range testnet.VerificationNodes().Running() { modifiedPayloads := n.BeaconClient.Builder.GetModifiedPayloads() if len(modifiedPayloads) == 0 { @@ -569,12 +516,91 @@ func (ts BuilderWithdrawalsTestSpec) Execute( } } - // Count and print missed slots + // Count, print and verify missed slots if count, err := testnet.BeaconClients().Running()[0].GetFilledSlotsCountPerEpoch(ctx); err != nil { t.Fatalf("FAIL: unable to obtain slot count per epoch: %v", err) } else { for ep, slots := range count { t.Logf("INFO: Epoch %d, filled slots=%d", ep, slots) } + + var max_missed_slots uint64 = 0 + if ts.ErrorOnHeaderRequest || ts.InvalidPayloadVersion || ts.InvalidatePayloadAttributes != "" { + // These errors should be caught by the CL client when the built blinded + // payload is received. Hence, a low number of missed slots is expected. + max_missed_slots = 1 + } else { + // All other errors cannot be caught by the CL client until the + // payload is revealed, and the beacon block had been signed. + // Hence, a high number of missed slots is expected because the + // circuit breaker is a mechanism that only kicks in after many + // missed slots. + max_missed_slots = 10 + } + if count[capellaEpoch] < uint64(testnet.Spec().SLOTS_PER_EPOCH)-max_missed_slots { + t.Fatalf( + "FAIL: Epoch %d should have at least %d filled slots, but has %d", + capellaEpoch, + uint64(testnet.Spec().SLOTS_PER_EPOCH)-max_missed_slots, + count[capellaEpoch], + ) + } + } + + // Verify all submited blinded beacon blocks have correct signatures + spec := testnet.Spec().Spec + genesisValsRoot := testnet.GenesisValidatorsRoot() + for i, n := range testnet.Nodes.Running() { + b := n.BeaconClient.Builder + for slot, b := range b.GetSignedBeaconBlocks() { + if slot != b.Slot() { + t.Fatalf( + "FAIL: Beacon block slot %d does not match slot %d", + b.Slot(), + slot, + ) + } + proposerIndex := b.ProposerIndex() + v := allValidators.GetValidatorByIndex(proposerIndex) + if v == nil { + t.Fatalf( + "FAIL: Unable to find validator with index %d", + proposerIndex, + ) + } + blockProposerDomain := beacon.ComputeDomain( + beacon.DOMAIN_BEACON_PROPOSER, + spec.ForkVersion(slot), + genesisValsRoot, + ) + signature := b.BlockSignature() + blockRoot := b.Root(spec) + if valid, err := v.VerifySignature( + signature, + blockRoot, + blockProposerDomain, + ); err != nil { + t.Fatalf( + "FAIL: Error verifying signature for slot %d on node %d: err", + slot, + i, + err, + ) + } else if !valid { + t.Fatalf( + "FAIL: Invalid signature for slot %d on node %d, root=%s, signature=%s, public key=%s", + slot, + i, + blockRoot.String(), + b.BlockSignature().String(), + v.PubKey.String(), + ) + } + + } + } + t.Logf( + "INFO: Validated all signatures of beacon blocks received by builders", + ) } diff --git a/simulators/eth2/withdrawals/specs.go b/simulators/eth2/withdrawals/specs.go index db47fa1861..c8b1246c9a 100644 --- a/simulators/eth2/withdrawals/specs.go +++ b/simulators/eth2/withdrawals/specs.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/params" + mock_builder "github.com/ethereum/hive/simulators/eth2/common/builder/mock" "github.com/ethereum/hive/simulators/eth2/common/clients" cl "github.com/ethereum/hive/simulators/eth2/common/config/consensus" el "github.com/ethereum/hive/simulators/eth2/common/config/execution" @@ -233,21 +234,6 @@ func (ts BaseWithdrawalsTestSpec) GetValidatorKeys( return keys } -type BuilderTestError int - -const ( - NO_ERROR BuilderTestError = iota - ERROR_ON_HEADER_REQUEST - ERROR_ON_UNBLINDED_PAYLOAD_REQUEST - INVALID_WITHDRAWALS - INVALIDATE_SINGLE_WITHDRAWAL_ADDRESS - INVALIDATE_SINGLE_WITHDRAWAL_AMOUNT - INVALIDATE_SINGLE_WITHDRAWAL_VALIDATOR_INDEX - INVALIDATE_SINGLE_WITHDRAWAL_INDEX - VALID_WITHDRAWALS_INVALID_STATE_ROOT - TIMEOUT -) - var REQUIRES_FINALIZATION_TO_ACTIVATE_BUILDER = []string{ "lighthouse", "teku", @@ -255,7 +241,11 @@ var REQUIRES_FINALIZATION_TO_ACTIVATE_BUILDER = []string{ type BuilderWithdrawalsTestSpec struct { BaseWithdrawalsTestSpec - BuilderTestError BuilderTestError + ErrorOnHeaderRequest bool + ErrorOnPayloadReveal bool + InvalidPayloadVersion bool + InvalidatePayload mock_builder.PayloadInvalidation + InvalidatePayloadAttributes mock_builder.PayloadAttributesInvalidation } func (ts BuilderWithdrawalsTestSpec) GetTestnetConfig( diff --git a/simulators/ethereum/engine/Dockerfile b/simulators/ethereum/engine/Dockerfile index e33044e5e5..f98fcd86b4 100644 --- a/simulators/ethereum/engine/Dockerfile +++ b/simulators/ethereum/engine/Dockerfile @@ -1,12 +1,3 @@ -# Generate the ethash verification caches. -# Use a static version because this will never need to be updated. -FROM ethereum/client-go:v1.10.20 AS geth -RUN \ - /usr/local/bin/geth makecache 1 /ethash && \ - /usr/local/bin/geth makecache 30000 /ethash && \ - /usr/local/bin/geth makedag 1 /ethash && \ - /usr/local/bin/geth makedag 30000 /ethash - # This simulation runs Engine API tests. FROM golang:1-alpine as builder RUN apk add --update gcc musl-dev linux-headers @@ -21,5 +12,4 @@ FROM alpine:latest ADD . /source WORKDIR /source COPY --from=builder /source/engine . -COPY --from=geth /ethash /ethash ENTRYPOINT ["./engine"] diff --git a/simulators/ethereum/engine/client/engine.go b/simulators/ethereum/engine/client/engine.go index 68fec29229..13fd360ea9 100644 --- a/simulators/ethereum/engine/client/engine.go +++ b/simulators/ethereum/engine/client/engine.go @@ -4,8 +4,8 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/core" api "github.com/ethereum/go-ethereum/beacon/engine" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/hive/hivesim" "github.com/ethereum/go-ethereum/common" @@ -32,10 +32,12 @@ type Eth interface { type Engine interface { ForkchoiceUpdatedV1(ctx context.Context, fcState *api.ForkchoiceStateV1, pAttributes *api.PayloadAttributes) (api.ForkChoiceResponse, error) ForkchoiceUpdatedV2(ctx context.Context, fcState *api.ForkchoiceStateV1, pAttributes *api.PayloadAttributes) (api.ForkChoiceResponse, error) + ForkchoiceUpdated(ctx context.Context, version int, fcState *api.ForkchoiceStateV1, pAttributes *api.PayloadAttributes) (api.ForkChoiceResponse, error) GetPayloadV1(ctx context.Context, payloadId *api.PayloadID) (api.ExecutableData, error) GetPayloadV2(ctx context.Context, payloadId *api.PayloadID) (api.ExecutableData, *big.Int, error) + NewPayload(ctx context.Context, version int, payload interface{}) (api.PayloadStatusV1, error) NewPayloadV1(ctx context.Context, payload *client_types.ExecutableDataV1) (api.PayloadStatusV1, error) NewPayloadV2(ctx context.Context, payload *api.ExecutableData) (api.PayloadStatusV1, error) @@ -76,8 +78,10 @@ type EngineStarter interface { } var ( - Head *big.Int // Nil - Pending = big.NewInt(-2) - Finalized = big.NewInt(-3) - Safe = big.NewInt(-4) + Head *big.Int // Nil + Pending = big.NewInt(-2) + Finalized = big.NewInt(-3) + Safe = big.NewInt(-4) + LatestForkchoiceUpdatedVersion = 2 + LatestNewPayloadVersion = 2 ) diff --git a/simulators/ethereum/engine/client/hive_rpc/hive_rpc.go b/simulators/ethereum/engine/client/hive_rpc/hive_rpc.go index 5896515a2e..d09ce86082 100644 --- a/simulators/ethereum/engine/client/hive_rpc/hive_rpc.go +++ b/simulators/ethereum/engine/client/hive_rpc/hive_rpc.go @@ -11,10 +11,10 @@ import ( "time" "github.com/ethereum/go-ethereum" + api "github.com/ethereum/go-ethereum/beacon/engine" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core" - api "github.com/ethereum/go-ethereum/beacon/engine" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" @@ -248,10 +248,7 @@ func (ec *HiveRPCEngineClient) StorageAtKeys(ctx context.Context, account common results[key] = valueResult } - if err := ec.PrepareDefaultAuthCallToken(); err != nil { - return nil, err - } - if err := ec.c.BatchCallContext(ctx, reqs); err != nil { + if err := ec.cEth.BatchCallContext(ctx, reqs); err != nil { return nil, err } for i, req := range reqs { @@ -418,7 +415,7 @@ func (ec *HiveRPCEngineClient) GetPayloadBodiesByHashV1(ctx context.Context, has return result, err } -func (ec *HiveRPCEngineClient) newPayload(ctx context.Context, version int, payload interface{}) (api.PayloadStatusV1, error) { +func (ec *HiveRPCEngineClient) NewPayload(ctx context.Context, version int, payload interface{}) (api.PayloadStatusV1, error) { var result api.PayloadStatusV1 if err := ec.PrepareDefaultAuthCallToken(); err != nil { return result, err @@ -431,12 +428,12 @@ func (ec *HiveRPCEngineClient) newPayload(ctx context.Context, version int, payl func (ec *HiveRPCEngineClient) NewPayloadV1(ctx context.Context, payload *client_types.ExecutableDataV1) (api.PayloadStatusV1, error) { ed := payload.ToExecutableData() ec.latestPayloadSent = &ed - return ec.newPayload(ctx, 1, payload) + return ec.NewPayload(ctx, 1, payload) } func (ec *HiveRPCEngineClient) NewPayloadV2(ctx context.Context, payload *api.ExecutableData) (api.PayloadStatusV1, error) { ec.latestPayloadSent = payload - return ec.newPayload(ctx, 2, payload) + return ec.NewPayload(ctx, 2, payload) } func (ec *HiveRPCEngineClient) ExchangeTransitionConfigurationV1(ctx context.Context, tConf *api.TransitionConfigurationV1) (api.TransitionConfigurationV1, error) { @@ -513,10 +510,7 @@ func (ec *HiveRPCEngineClient) SendTransactions(ctx context.Context, txs []*type Result: &hashes[i], } } - if err := ec.PrepareDefaultAuthCallToken(); err != nil { - return []error{err} - } - if err := ec.c.BatchCallContext(ctx, reqs); err != nil { + if err := ec.cEth.BatchCallContext(ctx, reqs); err != nil { return []error{err} } diff --git a/simulators/ethereum/engine/client/node/node.go b/simulators/ethereum/engine/client/node/node.go index 002d773552..e8298ae590 100644 --- a/simulators/ethereum/engine/client/node/node.go +++ b/simulators/ethereum/engine/client/node/node.go @@ -554,7 +554,7 @@ func (n *GethNode) ReOrgBackBlockChain(N uint64, currentBlock *types.Header) (*t func (n *GethNode) SubscribeP2PEvents() { eventChan := make(chan *p2p.PeerEvent) - n.node.Server().SubscribeEvents(eventChan) + subscription := n.node.Server().SubscribeEvents(eventChan) for { select { case event := <-eventChan: @@ -573,6 +573,7 @@ func (n *GethNode) SubscribeP2PEvents() { } case <-n.running.Done(): + subscription.Unsubscribe() return } } @@ -694,6 +695,23 @@ func (n *GethNode) SetBlock(block *types.Block, parentNumber uint64, parentRoot } // Engine API +func (n *GethNode) NewPayload(ctx context.Context, version int, pl interface{}) (beacon.PayloadStatusV1, error) { + switch version { + case 1: + if c, ok := pl.(*client_types.ExecutableDataV1); ok { + return n.NewPayloadV1(ctx, c) + } else { + return beacon.PayloadStatusV1{}, fmt.Errorf("wrong type %T", pl) + } + case 2: + if c, ok := pl.(*beacon.ExecutableData); ok { + return n.NewPayloadV2(ctx, c) + } else { + return beacon.PayloadStatusV1{}, fmt.Errorf("wrong type %T", pl) + } + } + return beacon.PayloadStatusV1{}, fmt.Errorf("unknown version %d", version) +} func (n *GethNode) NewPayloadV1(ctx context.Context, pl *client_types.ExecutableDataV1) (beacon.PayloadStatusV1, error) { ed := pl.ToExecutableData() n.latestPayloadSent = &ed @@ -707,7 +725,16 @@ func (n *GethNode) NewPayloadV2(ctx context.Context, pl *beacon.ExecutableData) n.latestPayloadStatusReponse = &resp return resp, err } - +func (n *GethNode) ForkchoiceUpdated(ctx context.Context, version int, fcs *beacon.ForkchoiceStateV1, payload *beacon.PayloadAttributes) (beacon.ForkChoiceResponse, error) { + switch version { + case 1: + return n.ForkchoiceUpdatedV1(ctx, fcs, payload) + case 2: + return n.ForkchoiceUpdatedV2(ctx, fcs, payload) + default: + return beacon.ForkChoiceResponse{}, fmt.Errorf("unknown version %d", version) + } +} func (n *GethNode) ForkchoiceUpdatedV1(ctx context.Context, fcs *beacon.ForkchoiceStateV1, payload *beacon.PayloadAttributes) (beacon.ForkChoiceResponse, error) { n.latestFcUStateSent = fcs n.latestPAttrSent = payload diff --git a/simulators/ethereum/engine/clmock/clmock.go b/simulators/ethereum/engine/clmock/clmock.go index 105411c26e..bb6dc00b81 100644 --- a/simulators/ethereum/engine/clmock/clmock.go +++ b/simulators/ethereum/engine/clmock/clmock.go @@ -156,6 +156,7 @@ func NewCLMocker(t *hivesim.T, slotsToSafe, slotsToFinalized, safeSlotsToImportO func (cl *CLMocker) AddEngineClient(ec client.EngineClient) { cl.EngineClientsLock.Lock() defer cl.EngineClientsLock.Unlock() + cl.Logf("CLMocker: Adding engine client %v", ec.ID()) cl.EngineClients = append(cl.EngineClients, ec) } @@ -164,6 +165,7 @@ func (cl *CLMocker) RemoveEngineClient(ec client.EngineClient) { cl.EngineClientsLock.Lock() defer cl.EngineClientsLock.Unlock() + cl.Logf("CLMocker: Removing engine client %v", ec.ID()) for i, engine := range cl.EngineClients { if engine.ID() == ec.ID() { cl.EngineClients = append(cl.EngineClients[:i], cl.EngineClients[i+1:]...) @@ -176,9 +178,11 @@ func (cl *CLMocker) RemoveEngineClient(ec client.EngineClient) { // Close all the engine clients func (cl *CLMocker) CloseClients() { for _, engine := range cl.EngineClients { + cl.Logf("CLMocker: Closing engine client %v", engine.ID()) if err := engine.Close(); err != nil { panic(err) } + cl.Logf("CLMocker: Closed engine client %v", engine.ID()) } } diff --git a/simulators/ethereum/engine/suites/engine/tests.go b/simulators/ethereum/engine/suites/engine/tests.go index c3f0a68c16..3dec6003aa 100644 --- a/simulators/ethereum/engine/suites/engine/tests.go +++ b/simulators/ethereum/engine/suites/engine/tests.go @@ -88,6 +88,11 @@ var Tests = []test.Spec{ Run: preTTDFinalizedBlockHash, TTD: 2, }, + { + Name: "Unique Payload ID", + Run: uniquePayloadID, + ForkConfig: test.LatestFork, + }, // Invalid Payload Tests { Name: "Bad Hash on NewPayload", @@ -1513,6 +1518,70 @@ func preTTDFinalizedBlockHash(t *test.Env) { } +// Check that the payload id returned on a forkchoiceUpdated call is different +// when the attributes change +func uniquePayloadID(t *test.Env) { + // Wait until TTD is reached by this client + t.CLMock.WaitForTTD() + + parentHash := t.CLMock.LatestHeader.Hash() + + fcState := &api.ForkchoiceStateV1{ + HeadBlockHash: parentHash, + } + payloadAttributes := &api.PayloadAttributes{ + Timestamp: t.CLMock.LatestHeader.Time + 1, + Random: common.Hash{}, + SuggestedFeeRecipient: common.Address{}, + Withdrawals: []*types.Withdrawal{}, + } + + previousPayloadID := &api.PayloadID{} + + r := t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Modify timestamp + previousPayloadID = r.Response.PayloadID + payloadAttributes.Timestamp += 1 + r = t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Modify random + previousPayloadID = r.Response.PayloadID + payloadAttributes.Random = common.Hash{1} + r = t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Modify fee recipient + previousPayloadID = r.Response.PayloadID + payloadAttributes.SuggestedFeeRecipient = common.Address{1} + r = t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Add withdrawal + previousPayloadID = r.Response.PayloadID + newWithdrawal := &types.Withdrawal{} + payloadAttributes.Withdrawals = append(payloadAttributes.Withdrawals, newWithdrawal) + r = t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Modify withdrawal + previousPayloadID = r.Response.PayloadID + newWithdrawal.Amount = 1 + r = t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Add another withdrawal + previousPayloadID = r.Response.PayloadID + newWithdrawal = &types.Withdrawal{Index: 1} + payloadAttributes.Withdrawals = append(payloadAttributes.Withdrawals, newWithdrawal) + r = t.TestEngine.TestEngineForkchoiceUpdated(fcState, payloadAttributes, -1) + r.ExpectUpdatedPayloadID(previousPayloadID) + + // Add test here for future attributes! +} + // Corrupt the hash of a valid payload, client should reject the payload. // All possible scenarios: // (fcU) diff --git a/simulators/ethereum/engine/suites/transition/tests.go b/simulators/ethereum/engine/suites/transition/tests.go index 8f5f5e985f..beebb3a6a2 100644 --- a/simulators/ethereum/engine/suites/transition/tests.go +++ b/simulators/ethereum/engine/suites/transition/tests.go @@ -947,10 +947,10 @@ func GenerateMergeTestSpec(mergeTestSpec MergeTestSpec) test.Spec { for i, secondaryClientSpec := range mergeTestSpec.SecondaryClientSpecs { // Start the secondary client with the alternative chain secondaryClient, err := secondaryClientSpec.ClientStarter.StartClient(t.T, t.CLMock.TestContext, t.Genesis, t.ClientParams, t.ClientFiles, t.Engine) - t.Logf("INFO (%s): Started secondary client: %v", t.TestName, secondaryClient.ID()) if err != nil { t.Fatalf("FAIL (%s): Unable to start secondary client: %v", t.TestName, err) } + t.Logf("INFO (%s): Started secondary client: %v", t.TestName, secondaryClient.ID()) defer t.HandleClientPostRunVerification(secondaryClient) secondaryClients[i] = ClientSpec{ Client: secondaryClient, @@ -961,6 +961,15 @@ func GenerateMergeTestSpec(mergeTestSpec MergeTestSpec) test.Spec { // Start a secondary clients with alternative PoW chains for _, cs := range secondaryClients { if cs.Spec.SkipAddingToCLMocker { + // This client is not added to the CLMocker, so we don't need to + // wait for it to reach TTD, but we still need to close it + defer func(c client.EngineClient) { + t.Logf("INFO (%s): Closing secondary engine client: %v", t.TestName, c.ID()) + if err := c.Close(); err != nil { + t.Logf("WARN (%s): Error while closing engine client: %v", t.TestName, err) + } + t.Logf("INFO (%s): Closed secondary engine client: %v", t.TestName, c.ID()) + }(cs.Client) continue } diff --git a/simulators/ethereum/engine/suites/withdrawals/README.md b/simulators/ethereum/engine/suites/withdrawals/README.md index 1f91ea9ee7..5477fecf38 100644 --- a/simulators/ethereum/engine/suites/withdrawals/README.md +++ b/simulators/ethereum/engine/suites/withdrawals/README.md @@ -205,6 +205,13 @@ All test cases contain the following verifications: - All transactions and withdrawals are in the correct format and order. - Requested payload bodies of unknown hashes are returned as null in the returned list +- Payload Bodies By Range/Hash Parallel - Shanghai Fork on Block 17 - 32 Withdrawal Blocks + - Launch client `A` and create a canonical chain consisting of 48 blocks, where the first shanghai block is number 17 + - Make requests to obtain the full withdrawals payload bodies from the canonical chain by hash or range, in parallel, and repeatedly. + - Verify that: + - All transactions and withdrawals are in the correct format and order. + - There are no locking issues in the client due to parallel requests. + ## Block Value Tests - Block Value on GetPayloadV2 Post-Shanghai - Create a Shanghai chain where the fork transition happens at block 1 diff --git a/simulators/ethereum/engine/suites/withdrawals/tests.go b/simulators/ethereum/engine/suites/withdrawals/tests.go index 231a0d1410..d330171f80 100644 --- a/simulators/ethereum/engine/suites/withdrawals/tests.go +++ b/simulators/ethereum/engine/suites/withdrawals/tests.go @@ -7,6 +7,7 @@ import ( "fmt" "math/big" "math/rand" + "sync" "time" beacon "github.com/ethereum/go-ethereum/beacon/engine" @@ -779,6 +780,37 @@ var Tests = []test.SpecInterface{ }, }, }, + + &GetPayloadBodiesSpec{ + WithdrawalsBaseSpec: &WithdrawalsBaseSpec{ + Spec: test.Spec{ + Name: "GetPayloadBodies Parallel", + About: ` + Make multiple withdrawals to 16 accounts each payload. + Retrieve many of the payloads' bodies by number range and hash in parallel, multiple times. + `, + TimeoutSeconds: 240, + SlotsToSafe: big.NewInt(32), + SlotsToFinalized: big.NewInt(64), + }, + WithdrawalsForkHeight: 17, + WithdrawalsBlockCount: 32, + WithdrawalsPerBlock: 16, + WithdrawableAccountCount: 1024, + }, + Parallel: true, + RequestsRepeat: 55, + GetPayloadBodiesRequests: []GetPayloadBodyRequest{ + GetPayloadBodyRequestByRange{ + Start: 17, + Count: 32, + }, + GetPayloadBodyRequestByHashIndex{ + Start: 17, + End: 17 + 32, + }, + }, + }, } // Helper types to convert gwei into wei more easily @@ -1900,12 +1932,14 @@ func (s *MaxInitcodeSizeSpec) Execute(t *test.Env) { type GetPayloadBodiesSpec struct { *WithdrawalsBaseSpec GetPayloadBodiesRequests []GetPayloadBodyRequest + RequestsRepeat int GenerateSidechain bool AfterSync bool + Parallel bool } type GetPayloadBodyRequest interface { - Verify(*test.TestEngineClient, clmock.ExecutableDataHistory) + Verify(int, *test.TestEngineClient, clmock.ExecutableDataHistory) } type GetPayloadBodyRequestByRange struct { @@ -1913,7 +1947,12 @@ type GetPayloadBodyRequestByRange struct { Count uint64 } -func (req GetPayloadBodyRequestByRange) Verify(testEngine *test.TestEngineClient, payloadHistory clmock.ExecutableDataHistory) { +func (req GetPayloadBodyRequestByRange) Verify(reqIndex int, testEngine *test.TestEngineClient, payloadHistory clmock.ExecutableDataHistory) { + testEngine.Logf("INFO: Starting GetPayloadBodyByRange request %d", reqIndex) + startTime := time.Now() + defer func() { + testEngine.Logf("INFO: Ended GetPayloadBodyByRange request %d, %s", reqIndex, time.Since(startTime)) + }() r := testEngine.TestEngineGetPayloadBodiesByRangeV1(req.Start, req.Count) if req.Start < 1 || req.Count < 1 { r.ExpectationDescription = fmt.Sprintf(` @@ -1953,7 +1992,12 @@ type GetPayloadBodyRequestByHashIndex struct { End uint64 } -func (req GetPayloadBodyRequestByHashIndex) Verify(testEngine *test.TestEngineClient, payloadHistory clmock.ExecutableDataHistory) { +func (req GetPayloadBodyRequestByHashIndex) Verify(reqIndex int, testEngine *test.TestEngineClient, payloadHistory clmock.ExecutableDataHistory) { + testEngine.Logf("INFO: Starting GetPayloadBodyByHash request %d", reqIndex) + startTime := time.Now() + defer func() { + testEngine.Logf("INFO: Ended GetPayloadBodyByHash request %d, %s", reqIndex, time.Since(startTime)) + }() payloads := make([]*beacon.ExecutableData, 0) hashes := make([]common.Hash, 0) if len(req.BlockNumbers) > 0 { @@ -2095,9 +2139,44 @@ func (ws *GetPayloadBodiesSpec) Execute(t *test.Env) { } // Now send the range request, which should ignore any sidechain - for _, req := range ws.GetPayloadBodiesRequests { - req.Verify(testEngine, payloadHistory) + if ws.Parallel { + wg := new(sync.WaitGroup) + type RequestIndex struct { + Request GetPayloadBodyRequest + Index int + } + workChan := make(chan *RequestIndex) + workers := 16 + wg.Add(workers) + for w := 0; w < workers; w++ { + go func() { + defer wg.Done() + for req := range workChan { + req.Request.Verify(req.Index, testEngine, payloadHistory) + } + }() + } + repeat := 1 + if ws.RequestsRepeat > 0 { + repeat = ws.RequestsRepeat + } + for j := 0; j < repeat; j++ { + for i, req := range ws.GetPayloadBodiesRequests { + workChan <- &RequestIndex{ + Request: req, + Index: i + (j * repeat), + } + } + } + + close(workChan) + wg.Wait() + } else { + for i, req := range ws.GetPayloadBodiesRequests { + req.Verify(i, testEngine, payloadHistory) + } } + } type BlockValueSpec struct { diff --git a/simulators/ethereum/engine/test/expect.go b/simulators/ethereum/engine/test/expect.go index 8f20ae47e7..6566c3dcfd 100644 --- a/simulators/ethereum/engine/test/expect.go +++ b/simulators/ethereum/engine/test/expect.go @@ -9,8 +9,8 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/common" api "github.com/ethereum/go-ethereum/beacon/engine" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/hive/simulators/ethereum/engine/client" @@ -122,6 +122,9 @@ func (tec *TestEngineClient) TestEngineForkchoiceUpdatedV2(fcState *api.Forkchoi } func (tec *TestEngineClient) TestEngineForkchoiceUpdated(fcState *api.ForkchoiceStateV1, pAttributes *api.PayloadAttributes, version int) *ForkchoiceResponseExpectObject { + if version == -1 { + version = client.LatestForkchoiceUpdatedVersion + } if version == 2 { return tec.TestEngineForkchoiceUpdatedV2(fcState, pAttributes) } @@ -186,6 +189,21 @@ func (exp *ForkchoiceResponseExpectObject) ExpectPayloadID(pid *api.PayloadID) { } } +func (exp *ForkchoiceResponseExpectObject) ExpectUpdatedPayloadID(previousID *api.PayloadID) { + exp.ExpectNoError() + if exp.Response.PayloadID == nil || previousID == nil { + if exp.Response.PayloadID == previousID { + // Both are null + exp.Fatalf("FAIL (%v): Unexpected PayloadID on EngineForkchoiceUpdatedV%d: Expected change from %v", exp.TestName, exp.Version, previousID) + } + } else { + // Both are different from null + if *exp.Response.PayloadID == *previousID { + exp.Fatalf("FAIL (%v): Unexpected PayloadID on EngineForkchoiceUpdatedV%d: Expected change from %s", exp.TestName, exp.Version, previousID.String()) + } + } +} + // NewPayload type NewPayloadResponseExpectObject struct { @@ -483,7 +501,8 @@ type GetPayloadBodiesResponseExpectObject struct { } func (tec *TestEngineClient) TestEngineGetPayloadBodiesByRangeV1(start uint64, count uint64) *GetPayloadBodiesResponseExpectObject { - ctx, cancel := context.WithTimeout(tec.TestContext, globals.RPCTimeout) + // Get Payload Bodies can take a long time to respond + ctx, cancel := context.WithTimeout(tec.TestContext, globals.RPCTimeout*6) defer cancel() payloadBodies, err := tec.Engine.GetPayloadBodiesByRangeV1(ctx, start, count) ret := &GetPayloadBodiesResponseExpectObject{ @@ -500,7 +519,7 @@ func (tec *TestEngineClient) TestEngineGetPayloadBodiesByRangeV1(start uint64, c } func (tec *TestEngineClient) TestEngineGetPayloadBodiesByHashV1(hashes []common.Hash) *GetPayloadBodiesResponseExpectObject { - ctx, cancel := context.WithTimeout(tec.TestContext, globals.RPCTimeout) + ctx, cancel := context.WithTimeout(tec.TestContext, globals.RPCTimeout*6) defer cancel() payloadBodies, err := tec.Engine.GetPayloadBodiesByHashV1(ctx, hashes) ret := &GetPayloadBodiesResponseExpectObject{ diff --git a/simulators/ethereum/engine/test/spec.go b/simulators/ethereum/engine/test/spec.go index 0d8c906133..dce61b59f0 100644 --- a/simulators/ethereum/engine/test/spec.go +++ b/simulators/ethereum/engine/test/spec.go @@ -135,3 +135,7 @@ func (s Spec) GetTTD() int64 { func (s Spec) IsMiningDisabled() bool { return s.DisableMining } + +var LatestFork = ForkConfig{ + ShanghaiTimestamp: big.NewInt(0), +} diff --git a/simulators/ethereum/graphql/testcases/01_eth_blockNumber.json b/simulators/ethereum/graphql/testcases/01_eth_blockNumber.json index d74b9a8580..5ae54a0dc9 100644 --- a/simulators/ethereum/graphql/testcases/01_eth_blockNumber.json +++ b/simulators/ethereum/graphql/testcases/01_eth_blockNumber.json @@ -5,9 +5,9 @@ "responses": [{ "data" : { "block" : { - "number" : 32 + "number" : "0x20" } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/02_eth_call_Block8.json b/simulators/ethereum/graphql/testcases/02_eth_call_Block8.json index 426a4846a5..fdcac0dee6 100644 --- a/simulators/ethereum/graphql/testcases/02_eth_call_Block8.json +++ b/simulators/ethereum/graphql/testcases/02_eth_call_Block8.json @@ -4,13 +4,13 @@ "responses":[{ "data" : { "block" : { - "number" : 8, + "number" : "0x8", "call" : { "data" : "0x0000000000000000000000000000000000000000000000000000000000000000", - "status" : 1 + "status" : "0x1" } } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/03_eth_call_BlockLatest.json b/simulators/ethereum/graphql/testcases/03_eth_call_BlockLatest.json index 6a21adac9a..cd51985471 100644 --- a/simulators/ethereum/graphql/testcases/03_eth_call_BlockLatest.json +++ b/simulators/ethereum/graphql/testcases/03_eth_call_BlockLatest.json @@ -4,13 +4,13 @@ "responses":[{ "data" : { "block" : { - "number" : 32, + "number" : "0x20", "call" : { "data" : "0x0000000000000000000000000000000000000000000000000000000000000001", - "status" : 1 + "status" : "0x1" } } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/04_eth_estimateGas_contractDeploy.json b/simulators/ethereum/graphql/testcases/04_eth_estimateGas_contractDeploy.json index 7ab7ff729e..e16a07cbe4 100644 --- a/simulators/ethereum/graphql/testcases/04_eth_estimateGas_contractDeploy.json +++ b/simulators/ethereum/graphql/testcases/04_eth_estimateGas_contractDeploy.json @@ -3,9 +3,9 @@ "responses":[{ "data" : { "block" : { - "estimateGas" : 111953 + "estimateGas" : "0x1b551" } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json b/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json index c36e86d557..a6eaa2bbc6 100644 --- a/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json +++ b/simulators/ethereum/graphql/testcases/05_eth_estimateGas_noParams.json @@ -3,9 +3,9 @@ "responses":[{ "data" : { "block" : { - "estimateGas" : 21000 + "estimateGas" : "0x5208" } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/06_eth_estimateGas_transfer.json b/simulators/ethereum/graphql/testcases/06_eth_estimateGas_transfer.json index 913e29b594..c35dbadf46 100644 --- a/simulators/ethereum/graphql/testcases/06_eth_estimateGas_transfer.json +++ b/simulators/ethereum/graphql/testcases/06_eth_estimateGas_transfer.json @@ -3,9 +3,9 @@ "responses":[{ "data" : { "block" : { - "estimateGas" : 21000 + "estimateGas" : "0x5208" } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/14_eth_getBlock_byHash.json b/simulators/ethereum/graphql/testcases/14_eth_getBlock_byHash.json index 7abda81ac4..decf15c17a 100644 --- a/simulators/ethereum/graphql/testcases/14_eth_getBlock_byHash.json +++ b/simulators/ethereum/graphql/testcases/14_eth_getBlock_byHash.json @@ -7,28 +7,28 @@ "responses": [{ "data" : { "block" : { - "number" : 30, + "number" : "0x1e", "transactions" : [ { "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" } ], - "timestamp" : 1444660022, + "timestamp" : "0x561bc336", "difficulty" : "0x20740", "totalDifficulty" : "0x3e6cc0", - "gasUsed" : 23585, - "gasLimit" : 3141592, + "gasUsed" : "0x5c21", + "gasLimit" : "0x2fefd8", "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", "nonce" : "0x5c321bd9e9f040f1", - "ommerCount" : 0, + "ommerCount" : "0x0", "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "extraData" : "0x", "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1, + "transactionCount" : "0x1", "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01" } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/16_eth_getBlock_byNumber.json b/simulators/ethereum/graphql/testcases/16_eth_getBlock_byNumber.json index 0b50c7e9ee..34244dbc5c 100644 --- a/simulators/ethereum/graphql/testcases/16_eth_getBlock_byNumber.json +++ b/simulators/ethereum/graphql/testcases/16_eth_getBlock_byNumber.json @@ -10,21 +10,21 @@ "transactions" : [ { "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" } ], - "timestamp" : 1444660022, + "timestamp" : "0x561bc336", "difficulty" : "0x20740", "totalDifficulty" : "0x3e6cc0", - "gasUsed" : 23585, - "gasLimit" : 3141592, + "gasUsed" : "0x5c21", + "gasLimit" : "0x2fefd8", "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", "nonce" : "0x5c321bd9e9f040f1", - "ommerCount" : 0, + "ommerCount" : "0x0", "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "extraData" : "0x", "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1, + "transactionCount" : "0x1", "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01", "ommers" : [ ], "ommerAt" : null, @@ -41,4 +41,4 @@ } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/19_eth_getBlockTransactionCount_byHash.json b/simulators/ethereum/graphql/testcases/19_eth_getBlockTransactionCount_byHash.json index d43de22a43..3a31866f19 100644 --- a/simulators/ethereum/graphql/testcases/19_eth_getBlockTransactionCount_byHash.json +++ b/simulators/ethereum/graphql/testcases/19_eth_getBlockTransactionCount_byHash.json @@ -7,7 +7,7 @@ "responses": [{ "data" : { "block" : { - "transactionCount" : 1 + "transactionCount" : "0x1" } } }], diff --git a/simulators/ethereum/graphql/testcases/20_eth_getBlockTransactionCount_byNumber.json b/simulators/ethereum/graphql/testcases/20_eth_getBlockTransactionCount_byNumber.json index db2c9bc3ee..4573355dae 100644 --- a/simulators/ethereum/graphql/testcases/20_eth_getBlockTransactionCount_byNumber.json +++ b/simulators/ethereum/graphql/testcases/20_eth_getBlockTransactionCount_byNumber.json @@ -10,24 +10,24 @@ "transactions" : [ { "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4" } ], - "timestamp" : 1444660022, + "timestamp" : "0x561bc336", "difficulty" : "0x20740", "totalDifficulty" : "0x3e6cc0", - "gasUsed" : 23585, - "gasLimit" : 3141592, + "gasUsed" : "0x5c21", + "gasLimit" : "0x2fefd8", "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", "nonce" : "0x5c321bd9e9f040f1", - "ommerCount" : 0, + "ommerCount" : "0x0", "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000", "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c", "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "extraData" : "0x", "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1, + "transactionCount" : "0x1", "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01" } } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/23_eth_getLogs_matchTopic.json b/simulators/ethereum/graphql/testcases/23_eth_getLogs_matchTopic.json index 4dc1db88b7..cf7f6e4b15 100644 --- a/simulators/ethereum/graphql/testcases/23_eth_getLogs_matchTopic.json +++ b/simulators/ethereum/graphql/testcases/23_eth_getLogs_matchTopic.json @@ -4,7 +4,7 @@ "data" : { "block" : { "logs" : [ { - "index" : 0, + "index" : "0x0", "topics" : [ "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" ], "data" : "0x000000000000000000000000000000000000000000000000000000000000002a", "account" : { diff --git a/simulators/ethereum/graphql/testcases/24_eth_getLogs_range.json b/simulators/ethereum/graphql/testcases/24_eth_getLogs_range.json index 52289500ab..6b04466744 100644 --- a/simulators/ethereum/graphql/testcases/24_eth_getLogs_range.json +++ b/simulators/ethereum/graphql/testcases/24_eth_getLogs_range.json @@ -4,7 +4,7 @@ "data": { "logs": [ { - "index": 0, + "index": "0x0", "topics": [ "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" ], @@ -15,12 +15,12 @@ "transaction": { "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6", "block": { - "number": 23 + "number": "0x17" } } }, { - "index": 0, + "index": "0x0", "topics": [], "data": "0x000000000000000000000000000000000000000000000000000000000000002a", "account": { @@ -29,7 +29,7 @@ "transaction": { "hash": "0x5ecd942096ab3f70c5bcc8f3a98f88c4ff0a3bd986417df9948eb1819db76d0e", "block": { - "number": 24 + "number": "0x18" } } } @@ -37,4 +37,4 @@ } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/30_eth_getTransaction_byHash.json b/simulators/ethereum/graphql/testcases/30_eth_getTransaction_byHash.json index c560d9bc1e..b5607f0fbd 100644 --- a/simulators/ethereum/graphql/testcases/30_eth_getTransaction_byHash.json +++ b/simulators/ethereum/graphql/testcases/30_eth_getTransaction_byHash.json @@ -7,12 +7,12 @@ "block": { "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" }, - "gas": 314159, + "gas": "0x4cb2f", "gasPrice": "0x1", "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4", "inputData": "0xe8beef5b", - "nonce": 29, - "index": 0, + "nonce": "0x1d", + "index": "0x0", "value": "0xa", "from": { "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" @@ -22,7 +22,7 @@ }, "logs": [ { - "index": 0 + "index": "0x0" } ], "status": null, @@ -51,7 +51,7 @@ } ], "nonce": "0x1d", - "status": 0, + "status": "0x0", "to": { "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" }, @@ -61,4 +61,4 @@ } ], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json b/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json index 79af4ce165..675c8de0b3 100644 --- a/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json +++ b/simulators/ethereum/graphql/testcases/32_eth_getTransactionCount.json @@ -5,7 +5,7 @@ "data": { "block": { "account": { - "transactionCount": 32 + "transactionCount": "0x20" } } } @@ -21,4 +21,4 @@ } ], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/33_eth_getTransactionReceipt.json b/simulators/ethereum/graphql/testcases/33_eth_getTransactionReceipt.json index 5421442171..e481c1d7ee 100644 --- a/simulators/ethereum/graphql/testcases/33_eth_getTransactionReceipt.json +++ b/simulators/ethereum/graphql/testcases/33_eth_getTransactionReceipt.json @@ -11,14 +11,14 @@ "createdContract": { "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" }, - "cumulativeGasUsed": 493172, + "cumulativeGasUsed": "0x78674", "from": { "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" }, - "gas": 3141592, - "gasUsed": 493172, + "gas": "0x2fefd8", + "gasUsed": "0x78674", "hash": "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed", - "index": 0, + "index": "0x0", "logs": [], "to": null } @@ -34,12 +34,12 @@ "createdContract": { "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" }, - "cumulativeGasUsed": 493172, + "cumulativeGasUsed": "0x78674", "from": { "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" }, "gas": "0x2fefd8", - "gasUsed": 493172, + "gasUsed": "0x78674", "hash": "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed", "index": 0, "logs": [], diff --git a/simulators/ethereum/graphql/testcases/35_graphql_pending.json b/simulators/ethereum/graphql/testcases/35_graphql_pending.json index 96b7fe0a70..7aceb90647 100644 --- a/simulators/ethereum/graphql/testcases/35_graphql_pending.json +++ b/simulators/ethereum/graphql/testcases/35_graphql_pending.json @@ -5,20 +5,20 @@ "responses": [{ "data": { "pending": { - "transactionCount": 1, + "transactionCount": "0x1", "transactions": [ { - "nonce": 50, - "gas": 1048575 + "nonce": "0x32", + "gas": "0xfffff" } ], "account": { "balance": "0x140" }, - "estimateGas": 21000, + "estimateGas": "0x5208", "call": { "data": "0x0000000000000000000000000000000000000000000000000000000000000001", - "status": 1 + "status": "0x1" } } } diff --git a/simulators/ethereum/graphql/testcases/41_graphql_blocks_byFrom.json b/simulators/ethereum/graphql/testcases/41_graphql_blocks_byFrom.json index ade785cc23..1769109a8e 100644 --- a/simulators/ethereum/graphql/testcases/41_graphql_blocks_byFrom.json +++ b/simulators/ethereum/graphql/testcases/41_graphql_blocks_byFrom.json @@ -4,16 +4,16 @@ "data": { "blocks": [ { - "number": 30 + "number": "0x1e" }, { - "number": 31 + "number": "0x1f" }, { - "number": 32 + "number": "0x20" } ] } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/42_graphql_blocks_byRange.json b/simulators/ethereum/graphql/testcases/42_graphql_blocks_byRange.json index f826c70e5e..1552e2de42 100644 --- a/simulators/ethereum/graphql/testcases/42_graphql_blocks_byRange.json +++ b/simulators/ethereum/graphql/testcases/42_graphql_blocks_byRange.json @@ -7,34 +7,34 @@ "responses":[{ "data" : { "blocks" : [ { - "number" : 30, - "gasUsed" : 23585, - "gasLimit" : 3141592, + "number" : "0x1e", + "gasUsed" : "0x5c21", + "gasLimit" : "0x2fefd8", "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6", "nonce" : "0x5c321bd9e9f040f1", "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e", "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d", - "transactionCount" : 1 + "transactionCount" : "0x1" }, { - "number" : 31, - "gasUsed" : 24303, - "gasLimit" : 3141592, + "number" : "0x1f", + "gasUsed" : "0x5eef", + "gasLimit" : "0x2fefd8", "hash" : "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49", "nonce" : "0xd3a27a3001616468", "stateRoot" : "0xa80997cf804269d64f2479baf535cf8f9090b70fbf515741c6995564f1e678bd", "receiptsRoot" : "0x2440c44a3f75ad8b0425a73e7be2f61a5171112465cfd14e62e735b56d7178e6", - "transactionCount" : 1 + "transactionCount" : "0x1" }, { - "number" : 32, - "gasUsed" : 23705, - "gasLimit" : 3141592, + "number" : "0x20", + "gasUsed" : "0x5c99", + "gasLimit" : "0x2fefd8", "hash" : "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53", "nonce" : "0xdb063000b00e8026", "stateRoot" : "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be", "receiptsRoot" : "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c", - "transactionCount" : 1 + "transactionCount" : "0x1" } ] } }], "statusCode": 200 -} \ No newline at end of file +} diff --git a/simulators/ethereum/graphql/testcases/46_getBlock_byHexNumber.json b/simulators/ethereum/graphql/testcases/46_getBlock_byHexNumber.json new file mode 100644 index 0000000000..0d4e0ed79e --- /dev/null +++ b/simulators/ethereum/graphql/testcases/46_getBlock_byHexNumber.json @@ -0,0 +1,14 @@ +{ + "request": "{block (number : \"0x1e\") { gasUsed gasLimit hash }} ", + + "responses":[{ + "data" : { + "block" : { + "gasUsed" : "0x5c21", + "gasLimit" : "0x2fefd8", + "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6" + } + } + }], + "statusCode": 200 +} diff --git a/simulators/ethereum/graphql/testcases/47_eth_getLogs_range_hex.json b/simulators/ethereum/graphql/testcases/47_eth_getLogs_range_hex.json new file mode 100644 index 0000000000..f7891fc7d8 --- /dev/null +++ b/simulators/ethereum/graphql/testcases/47_eth_getLogs_range_hex.json @@ -0,0 +1,22 @@ +{ + "request": "{ logs( filter: { fromBlock:\"0x14\", toBlock: \"0x18\", topics : [], addresses : []}) { index transaction{hash} } }", + "responses": [{ + "data": { + "logs": [ + { + "index": "0x0", + "transaction": { + "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6" + } + }, + { + "index": "0x0", + "transaction": { + "hash": "0x5ecd942096ab3f70c5bcc8f3a98f88c4ff0a3bd986417df9948eb1819db76d0e" + } + } + ] + } + }], + "statusCode": 200 +} diff --git a/simulators/ethereum/graphql/testcases/48_transaction_fromByHexBlockNumber.json b/simulators/ethereum/graphql/testcases/48_transaction_fromByHexBlockNumber.json new file mode 100644 index 0000000000..96ff90d147 --- /dev/null +++ b/simulators/ethereum/graphql/testcases/48_transaction_fromByHexBlockNumber.json @@ -0,0 +1,18 @@ +{ + "request": "{transaction (hash : \"0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block { number } from(block: \"0x1d\") {transactionCount}} } ", + "responses": [ + { + "data": { + "transaction": { + "block": { + "number": "0x1e" + }, + "from": { + "transactionCount": "0x1d" + } + } + } + } + ], + "statusCode": 200 +} diff --git a/simulators/ethereum/pyspec/Dockerfile b/simulators/ethereum/pyspec/Dockerfile index 310795c36b..b7882de0e0 100644 --- a/simulators/ethereum/pyspec/Dockerfile +++ b/simulators/ethereum/pyspec/Dockerfile @@ -18,12 +18,15 @@ ADD ./pyspec /pyspec WORKDIR /pyspec COPY --from=builder /source/pyspec/pyspec . +# To run locally generated fixtures, comment the following RUN lines and +# uncomment the ADD line. # Download the latest fixture release. RUN wget https://github.com/ethereum/execution-spec-tests/releases/latest/download/fixtures.tar.gz # Extract the latest fixtures. RUN tar -xzvf fixtures.tar.gz RUN mv fixtures /fixtures +# ADD ./pyspec/fixtures /fixtures # Point to executable and test fixtures. ENV TESTPATH /fixtures diff --git a/simulators/ethereum/pyspec/main.go b/simulators/ethereum/pyspec/main.go index 151ed13772..5a3f14585c 100644 --- a/simulators/ethereum/pyspec/main.go +++ b/simulators/ethereum/pyspec/main.go @@ -9,6 +9,7 @@ import ( "fmt" "os" "path/filepath" + "regexp" "strconv" "strings" "sync" @@ -90,8 +91,11 @@ func fixtureRunner(t *hivesim.T) { }() } + _, testPattern := t.Sim.TestPattern() + re := regexp.MustCompile(testPattern) + // deliver and run test cases against each client - loadFixtureTests(t, fileRoot, func(tc testcase) { + loadFixtureTests(t, fileRoot, re, func(tc testcase) { for _, client := range clientTypes { if !client.HasRole("eth1") { continue diff --git a/simulators/ethereum/pyspec/runner.go b/simulators/ethereum/pyspec/runner.go index 83bbdb5f27..a8eaa588cb 100644 --- a/simulators/ethereum/pyspec/runner.go +++ b/simulators/ethereum/pyspec/runner.go @@ -4,8 +4,9 @@ import ( "context" "errors" "fmt" - "os" + "io/fs" "path/filepath" + "regexp" "strings" "time" @@ -18,16 +19,21 @@ import ( // loadFixtureTests extracts tests from fixture.json files in a given directory, // creates a testcase for each test, and passes the testcase struct to fn. -func loadFixtureTests(t *hivesim.T, root string, fn func(testcase)) { - filepath.Walk(root, func(path string, info os.FileInfo, err error) error { +func loadFixtureTests(t *hivesim.T, root string, re *regexp.Regexp, fn func(testcase)) { + filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error { // check file is actually a fixture if err != nil { t.Logf("unable to walk path: %s", err) return err } - if info.IsDir() || !strings.HasSuffix(info.Name(), ".json") { + if d.IsDir() || !strings.HasSuffix(d.Name(), ".json") { return nil } + pathname := strings.TrimSuffix(strings.TrimPrefix(path, root), ".json") + if !re.MatchString(pathname) { + fmt.Println("skip", pathname) + return nil // skip + } excludePaths := []string{"example/"} // modify for tests to exclude if strings.Contains(path, strings.Join(excludePaths, "")) { return nil @@ -54,7 +60,10 @@ func loadFixtureTests(t *hivesim.T, root string, fn func(testcase)) { filepath: path, } // extract genesis, payloads & post allocation field to tc - tc.extractFixtureFields(fixture.json) + if err := tc.extractFixtureFields(fixture.json); err != nil { + t.Logf("test %v / %v: unable to extract fixture fields: %v", d.Name(), name, err) + tc.failedErr = fmt.Errorf("unable to extract fixture fields: %v", err) + } // feed tc to single worker within fixtureRunner() fn(tc) } @@ -85,7 +94,11 @@ func (tc *testcase) run(t *hivesim.T) { } tc.updateEnv(env) t0 := time.Now() - + // If test is already failed, don't bother spinning up a client + if tc.failedErr != nil { + t.Errorf("test failed early: %v", tc.failedErr) + return + } // start client (also creates an engine RPC client internally) t.Log("starting client with Engine API.") engineClient, err := engineStarter.StartClient(t, ctx, tc.genesis, env, nil) diff --git a/simulators/ethereum/pyspec/types.go b/simulators/ethereum/pyspec/types.go index 960b301b58..83f011ac15 100644 --- a/simulators/ethereum/pyspec/types.go +++ b/simulators/ethereum/pyspec/types.go @@ -2,6 +2,7 @@ package main import ( "encoding/json" + "fmt" "math/big" api "github.com/ethereum/go-ethereum/beacon/engine" @@ -144,14 +145,17 @@ type withdrawalsUnmarshaling struct { // extractFixtureFields extracts the genesis, payloads and post allocation // fields from the given fixture test and stores them in the testcase struct. -func (tc *testcase) extractFixtureFields(fixture fixtureJSON) { +func (tc *testcase) extractFixtureFields(fixture fixtureJSON) error { // extract genesis fields from fixture test tc.genesis = extractGenesis(fixture) // extract payloads from each block payloads := []*api.ExecutableData{} - for _, block := range fixture.Blocks { - block, _ := block.decodeBlock() + for _, bl := range fixture.Blocks { + block, err := bl.decodeBlock() + if err != nil { + return fmt.Errorf("failed to decode block: %v", err) + } payload := api.BlockToExecutableData(block, common.Big0).ExecutionPayload payloads = append(payloads, payload) } @@ -159,6 +163,7 @@ func (tc *testcase) extractFixtureFields(fixture fixtureJSON) { // extract post account information tc.postAlloc = &fixture.Post + return nil } // extractGenesis extracts the genesis block information from the given fixture