Merge pull request #2341 from synapsecns/master

FE Release 3-21
synapsecns · Mar 26, 2024 · e7e3c6e · e7e3c6e
2 parents 04b9894 + 970d5a9
commit e7e3c6e
Show file tree

Hide file tree

Showing 92 changed files with 20,316 additions and 1,245 deletions.
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -10,6 +10,14 @@ reviews:
       - 'DO NOT MERGE'
     drafts: true
 
+    base_branches:
+      # useful for large features, e.g. https://github.com/synapsecns/sanguine/pull/2234
+      - 'feat/.*'
+      # the og
+      - 'master'
+      # fe-release branch. We're more looking for summaries here
+      - 'fe-release'
+
   path_filters:
     - '!**abigen.go'
     - '!**metadata.go'

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -49,7 +49,7 @@ jobs:
       - uses: docker://ghcr.io/synapsecns/sanguine/git-changes-action:latest
         id: filter_go
         with:
-          github_token: ${{ secrets.WORKFLOW_PAT }}
+          github_token: ${{ secrets.WORKFLOW_PAT || secrets.GITHUB_TOKEN }}
           timeout: '10m'
 
       - name: Check For Solidity Changes
@@ -329,9 +329,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          # see: https://github.com/golangci/golangci-lint/issues/3420, moving to go 1.20 requires a new golangci-lint version
-          # TODO: with this being 3 behind this should be done sooner rather than later.
-          go-version: 1.19.x
+          go-version: 1.21.x
 
       - uses: actions/checkout@v4
         with:
@@ -351,7 +349,7 @@ jobs:
           args: --timeout=60m
         env:
           # GitHub token for annotations (optional)
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_PAT }}
+          GITHUB_TOKEN: ${{ secrets.WORKFLOW_PAT || secrets.GITHUB_TOKEN }}
           GOMEMLIMIT: 6GiB
           GOGC: -1
 

diff --git a/.github/workflows/goreleaser-actions.yml b/.github/workflows/goreleaser-actions.yml
@@ -100,7 +100,7 @@ jobs:
       - uses: docker://ghcr.io/synapsecns/sanguine/git-changes-action:latest
         id: filter_go
         with:
-          github_token: ${{ secrets.WORKFLOW_PAT }}
+          github_token: ${{ secrets.WORKFLOW_PAT || secrets.GITHUB_TOKEN }}
 
       - id: length
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -28,17 +28,20 @@ jobs:
         with:
           pattern: '.github/renovate.json' # Regular expression for filename to validate, default to *.json
 
+
       - name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
         id: yaml-lint
         with:
           config_file: .yamllint.yml
+
       - uses: actions/upload-artifact@v4
         if: steps.yaml-lint.outcome == 'success'
         with:
           name: yamllint-logfile
           path: ${{ steps.yaml-lint.outputs.logfile }}
 
+
       # TODO: reinstate lint
       # - name: Download actionlint
       #   id: get_actionlint

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -12,7 +12,8 @@ jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
-# these are pretty disruptive
+    if: github.repository_owner == 'synapsecns'
+    # these are pretty disruptive
 #    permissions:
 #      contents: write
 #      pull-requests: write

diff --git a/.gitmodules b/.gitmodules
@@ -20,3 +20,6 @@
 [submodule "services/rfq/external/canonical-weth"]
 	path = services/rfq/external/canonical-weth
 	url = https://github.com/gnosis/canonical-weth
+[submodule "services/cctp-relayer/external/evm-cctp-contracts"]
+	path = services/cctp-relayer/external/evm-cctp-contracts
+	url = https://github.com/circlefin/evm-cctp-contracts.git
diff --git a/contrib/promexporter/config/config.go b/contrib/promexporter/config/config.go
@@ -104,10 +104,15 @@ func DecodeConfig(filePath string) (_ Config, err error) {
 			ChainIDs: types.ToInts(types.ETH, types.ARBITRUM, types.AVALANCHE, types.OPTIMISM),
 		},
 		{
-			Address:  "0xb300eff6b57aa09e5fccf7221fcb9e676a74d931",
+			Address:  "0xdd50676f81f607fd8ba7ed3187ddf172db174cd3",
 			Name:     "rfq",
 			ChainIDs: types.ToInts(types.OPTIMISM, types.ARBITRUM, types.ETH),
 		},
