Skip to content

Commit

Permalink
Merge branch 'master' into synapse-interface/worldchain
Browse files Browse the repository at this point in the history
  • Loading branch information
abtestingalpha committed Oct 21, 2024
2 parents ba40efe + 7cf772e commit 095732e
Show file tree
Hide file tree
Showing 77 changed files with 3,891 additions and 396 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/solidity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
- 'packages/contracts-rfq/**'
- '.github/workflows/solidity.yml'
- 'packages/solidity-devops/**'
branches:
# Solidity workflows are irrelevant for the FE release branch
- '!fe-release'
push:
paths:
- 'packages/contracts-core/**'
Expand Down Expand Up @@ -174,6 +177,7 @@ jobs:
with:
node-version: '${{steps.nvmrc.outputs.NVMRC}}'
target: './packages/${{matrix.package}}'
slither-config: './packages/${{matrix.package}}/slither.config.json'
ignore-compile: true
sarif: results.sarif
solc-version: 0.8.17
Expand Down Expand Up @@ -204,6 +208,9 @@ jobs:
- name: Installing dependencies
run: yarn install --immutable

- name: Install lcov
run: sudo apt-get update && sudo apt-get install -y lcov

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
Expand All @@ -222,6 +229,12 @@ jobs:
env:
FOUNDRY_FUZZ_RUNS: 10

# Some of the packages may want to exclude certain files from the coverage report (legacy code, scripts, tests)
- name: Apply filters to coverage report
if: ${{ matrix.package != 'solidity-devops' }}
working-directory: './packages/${{matrix.package}}'
run: npm run coverage:filter --if-present

- name: Send Coverage (Codecov)
if: ${{ matrix.package != 'solidity-devops' }}
uses: Wandalen/wretry.action@v1.0.36
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"nohoist": [
"**/typechain",
"**/@typechain/*",
"**/@openzeppelin/contracts-upgradeable",
"**/@openzeppelin/contracts",
"**/@openzeppelin/*",
"**/@synapsecns/solidity-devops",
"**/ds-test",
"**/forge-std"
Expand Down
1 change: 1 addition & 0 deletions packages/contracts-rfq/.solhintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
contracts/FastBridge.sol
contracts/interfaces/IFastBridge.sol
contracts/legacy/**/*.sol
script/FastBridge.s.sol
test/FastBridge.t.sol
test/FastBridgeMock.sol
28 changes: 28 additions & 0 deletions packages/contracts-rfq/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,34 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.9.1](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-rfq@0.9.0...@synapsecns/contracts-rfq@0.9.1) (2024-10-18)

**Note:** Version bump only for package @synapsecns/contracts-rfq





# [0.9.0](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-rfq@0.8.4...@synapsecns/contracts-rfq@0.9.0) (2024-10-18)


### Features

* **contracts-rfq:** add version to `BridgeTransaction`, tight packing [SLT-328] [SLT-273] ([#3284](https://github.com/synapsecns/sanguine/issues/3284)) ([a0d8a39](https://github.com/synapsecns/sanguine/commit/a0d8a39013b1ae332a80a2a624b99b0e7bb50722))
* **contracts-rfq:** FastBridge v1 multicall [SLT-324] ([#3313](https://github.com/synapsecns/sanguine/issues/3313)) ([bd6bd2d](https://github.com/synapsecns/sanguine/commit/bd6bd2db4be4b2a8b43357f0293bceaef294039d))





## [0.8.4](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-rfq@0.8.3...@synapsecns/contracts-rfq@0.8.4) (2024-10-18)

**Note:** Version bump only for package @synapsecns/contracts-rfq





## [0.8.3](https://github.com/synapsecns/sanguine/compare/@synapsecns/contracts-rfq@0.8.2...@synapsecns/contracts-rfq@0.8.3) (2024-10-16)

**Note:** Version bump only for package @synapsecns/contracts-rfq
Expand Down
4 changes: 3 additions & 1 deletion packages/contracts-rfq/contracts/FastBridge.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {UniversalTokenLib} from "./libs/UniversalToken.sol";
import {Admin} from "./Admin.sol";
import {IFastBridge} from "./interfaces/IFastBridge.sol";

contract FastBridge is IFastBridge, Admin {
import {MulticallTarget} from "./utils/MulticallTarget.sol";

contract FastBridge is IFastBridge, MulticallTarget, Admin {
using SafeERC20 for IERC20;
using UniversalTokenLib for address;

Expand Down
Loading

0 comments on commit 095732e

Please sign in to comment.