english auctions

Author: 0xFirekeeper

Thirdweb.Tests/Thirdweb.Extensions/Thirdweb.MarketplaceExtensions.Tests.cs

@@ -73,12 +73,6 @@ public async Task Marketplace_DirectListings_CreateListing_Success()
         Assert.Equal(TokenType.ERC1155, listing.TokenTypeEnum);
         Assert.Equal(Status.CREATED, listing.StatusEnum);
         Assert.Equal(listing.Reserved, listingParams.Reserved);
-
-        var isCurrencyApproved = await contract.Marketplace_DirectListings_IsCurrencyApprovedForListing(listingId, Constants.NATIVE_TOKEN_ADDRESS);
-        Assert.True(isCurrencyApproved);
-
-        var currencyPriceForListing = await contract.Marketplace_DirectListings_CurrencyPriceForListing(listingId, Constants.NATIVE_TOKEN_ADDRESS);
-        Assert.Equal(currencyPriceForListing, listingParams.PricePerToken);
     }
 
     [Fact(Timeout = 120000)]
@@ -229,6 +223,49 @@ public async Task Marketplace_DirectListings_GetListing_Success()
 
     #region IEnglishAuctions
 
+    [Fact(Timeout = 120000)]
+    public async Task Marketplace_EnglishAuctions_CreateAuction_Success()
+    {
+        var contract = await this.GetMarketplaceContract();
+        var wallet = await this.GetSmartWallet(1);
+
+        var auctionParams = new AuctionParameters()
+        {
+            AssetContract = this._drop1155ContractAddress,
+            TokenId = 0,
+            Quantity = 1,
+            Currency = Constants.NATIVE_TOKEN_ADDRESS,
+            MinimumBidAmount = 1,
+            BuyoutBidAmount = BigInteger.Parse("1".ToWei()),
+            TimeBufferInSeconds = 3600,
+            BidBufferBps = 100,
+            StartTimestamp = Utils.GetUnixTimeStampNow() - 3000,
+            EndTimestamp = Utils.GetUnixTimeStampNow() + (3600 * 24 * 7),
+        };
+
+        var receipt = await contract.Marketplace_EnglishAuctions_CreateAuction(wallet, auctionParams, true);
+        Assert.NotNull(receipt);
+        Assert.True(receipt.TransactionHash.Length == 66);
+
+        var auctionId = await contract.Marketplace_EnglishAuctions_TotalAuctions() - 1;
+        var auction = await contract.Marketplace_EnglishAuctions_GetAuction(auctionId);
+        Assert.NotNull(auction);
+        Assert.Equal(auction.AuctionId, auctionId);
+        Assert.Equal(auction.TokenId, auctionParams.TokenId);
+        Assert.Equal(auction.Quantity, auctionParams.Quantity);
+        Assert.Equal(auction.MinimumBidAmount, auctionParams.MinimumBidAmount);
+        Assert.Equal(auction.BuyoutBidAmount, auctionParams.BuyoutBidAmount);
+        Assert.True(auction.TimeBufferInSeconds >= auctionParams.TimeBufferInSeconds);
+        Assert.True(auction.BidBufferBps >= auctionParams.BidBufferBps);
+        Assert.True(auction.StartTimestamp >= auctionParams.StartTimestamp);
+        Assert.True(auction.EndTimestamp >= auctionParams.EndTimestamp);
+        Assert.Equal(auction.AuctionCreator, await wallet.GetAddress());
+        Assert.Equal(auction.AssetContract, auctionParams.AssetContract);
+        Assert.Equal(auction.Currency, auctionParams.Currency);
+        Assert.Equal(TokenType.ERC1155, auction.TokenTypeEnum);
+        Assert.Equal(Status.CREATED, auction.StatusEnum);
+    }
+
     [Fact(Timeout = 120000)]
     public async Task Marketplace_EnglishAuctions_GetAuction_Success()
     {
@@ -262,64 +299,78 @@ public async Task Marketplace_EnglishAuctions_GetAllValidAuctions_Success()
         Assert.True(auctions.Count >= 0);
     }
 
+    #endregion
+
+    #region IOffers
+
     // [Fact(Timeout = 120000)]
-    // public async Task Marketplace_EnglishAuctions_GetWinningBid_Success()
+    // public async Task Marketplace_Offers_MakeOffer_Success()
     // {
     //     var contract = await this.GetMarketplaceContract();
