feat: multi posm intent #1066
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| { | ||
| "borrowNative": "229560", | ||
| "repayNative": "168311", | ||
| "supplyAsCollateralNative": "160307", | ||
| "supplyNative": "136441", | ||
| "withdrawNative: full": "125585", | ||
| "withdrawNative: partial": "136781" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "borrowWithSig": "215849", | ||
| "repayWithSig": "189159", | ||
| "setSelfAsUserPositionManagerWithSig": "82643", | ||
| "setUsingAsCollateralWithSig": "85031", | ||
| "supplyWithSig": "153170", | ||
| "updateUserDynamicConfigWithSig": "62857", | ||
| "updateUserRiskPremiumWithSig": "61557", | ||
| "withdrawWithSig": "131678" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| { | ||
| "borrow: first": "191303", | ||
| "borrow: second action, same reserve": "171275", | ||
| "liquidationCall (receiveShares): full": "300391", | ||
| "liquidationCall (receiveShares): partial": "300109", | ||
| "liquidationCall: full": "310756", | ||
| "liquidationCall: partial": "310474", | ||
| "permitReserve + repay (multicall)": "166294", | ||
| "permitReserve + supply (multicall)": "146774", | ||
| "permitReserve + supply + enable collateral (multicall)": "160463", | ||
| "repay: full": "126425", | ||
| "repay: partial": "131314", | ||
| "setUserPositionManagerWithSig: disable": "52333", | ||
| "setUserPositionManagerWithSig: enable": "76362", | ||
| "supply + enable collateral (multicall)": "140536", | ||
| "supply: 0 borrows, collateral disabled": "123657", | ||
| "supply: 0 borrows, collateral enabled": "106579", | ||
| "supply: second action, same reserve": "106557", | ||
| "updateUserDynamicConfig: 1 collateral": "73782", | ||
| "updateUserDynamicConfig: 2 collaterals": "88639", | ||
| "updateUserRiskPremium: 1 borrow": "94782", | ||
| "updateUserRiskPremium: 2 borrows": "104597", | ||
| "usingAsCollateral: 0 borrows, enable": "58893", | ||
| "usingAsCollateral: 1 borrow, disable": "105050", | ||
| "usingAsCollateral: 1 borrow, enable": "41781", | ||
| "usingAsCollateral: 2 borrows, disable": "126033", | ||
| "usingAsCollateral: 2 borrows, enable": "41793", | ||
| "withdraw: 0 borrows, full": "128888", | ||
| "withdraw: 0 borrows, partial": "133451", | ||
| "withdraw: 1 borrow, partial": "161014", | ||
| "withdraw: 2 borrows, partial": "174192", | ||
| "withdraw: non collateral": "106522" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| { | ||
| "borrow: first": "261987", | ||
| "borrow: second action, same reserve": "204959", | ||
| "liquidationCall (receiveShares): full": "334242", | ||
| "liquidationCall (receiveShares): partial": "333960", | ||
| "liquidationCall: full": "344607", | ||
| "liquidationCall: partial": "344325", | ||
| "permitReserve + repay (multicall)": "163485", | ||
| "permitReserve + supply (multicall)": "146774", | ||
| "permitReserve + supply + enable collateral (multicall)": "160463", | ||
| "repay: full": "120587", | ||
| "repay: partial": "139876", | ||
| "setUserPositionManagerWithSig: disable": "52333", | ||
| "setUserPositionManagerWithSig: enable": "76362", | ||
| "supply + enable collateral (multicall)": "140536", | ||
| "supply: 0 borrows, collateral disabled": "123657", | ||
| "supply: 0 borrows, collateral enabled": "106579", | ||
| "supply: second action, same reserve": "106557", | ||
| "updateUserDynamicConfig: 1 collateral": "73782", | ||
| "updateUserDynamicConfig: 2 collaterals": "88639", | ||
| "updateUserRiskPremium: 1 borrow": "151346", | ||
| "updateUserRiskPremium: 2 borrows": "204830", | ||
| "usingAsCollateral: 0 borrows, enable": "58893", | ||
| "usingAsCollateral: 1 borrow, disable": "161614", | ||
| "usingAsCollateral: 1 borrow, enable": "41781", | ||
| "usingAsCollateral: 2 borrows, disable": "234266", | ||
| "usingAsCollateral: 2 borrows, enable": "41793", | ||
| "withdraw: 0 borrows, full": "128888", | ||
| "withdraw: 0 borrows, partial": "133451", | ||
| "withdraw: 1 borrow, partial": "215076", | ||
| "withdraw: 2 borrows, partial": "259826", | ||
| "withdraw: non collateral": "106522" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // SPDX-License-Identifier: UNLICENSED | ||
| // Copyright (c) 2025 Aave Labs | ||
| pragma solidity ^0.8.0; | ||
|
|
||
| import {SignatureChecker as OpenZeppelinSignatureChecker} from 'src/dependencies/openzeppelin/SignatureChecker.sol'; | ||
|
|
||
| /// @title SignatureChecker | ||
| /// @author Aave Labs | ||
| library SignatureChecker { | ||
| /// @notice Checks if a signature is valid for a given signer and data hash. | ||
| /// @dev External wrapper around OpenZeppelin's SignatureChecker.isValidSignatureNow to reduce code size at the expense of an external delegatecall. | ||
| /// @param signer The address of the signer. | ||
| /// @param hash The hash of the data to be signed. | ||
| /// @param signature The signature bytes. | ||
| /// @return True if the signature is valid, false otherwise. | ||
| function isValidSignatureNow( | ||
| address signer, | ||
| bytes32 hash, | ||
| bytes memory signature | ||
| ) external view returns (bool) { | ||
| return OpenZeppelinSignatureChecker.isValidSignatureNow(signer, hash, signature); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,10 @@ pragma solidity 0.8.28; | |
| import {SafeCast} from 'src/dependencies/openzeppelin/SafeCast.sol'; | ||
| import {SafeERC20, IERC20} from 'src/dependencies/openzeppelin/SafeERC20.sol'; | ||
| import {IERC20Permit} from 'src/dependencies/openzeppelin/IERC20Permit.sol'; | ||
| import {SignatureChecker} from 'src/libraries/misc/SignatureChecker.sol'; | ||
| import {AccessManagedUpgradeable} from 'src/dependencies/openzeppelin-upgradeable/AccessManagedUpgradeable.sol'; | ||
| import {EIP712} from 'src/dependencies/solady/EIP712.sol'; | ||
| import {EIP712Hash, EIP712Types} from 'src/position-manager/libraries/EIP712Hash.sol'; | ||
|
Contributor
There was a problem hiding this comment. I still think this should be a common lib for all contracts in the repo @miguelmtzinf
Member
Author
There was a problem hiding this comment. 100% agree, didn't do it here bc it's done in another PR and wanted to only keep relevant changes |
||
| import {MathUtils} from 'src/libraries/math/MathUtils.sol'; | ||
| import {PercentageMath} from 'src/libraries/math/PercentageMath.sol'; | ||
| import {WadRayMath} from 'src/libraries/math/WadRayMath.sol'; | ||
|
|
@@ -37,11 +38,7 @@ abstract contract Spoke is ISpoke, Multicall, NoncesKeyed, AccessManagedUpgradea | |
| using PositionStatusMap for *; | ||
| using ReserveFlagsMap for ReserveFlags; | ||
| using UserPositionDebt for ISpoke.UserPosition; | ||
| using EIP712Hash for EIP712Types.SetUserPositionManager; | ||
|
|
||
| /// @inheritdoc ISpoke | ||
| address public immutable ORACLE; | ||
|
|
@@ -448,29 +445,23 @@ abstract contract Spoke is ISpoke, Multicall, NoncesKeyed, AccessManagedUpgradea | |
|
|
||
| /// @inheritdoc ISpoke | ||
| function setUserPositionManagerWithSig( | ||
| EIP712Types.SetUserPositionManager calldata params, | ||
| bytes calldata signature | ||
| ) external { | ||
| bytes32 digest = _hashTypedData(params.hash()); | ||
| require( | ||
| block.timestamp <= params.deadline && | ||
| SignatureChecker.isValidSignatureNow(params.user, digest, signature), | ||
| InvalidSignature() | ||
| ); | ||
| _useCheckedNonce(params.user, params.nonce); | ||
| for (uint256 i = 0; i < params.updates.length; ++i) { | ||
| _setUserPositionManager({ | ||
| positionManager: params.updates[i].positionManager, | ||
| user: params.user, | ||
| approve: params.updates[i].approve | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| /// @inheritdoc ISpoke | ||
|
|
@@ -693,7 +684,7 @@ abstract contract Spoke is ISpoke, Multicall, NoncesKeyed, AccessManagedUpgradea | |
| function _setUserPositionManager(address positionManager, address user, bool approve) internal { | ||
| PositionManagerConfig storage config = _positionManager[positionManager]; | ||
| // only allow approval when position manager is active for improved UX | ||
| require(!approve || config.active, InactivePositionManager()); // todo rm this ux check given sig batching? | ||
|
Contributor
There was a problem hiding this comment. might be good to have, we don't want to approve an inactive one via the batch by mistake and be surprised if activated by Governance later
Member
Author
There was a problem hiding this comment. my concern is that keeping this fails an entire batch bc of one such case since it is only a UX check, i'm leaning towards removing it
Member
There was a problem hiding this comment. i d keep it, or no-op for ease of integraiton (e.g. we only approve if globally active)
Member
Author
There was a problem hiding this comment. either is risky tbh |
||
| config.approval[user] = approve; | ||
| emit SetUserPositionManager(user, positionManager, approve); | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's move with the other lib imports