Agents testnet fixes

agents/agents/executor/cmd/commands.go

@@ -107,11 +107,13 @@ var ExecutorRunCommand = &cli.Command{
 
 		handler, err := metrics.NewFromEnv(ctx, metadata.BuildInfo())
 		if err != nil {
+			fmt.Printf("cmderr: %v\n", err)
 			return fmt.Errorf("failed to create metrics handler: %w", err)
 		}
 
 		executorConfig, executorDB, err := createExecutorParameters(ctx, c, handler)
 		if err != nil {
+			fmt.Printf("cmderr: %v\n", err)
 			return err
 		}
 
@@ -125,15 +127,17 @@ var ExecutorRunCommand = &cli.Command{
 				false,
 			)
 			if err != nil {
+				fmt.Printf("cmderr: %v\n", err)
 				return fmt.Errorf("failed to initialize database: %w", err)
 			}
 
 			scribeClients := make(map[uint32][]backend.ScribeBackend)
 
 			for _, client := range executorConfig.ScribeConfig.EmbeddedScribeConfig.Chains {
 				for confNum := 1; confNum <= scribeCmd.MaxConfirmations; confNum++ {
-					backendClient, err := backend.DialBackend(ctx, fmt.Sprintf("%s/%d/rpc/%d", executorConfig.ScribeConfig.EmbeddedScribeConfig.RPCURL, confNum, client.ChainID), handler)
+					backendClient, err := backend.DialBackend(ctx, fmt.Sprintf("%s/confirmations/%d/rpc/%d", executorConfig.BaseOmnirpcURL, confNum, client.ChainID), handler)
 					if err != nil {
+						fmt.Printf("cmderr: %v\n", err)
 						return fmt.Errorf("could not start client for %s", fmt.Sprintf("%s/1/rpc/%d", executorConfig.ScribeConfig.EmbeddedScribeConfig.RPCURL, client.ChainID))
 					}
 
@@ -143,12 +147,14 @@ var ExecutorRunCommand = &cli.Command{
 
 			scribe, err := service.NewScribe(eventDB, scribeClients, executorConfig.ScribeConfig.EmbeddedScribeConfig, handler)
 			if err != nil {
+				fmt.Printf("cmderr: %v\n", err)
 				return fmt.Errorf("failed to initialize scribe: %w", err)
 			}
 
 			g.Go(func() error {
 				err := scribe.Start(ctx)
 				if err != nil {
+					fmt.Printf("cmderr: %v\n", err)
 					return fmt.Errorf("failed to start scribe: %w", err)
 				}
 
@@ -164,6 +170,7 @@ var ExecutorRunCommand = &cli.Command{
 			g.Go(func() error {
 				err := embedded.Start(ctx)
 				if err != nil {
+					fmt.Printf("cmderr: %v\n", err)
 					return fmt.Errorf("failed to start embedded scribe: %w", err)
 				}
 
@@ -178,6 +185,7 @@ var ExecutorRunCommand = &cli.Command{
 				handler,
 			).ScribeClient
 		default:
+			fmt.Printf("cmderr: %v\n", err)
 			return fmt.Errorf("invalid scribe type: %s", executorConfig.ScribeConfig.Type)
 		}
 
@@ -190,12 +198,14 @@ var ExecutorRunCommand = &cli.Command{
 
 		executor, err := executor.NewExecutor(ctx, executorConfig, executorDB, scribeClient, baseOmniRPCClient, handler)
 		if err != nil {
+			fmt.Printf("cmderr: %v\n", err)
 			return fmt.Errorf("failed to create executor: %w", err)
 		}
 
 		g.Go(func() error {
 			err := api.Start(ctx, uint16(c.Uint(metricsPortFlag.Name)))
 			if err != nil {
+				fmt.Printf("cmderr: %v\n", err)
 				return fmt.Errorf("failed to start api: %w", err)
 			}
 
@@ -205,13 +215,15 @@ var ExecutorRunCommand = &cli.Command{
 		g.Go(func() error {
 			err := executor.Run(ctx)
 			if err != nil {
+				fmt.Printf("cmderr: %v\n", err)
 				return fmt.Errorf("failed to run executor: %w", err)
 			}
 
 			return nil
 		})
 
 		if err := g.Wait(); err != nil {
+			fmt.Printf("waiterr: %v\n", err)
 			return fmt.Errorf("failed to run executor: %w", err)
 		}
 

agents/agents/executor/db/crosstable_test.go

@@ -1,12 +1,13 @@
 package db_test
 
 import (
+	"math/big"
+
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/ethereum/go-ethereum/common"
 	. "github.com/stretchr/testify/assert"
 	"github.com/synapsecns/sanguine/agents/agents/executor/db"
 	agentstypes "github.com/synapsecns/sanguine/agents/types"
-	"math/big"
 )
 
 func (t *DBSuite) TestGetTimestampForMessage() {
@@ -154,23 +155,23 @@ func (t *DBSuite) TestGetEarliestStateInRange() {
 		err = testDB.StoreAttestation(t.GetTestContext(), attestation2, origin+1, 3, 3)
 		Nil(t.T(), err)
 
-		earliestState, err := testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 0, 5)
+		earliestState, _, err := testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 0, 5)
 		Nil(t.T(), err)
 		Equal(t.T(), uint32(2), (*earliestState).Nonce())
 
-		earliestState, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 0, 1)
+		earliestState, _, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 0, 1)
 		Nil(t.T(), err)
 		Nil(t.T(), earliestState)
 
-		earliestState, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 3, 5)
+		earliestState, _, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 3, 5)
 		Nil(t.T(), err)
 		Equal(t.T(), uint32(4), (*earliestState).Nonce())
 
-		earliestState, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 6, 6)
+		earliestState, _, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 6, 6)
 		Nil(t.T(), err)
 		Nil(t.T(), earliestState)
 
-		earliestState, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 5, 5)
+		earliestState, _, err = testDB.GetEarliestStateInRange(t.GetTestContext(), origin, origin+1, 5, 5)
 		Nil(t.T(), err)
 		Equal(t.T(), uint32(5), (*earliestState).Nonce())
 	})

agents/agents/executor/db/executor_db.go

@@ -3,6 +3,8 @@ package db
 import (
 	"context"
 	"encoding/json"
+
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/synapsecns/sanguine/agents/agents/executor/types"
 	agentsTypes "github.com/synapsecns/sanguine/agents/types"
 	submitterDB "github.com/synapsecns/sanguine/ethergo/submitter/db"
@@ -11,7 +13,7 @@ import (
 // ExecutorDBWriter is the interface for writing to the executor database.
 type ExecutorDBWriter interface {
 	// StoreMessage stores a message in the database.
-	StoreMessage(ctx context.Context, message agentsTypes.Message, blockNumber uint64, minimumTimeSet bool, minimumTime uint64) error
+	StoreMessage(ctx context.Context, message agentsTypes.Message, blockNumber uint64, minimumTimeSet bool, minimumTime uint64, originTxHash common.Hash) error
 	// ExecuteMessage marks a message as executed in the database.
 	ExecuteMessage(ctx context.Context, messageMask DBMessage) error
 	// SetMinimumTime sets the minimum time of a message.
@@ -57,7 +59,7 @@ type ExecutorDBReader interface {
 	// GetState gets a state from the database.
 	GetState(ctx context.Context, stateMask DBState) (*agentsTypes.State, error)
 	// GetStateMetadata gets the snapshot root, proof, and tree height of a state from the database.
-	GetStateMetadata(ctx context.Context, stateMask DBState) (snapshotRoot *[32]byte, proof *json.RawMessage, stateIndex *uint32, err error)
+	GetStateMetadata(ctx context.Context, stateMask DBState) (proof *json.RawMessage, stateIndex *uint32, err error)
 	// GetPotentialSnapshotRoots gets all snapshot roots that are greater than or equal to a specified nonce and matches
 	// a specified chain ID.
 	GetPotentialSnapshotRoots(ctx context.Context, chainID uint32, nonce uint32) ([]string, error)
@@ -73,7 +75,7 @@ type ExecutorDBReader interface {
 	// GetEarliestStateInRange gets the earliest state with the same snapshot root as an attestation within a nonce range.
 	// 1. Get all states that are within a nonce range.
 	// 2. Get the state with the earliest attestation associated to it.
-	GetEarliestStateInRange(ctx context.Context, chainID, destination, startNonce, endNonce uint32) (*agentsTypes.State, error)
+	GetEarliestStateInRange(ctx context.Context, chainID, destination, startNonce, endNonce uint32) (*agentsTypes.State, *string, error)
 }
 
 // ExecutorDB is the interface for the executor database.

agents/agents/executor/db/message_test.go

@@ -1,13 +1,14 @@
 package db_test
 
 import (
+	"math/big"
+
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/ethereum/go-ethereum/common"
 	. "github.com/stretchr/testify/assert"
 	"github.com/synapsecns/sanguine/agents/agents/executor/db"
 	"github.com/synapsecns/sanguine/agents/agents/executor/types"
 	agentsTypes "github.com/synapsecns/sanguine/agents/types"
-	"math/big"
 )
 
 func (t *DBSuite) TestStoreRetrieveMessage() {
@@ -23,7 +24,7 @@ func (t *DBSuite) TestStoreRetrieveMessage() {
 		headerA := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainIDA, nonceA, destinationA, gofakeit.Uint32())
 		typesMessageA := agentsTypes.NewMessage(headerA, nil, messageA)
 
-		err := testDB.StoreMessage(t.GetTestContext(), typesMessageA, blockNumberA, minimumTimeSetA, minimumTimeA)
+		err := testDB.StoreMessage(t.GetTestContext(), typesMessageA, blockNumberA, minimumTimeSetA, minimumTimeA, common.Hash{})
 		Nil(t.T(), err)
 
 		chainIDB := gofakeit.Uint32()
@@ -37,7 +38,7 @@ func (t *DBSuite) TestStoreRetrieveMessage() {
 		headerB := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainIDB, nonceB, destinationB, gofakeit.Uint32())
 		typesMessageB := agentsTypes.NewMessage(headerB, nil, messageB)
 
-		err = testDB.StoreMessage(t.GetTestContext(), typesMessageB, blockNumberB, minimumTimeSetB, minimumTimeB)
+		err = testDB.StoreMessage(t.GetTestContext(), typesMessageB, blockNumberB, minimumTimeSetB, minimumTimeB, common.Hash{})
 		Nil(t.T(), err)
 
 		messageAMask := db.DBMessage{
@@ -105,7 +106,7 @@ func (t *DBSuite) TestGetLastBlockNumber() {
 		header := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, optimisticSeconds)
 		message, err := agentsTypes.NewMessageFromManagerMessage(header, messageBody)
 		Nil(t.T(), err)
-		err = testDB.StoreMessage(t.GetTestContext(), message, messageBlockNumber, false, 0)
+		err = testDB.StoreMessage(t.GetTestContext(), message, messageBlockNumber, false, 0, common.Hash{})
 		Nil(t.T(), err)
 
 		// Create and store an attestation.
@@ -145,7 +146,7 @@ func (t *DBSuite) TestExecuteMessage() {
 		header := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, gofakeit.Uint32())
 		typesMessage := agentsTypes.NewMessage(header, nil, message)
 
-		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, true, 5)
+		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, true, 5, common.Hash{})
 		Nil(t.T(), err)
 
 		messageMask := db.DBMessage{
@@ -185,7 +186,7 @@ func (t *DBSuite) TestGetExecutableMessages() {
 		header := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, gofakeit.Uint32())
 		typesMessage := agentsTypes.NewMessage(header, nil, message)
 
-		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, false, 10)
+		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, false, 10, common.Hash{})
 		Nil(t.T(), err)
 
 		messageMask := db.DBMessage{
@@ -206,7 +207,7 @@ func (t *DBSuite) TestGetExecutableMessages() {
 		header = agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, gofakeit.Uint32())
 		typesMessage = agentsTypes.NewMessage(header, nil, message)
 
-		err = testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, true, 20)
+		err = testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, true, 20, common.Hash{})
 		Nil(t.T(), err)
 
 		// Check when the current time is after the minimum time, and minimum time is set to true.
@@ -245,7 +246,7 @@ func (t *DBSuite) TestGetUnsetMinimumTimeMessages() {
 		header := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, gofakeit.Uint32())
 		typesMessage := agentsTypes.NewMessage(header, nil, message)
 
-		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, false, 0)
+		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, false, 0, common.Hash{})
 		Nil(t.T(), err)
 
 		messageMask := db.DBMessage{
@@ -264,7 +265,7 @@ func (t *DBSuite) TestGetUnsetMinimumTimeMessages() {
 		header = agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, gofakeit.Uint32())
 		typesMessage = agentsTypes.NewMessage(header, nil, message)
 
-		err = testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, true, 0)
+		err = testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, true, 0, common.Hash{})
 		Nil(t.T(), err)
 
 		messages, err = testDB.GetUnsetMinimumTimeMessages(t.GetTestContext(), messageMask, 1)
@@ -285,7 +286,7 @@ func (t *DBSuite) TestSetMinimumTime() {
 		header := agentsTypes.NewHeader(agentsTypes.MessageFlagManager, chainID, nonce, destination, gofakeit.Uint32())
 		typesMessage := agentsTypes.NewMessage(header, nil, message)
 
-		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, false, 0)
+		err := testDB.StoreMessage(t.GetTestContext(), typesMessage, blockNumber, false, 0, common.Hash{})
 		Nil(t.T(), err)
 
 		trueVal := true

agents/agents/executor/db/sql/base/crosstable.go

@@ -61,7 +61,13 @@ func (s Store) GetTimestampForMessage(ctx context.Context, chainID, destination,
 		return nil, fmt.Errorf("failed to get timestamp for message: %w", dbTx.Error)
 	}
 
-	if dbTx.RowsAffected == 0 {
+	fmt.Printf("got timestamp for message with rowsAffected %d: %d", dbTx.RowsAffected, timestamp)
+
+	// if dbTx.RowsAffected == 0 {
+	// 	//nolint:nilnil
+	// 	return nil, nil
+	// }
+	if timestamp == 0 {
 		//nolint:nilnil
 		return nil, nil
 	}
@@ -72,28 +78,28 @@ func (s Store) GetTimestampForMessage(ctx context.Context, chainID, destination,
 // GetEarliestStateInRange gets the earliest state with the same snapshot root as an attestation within a nonce range.
 // 1. Get all states that are within a nonce range.
 // 2. Get the state with the earliest attestation associated to it.
-func (s Store) GetEarliestStateInRange(ctx context.Context, chainID, destination, startNonce, endNonce uint32) (*agentsTypes.State, error) {
+func (s Store) GetEarliestStateInRange(ctx context.Context, chainID, destination, startNonce, endNonce uint32) (*agentsTypes.State, *string, error) {
 	statesTableName, err := dbcommon.GetModelName(s.DB(), &State{})
 	if err != nil {
-		return nil, fmt.Errorf("failed to get states table name: %w", err)
+		return nil, nil, fmt.Errorf("failed to get states table name: %w", err)
 	}
 
 	attestationsTableName, err := dbcommon.GetModelName(s.DB(), &Attestation{})
 	if err != nil {
-		return nil, fmt.Errorf("failed to get attestations table name: %w", err)
+		return nil, nil, fmt.Errorf("failed to get attestations table name: %w", err)
 	}
 
 	var state State
 
 	query, err := interpol.WithMap(
 		`SELECT * FROM {stTable} WHERE {chainID} = ? AND {snapshotRoot} = (
-                     SELECT {snapshotRoot} FROM {attTable} WHERE {destination} = ? AND {destBlockNum} = (
-						SELECT MIN({destBlockNum}) FROM (
+                     SELECT {snapshotRoot} FROM {attTable} WHERE {destination} = ? AND ({snapshotRoot}) = (
+						SELECT attestationTable.{snapshotRoot} FROM (
 							(SELECT {snapshotRoot} FROM {stTable} WHERE {nonce} >= ? AND {nonce} <= ? AND {chainID} = ?) AS stateTable
 							INNER JOIN
 							(SELECT {snapshotRoot}, {destBlockNum} FROM {attTable} WHERE {destination} = ?) as attestationTable
 							ON stateTable.{snapshotRoot} = attestationTable.{snapshotRoot}
-						)
+						) ORDER BY {destBlockNum} ASC LIMIT 1
 					) ORDER BY {attNonce} DESC LIMIT 1
 				)`,
 		map[string]string{
@@ -108,19 +114,19 @@ func (s Store) GetEarliestStateInRange(ctx context.Context, chainID, destination
 		},
 	)
 	if err != nil {
-		return nil, fmt.Errorf("failed to interpolate GetEarliestStateInRange query: %w", err)
+		return nil, nil, fmt.Errorf("failed to interpolate GetEarliestStateInRange query: %w", err)
 	}
 
 	dbTx := s.DB().WithContext(ctx).
 		Raw(query, chainID, destination, startNonce, endNonce, chainID, destination).
 		Scan(&state)
 	if dbTx.Error != nil {
-		return nil, fmt.Errorf("failed to get earliest state in range: %w", dbTx.Error)
+		return nil, nil, fmt.Errorf("failed to get earliest state in range: %w", dbTx.Error)
 	}
 
 	if dbTx.RowsAffected == 0 {
 		//nolint:nilnil
-		return nil, nil
+		return nil, nil, nil
 	}
 
 	gasData := agentsTypes.NewGasData(
@@ -141,5 +147,5 @@ func (s Store) GetEarliestStateInRange(ctx context.Context, chainID, destination
 		gasData,
 	)
 
-	return &receivedState, nil
+	return &receivedState, &state.SnapshotRoot, nil
 }