-    //     var auctionId = BigInteger.One;
-
-    //     var (bidder, currency, bidAmount) = await contract.Marketplace_EnglishAuctions_GetWinningBid(auctionId);
-    //     Assert.NotNull(bidder);
-    //     Assert.NotNull(currency);
-    //     Assert.True(bidAmount >= 0);
+    //     var wallet = await this.GetSmartWallet(0);
+
+    //     var offerParams = new OfferParams()
+    //     {
+    //         AssetContract = this._drop1155ContractAddress,
+    //         TokenId = 0,
+    //         Quantity = 1,
+    //         Currency = ERC20_HERE,
+    //         TotalPrice = 0,
+    //         ExpirationTimestamp = Utils.GetUnixTimeStampNow() + (3600 * 24),
+    //     };
+
+    //     var receipt = await contract.Marketplace_Offers_MakeOffer(wallet, offerParams, true);
+    //     Assert.NotNull(receipt);
+    //     Assert.True(receipt.TransactionHash.Length == 66);
+
+    //     var offerId = await contract.Marketplace_Offers_TotalOffers() - 1;
+    //     var offer = await contract.Marketplace_Offers_GetOffer(offerId);
+    //     Assert.NotNull(offer);
+    //     Assert.Equal(offer.OfferId, offerId);
+    //     Assert.Equal(offer.TokenId, offerParams.TokenId);
+    //     Assert.Equal(offer.Quantity, offerParams.Quantity);
+    //     Assert.Equal(offer.TotalPrice, offerParams.TotalPrice);
+    //     Assert.True(offer.ExpirationTimestamp >= offerParams.ExpirationTimestamp);
+    //     Assert.Equal(offer.Offeror, await wallet.GetAddress());
+    //     Assert.Equal(offer.AssetContract, offerParams.AssetContract);
+    //     Assert.Equal(offer.Currency, offerParams.Currency);
+    //     Assert.Equal(TokenType.ERC1155, offer.TokenTypeEnum);
+    //     Assert.Equal(Status.CREATED, offer.StatusEnum);
     // }
 
     // [Fact(Timeout = 120000)]
-    // public async Task Marketplace_EnglishAuctions_IsAuctionExpired_Success()
+    // public async Task Marketplace_Offers_GetOffer_Success()
     // {
     //     var contract = await this.GetMarketplaceContract();
-    //     var auctionId = BigInteger.One;
+    //     var offerId = BigInteger.One;
 
-    //     _ = await contract.Marketplace_EnglishAuctions_IsAuctionExpired(auctionId);
+    //     var offer = await contract.Marketplace_Offers_GetOffer(offerId);
+    //     Assert.NotNull(offer);
     // }
 
-    #endregion
-
-    #region IOffers
-
-    [Fact(Timeout = 120000)]
-    public async Task Marketplace_Offers_GetOffer_Success()
-    {
-        var contract = await this.GetMarketplaceContract();
-        var offerId = BigInteger.One;
-
-        var offer = await contract.Marketplace_Offers_GetOffer(offerId);
-        Assert.NotNull(offer);
-    }
-
-    [Fact(Timeout = 120000)]
-    public async Task Marketplace_Offers_GetAllOffers_Success()
-    {
-        var contract = await this.GetMarketplaceContract();
-        var startId = BigInteger.Zero;
-        var endId = BigInteger.Zero;
+    // [Fact(Timeout = 120000)]
+    // public async Task Marketplace_Offers_GetAllOffers_Success()
+    // {
+    //     var contract = await this.GetMarketplaceContract();
+    //     var startId = BigInteger.Zero;
+    //     var endId = 10;
 
-        var offers = await contract.Marketplace_Offers_GetAllOffers(startId, endId);
-        Assert.NotNull(offers);
-        Assert.True(offers.Count >= 0);
-    }
+    //     var offers = await contract.Marketplace_Offers_GetAllOffers(startId, endId);
+    //     Assert.NotNull(offers);
+    //     Assert.True(offers.Count >= 0);
+    // }
 
-    [Fact(Timeout = 120000)]
-    public async Task Marketplace_Offers_GetAllValidOffers_Success()
-    {
-        var contract = await this.GetMarketplaceContract();
-        var startId = BigInteger.Zero;
-        var endId = BigInteger.Zero;
+    // [Fact(Timeout = 120000)]
+    // public async Task Marketplace_Offers_GetAllValidOffers_Success()
+    // {
+    //     var contract = await this.GetMarketplaceContract();
+    //     var startId = BigInteger.Zero;
+    //     var endId = 10;
 
-        var offers = await contract.Marketplace_Offers_GetAllValidOffers(startId, endId);
-        Assert.NotNull(offers);
-        Assert.True(offers.Count >= 0);
-    }
+    //     var offers = await contract.Marketplace_Offers_GetAllValidOffers(startId, endId);
+    //     Assert.NotNull(offers);
+    //     Assert.True(offers.Count >= 0);
+    // }
 
     #endregion
 }

Thirdweb/Thirdweb.Extensions/ThirdwebMarketplaceExtensions.Types.cs

@@ -240,25 +240,25 @@ public class AuctionParameters
     /// The buffer time in seconds to extend the auction expiration if a new bid is made.
     /// </summary>
     [Parameter("uint64", "timeBufferInSeconds", 7)]
-    public ulong TimeBufferInSeconds { get; set; }
+    public long TimeBufferInSeconds { get; set; }
 
     /// <summary>
     /// The bid buffer in basis points to ensure a new bid must be a certain percentage higher than the current bid.
     /// </summary>
     [Parameter("uint64", "bidBufferBps", 8)]
-    public ulong BidBufferBps { get; set; }
+    public long BidBufferBps { get; set; }
 
     /// <summary>
     /// The timestamp at and after which bids can be made to the auction.
     /// </summary>
     [Parameter("uint64", "startTimestamp", 9)]
