Skip to content

Commit

Permalink
Merge pull request #2680 from synapsecns/master
Browse files Browse the repository at this point in the history
FE Release 2024-06-13
  • Loading branch information
abtestingalpha authored Jun 13, 2024
2 parents b60b380 + 30be8d6 commit 1ec6a12
Show file tree
Hide file tree
Showing 635 changed files with 4,917 additions and 383,914 deletions.
28 changes: 0 additions & 28 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ flags:
paths:
- agents/
carryforward: true
committee:
paths:
- committee/
carryforward: true
sin-executor:
paths:
- sin-executor/
carryforward: true
screener-api:
paths:
- contrib/screener-api/
Expand All @@ -38,26 +30,6 @@ flags:
paths:
- contrib/git-changes-action/
carryforward: true
release-copier-action:
paths:
- contrib/release-copier-action/
carryforward: true
terraform-provider-helmproxy:
paths:
- contrib/terraform-provider-helmproxy/
carryforward: true
terraform-provider-iap:
paths:
- contrib/terraform-provider-iap/
carryforward: true
terraform-provider-kubeproxy:
paths:
- contrib/terraform-provider-kubeproxy/
carryforward: true
tfcore:
paths:
- contrib/tfcore/
carryforward: true
core:
paths:
- core/
Expand Down
3 changes: 0 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
"ghcr.io/devcontainers/features/github-cli:1": {
"version": "latest",
},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest",
},
"ghcr.io/devcontainers/features/node:1": {
"version": "latest",
}
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/cypress.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -523,18 +523,18 @@ jobs:
# Foundry is required for flattening
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
if: ${{ contains(matrix.package, 'agents') || contains(matrix.package, 'services/rfq') || contains(matrix.package, 'sin-executor') || contains(matrix.package, 'committee') }}
if: ${{ contains(matrix.package, 'agents') || contains(matrix.package, 'services/rfq') }}
with:
version: nightly

- name: Install Node Dependencies
run: yarn install --immutable
if: ${{ contains(matrix.package, 'agents') || contains(matrix.package, 'services/rfq') || contains(matrix.package, 'sin-executor') || contains(matrix.package, 'committee') }}
if: ${{ contains(matrix.package, 'agents') || contains(matrix.package, 'services/rfq') }}

# Generate flattened files
- name: Run flattener
run: npx lerna exec npm run build:go
if: ${{ contains(matrix.package, 'agents') || contains(matrix.package, 'services/rfq') || contains(matrix.package, 'sin-executor') || contains(matrix.package, 'committee') }}
if: ${{ contains(matrix.package, 'agents') || contains(matrix.package, 'services/rfq') }}

# Setup Go
- uses: actions/setup-go@v4
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/goreleaser-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -258,35 +258,6 @@ jobs:
name: ${{steps.project_id.outputs.project_name}}.zip
path: ${{steps.project_id.outputs.project_name}}.zip

- name: Copy Releases
if: ${{ steps.branch-name.outputs.is_default == 'true' && contains( steps.tag_version.outputs.new_tag, 'terraform-provider-iap') }}
uses: docker://ghcr.io/synapsecns/sanguine/release-copier-action:latest
with:
github_token: ${{ secrets.PUBLISH_TOKEN }}
# TODO: will change with new org
destination_repo: 'trajan0x/terraform-provider-iap'
tag_name: ${{ steps.tag_version.outputs.new_tag }}
strip_prefix: 'contrib/terraform-provider-iap/'

- name: Copy Releases
if: ${{ steps.branch-name.outputs.is_default == 'true' && contains( steps.tag_version.outputs.new_tag, 'terraform-provider-helmproxy') }}
uses: docker://ghcr.io/synapsecns/sanguine/release-copier-action:latest
with:
github_token: ${{ secrets.PUBLISH_TOKEN }}
# TODO: will change with new org
destination_repo: 'trajan0x/terraform-provider-helmproxy'
tag_name: ${{ steps.tag_version.outputs.new_tag }}
strip_prefix: 'contrib/terraform-provider-helmproxy/'

