fixing merge conflicts

.gitattributes

@@ -16,8 +16,11 @@
 # ignore ifacemaker files
 *_generated.go linguist-generated
 contrib/opbot/generated/* linguist-generated
+*.contractinfo.json linguist-generated=true
 
 
 # svg should be treated as a binary https://git.io/JE2VK
 *.svg    binary
 *.sol linguist-language=Solidity
+
+.vscode/*.json linguist-language=jsonc

.github/workflows/lint.yml

@@ -28,6 +28,11 @@ jobs:
         with:
           pattern: '.github/renovate.json' # Regular expression for filename to validate, default to *.json
 
+      - name: jsonc-syntax-check
+        uses: stevieb9/jsonc-syntax-check@1.02
+        with:
+          pattern: .vscode/*.json'
+
 
       - name: yaml-lint
         uses: ibiqlik/action-yamllint@v3

.vscode/extensions.json

@@ -1,12 +1,19 @@
 {
+    // This file (like all vscode metadata files) uses JSON with Comments (JSONC) format, which supports:
+    // - Comments (both single and multi-line)
+    // - Trailing commas
+    // - More lenient syntax than standard JSON
+
     // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
     // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-  
+
     // List of extensions which should be recommended for users of this workspace.
     "recommendations": [
       "dbaeumer.vscode-eslint",
       "editorconfig.editorconfig",
       "juanblanco.solidity",
       "golang.go",
+      "bierner.markdown-mermaid",
+      "bpruitt-goddard.mermaid-markdown-syntax-highlighting",
     ],
-  }
+  }

contrib/opbot/botmd/botmd.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/slack-io/slacker"
 	"github.com/synapsecns/sanguine/contrib/opbot/config"
+	"github.com/synapsecns/sanguine/contrib/opbot/internal"
 	"github.com/synapsecns/sanguine/contrib/opbot/signoz"
 	screenerClient "github.com/synapsecns/sanguine/contrib/screener-api/client"
 	"github.com/synapsecns/sanguine/core/dbcommon"
@@ -29,6 +30,7 @@ type Bot struct {
 	signozClient  *signoz.Client
 	signozEnabled bool
 	rpcClient     omnirpcClient.RPCClient
+	rfqClient     internal.RFQClient
 	signer        signer.Signer
 	submitter     submitter.TransactionSubmitter
 	screener      screenerClient.ScreenerClient
@@ -42,10 +44,11 @@ func NewBot(handler metrics.Handler, cfg config.Config) *Bot {
 	sugaredLogger := otelzap.New(experimentalLogger.MakeZapLogger()).Sugar()
 
 	bot := Bot{
-		handler: handler,
-		cfg:     cfg,
-		server:  server,
-		logger:  experimentalLogger.MakeWrappedSugaredLogger(sugaredLogger),
+		handler:   handler,
+		cfg:       cfg,
+		server:    server,
+		logger:    experimentalLogger.MakeWrappedSugaredLogger(sugaredLogger),
+		rfqClient: internal.NewRFQClient(handler, cfg.RFQIndexerAPIURL),
 	}
 
 	// you should be able to run opbot even without signoz.