Merge branch 'master' into feat/fast-bridge-v2-tests

synapsecns · Sep 17, 2024 · 0f39b57 · 0f39b57
2 parents 0f99c3e + 377a7fa
commit 0f39b57
Show file tree

Hide file tree

Showing 111 changed files with 2,981 additions and 594 deletions.
diff --git a/agents/contracts/bondingmanager/bondingmanager.metadata.go b/agents/contracts/bondingmanager/bondingmanager.metadata.go
diff --git a/agents/contracts/destination/destination.metadata.go b/agents/contracts/destination/destination.metadata.go
diff --git a/agents/contracts/gasoracle/gasoracle.metadata.go b/agents/contracts/gasoracle/gasoracle.metadata.go
diff --git a/agents/contracts/inbox/inbox.metadata.go b/agents/contracts/inbox/inbox.metadata.go
diff --git a/agents/contracts/lightinbox/lightinbox.metadata.go b/agents/contracts/lightinbox/lightinbox.metadata.go
diff --git a/agents/contracts/lightmanager/lightmanager.metadata.go b/agents/contracts/lightmanager/lightmanager.metadata.go
diff --git a/agents/contracts/origin/origin.metadata.go b/agents/contracts/origin/origin.metadata.go
diff --git a/agents/contracts/summit/summit.metadata.go b/agents/contracts/summit/summit.metadata.go
diff --git a/agents/contracts/test/attestationharness/attestationharness.metadata.go b/agents/contracts/test/attestationharness/attestationharness.metadata.go
diff --git a/agents/contracts/test/basemessageharness/basemessageharness.metadata.go b/agents/contracts/test/basemessageharness/basemessageharness.metadata.go
diff --git a/agents/contracts/test/bondingmanagerharness/bondingmanagerharness.metadata.go b/agents/contracts/test/bondingmanagerharness/bondingmanagerharness.metadata.go
diff --git a/agents/contracts/test/destinationharness/destinationharness.metadata.go b/agents/contracts/test/destinationharness/destinationharness.metadata.go
diff --git a/agents/contracts/test/gasdata/gasdataharness.metadata.go b/agents/contracts/test/gasdata/gasdataharness.metadata.go
diff --git a/agents/contracts/test/headerharness/headerharness.metadata.go b/agents/contracts/test/headerharness/headerharness.metadata.go
diff --git a/agents/contracts/test/lightmanagerharness/lightmanagerharness.metadata.go b/agents/contracts/test/lightmanagerharness/lightmanagerharness.metadata.go
diff --git a/agents/contracts/test/messageharness/messageharness.metadata.go b/agents/contracts/test/messageharness/messageharness.metadata.go
diff --git a/agents/contracts/test/originharness/originharness.metadata.go b/agents/contracts/test/originharness/originharness.metadata.go
diff --git a/agents/contracts/test/pingpongclient/pingpongclient.metadata.go b/agents/contracts/test/pingpongclient/pingpongclient.metadata.go
diff --git a/agents/contracts/test/receiptharness/receiptharness.metadata.go b/agents/contracts/test/receiptharness/receiptharness.metadata.go
diff --git a/agents/contracts/test/requestharness/requestharness.metadata.go b/agents/contracts/test/requestharness/requestharness.metadata.go
diff --git a/agents/contracts/test/snapshotharness/snapshotharness.metadata.go b/agents/contracts/test/snapshotharness/snapshotharness.metadata.go
diff --git a/agents/contracts/test/stateharness/stateharness.metadata.go b/agents/contracts/test/stateharness/stateharness.metadata.go
diff --git a/agents/contracts/test/summitharness/summitharness.metadata.go b/agents/contracts/test/summitharness/summitharness.metadata.go
diff --git a/agents/contracts/test/testclient/testclient.metadata.go b/agents/contracts/test/testclient/testclient.metadata.go
diff --git a/agents/contracts/test/tipsharness/tipsharness.metadata.go b/agents/contracts/test/tipsharness/tipsharness.metadata.go
diff --git a/agents/testutil/agentstestcontract/agentstestcontract.metadata.go b/agents/testutil/agentstestcontract/agentstestcontract.metadata.go
diff --git a/contrib/opbot/botmd/botmd.go b/contrib/opbot/botmd/botmd.go
@@ -11,11 +11,13 @@ import (
 	"github.com/synapsecns/sanguine/core/dbcommon"
 	"github.com/synapsecns/sanguine/core/metrics"
 	"github.com/synapsecns/sanguine/core/metrics/instrumentation/slackertrace"
+	experimentalLogger "github.com/synapsecns/sanguine/core/metrics/logger"
 	signerConfig "github.com/synapsecns/sanguine/ethergo/signer/config"
 	"github.com/synapsecns/sanguine/ethergo/signer/signer"
 	"github.com/synapsecns/sanguine/ethergo/submitter"
 	cctpSql "github.com/synapsecns/sanguine/services/cctp-relayer/db/sql"
 	omnirpcClient "github.com/synapsecns/sanguine/services/omnirpc/client"
+	"github.com/uptrace/opentelemetry-go-extra/otelzap"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -30,15 +32,20 @@ type Bot struct {
 	signer        signer.Signer
 	submitter     submitter.TransactionSubmitter
 	screener      screenerClient.ScreenerClient
+	logger        experimentalLogger.ExperimentalLogger
 }
 
 // NewBot creates a new bot server.
 func NewBot(handler metrics.Handler, cfg config.Config) *Bot {
 	server := slacker.NewClient(cfg.SlackBotToken, cfg.SlackAppToken)
+
+	sugaredLogger := otelzap.New(experimentalLogger.MakeZapLogger()).Sugar()
+
 	bot := Bot{
 		handler: handler,
 		cfg:     cfg,
 		server:  server,
+		logger:  experimentalLogger.MakeWrappedSugaredLogger(sugaredLogger),
 	}
 
 	// you should be able to run opbot even without signoz.

diff --git a/contrib/opbot/botmd/commands.go b/contrib/opbot/botmd/commands.go
@@ -82,6 +82,7 @@ func (b *Bot) traceCommand() *slacker.CommandDefinition {
 			// search for the transaction
 			res, err := b.signozClient.SearchTraces(ctx.Context(), signoz.Last3Hr, searchMap)
 			if err != nil {
+				b.logger.Errorf(ctx.Context(), "error searching for the transaction: %v", err)
 				_, err := ctx.Response().Reply("error searching for the transaction")
 				if err != nil {
 					log.Println(err)
@@ -290,6 +291,7 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 				}
 			}
 			if err != nil {
+				b.logger.Errorf(ctx.Context(), "error fetching quote request: %v", err)
 				_, err := ctx.Response().Reply("error fetching quote request")
 				if err != nil {
 					log.Println(err)
@@ -338,19 +340,23 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 			err = retry.WithBackoff(
 				ctx.Context(),
 				func(ctx context.Context) error {
-					txHash, err = relClient.GetTxHashByNonce(ctx, &relapi.GetTxByNonceRequest{
-						ChainID: rawRequest.OriginChainID,
-						Nonce:   nonce,
-					})
+					txHash, err = relClient.GetTxHashByNonce(
+						ctx,
+						&relapi.GetTxByNonceRequest{
+							ChainID: rawRequest.OriginChainID,
+							Nonce:   nonce,
+						})
 					if err != nil {
+						b.logger.Errorf(ctx, "error fetching quote request: %v", err)
 						return fmt.Errorf("error fetching quote request: %w", err)
 					}
 					return nil
 				},
-				retry.WithMaxAttempts(3),
-				retry.WithMaxAttemptTime(15*time.Second),
+				retry.WithMaxAttempts(5),
+				retry.WithMaxAttemptTime(30*time.Second),
 			)
 			if err != nil {
+				b.logger.Errorf(ctx.Context(), "error fetching quote request: %v", err)
 				_, err := ctx.Response().Reply(fmt.Sprintf("error fetching explorer link to refund, but nonce is %d", nonce))
 				log.Printf("error fetching quote request: %v\n", err)
 				return

diff --git a/contrib/opbot/go.mod b/contrib/opbot/go.mod
@@ -28,6 +28,7 @@ require (
 	github.com/synapsecns/sanguine/services/cctp-relayer v0.0.0-00010101000000-000000000000
 	github.com/synapsecns/sanguine/services/omnirpc v0.0.0-00010101000000-000000000000
 	github.com/synapsecns/sanguine/services/rfq v0.0.0-00010101000000-000000000000
+	github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.1
 	github.com/urfave/cli/v2 v2.27.2
 	golang.org/x/sync v0.8.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -240,7 +241,6 @@ require (
 	github.com/uptrace/opentelemetry-go-extra/otelgorm v0.3.1 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.1 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.1 // indirect
-	github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.1 // indirect
 	github.com/valyala/fastjson v1.6.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect

diff --git a/ethergo/examples/contracttests/counter/counter.metadata.go b/ethergo/examples/contracttests/counter/counter.metadata.go
diff --git a/ethergo/parser/abiutil/internal/testsignature.metadata.go b/ethergo/parser/abiutil/internal/testsignature.metadata.go
diff --git a/packages/rest-api/.babelrc b/packages/rest-api/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env", "@babel/preset-typescript"]
+}
diff --git a/packages/rest-api/.eslintrc.js b/packages/rest-api/.eslintrc.js
@@ -1,3 +1,11 @@
 module.exports = {
   extends: '../../.eslintrc.js',
+  overrides: [
+    {
+      files: ['jest.config.js'],
+      rules: {
+        'prettier/prettier': 'off',
+      },
+    },
+  ],
 }
diff --git a/packages/rest-api/CHANGELOG.md b/packages/rest-api/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.74](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-09-16)
+
+**Note:** Version bump only for package @synapsecns/rest-api
+
+
+
+
+
+## [1.0.73](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-09-12)
+
+**Note:** Version bump only for package @synapsecns/rest-api
+
+
+
+
+
 ## [1.0.72](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-09-04)
 
 

diff --git a/packages/rest-api/jest.config.js b/packages/rest-api/jest.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  roots: ['<rootDir>/src'],
+  transform: {
+    '^.+\\.(ts|tsx)$': 'babel-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  moduleDirectories: ['node_modules', 'src'],
+}