Feat/state sync

.gitignore

@@ -3,3 +3,4 @@ debug_container.log
 .scalerized
 example-testnet
 build
+*.env

Dockerfile

@@ -30,6 +30,7 @@ COPY --from=build-env /go/src/github.com/aerius-labs/scalerize/build/scalerized
 COPY --from=build-env /go/src/github.com/aerius-labs/scalerize/example-testnet example-testnet
 COPY --from=build-env /go/src/github.com/aerius-labs/scalerize/start-testnet-node.sh start-testnet-node.sh
 COPY --from=build-env /go/src/github.com/aerius-labs/scalerize/testing/files/jwt.hex jwt.hex
+COPY --from=build-env /go/src/github.com/aerius-labs/scalerize/scripts/init.sh ./init.sh
 
 # Run scalerized by default
 CMD ["scalerized"]

Makefile

@@ -4,6 +4,8 @@ SCALERIZED_BINARY_PATH := /go/src/github.com/aerius-labs/scalerize/build/scaleri
 BUILDDIR ?= $(CURDIR)/build
 
 include scripts/execution-client.mk
+-include testnet.env
+export $(shell sed 's/=.*//' testnet.env)
 
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git log -1 --format='%H')
@@ -57,3 +59,8 @@ init:
 
 localtestnet-example-config: 
 	$(SCALERIZED_BINARY_PATH) testnet init-files --output-dir example-testnet --v $(NODES) --starting-ip-address $(STARTING-IP-ADDR) --keyring-backend test
+
+localtestnet-config: 
+	@echo "Using NO_OF_NODES=$(NO_OF_NODES) and IP_ADDRESSES=$(IP_ADDRESSES)"
+	@set -a && . ./testnet.env && set +a && \
+	$(SCALERIZED_BINARY_PATH) testnet init-files --output-dir example-testnet --v $(NO_OF_NODES) --ip-addresses $(IP_ADDRESSES) --keyring-backend test

app/app.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	_ "embed"
-	"fmt"
 	"io"
 	"sync"
 
@@ -55,7 +54,8 @@ var AppConfigYAML []byte
 var (
 	_                  runtime.AppI            = (*ScalerizeApp)(nil)
 	_                  servertypes.Application = (*ScalerizeApp)(nil)
-	socketPath         string
+	dbSocketPath       string
+	stateSocketPath    string
 	cometBFTRPCAddress string
 )
 
@@ -145,7 +145,8 @@ func NewScalerizeApp(
 		return nil, err
 	}
 
-	socketPath = appOpts.Get(params.FlagSocketPath).(string)
+	dbSocketPath = appOpts.Get(params.FlagDBSocketPath).(string)
+	stateSocketPath = appOpts.Get(params.FlagStateSocketPath).(string)
 	cometBFTRPCAddress = appOpts.Get(params.FlagCometBFTRPCAddress).(string)
 
 	executionClient, err := app.NewClient(ctx, appOpts, logger)
@@ -182,7 +183,6 @@ func NewScalerizeApp(
 
 	/****  Module Options ****/
 
-	fmt.Println("CHAIN ID: ", app.ChainID())
 	// create the simulation manager and define the order of the modules for deterministic simulations
 	// NOTE: this is not required apps that don't use the simulator for fuzz testing transactions
 	app.sm = module.NewSimulationManagerFromAppModules(app.ModuleManager.Modules, make(map[string]module.AppModuleSimulation, 0))
@@ -192,13 +192,15 @@ func NewScalerizeApp(
 		return nil, err
 	}
 
-	go app.StartDBRouter(appOpts.Get(params.FlagExecutionClientType).(string))
+	clientType := appOpts.Get(params.FlagExecutionClientType).(string)
 
-	<-ensureClientCreatedCh
+	executionClient.SetApp(app.BaseApp)
 
-	for _, storekey := range app.GetStoreKeys() {
-		fmt.Printf("STORE KEY: %+v\n", storekey)
-	}
+	go app.StartDBRouter(clientType)
+	go app.StartStateRouter(clientType)
+	go executionClient.SetCosmosRPCClient(cometBFTRPCAddress)
+
+	<-ensureClientCreatedCh
 
 	return app, nil
 }
@@ -243,49 +245,3 @@ func (app *ScalerizeApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.
 		panic(err)
 	}
 }
-
-// func GetProof(clientCtx client.Context, storeKey string, key []byte) ([]byte, *crypto.ProofOps, error) {
-// 	height := clientCtx.Height
-// 	fmt.Println("HEIGHT: ", height)
-// 	// ABCI queries at height less than or equal to 2 are not supported.
-// 	// Base app does not support queries for height less than or equal to 1.
-// 	// Therefore, a query at height 2 would be equivalent to a query at height 3
-// 	if height <= 2 {
-// 		return nil, nil, fmt.Errorf("proof queries at height <= 2 are not supported")
-// 	}
-
-// 	abciReq := abci.RequestQuery{
-// 		Path:   fmt.Sprintf("store/%s/key", storeKey),
-// 		Data:   key,
-// 		Height: height,
-// 		Prove:  true,
-// 	}
-
-// 	abciRes, err := clientCtx.QueryABCI(abciReq)
-// 	if err != nil {
-// 		return nil, nil, err
-// 	}
-
-// 	return abciRes.Value, abciRes.ProofOps, nil
-// }
-
-// func (app *ScalerizeApp) InitializeCommitMultiStore(db dbm.DB, logger log.Logger, metricGatherer metrics.StoreMetrics) error {
-// 	// Initialize the CommitMultiStore
-// 	cms := store.NewCommitMultiStore(db, logger, metricGatherer)
-
-// 	// Mount necessary stores
-// 	for _, table := range app.executionTablesInfo {
-// 		cms.MountStoreWithDB(table.StoreKey, storetypes.StoreTypeIAVL, db)
-// 	}
-
-// 	// Load the latest version
-// 	err := cms.LoadLatestVersion()
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	// Set the CommitMultiStore
-// 	app.SetCMS(cms)
-
-// 	return nil
-// }

app/client.go

@@ -10,12 +10,15 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	"github.com/aerius-labs/scalerize/app/params"
 	evmexec "github.com/aerius-labs/scalerize/execution/evm"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 )
 
 type ExecutionClient interface {
 	Name() string
 	Start(ctx context.Context, ready chan bool) error
+	SetApp(*baseapp.BaseApp)
+	SetCosmosRPCClient(string)
 	ABCIHandler
 }
 

app/constants.go

@@ -1,12 +1,5 @@
 package app
 
-import "sync"
-
-var (
-	ethIteratorsCurrentKey     = make(map[[CursorIDBytes]byte][]byte)
-	ethIteratorsCurrentKeyLock sync.RWMutex
-)
-
 const (
 	// DbTx and DbTxMut for both regular and dup-sorted tables
 	OP_PUT    byte = 1
@@ -62,8 +55,6 @@ const (
 	EthAccountAddressBytes = 20
 	EthBlockNumberBytes    = 8
 	EthBlockHashBytes      = 32
-
-	CursorIDBytes = 8
 )
 
 const (