-    public ulong StartTimestamp { get; set; }
+    public long StartTimestamp { get; set; }
 
     /// <summary>
     /// The timestamp after which bids cannot be made to the auction.
     /// </summary>
     [Parameter("uint64", "endTimestamp", 10)]
-    public ulong EndTimestamp { get; set; }
+    public long EndTimestamp { get; set; }
 }
 
 /// <summary>
@@ -301,25 +301,25 @@ public class Auction
     /// The buffer time in seconds to extend the auction expiration if a new bid is made.
     /// </summary>
     [Parameter("uint64", "timeBufferInSeconds", 6)]
-    public ulong TimeBufferInSeconds { get; set; }
+    public long TimeBufferInSeconds { get; set; }
 
     /// <summary>
     /// The bid buffer in basis points to ensure a new bid must be a certain percentage higher than the current bid.
     /// </summary>
     [Parameter("uint64", "bidBufferBps", 7)]
-    public ulong BidBufferBps { get; set; }
+    public long BidBufferBps { get; set; }
 
     /// <summary>
     /// The timestamp at and after which bids can be made to the auction.
     /// </summary>
     [Parameter("uint64", "startTimestamp", 8)]
-    public ulong StartTimestamp { get; set; }
+    public long StartTimestamp { get; set; }
 
     /// <summary>
     /// The timestamp after which bids cannot be made to the auction.
     /// </summary>
     [Parameter("uint64", "endTimestamp", 9)]
-    public ulong EndTimestamp { get; set; }
+    public long EndTimestamp { get; set; }
 
     /// <summary>
     /// The address of the auction creator.
@@ -352,50 +352,6 @@ public class Auction
     public Status StatusEnum { get; set; }
 }
 
-/// <summary>
-/// Represents a bid in an auction.
-/// </summary>
-[Struct("Bid")]
-public class Bid
-{
-    /// <summary>
-    /// The unique ID of the auction for which the bid is placed.
-    /// </summary>
-    [Parameter("uint256", "auctionId", 1)]
-    public BigInteger AuctionId { get; set; }
-
-    /// <summary>
-    /// The address of the bidder.
-    /// </summary>
-    [Parameter("address", "bidder", 2)]
-    public string Bidder { get; set; }
-
-    /// <summary>
-    /// The bid amount for the auction.
-    /// </summary>
-    [Parameter("uint256", "bidAmount", 3)]
-    public BigInteger BidAmount { get; set; }
-}
-
-/// <summary>
-/// Represents the status of the payout for an auction.
-/// </summary>
-[Struct("AuctionPayoutStatus")]
-public class AuctionPayoutStatus
-{
-    /// <summary>
-    /// Whether the auction tokens have been paid out.
-    /// </summary>
-    [Parameter("bool", "paidOutAuctionTokens", 1)]
-    public bool PaidOutAuctionTokens { get; set; }
-
-    /// <summary>
-    /// Whether the bid amount has been paid out.
-    /// </summary>
-    [Parameter("bool", "paidOutBidAmount", 2)]
-    public bool PaidOutBidAmount { get; set; }
-}
-
 #endregion
 
 #region IOffers
@@ -446,7 +402,7 @@ public class OfferParams
 /// <summary>
 /// Represents an offer made on NFTs.
 /// </summary>
-[Struct("Offer")]
+[FunctionOutput]
 public class Offer
 {
     /// <summary>

Thirdweb/Thirdweb.Extensions/ThirdwebMarketplaceExtensions.cs

@@ -700,6 +700,21 @@ public static async Task<bool> Marketplace_EnglishAuctions_IsAuctionExpired(this
         return await contract.Read<bool>("isAuctionExpired", auctionId);
     }
 
+    /// <summary>
+    /// Gets the total number of auctions created.
+    /// </summary>
+    /// <param name="contract">The contract instance.</param>
+    /// <returns>A task that represents the total number of auctions.</returns>
+    public static async Task<BigInteger> Marketplace_EnglishAuctions_TotalAuctions(this ThirdwebContract contract)
+    {
+        if (contract == null)
+        {
+            throw new ArgumentNullException(nameof(contract));
+        }
+
+        return await contract.Read<BigInteger>("totalAuctions");
+    }
+
     #endregion
 
     #region IOffers
@@ -854,5 +869,20 @@ public static async Task<List<Offer>> Marketplace_Offers_GetAllValidOffers(this
         return await contract.Read<List<Offer>>("getAllValidOffers", startId, endId);
     }
 
+    /// <summary>
+    /// Gets the total number of offers created.
+    /// </summary>
+    /// <param name="contract">The contract instance.</param>
+    /// <returns>A task that represents the total number of offers.</returns>
+    public static async Task<BigInteger> Marketplace_Offers_TotalOffers(this ThirdwebContract contract)
+    {
+        if (contract == null)
+        {
+            throw new ArgumentNullException(nameof(contract));
+        }
+
+        return await contract.Read<BigInteger>("totalOffers");
+    }
+
     #endregion
 }