Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
with:
version: v1.5.1

- name: Install solc 0.8.34
run: forge build -- src/chains/Mainnet/TakerSubmitted.sol
env:
FOUNDRY_SOLC_VERSION: 0.8.34

- name: Install dependencies
run: git submodule update --recursive --init

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@ jobs:
with:
version: v1.5.1

- name: Install solc 0.8.34
run: forge build -- src/chains/Mainnet/TakerSubmitted.sol
env:
FOUNDRY_SOLC_VERSION: 0.8.34

- name: Install dependencies
run: git submodule update --recursive --init

- name: Install node dependencies
run: npm install

- name: Check contract sizes
run: forge build --sizes --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip ModeDeployer.sol --skip 'test/*'
- name: Check chain-specific Settler contract sizes
run: forge build --sizes --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip ModeDeployer.sol --skip 'test/*' -- src/chains/
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
with:
version: v1.5.1

- name: Install solc 0.8.34
run: forge build -- src/chains/Mainnet/TakerSubmitted.sol
env:
FOUNDRY_SOLC_VERSION: 0.8.34

- name: Install dependencies
run: git submodule update --recursive --init

Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ The codebase uses `auto_detect_solc = true` — the compiler version is determin
| Component | Solc Version | EVM Version | Optimizer Runs |
|-----------|--------------|-------------|----------------|
| Core libraries (`src/core/`, `src/*.sol`) | `^0.8.25` (auto-detected) | osaka | 2,000 |
| Chain contracts (`src/chains/*/`) | `=0.8.33` | osaka | 2,000 |
| Chain contracts (`src/chains/*/`) | `=0.8.34` | osaka | 2,000 |
| AllowanceHolder + Deployer | `=0.8.25` (CI-pinned) | osaka | 2,000 |
| UniswapV4 (`lib/v4-core/`) | 0.8.26 (CI-pinned) | osaka | 2,000 |
| MultiCall | 0.8.28 | london | 1,000,000 |
Expand Down
2 changes: 1 addition & 1 deletion sh/common_deploy_bridge_settler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ else
fi

forge flatten -o "$flat_bridge_settler_source" src/chains/"$chain_display_name"/BridgeSettler.sol >/dev/null
FOUNDRY_SOLC_VERSION=0.8.33 forge build "$flat_bridge_settler_source"
FOUNDRY_SOLC_VERSION=0.8.34 forge build "$flat_bridge_settler_source"

declare bridge_settler_artifact
bridge_settler_artifact="$project_root"/out/"$chain_display_name"BridgeSettlerFlat.sol/"$chain_display_name"BridgeSettler.json
Expand Down
6 changes: 3 additions & 3 deletions sh/common_deploy_settler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ flat_taker_source="$project_root"/src/flat/"$chain_display_name"TakerSubmittedFl
declare -r flat_taker_source
trap 'trap - EXIT; set +e; rm -f '"$(_escape "$flat_taker_source")" EXIT
forge flatten -o "$flat_taker_source" src/chains/"$chain_display_name"/TakerSubmitted.sol >/dev/null
FOUNDRY_SOLC_VERSION=0.8.33 forge build "$flat_taker_source"
FOUNDRY_SOLC_VERSION=0.8.34 forge build "$flat_taker_source"

declare flat_metatx_source
flat_metatx_source="$project_root"/src/flat/"$chain_display_name"MetaTxnFlat.sol
declare -r flat_metatx_source
trap 'trap - EXIT; set +e; rm -f '"$(_escape "$flat_taker_source")"' '"$(_escape "$flat_metatx_source")" EXIT
forge flatten -o "$flat_metatx_source" src/chains/"$chain_display_name"/MetaTxn.sol >/dev/null
FOUNDRY_SOLC_VERSION=0.8.33 forge build "$flat_metatx_source"
FOUNDRY_SOLC_VERSION=0.8.34 forge build "$flat_metatx_source"

declare flat_intent_source
flat_intent_source="$project_root"/src/flat/"$chain_display_name"IntentFlat.sol
declare -r flat_intent_source
trap 'trap - EXIT; set +e; rm -f '"$(_escape "$flat_taker_source")"' '"$(_escape "$flat_metatx_source")"' '"$(_escape "$flat_intent_source")" EXIT
forge flatten -o "$flat_intent_source" src/chains/"$chain_display_name"/Intent.sol >/dev/null
FOUNDRY_SOLC_VERSION=0.8.33 forge build "$flat_intent_source"
FOUNDRY_SOLC_VERSION=0.8.34 forge build "$flat_intent_source"

declare taker_artifact
taker_artifact="$project_root"/out/"$chain_display_name"TakerSubmittedFlat.sol/"$chain_display_name"Settler.json
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Abstract/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
import {BridgeSettler, BridgeSettlerBase} from "../../bridge/BridgeSettler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Abstract/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Abstract/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {AbstractSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Abstract/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {AbstractMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Abstract/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {AbstractMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Arbitrum/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Arbitrum/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Arbitrum/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {ArbitrumSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Arbitrum/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {ArbitrumMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Arbitrum/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {ArbitrumMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Avalanche/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Avalanche/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Avalanche/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {AvalancheSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Avalanche/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {AvalancheMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Avalanche/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {AvalancheMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Base/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Base/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Base/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BaseSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Base/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BaseMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Base/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BaseMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Berachain/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Berachain/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Berachain/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BerachainSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Berachain/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BerachainMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Berachain/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BerachainMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Bnb/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Bnb/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Bnb/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BnbSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Bnb/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BnbMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Bnb/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {BnbMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/HyperEvm/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/HyperEvm/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/HyperEvm/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {HyperEvmSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/HyperEvm/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {HyperEvmMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/HyperEvm/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {HyperEvmMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Ink/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Ink/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Ink/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {InkSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Ink/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {InkMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Ink/TakerSubmitted.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {InkMixin} from "./Common.sol";
import {Settler} from "../../Settler.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Katana/BridgeSettler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {IERC20} from "@forge-std/interfaces/IERC20.sol";
import {IBridgeSettlerActions} from "../../bridge/IBridgeSettlerActions.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Katana/Common.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {SettlerBase} from "../../SettlerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/chains/Katana/Intent.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {KatanaSettlerMetaTxn} from "./MetaTxn.sol";
import {SettlerIntent} from "../../SettlerIntent.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/chains/Katana/MetaTxn.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity =0.8.33;
pragma solidity =0.8.34;

import {KatanaMixin} from "./Common.sol";
import {SettlerMetaTxn} from "../../SettlerMetaTxn.sol";
Expand Down
Loading
Loading