- name: Copy Releases
if: ${{ steps.branch-name.outputs.is_default == 'true' && contains( steps.tag_version.outputs.new_tag, 'terraform-provider-kubeproxy') }}
uses: docker://ghcr.io/synapsecns/sanguine/release-copier-action:latest
with:
github_token: ${{ secrets.PUBLISH_TOKEN }}
# TODO: will change with new org
destination_repo: 'trajan0x/terraform-provider-kubeproxy'
tag_name: ${{ steps.tag_version.outputs.new_tag }}
strip_prefix: 'contrib/terraform-provider-kubeproxy/'

- name: Refresh Report Card
if: steps.branch-name.outputs.is_default == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
with:
ignore_paths: ./contrib/terraform-provider-iap/scripts/add-tfmac.sh ./contrib/terraform-provider-helmproxy/scripts/add-tfmac.sh ./contrib/terraform-provider-kubeproxy/scripts/add-tfmac.sh ./contrib/scripts/txdecoder.sh
ignore_paths: ./contrib/scripts/txdecoder.sh

- name: Validate renovate
uses: rinchsan/[email protected]
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/solidity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ on:
- 'packages/contracts-core/**'
- 'packages/contracts-rfq/**'
- '.github/workflows/solidity.yml'
- 'packages/contracts-communication/**'
- 'packages/solidity-devops/**'
push:
paths:
- 'packages/contracts-core/**'
- 'packages/contracts-rfq/**'
- 'packages/contracts-communication/**'
- 'packages/solidity-devops/**'
- '.github/workflows/solidity.yml'

Expand All @@ -39,7 +37,6 @@ jobs:
contracts-core: 'packages/contracts-core/**'
contracts-rfq: 'packages/contracts-rfq/**'
solidity-devops: 'packages/solidity-devops/**'
contracts-communication: 'packages/contracts-communication/**'
- id: length
run: |
export FILTER_LENGTH=$(echo $FILTERED_PATHS | jq '. | length')
Expand Down Expand Up @@ -83,7 +80,6 @@ jobs:
{
"contracts-core": "${{ secrets.VERCEL_CONTRACT_DOCS_PROJECT_ID}}",
"contracts-rfq": "${{ secrets.VERCEL_CONTRACT_RFQ_DOCS_PROJECT_ID }}",
"contracts-communication": "${{ secrets.VERCEL_COMMUNICATION_DOCS_PROJECT_ID }}",
"solidity-devops": "${{ secrets.VERCEL_DEVOPS_DOCS_PROJECT_ID }}"
}
END
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,4 @@ fastcache.tmp*
main
.devnet/

