Delegates #1309
Merged
Delegates #1309
Conversation
This file contains 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
…ons to ensure both contracts compile simultaneously
… contract accordingly. Removed the delegateFactory contract
… contract accordingly. Removed the delegateFactory contract
…d tracking of remaining rule allowance
Delegates
🚨 Report Summary
For more details view the full report in OpenZeppelin Code Inspector |
smartcontrart
commented
May 10, 2024
dmosites
reviewed
May 15, 2024
source/delegate/LICENSE
Outdated
| @@ -0,0 +1,19 @@ | |||
| Copyright 2023 AirSwap | |||
dmosites
reviewed
May 16, 2024
dmosites
reviewed
May 16, 2024
| if (_senderWallet != msg.sender) revert SenderInvalid(); | ||
| } | ||
| Rule storage rule = rules[_senderWallet][_senderToken][_signerToken]; | ||
| rule.senderAmount = 0; |
There was a problem hiding this comment.
Would we gain anything by zeroing out the other fields?
There was a problem hiding this comment.
I originally didn't do it to save on gas. But the additional security might be worth the gas (which won't be much)
There was a problem hiding this comment.
How about just something like delete rules[_senderWallet][_senderToken][_signerToken];
There was a problem hiding this comment.
Absolutely... No idea why I wrote that horror...
dmosites
reviewed
May 16, 2024
| } | ||
|
|
||
| if (rule.senderAmount < _senderAmount) { | ||
| revert InsufficientDelegateAllowance(); |
There was a problem hiding this comment.
"InvalidSenderAmount" to match the above.
dmosites
reviewed
May 16, 2024
dmosites
reviewed
May 16, 2024
| } | ||
|
|
||
| /** | ||
| * @notice Revoke the signatory |
dmosites
reviewed
May 16, 2024
dmosites
reviewed
May 16, 2024
source/delegate/package.json
Outdated
| { | ||
| "name": "@airswap/delegate", | ||
| "version": "4.1.4", | ||
| "description": "AirSwap: Trade intent delegates", |
There was a problem hiding this comment.
"AirSwap: Delegate On-chain Trading Rules"
dmosites
reviewed
May 16, 2024
dmosites
approved these changes
May 27, 2024
smartcontrart
added a commit
that referenced
this pull request
Jul 18, 2024
* publish libraries 4.2.1-beta.0 * Bump follow-redirects from 1.15.5 to 1.15.6 (#1302) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Batch registry call (#1295) * Created Registry interface and imported in BatchCall * Created getTokensForStakers * Ran Prettier * Switched to solady lib for ERC20 calls --------- Co-authored-by: Don Mosites <[email protected]> * Bump express from 4.18.3 to 4.19.2 (#1303) Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump undici from 5.28.3 to 5.28.4 (#1304) Bumps [undici](https://github.com/nodejs/undici) from 5.28.3 to 5.28.4. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.3...v5.28.4) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ejs from 3.1.9 to 3.1.10 (#1308) Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](mde/ejs@v3.1.9...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Delegates (#1309) * Imported Delegate and Indexer contracts and Fixed Delegate code to allow compilation * Updated Indexer code to compile with Solidity 0.8.17 * Updated licenses for Delegates and Indexer contracts * Removed constructor visibility and updated Delegate/Indexer interactions to ensure both contracts compile simultaneously * Removed the indexer boilerplate and adjusted the delegate placeholder contract accordingly. Removed the delegateFactory contract * Removed the indexer boilerplate and adjusted the delegate placeholder contract accordingly. Removed the delegateFactory contract * Removed IDelegateFactoryContract * Created basics of the swap function for the delegate contract * Fixed token transfers * Removed unecessary variable * Removed unused imports in Delegate tests * Removed unused imports in Delegate tests * Fixed transfer amounts * Updated recipient to delegator in swapERC20 * Renamed signer to delegator and sender to taker * Renamed signer and sender to delegator and taker for clarity and added tracking of remaining rule allowance * Created delegate integration test * Removed unused variables * updated delegates contract to solady library * delegates: cleanup deps; remove redundants * name updates; test quickfix * prettier * Renamed _maxDelegatorAmount to _maxSenderAmount for consistency * Added test to check delegate allowance * Added internal rule tests * Implemented Delegate price check * Separated setting and unsetting rules tests * Specified DEFAULT_SIGNER_AMOUNT and DEFAULT_SENDER_AMOUNT in tests. Added a test case when SENDER_AMOUNT is above requirements * Removed test to check if sender can send more token that defined in the rule * Implemented signatory logic allowing sender to delegate rule setting on their behalf * Wrote delegate deploy script * Removed unecessary scripts * updated deploy.js.d.ts * Fixed chain name import * Deployed to Sepolia * Renamed Signatory to Manager, adjusted tests accordingly * Deployed to Sepolia * prettier * restore abis * Updated copyright date * PR comments, added swapERC20 setter and fixed ownership initialization * zeroed out all fields in the rule when unsetting * Refactored rule reset on unset --------- Co-authored-by: Don Mosites <[email protected]> * @airswap/delegate: update utils version; update yarn.lock * Prepared neon and neondevnet deployment * Deployment to Neon Devnet * Deployed wrapper * update utils deps to latest * update neonscan vars * update env.example * restore yarn.lock * Removed Delegates * Deployed on Neon mainnet * Verified contracts and transfered ownership on Neon --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: don mosites <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.