+		{
+			Address:  "0xdc927bd56cf9dfc2e3779c7e3d6d28da1c219969",
+			Name:     "rfq2",
+			ChainIDs: types.ToInts(types.OPTIMISM, types.ARBITRUM, types.ETH),
+		},
 	}
 
 	cfg.BridgeChecks = map[int]string{

diff --git a/package-docs/.nojekyll b/package-docs/.nojekyll
diff --git a/package-docs/README.md b/package-docs/README.md
diff --git a/package-docs/classes/SynapseSDK.md b/package-docs/classes/SynapseSDK.md
diff --git a/package-docs/modules.md b/package-docs/modules.md
diff --git a/package.json b/package.json
@@ -32,8 +32,7 @@
     "clean": "yarn lerna run clean --parallel",
     "test:coverage": "yarn cover-all && yarn collect &&  nyc report --reporter lcov --report-dir=lcov",
     "cover-all": "yarn lerna exec npm run test:coverage --parallel",
-    "collect": "rm -rf .nyc_output && mkdir -p .nyc_output && aggregate-coverage collectFiles --pattern='packages/**/!(node_modules)/**/coverage-final.json' --target='.nyc_output'",
-    "generate:docs": "typedoc --plugin typedoc-plugin-markdown --out package-docs"
+    "collect": "rm -rf .nyc_output && mkdir -p .nyc_output && aggregate-coverage collectFiles --pattern='packages/**/!(node_modules)/**/coverage-final.json' --target='.nyc_output'"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.2",

diff --git a/packages/contracts-core/.prettierignore b/packages/contracts-core/.prettierignore
diff --git a/packages/contracts-core/.prettierrc.js b/packages/contracts-core/.prettierrc.js
diff --git a/packages/contracts-core/CHANGELOG.md b/packages/contracts-core/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.29](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-core@1.0.28...@synapsecns/contracts-core@1.0.29) (2024-03-21)
+
+**Note:** Version bump only for package @synapsecns/contracts-core
+
+
+
+
+
+## [1.0.28](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-core@1.0.27...@synapsecns/contracts-core@1.0.28) (2024-03-21)
+
+**Note:** Version bump only for package @synapsecns/contracts-core
+
+
+
+
+
 ## [1.0.27](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-core@1.0.26...@synapsecns/contracts-core@1.0.27) (2023-12-06)
 
 **Note:** Version bump only for package @synapsecns/contracts-core

diff --git a/packages/contracts-core/package.json b/packages/contracts-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@synapsecns/contracts-core",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "",
   "scripts": {
     "build": "yarn build:contracts && yarn build:typescript && yarn build:go",
@@ -27,11 +27,8 @@
   "devDependencies": {
     "@typechain/ethers-v5": "10.0.0",
     "hardhat": "2.9.7",
-    "prettier": "2.7.1",
-    "prettier-plugin-solidity": "1.0.0-dev.23",
     "rimraf": "3.0.2",
     "solhint": "3.3.8",
-    "solhint-plugin-prettier": "0.0.5",
     "typechain": "8.0.0",
     "typescript": "4.7.3"
   },
@@ -44,8 +41,6 @@
     "@openzeppelin/contracts": "4.9.3",
     "@openzeppelin/contracts-upgradeable": "4.9.3",
     "dotenv": "16.0.1",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-prettier": "3.4.1",
     "solidity-coverage": "0.7.21",
     "ts-node": "10.8.1"
   }

diff --git a/packages/rest-api/CHANGELOG.md b/packages/rest-api/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.57](https://github.com/synapsecns/sanguine/compare/@synapsecns/rest-api@1.0.56...@synapsecns/rest-api@1.0.57) (2024-03-21)
+
+**Note:** Version bump only for package @synapsecns/rest-api
+
+
+
+
+
 ## [1.0.56](https://github.com/synapsecns/sanguine/compare/@synapsecns/rest-api@1.0.55...@synapsecns/rest-api@1.0.56) (2024-03-04)
 
 **Note:** Version bump only for package @synapsecns/rest-api