Merge branch 'feat/logrange-asc-scribe' into feat/sinner

synapsecns · Nov 2, 2023 · 20e770f · 20e770f
2 parents 88b4467 + 8298d74
commit 20e770f
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 21 deletions.
diff --git a/services/explorer/consumer/client/resolver-client/server.go b/services/explorer/consumer/client/resolver-client/server.go
diff --git a/services/scribe/api/data_test.go b/services/scribe/api/data_test.go
@@ -5,6 +5,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	. "github.com/stretchr/testify/assert"
+	"github.com/synapsecns/sanguine/core"
 	"github.com/synapsecns/sanguine/services/scribe/db"
 	"github.com/synapsecns/sanguine/services/scribe/graphql"
 	"github.com/synapsecns/sanguine/services/scribe/grpc/client/rest"
@@ -51,13 +52,13 @@ func (g APISuite) TestRetrieveData() {
 	Nil(g.T(), err)
 	// there were 20 logs created (2 per loop, in a loop of 10)
 	Equal(g.T(), 20, len(logs.Response))
-	logsRange, err := g.gqlClient.GetLogsRange(g.GetTestContext(), int(chainID), 2, 5, 1)
+	logsRange, err := g.gqlClient.GetLogsRange(g.GetTestContext(), int(chainID), 2, 5, 1, nil)
 	Nil(g.T(), err)
 	// from 2-5, there were 8 logs created (2 per loop, in a range of 4)
 	Equal(g.T(), 8, len(logsRange.Response))
 
 	// Test getting logs in a range in ascending order.
-	logsRangeAsc, err := g.gqlClient.GetLogsRange(g.GetTestContext(), int(chainID), 5, 2, 1)
+	logsRangeAsc, err := g.gqlClient.GetLogsRange(g.GetTestContext(), int(chainID), 2, 5, 1, core.PtrTo(true))
 	Nil(g.T(), err)
 	Equal(g.T(), 8, len(logsRangeAsc.Response))
 	Equal(g.T(), 2, logsRangeAsc.Response[0].BlockNumber)

diff --git a/services/scribe/cmd/cmd.md b/services/scribe/cmd/cmd.md
@@ -5,7 +5,7 @@
 Scribe is a multi-chain indexing service. Scribe is designed to take a list of contracts specified by chain id and store logs, receipts, and txs for every event, past to present, in a mysql database.
 
 Use cases
-- Analytics for on chain events
+- Analytics for on-chain events
 - Stream events occurring across chains
 - Monitor activity on your contracts
 

diff --git a/services/scribe/graphql/client/client.go b/services/scribe/graphql/client/client.go
diff --git a/services/scribe/graphql/client/queries/queries.graphql b/services/scribe/graphql/client/queries/queries.graphql
@@ -13,8 +13,8 @@ query GetLogs ($chain_id: Int!, $page: Int!) {
     }
 }
 
-query GetLogsRange ($chain_id: Int!, $start_block: Int!, $end_block: Int!, $page: Int!) {
-    response: logsRange (chain_id: $chain_id, start_block: $start_block, end_block: $end_block, page: $page) {
+query GetLogsRange ($chain_id: Int!, $start_block: Int!, $end_block: Int!, $page: Int!, $asc: Boolean = false) {
+    response: logsRange (chain_id: $chain_id, start_block: $start_block, end_block: $end_block, page: $page,asc: $asc) {
         contract_address
         chain_id
         topics

diff --git a/services/scribe/graphql/server/graph/queries.resolvers.go b/services/scribe/graphql/server/graph/queries.resolvers.go
diff --git a/services/scribe/graphql/server/graph/resolver/server.go b/services/scribe/graphql/server/graph/resolver/server.go
diff --git a/services/scribe/graphql/server/graph/schema/queries.graphql b/services/scribe/graphql/server/graph/schema/queries.graphql
@@ -24,6 +24,7 @@ type Query {
     start_block: Int!
     end_block: Int!
     page: Int!
+    asc: Boolean = False
   ): [Log]
   # returns all receipts that match the given filter
   receipts(

diff --git a/services/scribe/service/indexer/indexer_test.go b/services/scribe/service/indexer/indexer_test.go
@@ -467,7 +467,7 @@ func (x *IndexerSuite) TestTxTypeNotSupported() {
 	}
 
 	var backendClient backend.ScribeBackend
-	omnirpcURL := "https://rpc.interoperability.institute/confirmations/1/rpc/42161"
+	omnirpcURL := "https://arbitrum.llamarpc.com"
 	backendClient, err := backend.DialBackend(x.GetTestContext(), omnirpcURL, x.metrics)
 	Nil(x.T(), err)