Anvil backend log cleanup

.codecov.yml

@@ -16,6 +16,8 @@ coverage:
 
 # from go.work file
 flags:
+  # note: go.work flags should be in order of the directory structure
+  # also, if you're using multiple module names, you're doing something wrong
   agents:
     paths:
       - agents/

.dockerignore

@@ -0,0 +1,5 @@
+.github
+.vscode
+
+node_modules
+**/node_modules

.github/workflows/go.yml

@@ -503,7 +503,6 @@ jobs:
         with:
           label: 'needs-go-generate-${{matrix.package}}'
 
-
   check-generation:
     name: Go Generate (Module Changes)
     runs-on: ubuntu-latest

.github/workflows/goreleaser-actions.yml

@@ -75,6 +75,9 @@ jobs:
           push: true
           file: ./docker/goreleaser/Dockerfile
           # TODO this needs to be versioned
+          # Note: this automatically pushes the latest tag for sanguine-goreleaser even on branched workflows. While unlikely,
+          # this could break local devnets that rely on working versions of this image and as such the latest tag should only be pushed on master
+          # additionally, tags representing a specific version rather than the hash of the file should be considered for future use.
           tags: ghcr.io/synapsecns/sanguine-goreleaser:latest,${{ steps.name-export.outputs.TAG_NAME }}
           cache-from: type=registry,ref=ghcr.io/synapsecns/sanguine-goreleaser:buildcache
           cache-to: type=registry,ref=ghcr.io/synapsecns/sanguine-goreleaser:buildcache,mode=max

.gitignore

@@ -123,6 +123,8 @@ codecov/
 # fasthttp
 fastcache.tmp*
 
+#vercel
+
 # ignore all go built files in local dirs
 main
-**/.vercel
+.devnet/

.gitmodules

@@ -11,3 +11,6 @@
 [submodule "services/cctp-relayer/external/synapse-contracts"]
 	path = services/cctp-relayer/external/synapse-contracts
 	url = https://github.com/synapsecns/synapse-contracts
+[submodule "packages/contracts-core/lib/create3-factory"]
+	path = packages/contracts-core/lib/create3-factory
+	url = https://github.com/zeframlou/create3-factory

README.md

@@ -111,3 +111,10 @@ Use the above commands to recompile the packages.
 ## Dealing with submodules
 
 This repo make use of [multiple](.gitattributes) [submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules). To avoid issues when checking out different branches, you can use `git submodule update --init --recursive` after switching to a branch or `git checkout feat/branch-name --recurse-submodules` when switching branches.
+
+# Building Agents Locally
+
+<!-- TODO: we need to move this thing into an ops docs package. Given that the docs are still a work in progress, I'm leaving this here for now. -->
+<!-- Actually, it's unclear if this belongs in a contributing.md file, the docs or both. Maybe a symlink? -->
+
+In order to minimize risks coming from extraneous dependencies or supply chain attacks in a production like enviornment, all distributed images are built as [scratch](https://hub.docker.com/_/scratch) or [distroless](https://github.com/GoogleContainerTools/distroless#distroless-container-images) images. Builder containers are also not used to restrict the build enviornment to the [goreleaser container](https://github.com/synapsecns/sanguine/pkgs/container/sanguine-goreleaser). All production images are kept in the `docker/` file as `[dir].Dockerfile`. Local

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/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

@@ -72,15 +72,15 @@ 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
@@ -108,19 +108,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 +141,5 @@ func (s Store) GetEarliestStateInRange(ctx context.Context, chainID, destination
 		gasData,
 	)
 
-	return &receivedState, nil
+	return &receivedState, &state.SnapshotRoot, nil
 }

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

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"fmt"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/synapsecns/sanguine/agents/agents/executor/db"
 	"github.com/synapsecns/sanguine/agents/agents/executor/types"
 	agentsTypes "github.com/synapsecns/sanguine/agents/types"
@@ -13,8 +14,8 @@ import (
 )
 
 // StoreMessage stores a message in the database.
-func (s Store) StoreMessage(ctx context.Context, message agentsTypes.Message, blockNumber uint64, minimumTimeSet bool, minimumTime uint64) error {
-	dbMessage, err := AgentsTypesMessageToMessage(message, blockNumber, minimumTimeSet, minimumTime)
+func (s Store) StoreMessage(ctx context.Context, message agentsTypes.Message, blockNumber uint64, minimumTimeSet bool, minimumTime uint64, originTxHash common.Hash) error {
+	dbMessage, err := AgentsTypesMessageToMessage(message, blockNumber, minimumTimeSet, minimumTime, originTxHash)
 	if err != nil {
 		return fmt.Errorf("failed to convert message: %w", err)
 	}
@@ -51,6 +52,7 @@ func (s Store) ExecuteMessage(ctx context.Context, messageMask db.DBMessage) err
 
 // SetMinimumTime sets the minimum time of a message.
 func (s Store) SetMinimumTime(ctx context.Context, messageMask db.DBMessage, minimumTime uint64) error {
+	fmt.Printf("SetMinimumTime: %v, %v\n", minimumTime, messageMask)
 	dbMessageMask := DBMessageToMessage(messageMask)
 	update := Message{MinimumTime: minimumTime, MinimumTimeSet: true}
 	dbTx := s.DB().WithContext(ctx).
@@ -153,7 +155,7 @@ func (s Store) GetLastBlockNumber(ctx context.Context, chainID uint32, contractT
 			Where(fmt.Sprintf("%s = ?", ChainIDFieldName), chainID).
 			Select(fmt.Sprintf("MAX(%s)", BlockNumberFieldName)).
 			Find(&lastBlockNumber)
-	case types.LightInboxContract, types.SummitContract:
+	case types.LightInboxContract, types.SummitContract, types.DestinationContract:
 		dbTx = preDBTx.Model(&Attestation{}).
 			Where(fmt.Sprintf("%s = ?", DestinationFieldName), chainID).
 			Select(fmt.Sprintf("MAX(%s)", DestinationBlockNumberFieldName)).
@@ -342,11 +344,16 @@ func MessageToDBMessage(message Message) db.DBMessage {
 }
 
 // AgentsTypesMessageToMessage converts an agentsTypes.Message to a Message.
-func AgentsTypesMessageToMessage(message agentsTypes.Message, blockNumber uint64, minimumTimeSet bool, minimumTime uint64) (Message, error) {
+func AgentsTypesMessageToMessage(message agentsTypes.Message, blockNumber uint64, minimumTimeSet bool, minimumTime uint64, originTxHash common.Hash) (Message, error) {
 	rawMessage, err := agentsTypes.EncodeMessage(message)
 	if err != nil {
 		return Message{}, fmt.Errorf("failed to encode message: %w", err)
 	}
+	leafBytes, err := message.ToLeaf()
+	if err != nil {
+		return Message{}, fmt.Errorf("failed to get message leaf: %w", err)
+	}
+	leaf := common.BytesToHash(leafBytes[:])
 	return Message{
 		ChainID:        message.OriginDomain(),
 		Destination:    message.DestinationDomain(),
@@ -356,5 +363,7 @@ func AgentsTypesMessageToMessage(message agentsTypes.Message, blockNumber uint64
 		Executed:       false,
 		MinimumTimeSet: minimumTimeSet,
 		MinimumTime:    minimumTime,
+		Leaf:           leaf.String(),
+		OriginTxHash:   originTxHash.String(),
 	}, nil
 }