feat: use sqlite on lastgersync (#150)

* feat use sqlite on lastgersync * apply requests * rm tree migrations * Update lastgersync/processor.go Co-authored-by: Goran Rojovic <[email protected]> --------- Co-authored-by: Goran Rojovic <[email protected]>
0xPolygon · Nov 5, 2024 · 6d8dd74 · 6d8dd74
1 parent faa2a74
commit 6d8dd74
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 268 deletions.
diff --git a/lastgersync/e2e_test.go b/lastgersync/e2e_test.go
@@ -3,6 +3,7 @@ package lastgersync_test
 import (
 	"context"
 	"fmt"
+	"path"
 	"strconv"
 	"testing"
 	"time"
@@ -18,7 +19,7 @@ import (
 func TestE2E(t *testing.T) {
 	ctx := context.Background()
 	env := aggoraclehelpers.SetupAggoracleWithEVMChain(t)
-	dbPathSyncer := t.TempDir()
+	dbPathSyncer := path.Join(t.TempDir(), "file::memory:?cache=shared")
 	syncer, err := lastgersync.New(
 		ctx,
 		dbPathSyncer,
@@ -65,8 +66,8 @@ func TestE2E(t *testing.T) {
 		}
 		require.True(t, syncerUpToDate, errMsg)
 
-		_, actualGER, err := syncer.GetFirstGERAfterL1InfoTreeIndex(ctx, uint32(i))
-		require.NoError(t, err)
-		require.Equal(t, common.Hash(expectedGER), actualGER)
+		e, err := syncer.GetFirstGERAfterL1InfoTreeIndex(ctx, uint32(i))
+		require.NoError(t, err, fmt.Sprint("iteration: ", i))
+		require.Equal(t, common.Hash(expectedGER), e.GlobalExitRoot, fmt.Sprint("iteration: ", i))
 	}
 }
diff --git a/lastgersync/evmdownloader.go b/lastgersync/evmdownloader.go
@@ -62,21 +62,23 @@ func newDownloader(
 func (d *downloader) Download(ctx context.Context, fromBlock uint64, downloadedCh chan sync.EVMBlock) {
 	var (
 		attempts  int
-		lastIndex uint32
+		nextIndex uint32
 		err       error
 	)
 	for {
-		lastIndex, err = d.processor.getLastIndex(ctx)
+		lastIndex, err := d.processor.getLastIndex()
 		if errors.Is(err, db.ErrNotFound) {
-			lastIndex = 0
+			nextIndex = 0
 		} else if err != nil {
 			log.Errorf("error getting last indes: %v", err)
 			attempts++
 			d.rh.Handle("getLastIndex", attempts)
 
 			continue
 		}
-
+		if lastIndex > 0 {
+			nextIndex = lastIndex + 1
+		}
 		break
 	}
 	for {
@@ -88,12 +90,12 @@ func (d *downloader) Download(ctx context.Context, fromBlock uint64, downloadedC
 			return
 		default:
 		}
-		lastBlock := d.WaitForNewBlocks(ctx, fromBlock)
+		fromBlock = d.WaitForNewBlocks(ctx, fromBlock)
 
 		attempts = 0
 		var gers []Event
 		for {
-			gers, err = d.getGERsFromIndex(ctx, lastIndex)
+			gers, err = d.getGERsFromIndex(ctx, nextIndex)
 			if err != nil {
 				log.Errorf("error getting GERs: %v", err)
 				attempts++
@@ -105,7 +107,7 @@ func (d *downloader) Download(ctx context.Context, fromBlock uint64, downloadedC
 			break
 		}
 
-		blockHeader, isCanceled := d.GetBlockHeader(ctx, lastBlock)
+		blockHeader, isCanceled := d.GetBlockHeader(ctx, fromBlock)
 		if isCanceled {
 			return
 		}
@@ -126,7 +128,7 @@ func (d *downloader) Download(ctx context.Context, fromBlock uint64, downloadedC
 			if !ok {
 				log.Errorf("unexpected type %T in events", block.Events[0])
 			}
-			lastIndex = event.L1InfoTreeIndex
+			nextIndex = event.L1InfoTreeIndex + 1
 		}
 	}
 }

diff --git a/lastgersync/lastgersync.go b/lastgersync/lastgersync.go
@@ -32,7 +32,7 @@ func New(
 	waitForNewBlocksPeriod time.Duration,
 	downloadBufferSize int,
 ) (*LastGERSync, error) {
-	processor, err := newProcessor(dbPath)
+	processor, err := newProcessor(dbPath, "lastGERSync")
 	if err != nil {
 		return nil, err
 	}
@@ -75,7 +75,7 @@ func (s *LastGERSync) Start(ctx context.Context) {
 
 func (s *LastGERSync) GetFirstGERAfterL1InfoTreeIndex(
 	ctx context.Context, atOrAfterL1InfoTreeIndex uint32,
-) (injectedL1InfoTreeIndex uint32, ger common.Hash, err error) {
+) (Event, error) {
 	return s.processor.GetFirstGERAfterL1InfoTreeIndex(ctx, atOrAfterL1InfoTreeIndex)
 }
 

diff --git a/lastgersync/migrations/lastgersync0001.sql b/lastgersync/migrations/lastgersync0001.sql
@@ -0,0 +1,14 @@
+-- +migrate Down
+DROP TABLE IF EXISTS block;
+DROP TABLE IF EXISTS global_exit_root;
+
+-- +migrate Up
+CREATE TABLE block (
+    num   BIGINT PRIMARY KEY
+);
+
+CREATE TABLE imported_global_exit_root (
+	block_num           INTEGER PRIMARY KEY REFERENCES block(num) ON DELETE CASCADE,
+	global_exit_root    VARCHAR NOT NULL,
+	l1_info_tree_index  INTEGER NOT NULL
+);
diff --git a/lastgersync/migrations/migrations.go b/lastgersync/migrations/migrations.go
@@ -0,0 +1,21 @@
+package migrations
+
+import (
+	_ "embed"
+
+	"github.com/0xPolygon/cdk/db"
+	"github.com/0xPolygon/cdk/db/types"
+)
+
+//go:embed lastgersync0001.sql
+var mig001 string
+
+func RunMigrations(dbPath string) error {
+	migrations := []types.Migration{
+		{
+			ID:  "lastgersync0001",
+			SQL: mig001,
+		},
+	}
+	return db.RunMigrations(dbPath, migrations)
+}