Merge pull request #125 from G7DAO/feat/marketplace-offers-tests

Feat: Marketplace Offers Logic Tests
G7DAO · May 13, 2024 · db9aa1d · db9aa1d
2 parents f87c420 + 9cd063e
commit db9aa1d
Show file tree

Hide file tree

Showing 6 changed files with 426 additions and 10 deletions.
diff --git a/constants/constructor-args.ts b/constants/constructor-args.ts
@@ -486,4 +486,9 @@ export const EnglishAuctionsExtensionArgs = {
     TESTNET: {
         _nativeTokenWrapper: IRON_G7_ARB_SEPOLIA_NATIVE_TOKEN,
     },
+};
+
+export const OffersExtensionArgs = {
+    MAINNET: {},
+    TESTNET: {},
 };
diff --git a/constants/contract.ts b/constants/contract.ts
@@ -20,7 +20,8 @@ export enum CONTRACT_TYPE {
     RewardToken = 'RewardToken',
     DirectListingExtension = 'DirectListingExtension',
     Marketplace = 'Marketplace',
-    EnglishAuctionsExtension = 'EnglishAuctionsExtension'
+    EnglishAuctionsExtension = 'EnglishAuctionsExtension',
+    OffersExtension = 'OffersExtension'
 }
 
 export enum PROXY_CONTRACT_TYPE {
@@ -57,7 +58,8 @@ export enum CONTRACT_FILE_NAME {
     DirectListingsExtension = 'DirectListingsLogic',
     ERC20 = 'MockERC20',
     Marketplace = 'Marketplace',
-    EnglishAuctionsExtension = 'EnglishAuctionsLogic'
+    EnglishAuctionsExtension = 'EnglishAuctionsLogic',
+    OffersExtension = 'OffersLogic'
 }
 
 export enum CONTRACT_UPGRADABLE_FILE_NAME {
@@ -103,7 +105,8 @@ export enum CONTRACT_NAME {
     DirectListingExtension = 'DirectListingExtension',
     MartinERC20 = 'MockERC20',
     Marketplace = 'Marketplace',
-    EnglishAuctionsExtension = 'EnglishAuctionsExtension'
+    EnglishAuctionsExtension = 'EnglishAuctionsExtension',
+    OffersExtension = 'OffersExtension'
 }
 
 export enum CONTRACT_UPGRADABLE_NAME {

diff --git a/constants/proxy-deployments/deployments-game7-arb-sepolia.ts b/constants/proxy-deployments/deployments-game7-arb-sepolia.ts
@@ -9,7 +9,12 @@ import {
 import { TENANT } from '@constants/tenant';
 import { DeploymentProxyContract } from '../../types/deployment-type';
 import { NETWORK_TYPE, NetworkName } from '../network';
-import {DirectListingExtensionArgs, EnglishAuctionsExtensionArgs, MarketplaceArgs} from '@constants/constructor-args';
+import {
+    DirectListingExtensionArgs,
+    EnglishAuctionsExtensionArgs,
+    MarketplaceArgs,
+    OffersExtensionArgs,
+} from '@constants/constructor-args';
 
 const chain = NetworkName.Game7OrbitArbSepolia;
 const networkType = NETWORK_TYPE.TESTNET;
@@ -92,6 +97,27 @@ export const GAME7_ARB_SEPOLIA_CONTRACTS: DeploymentProxyContract[] = [
                     'isAuctionExpired(uint256)',
                 ],
             },
+            {
+                contractFileName: CONTRACT_FILE_NAME.OffersExtension,
+                type: CONTRACT_TYPE.OffersExtension,
+                name: CONTRACT_NAME.OffersExtension,
+                verify: true,
+                extensionArgs: OffersExtensionArgs.TESTNET,
+                metadata: {
+                    name: 'OffersLogic',
+                    metadataURI: 'ipfs://{hash}',
+                    implementation: `CONTRACT_${CONTRACT_NAME.OffersExtension}`,
+                },
+                functionsToInclude: [
+                    'makeOffer((address,uint256,uint256,address,uint256,uint256))',
+                    'cancelOffer(uint256)',
+                    'acceptOffer(uint256)',
+                    'totalOffers()',
+                    'getOffer(uint256)',
+                    'getAllOffers(uint256,uint256)',
+                    'getAllValidOffers(uint256,uint256)',
+                ],
+            },
         ],
         implementationArgs: MarketplaceArgs.TESTNET,
     },

diff --git a/test/hardhatTests/englishAuctions.test.ts b/test/hardhatTests/englishAuctions.test.ts
@@ -12,7 +12,7 @@ import {
 import { loadFixture, time } from '@nomicfoundation/hardhat-network-helpers';
 import { deployMarketplaceContracts } from './fixture/marketplaceContractsFixture';
 import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
-import { Auction, AuctionParameters, AuctionStatus, TokenType } from './helpers/types';
+import { Auction, AuctionParameters, Status, TokenType } from './helpers/types';
 import { NATIVE_TOKEN, ONE_DAY, ONE_HOUR } from './helpers/constants';
 import { ASSET_ROLE, LISTER_ROLE } from './helpers/roles';
 import { ZeroAddress } from 'ethers';
@@ -195,7 +195,7 @@ describe('EnglishAuction', function () {
                     assetContract: auctionParameters.assetContract,
                     currency: auctionParameters.currency,
                     tokenType: TokenType.ERC721,
-                    status: AuctionStatus.CREATED,
+                    status: Status.CREATED,
                 };
             });
 

diff --git a/test/hardhatTests/helpers/types.ts b/test/hardhatTests/helpers/types.ts
@@ -13,10 +13,11 @@ export type AuctionParameters = {
 
 export enum TokenType {
     ERC721,
-    ERC1155
+    ERC1155,
+    ERC20
 }
 
-export enum AuctionStatus {
+export enum Status {
     UNSET,
     CREATED,
     COMPLETED,
@@ -37,5 +38,27 @@ export type Auction = {
     assetContract: string;
     currency: string;
     tokenType: TokenType;
-    status: AuctionStatus;
-}
+    status: Status;
+}
+
+export type OfferParams = {
+    assetContract: string;
+    tokenId: number;
+    quantity: number;
+    currency: string;
+    totalPrice: bigint;
+    expirationTimestamp: number;
+}
+
+export type Offer = {
+    offerId: bigint;
+    tokenId: number;
+    quantity: number;
+    totalPrice: bigint;
+    expirationTimestamp: number;
+    offeror: string;
+    assetContract: string;
+    currency: string;
+    tokenType: TokenType;
+    status: Status;
+}