**/__debug_bin*
3 changes: 1 addition & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ run:
- grpc/client/rest/*
- bundle/*
- generated/*
- tracely/*
timeout: 15m
skip-files:
- '.*\\.abigen\\.go$'
Expand Down Expand Up @@ -135,4 +134,4 @@ issues:
- cyclop

exclude-use-default: false
new-from-rev: 5f8d480f4e3f1f2a318243a9924f50ec90ec4945
new-from-rev: a9a6f84f0569de877d06a027257aeca266aeda49
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.17.0
v18.18.0
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,15 @@ There are a variety of different packages in this repo, covered comprehensively
<pre>
root
├── <a href="./agents">agents</a>: agents contain all the agents used in optimistic messaging
├── <a href="./committe">committe</a>: sin synapsemodule committee.
├── <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/promexporter">promexporter</a>: Multi-service prometheus exporter
│ ├── <a href="./contrib/screener-api">screener-api</a>: Optional address screening api
│ ├── <a href="./contrib/release-copier-action">release-copier-action</a>: Github action for copying releases from one repo to another
│ ├── <a href="./contrib/terraform-provider-iap">terraform-provider-iap</a>: Terraform provider used for bastion proxy tunneling
│ ├── <a href="./contrib/terraform-provider-helmproxy">terraform-provider-helmproxy</a>: Terraform provider that allows helm to be proxied through an iap bastion proxy
│ ├── <a href="./contrib/terraform-provider-kubeproxy">terraform-provider-kubeproxy</a>: Terraform provider that allows kube to be proxied through an iap bastion proxy
│ ├── <a href="./contrib/tfcore">tfcore</a>: Terraform core utilities + iap utilities
├── <a href="./core">core</a>: The Go core library with common utilities for use across the monorepo
├── <a href="./ethergo">ethergo</a>: Go-based ethereum testing + common library
├── <a href="./packages">packages</a>
│ ├── <a href="./packages/contracts-core">contracts-core</a>: Core contracts used for synapse, powered by <a href="https://github.com/foundry-rs/foundry">Foundry</a>
│ ├── <a href="./packages/contracts-core">contracts-communication</a>: SIN contracts.
│ ├── <a href="./packages/contracts-rfq">rfq</a>: RFQ contracts
│ ├── <a href="./packages/coverage-aggregator">coverage-aggregator</a>: Javascript coverage aggregator based on <a href="https://www.npmjs.com/package/nyc">nyc</a>
│ ├── <a href="./packages/docs">docs</a>: Docasaurus documentation. Note: this is not yet in use, and docs are still maintained on gitbook
Expand All @@ -82,14 +75,14 @@ root
│ ├── <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
├── <a href="./sin-executor">sin-executor</a>: synapse interchain execturo.
├── <a href="./tools">tools</a>
│ ├── <a href="./tools/abigen">abigen</a>: Used to generate abigen bindings for go
│ ├── <a href="./tools/bundle">bundle</a>: Modified version of <a href="https://pkg.go.dev/golang.org/x/[email protected]/cmd/bundle"> go bundler </a> with improved shadowing support
│ ├── <a href="./tools/modulecopier">module copier</a>: Used to copy internal modules and export methods for testing
│ ├── <a href="./tools/revertresolver">revertresolver</a>: Converts hexified solidity errors into their underlying errors.
</pre>

Note: Terraform related modules have been moved to [this repository](https://github.com/synapsecns/tf-providers)

## Setup

Clone the repository, open it, and install nodejs packages with `yarn`:
Expand Down
2 changes: 1 addition & 1 deletion agents/agents/agentsintegration/agentsintegration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func (u *AgentsIntegrationSuite) TestAgentsE2E() {

tips := types.NewTips(big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0))
optimisticSeconds := uint32(1)
recipientDestination := u.TestClientMetadataOnDestination.Address().Hash()
recipientDestination := common.BytesToHash(u.TestClientMetadataOnDestination.Address().Bytes())
nonce := uint32(1)
body := []byte{byte(gofakeit.Uint32())}
txContextOrigin := u.TestBackendOrigin.GetTxContext(u.GetTestContext(), u.OriginContractMetadata.OwnerPtr())
Expand Down
2 changes: 1 addition & 1 deletion agents/agents/executor/executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ func (e *ExecutorSuite) TestExecutor() {

optimisticSeconds := uint32(10)

recipient := testContractDest.Address().Hash()
recipient := common.BytesToHash(testContractDest.Address().Bytes())
nonce := uint32(1)
body := []byte{byte(gofakeit.Uint32())}

Expand Down
2 changes: 1 addition & 1 deletion agents/agents/guard/fraud_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ func (g *GuardSuite) TestInvalidReceipt() {
deliveryTip := big.NewInt(int64(gofakeit.Uint32()))
tips := types.NewTips(summitTip, attestationTip, executorTip, deliveryTip)
optimisticSeconds := uint32(1)
recipientDestination := g.TestClientMetadataOnDestination.Address().Hash()
recipientDestination := common.BytesToHash(g.TestClientMetadataOnDestination.Address().Bytes())
nonce := uint32(1)
body := []byte{byte(gofakeit.Uint32())}
txContextOrigin := g.TestBackendOrigin.GetTxContext(g.GetTestContext(), g.OriginContractMetadata.OwnerPtr())
Expand Down
Loading

0 comments on commit 1ec6a12

Please sign in to comment.