Skip to content

Commit

Permalink
merged with dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MrDeadCe11 committed May 3, 2024
2 parents 8faf0c4 + 5e00e76 commit 9b631ac
Show file tree
Hide file tree
Showing 26 changed files with 2,612 additions and 95 deletions.
37 changes: 8 additions & 29 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ jobs:
forge:
name: Run Unit and E2E Tests
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.x]

steps:
- uses: actions/checkout@v3
with:
Expand All @@ -46,15 +51,16 @@ jobs:
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly
cache: true

- name: Install forge dependencies
run: forge install

- name: Install yarn dependencies
run: yarn install --frozen-lockfile

- name: Precompile using 0.8.19 and via-ir=false
run: yarn build
- name: Build
run: forge build

- name: "Create env file"
run: |
Expand All @@ -68,30 +74,3 @@ jobs:
- name: Run tests
shell: bash
run: yarn test

# coverage:
# name: Run Coverage Tests
# runs-on: ubuntu-latest

# strategy:
# matrix:
# node-version: [16.x]

# steps:
# - uses: actions/checkout@v3
# - name: Use Node.js
# uses: actions/setup-node@v3
# with:
# node-version: ${{ matrix.node-version }}
# cache: "yarn"
# - name: Install Foundry
# uses: foundry-rs/foundry-toolchain@v1
# with:
# version: nightly
# - run: yarn install
# - run: yarn build
# - run: yarn coverage
# - uses: codecov/codecov-action@v3
# with:
# files: ./coverage/lcov.info
# flags: production
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ lcov.info
!/**/.gitkeep
.vscode/


# Docs build files
docs/book
docs/src/src/
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,11 @@ Template: [`new-AddCollateral.json`](gov-input/anvil/new-AddCollateral.json)
- delayedOracle: Usually a DelayedOracle that enforces delays to fresh price feeds.
- safetyCRatio: RAY, CRatio used to compute the 'safePrice' - the price used when generating debt in SAFEEngine.
- liquidationCRatio: RAY, CRatio used to compute the 'liquidationPrice' the price used when liquidating SAFEs.

- CollateralAuctionHouseParams:
- maximumDiscount: WAD, Maximum discount at which collateral is being sold
- minimumBid: WAD, Minimum acceptable bid
- minimumDiscount: WAD, Minimum discount at which collateral is being sold
- perSecondDiscountUpdateRate: RAY, Rate at which the discount will be updated in an auction.
This script proposes adding a new collateral to the system (deploys new contracts via the collateral join, collateral auction house factories and it adds the correct authorizations to the needed contracts).

### Modify Parameters
Expand Down
269 changes: 269 additions & 0 deletions broadcast/RedeployVault721.s.sol/42161/run-1714604460.json

Large diffs are not rendered by default.

Loading

0 comments on commit 9b631ac

Please sign in to comment.