Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/616 #825

Merged
merged 14 commits into from
Oct 24, 2023
Merged

Feature/616 #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
82248eb
refactor(test): fetch facet selectors
rndquu Oct 3, 2023
060647d
refactor(deploy): fetch facet selectors
rndquu Oct 3, 2023
2795552
build: use foundry from 19 Aug
rndquu Oct 4, 2023
0483f01
build: use foundry from 28 Sep
rndquu Oct 4, 2023
76e9d74
build: use foundry from 28 Sep for coverage check CI
rndquu Oct 4, 2023
08470f4
ci: install foundry deps in coverage check workflow
rndquu Oct 4, 2023
2cadc33
ci: update deps in coverage check workflow
rndquu Oct 4, 2023
d8739a4
fix: fix conflicts
rndquu Oct 24, 2023
bd9c593
test: inherit DiamondTestSetup from UUPSTestHelper
rndquu Oct 24, 2023
3f37c65
fix: resolve conflicts
rndquu Oct 24, 2023
fdb9309
ci: do not update deps in coverage check
rndquu Oct 24, 2023
0a56ff8
ci: update deps in coverage check
rndquu Oct 24, 2023
010d685
ci: update forge-std
rndquu Oct 24, 2023
0586e07
refactor(deploy): get CreditClockFacet selectors dynamically
rndquu Oct 24, 2023
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
6 changes: 5 additions & 1 deletion .github/workflows/coverage-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: development

- name: Setup Foundry
uses: onbjerg/foundry-toolchain@v1
uses: foundry-rs/foundry-toolchain@v1
molecula451 marked this conversation as resolved.
Show resolved Hide resolved
with:
version: nightly-5be158ba6dc7c798a6f032026fe60fc01686b33b

Expand Down Expand Up @@ -70,6 +70,10 @@ jobs:
- name: Checkout code in PR branch
uses: actions/checkout@v3

- name: Update Forge Dependencies
working-directory: packages/contracts
run: forge update lib/forge-std

- name: Get PR branch coverage
id: coverage-pr
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[submodule "packages/contracts/lib/forge-std"]
path = packages/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
branch = chore/v1.5.6
branch = chore/reorder-vm # v1.6.1
[submodule "packages/contracts/lib/abdk-libraries-solidity"]
path = packages/contracts/lib/abdk-libraries-solidity
url = https://github.com/abdk-consulting/abdk-libraries-solidity
Expand Down
1 change: 1 addition & 0 deletions cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"coef",
"collateralized",
"commitlint",
"concat",
"connectkit",
"Consts",
"Cpath",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/lib/forge-std
Open in desktop
Submodule forge-std updated 21 files
+48 −6 .github/workflows/ci.yml
+1 −1 package.json
+4 −3 src/Script.sol
+7 −2 src/StdChains.sol
+156 −15 src/StdCheats.sol
+16 −1 src/StdInvariant.sol
+18 −14 src/StdJson.sol
+54 −3 src/StdStorage.sol
+2 −2 src/StdStyle.sol
+1 −1 src/StdUtils.sol
+4 −3 src/Test.sol
+479 −241 src/Vm.sol
+93 −77 test/StdAssertions.t.sol
+91 −31 test/StdChains.t.sol
+167 −64 test/StdCheats.t.sol
+10 −10 test/StdError.t.sol
+27 −12 test/StdMath.t.sol
+66 −34 test/StdStorage.t.sol
+4 −4 test/StdStyle.t.sol
+66 −36 test/StdUtils.t.sol
+15 −0 test/Vm.t.sol
3 changes: 2 additions & 1 deletion packages/contracts/scripts/deploy/dollar/solidityScripting/00_Constants.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
pragma solidity 0.8.19;

import "../../../../src/dollar/libraries/Constants.sol";
import {DiamondTestHelper} from "../../../../test/helpers/DiamondTestHelper.sol";
import "forge-std/Script.sol";

contract Constants is Script {
contract Constants is DiamondTestHelper, Script {
address constant curve3PoolToken =
0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490;
address constant basePool = 0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7;
Expand Down
Loading