Skip to content

Commit

Permalink
feat: remove unused fee claimer, fix ci, improve stata interface (aav…
Browse files Browse the repository at this point in the history
…e-dao#73)

- remove paraswap fee claimer as it's no longer used (avara interface was the only one using and it no longer is necessary to have a middle contract with psp v6 aave/interface@68fec1e#diff-5866e66fcd5a4ac26049b83ba47b15d94a9ff6f1a7c117f28d366607a857d0a6R76)
- move static-a-token to stata-token for consistent naming
- add pool and pool address providers to the stata interface
- change the comment action to use the bgd one, so it's easier to iterate without having to update origin (e.g. the correct one has problems with comment size - which is now fixed on bgd side)
- disable certora ci on fork prs as it's only failing anyways
  • Loading branch information
sakulstra authored Nov 18, 2024
1 parent 076108f commit 809dd8a
Show file tree
Hide file tree
Showing 39 changed files with 52 additions and 448 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/certora-stata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ on:
jobs:
verify:
runs-on: ubuntu-latest
if:
github.event.pull_request.head.repo.full_name == github.repository || (github.event_name == 'push' &&
github.ref == format('refs/heads/{0}', github.event.repository.default_branch))

steps:
- uses: actions/checkout@v2
Expand Down
56 changes: 4 additions & 52 deletions .github/workflows/comment.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
# By calling this ci via `workflow_call` from another ci it has permissions to comment on prs from forks
# This action expects the a artifact named `content` to be present in the workflow run
# If the artifact contains a pr_number.txt, the action will comment on that pr. If not it comments on the commit.
# The content of the messages composed by concatinating all *.txt files within content into a single file
# If you want to enforce a specific order, you need to name the files in a way that sorts in the desired order
name: Comment
name: PR Comment

on:
workflow_run:
Expand All @@ -20,49 +15,6 @@ permissions:

jobs:
comment:
name: Comment Bot
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: content
path: /tmp/content
run-id: ${{ github.event.workflow_run.id }}
github-token: ${{ secrets.READ_ONLY_PAT || github.token }}

- name: Read pr number
id: get_pr_number
run: |
echo "pr_number=$(cat /tmp/content/pr_number.txt)" >> $GITHUB_OUTPUT
rm /tmp/content/pr_number.txt
- name: Combine
id: combine
run: cat /tmp/content/*.txt > /tmp/all.txt

- name: Find Comment
uses: peter-evans/find-comment@v3
id: fc
if: ${{ steps.get_pr_number.outputs.pr_number != null }}
with:
issue-number: ${{ steps.get_pr_number.outputs.pr_number }}
comment-author: "github-actions[bot]"
token: ${{ secrets.READ_ONLY_PAT || github.token }}

- name: Create or update pr comment
uses: peter-evans/create-or-update-comment@v4
if: ${{ steps.get_pr_number.outputs.pr_number != null }}
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ steps.get_pr_number.outputs.pr_number }}
body-file: /tmp/all.txt
edit-mode: replace
token: ${{ secrets.READ_ONLY_PAT || github.token }}

- name: Create or update commit comment
uses: peter-evans/commit-comment@v3
if: ${{ steps.get_pr_number.outputs.pr_number == null }}
with:
sha: ${{ github.event.workflow_run.head_sha }}
body-file: /tmp/all.txt
token: ${{ secrets.READ_ONLY_PAT || github.token }}
uses: bgd-labs/github-workflows/.github/workflows/comment.yml@main
secrets:
READ_ONLY_PAT: ${{ secrets.READ_ONLY_PAT }}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.10;

import {IPool, IPoolAddressesProvider} from '../../../interfaces/IPool.sol';

interface IERC4626StataToken {
struct SignatureParams {
uint8 v;
Expand All @@ -14,6 +16,18 @@ interface IERC4626StataToken {

error OnlyPauseGuardian(address caller);

/**
* @notice The pool associated with the aToken.
* @return The pool address.
*/
function POOL() external view returns (IPool);

/**
* @notice The poolAddressesProvider associated with the pool.
* @return The poolAddressesProvider address.
*/
function POOL_ADDRESSES_PROVIDER() external view returns (IPoolAddressesProvider);

/**
* @notice Burns `shares` of static aToken, with receiver receiving the corresponding amount of aToken
* @param shares The shares to withdraw, in static balance of StaticAToken
Expand Down
73 changes: 0 additions & 73 deletions src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol

This file was deleted.

4 changes: 0 additions & 4 deletions src/deployments/contracts/MarketReportStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,4 @@ import '../interfaces/IMarketReportStorage.sol';

abstract contract MarketReportStorage is IMarketReportStorage {
MarketReport internal _marketReport;

function getMarketReport() external view returns (MarketReport memory) {
return _marketReport;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity ^0.8.0;
import '../../interfaces/IMarketReportTypes.sol';
import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
import {StataTokenV2} from '../../../contracts/extensions/static-a-token/StataTokenV2.sol';
import {StataTokenFactory} from '../../../contracts/extensions/static-a-token/StataTokenFactory.sol';
import {StataTokenV2} from '../../../contracts/extensions/stata-token/StataTokenV2.sol';
import {StataTokenFactory} from '../../../contracts/extensions/stata-token/StataTokenFactory.sol';
import {IErrors} from '../../interfaces/IErrors.sol';

contract AaveV3HelpersProcedureTwo is IErrors {
Expand Down
Loading

0 comments on commit 809dd8a

Please sign in to comment.