Off-chain cleanup (#302)

* Added optional --id param to the auto claim withdrawal actions

* Updated ARMs in the README

* README update

* Added new getReserves interface

* Removed Defender from the repo

Author: naddison36

.claude/CLAUDE.md

@@ -72,12 +72,10 @@ All ARMs are deployed behind `Proxy.sol` (EIP-1967) for upgradeability.
 
 ### Off-Chain Automation (`src/js/`)
 
-- **`src/js/actions/`** - OpenZeppelin Defender Actions (auto-withdraw, auto-claim, price setting, fee collection, allocation). Bundled with rollup.
-- **`src/js/tasks/`** - Hardhat tasks for admin operations.
+- **`src/js/tasks/actions/`** - Talos scheduled actions.
+- **`src/js/tasks/`** - Hardhat tasks for admin and operational jobs.
 - **`src/js/utils/`** - Shared utilities (1Inch/Kyber integration, address parsing, pricing helpers).
 
-Actions are bundled via: `pnpm rollup -c src/js/actions/rollup.config.cjs`
-
 **Scheduled actions (Talos):** the runner's cron/manual actions live in `src/js/tasks/actions/*.ts`, are scheduled in `migrations/seed_schedules.sql`, and are catalogued in `docs/ACTIONS.md`. When you add, remove, or change the behaviour of a scheduled action, update `docs/ACTIONS.md` in the same change.
 
 ## Deployment

.gitignore

@@ -33,7 +33,6 @@ test/invariants/.foundry-failures
 lcov.info*
 crytic-export
 
-# Defender Actions
 dist
 cache_hardhat
 
@@ -43,4 +42,4 @@ build/deployments-fork*.json
 *.html
 
 # Other
-.DS_Store
+.DS_Store

CLAUDE.md

@@ -62,10 +62,8 @@ All ARMs are deployed behind `Proxy.sol` (EIP-1967) for upgradeability.
 
 ### Off-Chain Automation (`src/js/`)
 
-- **`src/js/actions/`** - OpenZeppelin Defender Actions (auto-withdraw, auto-claim, price setting, fee collection, allocation). Bundled with rollup.
-- **`src/js/tasks/`** - Hardhat tasks for admin operations.
-
-Actions are bundled via: `pnpm rollup -c src/js/actions/rollup.config.cjs`
+- **`src/js/tasks/actions/`** - Talos scheduled actions.
+- **`src/js/tasks/`** - Hardhat tasks for admin and operational jobs.
 
 **Scheduled actions (Talos):** the runner's cron/manual actions live in `src/js/tasks/actions/*.ts`, are scheduled in `migrations/seed_schedules.sql`, and are catalogued in `docs/ACTIONS.md`. When you add, remove, or change the behaviour of a scheduled action, update `docs/ACTIONS.md` in the same change.
 

Hardhat.md

@@ -12,29 +12,19 @@ anvil --fork-url="$MAINNET_URL"
 2. In a separate terminal, run the `requestWithdraw` task against the local fork.
 
 ```
-unset DEFENDER_API_KEY
-unset DEFENDER_API_SECRET
 export IMPERSONATE=0x39878253374355DBcc15C86458F084fb6f2d6DE7
 export DEBUG=origin*
 yarn hardhat requestWithdraw --amount 300 --network local
 ```
 
-3. Create a Relayer API key
-
-See [Generate Relayer API key](./README.md#generate-relayer-api-key) instructions in the README.
-
-4.  Run the real thing after generating an API key for the Relay account
+3. Run the real task from an environment with AWS KMS credentials configured.
 
 ```
 unset IMPERSONATE
-export DEFENDER_API_KEY=
-export DEFENDER_API_SECRET=
 export DEBUG=origin*
 yarn hardhat requestWithdraw --amount 300 --network mainnet
 ```
 
-5. Delete the Relayer API key
-
 For more information, see the `requestWithdraw` help
 
 ```
@@ -52,29 +42,19 @@ anvil --fork-url="$MAINNET_URL"
 2. In a separate terminal, run the `autoClaimWithdraw` task against the local fork.
 
 ```
-unset DEFENDER_API_KEY
-unset DEFENDER_API_SECRET
 export IMPERSONATE=0x39878253374355DBcc15C86458F084fb6f2d6DE7
 export DEBUG=origin*
 yarn hardhat autoClaimWithdraw --network local
 ```
 
-3. Create a Relayer API key
-
-See [Generate Relayer API key](./README.md#generate-relayer-api-key) instructions in the README.
-
-4.  Run the real thing after generating an API key for the Relay account
+3. Run the real task from an environment with AWS KMS credentials configured.
 
 ```
 unset IMPERSONATE
-export DEFENDER_API_KEY=
-export DEFENDER_API_SECRET=
 export DEBUG=origin*
 yarn hardhat autoClaimWithdraw --network mainnet
 ```
 
-5. Delete the Relayer API key
-
 For more information, see the `autoClaimWithdraw` help
 
 ```

README.md

@@ -1,12 +1,12 @@
 # Automated Redemption Manager (ARM)
 
-There are currently three ARM contracts:
+There are currently five ARM contracts:
 
 1. [Lido ARM](https://docs.originprotocol.com/automated-redemption-manager-arm/steth-arm) on Ethereum with stETH as the base asset and WETH as the liquidity asset.
 2. [EtherFi ARM](https://docs.originprotocol.com/automated-redemption-manager-arm/eeth-arm) on Ethereum with eETH as the base asset and WETH as the liquidity asset.
-3. Ethena ARM on Ethereum with sUSDe as the base asset and USDe as the liquidity asset.
-2. [OS ARM](https://docs.originprotocol.com/os-arm) on Sonic with OS as the base asset and wS as the liquidity asset.
-3. OETH ARM on Ethereum with OETH as the base asset and WETH as the liquidity asset.
+3. [Ethena ARM](https://docs.originprotocol.com/automated-redemption-manager-arm/susde-arm) on Ethereum with sUSDe as the base asset and USDe as the liquidity asset.
+4. USD ARM on Ethereum with PYUSD and USDG as base assets and USDC as the liquidity asset.
+5. [OS ARM](https://docs.originprotocol.com/os-arm) on Sonic with OS as the base asset and wS as the liquidity asset.
 
 ## Deployed Contracts
 
@@ -100,11 +100,27 @@ function swapTokensForExactTokens(
 ) external returns (uint256[] memory amounts);
 
 /**
- * @notice Get the available liquidity for a each token in the ARM.
- * @return reserve0 The available liquidity for token0
- * @return reserve1 The available liquidity for token1
+ * @notice Get the available reserves for each token in the ARM.
+ * @dev Applies to the Lido, EtherFi, OETH and OS ARMs.
+ * @return reserve0 The available liquidity for token0.
+ * @return reserve1 The available liquidity for token1.
  */
 function getReserves() external view returns (uint256 reserve0, uint256 reserve1);
+
+/**
+ * @notice Get available liquidity and base asset reserves for a supported base asset.
+ * @dev Applies to the Ethena and USD ARMs.
+ * For the Ethena ARM, reserveBaseAsset is sUSDe and liquidityAssets are USDe.
+ * For the USD ARM, reserveBaseAsset is PYUSD or USDG and liquidityAssets are USDC.
+ * Liquidity assets are net of outstanding LP withdrawal claims.
+ * @param reserveBaseAsset Supported base asset whose reserve should be returned.
+ * @return liquidityAssets Available liquidity assets.
+ * @return baseAssetReserve Base assets held directly by the ARM.
+ */
+function getReserves(address reserveBaseAsset)
+    external
+    view
+    returns (uint256 liquidityAssets, uint256 baseAssetReserve);
 ```
 
 ## Liquidity Provider Interface
@@ -293,7 +309,7 @@ yarn hardhat tenderlySync --network sonic
 yarn hardhat tenderlyUpload --network sonic --name ORIGIN_ARM
 ```
 
-## Automated Actions (Talos) 
+## Automated Actions (Talos)
 
 The `src/js/tasks/actions/*.ts` files are hardhat tasks that handle operational jobs (allocations, fee collection, withdrawal requests, etc.). In production they're driven by a container that imports [`@talos/client`](https://github.com/oplabs/talos):
 
@@ -316,86 +332,4 @@ pnpm hardhat healthcheck
 
 If you opt in by setting `DATABASE_URL` (e.g., via `docker compose up`), the nonce queue engages and will try to connect to whatever that URL points at. `unset DATABASE_URL` to go back to the unwrapped path.
 
-Signer selection (`DEPLOYER_PRIVATE_KEY` → KMS via `KMS_RELAYER_ID` → `IMPERSONATE` → Defender → hardhat first signer) lives entirely in `src/js/utils/signers.ts` and is unchanged.
-
-## Open Zeppelin Defender
-
-[Open Zeppelin Defender v2](https://docs.openzeppelin.com/defender/v2/) is used to manage the Operations account and automate AMM operational jobs like managing liquidity.
-
-### Deploying Defender Actions
-
-Defender Actions are used to run operational jobs are specific times or intervals.
-
-[rollup](https://rollupjs.org/) is used to bundle the Actions source code in [/src/js/actions](./src/js/actions) into a single file that can be uploaded to Defender. The implementation was based off [Defender Action example using Rollup](https://github.com/OpenZeppelin/defender-autotask-examples/tree/master/rollup). The rollup config is in [/src/js/actions/rollup.config.cjs](./src/js/actions/rollup.config.cjs). The outputs are written to task-specific folders under [/src/js/actions/dist](./src/js/actions/dist/).
-
-The [defender-autotask CLI](https://www.npmjs.com/package/@openzeppelin/defender-autotask-client) is used to upload the Action code to Defender.
-For this to work, a Defender Team API key with `Manage Actions` capabilities is needed. This can be generated by a Defender team admin under the `Manage` tab on the top right of the UI and then `API Keys` on the left menu.
-
-The following will set the Defender Team API key and bundle the Actions code ready for upload.
-
-```bash 
-# Set the DEFENDER_TEAM_KEY and DEFENDER_TEAM_SECRET env vars in the .env file
-
-yarn rollup -c src/js/actions/rollup.config.cjs
-```
-
-The following will upload the different Action bundles to Defender.
-
-```bash
-
-# Set the DEBUG environment variable to oeth* for the Defender Action
-yarn hardhat setActionVars --id 93c010f9-05b5-460f-bd10-1205dd80a7c9
-yarn hardhat setActionVars --id 563d8d0c-17dc-46d3-8955-e4824864869f
-yarn hardhat setActionVars --id c010fb76-ea63-409d-9981-69322d27993a
-yarn hardhat setActionVars --id 127171fd-7b85-497e-8335-fd7907c08386
-yarn hardhat setActionVars --id 84b5f134-8351-4402-8f6a-fb4376034bc4
-yarn hardhat setActionVars --id ffcfc580-7b0a-42ed-a4f2-3f0a3add9779 --name ONEINCH_API_KEY # Don't forget to run `export ONEINCH_API_KEY=...` first!
-yarn hardhat setActionVars --id 89658c5f-3857-4972-bef8-a5e914e13c56 # setPricesEtherFi
-yarn hardhat setActionVars --id 641e73f8-6792-41c8-bda9-930681d94ada # setPricesEthena
-yarn hardhat setActionVars --id 32dbc67b-89f3-4856-8f3d-ad4dc5a09322
-yarn hardhat setActionVars --id 7a0cb2c9-11c2-41dd-bcd0-d7c2dbda6af6
-yarn hardhat setActionVars --id a9fc4c86-0506-4809-afbc-93b5e558cb68
-yarn hardhat setActionVars --id 12977d51-d107-45eb-ac20-45942009ab01
-yarn hardhat setActionVars --id 6ec46510-0b8e-48b4-a4c8-de759aad0ba4
-yarn hardhat setActionVars --id 6d148f26-54a6-4377-92f2-3148d572eea3 --name ONEINCH_API_KEY # Don't forget to run `export ONEINCH_API_KEY=...` first!
-yarn hardhat setActionVars --id acfbb7d6-5ea6-4ffc-a758-fa4b4f584dd1 # allocateLido
-yarn hardhat setActionVars --id 6e26641e-4132-4824-bb80-7c891fd31455 # collectEtherFiFees
-yarn hardhat setActionVars --id 002c2b0d-9522-4d5f-a340-9713ee43a1c3 # allocateEtherFi
-yarn hardhat setActionVars --id 062cfee1-c34e-43ae-beb0-de62bc668bbd # autoRequestEtherFiWithdraw
-yarn hardhat setActionVars --id 6c52f3a9-85d8-4c7f-8aee-90a95b13965c # autoClaimEtherFiWithdraw
-yarn hardhat setActionVars --id 82ead29e-88f1-43bc-a5ed-503fadb3e491 # collectEthenaFees
-yarn hardhat setActionVars --id 80565995-9bb2-42a0-bbd5-e15297b67050 # allocateEthena
-yarn hardhat setActionVars --id 3a49c165-62d9-43a2-bef0-901ce1d59bef # autoRequestEthenaWithdraw
-yarn hardhat setActionVars --id b362885c-a023-4fb5-8c04-1c33147465eb # autoClaimEthenaWithdraw
-
-# Mainnet
-yarn hardhat updateAction --id 93c010f9-05b5-460f-bd10-1205dd80a7c9 --file autoRequestWithdraw
-yarn hardhat updateAction --id 563d8d0c-17dc-46d3-8955-e4824864869f --file autoClaimWithdraw
-yarn hardhat updateAction --id c010fb76-ea63-409d-9981-69322d27993a --file autoRequestLidoWithdraw
-yarn hardhat updateAction --id 127171fd-7b85-497e-8335-fd7907c08386 --file autoClaimLidoWithdraw
-yarn hardhat updateAction --id 84b5f134-8351-4402-8f6a-fb4376034bc4 --file collectLidoFees
-yarn hardhat updateAction --id ffcfc580-7b0a-42ed-a4f2-3f0a3add9779 --file setPricesLido
-yarn hardhat updateAction --id 89658c5f-3857-4972-bef8-a5e914e13c56 --file setPricesEtherFi
-yarn hardhat updateAction --id 641e73f8-6792-41c8-bda9-930681d94ada --file setPricesEthena
-yarn hardhat updateAction --id 32dbc67b-89f3-4856-8f3d-ad4dc5a09322 --file collectFeesSonic
-yarn hardhat updateAction --id 7a0cb2c9-11c2-41dd-bcd0-d7c2dbda6af6 --file allocateSonic
-yarn hardhat updateAction --id a9fc4c86-0506-4809-afbc-93b5e558cb68 --file collectRewardsSonic
-yarn hardhat updateAction --id 12977d51-d107-45eb-ac20-45942009ab01 --file autoRequestWithdrawSonic
-yarn hardhat updateAction --id 6ec46510-0b8e-48b4-a4c8-de759aad0ba4 --file autoClaimWithdrawSonic
-yarn hardhat updateAction --id 6d148f26-54a6-4377-92f2-3148d572eea3 --file setOSSiloPriceAction
-yarn hardhat updateAction --id acfbb7d6-5ea6-4ffc-a758-fa4b4f584dd1 --file allocateLido
-yarn hardhat updateAction --id 6e26641e-4132-4824-bb80-7c891fd31455 --file collectEtherFiFees
-yarn hardhat updateAction --id 002c2b0d-9522-4d5f-a340-9713ee43a1c3 --file allocateEtherFi
-yarn hardhat updateAction --id 062cfee1-c34e-43ae-beb0-de62bc668bbd --file autoRequestEtherFiWithdraw
-yarn hardhat updateAction --id 6c52f3a9-85d8-4c7f-8aee-90a95b13965c --file autoClaimEtherFiWithdraw
-yarn hardhat updateAction --id 82ead29e-88f1-43bc-a5ed-503fadb3e491 --file collectEthenaFees
-yarn hardhat updateAction --id 80565995-9bb2-42a0-bbd5-e15297b67050 --file allocateEthena
-yarn hardhat updateAction --id 3a49c165-62d9-43a2-bef0-901ce1d59bef --file autoRequestEthenaWithdraw
-yarn hardhat updateAction --id b362885c-a023-4fb5-8c04-1c33147465eb --file autoClaimEthenaWithdraw
-```
-
-`rollup` can be installed globally to avoid the `yarn` prefix.
-
-The Defender Actions need to be under 5MB in size. The [rollup-plugin-visualizer](https://www.npmjs.com/package/rollup-plugin-visualizer) can be used to visualize the size of an Action's dependencies.
-A `stats.html` file is generated in the`src/js/actions` folder that can be opened in a browser to see the size of the Action's dependencies.
-This will be for the last Action in the rollup config `src/js/actions/rollup.config.cjs`.
+Signer selection (`DEPLOYER_PRIVATE_KEY` → KMS via `KMS_RELAYER_ID` → `IMPERSONATE` → hardhat first signer) lives in `src/js/utils/signers.ts`.

package.json

@@ -23,10 +23,6 @@
     "@nomicfoundation/hardhat-ethers": "3.0.7",
     "@nomicfoundation/hardhat-foundry": "^1.1.1",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.10",
-    "@openzeppelin/defender-sdk": "2.7.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
     "@solidity-parser/parser": "^0.18.0",
     "axios": "^1.9.0",
     "builtin-modules": "^3.3.0",
@@ -39,8 +35,6 @@
     "hardhat": "^2.22.9",
     "node-fetch": "^2.6.7",
     "prettier": "^3.6.2",
-    "rollup": "^4.9.1",
-    "rollup-plugin-visualizer": "^5.12.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.0"
   },