fix: single usd erc20

Author: veeso

ethereum/contracts/Marketplace.sol

@@ -8,11 +8,8 @@ import {Deferred} from "./Deferred.sol";
 import {RewardPool} from "./RewardPool.sol";
 
 contract Marketplace is Ownable {
-    /// @notice The address of the USDT token
-    address private usdt;
-
-    /// @notice The address of the USDC token
-    address private usdc;
+    /// @notice The address of the USD ERC20 token
+    address public usdErc20;
 
     /// @notice The address of the EKOKE token
     address private ekoke;
@@ -41,20 +38,19 @@ contract Marketplace is Ownable {
 
     constructor(
         address _owner,
-        address _usdt,
-        address _usdc,
+        address _usdErc20,
         address _ekoke,
         address _deferred
     ) Ownable(_owner) {
-        require(_usdt != address(0), "Marketplace: USDT address is zero");
-        require(_usdc != address(0), "Marketplace: USDC address is zero");
-        require(_ekoke != address(0), "Marketplace: EKOKE address is zero");
+        require(
+            _usdErc20 != address(0),
+            "Marketplace: USD ERC20 address is zero"
+        );
         require(
             _deferred != address(0),
             "Marketplace: Deferred address is zero"
         );
-        usdt = _usdt;
-        usdc = _usdc;
+        usdErc20 = _usdErc20;
         ekoke = _ekoke;
         deferred = _deferred;
     }
@@ -79,22 +75,9 @@ contract Marketplace is Ownable {
         interestRate = _interestRate;
     }
 
-    /// @notice Buy a deferred NFT with USDT
-    /// @param _tokenId The ID of the deferred NFT
-    function buyTokenWithUSDT(uint256 _tokenId) external {
-        buyToken(_tokenId, usdt);
-    }
-
-    /// @notice Buy a deferred NFT with USDC
-    /// @param _tokenId The ID of the deferred NFT
-    function buyTokenWithUSDC(uint256 _tokenId) external {
-        buyToken(_tokenId, usdc);
-    }
-
-    /// @notice Buy a deferred NFT with the provided currency
-    /// @param _tokenId The ID of the deferred NFT
-    /// @param _currency The address of the currency
-    function buyToken(uint256 _tokenId, address _currency) internal {
+    /// @notice Buy a deferred NFT with the configured USD ERC20 token
+    /// @param _tokenId The ID of the deferred NFT\
+    function buyToken(uint256 _tokenId) external {
         require(rewardPool != address(0), "Marketplace: Reward pool not set");
 
         // get the contract from deferred
@@ -121,7 +104,7 @@ contract Marketplace is Ownable {
             sellContract.ekokeReward > 0;
 
         // get the currency token
-        ERC20 currency = ERC20(_currency);
+        ERC20 currency = ERC20(usdErc20);
 
         // get the required allowance
         uint256 requiredAllowance = isContractBuyer

ethereum/test/Marketplace.ts

@@ -12,7 +12,6 @@ describe("RewardPool", () => {
     deferred: Deferred;
     rewardPool: RewardPool;
     ekoke: Ekoke;
-    usdc: Ekoke;
     usdt: Ekoke;
     owner: SignerWithAddress;
     seller: SignerWithAddress;
@@ -36,12 +35,6 @@ describe("RewardPool", () => {
     await usdt.adminMint(buyer.address, 1000);
     await usdt.adminMint(thirdParty.address, 1000);
 
-    const usdcContract = await ethers.deployContract("Ekoke", [owner.address]);
-    const usdc = usdcContract as unknown as Ekoke;
-    // mint 1000 USDC to alice
-    await usdc.adminMint(buyer.address, 1000);
-    await usdc.adminMint(thirdParty.address, 1000);
-
     const deferredContract = await ethers.deployContract("Deferred", [
       owner.address,
     ]);
@@ -57,7 +50,6 @@ describe("RewardPool", () => {
     const marketplaceContract = await ethers.deployContract("Marketplace", [
       owner.address,
       usdt.getAddress(),
-      usdc.getAddress(),
       ekoke.getAddress(),
       deferred.getAddress(),
     ]);
@@ -97,7 +89,6 @@ describe("RewardPool", () => {
       seller,
       minter,
       usdt,
-      usdc,
       thirdParty,
     };
   });
@@ -109,7 +100,7 @@ describe("RewardPool", () => {
     // give allowance to marketplace
     await usdt.connect(thirdParty).approve(marketplace.getAddress(), USD_PRICE);
     // buy
-    await marketplace.connect(thirdParty).buyTokenWithUSDT(tokenId);
+    await marketplace.connect(thirdParty).buyToken(tokenId);
 
     // USDT balance of buyer
     expect(await usdt.balanceOf(thirdParty.address)).to.equal(1000 - USD_PRICE);
@@ -123,27 +114,6 @@ describe("RewardPool", () => {
     expect(await ekoke.balanceOf(thirdParty.address)).to.equal(EKOKE_REWARD);
   });
 
-  it("Should buy a NFT with USDC as third-party", async () => {
-    const { marketplace, thirdParty, seller, deferred, ekoke, usdc } = deploy;
-
-    const tokenId = 0;
-    // give allowance to marketplace
-    await usdc.connect(thirdParty).approve(marketplace.getAddress(), USD_PRICE);
-    // buy
-    await marketplace.connect(thirdParty).buyTokenWithUSDC(tokenId);
-
-    // USDT balance of buyer
-    expect(await usdc.balanceOf(thirdParty.address)).to.equal(1000 - USD_PRICE);
-    // USDT balance of seller
-    expect(await usdc.balanceOf(seller.address)).to.equal(USD_PRICE);
-
-    // check NFT has been transferred
-    expect(await deferred.ownerOf(tokenId)).to.equal(thirdParty.address);
-
-    // check buyer has received the reward
-    expect(await ekoke.balanceOf(thirdParty.address)).to.equal(EKOKE_REWARD);
-  });
-
   it("Should buy a NFT with USDT as contract buyer", async () => {
     const { marketplace, buyer, seller, deferred, ekoke, usdt } = deploy;
 
@@ -154,7 +124,7 @@ describe("RewardPool", () => {
       .connect(buyer)
       .approve(marketplace.getAddress(), USD_PRICE + interest);
     // buy
-    await marketplace.connect(buyer).buyTokenWithUSDT(tokenId);
+    await marketplace.connect(buyer).buyToken(tokenId);
 
     // USDT balance of buyer
     expect(await usdt.balanceOf(buyer.address)).to.equal(