From 09edb13703b31f99afba69d14834a06ed4921b65 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Wed, 6 Oct 2021 10:34:51 +0800 Subject: [PATCH 1/7] Problem: recent version of go-ethereum is not used Closes: #142 #102 Solution: - update to ethermint's recent main branch - add feemarket module changelog --- CHANGELOG.md | 2 + app/app.go | 20 +- go.mod | 9 +- go.sum | 137 ++++----- gomod2nix.toml | 540 +++++++++++------------------------ x/cronos/keeper/evm.go | 27 +- x/cronos/keeper/keeper.go | 5 +- x/cronos/types/interfaces.go | 10 + x/cronos/types/tracer.go | 23 -- 9 files changed, 257 insertions(+), 516 deletions(-) delete mode 100644 x/cronos/types/tracer.go diff --git a/CHANGELOG.md b/CHANGELOG.md index c209c29a22..0565eb3e85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ ### Improvements - [cronos#162](https://github.com/crypto-org-chain/cronos/pull/162) bump ibc-go to v1.2.1 with hooks support +- [cronos#143](https://github.com/crypto-org-chain/cronos/pull/143) update go-ethereum to 1.10.9 and add fee market + module. *October 4, 2021* ## v0.5.5 diff --git a/app/app.go b/app/app.go index 135e80dd5e..95be78e66f 100644 --- a/app/app.go +++ b/app/app.go @@ -101,6 +101,9 @@ import ( evmrest "github.com/tharsis/ethermint/x/evm/client/rest" evmkeeper "github.com/tharsis/ethermint/x/evm/keeper" evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/tharsis/ethermint/x/feemarket" + feemarketkeeper "github.com/tharsis/ethermint/x/feemarket/keeper" + feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" "github.com/peggyjv/gravity-bridge/module/x/gravity" gravitykeeper "github.com/peggyjv/gravity-bridge/module/x/gravity/keeper" @@ -171,6 +174,7 @@ var ( transfer.AppModuleBasic{}, vesting.AppModuleBasic{}, evm.AppModuleBasic{}, + feemarket.AppModuleBasic{}, gravity.AppModuleBasic{}, // this line is used by starport scaffolding # stargate/app/moduleBasic cronos.AppModuleBasic{}, @@ -247,7 +251,8 @@ type App struct { ScopedTransferKeeper capabilitykeeper.ScopedKeeper // Ethermint keepers - EvmKeeper *evmkeeper.Keeper + EvmKeeper *evmkeeper.Keeper + FeeMarketKeeper feemarketkeeper.Keeper // Gravity module GravityKeeper gravitykeeper.Keeper @@ -294,6 +299,7 @@ func New( ibchost.StoreKey, ibctransfertypes.StoreKey, // ethermint keys evmtypes.StoreKey, + feemarkettypes.StoreKey, gravitytypes.StoreKey, // this line is used by starport scaffolding # stargate/app/storeKey cronostypes.StoreKey, @@ -382,9 +388,14 @@ func New( // Create Ethermint keepers tracer := cast.ToString(appOpts.Get(srvflags.EVMTracer)) + + // Create Ethermint keepers + app.FeeMarketKeeper = feemarketkeeper.NewKeeper( + appCodec, keys[feemarkettypes.StoreKey], app.GetSubspace(feemarkettypes.ModuleName), + ) app.EvmKeeper = evmkeeper.NewKeeper( appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], app.GetSubspace(evmtypes.ModuleName), - app.AccountKeeper, app.BankKeeper, stakingKeeper, + app.AccountKeeper, app.BankKeeper, stakingKeeper, app.FeeMarketKeeper, tracer, bApp.Trace(), // debug EVM based on Baseapp options ) @@ -488,6 +499,7 @@ func New( transferModule, evm.NewAppModule(app.EvmKeeper, app.AccountKeeper), + feemarket.NewAppModule(app.FeeMarketKeeper), gravity.NewAppModule(app.GravityKeeper, app.BankKeeper), // this line is used by starport scaffolding # stargate/app/appModule cronosModule, @@ -509,6 +521,7 @@ func New( app.mm.SetOrderEndBlockers( crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName, evmtypes.ModuleName, + feemarkettypes.ModuleName, gravitytypes.ModuleName, ) @@ -534,6 +547,7 @@ func New( authz.ModuleName, feegrant.ModuleName, evmtypes.ModuleName, + feemarkettypes.ModuleName, gravitytypes.ModuleName, // this line is used by starport scaffolding # stargate/app/initGenesis cronostypes.ModuleName, @@ -583,6 +597,7 @@ func New( app.SetAnteHandler( evmante.NewAnteHandler( app.AccountKeeper, app.BankKeeper, app.EvmKeeper, app.FeeGrantKeeper, app.IBCKeeper.ChannelKeeper, + app.FeeMarketKeeper, encodingConfig.TxConfig.SignModeHandler(), ), ) @@ -763,6 +778,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibchost.ModuleName) paramsKeeper.Subspace(evmtypes.ModuleName) + paramsKeeper.Subspace(feemarkettypes.ModuleName) paramsKeeper.Subspace(gravitytypes.ModuleName) // this line is used by starport scaffolding # stargate/app/paramSubspace paramsKeeper.Subspace(cronostypes.ModuleName) diff --git a/go.mod b/go.mod index 74f3fcf95f..6157f6668e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/armon/go-metrics v0.3.9 github.com/cosmos/cosmos-sdk v0.44.1 github.com/cosmos/ibc-go v1.2.1 - github.com/ethereum/go-ethereum v1.10.3 + github.com/ethereum/go-ethereum v1.10.9 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 @@ -19,8 +19,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tendermint/tendermint v0.34.13 github.com/tendermint/tm-db v0.6.4 - github.com/tharsis/ethermint v0.4.2-0.20210927141513-04c2f05002f8 - google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af + github.com/tharsis/ethermint v0.6.1-0.20211005160855-202bc5f1cd2e + google.golang.org/genproto v0.0.0-20211001223012-bfb93cce50d9 google.golang.org/grpc v1.41.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -40,6 +40,3 @@ replace github.com/cosmos/ibc-go => github.com/crypto-org-chain/ibc-go v1.2.1-ho replace github.com/peggyjv/gravity-bridge/module => github.com/crypto-org-chain/gravity-bridge/module v0.1.22-0.20211011065300-a09cf050d304 replace github.com/cosmos/iavl => github.com/cosmos/iavl v0.17.1 - -// FIXME: https://github.com/crypto-org-chain/ethermint/tree/cronos2 -replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.4.2-0.20211004101819-7b5449f36cc8 diff --git a/go.sum b/go.sum index 46f5c7d58b..ac8123fd1d 100644 --- a/go.sum +++ b/go.sum @@ -79,7 +79,6 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= 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/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.8 h1:Rpmta4xZ/MgZnriKNd24iZMhGpP5dvUcs/uqfBapKZY= @@ -100,13 +99,13 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/sarama v1.28.0/go.mod h1:j/2xTrU39dlzBmsxF1eQ2/DdWrxyBCl6pzz7a81o/ZY= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/VictoriaMetrics/fastcache v1.5.7 h1:4y6y0G8PRzszQUYIQHHssv/jgPHAb5qQuuDNdCbyAgw= github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= +github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= +github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= @@ -134,11 +133,7 @@ github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g 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/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks= -github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/aristanetworks/goarista v0.0.0-20210308203447-b196d8410f1d/go.mod h1:drswc1gdKErwWsW+gV2R5ELcuHehg5pZD2tat4B65Ik= -github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -203,7 +198,6 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= @@ -231,11 +225,8 @@ github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkA github.com/confio/ics23/go v0.6.3/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/confio/ics23/go v0.6.6 h1:pkOy18YxxJ/r0XFDCnrl4Bjv6h4LkBSpLS6F38mrKL8= github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/consensys/bavard v0.1.8-0.20210105233146-c16790d2aa8b/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= -github.com/consensys/goff v0.3.10/go.mod h1:xTldOBEHmFiYS0gPXd3NsaEqZWlnmeWcRLWgD3ba3xc= -github.com/consensys/gurvy v0.3.8/go.mod h1:sN75xnsiD593XnhbhvG2PkOy194pZBzqShWF/kwuW/g= github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8= @@ -268,14 +259,13 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crypto-org-chain/ethermint v0.4.2-0.20211004101819-7b5449f36cc8 h1:Q/MuWq+i8xODIJMx23pnhWvnIQJsv0hroaU6XQpeCQQ= -github.com/crypto-org-chain/ethermint v0.4.2-0.20211004101819-7b5449f36cc8/go.mod h1:8DQM1tW3h/rxvD0cJG8fyW/YkdPGb4WjFdO11g4Dk3k= github.com/crypto-org-chain/gravity-bridge/module v0.1.22-0.20211011065300-a09cf050d304 h1:5A6pzj5uQPQCCO96SqsCCoar/DfjOxIdadBHX3ncotU= github.com/crypto-org-chain/gravity-bridge/module v0.1.22-0.20211011065300-a09cf050d304/go.mod h1:7sqblrhSS7+I94DDIWz98N2mcXR5hL7f+EaV054sBMQ= github.com/crypto-org-chain/ibc-go v1.2.1-hooks h1:wuWaQqm/TFKJQwuFgjCPiPumQio+Yik5Z1DObDExrrU= github.com/crypto-org-chain/ibc-go v1.2.1-hooks/go.mod h1:YieSs25Y0TSFR67qg6Elge34yJNEOjYhYB+HNQQLoSQ= github.com/crypto-org-chain/keyring v1.1.6-fixes h1:AUFSu56NY6XobY6XfRoDx6v3loiOrHK5MNUm32GEjwA= github.com/crypto-org-chain/keyring v1.1.6-fixes/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= +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/daixiang0/gci v0.2.9/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= @@ -289,6 +279,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0= github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= +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/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= @@ -317,14 +309,12 @@ github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b h1:HBah4D48yp github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.2.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/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elastic/gosigar v0.14.1/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25 h1:2vLKys4RBU4pn2T/hjXMbvwTr1Cvy5THHrQkbeY9HRk= github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25/go.mod h1:hTr8+TLQmkUkgcuh3mcr5fjrT9c64ZzsBCdCEC6UppY= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -332,9 +322,9 @@ github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/esimonov/ifshort v1.0.2/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= -github.com/ethereum/go-ethereum v1.10.1/go.mod h1:E5e/zvdfUVr91JZ0AwjyuJM3x+no51zZJRz61orLLSk= -github.com/ethereum/go-ethereum v1.10.3 h1:SEYOYARvbWnoDl1hOSks3ZJQpRiiRJe8ubaQGJQwq0s= -github.com/ethereum/go-ethereum v1.10.3/go.mod h1:99onQmSd1GRGOziyGldI41YQb7EESX3Q4H41IfJgIQQ= +github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg= +github.com/ethereum/go-ethereum v1.10.9 h1:uMSWt0qDhaqqCk0PWqfDFOMUExmk4Tnbma6c6oXW+Pk= +github.com/ethereum/go-ethereum v1.10.9/go.mod h1:CaTMQrv51WaAlD2eULQ3f03KiahDRO28fleQcKjWrrg= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= @@ -365,9 +355,10 @@ github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWp github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= -github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -376,6 +367,7 @@ github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= 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-critic/go-critic v0.5.6/go.mod h1:cVjj0DfqewQVIlIAGexPCaGaZDAqGE29PYDDADIVNEo= 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= @@ -392,6 +384,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -473,15 +467,16 @@ 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/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= 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= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= github.com/golangci/golangci-lint v1.42.1/go.mod h1:MuInrVlgg2jq4do6XI1jbkErbVHVbwdrLLtGv6p2wPI= +github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= @@ -532,7 +527,6 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/protobuf v3.14.0+incompatible/go.mod h1:lUQ9D1ePzbH2PrIS7ob/bjm9HXyH5WHB0Akwh7URreM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -558,8 +552,6 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= 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.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -604,6 +596,8 @@ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN 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/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= +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-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= @@ -619,9 +613,8 @@ github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR3 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 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -642,16 +635,17 @@ github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 h1:uUj github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= 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.1.1 h1:4JywC80b+/hSfljFlEBLHrrh+CIONLDz9NuFl0af4Mw= github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= +github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= +github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= -github.com/huin/goupnp v1.0.1-0.20200620063722-49508fba0031/go.mod h1:nNs7wvRfN1eKaMknBydLNQU6146XQim8t4h+q90biWo= -github.com/huin/goupnp v1.0.1-0.20210310174557-0ca763054c88 h1:bcAj8KroPf552TScjFPIakjH2/tdIrIH8F+cc4v4SRo= github.com/huin/goupnp v1.0.1-0.20210310174557-0ca763054c88/go.mod h1:nNs7wvRfN1eKaMknBydLNQU6146XQim8t4h+q90biWo= +github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI= +github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -664,22 +658,18 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= 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= +github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8= 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/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= -github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -718,11 +708,9 @@ github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/ 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/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM52clh5rGzTKpVctGT1lH4Dc8Jw= github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= -github.com/kilic/bls12-381 v0.0.0-20201226121925-69dacb279461/go.mod h1:vDTTHJONJ6G+P2R74EhnyotQDTliQDnFEwhdmfzw1ig= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -736,12 +724,8 @@ github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.9 h1:5OCMOdde1TCT2sookEuVeEZzA8bmRSFV3AwPDZAG8AA= github.com/klauspost/compress v1.11.9/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid/v2 v2.0.2/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.0.4/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/klauspost/reedsolomon v1.9.11/go.mod h1:nLvuzNvy1ZDNQW30IuMc2ZWCbiqrJgdLoUS2X8HAUVg= 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= @@ -759,9 +743,10 @@ github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5 github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= +github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/ldez/gomoddirectives v0.2.2/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= github.com/ldez/tagliatelle v0.2.0/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= -github.com/leanovate/gopter v0.2.8/go.mod h1:gNcbPWNEWRe4lm+bycKqxUYoH5uoVje5SkOJ3uoLer8= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= @@ -783,12 +768,17 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +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/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= 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.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= @@ -823,8 +813,8 @@ github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKju github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miguelmota/go-ethereum-hdwallet v0.0.1 h1:DWqgZtKWTGcHR5QsprMJItZiJ2xVEQTv640r597ul8M= -github.com/miguelmota/go-ethereum-hdwallet v0.0.1/go.mod h1:iowKavXnc0NVNiv/UKYYBo3SjADph5PUvYQTjOIV9as= +github.com/miguelmota/go-ethereum-hdwallet v0.1.1 h1:zdXGlHao7idpCBjEGTXThVAtMKs+IxAgivZ75xqkWK0= +github.com/miguelmota/go-ethereum-hdwallet v0.1.1/go.mod h1:f9m9uXokAHA6WNoYOPjj4AqjJS5pquQRiYYj/XSyPYc= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/minio/highwayhash v1.0.1 h1:dZ6IIu8Z14VlC0VpfKofAhCy74wu/Qb5gcn52yWoz/0= @@ -844,6 +834,8 @@ github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo= github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= +github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= @@ -898,7 +890,6 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.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.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= @@ -907,16 +898,11 @@ github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/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.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= 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/openconfig/gnmi v0.0.0-20210226144353-8eae1937bf84/go.mod h1:H/20NXlnWbCPFC593nxpiKJ+OU//7mW7s7Qk7uVdg3Q= -github.com/openconfig/goyang v0.0.0-20200115183954-d0a48929f0ea/go.mod h1:dhXaV0JgHJzdrHi2l+w0fZrwArtXL7jEFoiqLEdmkvU= -github.com/openconfig/reference v0.0.0-20201210185750-72ca4cfd4abd/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw= -github.com/openconfig/ygot v0.6.0/go.mod h1:o30svNf7O0xK+R35tlx95odkDmZWS9JyWWQSmIhqwAs= github.com/opencontainers/go-digest v1.0.0-rc1/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= @@ -960,7 +946,6 @@ github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= 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 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= @@ -968,7 +953,6 @@ github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7 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/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -990,7 +974,6 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= -github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1010,7 +993,6 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0 h1:3jqPBvKT4OHAbje2Ql7KeaaSicDBCxMYwEJU1zRJceE= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= @@ -1074,7 +1056,6 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0 github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4= github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/securego/gosec/v2 v2.8.1/go.mod h1:pUmsq6+VyFEElJMUX+QB3p3LWNHXg1R3xh2ssVJPs8Q= @@ -1162,13 +1143,12 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= -github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 h1:xQdMZ1WLrgkkvOZ/LDQxjVxMLdby7osSh4ZEVa5sIjs= github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= -github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= -github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= @@ -1180,13 +1160,14 @@ github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= +github.com/tharsis/ethermint v0.6.1-0.20211005160855-202bc5f1cd2e h1:ta7ZvfQws+A5aCRDNetj0bHPUE//eelmTleS4bimSpI= +github.com/tharsis/ethermint v0.6.1-0.20211005160855-202bc5f1cd2e/go.mod h1:iFpWRSHH5UmbHTyMkRpulMQakLtA4DM2UEAGbGgbZ3I= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tjfoc/gmsm v1.4.0/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg= github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4= @@ -1218,6 +1199,8 @@ github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/X github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= +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/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= @@ -1227,14 +1210,10 @@ github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZ github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= 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/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= -github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= github.com/yeya24/promlinter v0.1.0/go.mod h1:rs5vtZzeBHqqMwXqFScncpCF6u06lezhZepno9AB1Oc= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= @@ -1297,21 +1276,18 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/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-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1397,7 +1373,6 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R 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-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -1411,6 +1386,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1442,7 +1418,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1504,27 +1479,24 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w 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-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/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-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210313202042-bd2e13477e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1538,6 +1510,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210903071746-97244b99971b h1:3Dq0eVHn0uaQJmPO+/aYPI/fRMqdrVDbu7MQcku54gg= golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1774,11 +1747,10 @@ google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKr google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af h1:aLMMXFYqw01RA6XJim5uaN+afqNNjc9P8HPAbnpnc5s= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20211001223012-bfb93cce50d9 h1:eF1wcrhdz56Vugf8qNX5dD93ItkrhothojQyHXqloe0= +google.golang.org/genproto v0.0.0-20211001223012-bfb93cce50d9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.1/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1796,7 +1768,6 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= 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= @@ -1814,16 +1785,10 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c= gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= -gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= -gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= -gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/gomod2nix.toml b/gomod2nix.toml index e3a284472d..0750bbb551 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -341,12 +341,12 @@ sha256 = "1lg3pq9mg55zpv3k431nnpx3pz13aja7vs18hw236jl2yb1ga1vw" ["github.com/Shopify/sarama"] - sumVersion = "v1.28.0" + sumVersion = "v1.19.0" ["github.com/Shopify/sarama".fetch] type = "git" url = "https://github.com/Shopify/sarama" - rev = "a7eb541855c8e19965a30547eadc20f6bc6edea5" - sha256 = "0b6qckxqnsikkmqkgwzq919zns7ajip6bb69xkfpr0kdy4ryc8cv" + rev = "ec843464b50d4c8b56403ec9d589cf41ea30e722" + sha256 = "0q1z3pvcd011yprwzws2s293v4cjvsszhai6vnfrahjcbsz79q0z" ["github.com/Shopify/toxiproxy"] sumVersion = "v2.1.4+incompatible" @@ -365,12 +365,12 @@ sha256 = "0ijhmr8sl768vkxslvw7fprav6srw4ivp32rzg3ydj8nc1wh86nl" ["github.com/VictoriaMetrics/fastcache"] - sumVersion = "v1.5.7" + sumVersion = "v1.6.0" ["github.com/VictoriaMetrics/fastcache".fetch] type = "git" url = "https://github.com/VictoriaMetrics/fastcache" - rev = "2c7a92dc306a8b0402608403e97ae9c3cb3c2328" - sha256 = "19fsx8ha2kdjbsinlllz70fj96z6xhvn38x8qrmml0abmsf5z60k" + rev = "5ffb40c1da4c7e2b8483e73629e66f4f1f94bff2" + sha256 = "1ivx700ijnkyjbgw4rq4446d4dnb4sg7sh569rsvnm5cm0fkvyhz" ["github.com/VividCortex/gohistogram"] sumVersion = "v1.0.0" @@ -509,37 +509,13 @@ rev = "cecee50308fc7e6f77f55b3fd906c1c6c471fa2f" sha256 = "17ckl7p7s3ga33yrjisilsimp80ansqxl54wvpkv0j7vx2zvc13y" -["github.com/aristanetworks/fsnotify"] - sumVersion = "v1.4.2" - ["github.com/aristanetworks/fsnotify".fetch] - type = "git" - url = "https://github.com/aristanetworks/fsnotify" - rev = "629574ca2a5df945712d3079857300b5e4da0236" - sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3" - -["github.com/aristanetworks/glog"] - sumVersion = "v0.0.0-20191112221043-67e8567f59f3" - ["github.com/aristanetworks/glog".fetch] - type = "git" - url = "https://github.com/aristanetworks/glog" - rev = "67e8567f59f3d2957c87f7a95002ae485e1c4a7f" - sha256 = "1ja15n6m2s70qlxccwll9d7bs8hz88j1mv31d1b6l80q19a6fcl0" - ["github.com/aristanetworks/goarista"] - sumVersion = "v0.0.0-20210308203447-b196d8410f1d" + sumVersion = "v0.0.0-20170210015632-ea17b1a17847" ["github.com/aristanetworks/goarista".fetch] type = "git" url = "https://github.com/aristanetworks/goarista" - rev = "b196d8410f1d5a6647463a66296323dc9ed5dc4a" - sha256 = "06dlkw9v45byl6sq4wzvvaig12a5vgnjx53akb5p8zq4mxkvx8mr" - -["github.com/aristanetworks/splunk-hec-go"] - sumVersion = "v0.3.3" - ["github.com/aristanetworks/splunk-hec-go".fetch] - type = "git" - url = "https://github.com/aristanetworks/splunk-hec-go" - rev = "69956d6a6cbd511dade209563c3256c204c9ae51" - sha256 = "10m4ymrwlfxkgx7wfnxmfrw7569r4q6pj5y2g5wk0hmyd9wqb3sd" + rev = "ea17b1a17847fb6e4c0a91de0b674704693469b0" + sha256 = "02q3dhrgcbdx2826vs7gwrnw6yg9kwcyqyhrvnyf5fj5wfdqzdmp" ["github.com/armon/circbuf"] sumVersion = "v0.0.0-20150827004946-bbbad097214e" @@ -844,14 +820,6 @@ rev = "5267b6dd4d2666b980a911bf235efa276222cbe2" sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8" -["github.com/cenkalti/backoff/v4"] - sumVersion = "v4.0.0" - ["github.com/cenkalti/backoff/v4".fetch] - type = "git" - url = "https://github.com/cenkalti/backoff" - rev = "a9a4cec6c9a26336ca42700ccc319ca842be56c0" - sha256 = "0ch1wi2ajs34lny21i92wl2ri9kydvqil72h50ir154sld2mc16l" - ["github.com/census-instrumentation/opencensus-proto"] sumVersion = "v0.2.1" ["github.com/census-instrumentation/opencensus-proto".fetch] @@ -1030,22 +998,6 @@ rev = "39ac3d4b3f1fc30b95a4098257eaac0ad2093a34" sha256 = "1y564cvr8lh33andnbpivpkz472z72g4f2gf24b701s2bclx0k6w" -["github.com/consensys/goff"] - sumVersion = "v0.3.10" - ["github.com/consensys/goff".fetch] - type = "git" - url = "https://github.com/consensys/goff" - rev = "753b362693129e21b5f2af66f7e52a8eff91721c" - sha256 = "1c8ksxlff8a4rm5q1sr15kvi3j9q2f2y2fh7hh9qx56chh1yqy22" - -["github.com/consensys/gurvy"] - sumVersion = "v0.3.8" - ["github.com/consensys/gurvy".fetch] - type = "git" - url = "https://github.com/consensys/gurvy" - rev = "e350ead0219d4f30aa72ec85d1857b573d2f136a" - sha256 = "0h9p576h425djlq5ddbcf2yjrxc44k9a47l5srpqhqb6ndx18m1v" - ["github.com/containerd/console"] sumVersion = "v1.0.2" ["github.com/containerd/console".fetch] @@ -1191,6 +1143,14 @@ rev = "3a6a957789163cacdfe0e291617a1c8e80612c11" sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3" +["github.com/cyberdelia/templates"] + sumVersion = "v0.0.0-20141128023046-ca7fffd4298c" + ["github.com/cyberdelia/templates".fetch] + type = "git" + url = "https://github.com/cyberdelia/templates" + rev = "ca7fffd4298cba4fc31b3fc0ff2ae0bc9bac933d" + sha256 = "1miakwci9pz95p0jps4i3pyv5ws713ks1wwir5bzrl0yg8klrgw1" + ["github.com/cyphar/filepath-securejoin"] sumVersion = "v0.2.2" ["github.com/cyphar/filepath-securejoin".fetch] @@ -1248,6 +1208,14 @@ rev = "5c3e0d6454001c8d14fcf06be94381d93991aaea" sha256 = "0m2mxrkbnr4dfan9ljxq9dd5hhqmpx5n9pd4hnwn5mlj4zgv018a" +["github.com/deepmap/oapi-codegen"] + sumVersion = "v1.8.2" + ["github.com/deepmap/oapi-codegen".fetch] + type = "git" + url = "https://github.com/deepmap/oapi-codegen" + rev = "5f43277fa067cdfee9bcdb9ad229362af52cefe9" + sha256 = "046azmbi27jw0zb56hf4rnbsnqfp48z4npp0zapnm9dccaw9277j" + ["github.com/denis-tingajkin/go-header"] sumVersion = "v0.4.2" ["github.com/denis-tingajkin/go-header".fetch] @@ -1377,12 +1345,12 @@ sha256 = "1sxl62r8c13p4sm60c77mzcn6dlxbbk6c2nmic6j8z55dx4nlg1a" ["github.com/eapache/go-resiliency"] - sumVersion = "v1.2.0" + sumVersion = "v1.1.0" ["github.com/eapache/go-resiliency".fetch] type = "git" url = "https://github.com/eapache/go-resiliency" - rev = "5efd2ed019fd331ec2defc6f3bd98882f1e3e636" - sha256 = "01rskda1hdmrmf9wz2zn33zisavkkrgd8ycj9zvlz19v5rgjrsqy" + rev = "ea41b0fad31007accc7f806884dcdf3da98b79ce" + sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx" ["github.com/eapache/go-xerial-snappy"] sumVersion = "v0.0.0-20180814174437-776d5712da21" @@ -1416,14 +1384,6 @@ rev = "188cc3b666ba704534fa4f96e9e61f21f1e1ba7c" sha256 = "0ajmkk5cj6xmbngx3nhar7672i2vrkwpnbv1f26i5p4f5aydhl4k" -["github.com/elastic/gosigar"] - sumVersion = "v0.14.1" - ["github.com/elastic/gosigar".fetch] - type = "git" - url = "https://github.com/elastic/gosigar" - rev = "69b57d03f20e0ee9d614207292b61bd1f3886d92" - sha256 = "1l4sfcv81sqf6yx4jdbf9civpp96h8mpf39rxf03ydlg7bc6djnf" - ["github.com/enigmampc/btcutil"] sumVersion = "v1.0.3-0.20200723161021-e2fb6adb2a25" ["github.com/enigmampc/btcutil".fetch] @@ -1457,12 +1417,12 @@ sha256 = "1kqq3js0rhhdircwamyr0b6l7b01flgvj4ny5x4g51vz8m1z36jj" ["github.com/ethereum/go-ethereum"] - sumVersion = "v1.10.3" + sumVersion = "v1.10.9" ["github.com/ethereum/go-ethereum".fetch] type = "git" url = "https://github.com/ethereum/go-ethereum" - rev = "991384a7f6719e1125ca0be7fb27d0c4d1c5d2d3" - sha256 = "0hshipwwfgdb91wz91iwaf8na18i7x7sr2dprdmv75m36qjg6qrm" + rev = "eae3b1946a276ac099e0018fc792d9e8c3bfda6d" + sha256 = "0n7wm90piib96f57plw6rar0bvik0788gxa64x686c9fb0f18n38" ["github.com/ettle/strcase"] sumVersion = "v0.1.1" @@ -1592,14 +1552,6 @@ rev = "39f24b305784dc1d91c39229afd889a161000c9b" sha256 = "1rimdrhmy6nkzh7ydpx6139hh9ml6rdqg5gvkpy2l1x9mhanvan0" -["github.com/garyburd/redigo"] - sumVersion = "v1.6.0" - ["github.com/garyburd/redigo".fetch] - type = "git" - url = "https://github.com/garyburd/redigo" - rev = "a69d19351219b6dd56f274f96d85a7014a2ec34e" - sha256 = "0k88z3vmqn36msw06qlwqw7xy8blvg06wkc5a9nyhrfv5z5x9a2v" - ["github.com/gballet/go-libpcsclite"] sumVersion = "v0.0.0-20190607065134-2772fd86a8ff" ["github.com/gballet/go-libpcsclite".fetch] @@ -1608,6 +1560,14 @@ rev = "2772fd86a8ff4306d2749f610a386bfee9e0d727" sha256 = "1j7389jcjdsb73c30cial688m3r2wypspn8zhy5mvm3c9xqnigin" +["github.com/getkin/kin-openapi"] + sumVersion = "v0.61.0" + ["github.com/getkin/kin-openapi".fetch] + type = "git" + url = "https://github.com/getkin/kin-openapi" + rev = "cc9e37b212eab86de474d58c64f390b717b7bb69" + sha256 = "01h5qdzpnm9my14pw19q72zhfy5pinkd34zx1c7zz90cphwahiiv" + ["github.com/ghodss/yaml"] sumVersion = "v1.0.0" ["github.com/ghodss/yaml".fetch] @@ -1648,6 +1608,14 @@ rev = "58a59202ab311a28f6cf05b95753256576781273" sha256 = "014cj82z42gaw863nrfmw39ff1z103n0aj5bs1fpx2iawgw5i6qh" +["github.com/go-chi/chi/v5"] + sumVersion = "v5.0.0" + ["github.com/go-chi/chi/v5".fetch] + type = "git" + url = "https://github.com/go-chi/chi" + rev = "fe3708ee6c7bf30623c33ca1b8005182c392ff3f" + sha256 = "1aadsmrl8yi175ix59vsjizk416yjf0vp6zc7mqk3lz49cyfywgx" + ["github.com/go-critic/go-critic"] sumVersion = "v0.5.6" ["github.com/go-critic/go-critic".fetch] @@ -1705,6 +1673,22 @@ rev = "9f1c1d07a2d46919f666f69f6a324bacba498a6a" sha256 = "1561h2srxgp4kx7l4q2dsvsh47h8k8ps3xnwjzg76yjvgfsqrlnw" +["github.com/go-openapi/jsonpointer"] + sumVersion = "v0.19.5" + ["github.com/go-openapi/jsonpointer".fetch] + type = "git" + url = "https://github.com/go-openapi/jsonpointer" + rev = "2446e21cad36eee826e1c2380f0ff747074a2faa" + sha256 = "0azic9nfwywlz4qxvacyi4g668fbbrkcyv15bag02yfcsi8szg5c" + +["github.com/go-openapi/swag"] + sumVersion = "v0.19.5" + ["github.com/go-openapi/swag".fetch] + type = "git" + url = "https://github.com/go-openapi/swag" + rev = "c3d0f7896d589f3babb99eea24bbc7de98108e72" + sha256 = "1z34vqc5yz6rzvarrvlhkimxx33p74iaxb28l1mv716njvlsmjhg" + ["github.com/go-playground/assert/v2"] sumVersion = "v2.0.1" ["github.com/go-playground/assert/v2".fetch] @@ -1987,12 +1971,12 @@ sha256 = "1mh5fyim42dn821nsd3afnmgscrzzhn3h8rag635d2jnr23r1zhk" ["github.com/golang/snappy"] - sumVersion = "v0.0.3" + sumVersion = "v0.0.4" ["github.com/golang/snappy".fetch] type = "git" url = "https://github.com/golang/snappy" - rev = "674baa8c7fc30da5df3074a459494a7e6b427dff" - sha256 = "1dc8sdca0nrqb8wri91mi2xcjm16wyawm4y0fwc5gp24ahjbrg7g" + rev = "544b4180ac705b7605231d4a4550a1acb22a19fe" + sha256 = "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j" ["github.com/golangci/check"] sumVersion = "v0.0.0-20180506172741-cfe4005ccda2" @@ -2146,14 +2130,6 @@ rev = "4bb14d4b1be14417e47d0bbaf2bd4e188eda647f" sha256 = "15lgdlblmw0f0cj0k7qn8bbk15k5b61n4r3vm2gaac2zribxk47b" -["github.com/google/protobuf"] - sumVersion = "v3.14.0+incompatible" - ["github.com/google/protobuf".fetch] - type = "git" - url = "https://github.com/google/protobuf" - rev = "2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10" - sha256 = "0kz4nwh4p0z4hlr7llx6r6wf3b2d1lkavysvkbja3a69dr1077ky" - ["github.com/google/renameio"] sumVersion = "v0.1.0" ["github.com/google/renameio".fetch] @@ -2243,22 +2219,6 @@ rev = "98cb6bf42e086f6af920b965c38cacc07402d51b" sha256 = "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk" -["github.com/gorilla/securecookie"] - sumVersion = "v1.1.1" - ["github.com/gorilla/securecookie".fetch] - type = "git" - url = "https://github.com/gorilla/securecookie" - rev = "e59506cc896acb7f7bf732d4fdf5e25f7ccd8983" - sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410" - -["github.com/gorilla/sessions"] - sumVersion = "v1.2.1" - ["github.com/gorilla/sessions".fetch] - type = "git" - url = "https://github.com/gorilla/sessions" - rev = "61fa50d034f99479a7de0d1c02c5e9dea5ad30cb" - sha256 = "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp" - ["github.com/gorilla/websocket"] sumVersion = "v1.4.2" ["github.com/gorilla/websocket".fetch] @@ -2397,6 +2357,14 @@ rev = "8a6fb523712970c966eefc6b39ed2c5e74880354" sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c" +["github.com/hashicorp/go-bexpr"] + sumVersion = "v0.1.10" + ["github.com/hashicorp/go-bexpr".fetch] + type = "git" + url = "https://github.com/hashicorp/go-bexpr" + rev = "b515551c2135509e07d5b3869bb2f78d8f3921e1" + sha256 = "14id00c98kphnm61l20q46ffvh0k980wdnmrlx8x72hs9m2cblag" + ["github.com/hashicorp/go-cleanhttp"] sumVersion = "v0.5.1" ["github.com/hashicorp/go-cleanhttp".fetch] @@ -2470,12 +2438,12 @@ sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1" ["github.com/hashicorp/go-uuid"] - sumVersion = "v1.0.2" + sumVersion = "v1.0.1" ["github.com/hashicorp/go-uuid".fetch] type = "git" url = "https://github.com/hashicorp/go-uuid" - rev = "6195a4f20692188e0a389def25559731d1e130f9" - sha256 = "1azjn5a03cv0bdab3clmkfz8g9807nxxjwy9i7dy73p7d4sikhja" + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43" + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k" ["github.com/hashicorp/go-version"] sumVersion = "v1.2.0" @@ -2559,12 +2527,12 @@ sha256 = "16dlc7q0w99nsqjh1ibv54rmmdl2kisbh5z57j963zlwbg43byjz" ["github.com/holiman/uint256"] - sumVersion = "v1.1.1" + sumVersion = "v1.2.0" ["github.com/holiman/uint256".fetch] type = "git" url = "https://github.com/holiman/uint256" - rev = "99b79c80738390408ef1a47f0e26812ef5506c02" - sha256 = "13v6rnwv1mivqxfmnmj57jg6is81p04gspmykc8slcc1ryvs1qdh" + rev = "46b8ad94199afbcc12f2ca653481891165d829d5" + sha256 = "0gi0i5zv5czydnvk5fa3p7a92ygfdi0x8sbaynn9i1ivajivw8g4" ["github.com/hpcloud/tail"] sumVersion = "v1.0.0" @@ -2591,12 +2559,12 @@ sha256 = "1f7pwj793p51nq03jiz834g0qvg502h9asry6nx4pdc10wzx2948" ["github.com/huin/goupnp"] - sumVersion = "v1.0.1-0.20210310174557-0ca763054c88" + sumVersion = "v1.0.2" ["github.com/huin/goupnp".fetch] type = "git" url = "https://github.com/huin/goupnp" - rev = "0ca763054c8882de233e45d2f61d8be91f86e536" - sha256 = "1wxy76z8dw491rck82xd13l90z68zsjhrijcfyn9gy4b1hi6p4dr" + rev = "5a0d4bd7ee6bee8e26f24664c8e0d0c8ec3b0a7e" + sha256 = "1cv561wlzlzwxwpwirmyck33bhfmgpgv4wfq65wv8wkk6lgvqz0m" ["github.com/huin/goutil"] sumVersion = "v0.0.0-20170803182201-1ca381bf3150" @@ -2654,13 +2622,21 @@ rev = "563e6c3d1a7a2790763c6289501095dbec19244e" sha256 = "1siv31gp7ypjphxjfv91sxzpz2rxk1nn2aj17pgk0cz7c8m59ic7" +["github.com/influxdata/influxdb-client-go/v2"] + sumVersion = "v2.4.0" + ["github.com/influxdata/influxdb-client-go/v2".fetch] + type = "git" + url = "https://github.com/influxdata/influxdb-client-go" + rev = "66a8c329808fb7f697c70a83b98c99a827e93648" + sha256 = "19w8s6370lvlvl431wi9bnyq72wghzng4ld3yvw5y7pb29msibky" + ["github.com/influxdata/influxdb1-client"] - sumVersion = "v0.0.0-20200827194710-b269163b24ab" + sumVersion = "v0.0.0-20191209144304-8bf82d3c094d" ["github.com/influxdata/influxdb1-client".fetch] type = "git" url = "https://github.com/influxdata/influxdb1-client" - rev = "b269163b24ab8e62026d13a92aa988a7389c3b4e" - sha256 = "0pm1j437xk7d32px60j52qm98zgn21nmaqavjflvr44zaglrz5n9" + rev = "8bf82d3c094dc06be9da8e5bf9d3589b6ea032ae" + sha256 = "0cjli7prxfxayx2grianbla5jr0dq28sazk8phbnh61ac5zaya4s" ["github.com/influxdata/influxql"] sumVersion = "v1.1.1-0.20200828144457-65d3ef77d385" @@ -2671,12 +2647,12 @@ sha256 = "1p7nmx31yp3cn2njwqpj1hqqlhalpyj9x91mpllvprrislzwf06v" ["github.com/influxdata/line-protocol"] - sumVersion = "v0.0.0-20180522152040-32c6aa80de5e" + sumVersion = "v0.0.0-20210311194329-9aa0e372d097" ["github.com/influxdata/line-protocol".fetch] type = "git" url = "https://github.com/influxdata/line-protocol" - rev = "32c6aa80de5eb09d190ad284a8214a531c6bce57" - sha256 = "0wvd6lplbvmz2lznvy4zz3fmxiqc43cgr4vppp1xi38j1iwq0349" + rev = "9aa0e372d097c9632ad8b3b9f76ca9cf70c4c14a" + sha256 = "1w65mr95sfygz64b6gvbbmhgwpkacdic6213kn3ac90xk37kmsy8" ["github.com/influxdata/promql/v2"] sumVersion = "v2.12.0" @@ -2718,59 +2694,6 @@ rev = "1fa385a6f45828c83361136b45b1a21a12139493" sha256 = "1n5h3qrd613cfw95vyqpy9vh3xv0zgbk3j5q8zad25q10wvp6ymn" -["github.com/jcmturner/aescts/v2"] - sumVersion = "v2.0.0" - relPath = "v2" - ["github.com/jcmturner/aescts/v2".fetch] - type = "git" - url = "https://github.com/jcmturner/aescts" - rev = "72347e1bd92aa67384e4f8c0e8a6d7cfaa716eea" - sha256 = "0yrdiisdhcqfs8jpicc30dfmbqzxhkmbayn902xrgwkndky8w7l1" - -["github.com/jcmturner/dnsutils/v2"] - sumVersion = "v2.0.0" - relPath = "v2" - ["github.com/jcmturner/dnsutils/v2".fetch] - type = "git" - url = "https://github.com/jcmturner/dnsutils" - rev = "90052734000be120c409677a88cb517e5b49dbf4" - sha256 = "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9" - -["github.com/jcmturner/gofork"] - sumVersion = "v1.0.0" - ["github.com/jcmturner/gofork".fetch] - type = "git" - url = "https://github.com/jcmturner/gofork" - rev = "dc7c13fece037a4a36e2b3c69db4991498d30692" - sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr" - -["github.com/jcmturner/goidentity/v6"] - sumVersion = "v6.0.1" - relPath = "v6" - ["github.com/jcmturner/goidentity/v6".fetch] - type = "git" - url = "https://github.com/jcmturner/goidentity" - rev = "836ef0c4025b66a750604bb79d41ace085366777" - sha256 = "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n" - -["github.com/jcmturner/gokrb5/v8"] - sumVersion = "v8.4.2" - relPath = "v8" - ["github.com/jcmturner/gokrb5/v8".fetch] - type = "git" - url = "https://github.com/jcmturner/gokrb5" - rev = "663478bf457f1fc3275973bea5b7b787cd332015" - sha256 = "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b" - -["github.com/jcmturner/rpc/v2"] - sumVersion = "v2.0.3" - relPath = "v2" - ["github.com/jcmturner/rpc/v2".fetch] - type = "git" - url = "https://github.com/jcmturner/rpc" - rev = "7f482067a47ba5c8f25f2bcae9ab99b3fed820e9" - sha256 = "1nm4j2nwcszghldw39rwdx2hr56i1lybfpv33y4gd67w6qcqbpsi" - ["github.com/jedisct1/go-minisign"] sumVersion = "v0.0.0-20190909160543-45766022959e" ["github.com/jedisct1/go-minisign".fetch] @@ -2972,14 +2895,6 @@ rev = "48d3d31d256d9922a90b14c518c4b685f321fab2" sha256 = "1vb4irkbj5s4v8n8dqngmg2w2fbnaz568z731yqryspvvmrki2a1" -["github.com/kilic/bls12-381"] - sumVersion = "v0.0.0-20201226121925-69dacb279461" - ["github.com/kilic/bls12-381".fetch] - type = "git" - url = "https://github.com/kilic/bls12-381" - rev = "69dacb279461b1e4d9a3d693901f478eb9aafb3e" - sha256 = "1fghffa56qzqapnlcjg9pir6c171sxk37jsadhljmi3ilc9v4jms" - ["github.com/kisielk/errcheck"] sumVersion = "v1.6.0" ["github.com/kisielk/errcheck".fetch] @@ -3013,20 +2928,12 @@ sha256 = "1bnxpv11zxg23h6qnm6wvf1qvbz2k2n3l1xy02wwfa139kpwc4ag" ["github.com/klauspost/cpuid"] - sumVersion = "v1.2.1" + sumVersion = "v0.0.0-20170728055534-ae7887de9fa5" ["github.com/klauspost/cpuid".fetch] type = "git" url = "https://github.com/klauspost/cpuid" - rev = "05a8198c0f5a27739aec358908d7e12c64ce6eb7" - sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x" - -["github.com/klauspost/cpuid/v2"] - sumVersion = "v2.0.4" - ["github.com/klauspost/cpuid/v2".fetch] - type = "git" - url = "https://github.com/klauspost/cpuid" - rev = "11274af0a6d540f8fcfec0d5ed78fbe6f42c3ee3" - sha256 = "1riaicd9yyhx8zgmw1dzqf01ifhlg8fbzjag5xpl3rajih4ml6dr" + rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da" + sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4" ["github.com/klauspost/crc32"] sumVersion = "v0.0.0-20161016154125-cb6bfca970f6" @@ -3044,14 +2951,6 @@ rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506" sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s" -["github.com/klauspost/reedsolomon"] - sumVersion = "v1.9.11" - ["github.com/klauspost/reedsolomon".fetch] - type = "git" - url = "https://github.com/klauspost/reedsolomon" - rev = "ab26eb412646d995bc07af659e8abd4f679ae63d" - sha256 = "070damdcsp3lbbbcrsvq6ckhd9ff72b52palc02dyc98dxqcv3xh" - ["github.com/konsorten/go-windows-terminal-sequences"] sumVersion = "v1.0.3" ["github.com/konsorten/go-windows-terminal-sequences".fetch] @@ -3132,6 +3031,22 @@ rev = "722a3a9d673aef9e42d83ecf99cb72ab7e9e6c67" sha256 = "00zvdqiwdm8qvn8p6pjygl7vs920171j46qn0cs5fbmmrq42dk89" +["github.com/labstack/echo/v4"] + sumVersion = "v4.2.1" + ["github.com/labstack/echo/v4".fetch] + type = "git" + url = "https://github.com/labstack/echo" + rev = "a97052edaf781a731903d816c9b271028d709131" + sha256 = "0kmaxpz56v8qj1p2zql9s9mxani4y3lsmlykqd4jbi1j1zcnr034" + +["github.com/labstack/gommon"] + sumVersion = "v0.3.0" + ["github.com/labstack/gommon".fetch] + type = "git" + url = "https://github.com/labstack/gommon" + rev = "4919956f6fb227b548f004da27c7c6b20fba499f" + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0" + ["github.com/ldez/gomoddirectives"] sumVersion = "v0.2.2" ["github.com/ldez/gomoddirectives".fetch] @@ -3230,6 +3145,14 @@ rev = "291b8266af1000c77a12ae6d4dde1145a028012f" sha256 = "0v4agnkhc30fblbmhs0gq2bikhdnnmqmpp4phrnza68m04j5hxbn" +["github.com/mailru/easyjson"] + sumVersion = "v0.0.0-20190626092158-b2ccc519800e" + ["github.com/mailru/easyjson".fetch] + type = "git" + url = "https://github.com/mailru/easyjson" + rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e" + sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk" + ["github.com/maratori/testpackage"] sumVersion = "v1.0.1" ["github.com/maratori/testpackage".fetch] @@ -3246,6 +3169,14 @@ rev = "6504466cf951eb5e1ae25306e5a31fe3cad56539" sha256 = "1nyzx5il6q7cw1d4dyw93xsqdwdwhbwvl82cgr0lwaxlxwwg7pfj" +["github.com/matryer/moq"] + sumVersion = "v0.0.0-20190312154309-6cfb0558e1bd" + ["github.com/matryer/moq".fetch] + type = "git" + url = "https://github.com/matryer/moq" + rev = "6cfb0558e1bd81d19c9909483c39e199634fed29" + sha256 = "0x7ss68cvq2aljyw4765iy7divmp8rghpyzlas3nb95qzsfmmpzl" + ["github.com/mattn/go-colorable"] sumVersion = "v0.1.8" ["github.com/mattn/go-colorable".fetch] @@ -3351,12 +3282,12 @@ sha256 = "0rmmgssb6y28x54si5h63gwbdsjjxf5n9xvm3zqdfsf9l10gx2m6" ["github.com/miguelmota/go-ethereum-hdwallet"] - sumVersion = "v0.0.1" + sumVersion = "v0.1.1" ["github.com/miguelmota/go-ethereum-hdwallet".fetch] type = "git" url = "https://github.com/miguelmota/go-ethereum-hdwallet" - rev = "dc19827c9f08345a799408ec5fedb2a2d74294d5" - sha256 = "01rz2q55540l457zwll2chrd2hnqcw69gbiybn1hlrpkjbqrbsg2" + rev = "ca8871b71a79c01875d53a75b2a8790d2575763a" + sha256 = "0r68hjyrh83knwavap7s5gbh03izzgly4k7yz9yzzvx1cji6vi7a" ["github.com/mimoo/StrobeGo"] sumVersion = "v0.0.0-20181016162300-f8f6d4d2b643" @@ -3438,6 +3369,14 @@ rev = "5ac1f6aa4011ece0c4df24a4fe8020a9cc21e393" sha256 = "0akjnwsng42vak978pny84d946fbaj2kgp7fzvx30zpc6fzrmli7" +["github.com/mitchellh/pointerstructure"] + sumVersion = "v1.2.0" + ["github.com/mitchellh/pointerstructure".fetch] + type = "git" + url = "https://github.com/mitchellh/pointerstructure" + rev = "09edf7f47224892e450d1c704156ce2f245efaab" + sha256 = "1p6rmkwixnyf291v5jc0g72b3krp3awyakfamkq5485gvm8vk0mm" + ["github.com/mitchellh/reflectwalk"] sumVersion = "v1.0.1" ["github.com/mitchellh/reflectwalk".fetch] @@ -3719,38 +3658,6 @@ rev = "970db520ece77730c7e4724c61121037378659d9" sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj" -["github.com/openconfig/gnmi"] - sumVersion = "v0.0.0-20210226144353-8eae1937bf84" - ["github.com/openconfig/gnmi".fetch] - type = "git" - url = "https://github.com/openconfig/gnmi" - rev = "8eae1937bf841842e2e0864c34562c8352d56bb2" - sha256 = "0xrfpn117fb28inrnfrzsbrpndd8npiyn207w6fx9srp5d1hr9w4" - -["github.com/openconfig/goyang"] - sumVersion = "v0.0.0-20200115183954-d0a48929f0ea" - ["github.com/openconfig/goyang".fetch] - type = "git" - url = "https://github.com/openconfig/goyang" - rev = "d0a48929f0eacdc11bbfe0555e7ac8621cfa8b4f" - sha256 = "036ma7lfliz7gld863760b69vql4vxd0m9c5n7vkch22srm7f4wg" - -["github.com/openconfig/reference"] - sumVersion = "v0.0.0-20201210185750-72ca4cfd4abd" - ["github.com/openconfig/reference".fetch] - type = "git" - url = "https://github.com/openconfig/reference" - rev = "72ca4cfd4abdbdb382905ff45e9cb990b4a770bb" - sha256 = "1laf2k1cfwdr2wcgfc6g6y4rs7cwjnwdj3lgrvgiklfyf5q8yw27" - -["github.com/openconfig/ygot"] - sumVersion = "v0.6.0" - ["github.com/openconfig/ygot".fetch] - type = "git" - url = "https://github.com/openconfig/ygot" - rev = "68346f97239f91ac9fb1f419586f58d6c39f5500" - sha256 = "0baza6d80wvnbfdqdvyz98pl61w7ihnbm1mdwkn6b9a0ip6f9k6j" - ["github.com/opencontainers/go-digest"] sumVersion = "v1.0.0" ["github.com/opencontainers/go-digest".fetch] @@ -3970,12 +3877,12 @@ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2" ["github.com/pierrec/lz4"] - sumVersion = "v2.6.0+incompatible" + sumVersion = "v2.0.5+incompatible" ["github.com/pierrec/lz4".fetch] type = "git" url = "https://github.com/pierrec/lz4" - rev = "0e583d326e0ec6b9c1ad223188dc709af385408e" - sha256 = "1w1427xd9k7yz3yda0n07vc27hlb8l2c2lmhnn7lpj83g9s0wy60" + rev = "ea731401f5c95a8ba30f15787e5e0fb77c60c66b" + sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p" ["github.com/pkg/errors"] sumVersion = "v0.9.1" @@ -4292,14 +4199,6 @@ rev = "1595213edefa28ca5047b00340c63557f9c051d0" sha256 = "06h5g16zlfnw9wvgaqp7jfav3n3pvli6asfcx1hv44sl601wnwk0" -["github.com/satori/go.uuid"] - sumVersion = "v1.2.0" - ["github.com/satori/go.uuid".fetch] - type = "git" - url = "https://github.com/satori/go.uuid" - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb" - ["github.com/sean-/seed"] sumVersion = "v0.0.0-20170313163322-e2103e2c3529" ["github.com/sean-/seed".fetch] @@ -4598,12 +4497,12 @@ sha256 = "00zi0k190ydlm9drnafvj9p4cf6axm858wr71pbmq1p3r94iqws4" ["github.com/syndtr/goleveldb"] - sumVersion = "v1.0.1-0.20210305035536-64b5b1c73954" + sumVersion = "v1.0.1-0.20210819022825-2ae1ddf74ef7" ["github.com/syndtr/goleveldb".fetch] type = "git" url = "https://github.com/syndtr/goleveldb" - rev = "64b5b1c739545ed311fb9d9924d19d188fabdc83" - sha256 = "0z4p22hpv3s9c85kw6vk6p8zc2dbkxfqvl5l89qknsc3cv9ys15r" + rev = "2ae1ddf74ef7020251ff1ff0fe8daac21a157761" + sha256 = "11b4vjldnp6ws52wlqrzsy6nnn5qa2m98wiqvd90nzsh0n3bi9nz" ["github.com/tdakkota/asciicheck"] sumVersion = "v0.0.0-20200416200610-e657995f937b" @@ -4621,22 +4520,6 @@ rev = "f0fad39f321c61bf05fcb4a01fe259606235e712" sha256 = "0brf99da00jf91hf7w0qqk6yj61zcya9ci7pm8d60q6zl40i87c5" -["github.com/templexxx/cpufeat"] - sumVersion = "v0.0.0-20180724012125-cef66df7f161" - ["github.com/templexxx/cpufeat".fetch] - type = "git" - url = "https://github.com/templexxx/cpufeat" - rev = "cef66df7f161dee20f4d650da7268d77eaaec82d" - sha256 = "183aviadgq0slzighpa9z32cd26991hv5d5jnmk7frcq0nd62p9k" - -["github.com/templexxx/xor"] - sumVersion = "v0.0.0-20191217153810-f85b25db303b" - ["github.com/templexxx/xor".fetch] - type = "git" - url = "https://github.com/templexxx/xor" - rev = "f85b25db303b7014d1e97d8f25909c721a48cddf" - sha256 = "0h39qrkiq025q7dg8225afc6a7gqf6d25zspvzb6n02hdnchfqq2" - ["github.com/tendermint/btcd"] sumVersion = "v0.1.1" ["github.com/tendermint/btcd".fetch] @@ -4686,13 +4569,12 @@ sha256 = "1kmdk3v2a6ygcg2i8jfgz61yzxi4183xgzlaviq9jwsqwc2hj60w" ["github.com/tharsis/ethermint"] - sumVersion = "v0.4.2-0.20211004101819-7b5449f36cc8" - vendorPath = "github.com/crypto-org-chain/ethermint" + sumVersion = "v0.6.1-0.20211005160855-202bc5f1cd2e" ["github.com/tharsis/ethermint".fetch] type = "git" - url = "https://github.com/crypto-org-chain/ethermint" - rev = "7b5449f36cc87285ff68e0977c7105782ce7dc03" - sha256 = "055lx94k9gn835n3i1gbzyqa9ncknghf43hmk501cqcjgqn4mdsr" + url = "https://github.com/tharsis/ethermint" + rev = "202bc5f1cd2e7c9e44a9cd6a722dd26abd5955ad" + sha256 = "1jkvvgzl9a8mhpn4833l3jmw4q1spgrzkclj2ws1gb58zss1f0vm" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7" @@ -4742,14 +4624,6 @@ rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1" sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc" -["github.com/tjfoc/gmsm"] - sumVersion = "v1.4.0" - ["github.com/tjfoc/gmsm".fetch] - type = "git" - url = "https://github.com/tjfoc/gmsm" - rev = "d8e8bda44671fdfb187e931f324d7537ece9a87f" - sha256 = "104mhgl9skqbin1s9d7x1gmimvfpzkc4r11s7q18gvpkjlgcsl8y" - ["github.com/tklauser/go-sysconf"] sumVersion = "v0.3.7" ["github.com/tklauser/go-sysconf".fetch] @@ -4887,6 +4761,14 @@ rev = "434c48ba7e3a0dafb32964b8971fb1448a39ceee" sha256 = "120vyy6q75v70vkhbckh287700bma6wqzvg7i8wf8qy2vvq551ag" +["github.com/valyala/fasttemplate"] + sumVersion = "v1.2.1" + ["github.com/valyala/fasttemplate".fetch] + type = "git" + url = "https://github.com/valyala/fasttemplate" + rev = "2275c48ed3e40f01fa347e220be31070a89b6ad4" + sha256 = "0bd1hxxg1bzx307adpd1s4yjaa6q51cqk4qvqskfflxvgll79vdn" + ["github.com/valyala/quicktemplate"] sumVersion = "v1.6.3" ["github.com/valyala/quicktemplate".fetch] @@ -4959,22 +4841,6 @@ rev = "48726bab92085232373de4ec5c51ce7b441c63a0" sha256 = "1rszp777snp9qvnh2giim7d42cvca5l180gq4j7clbmshnzg6c6m" -["github.com/xdg/scram"] - sumVersion = "v0.0.0-20180814205039-7eeb5667e42c" - ["github.com/xdg/scram".fetch] - type = "git" - url = "https://github.com/xdg/scram" - rev = "7eeb5667e42c09cb51bf7b7c28aea8c56767da90" - sha256 = "1ff20g1wdfz9yfg0azawmi7bdfnn4b8ymkmcf67ckq04q49cvfnb" - -["github.com/xdg/stringprep"] - sumVersion = "v1.0.0" - ["github.com/xdg/stringprep".fetch] - type = "git" - url = "https://github.com/xdg/stringprep" - rev = "bd625b8dc1e3b0f57412280ccbcc317f0c69d8db" - sha256 = "03nard51zgzbaq64p6gsvrz8fps3yazl3ydd115y0bppkdx2i4ji" - ["github.com/xiang90/probing"] sumVersion = "v0.0.0-20190116061207-43a291ad63a2" ["github.com/xiang90/probing".fetch] @@ -5007,22 +4873,6 @@ rev = "b2862e3d0a775f18c7cfe02273500ae307b61218" sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y" -["github.com/xtaci/kcp-go"] - sumVersion = "v5.4.20+incompatible" - ["github.com/xtaci/kcp-go".fetch] - type = "git" - url = "https://github.com/xtaci/kcp-go" - rev = "b1d82b8a82e775446d6700472900f0da93d2aca5" - sha256 = "0jljqbhklhx4cjxpqsm4v4ci1w2yaamxxyixyhh9sxhbcywcq6a8" - -["github.com/xtaci/lossyconn"] - sumVersion = "v0.0.0-20190602105132-8df528c0c9ae" - ["github.com/xtaci/lossyconn".fetch] - type = "git" - url = "https://github.com/xtaci/lossyconn" - rev = "8df528c0c9aeed110ff35a1d622c540d9f7d8f04" - sha256 = "0sbh56lfrpvyjkzp65h9dv9n2jda6b1slqamv0njzspigxr1zp44" - ["github.com/ybbus/jsonrpc"] sumVersion = "v2.1.2+incompatible" ["github.com/ybbus/jsonrpc".fetch] @@ -5171,12 +5021,12 @@ sha256 = "14mr66h7vxirpvb12106372apw1w3ppymbf89lprxkkg03srkfy8" ["golang.org/x/crypto"] - sumVersion = "v0.0.0-20210817164053-32db794688a5" + sumVersion = "v0.0.0-20210921155107-089bfa567519" ["golang.org/x/crypto".fetch] type = "git" url = "https://go.googlesource.com/crypto" - rev = "32db794688a5a24a23a43f2a984cecd5b3d8da58" - sha256 = "0arh5rhahrjzmlifmbgswwc0kjkgmhps6g4hzia0i6ismsk74n48" + rev = "089bfa5675191fd96a44247682f76ebca03d7916" + sha256 = "0i49ywadw5hp30i4dghwjwhbrfxq881jxskhnz7gwps5kb0bdnjf" ["golang.org/x/exp"] sumVersion = "v0.0.0-20200331195152-e8c3332aa8e5" @@ -5331,12 +5181,12 @@ sha256 = "1wkipg7xxc0ha5p6c3bj0vpgq38l18441n5l6zxdhx0gzvz5z1hs" ["google.golang.org/genproto"] - sumVersion = "v0.0.0-20210909211513-a8c4777a87af" + sumVersion = "v0.0.0-20211001223012-bfb93cce50d9" ["google.golang.org/genproto".fetch] type = "git" url = "https://github.com/googleapis/go-genproto" - rev = "a8c4777a87afad5bd90bd22a6a2fbccbb3027224" - sha256 = "10dwyw88ffgqsyymn8g5rj7gpm9njhj1f0p08s6jb17yqi54xzw3" + rev = "bfb93cce50d9212d8edd323d18cf616ab983e277" + sha256 = "0p6w5k8jhd0kixbkl2brgl7a64g526iq8a3s3kz7zs61d75w1f6w" ["google.golang.org/grpc"] sumVersion = "v1.33.2" @@ -5371,14 +5221,6 @@ rev = "947dcec5ba9c011838740e680966fd7087a71d0d" sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r" -["gopkg.in/bsm/ratelimit.v1"] - sumVersion = "v1.0.0-20160220154919-db14e161995a" - ["gopkg.in/bsm/ratelimit.v1".fetch] - type = "git" - url = "https://gopkg.in/bsm/ratelimit.v1" - rev = "db14e161995a5177acef654cb0dd785e8ee8bc22" - sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh" - ["gopkg.in/check.v1"] sumVersion = "v1.0.0-20201130134442-10cb98267c6c" ["gopkg.in/check.v1".fetch] @@ -5443,46 +5285,6 @@ rev = "14e9811b1643cf01ea36277e44dffef4f119fa31" sha256 = "0s35274ibybg1nidwb65jyc3gkkbs91s7rv5jdg73x6sbd73q6wr" -["gopkg.in/jcmturner/aescts.v1"] - sumVersion = "v1.0.1" - ["gopkg.in/jcmturner/aescts.v1".fetch] - type = "git" - url = "https://gopkg.in/jcmturner/aescts.v1" - rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290" - sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv" - -["gopkg.in/jcmturner/dnsutils.v1"] - sumVersion = "v1.0.1" - ["gopkg.in/jcmturner/dnsutils.v1".fetch] - type = "git" - url = "https://gopkg.in/jcmturner/dnsutils.v1" - rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c" - sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927" - -["gopkg.in/jcmturner/goidentity.v3"] - sumVersion = "v3.0.0" - ["gopkg.in/jcmturner/goidentity.v3".fetch] - type = "git" - url = "https://gopkg.in/jcmturner/goidentity.v3" - rev = "3a6fd63c09116f950c952b5cb82d039acc7545b1" - sha256 = "0ymvs25i3j8nv3pml86bkxa73syki6k73bhhdcs15chr7bfgx0im" - -["gopkg.in/jcmturner/gokrb5.v7"] - sumVersion = "v7.2.3" - ["gopkg.in/jcmturner/gokrb5.v7".fetch] - type = "git" - url = "https://gopkg.in/jcmturner/gokrb5.v7" - rev = "7b6b2f54b7fda31a47cd7e68ca8485dedeb0e1ed" - sha256 = "1rb524xfzf7ij0sbwhiclzg8iqhwck6ndfmbajkw24w761sgnw8q" - -["gopkg.in/jcmturner/rpc.v1"] - sumVersion = "v1.1.0" - ["gopkg.in/jcmturner/rpc.v1".fetch] - type = "git" - url = "https://gopkg.in/jcmturner/rpc.v1" - rev = "99a8ce2fbf8b8087b6ed12a37c61b10f04070043" - sha256 = "0hkmvf8qdcifnzym8kv1xhq7lq0wpr0i6gzff159lh9xn0wfg175" - ["gopkg.in/natefinch/npipe.v2"] sumVersion = "v2.0.0-20160621034901-c1b8fa8bdcce" ["gopkg.in/natefinch/npipe.v2".fetch] @@ -5499,14 +5301,6 @@ rev = "60c24ae608a642bf894bed9eb53627d2384bedca" sha256 = "13qirm5nqk6isv9n0wdi18k9wc8h1d7n6zwflhziwix7ghnr7a1q" -["gopkg.in/redis.v4"] - sumVersion = "v4.2.4" - ["gopkg.in/redis.v4".fetch] - type = "git" - url = "https://gopkg.in/redis.v4" - rev = "c938162545c57136fa59879746bc65d0f1db3d1e" - sha256 = "10dkav38ljdsfjvj9wpjn29y4csa2kymm5fgalqa4hvwxz95cnpg" - ["gopkg.in/resty.v1"] sumVersion = "v1.12.0" ["gopkg.in/resty.v1".fetch] diff --git a/x/cronos/keeper/evm.go b/x/cronos/keeper/evm.go index be532d9f7a..12bc68ece9 100644 --- a/x/cronos/keeper/evm.go +++ b/x/cronos/keeper/evm.go @@ -1,7 +1,6 @@ package keeper import ( - "errors" "fmt" "math/big" @@ -27,32 +26,14 @@ func (k Keeper) CallEVM(ctx sdk.Context, to *common.Address, data []byte, value value, // amount config.DefaultGasCap, big.NewInt(0), // gasPrice + big.NewInt(0), // gasFeeCap + big.NewInt(0), // gasTipCap data, nil, // accessList false, // checkNonce ) - - params := k.evmKeeper.GetParams(ctx) - // return error if contract creation or call are disabled through governance - if !params.EnableCreate && to == nil { - return nil, nil, errors.New("failed to create new contract") - } else if !params.EnableCall && to != nil { - return nil, nil, errors.New("failed to call contract") - } - ethCfg := params.ChainConfig.EthereumConfig(k.evmKeeper.ChainID()) - - // get the coinbase address from the block proposer - coinbase, err := k.evmKeeper.GetCoinbaseAddress(ctx) - if err != nil { - return nil, nil, errors.New("failed to obtain coinbase address") - } - evm := k.evmKeeper.NewEVM(msg, ethCfg, params, coinbase, types.NewDummyTracer()) - ret, err := k.evmKeeper.ApplyMessage(evm, msg, ethCfg, true) - if err != nil { - return nil, nil, err - } - k.evmKeeper.CommitCachedContexts() - return &msg, ret, nil + ret, err := k.evmKeeper.ApplyNativeMessage(msg) + return &msg, ret, err } // CallModuleCRC20 call a method of ModuleCRC20 contract diff --git a/x/cronos/keeper/keeper.go b/x/cronos/keeper/keeper.go index ab07798b94..3eb977d877 100644 --- a/x/cronos/keeper/keeper.go +++ b/x/cronos/keeper/keeper.go @@ -12,7 +12,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/crypto-org-chain/cronos/x/cronos/types" "github.com/ethereum/go-ethereum/common" - evmkeeper "github.com/tharsis/ethermint/x/evm/keeper" // this line is used by starport scaffolding # ibc/keeper/import ) @@ -31,7 +30,7 @@ type ( // gravity bridge keeper gravityKeeper types.GravityKeeper // ethermint evm keeper - evmKeeper *evmkeeper.Keeper + evmKeeper types.EvmKeeper // this line is used by starport scaffolding # ibc/keeper/attribute } @@ -45,7 +44,7 @@ func NewKeeper( bankKeeper types.BankKeeper, transferKeeper types.TransferKeeper, gravityKeeper types.GravityKeeper, - evmKeeper *evmkeeper.Keeper, + evmKeeper types.EvmKeeper, // this line is used by starport scaffolding # ibc/keeper/parameter ) *Keeper { diff --git a/x/cronos/types/interfaces.go b/x/cronos/types/interfaces.go index fca526b0a1..9ad5a697ca 100644 --- a/x/cronos/types/interfaces.go +++ b/x/cronos/types/interfaces.go @@ -6,8 +6,10 @@ import ( "github.com/cosmos/ibc-go/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" gravitytypes "github.com/peggyjv/gravity-bridge/module/x/gravity/types" tmbytes "github.com/tendermint/tendermint/libs/bytes" + evmtypes "github.com/tharsis/ethermint/x/evm/types" ) // BankKeeper defines the expected interface needed to retrieve account balances. @@ -46,6 +48,14 @@ type GravityKeeper interface { GetParams(ctx sdk.Context) (params gravitytypes.Params) } +// EvmKeeper defines the expected evm keeper interface +type EvmKeeper interface { + WithContext(ctx sdk.Context) + GetNonce(common.Address) uint64 + ApplyNativeMessage(core.Message) (*evmtypes.MsgEthereumTxResponse, error) + GetParams(ctx sdk.Context) evmtypes.Params +} + // EvmLogHandler defines the interface for evm log handler type EvmLogHandler interface { // Return the id of the log signature it handles diff --git a/x/cronos/types/tracer.go b/x/cronos/types/tracer.go deleted file mode 100644 index 0f9ca0c568..0000000000 --- a/x/cronos/types/tracer.go +++ /dev/null @@ -1,23 +0,0 @@ -package types - -import ( - "math/big" - "time" - - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" -) - -type DummyTracer struct{} - -func NewDummyTracer() *DummyTracer { - return &DummyTracer{} -} - -func (dt DummyTracer) CaptureStart(env *vm.EVM, from common.Address, to common.Address, create bool, input []byte, gas uint64, value *big.Int) { -} -func (dt DummyTracer) CaptureState(env *vm.EVM, pc uint64, op vm.OpCode, gas, cost uint64, scope *vm.ScopeContext, rData []byte, depth int, err error) { -} -func (dt DummyTracer) CaptureFault(env *vm.EVM, pc uint64, op vm.OpCode, gas, cost uint64, scope *vm.ScopeContext, depth int, err error) { -} -func (dt DummyTracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) {} From 90f64d45c2addedf94c3ff4cff5f7aa13b8e033a Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 11 Oct 2021 14:54:13 +0800 Subject: [PATCH 2/7] try again --- go.mod | 4 ++-- go.sum | 8 ++++---- gomod2nix.toml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 6157f6668e..445d88b12f 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tendermint/tendermint v0.34.13 github.com/tendermint/tm-db v0.6.4 - github.com/tharsis/ethermint v0.6.1-0.20211005160855-202bc5f1cd2e - google.golang.org/genproto v0.0.0-20211001223012-bfb93cce50d9 + github.com/tharsis/ethermint v0.6.1-0.20211008133842-e9ab6241db41 + google.golang.org/genproto v0.0.0-20211007155348-82e027067bd4 google.golang.org/grpc v1.41.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index ac8123fd1d..26654706b9 100644 --- a/go.sum +++ b/go.sum @@ -1160,8 +1160,8 @@ github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/tharsis/ethermint v0.6.1-0.20211005160855-202bc5f1cd2e h1:ta7ZvfQws+A5aCRDNetj0bHPUE//eelmTleS4bimSpI= -github.com/tharsis/ethermint v0.6.1-0.20211005160855-202bc5f1cd2e/go.mod h1:iFpWRSHH5UmbHTyMkRpulMQakLtA4DM2UEAGbGgbZ3I= +github.com/tharsis/ethermint v0.6.1-0.20211008133842-e9ab6241db41 h1:wyL2PQVPgdFQZTzML0MVTyYFQTWBgURjxfVnKF/3Chg= +github.com/tharsis/ethermint v0.6.1-0.20211008133842-e9ab6241db41/go.mod h1:y1AeS88om0/IfdHqjA8F82eM/dSX5i9GBnrQjRMTLdI= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -1747,8 +1747,8 @@ google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKr google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20211001223012-bfb93cce50d9 h1:eF1wcrhdz56Vugf8qNX5dD93ItkrhothojQyHXqloe0= -google.golang.org/genproto v0.0.0-20211001223012-bfb93cce50d9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211007155348-82e027067bd4 h1:YXPV/eKW0ZWRdB5tyI6aPoaa2Wxb4OSlFrTREMdwn64= +google.golang.org/genproto v0.0.0-20211007155348-82e027067bd4/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/gomod2nix.toml b/gomod2nix.toml index 0750bbb551..dfb1832b1e 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -4569,12 +4569,12 @@ sha256 = "1kmdk3v2a6ygcg2i8jfgz61yzxi4183xgzlaviq9jwsqwc2hj60w" ["github.com/tharsis/ethermint"] - sumVersion = "v0.6.1-0.20211005160855-202bc5f1cd2e" + sumVersion = "v0.6.1-0.20211008133842-e9ab6241db41" ["github.com/tharsis/ethermint".fetch] type = "git" url = "https://github.com/tharsis/ethermint" - rev = "202bc5f1cd2e7c9e44a9cd6a722dd26abd5955ad" - sha256 = "1jkvvgzl9a8mhpn4833l3jmw4q1spgrzkclj2ws1gb58zss1f0vm" + rev = "e9ab6241db4177a1fdd0a80c6fa21a6c3dcecffb" + sha256 = "0jwbj5chz1d3m6hy3wyy75nrmqsx727rsgf5x95kgm0nfm1y5al7" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7" @@ -5181,12 +5181,12 @@ sha256 = "1wkipg7xxc0ha5p6c3bj0vpgq38l18441n5l6zxdhx0gzvz5z1hs" ["google.golang.org/genproto"] - sumVersion = "v0.0.0-20211001223012-bfb93cce50d9" + sumVersion = "v0.0.0-20211007155348-82e027067bd4" ["google.golang.org/genproto".fetch] type = "git" url = "https://github.com/googleapis/go-genproto" - rev = "bfb93cce50d9212d8edd323d18cf616ab983e277" - sha256 = "0p6w5k8jhd0kixbkl2brgl7a64g526iq8a3s3kz7zs61d75w1f6w" + rev = "82e027067bd47cd3a8625f101795b0bf298cba9c" + sha256 = "0dn0nq6f2l3yzpaaxgp3yxrz99cglxpknr3r75ryk76m9jdys2mv" ["google.golang.org/grpc"] sumVersion = "v1.33.2" From a33391e6c8b17e22805e41f3b18024f22efbe493 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 11 Oct 2021 20:05:42 +0800 Subject: [PATCH 3/7] disable london hardfork --- integration_tests/configs/disable_auto_deployment.yaml | 2 ++ integration_tests/test_basic.py | 2 +- scripts/cronos-devnet.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/integration_tests/configs/disable_auto_deployment.yaml b/integration_tests/configs/disable_auto_deployment.yaml index c5d3bb1df1..f5de87af90 100644 --- a/integration_tests/configs/disable_auto_deployment.yaml +++ b/integration_tests/configs/disable_auto_deployment.yaml @@ -21,6 +21,8 @@ cronos_777-1: evm: params: evm_denom: basetcro + chain_config: + london_block: "9223372036854775808" cronos: params: cronos_admin: crc12luku6uxehhak02py4rcz65zu0swh7wjsrw0pp diff --git a/integration_tests/test_basic.py b/integration_tests/test_basic.py index 10e849459e..1356467f0f 100644 --- a/integration_tests/test_basic.py +++ b/integration_tests/test_basic.py @@ -55,7 +55,7 @@ def test_events(cluster, suspend_capture): def test_minimal_gas_price(cronos): w3 = cronos.w3 gas_price = w3.eth.gas_price - assert gas_price == 5000000000000 + assert gas_price == 5001000000000 tx = { "to": "0x0000000000000000000000000000000000000000", "value": 10000, diff --git a/scripts/cronos-devnet.yaml b/scripts/cronos-devnet.yaml index 9ebc583ea9..e34789edd7 100644 --- a/scripts/cronos-devnet.yaml +++ b/scripts/cronos-devnet.yaml @@ -26,6 +26,8 @@ cronos_777-1: evm: params: evm_denom: basetcro + chain_config: + london_block: "9223372036854775808" cronos: params: cronos_admin: crc12luku6uxehhak02py4rcz65zu0swh7wjsrw0pp From f7a5edb5c9b3154fe027011558a1ff5e93098371 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 11 Oct 2021 21:13:33 +0800 Subject: [PATCH 4/7] increase gas price --- integration_tests/cosmoscli.py | 2 +- integration_tests/test_gravity.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py index 1518a7b0f2..317cd5f968 100644 --- a/integration_tests/cosmoscli.py +++ b/integration_tests/cosmoscli.py @@ -7,7 +7,7 @@ from dateutil.parser import isoparse from pystarport.utils import build_cli_args_safe, format_doc_string, interact -DEFAULT_GAS_PRICE = "5000000000000basetcro" +DEFAULT_GAS_PRICE = "5001000000000basetcro" class ModuleAccount(enum.Enum): diff --git a/integration_tests/test_gravity.py b/integration_tests/test_gravity.py index f5a5493fa2..d7a644a457 100644 --- a/integration_tests/test_gravity.py +++ b/integration_tests/test_gravity.py @@ -55,7 +55,7 @@ def gorc_config(keystore, gravity_contract, eth_rpc, cosmos_grpc, metrics_listen }, "cosmos": { "gas_price": { - "amount": 5000000000000, + "amount": 5001000000000, "denom": "basetcro", }, "grpc": cosmos_grpc, From 399fea698336c0bc37790fea3bf8f160ee0acf99 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Tue, 12 Oct 2021 10:12:45 +0800 Subject: [PATCH 5/7] fix nil pointer panic --- go.mod | 2 ++ go.sum | 4 ++-- gomod2nix.toml | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 445d88b12f..bb3db44cc4 100644 --- a/go.mod +++ b/go.mod @@ -40,3 +40,5 @@ replace github.com/cosmos/ibc-go => github.com/crypto-org-chain/ibc-go v1.2.1-ho replace github.com/peggyjv/gravity-bridge/module => github.com/crypto-org-chain/gravity-bridge/module v0.1.22-0.20211011065300-a09cf050d304 replace github.com/cosmos/iavl => github.com/cosmos/iavl v0.17.1 + +replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.4.2-0.20211012020956-6c537e87c727 diff --git a/go.sum b/go.sum index 26654706b9..18ab70370e 100644 --- a/go.sum +++ b/go.sum @@ -259,6 +259,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/crypto-org-chain/ethermint v0.4.2-0.20211012020956-6c537e87c727 h1:9MuZPjHvTTvRk1GThHyobTtr943Px59McQOBU0VDIuk= +github.com/crypto-org-chain/ethermint v0.4.2-0.20211012020956-6c537e87c727/go.mod h1:y1AeS88om0/IfdHqjA8F82eM/dSX5i9GBnrQjRMTLdI= github.com/crypto-org-chain/gravity-bridge/module v0.1.22-0.20211011065300-a09cf050d304 h1:5A6pzj5uQPQCCO96SqsCCoar/DfjOxIdadBHX3ncotU= github.com/crypto-org-chain/gravity-bridge/module v0.1.22-0.20211011065300-a09cf050d304/go.mod h1:7sqblrhSS7+I94DDIWz98N2mcXR5hL7f+EaV054sBMQ= github.com/crypto-org-chain/ibc-go v1.2.1-hooks h1:wuWaQqm/TFKJQwuFgjCPiPumQio+Yik5Z1DObDExrrU= @@ -1160,8 +1162,6 @@ github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/tharsis/ethermint v0.6.1-0.20211008133842-e9ab6241db41 h1:wyL2PQVPgdFQZTzML0MVTyYFQTWBgURjxfVnKF/3Chg= -github.com/tharsis/ethermint v0.6.1-0.20211008133842-e9ab6241db41/go.mod h1:y1AeS88om0/IfdHqjA8F82eM/dSX5i9GBnrQjRMTLdI= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= diff --git a/gomod2nix.toml b/gomod2nix.toml index dfb1832b1e..dcb562cda1 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -4569,12 +4569,13 @@ sha256 = "1kmdk3v2a6ygcg2i8jfgz61yzxi4183xgzlaviq9jwsqwc2hj60w" ["github.com/tharsis/ethermint"] - sumVersion = "v0.6.1-0.20211008133842-e9ab6241db41" + sumVersion = "v0.4.2-0.20211012020956-6c537e87c727" + vendorPath = "github.com/crypto-org-chain/ethermint" ["github.com/tharsis/ethermint".fetch] type = "git" - url = "https://github.com/tharsis/ethermint" - rev = "e9ab6241db4177a1fdd0a80c6fa21a6c3dcecffb" - sha256 = "0jwbj5chz1d3m6hy3wyy75nrmqsx727rsgf5x95kgm0nfm1y5al7" + url = "https://github.com/crypto-org-chain/ethermint" + rev = "6c537e87c7278d9eb6c1719e42644886ddef50c5" + sha256 = "0zjxpv87sl5l70zffcygm0c6qv3b0k88gd413rmks220iqfqssf7" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7" From c1dd9f43a5f1977334420a41057454aad564549c Mon Sep 17 00:00:00 2001 From: yihuang Date: Tue, 12 Oct 2021 11:28:47 +0800 Subject: [PATCH 6/7] Update go.mod --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index bb3db44cc4..ffe9db9b6d 100644 --- a/go.mod +++ b/go.mod @@ -41,4 +41,5 @@ replace github.com/peggyjv/gravity-bridge/module => github.com/crypto-org-chain/ replace github.com/cosmos/iavl => github.com/cosmos/iavl v0.17.1 +// FIXME: https://github.com/crypto-org-chain/ethermint/tree/nil-tracer replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.4.2-0.20211012020956-6c537e87c727 From 30ed5dc20106822f38119483a2f9cd67e8780c7c Mon Sep 17 00:00:00 2001 From: HuangYi Date: Tue, 12 Oct 2021 11:59:01 +0800 Subject: [PATCH 7/7] changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0565eb3e85..88a32038ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,12 @@ - [cronos#144](https://github.com/crypto-org-chain/cronos/pull/144) fix events in autodeploy crc20 module contract - [gravity-bridge#17](https://github.com/crypto-org-chain/gravity-bridge/pull/17) processEthereumEvent does not persist hooks emitted event - [gravity-bridge#20](https://github.com/crypto-org-chain/gravity-bridge/pull/20) fix undeterministic in consensus +- [ethermint#620](https://github.com/tharsis/ethermint/pull/620) Add fee market field to EVM `Keeper` and `AnteHandler`. +- [ethermint#231](https://github.com/tharsis/ethermint/pull/231) Bump go-ethereum version to [`v1.10.9`](https://github.com/ethereum/go-ethereum/releases/tag/v1.10.9) ### Improvements - [cronos#162](https://github.com/crypto-org-chain/cronos/pull/162) bump ibc-go to v1.2.1 with hooks support -- [cronos#143](https://github.com/crypto-org-chain/cronos/pull/143) update go-ethereum to 1.10.9 and add fee market - module. +- [cronos#143](https://github.com/crypto-org-chain/cronos/pull/143) update ethermint dependency *October 4, 2021* ## v0.5.5