Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-chain/zkevm
Browse files Browse the repository at this point in the history
  • Loading branch information
@abtestingalpha
abtestingalpha committed Aug 14, 2023
2 parents d353c6b + 265e17e commit a539f16
Show file tree
Hide file tree
Showing 176 changed files with 9,993 additions and 6,618 deletions.
40 changes: 14 additions & 26 deletions agents/agents/agentsintegration/agentsintegration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package agentsintegration_test

import (
signerConfig "github.com/synapsecns/sanguine/ethergo/signer/config"
"github.com/synapsecns/sanguine/services/scribe/backend"
"math/big"
"os"
"testing"
"time"

"github.com/Flaque/filet"
awsTime "github.com/aws/smithy-go/time"
"github.com/brianvoe/gofakeit/v6"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
Expand All @@ -18,12 +20,9 @@ import (
"github.com/synapsecns/sanguine/agents/config"
execConfig "github.com/synapsecns/sanguine/agents/config/executor"
"github.com/synapsecns/sanguine/agents/types"
"github.com/synapsecns/sanguine/services/scribe/backfill"
"github.com/synapsecns/sanguine/services/scribe/client"
scribeConfig "github.com/synapsecns/sanguine/services/scribe/config"
"github.com/synapsecns/sanguine/services/scribe/node"

"github.com/Flaque/filet"
"github.com/synapsecns/sanguine/services/scribe/service"
)

func RemoveAgentsTempFile(t *testing.T, fileName string) {
Expand All @@ -39,11 +38,11 @@ func (u *AgentsIntegrationSuite) TestAgentsE2E() {
testDone = true
}()

originClient, err := backfill.DialBackend(u.GetTestContext(), u.TestBackendOrigin.RPCAddress(), u.ScribeMetrics)
originClient, err := backend.DialBackend(u.GetTestContext(), u.TestBackendOrigin.RPCAddress(), u.ScribeMetrics)
u.Nil(err)
destinationClient, err := backfill.DialBackend(u.GetTestContext(), u.TestBackendDestination.RPCAddress(), u.ScribeMetrics)
destinationClient, err := backend.DialBackend(u.GetTestContext(), u.TestBackendDestination.RPCAddress(), u.ScribeMetrics)
u.Nil(err)
summitClient, err := backfill.DialBackend(u.GetTestContext(), u.TestBackendSummit.RPCAddress(), u.ScribeMetrics)
summitClient, err := backend.DialBackend(u.GetTestContext(), u.TestBackendSummit.RPCAddress(), u.ScribeMetrics)
u.Nil(err)

originConfig := scribeConfig.ContractConfig{
Expand All @@ -55,12 +54,8 @@ func (u *AgentsIntegrationSuite) TestAgentsE2E() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: scribeConfig.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Contracts: []scribeConfig.ContractConfig{originConfig},
Confirmations: 0,
Contracts: []scribeConfig.ContractConfig{originConfig},
}
destinationConfig := scribeConfig.ContractConfig{
Address: u.LightInboxOnDestination.Address().String(),
Expand All @@ -71,12 +66,8 @@ func (u *AgentsIntegrationSuite) TestAgentsE2E() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: scribeConfig.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Contracts: []scribeConfig.ContractConfig{destinationConfig},
Confirmations: 0,
Contracts: []scribeConfig.ContractConfig{destinationConfig},
}
summitConfig := scribeConfig.ContractConfig{
Address: u.InboxOnSummit.Address().String(),
Expand All @@ -87,23 +78,20 @@ func (u *AgentsIntegrationSuite) TestAgentsE2E() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: scribeConfig.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Confirmations: 0,

Contracts: []scribeConfig.ContractConfig{summitConfig},
}
scribeConfig := scribeConfig.Config{
Chains: []scribeConfig.ChainConfig{originChainConfig, destinationChainConfig, summitChainConfig},
}
clients := map[uint32][]backfill.ScribeBackend{
clients := map[uint32][]backend.ScribeBackend{
uint32(u.TestBackendOrigin.GetChainID()): {originClient, originClient},
uint32(u.TestBackendDestination.GetChainID()): {destinationClient, destinationClient},
uint32(u.TestBackendSummit.GetChainID()): {summitClient, summitClient},
}

scribe, err := node.NewScribe(u.ScribeTestDB, clients, scribeConfig, u.ScribeMetrics)
scribe, err := service.NewScribe(u.ScribeTestDB, clients, scribeConfig, u.ScribeMetrics)
u.Nil(err)

scribeClient := client.NewEmbeddedScribe("sqlite", u.DBPath, u.ScribeMetrics)
Expand Down
10 changes: 5 additions & 5 deletions agents/agents/executor/cmd/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/synapsecns/sanguine/core/metrics"
omnirpcClient "github.com/synapsecns/sanguine/services/omnirpc/client"
scribeAPI "github.com/synapsecns/sanguine/services/scribe/api"
"github.com/synapsecns/sanguine/services/scribe/backfill"
"github.com/synapsecns/sanguine/services/scribe/backend"
"github.com/synapsecns/sanguine/services/scribe/client"
scribeCmd "github.com/synapsecns/sanguine/services/scribe/cmd"
"github.com/synapsecns/sanguine/services/scribe/node"
"github.com/synapsecns/sanguine/services/scribe/service"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -143,11 +143,11 @@ var ExecutorRunCommand = &cli.Command{
return fmt.Errorf("failed to initialize database: %w", err)
}

scribeClients := make(map[uint32][]backfill.ScribeBackend)
scribeClients := make(map[uint32][]backend.ScribeBackend)

for _, client := range executorConfig.ScribeConfig.EmbeddedScribeConfig.Chains {
for confNum := 1; confNum <= scribeCmd.MaxConfirmations; confNum++ {
backendClient, err := backfill.DialBackend(ctx, fmt.Sprintf("%s/%d/rpc/%d", executorConfig.BaseOmnirpcURL, confNum, client.ChainID), handler)
backendClient, err := backend.DialBackend(ctx, fmt.Sprintf("%s/%d/rpc/%d", executorConfig.BaseOmnirpcURL, confNum, client.ChainID), handler)
if err != nil {
return fmt.Errorf("could not start client for %s", fmt.Sprintf("%s/1/rpc/%d", executorConfig.BaseOmnirpcURL, client.ChainID))
}
Expand All @@ -156,7 +156,7 @@ var ExecutorRunCommand = &cli.Command{
}
}

scribe, err := node.NewScribe(eventDB, scribeClients, executorConfig.ScribeConfig.EmbeddedScribeConfig, handler)
scribe, err := service.NewScribe(eventDB, scribeClients, executorConfig.ScribeConfig.EmbeddedScribeConfig, handler)
if err != nil {
return fmt.Errorf("failed to initialize scribe: %w", err)
}
Expand Down
51 changes: 19 additions & 32 deletions agents/agents/executor/executor_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package executor_test

import (
"github.com/synapsecns/sanguine/services/scribe/backend"
"math/big"
"time"

Expand All @@ -13,10 +14,10 @@ import (
"github.com/synapsecns/sanguine/agents/types"
"github.com/synapsecns/sanguine/core/merkle"
agentsConfig "github.com/synapsecns/sanguine/ethergo/signer/config"
"github.com/synapsecns/sanguine/services/scribe/backfill"
"github.com/synapsecns/sanguine/services/scribe/client"
"github.com/synapsecns/sanguine/services/scribe/service"

"github.com/synapsecns/sanguine/services/scribe/config"
"github.com/synapsecns/sanguine/services/scribe/node"
)

func (e *ExecutorSuite) TestVerifyState() {
Expand Down Expand Up @@ -138,23 +139,19 @@ func (e *ExecutorSuite) TestMerkleInsert() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: config.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Contracts: []config.ContractConfig{contractConfig},
Confirmations: 0,
Contracts: []config.ContractConfig{contractConfig},
}
scribeConfig := config.Config{
Chains: []config.ChainConfig{chainConfig},
}
simulatedClient, err := backfill.DialBackend(e.GetTestContext(), e.TestBackendOrigin.RPCAddress(), e.ScribeMetrics)
simulatedClient, err := backend.DialBackend(e.GetTestContext(), e.TestBackendOrigin.RPCAddress(), e.ScribeMetrics)
e.Nil(err)
clients := map[uint32][]backfill.ScribeBackend{
clients := map[uint32][]backend.ScribeBackend{
chainID: {simulatedClient, simulatedClient},
}

scribe, err := node.NewScribe(e.ScribeTestDB, clients, scribeConfig, e.ScribeMetrics)
scribe, err := service.NewScribe(e.ScribeTestDB, clients, scribeConfig, e.ScribeMetrics)
e.Nil(err)

scribeClient := client.NewEmbeddedScribe("sqlite", e.DBPath, e.ScribeMetrics)
Expand Down Expand Up @@ -484,11 +481,11 @@ func (e *ExecutorSuite) TestExecutor() {

testContractDest, _ := e.TestDeployManager.GetAgentsTestContract(e.GetTestContext(), e.TestBackendDestination)

originClient, err := backfill.DialBackend(e.GetTestContext(), e.TestBackendOrigin.RPCAddress(), e.ScribeMetrics)
originClient, err := backend.DialBackend(e.GetTestContext(), e.TestBackendOrigin.RPCAddress(), e.ScribeMetrics)
e.Nil(err)
destinationClient, err := backfill.DialBackend(e.GetTestContext(), e.TestBackendDestination.RPCAddress(), e.ScribeMetrics)
destinationClient, err := backend.DialBackend(e.GetTestContext(), e.TestBackendDestination.RPCAddress(), e.ScribeMetrics)
e.Nil(err)
summitClient, err := backfill.DialBackend(e.GetTestContext(), e.TestBackendSummit.RPCAddress(), e.ScribeMetrics)
summitClient, err := backend.DialBackend(e.GetTestContext(), e.TestBackendSummit.RPCAddress(), e.ScribeMetrics)
e.Nil(err)

originConfig := config.ContractConfig{
Expand All @@ -500,12 +497,8 @@ func (e *ExecutorSuite) TestExecutor() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: config.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Contracts: []config.ContractConfig{originConfig},
Confirmations: 0,
Contracts: []config.ContractConfig{originConfig},
}
destinationConfig := config.ContractConfig{
Address: e.DestinationContract.Address().String(),
Expand All @@ -516,11 +509,8 @@ func (e *ExecutorSuite) TestExecutor() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: config.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Confirmations: 0,

Contracts: []config.ContractConfig{destinationConfig},
}
summitConfig := config.ContractConfig{
Expand All @@ -532,23 +522,20 @@ func (e *ExecutorSuite) TestExecutor() {
GetLogsBatchAmount: 1,
StoreConcurrency: 1,
GetLogsRange: 1,
ConfirmationConfig: config.ConfirmationConfig{
RequiredConfirmations: 1,
ConfirmationThreshold: 1,
ConfirmationRefreshRate: 1,
},
Confirmations: 0,

Contracts: []config.ContractConfig{summitConfig},
}
scribeConfig := config.Config{
Chains: []config.ChainConfig{originChainConfig, destinationChainConfig, summitChainConfig},
}
clients := map[uint32][]backfill.ScribeBackend{
clients := map[uint32][]backend.ScribeBackend{
chainID: {originClient, originClient},
destination: {destinationClient, destinationClient},
summit: {summitClient, summitClient},
}

scribe, err := node.NewScribe(e.ScribeTestDB, clients, scribeConfig, e.ScribeMetrics)
scribe, err := service.NewScribe(e.ScribeTestDB, clients, scribeConfig, e.ScribeMetrics)
e.Nil(err)

scribeClient := client.NewEmbeddedScribe("sqlite", e.DBPath, e.ScribeMetrics)
Expand Down
22 changes: 12 additions & 10 deletions agents/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ require (
github.com/synapsecns/sanguine/core v0.0.0-00010101000000-000000000000
github.com/synapsecns/sanguine/ethergo v0.0.2
github.com/synapsecns/sanguine/services/omnirpc v0.0.0-00010101000000-000000000000
github.com/synapsecns/sanguine/services/scribe v0.0.63
github.com/synapsecns/sanguine/services/scribe v0.0.194
github.com/synapsecns/sanguine/tools v0.0.0-00010101000000-000000000000
github.com/ugorji/go/codec v1.2.11
github.com/urfave/cli/v2 v2.24.4
github.com/urfave/cli/v2 v2.25.5
github.com/vburenin/ifacemaker v1.2.0
github.com/vektra/mockery/v2 v2.14.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
Expand All @@ -49,7 +49,7 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/kms v1.10.1 // indirect
github.com/99designs/gqlgen v0.17.31 // indirect
github.com/99designs/gqlgen v0.17.36 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/DataDog/appsec-internal-go v1.0.0 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.45.0-rc.1 // indirect
Expand Down Expand Up @@ -169,7 +169,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.1 // indirect
Expand Down Expand Up @@ -241,6 +241,7 @@ require (
github.com/pyroscope-io/client v0.7.0 // indirect
github.com/pyroscope-io/godeltaprof v0.1.0 // indirect
github.com/pyroscope-io/otel-profiling-go v0.4.0 // indirect
github.com/ravilushqa/otelgqlgen v0.13.1 // indirect
github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
Expand All @@ -251,7 +252,7 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.6.0 // indirect
github.com/segmentio/fasthash v1.0.3 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
Expand All @@ -277,17 +278,18 @@ require (
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.21 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.2 // indirect
github.com/vektah/gqlparser/v2 v2.5.1 // indirect
github.com/vektah/gqlparser/v2 v2.5.8 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.40.0 // indirect
go.opentelemetry.io/contrib v1.16.1 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
Expand All @@ -307,13 +309,13 @@ require (
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230127193734-31bee513bff7 // indirect
golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
golang.org/x/tools v0.9.3 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.121.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading

0 comments on commit a539f16

Please sign in to comment.