Skip to content

Commit

Permalink
Merge branch 'master' into chore/clean
Browse files Browse the repository at this point in the history
  • Loading branch information
bigboydiamonds committed Jun 27, 2024
2 parents 78be334 + 18ac4e6 commit b7e1af7
Show file tree
Hide file tree
Showing 260 changed files with 11,292 additions and 6,344 deletions.
11 changes: 6 additions & 5 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ plugins:
enabled: true

exclude_patterns:
- '.*\\.abigen\\.go$'
- '.*\\.metadata\\.go$'
- '.*\\.pb\\.go$'
- '.*_gen.go$'
- '.*_generated.go$'
- '**/*.abigen.go'
- '**/*.gen.go' #gql gen
- '**/*.metadata.go'
- '**/*.pb.go'
- '**/*_gen.go'
- '**/.*_generated.go'
- '**/grpc/client/rest/*'
- '**/bundle/*'
- '**/generated/*'
Expand Down
8 changes: 4 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ flags:
paths:
- contrib/screener-api/
carryforward: true
opbot:
paths:
- contrib/opbot/
carryforward: true
git-changes-action:
paths:
- contrib/git-changes-action/
Expand Down Expand Up @@ -57,10 +61,6 @@ flags:
paths:
- services/scribe/
carryforward: true
stiprelayer:
paths:
- services/stiprelayer/
carryforward: true
solidity-core:
paths:
- packages/contracts-core/
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*_gen.go linguist-generated
# ignore ifacemaker files
*_generated.go linguist-generated
contrib/opbot/generated/* linguist-generated


# svg should be treated as a binary https://git.io/JE2VK
Expand Down
23 changes: 23 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ M-make:
M-docker:
- any: ['docker/**/*']

M-docs:
- any: ['docs/**/*']

M-integration:
- any: ['integration-tests/**/*']

Expand All @@ -31,5 +34,25 @@ M-charts:
C-Protocol-Critical:
- 'packages/contracts-core/**/*.sol'

M-vscode-settings:
- any: ['.vscode/**/*']


M-deps:
- 'package.json'
- 'yarn.lock'
- 'go.mod'
- 'go.sum'
- 'go.work'
- 'go.work.sum'

Sol:
- '**/*.ts'

Typescript:
- '**/*.ts'

Javascript:
- '**/*.js'
Go:
- '**/*.go'
32 changes: 7 additions & 25 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
max-parallel: 8
matrix:
go-version:
- 1.21.x
- 1.22.x
platform:
- ubuntu-latest
# only do on agents for now. Anything that relies on solidity in a package should do this
Expand Down Expand Up @@ -137,12 +137,6 @@ jobs:
sleep 1
done
- name: Install pyroscope-ci
uses: jaxxstorm/[email protected]
with: # Grab the latest version
repo: pyroscope-io/ci
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Install gotestsum
uses: jaxxstorm/[email protected]
Expand All @@ -156,17 +150,6 @@ jobs:
run: |
echo "::set-output name=flag::$(echo "${{ matrix.package }}" | rev | cut -d/ -f1 | rev)"
- name: Get pyroscope path
id: pyroscope-path
run: echo "##[set-output name=PYROSCOPE_PATH;]$(which pyroscope-ci)"
shell: bash

- name: Setup Pyroscope Tests
run: $PYROSCOPE_PATH go install --applicationName=$APPLICATION_NAME .
shell: bash
env:
PYROSCOPE_PATH: '${{ steps.pyroscope-path.outputs.PYROSCOPE_PATH }}'
APPLICATION_NAME: ${{ steps.coverage.outputs.flag }}
- name: Precompile Tests
working-directory: ${{ matrix.package }}
Expand All @@ -188,7 +171,7 @@ jobs:
retries=0
while [ $retries -lt $max_num_retries ]; do
if $PYROSCOPE_PATH exec --apiKey=${{ secrets.PYROSCOPE_CLOUD_TOKEN }} -- gotestsum --rerun-fails=3 --packages="$pkg" --format standard-verbose -- -v -timeout 30m -coverpkg="$pkg" -coverprofile=profile.cov $pkg; then
if gotestsum --rerun-fails=3 --packages="$pkg" --format standard-verbose -- -v -timeout 30m -coverpkg="$pkg" -coverprofile=profile.cov $pkg; then
break
else
retries=$((retries+1))
Expand All @@ -211,7 +194,6 @@ jobs:
cp coverage.txt profile.cov
docker ps
env:
PYROSCOPE_PATH: '${{ steps.pyroscope-path.outputs.PYROSCOPE_PATH }}'
ENABLE_MYSQL_TEST: true
MYSQL_HOST: 0.0.0.0
MYSQL_USER: user
Expand Down Expand Up @@ -271,7 +253,7 @@ jobs:
fail-fast: false
matrix:
go-version:
- 1.21.x
- 1.22.x
platform:
- ubuntu-latest
steps:
Expand Down Expand Up @@ -321,7 +303,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.22.x

- uses: actions/checkout@v4
with:
Expand All @@ -332,7 +314,7 @@ jobs:
run: cp ${{matrix.package}}/go.mod go.mod -v

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
working-directory: ${{matrix.package}}/
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
Expand Down Expand Up @@ -416,7 +398,7 @@ jobs:
# Setup Go
- uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Go modules cache
uses: actions/cache@v3
Expand Down Expand Up @@ -539,7 +521,7 @@ jobs:
# Setup Go
- uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Go modules cache
uses: actions/cache@v3
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/goreleaser-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@ jobs:
fetch-depth: 0
submodules: 'recursive'

- name: Set up cache
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{matrix.package}}-${{ hashFiles(format('{0}/go.sum', matrix.package)) }}
restore-keys: |
${{ runner.os }}-go-${{matrix.package}}
- name: Get branch name
id: branch-name
Expand Down Expand Up @@ -188,7 +197,6 @@ jobs:
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

# use this to determine if we need goreleaser for a workflow
# TODO: it might be worth considering moving this into a seperate workflow so we can avoid doing a full clone + pulling the image when we don't need anything
- name: Check For Docker Images
if: steps.branch-name.outputs.is_default != 'true'
id: image_check
Expand All @@ -197,7 +205,6 @@ jobs:
has_images=$(yq eval '.dockers != null' ${{matrix.package}}/.goreleaser.yml)
echo "##[set-output name=has_images;]$(echo $has_images)"
- name: Run GoReleaser (Snapshot)
if: steps.branch-name.outputs.is_default != 'true' && steps.image_check.outputs.has_images == 'true'
run: goreleaser --timeout 900m --snapshot --clean --debug -f ${{matrix.package}}/.goreleaser.yml
Expand Down Expand Up @@ -258,7 +265,6 @@ jobs:
name: ${{steps.project_id.outputs.project_name}}.zip
path: ${{steps.project_id.outputs.project_name}}.zip


- name: Refresh Report Card
if: steps.branch-name.outputs.is_default == 'true'
working-directory: ${{matrix.package}}/
Expand Down
12 changes: 11 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ issues:
- path: \.resolvers\.go
linters:
- cyclop

- path: signoz/*
linters:
- mnd
- stylecheck
- path: example/*
linters:
- revive
- cyclop
- forcetypeassert
- staticcheck
- wrapcheck
exclude-use-default: false
new-from-rev: a9a6f84f0569de877d06a027257aeca266aeda49
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"editor.fontLigatures": "'calt', 'liga', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09'",
"editor.formatOnSave": true,
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
Expand All @@ -21,4 +22,4 @@
"solidity.compileUsingRemoteVersion": "v0.8.17+commit.8df45f5f",
"solidity.formatter": "prettier",
"solidity.defaultCompiler": "remote"
}
}
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ packages/sdk-router/ @aureliusbtc @ChiTimesChi @trajan0x
packages/explorer-ui/ @trajan0x @bigboydiamonds @abtestingalpha
packages/rest-api/ @trajan0x @Defi-Moses
packages/synapse-interface/ @bigboydiamonds @abtestingalpha @aureliusbtc

yarn.lock @bigboydiamonds @abtestingalpha
contrib/ @trajan0x

services/explorer @trajan0x
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ root
├── <a href="./charts">charts</a>: The helm charts used for deploying sanguine related services
├── <a href="./contrib">contrib</a>: Devops related tools
│ ├── <a href="./contrib/git-changes-action">git-changes-action</a>: Github action for identifying changes in dependent modules in a go workspace
│ ├── <a href="./contrib/opbot">op bot</a>: Slack bot for managing operations.
│ ├── <a href="./contrib/promexporter">promexporter</a>: Multi-service prometheus exporter
│ ├── <a href="./contrib/screener-api">screener-api</a>: Optional address screening api
├── <a href="./core">core</a>: The Go core library with common utilities for use across the monorepo
Expand All @@ -71,7 +72,6 @@ root
├── <a href="./services">services</a>
│ ├── <a href="./services/cctp-relayer">CCTP Relayer</a>: CCTP message relayer
│ ├── <a href="./services/explorer">explorer</a>: Bridge/messaging explorer ba
│ ├── <a href="./services/stiprelayer">stiprelayer</a>: STIP relayer for rewards.
│ ├── <a href="./services/rfq">rfq</a>: RFQ contracts
│ ├── <a href="./services/scribe">scribe</a>: Generalized ethereum event logger
│ ├── <a href="./services/omnirpc">omnirpc</a>: Latency aware RPC Client used across multiple-chains at once
Expand Down
Loading

0 comments on commit b7e1af7

Please sign in to comment.