diff --git a/agents/agents/notary/notary.go b/agents/agents/notary/notary.go index 38692d1e32..5009375dda 100644 --- a/agents/agents/notary/notary.go +++ b/agents/agents/notary/notary.go @@ -21,7 +21,7 @@ type Notary struct { } // RefreshInterval is how long to wait before refreshing. -//TODO: This should be done in config. +// TODO: This should be done in config. var RefreshInterval = 1 * time.Second // NewNotary creates a new notary. diff --git a/agents/agents/notary/producer.go b/agents/agents/notary/producer.go index 40c7474cdf..c643336603 100644 --- a/agents/agents/notary/producer.go +++ b/agents/agents/notary/producer.go @@ -8,8 +8,8 @@ import ( "github.com/synapsecns/sanguine/agents/db" "github.com/synapsecns/sanguine/agents/domains" "github.com/synapsecns/sanguine/agents/types" + "github.com/synapsecns/sanguine/core" "github.com/synapsecns/sanguine/ethergo/signer/signer" - "github.com/synapsecns/synapse-node/contracts/bridge" "time" ) @@ -65,7 +65,7 @@ func (a AttestationProducer) FindLatestNonce(ctx context.Context) (nonce uint32, } // update runs the update producer to produce an update. -//nolint: cyclop +// nolint: cyclop func (a AttestationProducer) update(ctx context.Context) error { latestNonce, err := a.FindLatestNonce(ctx) if err != nil { @@ -105,7 +105,7 @@ func (a AttestationProducer) update(ctx context.Context) error { if err != nil { return fmt.Errorf("could not hash update: %w", err) } - signature, err := a.signer.SignMessage(ctx, bridge.KappaToSlice(hashedUpdate), false) + signature, err := a.signer.SignMessage(ctx, core.BytesToSlice(hashedUpdate), false) if err != nil { return fmt.Errorf("could not sign message: %w", err) } diff --git a/agents/agents/notary/suite_test.go b/agents/agents/notary/suite_test.go index 3ea8c63b27..18f23cf973 100644 --- a/agents/agents/notary/suite_test.go +++ b/agents/agents/notary/suite_test.go @@ -12,13 +12,13 @@ import ( "github.com/synapsecns/sanguine/agents/domains/evm" "github.com/synapsecns/sanguine/agents/testutil" "github.com/synapsecns/sanguine/agents/types" + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/preset" "github.com/synapsecns/sanguine/ethergo/signer/signer" "github.com/synapsecns/sanguine/ethergo/signer/signer/localsigner" "github.com/synapsecns/sanguine/ethergo/signer/wallet" "github.com/synapsecns/synapse-node/pkg/chainwatcher" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/preset" "math/big" "testing" "time" @@ -26,7 +26,7 @@ import ( // NotarySuite tests the notary agent. type NotarySuite struct { - *testutils.TestSuite + *testsuite.TestSuite testBackend backends.TestBackend deployManager *testutil.DeployManager originContract *origin.OriginRef @@ -42,7 +42,7 @@ func NewNotarySuite(tb testing.TB) *NotarySuite { tb.Helper() return &NotarySuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/config/signer.go b/agents/config/signer.go index b56a7e8a6a..aab8d5998d 100644 --- a/agents/config/signer.go +++ b/agents/config/signer.go @@ -40,6 +40,7 @@ func (s SignerConfig) IsValid(_ context.Context) (ok bool, err error) { var ErrUnsupportedSignerType = errors.New("unsupported signer type") // SignerType is the signer type +// //go:generate go run golang.org/x/tools/cmd/stringer -type=SignerType -linecomment type SignerType int diff --git a/agents/config/suite_test.go b/agents/config/suite_test.go index ec19c7107e..87735e86eb 100644 --- a/agents/config/suite_test.go +++ b/agents/config/suite_test.go @@ -2,20 +2,20 @@ package config_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) // ConfigSuite is the config test suite. type ConfigSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewConfigSuite creates a end-to-end test suite. func NewConfigSuite(tb testing.TB) *ConfigSuite { tb.Helper() return &ConfigSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/contracts/attestationcollector/attestationcollector.metadata.go b/agents/contracts/attestationcollector/attestationcollector.metadata.go index d56ec8fa9f..db5af2b178 100644 --- a/agents/contracts/attestationcollector/attestationcollector.metadata.go +++ b/agents/contracts/attestationcollector/attestationcollector.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed attestationcollector.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/attestationcollector/attestationcollector_test.go b/agents/contracts/attestationcollector/attestationcollector_test.go index d4cfd1c01a..a843224581 100644 --- a/agents/contracts/attestationcollector/attestationcollector_test.go +++ b/agents/contracts/attestationcollector/attestationcollector_test.go @@ -3,6 +3,7 @@ package attestationcollector_test import ( "context" "fmt" + "github.com/synapsecns/sanguine/core" "math/big" "time" @@ -13,7 +14,6 @@ import ( "github.com/synapsecns/sanguine/agents/agents/notary" "github.com/synapsecns/sanguine/agents/contracts/attestationcollector" "github.com/synapsecns/sanguine/agents/types" - "github.com/synapsecns/synapse-node/contracts/bridge" ) func (a AttestationCollectorSuite) TestAttestationCollectorSuite() { @@ -43,7 +43,7 @@ func (a AttestationCollectorSuite) TestAttestationCollectorSuite() { hashedAttestation, err := notary.HashAttestation(unsignedAttestation) Nil(a.T(), err) - signature, err := a.signer.SignMessage(a.GetTestContext(), bridge.KappaToSlice(hashedAttestation), false) + signature, err := a.signer.SignMessage(a.GetTestContext(), core.BytesToSlice(hashedAttestation), false) Nil(a.T(), err) signedAttestation := types.NewSignedAttestation(unsignedAttestation, signature) diff --git a/agents/contracts/attestationcollector/helpers.go b/agents/contracts/attestationcollector/helpers.go index 8cc8f58641..2dd60dbba9 100644 --- a/agents/contracts/attestationcollector/helpers.go +++ b/agents/contracts/attestationcollector/helpers.go @@ -7,7 +7,7 @@ import ( ) // AttestationCollectorRef is a bound attestatoin collector contract that returns the address of the attestation collector contract. -//nolint: golint +// nolint: golint type AttestationCollectorRef struct { *AttestationCollector address common.Address diff --git a/agents/contracts/attestationcollector/parser.go b/agents/contracts/attestationcollector/parser.go index 8bbaf7930a..8c2ae879c9 100644 --- a/agents/contracts/attestationcollector/parser.go +++ b/agents/contracts/attestationcollector/parser.go @@ -66,6 +66,7 @@ func (p parserImpl) ParseAttestationSubmitted(log ethTypes.Log) (_ types.Attesta } // EventType is the type of the attestation collector events +// //go:generate go run golang.org/x/tools/cmd/stringer -type=EventType type EventType uint diff --git a/agents/contracts/attestationcollector/suite_test.go b/agents/contracts/attestationcollector/suite_test.go index 3c790be00c..5f050dff54 100644 --- a/agents/contracts/attestationcollector/suite_test.go +++ b/agents/contracts/attestationcollector/suite_test.go @@ -1,6 +1,8 @@ package attestationcollector_test import ( + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/contracts" "math/big" "testing" @@ -12,23 +14,22 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/origin" "github.com/synapsecns/sanguine/agents/contracts/test/attestationharness" "github.com/synapsecns/sanguine/agents/testutil" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/preset" "github.com/synapsecns/sanguine/ethergo/signer/signer" "github.com/synapsecns/sanguine/ethergo/signer/signer/localsigner" "github.com/synapsecns/sanguine/ethergo/signer/wallet" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/preset" ) // AttestationCollectorSuite is the attestation collector test suite. type AttestationCollectorSuite struct { - *testutils.TestSuite + *testsuite.TestSuite originContract *origin.OriginRef destinationContract *destination.DestinationRef - destinationContractMetadata backends.DeployedContract + destinationContractMetadata contracts.DeployedContract attestationHarness *attestationharness.AttestationHarnessRef attestationContract *attestationcollector.AttestationCollectorRef - attestationContractMetadata backends.DeployedContract + attestationContractMetadata contracts.DeployedContract testBackendOrigin backends.SimulatedTestBackend testBackendDestination backends.SimulatedTestBackend wallet wallet.Wallet @@ -39,7 +40,7 @@ type AttestationCollectorSuite struct { func NewAttestationCollectorSuite(tb testing.TB) *AttestationCollectorSuite { tb.Helper() return &AttestationCollectorSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/contracts/destination/destination.metadata.go b/agents/contracts/destination/destination.metadata.go index a3f170f4b9..0209375ff5 100644 --- a/agents/contracts/destination/destination.metadata.go +++ b/agents/contracts/destination/destination.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed destination.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/destination/destination_test.go b/agents/contracts/destination/destination_test.go index 079b1dea80..4b9bcace8b 100644 --- a/agents/contracts/destination/destination_test.go +++ b/agents/contracts/destination/destination_test.go @@ -3,6 +3,7 @@ package destination_test import ( "context" "fmt" + "github.com/synapsecns/sanguine/core" "math/big" "time" @@ -13,7 +14,6 @@ import ( "github.com/synapsecns/sanguine/agents/agents/notary" "github.com/synapsecns/sanguine/agents/contracts/destination" "github.com/synapsecns/sanguine/agents/types" - "github.com/synapsecns/synapse-node/contracts/bridge" ) func (d DestinationSuite) TestDestinationSuite() { @@ -42,7 +42,7 @@ func (d DestinationSuite) TestDestinationSuite() { hashedAttestation, err := notary.HashAttestation(unsignedAttestation) Nil(d.T(), err) - signature, err := d.signer.SignMessage(d.GetTestContext(), bridge.KappaToSlice(hashedAttestation), false) + signature, err := d.signer.SignMessage(d.GetTestContext(), core.BytesToSlice(hashedAttestation), false) Nil(d.T(), err) signedAttestation := types.NewSignedAttestation(unsignedAttestation, signature) diff --git a/agents/contracts/destination/helpers.go b/agents/contracts/destination/helpers.go index 7271fdd359..7c640ab58a 100644 --- a/agents/contracts/destination/helpers.go +++ b/agents/contracts/destination/helpers.go @@ -7,7 +7,7 @@ import ( ) // DestinationRef is a bound destination contract that returns the address of the destination contract. -//nolint: golint +// nolint: golint type DestinationRef struct { *Destination address common.Address diff --git a/agents/contracts/destination/parser.go b/agents/contracts/destination/parser.go index c9e1cccb09..ce44fd271d 100644 --- a/agents/contracts/destination/parser.go +++ b/agents/contracts/destination/parser.go @@ -61,6 +61,7 @@ func (p parserImpl) ParseAttestationAccepted(log ethTypes.Log) (_ types.Attestat } // EventType is the type of the destination event +// //go:generate go run golang.org/x/tools/cmd/stringer -type=EventType type EventType uint diff --git a/agents/contracts/destination/suite_test.go b/agents/contracts/destination/suite_test.go index 66a7a76fbd..fab51eb563 100644 --- a/agents/contracts/destination/suite_test.go +++ b/agents/contracts/destination/suite_test.go @@ -1,6 +1,8 @@ package destination_test import ( + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/contracts" "math/big" "testing" @@ -11,20 +13,19 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/origin" "github.com/synapsecns/sanguine/agents/contracts/test/attestationharness" "github.com/synapsecns/sanguine/agents/testutil" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/preset" "github.com/synapsecns/sanguine/ethergo/signer/signer" "github.com/synapsecns/sanguine/ethergo/signer/signer/localsigner" "github.com/synapsecns/sanguine/ethergo/signer/wallet" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/preset" ) // DestinationSuite is the destination test suite. type DestinationSuite struct { - *testutils.TestSuite + *testsuite.TestSuite originContract *origin.OriginRef destinationContract *destination.DestinationRef - destinationContractMetadata backends.DeployedContract + destinationContractMetadata contracts.DeployedContract attestationHarness *attestationharness.AttestationHarnessRef testBackendOrigin backends.SimulatedTestBackend testBackendDestination backends.SimulatedTestBackend @@ -36,7 +37,7 @@ type DestinationSuite struct { func NewDestinationSuite(tb testing.TB) *DestinationSuite { tb.Helper() return &DestinationSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/contracts/notarymanager/helpers.go b/agents/contracts/notarymanager/helpers.go index d8b5d26e31..ebd7cce536 100644 --- a/agents/contracts/notarymanager/helpers.go +++ b/agents/contracts/notarymanager/helpers.go @@ -6,7 +6,7 @@ import ( ) // NotaryManagerRef is a bound update manager that returns the address of the contract -//nolint: golint +// nolint: golint type NotaryManagerRef struct { *NotaryManager address common.Address diff --git a/agents/contracts/notarymanager/notarymanager.metadata.go b/agents/contracts/notarymanager/notarymanager.metadata.go index 9952f7d79c..c1c4e0e727 100644 --- a/agents/contracts/notarymanager/notarymanager.metadata.go +++ b/agents/contracts/notarymanager/notarymanager.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed notarymanager.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/origin/helpers.go b/agents/contracts/origin/helpers.go index 46d527f3fb..32ffd72df0 100644 --- a/agents/contracts/origin/helpers.go +++ b/agents/contracts/origin/helpers.go @@ -8,7 +8,7 @@ import ( ) // OriginRef is a bound origin contract that returns the address of the contract. -//nolint: golint +// nolint: golint type OriginRef struct { *Origin address common.Address diff --git a/agents/contracts/origin/origin.metadata.go b/agents/contracts/origin/origin.metadata.go index 3ebe1f84e1..1d06a22cc9 100644 --- a/agents/contracts/origin/origin.metadata.go +++ b/agents/contracts/origin/origin.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed origin.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/origin/parser.go b/agents/contracts/origin/parser.go index d6c5bd57b6..26fe0c82be 100644 --- a/agents/contracts/origin/parser.go +++ b/agents/contracts/origin/parser.go @@ -59,6 +59,7 @@ func (p parserImpl) ParseDispatch(log ethTypes.Log) (_ types.CommittedMessage, o } // EventType is the type of the origin event +// //go:generate go run golang.org/x/tools/cmd/stringer -type=EventType type EventType uint diff --git a/agents/contracts/origin/suite_test.go b/agents/contracts/origin/suite_test.go index 70e7efd486..d50735baf2 100644 --- a/agents/contracts/origin/suite_test.go +++ b/agents/contracts/origin/suite_test.go @@ -4,15 +4,15 @@ import ( "github.com/stretchr/testify/suite" "github.com/synapsecns/sanguine/agents/contracts/origin" "github.com/synapsecns/sanguine/agents/testutil" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "testing" ) // OriginSuite is the origin test suite. type OriginSuite struct { - *testutils.TestSuite + *testsuite.TestSuite originContract *origin.OriginRef testBackend backends.SimulatedTestBackend } @@ -21,7 +21,7 @@ type OriginSuite struct { func NewOriginSuite(tb testing.TB) *OriginSuite { tb.Helper() return &OriginSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/contracts/test/attestationharness/attestationharness.metadata.go b/agents/contracts/test/attestationharness/attestationharness.metadata.go index 99e636babf..c91a330848 100644 --- a/agents/contracts/test/attestationharness/attestationharness.metadata.go +++ b/agents/contracts/test/attestationharness/attestationharness.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed attestationharness.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/test/attestationharness/helpers.go b/agents/contracts/test/attestationharness/helpers.go index be2c2747e3..5b1dc955aa 100644 --- a/agents/contracts/test/attestationharness/helpers.go +++ b/agents/contracts/test/attestationharness/helpers.go @@ -9,7 +9,7 @@ import ( ) // AttestationHarnessRef is an attestation harness reference -//nolint: golint +// nolint: golint type AttestationHarnessRef struct { *AttestationHarness address common.Address diff --git a/agents/contracts/test/destinationharness/destinationharness.metadata.go b/agents/contracts/test/destinationharness/destinationharness.metadata.go index e4d962983c..9768fccf32 100644 --- a/agents/contracts/test/destinationharness/destinationharness.metadata.go +++ b/agents/contracts/test/destinationharness/destinationharness.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed destinationharness.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/test/destinationharness/helpers.go b/agents/contracts/test/destinationharness/helpers.go index 2494742dbb..281c4ee70c 100644 --- a/agents/contracts/test/destinationharness/helpers.go +++ b/agents/contracts/test/destinationharness/helpers.go @@ -9,7 +9,7 @@ import ( ) // DestinationHarnessRef is a destination harness reference -//nolint: golint +// nolint: golint type DestinationHarnessRef struct { *DestinationHarness address common.Address diff --git a/agents/contracts/test/headerharness/headerharness.metadata.go b/agents/contracts/test/headerharness/headerharness.metadata.go index 0e6f433622..258a09f51c 100644 --- a/agents/contracts/test/headerharness/headerharness.metadata.go +++ b/agents/contracts/test/headerharness/headerharness.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed headerharness.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/test/headerharness/helpers.go b/agents/contracts/test/headerharness/helpers.go index fc28739a51..a72c56c5b5 100644 --- a/agents/contracts/test/headerharness/helpers.go +++ b/agents/contracts/test/headerharness/helpers.go @@ -8,7 +8,7 @@ import ( ) // HeaderHarnessRef is a header harness reference -//nolint: golint +// nolint: golint type HeaderHarnessRef struct { *HeaderHarness address common.Address diff --git a/agents/contracts/test/messageharness/helpers.go b/agents/contracts/test/messageharness/helpers.go index d0594632bb..dd1e14dae1 100644 --- a/agents/contracts/test/messageharness/helpers.go +++ b/agents/contracts/test/messageharness/helpers.go @@ -8,7 +8,7 @@ import ( ) // MessageHarnessRef is a message harness reference -//nolint: golint +// nolint: golint type MessageHarnessRef struct { *MessageHarness address common.Address diff --git a/agents/contracts/test/messageharness/messageharness.metadata.go b/agents/contracts/test/messageharness/messageharness.metadata.go index f36b545915..0a0dbff6eb 100644 --- a/agents/contracts/test/messageharness/messageharness.metadata.go +++ b/agents/contracts/test/messageharness/messageharness.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed messageharness.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/test/originharness/helpers.go b/agents/contracts/test/originharness/helpers.go index d8155e787f..219cd867d6 100644 --- a/agents/contracts/test/originharness/helpers.go +++ b/agents/contracts/test/originharness/helpers.go @@ -8,7 +8,7 @@ import ( ) // OriginHarnessRef is a origin harness reference -//nolint: golint +// nolint: golint type OriginHarnessRef struct { *OriginHarness address common.Address diff --git a/agents/contracts/test/originharness/originharness.metadata.go b/agents/contracts/test/originharness/originharness.metadata.go index 2edd27ada7..f706dd6ae5 100644 --- a/agents/contracts/test/originharness/originharness.metadata.go +++ b/agents/contracts/test/originharness/originharness.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed originharness.contractinfo.json var rawContracts []byte diff --git a/agents/contracts/test/tipsharness/helpers.go b/agents/contracts/test/tipsharness/helpers.go index 344059ee10..8e13c52842 100644 --- a/agents/contracts/test/tipsharness/helpers.go +++ b/agents/contracts/test/tipsharness/helpers.go @@ -8,7 +8,7 @@ import ( ) // TipsHarnessRef is a tips harness reference -//nolint: golint +// nolint: golint type TipsHarnessRef struct { *TipsHarness address common.Address diff --git a/agents/contracts/test/tipsharness/tipsharness.metadata.go b/agents/contracts/test/tipsharness/tipsharness.metadata.go index a217ab3f4d..2c8140bbcd 100644 --- a/agents/contracts/test/tipsharness/tipsharness.metadata.go +++ b/agents/contracts/test/tipsharness/tipsharness.metadata.go @@ -8,6 +8,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed tipsharness.contractinfo.json var rawContracts []byte diff --git a/agents/db/datastore/sql/base/attestation.go b/agents/db/datastore/sql/base/attestation.go index c141f36c19..9ba48d2c13 100644 --- a/agents/db/datastore/sql/base/attestation.go +++ b/agents/db/datastore/sql/base/attestation.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/synapsecns/sanguine/agents/db" "github.com/synapsecns/sanguine/agents/types" - "github.com/synapsecns/synapse-node/contracts/bridge" + "github.com/synapsecns/sanguine/core" "gorm.io/gorm" "gorm.io/gorm/clause" ) @@ -24,7 +24,7 @@ func (s Store) StoreSignedAttestations(ctx context.Context, attestation types.Si }).Create(&SignedAttestation{ SADomain: attestation.Attestation().Domain(), SANonce: attestation.Attestation().Nonce(), - SARoot: bridge.KappaToSlice(attestation.Attestation().Root()), + SARoot: core.BytesToSlice(attestation.Attestation().Root()), SASignature: sig, }) diff --git a/agents/db/datastore/sql/base/model.go b/agents/db/datastore/sql/base/model.go index 1ae511af6b..d2f4374863 100644 --- a/agents/db/datastore/sql/base/model.go +++ b/agents/db/datastore/sql/base/model.go @@ -261,7 +261,7 @@ func (s SignedAttestation) Attestation() types.Attestation { } // Signature gets the signature of the signed attestation -//note: this is the only accessor method that can fail on decoding +// note: this is the only accessor method that can fail on decoding func (s SignedAttestation) Signature() types.Signature { res, err := types.DecodeSignature(s.SASignature) if err != nil { diff --git a/agents/db/datastore/sql/base/model_test.go b/agents/db/datastore/sql/base/model_test.go index 60a06cfc24..786396c322 100644 --- a/agents/db/datastore/sql/base/model_test.go +++ b/agents/db/datastore/sql/base/model_test.go @@ -6,7 +6,7 @@ import ( . "github.com/stretchr/testify/assert" "github.com/synapsecns/sanguine/agents/db/datastore/sql/base" "github.com/synapsecns/sanguine/agents/types" - "github.com/synapsecns/synapse-node/contracts/bridge" + "github.com/synapsecns/sanguine/core" "math/big" "testing" ) @@ -45,7 +45,7 @@ func TestCommittedMessageAccessors(t *testing.T) { Equal(t, cm.OptimisticSeconds(), cm.CMOptimisticSeconds) Equal(t, cm.LeafIndex(), cm.CMLeafIndex) Equal(t, cm.Message(), cm.CMMessage) - Equal(t, bridge.KappaToSlice(cm.Leaf()), cm.CMLeaf) + Equal(t, core.BytesToSlice(cm.Leaf()), cm.CMLeaf) Equal(t, cm.CMProverTip, cm.Tips().ProverTip().Bytes()) Equal(t, cm.CMExecutorTip, cm.Tips().ExecutorTip().Bytes()) @@ -66,7 +66,7 @@ func TestSignedAttestation(t *testing.T) { SASignature: rawSig, } - Equal(t, bridge.KappaToSlice(sa.Attestation().Root()), sa.SARoot) + Equal(t, core.BytesToSlice(sa.Attestation().Root()), sa.SARoot) Equal(t, sa.Attestation().Domain(), sa.SADomain) Equal(t, sa.Attestation().Nonce(), sa.SANonce) Equal(t, sa.Signature().V(), sig.V()) diff --git a/agents/db/datastore/sql/base/suite_test.go b/agents/db/datastore/sql/base/suite_test.go index ba22ec34ab..8c079147da 100644 --- a/agents/db/datastore/sql/base/suite_test.go +++ b/agents/db/datastore/sql/base/suite_test.go @@ -2,7 +2,7 @@ package base_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) @@ -11,13 +11,13 @@ import ( // db package. this is made for testing sql/gorm implementation specific // cases. type SQLSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewDBSuite creates a new chain testing suite. func NewSQLSuite(tb testing.TB) *SQLSuite { tb.Helper() - return &SQLSuite{TestSuite: testutils.NewTestSuite(tb)} + return &SQLSuite{TestSuite: testsuite.NewTestSuite(tb)} } func TestSqlSuite(t *testing.T) { diff --git a/agents/db/datastore/sql/base/txqueue.go b/agents/db/datastore/sql/base/txqueue.go index ee93a78809..b742798595 100644 --- a/agents/db/datastore/sql/base/txqueue.go +++ b/agents/db/datastore/sql/base/txqueue.go @@ -28,7 +28,7 @@ func (s Store) DB() *gorm.DB { } // GetAllModels gets all models to migrate -//see: https://medium.com/@SaifAbid/slice-interfaces-8c78f8b6345d for an explanation of why we can't do this at initialization time +// see: https://medium.com/@SaifAbid/slice-interfaces-8c78f8b6345d for an explanation of why we can't do this at initialization time func GetAllModels() (allModels []interface{}) { allModels = append(allModels, &RawEthTX{}, &ProcessedEthTx{}, &BlockEndModel{}, &CommittedMessage{}, &SignedAttestation{}, &DispatchMessage{}, &AcceptedAttestation{}) diff --git a/agents/db/datastore/sql/store.go b/agents/db/datastore/sql/store.go index 9232512683..ab58d0decb 100644 --- a/agents/db/datastore/sql/store.go +++ b/agents/db/datastore/sql/store.go @@ -11,7 +11,7 @@ import ( ) // NewStoreFromConfig creates a new datastore from a config file. -//nolint: wrapcheck +// nolint: wrapcheck func NewStoreFromConfig(ctx context.Context, dbType DBType, connString string) (db.SynapseDB, error) { switch dbType { case Mysql: @@ -24,6 +24,7 @@ func NewStoreFromConfig(ctx context.Context, dbType DBType, connString string) ( } // DBType is the database driver to use. +// //go:generate go run golang.org/x/tools/cmd/stringer -type=DBType -linecomment type DBType int diff --git a/agents/db/message.go b/agents/db/message.go index 08e5062c10..53444d4143 100644 --- a/agents/db/message.go +++ b/agents/db/message.go @@ -10,6 +10,7 @@ import ( ) // TxQueueDB contains an interface for storing transactions currently being processed. +// //go:generate go run github.com/vektra/mockery/v2 --name TxQueueDB --output ./mocks --case=underscore type TxQueueDB interface { // StoreRawTx stores a raw transaction diff --git a/agents/db/suite_test.go b/agents/db/suite_test.go index 796ba308a5..4d676d0550 100644 --- a/agents/db/suite_test.go +++ b/agents/db/suite_test.go @@ -9,8 +9,8 @@ import ( "github.com/synapsecns/sanguine/agents/db" "github.com/synapsecns/sanguine/agents/db/datastore/sql/mysql" "github.com/synapsecns/sanguine/agents/db/datastore/sql/sqlite" + "github.com/synapsecns/sanguine/core/testsuite" "github.com/synapsecns/synapse-node/pkg/common" - "github.com/synapsecns/synapse-node/testutils" "gorm.io/gorm/schema" "os" "sync" @@ -19,7 +19,7 @@ import ( ) type DBSuite struct { - *testutils.TestSuite + *testsuite.TestSuite dbs []db.SynapseDB } @@ -27,7 +27,7 @@ type DBSuite struct { func NewTxQueueSuite(tb testing.TB) *DBSuite { tb.Helper() return &DBSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), dbs: []db.SynapseDB{}, } } diff --git a/agents/db/txqueue_test.go b/agents/db/txqueue_test.go index 5c969571e2..2afc47071a 100644 --- a/agents/db/txqueue_test.go +++ b/agents/db/txqueue_test.go @@ -87,7 +87,7 @@ func (t *DBSuite) TestTxInsertion() { }) } -/// make sure tx doesn't conflict on both chains. +// / make sure tx doesn't conflict on both chains. func (t *DBSuite) TestTxNonceQueryMultiChain() { fakeTx := testTxes[0] fakeTx2 := testTxes[1] diff --git a/agents/domains/evm/collector_test.go b/agents/domains/evm/collector_test.go index 520bad83fd..32342bda33 100644 --- a/agents/domains/evm/collector_test.go +++ b/agents/domains/evm/collector_test.go @@ -7,7 +7,7 @@ import ( "github.com/synapsecns/sanguine/agents/agents/notary" "github.com/synapsecns/sanguine/agents/domains/evm" "github.com/synapsecns/sanguine/agents/types" - "github.com/synapsecns/synapse-node/contracts/bridge" + "github.com/synapsecns/sanguine/core" "math/big" ) @@ -23,7 +23,7 @@ func (i ContractSuite) TestSubmitAttestation() { hashedAttestation, err := notary.HashAttestation(unsignedAttestation) Nil(i.T(), err) - signature, err := i.signer.SignMessage(i.GetTestContext(), bridge.KappaToSlice(hashedAttestation), false) + signature, err := i.signer.SignMessage(i.GetTestContext(), core.BytesToSlice(hashedAttestation), false) Nil(i.T(), err) signedAttestation := types.NewSignedAttestation(unsignedAttestation, signature) diff --git a/agents/domains/evm/queue.go b/agents/domains/evm/queue.go index 9ddddee766..0f05567124 100644 --- a/agents/domains/evm/queue.go +++ b/agents/domains/evm/queue.go @@ -17,8 +17,8 @@ import ( // the transaction queue is thread safe // // Limitations: -// - Once a transaction is submitted to the queue, it cannot be removed. Gas for the transaction is bumped until it is processed -// as a result every call to the transactor is treated as unique. Nonce's passed into the transactor are overridden +// - Once a transaction is submitted to the queue, it cannot be removed. Gas for the transaction is bumped until it is processed +// as a result every call to the transactor is treated as unique. Nonce's passed into the transactor are overridden type TxQueueTransactor struct { // maxGasPrice is the max gas price to bid for a transactiosn inclusion on a particular chain //nolint: structcheck,unused // TODO diff --git a/agents/domains/evm/queue_test.go b/agents/domains/evm/queue_test.go index 73a34872b2..68de304bfb 100644 --- a/agents/domains/evm/queue_test.go +++ b/agents/domains/evm/queue_test.go @@ -11,11 +11,11 @@ import ( "github.com/synapsecns/sanguine/agents/domains/evm" "github.com/synapsecns/sanguine/agents/testutil" "github.com/synapsecns/sanguine/agents/types" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "github.com/synapsecns/sanguine/ethergo/signer/signer/localsigner" signerMocks "github.com/synapsecns/sanguine/ethergo/signer/signer/mocks" "github.com/synapsecns/sanguine/ethergo/signer/wallet" chainMocks "github.com/synapsecns/synapse-node/pkg/evm/mocks" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" "math/big" ) diff --git a/agents/domains/evm/suite_test.go b/agents/domains/evm/suite_test.go index 3c242e01b7..f9befdf78c 100644 --- a/agents/domains/evm/suite_test.go +++ b/agents/domains/evm/suite_test.go @@ -9,13 +9,14 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/origin" "github.com/synapsecns/sanguine/agents/domains/evm" "github.com/synapsecns/sanguine/agents/testutil" + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/preset" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/synapsecns/sanguine/ethergo/signer/signer" "github.com/synapsecns/sanguine/ethergo/signer/signer/localsigner" "github.com/synapsecns/sanguine/ethergo/signer/wallet" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/preset" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" "math/big" "testing" "time" @@ -23,7 +24,7 @@ import ( // RPCSuite defines a suite where we need live rpc endpoints (as opposed to a simulated backend) to test. type RPCSuite struct { - *testutils.TestSuite + *testsuite.TestSuite testBackend backends.TestBackend deployManager *testutil.DeployManager } @@ -31,7 +32,7 @@ type RPCSuite struct { // NewRPCSuite creates a new chain testing suite. func NewRPCSuite(tb testing.TB) *RPCSuite { tb.Helper() - return &RPCSuite{TestSuite: testutils.NewTestSuite(tb)} + return &RPCSuite{TestSuite: testsuite.NewTestSuite(tb)} } func (e *RPCSuite) SetupTest() { @@ -49,7 +50,7 @@ func TestEVMSuite(t *testing.T) { // ContractSuite defines a suite for testing contracts. This uses the simulated backend. type ContractSuite struct { - *testutils.TestSuite + *testsuite.TestSuite originContract *origin.OriginRef attestationContract *attestationcollector.AttestationCollectorRef testBackend backends.SimulatedTestBackend @@ -60,7 +61,7 @@ type ContractSuite struct { func NewContractSuite(tb testing.TB) *ContractSuite { tb.Helper() return &ContractSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } @@ -75,7 +76,7 @@ func (i *ContractSuite) SetupTest() { _, i.originContract = deployManager.GetOrigin(i.GetTestContext(), i.testBackend) - var attestationContract backends.DeployedContract + var attestationContract contracts.DeployedContract attestationContract, i.attestationContract = deployManager.GetAttestationCollector(i.GetTestContext(), i.attestationBackend) wall, err := wallet.FromRandom() @@ -111,7 +112,7 @@ func TestContractSuite(t *testing.T) { // TxQueueSuite tests out the transaction queue. type TxQueueSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewQueueSuite creates the queue. @@ -119,7 +120,7 @@ func NewQueueSuite(tb testing.TB) *TxQueueSuite { tb.Helper() return &TxQueueSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/go.mod b/agents/go.mod index 8181e5ffa2..4fd8fc25d7 100644 --- a/agents/go.mod +++ b/agents/go.mod @@ -3,6 +3,7 @@ module github.com/synapsecns/sanguine/agents go 1.17 require ( + github.com/BurntSushi/toml v1.1.0 github.com/Flaque/filet v0.0.0-20201012163910-45f684403088 github.com/Thor-x86/nullable v1.0.0 github.com/aws/smithy-go v1.11.3 @@ -16,12 +17,13 @@ require ( github.com/pkg/errors v0.9.1 github.com/richardwilkes/toolbox v1.52.0 github.com/spatialcurrent/go-math v0.0.0-20211120210754-b3872f7000fe - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.0 + github.com/synapsecns/sanguine/core v0.0.0-20220823193711-904c560fc7d3 github.com/synapsecns/sanguine/ethergo v0.0.0-00010101000000-000000000000 github.com/synapsecns/synapse-node v0.242.0 github.com/ugorji/go/codec v1.1.7 github.com/vburenin/ifacemaker v1.1.0 - go.uber.org/zap v1.19.1 + go.uber.org/zap v1.22.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c gorm.io/driver/mysql v1.1.2 gorm.io/driver/sqlite v1.1.5 @@ -31,7 +33,6 @@ require ( require ( filippo.io/edwards25519 v1.0.0-beta.2 // indirect github.com/99designs/keyring v1.1.6 // indirect - github.com/BurntSushi/toml v1.0.0 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/CosmWasm/wasmvm v0.16.3 // indirect github.com/DataDog/zstd v1.4.5 // indirect @@ -257,7 +258,7 @@ require ( github.com/status-im/keycard-go v0.0.0-20191119114148-6dd40a46baa0 // indirect github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 // indirect github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect - github.com/stretchr/objx v0.3.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/teivah/onecontext v1.3.0 // indirect @@ -282,12 +283,11 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect @@ -302,7 +302,7 @@ require ( gopkg.in/resty.v1 v1.12.0 // indirect gopkg.in/urfave/cli.v1 v1.20.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apimachinery v0.22.2 // indirect k8s.io/klog/v2 v2.9.0 // indirect ) @@ -310,6 +310,7 @@ require ( replace ( github.com/CosmWasm/wasmvm => github.com/CosmWasm/wasmvm v0.16.6 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + github.com/synapsecns/sanguine/core => ../core github.com/synapsecns/sanguine/ethergo => ../ethergo github.com/synapsecns/synapse-node => github.com/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f ) diff --git a/agents/go.sum b/agents/go.sum index 05f7797717..e9f4353b14 100644 --- a/agents/go.sum +++ b/agents/go.sum @@ -1,3 +1,4 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -66,8 +67,10 @@ filippo.io/edwards25519 v1.0.0-alpha.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCO filippo.io/edwards25519 v1.0.0-beta.2 h1:/BZRNzm8N4K4eWfK28dL4yescorxtO7YG1yun8fy+pI= filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk= github.com/99designs/keyring v1.1.6 h1:kVDC2uCgVwecxCk+9zoCt2uEL6dt+dfVzMvGgnVcIuM= github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= +github.com/AlecAivazis/survey/v2 v2.3.2/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg= github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= @@ -86,8 +89,9 @@ github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= +github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= @@ -107,12 +111,16 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y= github.com/LK4D4/trylock v0.0.0-20191027065348-ff7e133a5c54 h1:sg9CWNOhr58hMGmJ0q7x7jQ/B1RK/GyHNmeaYCJos9M= +github.com/LK4D4/trylock v0.0.0-20191027065348-ff7e133a5c54/go.mod h1:uHbOgfPowb74TKlV4AR5Az2haG6evxzM8Lmj1Xil25E= github.com/LK4d4/trylock v0.0.0-20191027065348-ff7e133a5c54 h1:mD+/7fgGmTO9w3g8xYfovo7GBSkyjkmQiacVj9VPx+0= github.com/LK4d4/trylock v0.0.0-20191027065348-ff7e133a5c54/go.mod h1:sAFuaugbNEiH1k50YhFNuD2+Gwga8oetKMT2RSFpglU= +github.com/MichaelMure/go-term-markdown v0.1.4/go.mod h1:EhcA3+pKYnlUsxYKBJ5Sn1cTQmmBMjeNlpV8nRb+JxA= +github.com/MichaelMure/go-term-text v0.3.1/go.mod h1:QgVjAEDUnRMlzpS6ky5CGblux7ebeiLnuy9dAaFZu8o= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -133,14 +141,24 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/ github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= +github.com/Yamashou/gqlgenc v0.0.2/go.mod h1:af1ziwCm0v6Kp2mKeD4HTbLos41BlnoVpNXDFvUfW/A= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= +github.com/a-h/generate v0.0.0-20220105161013-96c14dfdfb60/go.mod h1:traiLYQ0YD7qUMCdjo6/jSaJRPHXniX4HVs+PhEhYpc= github.com/adlio/schema v1.1.13/go.mod h1:L5Z7tw+7lRK1Fnpi/LT/ooCP1elkXn0krMWBQHUhEDE= github.com/adlio/schema v1.2.3/go.mod h1:nD7ZWmMMbwU12Pqwg+qL0rTvHBrBXfNz+5UQxTfy38M= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= +github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= +github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs= +github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= +github.com/alecthomas/chroma v0.7.1/go.mod h1:gHw09mkX1Qp80JlYbmN9L3+4R5o6DJJ3GRShh+AICNc= +github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= +github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI= +github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -155,6 +173,7 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd 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/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks= github.com/aristanetworks/glog v0.0.0-20180419172825-c15b03b3054f/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= @@ -191,6 +210,7 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbE github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.8.1/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.11.3 h1:DQixirEFM9IaKxX1olZ3ke3nvxRS2xMDteKIDWxozW8= github.com/aws/smithy-go v1.11.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/badoux/checkmail v0.0.0-20181210160741-9661bd69e9ad h1:kXfVkP8xPSJXzicomzjECcw6tv1Wl9h1lNenWBfNKdg= @@ -310,12 +330,15 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkAmdm9Iyy3D5Y0LfXo= github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= +github.com/confio/ics23/go v0.0.0-20200817220745-f173e6211efb/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= +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.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/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/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= github.com/containerd/continuity v0.2.1/go.mod h1:wCYX+dRqZdImhGucXOqTQn05AhX6EUDaGEMUzTFFpLg= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -333,6 +356,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= +github.com/cosmos/cosmos-sdk v0.44.3/go.mod h1:bA3+VenaR/l/vDiYzaiwbWvRPWHMBX2jG0ygiFtiBp0= github.com/cosmos/cosmos-sdk v0.44.5 h1:t5h+KPzZb0Zsag1RP1DCMQlyJyIQqJcqSPJrbUCDGHY= github.com/cosmos/cosmos-sdk v0.44.5/go.mod h1:maUA6m2TBxOJZkbwl0eRtEBgTX37kcaiOWU5t1HEGaY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= @@ -340,8 +364,13 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= +github.com/cosmos/iavl v0.15.0-rc3.0.20201009144442-230e9bdf52cd/go.mod h1:3xOIaNNX19p0QrX0VqWa6voPRoJRGGYtny+DH8NEPvE= +github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7uMjgxke/I= +github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= +github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwROUxFk= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= +github.com/cosmos/ibc-go v1.1.3/go.mod h1:TNJMo+fPU4GmpAGxqedjuA1l6izRLGPvuIRLpWAbXuE= github.com/cosmos/ibc-go v1.1.5 h1:H+q6G0szM5lePgLDQbTAaKQU5UR28ZjOIA3JJjNhuPQ= github.com/cosmos/ibc-go v1.1.5/go.mod h1:wkGkkX8Ou6yXgE8lO2xP9NOwo+Tl5x1dJaTTE6jBDpg= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= @@ -358,6 +387,7 @@ github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= +github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -380,7 +410,9 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ= github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg= github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU= +github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= @@ -394,6 +426,10 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= +github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= +github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= @@ -422,7 +458,9 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB github.com/elastic/gosigar v0.10.5 h1:GzPQ+78RaAb4J63unidA/JavQRKrB6s8IOzN6Ib59jo= github.com/elastic/gosigar v0.10.5/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/eliukblau/pixterm/pkg/ansimage v0.0.0-20191210081756-9fb6cf8c2f75/go.mod h1:0gZuvTO1ikSA5LtTI6E13LEOdWQNjIo5MTQOvrV0eFg= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25/go.mod h1:hTr8+TLQmkUkgcuh3mcr5fjrT9c64ZzsBCdCEC6UppY= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -445,10 +483,12 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod h1:JpoxHjuQauoxiFMl1ie8Xc/7TfLuMZ5eOCONd1sUBHg= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= +github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= +github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= @@ -486,12 +526,15 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME 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= github.com/gin-contrib/zap v0.0.2 h1:VnIucI+kUsxgzmcrX0gMk19a2I12KirTxi+ufuT2xZk= +github.com/gin-contrib/zap v0.0.2/go.mod h1:2vZj8gTuOYOfottCirxZr9gNM/Q1yk2iSVn15SUVG5A= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs= +github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= 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-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= @@ -527,6 +570,8 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -553,6 +598,7 @@ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= @@ -606,6 +652,7 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= +github.com/gomarkdown/markdown v0.0.0-20191123064959-2c17d62f5098/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -631,6 +678,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= github.com/google/gopacket v1.1.18 h1:lum7VRA9kdlvBi7/v2p7/zcbkduHaCH/SVVyurs7OpY= github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= @@ -641,6 +689,7 @@ github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3 github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190404155422-f8f10df84213/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -672,9 +721,11 @@ github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97Dwqy github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= +github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= @@ -694,9 +745,11 @@ github.com/grafana-tools/sdk v0.0.0-20210921191058-888ef9d18611/go.mod h1:AHHlOE github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29 h1:sezaKhEfPFg8W0Enm61B9Gs911H8iesGY5R8NDPtd1M= github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/graze/go-throttled v0.3.1/go.mod h1:OYBew5YhHxQqZGjoa7M8NQLIj+ztV+Iv5xCvzK1sQLg= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= @@ -705,6 +758,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.14.7/go.mod h1:oYZKL012gGh6LMyg/xA7Q2yq6j8bu0wa+9w14EEthWU= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -716,6 +770,7 @@ github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uM github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= +github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= @@ -774,6 +829,7 @@ github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpT github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff/go.mod h1:Feit0l8NcNO4g69XNjwvsR0LGcwMMfzI1TF253rOIlQ= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 h1:uUjLpLt6bVvZ72SQc/B4dXcPBw4Vgd7soowdRl52qEM= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= +github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= 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/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= @@ -801,6 +857,7 @@ github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7m 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/influxdb-client-go/v2 v2.5.1/go.mod h1:Y/0W1+TZir7ypoQZYd2IrnVOKB3Tq6oegAQeSVN/+EU= github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= 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= @@ -812,6 +869,7 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= +github.com/integralist/go-findroot v0.0.0-20160518114804-ac90681525dc/go.mod h1:UlaC6ndby46IJz9m/03cZPKKkR9ykeIVBBDE3UDBdJk= github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= @@ -912,11 +970,13 @@ github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= +github.com/jackpal/gateway v1.0.7/go.mod h1:aRcO0UFKt+MgIZmRmvOmnejdDT4Y1DNiNOsSd1AcIbA= github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jarcoal/httpmock v1.1.0 h1:F47ChZj1Y2zFsCXxNkBPwNNKnAyOATcdQibk0qEdVCE= +github.com/jarcoal/httpmock v1.1.0/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs= github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc= github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= @@ -933,6 +993,8 @@ github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0 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= github.com/jessevdk/go-flags v1.4.1-0.20181029123624-5de817a9aa20/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/jftuga/termsize v1.0.2/go.mod h1:Ox0nGORWiDkqCZ5gMnuB1aZP2qplPjf7Y2cffF72MDg= github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= @@ -963,6 +1025,7 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= +github.com/jszwec/csvutil v1.6.0/go.mod h1:Rpu7Uu9giO9subDyMCIQfHVDuLrcaC36UA4YcJjGBkg= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= @@ -976,6 +1039,7 @@ github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2vi github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200423153828-ed815bc50aec h1:2pXAsi4OUUjZKr5ds5UOF2IxXN+jVW0WetVO+czkf+A= github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200423153828-ed815bc50aec/go.mod h1:xR8jf3/VJAjh3nWu5tFe8Yxnt2HvWsqZHfGef1P5oDk= github.com/keep-network/keep-common v1.7.1-0.20211004182652-9b7140698f46/go.mod h1:g4RTDmhQMgwnlkU5bzW6cSz9dM+0UiQDPtow5NWdYbc= @@ -989,8 +1053,10 @@ github.com/keep-network/tbtc v1.1.1-0.20211005102550-e0f035c575a2/go.mod h1:POTe 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/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= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= @@ -1013,13 +1079,16 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= 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/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= @@ -1246,9 +1315,11 @@ github.com/libs4go/slf4go v0.0.4/go.mod h1:OWacxmrtRCiUHnHF/ndzEdHCucKjB+eoUXg/y github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/logrusorgru/aurora v0.0.0-20190803045625-94edacc10f9b/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lucas-clemente/quic-go v0.16.0/go.mod h1:I0+fcNTdb9eS1ZcjQZbDVPGchJ86chcIxPALn9lEJqE= +github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= @@ -1269,6 +1340,7 @@ github.com/manifoldco/promptui v0.3.0/go.mod h1:zoCNXiJnyM03LlBgTsWv8mq28s7aTC71 github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= github.com/marten-seemann/qtls v0.9.1/go.mod h1:T1MmAdDPyISzxlK6kjRr0pcZFBVd1OZbBb/j3cvzHhk= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= +github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007/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.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -1298,6 +1370,7 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -1341,6 +1414,7 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -1367,6 +1441,7 @@ github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjW github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtfelian/synced v1.1.7 h1:mKRgkZHMGTbvYqUyDM9tnYj1z31MSxkpI+qLTuCvby0= +github.com/mtfelian/synced v1.1.7/go.mod h1:9LrjNfrzokPgxRAEluvyoztApADeGGEwULm94BJxGkE= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI= @@ -1439,6 +1514,7 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= @@ -1446,6 +1522,7 @@ github.com/neverlee/keymutex v0.0.0-20171121013845-f593aa834bf9 h1:UfW5pM66x0MWE github.com/neverlee/keymutex v0.0.0-20171121013845-f593aa834bf9/go.mod h1:3hf2IoUXDKjCg/EuqSLUB5TY8StGS3haWYJiqzP907c= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/nsmithuk/local-kms v0.0.0-20220503165244-1bbbfed09b08/go.mod h1:F0zq7SoYkgpbXrZcXsf+S6nvbRjczBkJrMjwTAYb7e8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1520,6 +1597,7 @@ github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIw github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -1533,6 +1611,7 @@ github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9 github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +github.com/peterh/liner v1.2.1/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= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= @@ -1542,6 +1621,7 @@ github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= 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/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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= @@ -1550,6 +1630,7 @@ github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6J github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= +github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -1564,6 +1645,7 @@ 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.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= @@ -1585,12 +1667,15 @@ 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.19.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/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/exporter-toolkit v0.5.1 h1:9eqgis5er9xN613ZSADjypCJaDGj9ZlcWBvsIHa8/3c= +github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1605,6 +1690,7 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/pushgateway v1.4.1 h1:xh+YIXn+SBHYVF4xDUiGH0w1fz42HGFh1+OUgw+tK3c= +github.com/prometheus/pushgateway v1.4.1/go.mod h1:tK9yyjxg5CWK/ikolDKgPe+ndn004+/S7w4bp0lauuo= github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.10.0 h1:If5rVCMTp6W2SiRAQFlbpJNgVlgMEd+U2GZckwK38ic= @@ -1623,6 +1709,7 @@ github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= github.com/richardwilkes/toolbox v1.52.0 h1:Lp2kQfm8AYXk+GZG3jp7y4898NOmVXYG01MX+O8njh0= github.com/richardwilkes/toolbox v1.52.0/go.mod h1:jsPC77d240631vL5u96AEtgRQ7sPt+Ec8eP1ksNY5qA= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= @@ -1631,17 +1718,23 @@ github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= github.com/rs/zerolog v1.25.0 h1:Rj7XygbUHKUlDPcVdoLyR91fJBsduXj5fRxyqIQj/II= +github.com/rs/zerolog v1.25.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= github.com/rung/go-safecast v1.0.1 h1:7rkt2qO4JGdOkWKdPEBFLaEwQy20y0IhhWJNFxmH0p0= github.com/rung/go-safecast v1.0.1/go.mod h1:dzUcUS2UMtbfVc7w6mx/Ur3UYcpXEZC+WilISksJ4P8= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -1651,6 +1744,7 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= 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= @@ -1661,6 +1755,7 @@ github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KR github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 h1:Xuk8ma/ibJ1fOy4Ee11vHhUFHQNpHhrBneOCNHVXS5w= github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0/go.mod h1:7AwjWCpdPhkSmNAgUv5C7EJ4AbmjEB3r047r3DXWu3Y= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= @@ -1683,6 +1778,7 @@ github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTI github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= +github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= @@ -1692,7 +1788,9 @@ github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1l github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU= +github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -1767,9 +1865,11 @@ github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5J github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1777,10 +1877,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/superoo7/go-gecko v1.0.0/go.mod h1:6AMYHL2wP2EN8AB9msPM76Lbo8L/MQOknYjvak5coaY= github.com/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f h1:F2+tY8Y1n1Qn77mROlRcqV+k987FJNTwL4k48s4pck0= github.com/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f/go.mod h1:5YlKLpGdk5NpjbEguajL2BA8xFvY4EqL1asSpUm8+4o= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1804,13 +1906,21 @@ github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RM github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= +github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= +github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg= +github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ= +github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye4QXSFc6+TYxAxCI= github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0= github.com/tendermint/tendermint v0.34.16 h1:J2h7SwKWEv/cPuby2gjFhY00L2nLCoJOVFZvDbVeA8Q= github.com/tendermint/tendermint v0.34.16/go.mod h1:n0G22GynfeXTYbrn2IeLeB+oqsAe6R6jl4vZxZ1Y8F4= +github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpXVVBaK4f4= +github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= +github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI= github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= +github.com/terra-money/core v0.5.13/go.mod h1:aVpV4DsT+/RYoar1pVo1uuR/mNT8Wg95VoPHbfff7cg= github.com/terra-money/core v0.5.17 h1:LyQKVLEawSqn+AV+BcslP9H6qFUvFJxDBHzjvm3yl+Q= github.com/terra-money/core v0.5.17/go.mod h1:MEpq9DsEr2lBs8P7GiIJLfBqCZZKHfdl5qEs0nOcQkg= github.com/terra-money/terra.go v1.0.1-0.20211220063124-386f2075291e h1:R9FcYx6dSsT9YsDKLFAqq6zrbWnI6t4hjCelraU+GWY= @@ -1841,20 +1951,27 @@ github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:s github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= +github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc= +github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= 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/vburenin/ifacemaker v1.1.0 h1:3ScCGZ+D65Ud9L0x9ofhN0dk5QrfauzMWYfaYsfA+HE= github.com/vburenin/ifacemaker v1.1.0/go.mod h1:SlS6qpTccQsoK3ln7mBkUxA4agA8wfPr/IFYqBWerPw= +github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U= +github.com/vektah/gqlparser/v2 v2.1.0/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms= +github.com/vektra/mockery/v2 v2.9.4/go.mod h1:2gU4Cf/f8YyC8oEaSXfCnZBMxMjMl/Ko205rlP0fO90= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0 h1:6TteTDQ68CjgcCe8wH3D3ZhUQQOJXMTbj/D9rkk2a1k= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= @@ -1884,11 +2001,14 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xtaci/kcp-go v5.4.5+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/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Ya9AIoYBpE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= @@ -1928,8 +2048,8 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -1944,9 +2064,12 @@ go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= +go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ= +golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1963,6 +2086,7 @@ golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1979,18 +2103,23 @@ golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/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-20201016220609-9e8e0b390897/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-20201208171446-5f87f3452ae9/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-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/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-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI= golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2011,6 +2140,9 @@ golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8H golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20191206065243-da761ea9ff43/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -2023,7 +2155,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -2072,6 +2203,7 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2110,7 +2242,11 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8= golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2157,6 +2293,7 @@ golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2231,10 +2368,12 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w 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-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/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-20210309074719-68d13333faf2/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= @@ -2255,6 +2394,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-20210809222454-d867a43fc93e/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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2262,13 +2402,17 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2297,6 +2441,7 @@ golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181201035826-d0ca3933b724/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -2306,6 +2451,7 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -2313,6 +2459,7 @@ golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190912185636-87d9f09c5d89/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2331,6 +2478,7 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -2342,6 +2490,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -2353,6 +2502,7 @@ golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200827163409-021d7c6f1ec3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2368,6 +2518,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2475,6 +2626,7 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2581,6 +2733,7 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/h2non/gock.v1 v1.0.14/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -2622,8 +2775,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.0.3/go.mod h1:twGxftLBlFgNVNakL7F+P/x9oYqoymG3YYT8cAfI9oI= gorm.io/driver/mysql v1.1.2 h1:OofcyE2lga734MxwcCW9uB4mWNXMr50uaGRVwQL2B0M= gorm.io/driver/mysql v1.1.2/go.mod h1:4P/X9vSc3WTrhTLZ259cpFd6xKNYiSSdSZngkSBGIMM= @@ -2653,6 +2807,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= k8s.io/apimachinery v0.22.2 h1:ejz6y/zNma8clPVfNDLnPbleBo6MpoFy/HBiBqCouVk= k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -2662,6 +2817,7 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +pack.ag/tftp v1.0.0/go.mod h1:N1Pyo5YG+K90XHoR2vfLPhpRuE8ziqbgMn/r/SghZas= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= @@ -2670,6 +2826,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sourcegraph.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/agents/indexer/domain.go b/agents/indexer/domain.go index 8138bc70c7..1ef7c8767c 100644 --- a/agents/indexer/domain.go +++ b/agents/indexer/domain.go @@ -25,7 +25,7 @@ type DomainIndexer interface { } // NewDomainIndexer creates a new domain indexer. -//nolint: golint,revive +// nolint: golint,revive func NewDomainIndexer(db db.SynapseDB, domain domains.DomainClient, interval time.Duration) DomainIndexer { return domainIndexer{ db: db, diff --git a/agents/indexer/suite_test.go b/agents/indexer/suite_test.go index 56dbdfc9b0..d1720a0770 100644 --- a/agents/indexer/suite_test.go +++ b/agents/indexer/suite_test.go @@ -4,15 +4,15 @@ import ( "github.com/stretchr/testify/suite" "github.com/synapsecns/sanguine/agents/contracts/origin" "github.com/synapsecns/sanguine/agents/testutil" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/preset" + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/preset" "testing" ) // IndexerSuite tests the indexer. type IndexerSuite struct { - *testutils.TestSuite + *testsuite.TestSuite testBackend backends.TestBackend deployManager *testutil.DeployManager originContract *origin.OriginRef @@ -22,7 +22,7 @@ type IndexerSuite struct { func NewIndexerSuite(tb testing.TB) *IndexerSuite { tb.Helper() return &IndexerSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), testBackend: nil, deployManager: nil, } diff --git a/agents/internal/require.go b/agents/internal/require.go index f9589cc552..8960debf3b 100644 --- a/agents/internal/require.go +++ b/agents/internal/require.go @@ -4,6 +4,7 @@ package internal import ( + "github.com/BurntSushi/toml" "github.com/ugorji/go/codec" "github.com/vburenin/ifacemaker/maker" ) @@ -14,3 +15,4 @@ func init() { var _ = codec.Decoder{} var _ = maker.ParseStruct +var _ = toml.Unmarshal diff --git a/agents/testutil/contracttype.go b/agents/testutil/contracttype.go index 70daa01669..0d1fd4aaf7 100644 --- a/agents/testutil/contracttype.go +++ b/agents/testutil/contracttype.go @@ -12,7 +12,7 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/test/messageharness" "github.com/synapsecns/sanguine/agents/contracts/test/originharness" "github.com/synapsecns/sanguine/agents/contracts/test/tipsharness" - "github.com/synapsecns/sanguine/ethergo/deployer" + "github.com/synapsecns/sanguine/ethergo/contracts" ) // set all contact types. @@ -21,7 +21,7 @@ func init() { contractType := contractTypeImpl(i) AllContractTypes = append(AllContractTypes, contractType) // assert type is correct - var _ deployer.ContractType = contractType + var _ contracts.ContractType = contractType } } @@ -39,6 +39,7 @@ func verifyStringerUpdated(contractType contractTypeImpl) { // contractTypeImpl is the type of the contract being saved/fetched. // we use an interface here so the deploy helper here can be abstracted away from the synapse contracts +// //go:generate go run golang.org/x/tools/cmd/stringer -type=contractTypeImpl -linecomment type contractTypeImpl int @@ -81,7 +82,7 @@ func (c contractTypeImpl) Name() string { // ContractInfo gets the source code of every contract. See TODO above. // TODO these should use contract name and maybe come out of the generator. -//nolint: cyclop +// nolint: cyclop func (c contractTypeImpl) ContractInfo() *compiler.Contract { switch c { case OriginType: @@ -114,5 +115,5 @@ func (c contractTypeImpl) ContractName() string { return c.Name() } -// make sure contractTypeImpl conforms to deployer.ContractType. -var _ deployer.ContractType = contractTypeImpl(1) +// make sure contractTypeImpl conforms to contracts.ContractType. +var _ contracts.ContractType = contractTypeImpl(1) diff --git a/agents/testutil/deployers.go b/agents/testutil/deployers.go index f15443a082..d031cba3b9 100644 --- a/agents/testutil/deployers.go +++ b/agents/testutil/deployers.go @@ -3,6 +3,7 @@ package testutil import ( "context" "fmt" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" @@ -11,8 +12,8 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/destination" "github.com/synapsecns/sanguine/agents/contracts/notarymanager" "github.com/synapsecns/sanguine/agents/contracts/origin" + "github.com/synapsecns/sanguine/ethergo/backends" "github.com/synapsecns/sanguine/ethergo/deployer" - "github.com/synapsecns/synapse-node/testutils/backends" ) // OriginDeployer deploys the origin contract. @@ -26,7 +27,7 @@ func NewOriginDeployer(registry deployer.GetOnlyContractRegistry, backend backen } // Deploy deploys the origin contract. -func (d OriginDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (d OriginDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { notaryManagerContract := d.Registry().Get(ctx, NotaryManagerType) return d.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (address common.Address, tx *types.Transaction, data interface{}, err error) { @@ -66,8 +67,8 @@ func (d OriginDeployer) Deploy(ctx context.Context) (backends.DeployedContract, } // Dependencies gets a list of dependencies used to deploy the origin contract. -func (d OriginDeployer) Dependencies() []deployer.ContractType { - return []deployer.ContractType{NotaryManagerType} +func (d OriginDeployer) Dependencies() []contracts.ContractType { + return []contracts.ContractType{NotaryManagerType} } // NotaryManagerDeployer deploys the update manager. @@ -81,7 +82,7 @@ func NewNotaryManagerDeployer(registry deployer.GetOnlyContractRegistry, backend } // Deploy deploys the notary contract. -func (n NotaryManagerDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (n NotaryManagerDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return n.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return notarymanager.DeployNotaryManager(transactOps, backend, transactOps.From) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { @@ -100,7 +101,7 @@ func NewAttestationCollectorDeployer(registry deployer.GetOnlyContractRegistry, } // Deploy deploys the attestation collector. -func (a AttestationCollectorDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (a AttestationCollectorDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return a.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { attestationAddress, attestationTx, collector, err := attestationcollector.DeployAttestationCollector(transactOps, backend) if err != nil { @@ -131,7 +132,7 @@ func NewDestinationDeployer(registry deployer.GetOnlyContractRegistry, backend b } // Deploy deploys the destination. -func (d DestinationDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (d DestinationDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return d.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { destinationAddress, destinationTx, destination, err := destination.DeployDestination(transactOps, backend, uint32(d.Backend().GetChainID())) if err != nil { @@ -152,6 +153,6 @@ func (d DestinationDeployer) Deploy(ctx context.Context) (backends.DeployedContr } // Dependencies gets a list of dependencies used to deploy the destination contract. -func (d DestinationDeployer) Dependencies() []deployer.ContractType { - return []deployer.ContractType{OriginType, NotaryManagerType} +func (d DestinationDeployer) Dependencies() []contracts.ContractType { + return []contracts.ContractType{OriginType, NotaryManagerType} } diff --git a/agents/testutil/harness.go b/agents/testutil/harness.go index 5c8351dc77..af3b1f23d2 100644 --- a/agents/testutil/harness.go +++ b/agents/testutil/harness.go @@ -11,8 +11,9 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/test/messageharness" "github.com/synapsecns/sanguine/agents/contracts/test/originharness" "github.com/synapsecns/sanguine/agents/contracts/test/tipsharness" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/synapsecns/sanguine/ethergo/deployer" - "github.com/synapsecns/synapse-node/testutils/backends" ) // MessageHarnessDeployer deploys the message harness for testing. @@ -26,7 +27,7 @@ func NewMessageHarnessDeployer(registry deployer.GetOnlyContractRegistry, backen } // Deploy deploys the message harness deployer. -func (d MessageHarnessDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (d MessageHarnessDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return d.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return messageharness.DeployMessageHarness(transactOps, backend) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { @@ -48,7 +49,7 @@ func NewOriginHarnessDeployer(registry deployer.GetOnlyContractRegistry, backend } // Deploy deploys the origin harness. -func (o OriginHarnessDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (o OriginHarnessDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return o.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return originharness.DeployOriginHarness(transactOps, backend, OriginHarnessDomain) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { @@ -67,7 +68,7 @@ func NewAttestationHarnessDeployer(registry deployer.GetOnlyContractRegistry, ba } // Deploy deploys the attestation harness. -func (a AttestationHarnessDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (a AttestationHarnessDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return a.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return attestationharness.DeployAttestationHarness(transactOps, backend) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { @@ -86,7 +87,7 @@ func NewTipsHarnessDeployer(registry deployer.GetOnlyContractRegistry, backend b } // Deploy deploys the attestation harness. -func (a TipsHarnessDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (a TipsHarnessDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return a.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return tipsharness.DeployTipsHarness(transactOps, backend) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { @@ -105,7 +106,7 @@ func NewDestinationHarnessDeployer(registry deployer.GetOnlyContractRegistry, ba } // Deploy deploys the destination harness. -func (d DestinationHarnessDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (d DestinationHarnessDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return d.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return destinationharness.DeployDestinationHarness(transactOps, backend, uint32(d.Backend().GetChainID())) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { @@ -124,7 +125,7 @@ func NewHeaderHarnessDeployer(registry deployer.GetOnlyContractRegistry, backend } // Deploy deploys the header harness. -func (h HeaderHarnessDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (h HeaderHarnessDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { return h.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { return headerharness.DeployHeaderHarness(transactOps, backend) }, func(address common.Address, backend bind.ContractBackend) (interface{}, error) { diff --git a/agents/testutil/suite_test.go b/agents/testutil/suite_test.go index 9bbc4e881f..b44203c4d2 100644 --- a/agents/testutil/suite_test.go +++ b/agents/testutil/suite_test.go @@ -3,15 +3,15 @@ package testutil_test import ( "github.com/stretchr/testify/suite" "github.com/synapsecns/sanguine/agents/testutil" - "github.com/synapsecns/synapse-node/testutils" - "github.com/synapsecns/synapse-node/testutils/backends" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" + "github.com/synapsecns/sanguine/core/testsuite" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "testing" ) // SimulatedSuite is used to test individual contract deployments to make sure other tests don't break. type SimulatedSuite struct { - *testutils.TestSuite + *testsuite.TestSuite // testBackend is the test backend testBackend backends.SimulatedTestBackend // deployManager is the deploy helper @@ -31,7 +31,7 @@ func (s *SimulatedSuite) SetupTest() { func NewSimulatedSuite(tb testing.TB) *SimulatedSuite { tb.Helper() return &SimulatedSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/agents/testutil/typecast.go b/agents/testutil/typecast.go index de8dd6aaee..5b157e26af 100644 --- a/agents/testutil/typecast.go +++ b/agents/testutil/typecast.go @@ -4,6 +4,7 @@ import ( "context" "github.com/synapsecns/sanguine/agents/contracts/origin" "github.com/synapsecns/sanguine/agents/contracts/test/headerharness" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/stretchr/testify/assert" "github.com/synapsecns/sanguine/agents/contracts/attestationcollector" @@ -14,11 +15,11 @@ import ( "github.com/synapsecns/sanguine/agents/contracts/test/messageharness" "github.com/synapsecns/sanguine/agents/contracts/test/originharness" "github.com/synapsecns/sanguine/agents/contracts/test/tipsharness" - "github.com/synapsecns/synapse-node/testutils/backends" + "github.com/synapsecns/sanguine/ethergo/backends" ) // GetOrigin gets a typecast origin contract. -func (d *DeployManager) GetOrigin(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *origin.OriginRef) { +func (d *DeployManager) GetOrigin(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *origin.OriginRef) { d.T().Helper() originContract := d.GetContractRegistry(backend).Get(ctx, OriginType) @@ -30,7 +31,7 @@ func (d *DeployManager) GetOrigin(ctx context.Context, backend backends.Simulate } // GetMessageHarness gets the message harness. -func (d *DeployManager) GetMessageHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *messageharness.MessageHarnessRef) { +func (d *DeployManager) GetMessageHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *messageharness.MessageHarnessRef) { d.T().Helper() messageHarnessContract := d.GetContractRegistry(backend).Get(ctx, MessageHarnessType) @@ -42,7 +43,7 @@ func (d *DeployManager) GetMessageHarness(ctx context.Context, backend backends. } // GetOriginHarness gets the origin harness. -func (d *DeployManager) GetOriginHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *originharness.OriginHarnessRef) { +func (d *DeployManager) GetOriginHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *originharness.OriginHarnessRef) { d.T().Helper() messageHarnessContract := d.GetContractRegistry(backend).Get(ctx, OriginHarnessType) @@ -54,7 +55,7 @@ func (d *DeployManager) GetOriginHarness(ctx context.Context, backend backends.S } // GetAttestationHarness gets the attestation harness. -func (d *DeployManager) GetAttestationHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *attestationharness.AttestationHarnessRef) { +func (d *DeployManager) GetAttestationHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *attestationharness.AttestationHarnessRef) { d.T().Helper() attestationHarnessContract := d.GetContractRegistry(backend).Get(ctx, AttestationHarnessType) @@ -66,7 +67,7 @@ func (d *DeployManager) GetAttestationHarness(ctx context.Context, backend backe } // GetDestinationHarness gets the destination harness. -func (d *DeployManager) GetDestinationHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *destinationharness.DestinationHarnessRef) { +func (d *DeployManager) GetDestinationHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *destinationharness.DestinationHarnessRef) { d.T().Helper() destinationHarnessContract := d.GetContractRegistry(backend).Get(ctx, DestinationHarnessType) @@ -77,7 +78,7 @@ func (d *DeployManager) GetDestinationHarness(ctx context.Context, backend backe } // GetNotaryManager gets the notary manager. -func (d *DeployManager) GetNotaryManager(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *notarymanager.NotaryManagerRef) { +func (d *DeployManager) GetNotaryManager(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *notarymanager.NotaryManagerRef) { d.T().Helper() notaryManagerContract := d.GetContractRegistry(backend).Get(ctx, NotaryManagerType) @@ -88,7 +89,7 @@ func (d *DeployManager) GetNotaryManager(ctx context.Context, backend backends.S } // GetAttestationCollector gets the attestation collector contract. -func (d *DeployManager) GetAttestationCollector(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *attestationcollector.AttestationCollectorRef) { +func (d *DeployManager) GetAttestationCollector(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *attestationcollector.AttestationCollectorRef) { d.T().Helper() attestationContract := d.GetContractRegistry(backend).Get(ctx, AttestationCollectorType) @@ -99,7 +100,7 @@ func (d *DeployManager) GetAttestationCollector(ctx context.Context, backend bac } // GetDestination gets the destination contract. -func (d *DeployManager) GetDestination(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *destination.DestinationRef) { +func (d *DeployManager) GetDestination(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *destination.DestinationRef) { d.T().Helper() destinationContract := d.GetContractRegistry(backend).Get(ctx, DestinationType) @@ -110,7 +111,7 @@ func (d *DeployManager) GetDestination(ctx context.Context, backend backends.Sim } // GetTipsHarness gets the tips harness for testing. -func (d *DeployManager) GetTipsHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *tipsharness.TipsHarnessRef) { +func (d *DeployManager) GetTipsHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *tipsharness.TipsHarnessRef) { d.T().Helper() tipsContract := d.GetContractRegistry(backend).Get(ctx, TipsHarnessType) @@ -121,7 +122,7 @@ func (d *DeployManager) GetTipsHarness(ctx context.Context, backend backends.Sim } // GetHeaderHarness gets the header harness. -func (d *DeployManager) GetHeaderHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract backends.DeployedContract, handle *headerharness.HeaderHarnessRef) { +func (d *DeployManager) GetHeaderHarness(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *headerharness.HeaderHarnessRef) { d.T().Helper() headerHarnessContract := d.GetContractRegistry(backend).Get(ctx, HeaderHarnessType) diff --git a/agents/types/chain.go b/agents/types/chain.go index 2d2528e3f6..dcb98c9ded 100644 --- a/agents/types/chain.go +++ b/agents/types/chain.go @@ -12,8 +12,9 @@ func init() { } } -//go:generate go run golang.org/x/tools/cmd/stringer -type=ChainType -linecomment // ChainType is the type of chain being used (e.g. evm). +// +//go:generate go run golang.org/x/tools/cmd/stringer -type=ChainType -linecomment type ChainType uint8 const ( diff --git a/agents/types/encoder.go b/agents/types/encoder.go index b1a40a7c72..b13d455b22 100644 --- a/agents/types/encoder.go +++ b/agents/types/encoder.go @@ -121,7 +121,7 @@ const ( ) // EncodeTips encodes a list of tips. -//nolint: makezero +// nolint: makezero func EncodeTips(tips Tips) ([]byte, error) { b := make([]byte, offsetNotary) binary.BigEndian.PutUint16(b, tipsVersion) diff --git a/agents/types/parity_test.go b/agents/types/parity_test.go index 8b8489583e..e01b7b3ae3 100644 --- a/agents/types/parity_test.go +++ b/agents/types/parity_test.go @@ -9,7 +9,7 @@ import ( . "github.com/stretchr/testify/assert" "github.com/synapsecns/sanguine/agents/testutil" "github.com/synapsecns/sanguine/agents/types" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "math/big" "testing" "time" diff --git a/agents/types/signature.go b/agents/types/signature.go index 5ca280e034..673e311ba7 100644 --- a/agents/types/signature.go +++ b/agents/types/signature.go @@ -1,7 +1,7 @@ package types import ( - "github.com/synapsecns/synapse-node/pkg/common" + "github.com/synapsecns/sanguine/core" "math/big" ) @@ -25,22 +25,22 @@ type signature struct { // NewSignature creates a new signature. func NewSignature(v, r, s *big.Int) Signature { return signature{ - v: common.CopyBigInt(v), - r: common.CopyBigInt(r), - s: common.CopyBigInt(s), + v: core.CopyBigInt(v), + r: core.CopyBigInt(r), + s: core.CopyBigInt(s), } } func (s signature) V() *big.Int { - return common.CopyBigInt(s.v) + return core.CopyBigInt(s.v) } func (s signature) R() *big.Int { - return common.CopyBigInt(s.r) + return core.CopyBigInt(s.r) } func (s signature) S() *big.Int { - return common.CopyBigInt(s.s) + return core.CopyBigInt(s.s) } var _ Signature = signature{} diff --git a/agents/types/tips.go b/agents/types/tips.go index a6b8eb26f1..b986a36aad 100644 --- a/agents/types/tips.go +++ b/agents/types/tips.go @@ -1,7 +1,7 @@ package types import ( - "github.com/synapsecns/synapse-node/pkg/common" + "github.com/synapsecns/sanguine/core" "math/big" ) @@ -41,19 +41,19 @@ func (t tips) Version() uint16 { } func (t tips) NotaryTip() *big.Int { - return common.CopyBigInt(t.notaryTip) + return core.CopyBigInt(t.notaryTip) } func (t tips) BroadcasterTip() *big.Int { - return common.CopyBigInt(t.broadcasterTip) + return core.CopyBigInt(t.broadcasterTip) } func (t tips) ProverTip() *big.Int { - return common.CopyBigInt(t.proverTip) + return core.CopyBigInt(t.proverTip) } func (t tips) ExecutorTip() *big.Int { - return common.CopyBigInt(t.executorTip) + return core.CopyBigInt(t.executorTip) } var _ Tips = tips{} diff --git a/core/bytes.go b/core/bytes.go new file mode 100644 index 0000000000..a482da1a1d --- /dev/null +++ b/core/bytes.go @@ -0,0 +1,8 @@ +package core + +// BytesToSlice converts a 32 bit array to a slice slice. +func BytesToSlice(bytes [32]byte) []byte { + rawBytes := make([]byte, len(bytes)) + copy(rawBytes, bytes[:]) + return rawBytes +} diff --git a/core/go.mod b/core/go.mod index b22fe3629c..af75464d24 100644 --- a/core/go.mod +++ b/core/go.mod @@ -9,20 +9,23 @@ replace ( ) require ( + github.com/BurntSushi/toml v1.1.0 github.com/brianvoe/gofakeit/v6 v6.9.0 github.com/c-bata/go-prompt v0.2.6 github.com/ipfs/go-log v1.0.5 github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.7.0 - github.com/synapsecns/synapse-node v0.0.0-00010101000000-000000000000 + github.com/stretchr/testify v1.8.0 + github.com/synapsecns/synapse-node v0.242.0 github.com/urfave/cli/v2 v2.11.2 go.uber.org/zap v1.22.0 + k8s.io/apimachinery v0.22.2 ) require ( github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect + github.com/cespare/cp v1.1.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -36,6 +39,7 @@ require ( github.com/go-stack/stack v1.8.1 // indirect github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/google/uuid v1.1.5 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gosimple/slug v1.1.1 // indirect @@ -47,6 +51,7 @@ require ( github.com/mattn/go-tty v0.0.3 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pborman/uuid v1.2.1 // indirect github.com/pkg/term v1.2.0-beta.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.12.1 // indirect @@ -63,14 +68,12 @@ require ( github.com/tklauser/numcpus v0.2.2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apimachinery v0.22.2 // indirect k8s.io/klog/v2 v2.9.0 // indirect ) diff --git a/core/go.sum b/core/go.sum index ddcdf6da14..c26ac691c1 100644 --- a/core/go.sum +++ b/core/go.sum @@ -52,6 +52,7 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= +github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/CosmWasm/wasmvm v0.16.6 h1:YEqno8DJifj+1NixXSJGOXCKGX4Qb4kdYK1+JIHLpog= @@ -105,17 +106,15 @@ github.com/briandowns/spinner v1.6.1 h1:LBxHu5WLyVuVEtTD72xegiC7QJGx598LBpo3ywKT github.com/brianvoe/gofakeit/v6 v6.9.0 h1:UCGhPCKLiqBc910TKS7LcOGf74NozftibFCbGIS6GZQ= github.com/brianvoe/gofakeit/v6 v6.9.0/go.mod h1:palrJUk4Fyw38zIFB/uBZqsgzW5VsNllhHKKwAebzew= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= -github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= -github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= @@ -124,8 +123,9 @@ github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdf github.com/celo-org/celo-blockchain v0.0.0-20210222234634-f8c8f6744526 h1:rdY1F8vUybjjsv+V58eaSYsYPTNO+AXK9o7l+BQuhhU= github.com/celo-org/celo-bls-go v0.2.4 h1:V1y92kM5IRJWQZ6DCwqiKLW7swmUA5y/dPJ9YbU4HfA= 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= +github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU= +github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -176,7 +176,6 @@ github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vs github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ= github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0 h1:E5KszxGgpjpmW8vN811G6rBAZg0/S/DftdGqN4FW5x4= -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/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= @@ -309,7 +308,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -324,6 +324,7 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I= @@ -399,7 +400,6 @@ github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABo github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= 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= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -582,7 +582,6 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W 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= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -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.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -593,7 +592,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/otiai10/primes v0.0.0-20180210170552-f6d2a1ba97c4 h1:blMAhTXF6uL1+e3eVSajjLT43Cc0U8mU1gcigbbolJM= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= +github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= @@ -697,13 +697,16 @@ github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 h1:njlZPzLwU639 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f h1:F2+tY8Y1n1Qn77mROlRcqV+k987FJNTwL4k48s4pck0= github.com/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f/go.mod h1:5YlKLpGdk5NpjbEguajL2BA8xFvY4EqL1asSpUm8+4o= @@ -744,7 +747,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -759,7 +761,6 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= @@ -777,8 +778,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/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-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -810,7 +809,6 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -821,7 +819,6 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -858,7 +855,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/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= @@ -937,18 +933,17 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1016,12 +1011,9 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= diff --git a/core/int.go b/core/int.go new file mode 100644 index 0000000000..b2d2f7909f --- /dev/null +++ b/core/int.go @@ -0,0 +1,11 @@ +package core + +import "math/big" + +// CopyBigInt creates a copy of a big int without mutating the original. +func CopyBigInt(val *big.Int) *big.Int { + if val == nil { + return nil + } + return new(big.Int).SetBytes(val.Bytes()) +} diff --git a/core/int_test.go b/core/int_test.go new file mode 100644 index 0000000000..7825d80681 --- /dev/null +++ b/core/int_test.go @@ -0,0 +1,23 @@ +package core_test + +import ( + . "github.com/stretchr/testify/assert" + "github.com/synapsecns/sanguine/core" + "math/big" +) + +func (c *CoreSuite) TestCopyBigInt() { + const ogInt = 5 + ogBigInt := big.NewInt(ogInt) + newBigInt := core.CopyBigInt(ogBigInt) + + Equal(c.T(), ogBigInt.Int64(), newBigInt.Int64()) + Equal(c.T(), ogBigInt.Int64(), int64(ogInt)) +} + +func (c *CoreSuite) TestCopyNullInt() { + NotPanics(c.T(), func() { + copiedInt := core.CopyBigInt(nil) + Nil(c.T(), copiedInt) + }) +} diff --git a/core/os_test.go b/core/os_test.go index 2e2d5a9b7a..1c3564719d 100644 --- a/core/os_test.go +++ b/core/os_test.go @@ -8,25 +8,25 @@ import ( ) // TestGetEnv makes sure that default variables are set/fetched. -func (s *CoreSuite) TestGetEnv() { +func (c *CoreSuite) TestGetEnv() { testWord := gofakeit.Word() testValue := gofakeit.Word() - Equal(s.T(), common.GetEnv(testWord, testValue), testValue) + Equal(c.T(), common.GetEnv(testWord, testValue), testValue) err := os.Setenv(testWord, gofakeit.Word()) - Nil(s.T(), err) - NotEqual(s.T(), testValue, common.GetEnv(testWord, testValue)) + Nil(c.T(), err) + NotEqual(c.T(), testValue, common.GetEnv(testWord, testValue)) err = os.Setenv(testWord, testValue) - Nil(s.T(), err) - Equal(s.T(), testValue, common.GetEnv(testWord, testValue)) + Nil(c.T(), err) + Equal(c.T(), testValue, common.GetEnv(testWord, testValue)) } -func (s *CoreSuite) TestGetEnvInt() { - Equal(s.T(), common.GetEnvInt(gofakeit.Word(), 1), 1) - Nil(s.T(), os.Setenv("invalid", "invalid")) - Equal(s.T(), common.GetEnvInt("invalid", 1), 1) - Nil(s.T(), os.Setenv("valid", "3")) - Equal(s.T(), common.GetEnvInt("valid", 1), 3) +func (c *CoreSuite) TestGetEnvInt() { + Equal(c.T(), common.GetEnvInt(gofakeit.Word(), 1), 1) + Nil(c.T(), os.Setenv("invalid", "invalid")) + Equal(c.T(), common.GetEnvInt("invalid", 1), 1) + Nil(c.T(), os.Setenv("valid", "3")) + Equal(c.T(), common.GetEnvInt("valid", 1), 3) } diff --git a/core/suite_test.go b/core/suite_test.go index e09c2bd252..230becdbc8 100644 --- a/core/suite_test.go +++ b/core/suite_test.go @@ -2,13 +2,13 @@ package core_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) // CoreSuite defines the basic test suite. type CoreSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewTestSuite creates a new test suite and performs some basic checks afterward. @@ -16,7 +16,7 @@ type CoreSuite struct { func NewTestSuite(tb testing.TB) *CoreSuite { tb.Helper() return &CoreSuite{ - testutils.NewTestSuite(tb), + testsuite.NewTestSuite(tb), } } diff --git a/core/testsuite/suite.go b/core/testsuite/suite.go new file mode 100644 index 0000000000..16da624d09 --- /dev/null +++ b/core/testsuite/suite.go @@ -0,0 +1,160 @@ +// Package testsuite contains the standard test suite +package testsuite + +import ( + "context" + "github.com/ipfs/go-log" + "github.com/stretchr/testify/suite" + "github.com/synapsecns/synapse-node/pkg/chainwatcher" + "k8s.io/apimachinery/pkg/util/wait" + "sync" + "testing" + "time" +) + +// cancellableContext is a context object +// note: we don't really have a choice here, but note this is vulnerable to context leaks if setup/teardown +// events are not called. +type cancellableContext struct { + // ctx is the context object + //nolint: containedctx + ctx context.Context + // cancelFunc allows the context to be canceled + cancelFunc context.CancelFunc +} + +// newCancellableContext creates a new cancellable context. +func newCancellableContext(parentContext context.Context) cancellableContext { + ctx, cancel := context.WithCancel(parentContext) + return cancellableContext{ + ctx: ctx, + cancelFunc: cancel, + } +} + +// TestSuite defines the basic test suite. +// TODO: we should make sure global vars don't get mutated. Namely eth params. +type TestSuite struct { + suite.Suite + // context is the context object for the test suite. All other context objects inherit + // from it. unlike suiteContext and testContext it is not canceled and functionally does + // not have a lifecycle. TODO this should probably replace suiteContext + //nolint: containedctx + context context.Context + // suiteContext is the context object for the duration of the test. It is canceled at the end + // of the test + suiteContext cancellableContext + // testContext is the context object for the test. It is canceled at the end of the test + // inheritance of test contexts is as follows: + // + // context->suiteContext->testContext + // + testContext cancellableContext + // testID is an autoincrementing that can be used as a unique, per test, identifier. + testID int + // runAfterTest are functions that should be run after the test + runAfterTest []func() + // runAfterSuite are functions that are run after the suite + runAfterSuite []func() + // structMux protects non thread safe operations + structMux sync.Mutex +} + +// NewTestSuite creates a new test suite and performs some basic checks afterward. +// Every test suite in the synapse library should inherit from this suite and override where necessary. +func NewTestSuite(tb testing.TB) *TestSuite { + tb.Helper() + log.SetAllLoggers(log.LevelDebug) + ctx := context.Background() + return &TestSuite{ + context: ctx, + testID: 0, + } +} + +// Eventually asserts something is eventually true. +func (s *TestSuite) Eventually(willBeTrue func() bool) { + ctx, cancel := context.WithCancel(s.GetSuiteContext()) + isTrue := false + wait.UntilWithContext(ctx, func(ctx context.Context) { + if willBeTrue() { + isTrue = true + cancel() + } + }, time.Millisecond) + + // make sure the context just didn't cancel + if !isTrue { + s.T().Errorf("expected %T to be true before test context timed out", willBeTrue) + } +} + +// SetupSuite sets up the test suite. +func (s *TestSuite) SetupSuite() { + chainwatcher.PollInterval = time.Millisecond * 50 + + s.runAfterSuite = nil + s.suiteContext = newCancellableContext(s.context) +} + +// runDefferedFunctions runs deferred functions. +func runDeferredFunctions(deferredFuncs []func()) { + for _, deferredFunc := range deferredFuncs { + deferredFunc() + } +} + +// TearDownSuite tears down the test suite. +func (s *TestSuite) TearDownSuite() { + runDeferredFunctions(s.runAfterSuite) + s.suiteContext.cancelFunc() +} + +// SetupTest runs checks at the end of the test suite. +func (s *TestSuite) SetupTest() { + s.runAfterTest = nil + s.testContext = newCancellableContext(s.suiteContext.ctx) +} + +// GetTestID gets the unique test id for the current test. +// uniqueness is per-suite. +func (s *TestSuite) GetTestID() int { + return s.testID +} + +// TearDownTest runs checks at the end of the test suite. +func (s *TestSuite) TearDownTest() { + s.testID++ + runDeferredFunctions(s.runAfterTest) + // this will panic if you failed to call SetupTest() from an inheriting suite + s.testContext.cancelFunc() +} + +// DeferAfterTest runs a function after the test. This will run before context cancellation +// if you'd like to do otherwise you can from a new goroutine that watches TestContext() +// TODO: in cases of crashes this will not be done so fix this. +func (s *TestSuite) DeferAfterTest(newFunc func()) { + s.structMux.Lock() + defer s.structMux.Unlock() + s.runAfterTest = append(s.runAfterTest, newFunc) +} + +// DeferAfterSuite runs a function after the suite. This will run before context cancellation +// if you'd like to do otherwise you can from a new goroutine that watches SuiteContext() +// TODO: in cases of crashes this will not be done so fix this. +func (s *TestSuite) DeferAfterSuite(newFunc func()) { + s.structMux.Lock() + defer s.structMux.Unlock() + s.runAfterSuite = append(s.runAfterSuite, newFunc) +} + +// GetTestContext gets the context object for the suite. This is an alias for GetTestContext() +// TODO: right now this is run as a test because of naming. this is mostly harmless. +func (s *TestSuite) GetTestContext() context.Context { + return s.testContext.ctx +} + +// GetSuiteContext returns the context for the test suite. +func (s *TestSuite) GetSuiteContext() context.Context { + return s.suiteContext.ctx +} diff --git a/core/toml/doc.go b/core/toml/doc.go new file mode 100644 index 0000000000..80a9982ce4 --- /dev/null +++ b/core/toml/doc.go @@ -0,0 +1,2 @@ +// Package toml contains common utilities for implementing toml types. +package toml diff --git a/core/toml/marshaller.go b/core/toml/marshaller.go new file mode 100644 index 0000000000..44c3045b9d --- /dev/null +++ b/core/toml/marshaller.go @@ -0,0 +1,89 @@ +package toml + +import ( + "bytes" + "fmt" + "github.com/BurntSushi/toml" + "reflect" + "strings" +) + +// Encodable is an interface for a toml with an encode method. +type Encodable interface { + Encode() (string, error) +} + +// Indent is the indent we use. +const Indent = " " + +// Encode is a helper method to allow you to encode a toml to text. +// config should be passed here by pointer +// TODO: use a toml parser that can poparse comments. +func Encode(config interface{}) (string, error) { + var buf bytes.Buffer + encoder := toml.NewEncoder(&buf) + encoder.Indent = Indent + err := encoder.Encode(config) + if err != nil { + return "", fmt.Errorf("could not encode file: %w", err) + } + + // currently, there's a bug in the parser that requires maps to be on the same level as the parent. + // TODO: fix + splitFile := strings.Split(buf.String(), "\n") + var newLines []string + for _, line := range splitFile { + // get rid of double spacing on maps + indentLen := len(Indent) * 2 + newLines = append(newLines, strings.ReplaceAll(line, getStringOfLength(indentLen), getStringOfLength(indentLen-2))) + } + + return strings.Join(newLines, "\n"), nil +} + +// getStringOfLength generates a blank string of length. +func getStringOfLength(length int) (res string) { + for i := 0; i < length; i++ { + res += " " + } + return res +} + +// MarshalTextPtr should be a pointer here +// Deprecated: this can be done through the library. +func MarshalTextPtr(config interface{}) (text []byte, err error) { + var fieldValDeref reflect.Value + + // make sure we have a pointer, if we don't return an error + rv := eindirect(reflect.ValueOf(config)) + if rv.Kind() == reflect.Ptr { + // if the pointer is nil, return nothing + if rv.IsNil() { + return text, nil + } + // otherwise dereference it for decoding + rv.Set(reflect.New(rv.Type().Elem())) + fieldValDeref = rv.Elem() + } else { + return text, fmt.Errorf("this method can only be run on pointers (have %s). If your method is not a pointer, you don't need a custom text marshaller", rv.Kind().String()) + } + + var buf bytes.Buffer + encoder := toml.NewEncoder(&buf) + err = encoder.Encode(fieldValDeref.Interface()) + if err != nil { + return text, fmt.Errorf("could not encode file: %w", err) + } + return buf.Bytes(), nil +} + +// eindirect wraps a pointer. +func eindirect(v reflect.Value) reflect.Value { + // nolint: exhaustive + switch v.Kind() { + case reflect.Ptr, reflect.Interface: + return eindirect(v.Elem()) + default: + return v + } +} diff --git a/core/toml/marshaller_test.go b/core/toml/marshaller_test.go new file mode 100644 index 0000000000..976fca4b1d --- /dev/null +++ b/core/toml/marshaller_test.go @@ -0,0 +1,97 @@ +package toml_test + +import ( + "encoding" + "fmt" + "github.com/brianvoe/gofakeit/v6" + . "github.com/stretchr/testify/assert" + "github.com/synapsecns/sanguine/core/toml" +) + +// WorkingConfig is a config that will work. +type WorkingConfig struct { + SubConfig *WorkingSubConfig `toml:"SubConfig"` +} + +// Encode enodes the sub config. +func (w *WorkingConfig) Encode() (string, error) { + //nolint: wrapcheck + return toml.Encode(w) +} + +var _ toml.Encodable = &WorkingConfig{} + +// WorkingSubConfig is a config with that uses the marshaller method and will work +// this will work because we wrap it in the working subconfig burntToml. +type WorkingSubConfig struct { + // OperatorKeyFile is a path to the operator key this node will use + IsaConfig bool `toml:"IsAConfig"` + // Name is the password used to decrypt the keyfile + Name string `toml:"OperatorKeyPassword"` +} + +// MarshallText uses the marshall text method from marshaller +// Important: w must be a pointer. +func (w *WorkingSubConfig) MarshalText() (text []byte, err error) { + //nolint: wrapcheck + return toml.MarshalTextPtr(w) +} + +var _ encoding.TextMarshaler = &WorkingSubConfig{} + +// BrokenConfig is a config that will not work b/c of a missing MarshallTextPtr encode on a pointer config. +type BrokenConfig struct { + SubConfig *BrokenSubConfig `toml:"SubConfig"` +} + +// Encode encodes the broken config. +func (b *BrokenConfig) Encode() (string, error) { + //nolint: wrapcheck + return toml.Encode(b) +} + +var _ toml.Encodable = &BrokenConfig{} + +// BrokenConfig is a broken config since it is passed by pointer but does not implement marshall text +// this will return nothing. +type BrokenSubConfig struct { + // OperatorKeyFile is a path to the operator key this node will use + IsaConfig bool `burntToml:"IsAConfig"` + // Name is the password used to decrypt the keyfile + Name string `burntToml:"OperatorKeyPassword"` +} + +// generateWorkingConfig is a helper method to generate a working config with random data. +func generateWorkingConfig() *WorkingConfig { + return &WorkingConfig{ + SubConfig: &WorkingSubConfig{ + IsaConfig: gofakeit.Bool(), + Name: gofakeit.Name(), + }} +} + +// generateBrokenCofnig generates a broken config is a helper method to generate a broken config with random data. +func generateBrokenConfig() *BrokenConfig { + return &BrokenConfig{SubConfig: &BrokenSubConfig{ + IsaConfig: gofakeit.Bool(), + Name: gofakeit.Name(), + }} +} + +// ExampleTestMarshallerImplementation shows how to use the marshaller function +// this is useful for when you have a config and a sub config that uses a pointer. +func ExampleMarshalTextPtr() { + // if we use a struct that doesn't use marshaller text, we see no output + brokenConfig := generateBrokenConfig() + fmt.Println(brokenConfig.Encode()) + + // otherwise, we see output + workingConfig := generateWorkingConfig() + fmt.Println(workingConfig.Encode()) +} + +func (t TomlSuite) TestExample() { + NotPanics(t.T(), func() { + ExampleMarshalTextPtr() + }) +} diff --git a/core/toml/suite_test.go b/core/toml/suite_test.go new file mode 100644 index 0000000000..ae3c35e07c --- /dev/null +++ b/core/toml/suite_test.go @@ -0,0 +1,25 @@ +package toml_test + +import ( + "github.com/stretchr/testify/suite" + "github.com/synapsecns/sanguine/core/testsuite" + "testing" +) + +// TomlSuite defines the basic test suite. +type TomlSuite struct { + *testsuite.TestSuite +} + +// NewTestSuite creates a new test suite and performs some basic checks afterward. +// Every test suite in the synapse library should inherit from this suite and override where necessary. +func NewTestSuite(tb testing.TB) *TomlSuite { + tb.Helper() + return &TomlSuite{ + testsuite.NewTestSuite(tb), + } +} + +func TestTomlSuite(t *testing.T) { + suite.Run(t, NewTestSuite(t)) +} diff --git a/ethergo/backends/backend.go b/ethergo/backends/backend.go index 8e7ae5c79a..6a40e9c85b 100644 --- a/ethergo/backends/backend.go +++ b/ethergo/backends/backend.go @@ -57,20 +57,3 @@ type TestBackend interface { // SimulatedTestBackend is the base of a test backend SimulatedTestBackend } - -// DeployedContract is the contract interface. -type DeployedContract interface { - // Address is the address where the contract has been deployed - Address() common.Address - // ContractHandle is the actual handle returned by deploying the contract - // this must be castt o be useful - ContractHandle() interface{} - // Owner of the contract - Owner() common.Address - // DeployTx is the transaction where the contract was created - DeployTx() *types.Transaction - // ChainID is the chain id - ChainID() *big.Int - // OwnerPtr is a pointer to the owner - OwnerPtr() *common.Address -} diff --git a/ethergo/backends/base/base.go b/ethergo/backends/base/base.go index bae7ba3465..d2265ee6b2 100644 --- a/ethergo/backends/base/base.go +++ b/ethergo/backends/base/base.go @@ -12,8 +12,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/synapsecns/sanguine/ethergo/backends" - "github.com/synapsecns/sanguine/ethergo/deployer" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/synapsecns/sanguine/ethergo/signer/nonce" synapseCommon "github.com/synapsecns/synapse-node/pkg/common" "github.com/synapsecns/synapse-node/pkg/evm" @@ -107,7 +106,7 @@ var logOnce sync.Once var EnableLocalDebug = os.Getenv("CI") == "" // VerifyContract calls the contract verification hook (e.g. tenderly). -func (b *Backend) VerifyContract(contractType deployer.ContractType, contract backends.DeployedContract) (resError error) { +func (b *Backend) VerifyContract(contractType contracts.ContractType, contract contracts.DeployedContract) (resError error) { // TODO actually verify the contract against abi locally: https://pkg.go.dev/github.com/iden3/tx-forwarder/eth/contracts/verifier // until then we go ahead and run a code at to ensure the correct address was used, this helps avoid extremely hard to debug prob go func() { diff --git a/ethergo/backends/base/suite_test.go b/ethergo/backends/base/suite_test.go index ac2404b361..a9e50e1e36 100644 --- a/ethergo/backends/base/suite_test.go +++ b/ethergo/backends/base/suite_test.go @@ -2,20 +2,20 @@ package base_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) // BaseSuite is the base test suite. type BaseSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewBaseSuite creates a end-to-end test suite. func NewBaseSuite(tb testing.TB) *BaseSuite { tb.Helper() return &BaseSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/backends/ganache/auth_test.go b/ethergo/backends/ganache/auth_test.go index 7a7c9bc52b..d75087e51f 100644 --- a/ethergo/backends/ganache/auth_test.go +++ b/ethergo/backends/ganache/auth_test.go @@ -5,7 +5,7 @@ import ( "github.com/Flaque/filet" "github.com/ethereum/go-ethereum/crypto" . "github.com/stretchr/testify/assert" - "github.com/synapsecns/synapse-node/testutils/backends/ganache" + "github.com/synapsecns/sanguine/ethergo/backends/ganache" "log" ) diff --git a/ethergo/backends/ganache/suite_test.go b/ethergo/backends/ganache/suite_test.go index 53a051b1ae..91cf8aa8af 100644 --- a/ethergo/backends/ganache/suite_test.go +++ b/ethergo/backends/ganache/suite_test.go @@ -2,19 +2,19 @@ package ganache_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type GanacheSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewGanacheSuite creates a end-to-end test suite. func NewGanacheSuite(tb testing.TB) *GanacheSuite { tb.Helper() return &GanacheSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/backends/geth/suite_test.go b/ethergo/backends/geth/suite_test.go index 08d077b0fd..63c4754158 100644 --- a/ethergo/backends/geth/suite_test.go +++ b/ethergo/backends/geth/suite_test.go @@ -2,19 +2,19 @@ package geth_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type GethSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewGethSuite creates a end-to-end test suite. func NewGethSuite(tb testing.TB) *GethSuite { tb.Helper() return &GethSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/backends/simulated/multibackend/suite_test.go b/ethergo/backends/simulated/multibackend/suite_test.go index 8f722c6c4b..65701c507f 100644 --- a/ethergo/backends/simulated/multibackend/suite_test.go +++ b/ethergo/backends/simulated/multibackend/suite_test.go @@ -2,19 +2,19 @@ package multibackend_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type MultiBackendSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewMultiBackendSuite creates a end-to-end test suite. func NewMultiBackendSuite(tb testing.TB) *MultiBackendSuite { tb.Helper() return &MultiBackendSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/backends/simulated/suite_test.go b/ethergo/backends/simulated/suite_test.go index 73e646856c..f6a627da83 100644 --- a/ethergo/backends/simulated/suite_test.go +++ b/ethergo/backends/simulated/suite_test.go @@ -2,19 +2,19 @@ package simulated_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type SimulatedSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewSimulatedSuite creates a end-to-end test suite. func NewSimulatedSuite(tb testing.TB) *SimulatedSuite { tb.Helper() return &SimulatedSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/backends/verify.go b/ethergo/backends/verify.go index d8df836416..03dcda1d23 100644 --- a/ethergo/backends/verify.go +++ b/ethergo/backends/verify.go @@ -1,10 +1,10 @@ package backends import ( - "github.com/synapsecns/sanguine/ethergo/deployer" + "github.com/synapsecns/sanguine/ethergo/contracts" ) // ContractVerifier is a hook used to verify contracts with a test provider. type ContractVerifier interface { - VerifyContract(contractType deployer.ContractType, contract DeployedContract) error + VerifyContract(contractType contracts.ContractType, contract contracts.DeployedContract) error } diff --git a/ethergo/deployer/contract_type.go b/ethergo/contracts/contract_type.go similarity index 96% rename from ethergo/deployer/contract_type.go rename to ethergo/contracts/contract_type.go index e938766ab4..65de60ad0f 100644 --- a/ethergo/deployer/contract_type.go +++ b/ethergo/contracts/contract_type.go @@ -1,4 +1,4 @@ -package deployer +package contracts import "github.com/ethereum/go-ethereum/common/compiler" diff --git a/ethergo/contracts/deployed.go b/ethergo/contracts/deployed.go new file mode 100644 index 0000000000..f93fa53e82 --- /dev/null +++ b/ethergo/contracts/deployed.go @@ -0,0 +1,24 @@ +package contracts + +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "math/big" +) + +// DeployedContract is the contract interface. +type DeployedContract interface { + // Address is the address where the contract has been deployed + Address() common.Address + // ContractHandle is the actual handle returned by deploying the contract + // this must be castt o be useful + ContractHandle() interface{} + // Owner of the contract + Owner() common.Address + // DeployTx is the transaction where the contract was created + DeployTx() *types.Transaction + // ChainID is the chain id + ChainID() *big.Int + // OwnerPtr is a pointer to the owner + OwnerPtr() *common.Address +} diff --git a/ethergo/contracts/doc.go b/ethergo/contracts/doc.go new file mode 100644 index 0000000000..597cf7c6c6 --- /dev/null +++ b/ethergo/contracts/doc.go @@ -0,0 +1,2 @@ +// Package contracts contains contract types +package contracts diff --git a/ethergo/deployer/base.go b/ethergo/deployer/base.go index f7be990680..e4e9c26a07 100644 --- a/ethergo/deployer/base.go +++ b/ethergo/deployer/base.go @@ -6,7 +6,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/synapsecns/synapse-node/testutils/backends" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/contracts" ) // BaseDeployer is a basic deployment contract. It contains several utility functions including: @@ -17,11 +18,11 @@ type BaseDeployer struct { registry GetOnlyContractRegistry // backend is the registry backend backends.SimulatedTestBackend - contractType ContractType + contractType contracts.ContractType } // NewSimpleDeployer creates a new base deployer. -func NewSimpleDeployer(registry GetOnlyContractRegistry, backend backends.SimulatedTestBackend, contractType ContractType) *BaseDeployer { +func NewSimpleDeployer(registry GetOnlyContractRegistry, backend backends.SimulatedTestBackend, contractType contracts.ContractType) *BaseDeployer { return &BaseDeployer{ registry: registry, backend: backend, @@ -30,7 +31,7 @@ func NewSimpleDeployer(registry GetOnlyContractRegistry, backend backends.Simula } // Deploy is a placeholder to ensure function inheritance. Calling this directly will panic. -func (n BaseDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (n BaseDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { panic("deploy not implemented in base deployer") } @@ -45,19 +46,19 @@ func (n BaseDeployer) Registry() GetOnlyContractRegistry { } // ContractType returns the contract type. -func (n BaseDeployer) ContractType() ContractType { +func (n BaseDeployer) ContractType() contracts.ContractType { return n.contractType } // Dependencies returns dependencies for the contract - this should be overridden by base classes if there are dependencies. -func (n BaseDeployer) Dependencies() []ContractType { - return []ContractType{} +func (n BaseDeployer) Dependencies() []contracts.ContractType { + return []contracts.ContractType{} } // RecursiveDependencies recursively get dependencies. -func (n BaseDeployer) RecursiveDependencies(dependencies []ContractType) (res []ContractType) { +func (n BaseDeployer) RecursiveDependencies(dependencies []contracts.ContractType) (res []contracts.ContractType) { // check if dependency is already in result - resultHasDependency := func(dep ContractType) bool { + resultHasDependency := func(dep contracts.ContractType) bool { for _, dependency := range res { if dep.ID() == dependency.ID() { return true @@ -85,7 +86,7 @@ type HandleFunc func(address common.Address, backend bind.ContractBackend) (inte // DeploySimpleContract handles no dependency contract deployments. // All others must be handled in inheriting structs. -func (n BaseDeployer) DeploySimpleContract(ctx context.Context, deployFunction DeployFunc, handleFunction HandleFunc) (backends.DeployedContract, error) { +func (n BaseDeployer) DeploySimpleContract(ctx context.Context, deployFunction DeployFunc, handleFunction HandleFunc) (contracts.DeployedContract, error) { auth := n.backend.GetTxContext(ctx, nil) tmpAddress, tx, _, err := deployFunction(auth.TransactOpts, n.backend) if err != nil { diff --git a/ethergo/deployer/deployed_contract.go b/ethergo/deployer/deployed_contract.go index 16a64beb05..31cff95bfc 100644 --- a/ethergo/deployer/deployed_contract.go +++ b/ethergo/deployer/deployed_contract.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/stretchr/testify/assert" - "github.com/synapsecns/synapse-node/testutils/backends" + "github.com/synapsecns/sanguine/ethergo/contracts" "math/big" "testing" ) @@ -72,4 +72,4 @@ func (d DeployedContract) ChainID() *big.Int { return d.chainID } -var _ backends.DeployedContract = DeployedContract{} +var _ contracts.DeployedContract = DeployedContract{} diff --git a/ethergo/deployer/registry.go b/ethergo/deployer/registry.go index 9edb4933b5..e1cda1c729 100644 --- a/ethergo/deployer/registry.go +++ b/ethergo/deployer/registry.go @@ -4,7 +4,8 @@ import ( "context" "github.com/neverlee/keymutex" "github.com/stretchr/testify/assert" - "github.com/synapsecns/synapse-node/testutils/backends" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/contracts" "strconv" "sync" "testing" @@ -13,35 +14,35 @@ import ( // ContractDeployer is a contract deployer for a single contract type. type ContractDeployer interface { // Deploy deploys the contract and returns an error if it cannot be deployed - Deploy(ctx context.Context) (backends.DeployedContract, error) + Deploy(ctx context.Context) (contracts.DeployedContract, error) // ContractType gets the type of the deployed contract - ContractType() ContractType + ContractType() contracts.ContractType // Dependencies gets the dependencies of this contract - Dependencies() []ContractType + Dependencies() []contracts.ContractType } // GetOnlyContractRegistry is a contract registry that only allows gets. type GetOnlyContractRegistry interface { // Get gets a contract by type. If the contract is not deployed, a new contract of type is deployed. // In cases where an error is present, this error is triggered via the test object in the constructor - Get(ctx context.Context, contractType ContractType) backends.DeployedContract + Get(ctx context.Context, contractType contracts.ContractType) contracts.DeployedContract // GetRegisteredDeployer gets the deployer for a given contract, returs nil if it doesn't exist - GetRegisteredDeployer(contractType ContractType) ContractDeployer + GetRegisteredDeployer(contractType contracts.ContractType) ContractDeployer } // ContractRegistry handles contract deployment/storage for a specific chain. type ContractRegistry interface { GetOnlyContractRegistry // Deploy deploys the contract type, but does not register it - Deploy(ctx context.Context, contractType ContractType) backends.DeployedContract + Deploy(ctx context.Context, contractType contracts.ContractType) contracts.DeployedContract // Register registers the contract with the contract registry. If you use Get() this isn't // required. This method is idempotent and will overwrite any contracts deployed - Register(contractType ContractType, contract backends.DeployedContract) + Register(contractType contracts.ContractType, contract contracts.DeployedContract) // RegisterContractDeployer registers contract types that can be used for deployment. This allows extensibility by // non-synapse libraries. This will overwrite previous contract deployers with the same type RegisterContractDeployer(deployers ...ContractDeployer) // IsContractDeployed checks if a contract is deplyoed yet - IsContractDeployed(contractType ContractType) bool + IsContractDeployed(contractType contracts.ContractType) bool // RegisteredDeployers gets all deployers registered RegisteredDeployers() []ContractDeployer } @@ -61,7 +62,7 @@ type contractRegistryImpl struct { // deployers stores the contract deploers deployers map[int]ContractDeployer // deployedContracts are the deployed contracts - deployedContracts map[int]backends.DeployedContract + deployedContracts map[int]contracts.DeployedContract } func (c *contractRegistryImpl) RegisteredDeployers() (deployers []ContractDeployer) { @@ -73,7 +74,7 @@ func (c *contractRegistryImpl) RegisteredDeployers() (deployers []ContractDeploy return deployers } -func (c *contractRegistryImpl) IsContractDeployed(contractType ContractType) bool { +func (c *contractRegistryImpl) IsContractDeployed(contractType contracts.ContractType) bool { c.structMux.RLock() defer c.structMux.RUnlock() _, hasContract := c.deployedContracts[contractType.ID()] @@ -90,12 +91,12 @@ func NewContractRegistry(tb testing.TB, backend backends.SimulatedTestBackend) C structMux: sync.RWMutex{}, deployMutex: keymutex.New(47), deployers: make(map[int]ContractDeployer), - deployedContracts: make(map[int]backends.DeployedContract), + deployedContracts: make(map[int]contracts.DeployedContract), } } // Get gets the deployed contract. -func (c *contractRegistryImpl) Get(ctx context.Context, contractType ContractType) backends.DeployedContract { +func (c *contractRegistryImpl) Get(ctx context.Context, contractType contracts.ContractType) contracts.DeployedContract { c.tb.Helper() // contractLock this deployedContract @@ -125,16 +126,16 @@ func (c *contractRegistryImpl) Get(ctx context.Context, contractType ContractTyp } // contractLock creates a contractLock from a contract type and locks the mutex. -func (c *contractRegistryImpl) contractLock(contractType ContractType) { +func (c *contractRegistryImpl) contractLock(contractType contracts.ContractType) { c.deployMutex.Lock(strconv.Itoa(contractType.ID())) } // contractUnlock unlocks a contractLock based on the contract type. -func (c *contractRegistryImpl) contractUnlock(contractType ContractType) { +func (c *contractRegistryImpl) contractUnlock(contractType contracts.ContractType) { c.deployMutex.Unlock(strconv.Itoa(contractType.ID())) } -func (c *contractRegistryImpl) Deploy(ctx context.Context, contractType ContractType) backends.DeployedContract { +func (c *contractRegistryImpl) Deploy(ctx context.Context, contractType contracts.ContractType) contracts.DeployedContract { c.tb.Helper() c.structMux.RLock() deploymentHandle := c.deployers[contractType.ID()] @@ -153,7 +154,7 @@ func (c *contractRegistryImpl) Deploy(ctx context.Context, contractType Contract return deployedContract } -func (c *contractRegistryImpl) Register(contractType ContractType, contract backends.DeployedContract) { +func (c *contractRegistryImpl) Register(contractType contracts.ContractType, contract contracts.DeployedContract) { c.tb.Helper() // contractLock this deployedContract c.contractLock(contractType) @@ -172,7 +173,7 @@ func (c *contractRegistryImpl) RegisterContractDeployer(deployers ...ContractDep } } -func (c *contractRegistryImpl) GetRegisteredDeployer(contractType ContractType) ContractDeployer { +func (c *contractRegistryImpl) GetRegisteredDeployer(contractType contracts.ContractType) ContractDeployer { c.structMux.RLock() defer c.structMux.RUnlock() for contract, deployer := range c.deployers { diff --git a/ethergo/example/README.md b/ethergo/example/README.md index 1d64e71892..824cdaa050 100644 --- a/ethergo/example/README.md +++ b/ethergo/example/README.md @@ -11,7 +11,7 @@ ```go package counter - //go:generate go run github.com/synapsecns/synapse-node/testutils/codegen/abigen generate --sol ./counter.sol --pkg counter --sol-version 0.8.4 --filename counter + //go:generate go run github.com/synapsecns/sanguine/tools/abigen generate --sol ./counter.sol --pkg counter --sol-version 0.8.4 --filename counter ``` @@ -115,7 +115,7 @@ "github.com/ethereum/go-ethereum/core/types" "github.com/synapsecns/sanguine/ethergo/deployer" "github.com/synapsecns/sanguine/ethergo/example/counter" - "github.com/synapsecns/synapse-node/testutils/backends" + "github.com/synapsecns/sanguine/ethergo/backends" ) // CounterDeployer deploys a counter. @@ -156,7 +156,7 @@ "github.com/synapsecns/sanguine/ethergo/example" "github.com/synapsecns/sanguine/ethergo/example/counter" "github.com/synapsecns/sanguine/ethergo/manager" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "testing" "time" ) diff --git a/ethergo/example/contracttype.go b/ethergo/example/contracttype.go index 1f07283e5e..43f2f9b0fa 100644 --- a/ethergo/example/contracttype.go +++ b/ethergo/example/contracttype.go @@ -2,7 +2,7 @@ package example import ( "github.com/ethereum/go-ethereum/common/compiler" - "github.com/synapsecns/sanguine/ethergo/deployer" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/synapsecns/sanguine/ethergo/example/counter" ) @@ -12,7 +12,7 @@ func init() { contractType := contractTypeImpl(i) AllContractTypes = append(AllContractTypes, contractType) // assert type is correct - var _ deployer.ContractType = contractType + var _ contracts.ContractType = contractType } } @@ -70,4 +70,4 @@ func (c contractTypeImpl) ContractName() string { } // make sure contractTypeImpl conforms to deployer.ContractType. -var _ deployer.ContractType = contractTypeImpl(1) +var _ contracts.ContractType = contractTypeImpl(1) diff --git a/ethergo/example/counter_test.go b/ethergo/example/counter_test.go index ccc4440393..5c7c42fda9 100644 --- a/ethergo/example/counter_test.go +++ b/ethergo/example/counter_test.go @@ -4,10 +4,10 @@ import ( "context" "github.com/ethereum/go-ethereum/accounts/abi/bind" . "github.com/stretchr/testify/assert" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "github.com/synapsecns/sanguine/ethergo/example" "github.com/synapsecns/sanguine/ethergo/example/counter" "github.com/synapsecns/sanguine/ethergo/manager" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" "testing" "time" ) diff --git a/ethergo/example/deployer.go b/ethergo/example/deployer.go index f602b84165..b572af0a96 100644 --- a/ethergo/example/deployer.go +++ b/ethergo/example/deployer.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/synapsecns/sanguine/ethergo/deployer" "github.com/synapsecns/sanguine/ethergo/example/counter" - "github.com/synapsecns/synapse-node/testutils/backends" ) // CounterDeployer deploys a counter. @@ -23,7 +24,7 @@ func NewCounterDeployer(registry deployer.GetOnlyContractRegistry, backend backe } // Deploy deploys the contract. -func (n *CounterDeployer) Deploy(ctx context.Context) (backends.DeployedContract, error) { +func (n *CounterDeployer) Deploy(ctx context.Context) (contracts.DeployedContract, error) { //nolint: wrapcheck return n.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, interface{}, error) { //nolint: wrapcheck diff --git a/ethergo/go.mod b/ethergo/go.mod index fc1d93a1f0..b046c75a07 100644 --- a/ethergo/go.mod +++ b/ethergo/go.mod @@ -20,13 +20,13 @@ require ( github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.0 + github.com/synapsecns/sanguine/core v0.0.0-00010101000000-000000000000 github.com/synapsecns/synapse-node v0.242.0 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/teivah/onecontext v1.3.0 - github.com/tenderly/tenderly-cli v1.1.2 github.com/tyler-smith/go-bip39 v1.1.0 - go.uber.org/zap v1.19.1 + go.uber.org/zap v1.22.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c gopkg.in/yaml.v2 v2.4.0 gotest.tools v2.2.0+incompatible @@ -36,7 +36,7 @@ require ( require ( filippo.io/edwards25519 v1.0.0-beta.2 // indirect github.com/99designs/keyring v1.1.6 // indirect - github.com/BurntSushi/toml v1.0.0 // indirect + github.com/BurntSushi/toml v1.1.0 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/CosmWasm/wasmvm v0.16.3 // indirect github.com/DataDog/zstd v1.4.5 // indirect @@ -62,7 +62,8 @@ require ( github.com/bgentry/speakeasy v0.1.0 // indirect github.com/binance-chain/tss-lib v1.3.3 // indirect github.com/briandowns/spinner v1.6.1 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/celo-org/celo-blockchain v0.0.0-20210222234634-f8c8f6744526 // indirect github.com/celo-org/celo-bls-go v0.2.4 // indirect @@ -232,7 +233,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/otiai10/primes v0.0.0-20180210170552-f6d2a1ba97c4 // indirect - github.com/pborman/uuid v1.2.0 // indirect + github.com/pborman/uuid v1.2.1 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -265,8 +266,9 @@ require ( github.com/status-im/keycard-go v0.0.0-20191119114148-6dd40a46baa0 // indirect github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 // indirect github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect - github.com/stretchr/objx v0.3.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect + github.com/tenderly/tenderly-cli v1.1.2 // indirect github.com/tendermint/btcd v0.1.1 // indirect github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect @@ -286,11 +288,10 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect @@ -302,7 +303,7 @@ require ( gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 // indirect gopkg.in/resty.v1 v1.12.0 // indirect gopkg.in/urfave/cli.v1 v1.20.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.1.2 // indirect gorm.io/driver/sqlite v1.1.5 // indirect gorm.io/gorm v1.21.15 // indirect diff --git a/ethergo/go.sum b/ethergo/go.sum index d3f8338470..44678dcf75 100644 --- a/ethergo/go.sum +++ b/ethergo/go.sum @@ -86,8 +86,9 @@ github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= +github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= @@ -244,8 +245,11 @@ github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8/go.mod h1:3J08xEfcug github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= @@ -387,6 +391,7 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ= github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg= github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= @@ -1460,8 +1465,9 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= +github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= @@ -1698,8 +1704,8 @@ github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5J github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= -github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1708,8 +1714,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f h1:F2+tY8Y1n1Qn77mROlRcqV+k987FJNTwL4k48s4pck0= @@ -1858,7 +1865,6 @@ go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -1873,8 +1879,9 @@ go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= +go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1948,7 +1955,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -2187,8 +2193,9 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -2287,7 +2294,6 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2536,8 +2542,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.1.2 h1:OofcyE2lga734MxwcCW9uB4mWNXMr50uaGRVwQL2B0M= gorm.io/driver/mysql v1.1.2/go.mod h1:4P/X9vSc3WTrhTLZ259cpFd6xKNYiSSdSZngkSBGIMM= gorm.io/driver/sqlite v1.1.5 h1:JU8G59VyKu1x1RMQgjefQnkZjDe9wHc1kARDZPu5dZs= diff --git a/ethergo/manager/manager.go b/ethergo/manager/manager.go index 4870d9d13e..26454ac5f7 100644 --- a/ethergo/manager/manager.go +++ b/ethergo/manager/manager.go @@ -4,8 +4,9 @@ package manager import ( "context" "github.com/stretchr/testify/suite" + "github.com/synapsecns/sanguine/ethergo/backends" + "github.com/synapsecns/sanguine/ethergo/contracts" "github.com/synapsecns/sanguine/ethergo/deployer" - "github.com/synapsecns/synapse-node/testutils/backends" "sync" "testing" ) @@ -52,7 +53,7 @@ func (d *DeployerManager) SetT(t *testing.T) { // BulkDeploy synchronously deploys a bunch of contracts as quickly as possible to speed up tests. // in a future version this will utilize dependency trees. Returns nothing when complete. -func (d *DeployerManager) BulkDeploy(ctx context.Context, testBackends []backends.SimulatedTestBackend, contracts ...deployer.ContractType) { +func (d *DeployerManager) BulkDeploy(ctx context.Context, testBackends []backends.SimulatedTestBackend, contracts ...contracts.ContractType) { wg := sync.WaitGroup{} for _, backend := range testBackends { wg.Add(1) @@ -89,7 +90,7 @@ func (d *DeployerManager) GetContractRegistry(backend backends.SimulatedTestBack } // Get gets the contract from the registry. -func (d *DeployerManager) Get(ctx context.Context, backend backends.SimulatedTestBackend, contractType deployer.ContractType) backends.DeployedContract { +func (d *DeployerManager) Get(ctx context.Context, backend backends.SimulatedTestBackend, contractType contracts.ContractType) contracts.DeployedContract { return d.GetContractRegistry(backend).Get(ctx, contractType) } diff --git a/ethergo/signer/nonce/nonce.go b/ethergo/signer/nonce/nonce.go index 34e898958b..5d110c6d57 100644 --- a/ethergo/signer/nonce/nonce.go +++ b/ethergo/signer/nonce/nonce.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/pkg/errors" - synapseCommon "github.com/synapsecns/synapse-node/pkg/common" + "github.com/synapsecns/sanguine/core" "github.com/synapsecns/synapse-node/pkg/common/mapmutex" "math/big" "sync" @@ -62,7 +62,7 @@ func NewNonceManager(ctx context.Context, chain ChainQuery, chainID *big.Int) Ma //nolint: containedctx ctx: ctx, chain: chain, - chainID: synapseCommon.CopyBigInt(chainID), + chainID: core.CopyBigInt(chainID), nonceMap: make(map[common.Address]*big.Int), nonceMapLock: sync.RWMutex{}, accountMutex: mapmutex.NewStringerMapMutex(), diff --git a/ethergo/signer/nonce/suite_test.go b/ethergo/signer/nonce/suite_test.go index 59c83d98aa..9c3a27d07e 100644 --- a/ethergo/signer/nonce/suite_test.go +++ b/ethergo/signer/nonce/suite_test.go @@ -2,20 +2,20 @@ package nonce_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) // NonceSuite is the nonce suite. type NonceSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewNonceSuite creates a end-to-end test suite. func NewNonceSuite(tb testing.TB) *NonceSuite { tb.Helper() return &NonceSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/signer/signer/kmssigner/kmsmock/suite_test.go b/ethergo/signer/signer/kmssigner/kmsmock/suite_test.go index d01af27dfc..5f202b6c2d 100644 --- a/ethergo/signer/signer/kmssigner/kmsmock/suite_test.go +++ b/ethergo/signer/signer/kmssigner/kmsmock/suite_test.go @@ -2,19 +2,19 @@ package kmsmock_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type KMSSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewKMSSuite creates a end-to-end test suite. func NewKMSSuite(tb testing.TB) *KMSSuite { tb.Helper() return &KMSSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/signer/signer/kmssigner/signing_test.go b/ethergo/signer/signer/kmssigner/signing_test.go index 124448aad8..0fd2dfd4b5 100644 --- a/ethergo/signer/signer/kmssigner/signing_test.go +++ b/ethergo/signer/signer/kmssigner/signing_test.go @@ -5,8 +5,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" . "github.com/stretchr/testify/assert" + "github.com/synapsecns/sanguine/ethergo/backends/simulated" "github.com/synapsecns/sanguine/ethergo/signer/signer/kmssigner" - "github.com/synapsecns/synapse-node/testutils/backends/simulated" "math/big" ) diff --git a/ethergo/signer/signer/kmssigner/suite_test.go b/ethergo/signer/signer/kmssigner/suite_test.go index 74b4170441..4f0ba0ac4d 100644 --- a/ethergo/signer/signer/kmssigner/suite_test.go +++ b/ethergo/signer/signer/kmssigner/suite_test.go @@ -2,19 +2,19 @@ package kmssigner_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type KMSSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewKMSSuite creates a end-to-end test suite. func NewKMSSuite(tb testing.TB) *KMSSuite { tb.Helper() return &KMSSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/ethergo/signer/signer/signer.go b/ethergo/signer/signer/signer.go index 20c8a7efa5..0e8b49eb70 100644 --- a/ethergo/signer/signer/signer.go +++ b/ethergo/signer/signer/signer.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" ethCommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/synapsecns/synapse-node/pkg/common" + "github.com/synapsecns/sanguine/core" "math/big" ) @@ -44,15 +44,15 @@ type signatureImpl struct { } func (sg signatureImpl) V() *big.Int { - return common.CopyBigInt(sg.v) + return core.CopyBigInt(sg.v) } func (sg signatureImpl) R() *big.Int { - return common.CopyBigInt(sg.r) + return core.CopyBigInt(sg.r) } func (sg signatureImpl) S() *big.Int { - return common.CopyBigInt(sg.s) + return core.CopyBigInt(sg.s) } // Encode encodes a signature. diff --git a/ethergo/signer/wallet/suite_test.go b/ethergo/signer/wallet/suite_test.go index af51584dc0..1f1290d791 100644 --- a/ethergo/signer/wallet/suite_test.go +++ b/ethergo/signer/wallet/suite_test.go @@ -2,19 +2,19 @@ package wallet_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type WalletSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewWalletSuite creates a end-to-end test suite. func NewWalletSuite(tb testing.TB) *WalletSuite { tb.Helper() return &WalletSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/scribe/config/config.go b/scribe/config/config.go index 53ec850a75..c119d3a562 100644 --- a/scribe/config/config.go +++ b/scribe/config/config.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/BurntSushi/toml" - tomlCommon "github.com/synapsecns/synapse-node/pkg/common/toml" + tomlCommon "github.com/synapsecns/sanguine/core/toml" ) // Config is used to configure a Scribe instance and information about chains and contracts. diff --git a/scribe/config/suite_test.go b/scribe/config/suite_test.go index ec19c7107e..87735e86eb 100644 --- a/scribe/config/suite_test.go +++ b/scribe/config/suite_test.go @@ -2,20 +2,20 @@ package config_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) // ConfigSuite is the config test suite. type ConfigSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewConfigSuite creates a end-to-end test suite. func NewConfigSuite(tb testing.TB) *ConfigSuite { tb.Helper() return &ConfigSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/scribe/go.mod b/scribe/go.mod index 9708813d18..f738fcc449 100644 --- a/scribe/go.mod +++ b/scribe/go.mod @@ -3,7 +3,10 @@ module github.com/synapsecns/sanguine/scribe go 1.18 require ( + github.com/BurntSushi/toml v1.1.0 + github.com/Flaque/filet v0.0.0-20201012163910-45f684403088 github.com/brianvoe/gofakeit/v6 v6.9.0 + github.com/ethereum/go-ethereum v1.10.11 github.com/richardwilkes/toolbox v1.52.0 github.com/stretchr/testify v1.8.0 github.com/synapsecns/synapse-node v0.242.0 @@ -12,11 +15,9 @@ require ( require ( filippo.io/edwards25519 v1.0.0-beta.2 // indirect github.com/99designs/keyring v1.1.6 // indirect - github.com/BurntSushi/toml v1.0.0 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/CosmWasm/wasmvm v0.16.3 // indirect github.com/DataDog/zstd v1.4.5 // indirect - github.com/Flaque/filet v0.0.0-20201012163910-45f684403088 // indirect github.com/LK4d4/trylock v0.0.0-20191027065348-ff7e133a5c54 // indirect github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect github.com/VictoriaMetrics/fastcache v1.6.0 // indirect @@ -24,11 +25,13 @@ require ( github.com/aristanetworks/goarista v0.0.0-20200206021550-59c4040ef2d3 // indirect github.com/armon/go-metrics v0.3.10 // indirect github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/aws/smithy-go v1.11.3 // indirect github.com/benbjohnson/clock v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/binance-chain/tss-lib v1.3.3 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/celo-org/celo-blockchain v0.0.0-20210222234634-f8c8f6744526 // indirect github.com/celo-org/celo-bls-go v0.2.4 // indirect @@ -59,7 +62,6 @@ require ( github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect github.com/edsrzf/mmap-go v1.0.0 // indirect github.com/elastic/gosigar v0.10.5 // indirect - github.com/ethereum/go-ethereum v1.10.11 // indirect github.com/fatih/structtag v1.2.0 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect @@ -77,7 +79,7 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.0 // indirect - github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/google/gopacket v1.1.18 // indirect github.com/google/uuid v1.1.5 // indirect github.com/gorilla/handlers v1.5.1 // indirect @@ -194,7 +196,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/otiai10/primes v0.0.0-20180210170552-f6d2a1ba97c4 // indirect - github.com/pborman/uuid v1.2.0 // indirect + github.com/pborman/uuid v1.2.1 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect @@ -248,9 +250,8 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.7.0 // indirect - go.uber.org/zap v1.19.1 // indirect + go.uber.org/zap v1.22.0 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect diff --git a/scribe/go.sum b/scribe/go.sum index fbeb5c5c71..45ed1ea797 100644 --- a/scribe/go.sum +++ b/scribe/go.sum @@ -86,8 +86,8 @@ github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= @@ -189,7 +189,7 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbE github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.8.1 h1:9Y6qxtzgEODaLNGN+oN2QvcHvKUe4jsH8w4M+8LXzGk= +github.com/aws/smithy-go v1.11.3 h1:DQixirEFM9IaKxX1olZ3ke3nvxRS2xMDteKIDWxozW8= github.com/badoux/checkmail v0.0.0-20181210160741-9661bd69e9ad h1:kXfVkP8xPSJXzicomzjECcw6tv1Wl9h1lNenWBfNKdg= github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -211,9 +211,8 @@ github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+Wji github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/briandowns/spinner v1.6.1 h1:LBxHu5WLyVuVEtTD72xegiC7QJGx598LBpo3ywKTapA= +github.com/brianvoe/gofakeit/v6 v6.9.0 h1:UCGhPCKLiqBc910TKS7LcOGf74NozftibFCbGIS6GZQ= github.com/brianvoe/gofakeit/v6 v6.9.0/go.mod h1:palrJUk4Fyw38zIFB/uBZqsgzW5VsNllhHKKwAebzew= -github.com/brianvoe/gofakeit/v6 v6.18.0 h1:tDQ4zJVFQHaJKvY9xYSqGN4S7noZU/doFn15/aNbhCU= -github.com/brianvoe/gofakeit/v6 v6.18.0/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8= github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= @@ -223,8 +222,9 @@ github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8/go.mod h1:3J08xEfcug github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= @@ -600,8 +600,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= @@ -1422,8 +1422,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= @@ -1522,8 +1522,6 @@ github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= github.com/richardwilkes/toolbox v1.52.0 h1:Lp2kQfm8AYXk+GZG3jp7y4898NOmVXYG01MX+O8njh0= github.com/richardwilkes/toolbox v1.52.0/go.mod h1:jsPC77d240631vL5u96AEtgRQ7sPt+Ec8eP1ksNY5qA= -github.com/richardwilkes/toolbox v1.72.1 h1:HH/8yacAaRclZKJjT7363DbTG9xFDY41bS4BKX1yPNU= -github.com/richardwilkes/toolbox v1.72.1/go.mod h1:p0UrgVWPRsdznV+50KcHMape2HjEz4fe7rBZIso5fk4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= @@ -1819,7 +1817,6 @@ go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -1834,8 +1831,8 @@ go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1909,7 +1906,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -2249,11 +2245,9 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= diff --git a/tools/abigen/internal/etherscan/client.go b/tools/abigen/internal/etherscan/client.go new file mode 100644 index 0000000000..2506e40435 --- /dev/null +++ b/tools/abigen/internal/etherscan/client.go @@ -0,0 +1,37 @@ +package etherscan + +import ( + "context" + "fmt" + "github.com/pkg/errors" + synapseCommon "github.com/synapsecns/synapse-node/pkg/common" +) + +// NewEtherscanAbiGenClientFromChain creates a new ether scan client for a given chain. +// it applies a rate limiter at a file level that is only released when the process is complete. +func NewEtherscanAbiGenClientFromChain(ctx context.Context, chainID uint) (*Client, error) { + chain := synapseCommon.ChainIDs.ChainByID(chainID) + + api, hasAPI := APIForChain(chainID) + if !hasAPI { + return nil, fmt.Errorf("%w: chain id %d", ErrNoClientForChain, chainID) + } + return newEtherscanABIClient(ctx, chain, api, false) +} + +// APIForChain gets the analytics for a given chain that matches the etherscan standard +// returns false if none matches. +func APIForChain(chainID uint) (api synapseCommon.API, hasAPI bool) { + chain := synapseCommon.ChainIDs.ChainByID(chainID) + + for _, api = range chain.APIs { + if api.Standard != synapseCommon.EtherscanAPIStandard { + continue + } + return api, true + } + return synapseCommon.API{}, false +} + +// ErrNoClientForChain is returned if no analytics client exists for chain. +var ErrNoClientForChain = errors.New("no analytics client for chain") diff --git a/tools/abigen/internal/etherscan/client_test.go b/tools/abigen/internal/etherscan/client_test.go new file mode 100644 index 0000000000..5f95d887d1 --- /dev/null +++ b/tools/abigen/internal/etherscan/client_test.go @@ -0,0 +1,5 @@ +package etherscan_test + +func (s EtherscanSuite) TestContractSourceFromClientID() { + s.T().Skip("TODO") +} diff --git a/tools/abigen/internal/etherscan/doc.go b/tools/abigen/internal/etherscan/doc.go new file mode 100644 index 0000000000..4a89009366 --- /dev/null +++ b/tools/abigen/internal/etherscan/doc.go @@ -0,0 +1,2 @@ +// Package etherscan allows etherscan fetches while respecting the rate limit +package etherscan diff --git a/tools/abigen/internal/etherscan/etherscan.go b/tools/abigen/internal/etherscan/etherscan.go new file mode 100644 index 0000000000..2b63ae3454 --- /dev/null +++ b/tools/abigen/internal/etherscan/etherscan.go @@ -0,0 +1,80 @@ +package etherscan + +import ( + "context" + "fmt" + "github.com/nanmu42/etherscan-api" + "github.com/synapsecns/synapse-node/config" + "github.com/synapsecns/synapse-node/pkg/common" + "net/http" + "os" + "path/filepath" + "strconv" + "strings" + "time" +) + +// Client implements an etherscan client. +type Client struct { + *etherscan.Client + // rateLimiter is a file based rate limiter + rateLimiter *fileRateLimiter +} + +// timeout is the http timeout for a request. +const timeout = time.Second * 30 + +// newEtherscanABIClient creates a new etherscan client. +func newEtherscanABIClient(parentCtx context.Context, chain *common.Chain, api common.API, disableRateLimiter bool) (*Client, error) { + var client Client + ctx, cancel := context.WithCancel(parentCtx) + + apiKeyEnv := strings.ToUpper(fmt.Sprintf("%s_%s_KEY", chain.Name, common.EtherscanAPIStandard)) + apiKey := os.Getenv(apiKeyEnv) + + customization := etherscan.Customization{ + Client: &http.Client{ + Timeout: timeout, + }, + BaseURL: api.URL, + } + + // waitBetweenRequest is how long to wait between requests. If an analytics key is enabled, rate limiting is disabled + waitBetweenRequests := time.Second * 5 + rateLimiterEnabled := apiKey == "" && !disableRateLimiter + + if rateLimiterEnabled { + configDir, err := config.GetConfigDir() + if err != nil { + cancel() + return nil, fmt.Errorf("could not create file rate limiter: %w", err) + } + + rateLimitDir := filepath.Join(configDir, strconv.Itoa(chain.ChainID)) + + client.rateLimiter, err = newFileRateLimiter(ctx, rateLimitDir, waitBetweenRequests) + if err != nil { + cancel() + return nil, fmt.Errorf("could not create file rate limiter: %w", err) + } + + customization.BeforeRequest = func(_, _ string, _ map[string]interface{}) error { + _, err := client.rateLimiter.obtainLock(ctx) + return err + } + + customization.AfterRequest = func(_, action string, _ map[string]interface{}, _ interface{}, _ error) { + _, err = client.rateLimiter.releaseLock() + if err != nil { + logger.Error(err) + cancel() + } + } + } else { + // context cancellation is handled by the parent + _ = cancel + } + + client.Client = etherscan.NewCustomized(customization) + return &client, nil +} diff --git a/tools/abigen/internal/etherscan/export_test.go b/tools/abigen/internal/etherscan/export_test.go new file mode 100644 index 0000000000..cc8f9a2f34 --- /dev/null +++ b/tools/abigen/internal/etherscan/export_test.go @@ -0,0 +1,29 @@ +package etherscan + +import ( + "context" + "time" +) + +// FileRateLimiter is the file rate limiter exported for testing. +type FileRateLimiter struct { + *fileRateLimiter +} + +// NewFileRateLimiter creates a new file rate limiter. +func NewFileRateLimiter(parentCtx context.Context, filePath string, waitBetweenRequests time.Duration) (*FileRateLimiter, error) { + fileRateLimiter, err := newFileRateLimiter(parentCtx, filePath, waitBetweenRequests) + if err != nil { + return nil, err + } + return &FileRateLimiter{fileRateLimiter: fileRateLimiter}, nil +} + +// ObtainLock exports obtainLock for testing. +func (f *FileRateLimiter) ObtainLock(ctx context.Context) (ok bool, err error) { + return f.obtainLock(ctx) +} + +func (f *FileRateLimiter) ReleaseLock() (ok bool, err error) { + return f.releaseLock() +} diff --git a/tools/abigen/internal/etherscan/logger.go b/tools/abigen/internal/etherscan/logger.go new file mode 100644 index 0000000000..04d1a1a64c --- /dev/null +++ b/tools/abigen/internal/etherscan/logger.go @@ -0,0 +1,5 @@ +package etherscan + +import "github.com/ipfs/go-log" + +var logger = log.Logger("synapse-etherscan") diff --git a/tools/abigen/internal/etherscan/ratelimiter.go b/tools/abigen/internal/etherscan/ratelimiter.go new file mode 100644 index 0000000000..fe41c63203 --- /dev/null +++ b/tools/abigen/internal/etherscan/ratelimiter.go @@ -0,0 +1,137 @@ +package etherscan + +import ( + "context" + "fmt" + "github.com/gofrs/flock" + "io" + "os" + "path/filepath" + "strconv" + "sync" + "time" +) + +// fileRateLimiter implements a file based rate limiter for limiting requests across abi generate commands. +type fileRateLimiter struct { + // lockFolderPath is the path to the rate limiter + lockFolderPath string + // flock is the file locker for recording the last request. This is locked per process to prevent two from running at once + flock *flock.Flock + // waitBetweenRequests is how long to wait before requests + waitBetweenRequests time.Duration + // lastRequestFile is the last request file + lastRequestFile *os.File + // mux prevents duplicate locking + mux sync.Mutex +} + +// fileRateTimeout is how long to wait for file rate limiting. +const fileRateTimeout = time.Second * 20 + +// lastRequestFile is the last request. +const lastRequestFile = "/last_request.txt" + +// newFileRateLimiter creates a new file rate limiter. +func newFileRateLimiter(parentCtx context.Context, lockFolderPath string, waitBetweenRequests time.Duration) (*fileRateLimiter, error) { + ctx, cancel := context.WithTimeout(parentCtx, fileRateTimeout) + defer cancel() + + _ = os.MkdirAll(lockFolderPath, os.ModePerm) + + frl := fileRateLimiter{ + lockFolderPath: lockFolderPath, + waitBetweenRequests: waitBetweenRequests, + flock: flock.New(filepath.Join(lockFolderPath, "locker")), + } + + _, err := frl.flock.TryLockContext(ctx, time.Second) + if err != nil { + return nil, fmt.Errorf("could not obtain lock (timeout %s): %w", waitBetweenRequests, err) + } + + //nolint: gosec + err = frl.openFile() + if err != nil { + return nil, fmt.Errorf("could not create last request file: %w", err) + } + + return &frl, nil +} + +func (f *fileRateLimiter) openFile() (err error) { + _ = f.lastRequestFile.Close() + f.lastRequestFile, err = os.OpenFile(filepath.Join(f.lockFolderPath, lastRequestFile), os.O_RDWR|os.O_CREATE, os.ModePerm) + if err != nil { + return fmt.Errorf("could not create last request file: %w", err) + } + return nil +} + +// obtainLock locks until the time since last request is greater than waitBetweenRequests. +func (f *fileRateLimiter) obtainLock(ctx context.Context) (ok bool, err error) { + f.mux.Lock() + err = f.openFile() + if err != nil { + return false, fmt.Errorf("could not open file: %w", err) + } + + fileContents, err := io.ReadAll(f.lastRequestFile) + if err != nil { + return false, fmt.Errorf("could not obtain file contents: %w", err) + } + + var unixTimestamp int + if len(fileContents) == 0 { + unixTimestamp = 0 + } else { + unixTimestamp, err = strconv.Atoi(string(fileContents)) + if err != nil { + return false, fmt.Errorf("could not parse unix timestamp: %w", err) + } + } + + lastRequest := time.Unix(int64(unixTimestamp), 0) + + // waitPeriod is how long to wait before obtaining the lock + waitPeriod := time.Until(lastRequest.Add(f.waitBetweenRequests)) + + select { + case <-ctx.Done(): + return false, context.Canceled + case <-time.After(waitPeriod): + return true, nil + } +} + +// releaseLock releases the lock. +func (f *fileRateLimiter) releaseLock() (ok bool, err error) { + f.mux.Unlock() + + err = f.openFile() + if err != nil { + return false, fmt.Errorf("could not open file: %w", err) + } + + err = f.lastRequestFile.Truncate(0) + if err != nil { + return false, fmt.Errorf("could not truncate file: %w", err) + } + + _, err = f.lastRequestFile.Seek(0, 0) + if err != nil { + return false, fmt.Errorf("could not release lock: %w", err) + } + + _, err = f.lastRequestFile.WriteString(strconv.Itoa(int(time.Now().Unix()))) + if err != nil { + return false, fmt.Errorf("could not write timestamp: %w", err) + } + + err = f.lastRequestFile.Close() + if err != nil { + return false, fmt.Errorf("could not write timestamp: %w", err) + } + + return true, nil +} diff --git a/tools/abigen/internal/etherscan/ratelimiter_test.go b/tools/abigen/internal/etherscan/ratelimiter_test.go new file mode 100644 index 0000000000..20228f23bd --- /dev/null +++ b/tools/abigen/internal/etherscan/ratelimiter_test.go @@ -0,0 +1,32 @@ +package etherscan_test + +import ( + "github.com/Flaque/filet" + . "github.com/stretchr/testify/assert" + "github.com/synapsecns/sanguine/tools/abigen/internal/etherscan" + "time" +) + +var waitTime = time.Second + +func (s EtherscanSuite) TestRateLimiter() { + lockPath := filet.TmpDir(s.T(), "") + + rateLimiter, err := etherscan.NewFileRateLimiter(s.GetTestContext(), lockPath, waitTime) + Nil(s.T(), err) + + for lockCount := 0; lockCount < 2; lockCount++ { + expectedEndTime := time.Now().Add(waitTime) + // obtain lock obtains the lcok + ok, err := rateLimiter.ObtainLock(s.GetTestContext()) + True(s.T(), ok) + Nil(s.T(), err) + + // release lock releases the lcok + ok, err = rateLimiter.ReleaseLock() + True(s.T(), ok) + Nil(s.T(), err) + + GreaterOrEqual(s.T(), expectedEndTime.UnixNano(), time.Now().UnixNano()) + } +} diff --git a/tools/abigen/internal/etherscan/suite_test.go b/tools/abigen/internal/etherscan/suite_test.go new file mode 100644 index 0000000000..1154c6a233 --- /dev/null +++ b/tools/abigen/internal/etherscan/suite_test.go @@ -0,0 +1,23 @@ +package etherscan_test + +import ( + "github.com/stretchr/testify/suite" + "github.com/synapsecns/sanguine/core/testsuite" + "testing" +) + +type EtherscanSuite struct { + *testsuite.TestSuite +} + +// NewEtherscanSuite creates a end-to-end test suite. +func NewEtherscanSuite(tb testing.TB) *EtherscanSuite { + tb.Helper() + return &EtherscanSuite{ + TestSuite: testsuite.NewTestSuite(tb), + } +} + +func TestEtherscanSuite(t *testing.T) { + suite.Run(t, NewEtherscanSuite(t)) +} diff --git a/tools/abigen/internal/generate.go b/tools/abigen/internal/generate.go index 736e4fa626..ab45baa648 100644 --- a/tools/abigen/internal/generate.go +++ b/tools/abigen/internal/generate.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/compiler" "github.com/ethereum/go-ethereum/crypto" - "github.com/synapsecns/synapse-node/testutils/debug/etherscan" + "github.com/synapsecns/sanguine/tools/abigen/internal/etherscan" "os" "os/exec" "path" @@ -214,6 +214,7 @@ import ( ) // rawContracts are the json we use to dervive the processed contracts +// //go:embed {{ .Name }}.contractinfo.json var rawContracts []byte diff --git a/tools/abigen/internal/suite_test.go b/tools/abigen/internal/suite_test.go index 7a5bb445a6..077b19d648 100644 --- a/tools/abigen/internal/suite_test.go +++ b/tools/abigen/internal/suite_test.go @@ -3,13 +3,13 @@ package internal_test import ( "github.com/Flaque/filet" "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) // AbiSuite is the abigen suite. type AbiSuite struct { - *testutils.TestSuite + *testsuite.TestSuite exampleFilePath string } @@ -17,7 +17,7 @@ func NewAbiSuite(tb testing.TB) *AbiSuite { tb.Helper() return &AbiSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } } diff --git a/tools/go.mod b/tools/go.mod index 150298dda5..17b29b5398 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -7,9 +7,12 @@ require ( github.com/brianvoe/gofakeit/v6 v6.9.0 github.com/ethereum/go-ethereum v1.10.11 github.com/gen2brain/beeep v0.0.0-20210529141713-5586760f0cc1 + github.com/gofrs/flock v0.8.1 + github.com/ipfs/go-log v1.0.5 github.com/markbates/pkger v0.17.1 + github.com/nanmu42/etherscan-api v1.4.0 github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.0 github.com/synapsecns/sanguine/core v0.0.0-00010101000000-000000000000 github.com/synapsecns/synapse-node v0.242.0 github.com/thoas/go-funk v0.9.0 @@ -32,11 +35,13 @@ require ( github.com/aristanetworks/goarista v0.0.0-20200206021550-59c4040ef2d3 // indirect github.com/armon/go-metrics v0.3.10 // indirect github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/aws/smithy-go v1.11.3 // indirect github.com/benbjohnson/clock v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/binance-chain/tss-lib v1.3.3 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/c-bata/go-prompt v0.2.6 // indirect github.com/celo-org/celo-blockchain v0.0.0-20210222234634-f8c8f6744526 // indirect @@ -80,7 +85,6 @@ require ( github.com/gobuffalo/here v0.6.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/godbus/dbus/v5 v5.0.4 // indirect - github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/gateway v1.1.0 // indirect github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/protobuf v1.5.2 // indirect @@ -117,7 +121,6 @@ require ( github.com/ipfs/go-ipfs-config v0.0.4 // indirect github.com/ipfs/go-ipfs-util v0.0.2 // indirect github.com/ipfs/go-ipns v0.0.2 // indirect - github.com/ipfs/go-log v1.0.5 // indirect github.com/ipfs/go-log/v2 v2.1.3 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect @@ -197,12 +200,11 @@ require ( github.com/multiformats/go-multihash v0.0.14 // indirect github.com/multiformats/go-multistream v0.1.2 // indirect github.com/multiformats/go-varint v0.0.6 // indirect - github.com/nanmu42/etherscan-api v1.4.0 // indirect github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/otiai10/primes v0.0.0-20180210170552-f6d2a1ba97c4 // indirect - github.com/pborman/uuid v1.2.0 // indirect + github.com/pborman/uuid v1.2.1 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pkg/term v1.2.0-beta.2 // indirect @@ -259,13 +261,12 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.7.0 // indirect go.uber.org/zap v1.22.0 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect diff --git a/tools/go.sum b/tools/go.sum index dd18f7c51d..a02264c6c0 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -190,7 +190,8 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbE github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.8.1 h1:9Y6qxtzgEODaLNGN+oN2QvcHvKUe4jsH8w4M+8LXzGk= +github.com/aws/smithy-go v1.11.3 h1:DQixirEFM9IaKxX1olZ3ke3nvxRS2xMDteKIDWxozW8= +github.com/aws/smithy-go v1.11.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/badoux/checkmail v0.0.0-20181210160741-9661bd69e9ad h1:kXfVkP8xPSJXzicomzjECcw6tv1Wl9h1lNenWBfNKdg= github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -223,8 +224,11 @@ github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8/go.mod h1:3J08xEfcug github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= @@ -337,6 +341,7 @@ github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6 github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -370,6 +375,7 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ= github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg= github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= @@ -613,8 +619,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= @@ -1443,8 +1450,9 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= +github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= @@ -1563,6 +1571,7 @@ github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI91 github.com/rs/zerolog v1.25.0 h1:Rj7XygbUHKUlDPcVdoLyR91fJBsduXj5fRxyqIQj/II= github.com/rung/go-safecast v1.0.1 h1:7rkt2qO4JGdOkWKdPEBFLaEwQy20y0IhhWJNFxmH0p0= github.com/rung/go-safecast v1.0.1/go.mod h1:dzUcUS2UMtbfVc7w6mx/Ur3UYcpXEZC+WilISksJ4P8= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1681,7 +1690,8 @@ github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5J github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1690,8 +1700,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/synapsecns/synapse-node v0.242.1-0.20220523175312-65a2f2613b1f h1:F2+tY8Y1n1Qn77mROlRcqV+k987FJNTwL4k48s4pck0= @@ -1763,6 +1774,7 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/urfave/cli/v2 v2.11.2 h1:FVfNg4m3vbjbBpLYxW//WjxUoHvJ9TlppXcqY9Q9ZfA= @@ -1846,7 +1858,6 @@ go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -1937,7 +1948,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -2179,8 +2189,9 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= diff --git a/tools/modulecopier/internal/suite_test.go b/tools/modulecopier/internal/suite_test.go index 05d81ee984..7acf0b4d2d 100644 --- a/tools/modulecopier/internal/suite_test.go +++ b/tools/modulecopier/internal/suite_test.go @@ -2,19 +2,19 @@ package internal_test import ( "github.com/stretchr/testify/suite" - "github.com/synapsecns/synapse-node/testutils" + "github.com/synapsecns/sanguine/core/testsuite" "testing" ) type GeneratorSuite struct { - *testutils.TestSuite + *testsuite.TestSuite } // NewGeneratorSuite creates a end-to-end test suite. func NewGeneratorSuite(tb testing.TB) *GeneratorSuite { tb.Helper() return &GeneratorSuite{ - TestSuite: testutils.NewTestSuite(tb), + TestSuite: testsuite.NewTestSuite(tb), } }