Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] develop from airswap:develop #84

Open
wants to merge 61 commits into
base: develop
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Aug 24, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

dmosites and others added 11 commits January 11, 2024 22:33
Merge to Beta for NPM Publishing
Publish beta packages to NPM
update staking token addresses, deploy staking to testnets (#1267)
* 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>
* 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

* publish libraries 4.2.1-beta.0

* 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

* Removed unused variable

* Added Delegate fillSenderAmount and Expiry to Rule

* Added Rule expiry test

* Fixed expiry check bug

---------

Co-authored-by: don mosites <[email protected]>
@pull pull bot added the ⤵️ pull label Aug 24, 2024
dmosites and others added 18 commits August 28, 2024 10:57
* publish libraries 4.2.1-beta.0

* Removed redundant chain ID checks

* Removed unused error and reduced max_error count by one

* Removed unused error from swap and reduced MAX_ERROR by 1

---------

Co-authored-by: don mosites <[email protected]>
* Use of hashTypeData for code clarity and check chain ID (#1318)

* publish libraries 4.2.1-beta.0

* Removed redundant chain ID checks

* Removed unused error and reduced max_error count by one

* Removed unused error from swap and reduced MAX_ERROR by 1

---------

Co-authored-by: don mosites <[email protected]>

* naming, comments, adjustments

* Updated NatSpec

---------

Co-authored-by: Smartcontrart <[email protected]>
Co-authored-by: Smart Contrart <[email protected]>
* Added checks to validate target deployment address matches mainnet

* Added storing of commit hashes upon deployment to track deployed code

* Created script to populate the latest deploy commits

* Renamed deploy commits script for clarity

* Updated module declarations

* Removed script to populate hashes

* prompt language update

---------

Co-authored-by: Don Mosites <[email protected]>
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.7.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.7...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Scripts enhancements (#1321)

* Added checks to validate target deployment address matches mainnet

* Added storing of commit hashes upon deployment to track deployed code

* Created script to populate the latest deploy commits

* Renamed deploy commits script for clarity

* Updated module declarations

* Removed script to populate hashes

* prompt language update

---------

Co-authored-by: Don Mosites <[email protected]>

* Bump micromatch from 4.0.5 to 4.0.8 (#1323)

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump axios from 1.6.7 to 1.7.7 (#1324)

Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.7.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.7...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Increased Delegate test coverage to 100%

---------

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>
* Increased Delegate test coverage to 100%

* Implemented audit fixes

* Removed unused import
Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.20.2 to 1.20.3.
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](expressjs/body-parser@1.20.2...1.20.3)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.20.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.19.2...4.20.0)

---
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>
…ntract (#1334)

* consolidate deploy confirms; add delegates report; consistent swapERC20Contract

* update delegate test with swapERC20Contract

* prettify delegate test

* deploy confirm formatting
dmosites and others added 30 commits October 1, 2024 10:38
Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fixed SignerAmount check

* updated error; updated expiry check; added and updated tests

---------

Co-authored-by: Don Mosites <[email protected]>
* use yarn 4.x latest as package manager

* remove install-state; update gitignore

* update actions to enable corepack and use latest
Merge latest for publishing
* Fix rounding management of partial fills

* Renamed tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants