Merge pull request #1310 from airswap/develop

Delegates to beta

source/batch-call/contracts/BatchCall.sol

@@ -1,17 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import { ERC20 } from "solady/src/tokens/ERC20.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import "@airswap/swap/contracts/interfaces/ISwap.sol";
 import "@airswap/swap-erc20/contracts/interfaces/ISwapERC20.sol";
+import "@airswap/registry/contracts/interfaces/IRegistry.sol";
 
 /**
  * @title BatchCall: Batch balance, allowance, order validity checks, nonce usage check
  */
 contract BatchCall {
-  using SafeERC20 for IERC20;
   using Address for address;
 
   error ArgumentInvalid();
@@ -28,7 +27,7 @@ contract BatchCall {
     address tokenAddress
   ) public view returns (uint256) {
     if (tokenAddress.isContract()) {
-      IERC20 token = IERC20(tokenAddress);
+      ERC20 token = ERC20(tokenAddress);
       //  Check if balanceOf succeeds.
       (bool success, ) = address(token).staticcall(
         abi.encodeWithSelector(token.balanceOf.selector, userAddress)
@@ -119,7 +118,7 @@ contract BatchCall {
     address tokenAddress
   ) public view returns (uint256) {
     if (tokenAddress.isContract()) {
-      IERC20 token = IERC20(tokenAddress);
+      ERC20 token = ERC20(tokenAddress);
       // Check if allowance succeeds as a call else returns 0.
       (bool success, ) = address(token).staticcall(
         abi.encodeWithSelector(
@@ -290,4 +289,26 @@ contract BatchCall {
     }
     return nonceUsed;
   }
+
+  /**
+   * @notice provides the tokens supported by multiple Stakers
+   * @param stakers address[] list of stakers to be checked
+   * @param registryContract IRegistry Registry contract to call
+   * @return bool[] true indicates the nonce is used
+   */
+  function getTokensForStakers(
+    address[] calldata stakers,
+    IRegistry registryContract
+  ) external view returns (address[][] memory) {
+    if (stakers.length == 0) revert ArgumentInvalid();
+    address[][] memory tokensSupported = new address[][](stakers.length);
+
+    for (uint256 i; i < stakers.length; ) {
+      tokensSupported[i] = registryContract.getTokensForStaker(stakers[i]);
+      unchecked {
+        ++i;
+      }
+    }
+    return tokensSupported;
+  }
 }

source/batch-call/test/BatchCall.js

@@ -3,6 +3,7 @@ const { ethers, waffle } = require('hardhat')
 const { deployMockContract } = waffle
 const IERC20 = require('@openzeppelin/contracts/build/contracts/IERC20.json')
 const IERC721 = require('@openzeppelin/contracts/build/contracts/ERC721Royalty.json')
+const REGISTRY = require('@airswap/registry/build/contracts/Registry.sol/Registry.json')
 const SWAP = require('@airswap/swap/build/contracts/Swap.sol/Swap.json')
 const SWAP_ERC20 = require('@airswap/swap-erc20/build/contracts/SwapERC20.sol/SwapERC20.json')
 const ERC20_ADAPTER = require('@airswap/swap/build/contracts/adapters/ERC20Adapter.sol/ERC20Adapter.json')
@@ -22,6 +23,8 @@ const DEFAULT_AMOUNT = '1000'
 const DEFAULT_BALANCE = '100000'
 const BONUS_SCALE = '10'
 const BONUS_MAX = '100'
+const STAKING_COST = '1000000000'
+const SUPPORT_COST = '1000000'
 
 let snapshotId
 let deployer
@@ -31,6 +34,7 @@ let erc20token
 let erc20adapter
 let erc721token
 let erc721adapter
+let registry
 let swap
 let swapERC20
 let batchCall
@@ -107,6 +111,15 @@ async function setUpAllowances(senderAmount, signerAmount) {
 async function setUpBalances(senderAmount, signerAmount) {
   await erc20token.mock.balanceOf.withArgs(sender.address).returns(senderAmount)
   await erc20token.mock.balanceOf.withArgs(signer.address).returns(signerAmount)
+  await erc20token.mock.balanceOf
+    .withArgs(staker1.address)
+    .returns(STAKING_COST)
+  await erc20token.mock.balanceOf
+    .withArgs(staker2.address)
+    .returns(STAKING_COST)
+  await erc20token.mock.balanceOf
+    .withArgs(staker3.address)
+    .returns(STAKING_COST)
 }
 
 describe('BatchCall Integration', () => {
@@ -119,8 +132,17 @@ describe('BatchCall Integration', () => {
   })
 
   before('deploy adapter and swap', async () => {
-    ;[deployer, sender, signer, affiliate, protocolFeeWallet, anyone] =
-      await ethers.getSigners()
+    ;[
+      deployer,
+      sender,
+      signer,
+      affiliate,
+      protocolFeeWallet,
+      anyone,
+      staker1,
+      staker2,
+      staker3,
+    ] = await ethers.getSigners()
     erc20token = await deployMockContract(deployer, IERC20.abi)
     await erc20token.mock.allowance.returns(DEFAULT_AMOUNT)
     await erc20token.mock.balanceOf.returns(DEFAULT_AMOUNT)
@@ -143,6 +165,12 @@ describe('BatchCall Integration', () => {
       )
     ).deploy()
     await erc721adapter.deployed()
+
+    registry = await (
+      await ethers.getContractFactory(REGISTRY.abi, REGISTRY.bytecode)
+    ).deploy(erc20token.address, STAKING_COST, SUPPORT_COST)
+    await registry.deployed()
+
     swap = await (
       await ethers.getContractFactory(SWAP.abi, SWAP.bytecode)
     ).deploy(
@@ -329,4 +357,67 @@ describe('BatchCall Integration', () => {
       )
     })
   })
+
+  describe('returns tokensSupported for mutiple stakers', () => {
+    it('returns all tokens supported by multiple stakers', async () => {
+      const tokensSupported = []
+      for (let i = 0; i < 10; i++) {
+        tokensSupported[i] = await deployMockContract(deployer, IERC20.abi)
+      }
+      registry
+        .connect(staker1)
+        .addTokens([
+          tokensSupported[0].address,
+          tokensSupported[1].address,
+          tokensSupported[2].address,
+        ])
+      registry
+        .connect(staker2)
+        .addTokens([
+          tokensSupported[3].address,
+          tokensSupported[4].address,
+          tokensSupported[5].address,
+        ])
+      registry
+        .connect(staker3)
+        .addTokens([
+          tokensSupported[6].address,
+          tokensSupported[7].address,
+          tokensSupported[8].address,
+          tokensSupported[9].address,
+        ])
+      const expectedTokensSupported = await batchCall
+        .connect(deployer)
+        .getTokensForStakers(
+          [staker1.address, staker2.address, staker3.address],
+          registry.address
+        )
+      expect(expectedTokensSupported.toString()).to.equal(
+        [
+          [
+            tokensSupported[0].address,
+            tokensSupported[1].address,
+            tokensSupported[2].address,
+          ],
+          [
+            tokensSupported[3].address,
+            tokensSupported[4].address,
+            tokensSupported[5].address,
+          ],
+          [
+            tokensSupported[6].address,
+            tokensSupported[7].address,
+            tokensSupported[8].address,
+            tokensSupported[9].address,
+          ],
+        ].toString()
+      )
+    })
+
+    it('reverts if a wrong argument is passed', async () => {
+      await expect(
+        batchCall.getTokensForStakers([], registry.address)
+      ).to.be.revertedWith('ArgumentInvalid')
+    })
+  })
 })

source/delegate/LICENSE

@@ -0,0 +1,19 @@
+Copyright 2024 AirSwap
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

source/delegate/README.md

@@ -0,0 +1,37 @@
+# Delegate
+
+[AirSwap](https://www.airswap.io/) is an open-source peer-to-peer trading network.
+
+[![Discord](https://img.shields.io/discord/590643190281928738.svg)](https://discord.gg/ecQbV7H)
+[![License](https://img.shields.io/badge/License-MIT-blue)](https://opensource.org/licenses/MIT)
+![Twitter Follow](https://img.shields.io/twitter/follow/airswap?style=social)
+
+## Resources
+
+- About → https://about.airswap.io/
+- Website → https://www.airswap.io/
+- Twitter → https://twitter.com/airswap
+- Chat → https://chat.airswap.io/
+
+## Usage
+
+:warning: This package may contain unaudited code. For all AirSwap contract deployments see [Deployed Contracts](https://about.airswap.io/technology/deployments).
+
+## Commands
+
+Environment variables are set in an `.env` file in the repository root.
+
+| Command         | Description                              |
+| :-------------- | :--------------------------------------- |
+| `yarn`          | Install dependencies                     |
+| `yarn clean`    | Delete the contract `build` folder       |
+| `yarn compile`  | Compile all contracts to `build` folder  |
+| `yarn coverage` | Report test coverage                     |
+| `yarn test`     | Run all tests in `test` folder           |
+| `yarn test:ci`  | Run CI tests in `test` folder            |
+| `yarn deploy`   | Deploy on a network using --network flag |
+| `yarn verify`   | Verify on a network using --network flag |
+
+## Running Tests
+
+:bulb: Prior to testing locally, run `yarn compile` in the `airswap-protocols` project root to build required artifacts.