Skip to content
Open
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
8 changes: 8 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ jobs:
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install npm packages
run: npm ci --force

- name: Install lcov
uses: hrishikesh-kadam/setup-lcov@v1

Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/test-gas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
check:
name: Gas report
runs-on: ubuntu-latest
# Disabled until CI issues are resolved
if: false
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -20,6 +22,14 @@ jobs:
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install npm packages
run: npm ci --force

- name: Run Forge build
run: make sizes
id: build
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ jobs:
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install npm packages
run: npm ci --force

- name: Run Forge integration tests
env:
MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
Expand Down
11 changes: 8 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ docs/
# Dotenv file
.env

# Echidna
echidna
/echidna-corpus
/echidna-corpusOLD

# Gas report
gasreport.ansi

# Mac OS files
.DS_Store

Expand All @@ -25,6 +33,3 @@ node_modules

# Soljson
soljson-latest.js

# Gas report
gasreport.ansi
15 changes: 11 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,21 @@
[submodule "lib/common"]
path = lib/common
url = https://github.com/m0-foundation/common
branch = release-v1.4.0
branch = main
[submodule "lib/openzeppelin-foundry-upgrades"]
path = lib/openzeppelin-foundry-upgrades
url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
[submodule "lib/universal-router"]
path = lib/universal-router
url = https://github.com/Uniswap/universal-router
branch = main
[submodule "lib/fuzzlib"]
path = lib/fuzzlib
url = https://github.com/perimetersec/fuzzlib
[submodule "lib/uniswap-v4-periphery"]
path = lib/uniswap-v4-periphery
url = https://github.com/Uniswap/v4-periphery.git
url = https://github.com/Uniswap/v4-periphery
[submodule "lib/wrapped-m-token"]
path = lib/wrapped-m-token
url = https://github.com/m0-foundation/wrapped-m-token.git
branch = feat/swap-facility-support
url = https://github.com/m0-foundation/wrapped-m-token
branch = v2
1 change: 1 addition & 0 deletions .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"immutable-vars-naming": "off",
"imports-on-top": "error",
"max-line-length": ["warn", 120],
"no-console": "warn",
"no-empty-blocks": "off",
"no-inline-assembly": "off",
"not-rely-on-time": "off",
Expand Down
8 changes: 3 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"solidity.compileUsingRemoteVersion": "v0.8.26+commit.8a97fa7a",
"cSpell.words": [
"IJMI"
]
}
"solidity.compileUsingRemoteVersion": "v0.8.26+commit.8a97fa7a",
"cSpell.words": ["IJMI"]
}
244 changes: 135 additions & 109 deletions README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
"contractName": null,
"contractAddress": "0xb6807116b3b1b321a390594e31ecd6e0076f6278",
"function": "setTrustedRouter(address,bool)",
"arguments": [
"0x36f586A30502AE3afb555b8aA4dCc05d233c2ecE",
"true"
],
"arguments": ["0x36f586A30502AE3afb555b8aA4dCc05d233c2ecE", "true"],
"transaction": {
"from": "0xf2f1acbe0ba726fee8d75f3e32900526874740bb",
"to": "0xb6807116b3b1b321a390594e31ecd6e0076f6278",
Expand Down Expand Up @@ -119,4 +116,4 @@
"timestamp": 1765770288165,
"chain": 9745,
"commit": "7adf945"
}
}
7 changes: 2 additions & 5 deletions broadcast/ConfigureSwapFacility.s.sol/9745/run-latest.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
"contractName": null,
"contractAddress": "0xb6807116b3b1b321a390594e31ecd6e0076f6278",
"function": "setTrustedRouter(address,bool)",
"arguments": [
"0x36f586A30502AE3afb555b8aA4dCc05d233c2ecE",
"true"
],
"arguments": ["0x36f586A30502AE3afb555b8aA4dCc05d233c2ecE", "true"],
"transaction": {
"from": "0xf2f1acbe0ba726fee8d75f3e32900526874740bb",
"to": "0xb6807116b3b1b321a390594e31ecd6e0076f6278",
Expand Down Expand Up @@ -119,4 +116,4 @@
"timestamp": 1765770288165,
"chain": 9745,
"commit": "7adf945"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@
"timestamp": 1762535117189,
"chain": 1868,
"commit": "fda2152"
}
}
2 changes: 1 addition & 1 deletion broadcast/DeploySwapAdapter.s.sol/1868/run-latest.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@
"timestamp": 1762535117189,
"chain": 1868,
"commit": "fda2152"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,4 @@
"timestamp": 1762534170102,
"chain": 1868,
"commit": "fda2152"
}
}
2 changes: 1 addition & 1 deletion broadcast/DeploySwapFacility.s.sol/1868/run-latest.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,4 @@
"timestamp": 1762534170102,
"chain": 1868,
"commit": "fda2152"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,4 @@
"timestamp": 1765764617112,
"chain": 9745,
"commit": "7adf945"
}
}
2 changes: 1 addition & 1 deletion broadcast/DeploySwapFacility.s.sol/9745/run-latest.json
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,4 @@
"timestamp": 1765764617112,
"chain": 9745,
"commit": "7adf945"
}
}
1 change: 1 addition & 0 deletions crytic-export/combined_solc.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deployments/1868.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"extensionNames": [],
"swapAdapter": "0x023bd2F0A95373C55FC8D1c5F8e60cC3B9Bc4f4b",
"swapFacility": "0xB6807116b3B1B321a390594e31ECD6e0076f6278"
}
}
2 changes: 1 addition & 1 deletion deployments/9745.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"extensionNames": [],
"swapAdapter": "0x0000000000000000000000000000000000000000",
"swapFacility": "0xB6807116b3B1B321a390594e31ECD6e0076f6278"
}
}
Loading