Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3477863
Implement EtherFiARM contract and associated interfaces; add tests fo…
clement-ux Oct 3, 2025
30b29be
Add EtherFi Redemption Manager integration to EtherFiARM contract and…
clement-ux Oct 3, 2025
15ec6c5
Added asset() function for ERC-4626 compatibility
naddison36 Oct 17, 2025
a6c6dca
Format code
naddison36 Oct 17, 2025
6938e57
Changed asset() to be external rather than public
naddison36 Oct 17, 2025
0eeda55
Show forge version in CI
naddison36 Oct 20, 2025
ae789bc
Removed : from remapping
naddison36 Oct 21, 2025
24a8971
Reverted to Foundry version 1.3.6
naddison36 Oct 22, 2025
f425ced
Revert formatting to older Foundry version
naddison36 Oct 22, 2025
5965428
Added deploy of new LidoARM with the asset() function for better ERC-…
naddison36 Oct 22, 2025
e3c3f68
Set Foundry version in CI
naddison36 Oct 22, 2025
fbd8104
Changed to used authenticated Fly API
naddison36 Oct 22, 2025
6e0fa59
Merge remote-tracking branch 'origin/main' into clement/etherfi-arm
naddison36 Oct 22, 2025
f95d168
Merge branch 'nicka/add-asset-function' into clement/etherfi-arm
naddison36 Oct 22, 2025
31c082d
Refactor ZapperARM to make it more generic
naddison36 Oct 22, 2025
9d74e01
Add Ether.fi deploy script
naddison36 Oct 22, 2025
ca2a7b3
Add Ether.fi smoke tests
naddison36 Oct 22, 2025
e770cde
Made onERC721Received a pure function
naddison36 Oct 22, 2025
6d76e40
Increased the Treasury cap limit to 250 WETH
naddison36 Oct 22, 2025
8a161a4
Updated Treasury address for the Ether.fi ARM
naddison36 Oct 23, 2025
f362ef6
Added requestEtherFiWithdrawal smoke tests
naddison36 Oct 23, 2025
64b2e5b
Merge branch 'main' into clement/etherfi-arm
clement-ux Oct 23, 2025
d80af06
add smoke test for claim request and redeem.
clement-ux Oct 23, 2025
9bd99ee
add UpgradeOETHARMScript for deploying and upgrading OETH ARM impleme…
clement-ux Oct 23, 2025
3d38d1d
fix gov proposal
clement-ux Oct 24, 2025
3166a00
remove cheat for gov proposal
clement-ux Oct 24, 2025
a62325f
wip smoke test
clement-ux Oct 24, 2025
e317063
transfer out oeth and weth before initialization
clement-ux Oct 24, 2025
abd30ca
add more smoke tests
clement-ux Oct 24, 2025
b458624
finalize smoke tests
clement-ux Oct 24, 2025
6305315
fmt
clement-ux Oct 24, 2025
2cea3a8
Remove old ARM (#135)
clement-ux Oct 29, 2025
90a58bd
Merge branch 'main' into clement/upgrade-OETH-ARM
clement-ux Oct 30, 2025
b0a36f9
fmt
clement-ux Oct 30, 2025
5c7c17b
refactor: rename test contract for clarity and remove unused import
clement-ux Oct 30, 2025
7b2b41a
try something
clement-ux Oct 30, 2025
1aa7a23
try something
clement-ux Oct 30, 2025
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ snapshot:

# Tests
test-std:
forge test --summary --fail-fast --show-progress
forge test --summary --fail-fast --show-progress -vvv

test:
@FOUNDRY_NO_MATCH_CONTRACT=Fuzzer $(MAKE) test-std
Expand All @@ -42,7 +42,7 @@ test-all:
@$(MAKE) test-std

test-invariant-lido:
@FOUNDRY_INVARIANT_FAIL_ON_REVERT=false FOUNDRY_MATCH_CONTRACT=FuzzerFoundry_OethARM $(MAKE) test-std
@FOUNDRY_INVARIANT_FAIL_ON_REVERT=false FOUNDRY_MATCH_CONTRACT=FuzzerFoundry_LidoARM $(MAKE) test-std

test-invariant-origin:
@FOUNDRY_INVARIANT_FAIL_ON_REVERT=true FOUNDRY_MATCH_CONTRACT=FuzzerFoundry_OriginARM $(MAKE) test-std
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,10 @@ If the verification doesn't work with the deployment, it can be done separately
For example

```
# Verify OethARM
forge verify-contract 0xd8fF298eAed581f74ab845Af62C48aCF85B2f05e OethARM \
--constructor-args $(cast abi-encode "constructor(address,address,address)" 0x856c4Efb76C1D1AE02e20CEB03A2A6a08b0b8dC3 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2 0x39254033945AA2E4809Cc2977E7087BEE48bd7Ab )
# Verify LidoARM
forge verify-contract 0xeC6FdCc3904F8dD6a9cbbBCC41B741df5963B42E LidoARM \
--constructor-args $(cast abi-encode "constructor(address,address,address,uint256,uint256,int256)" 0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2 0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1 600 0 0 )


# Verify Proxy
forge verify-contract 0x6bac785889A4127dB0e0CeFEE88E0a9F1Aaf3cC7 Proxy
Expand Down
113 changes: 0 additions & 113 deletions docs/OEthARMHierarchy.svg

This file was deleted.

70 changes: 0 additions & 70 deletions docs/OEthARMSquashed.svg

This file was deleted.

Loading
Loading