opensea-js 2.0.1-beta.2 → 2.0.2-beta.1

package/lib/seaport.js

@@ -522,13 +522,13 @@ var OpenSeaPort = /** @class */ (function () {
      * @param quantities The quantity of each asset to sell. Defaults to 1 for each.
      * @param accountAddress Address of the maker's wallet
      * @param startAmount Value of the offer, in units of the payment token (or wrapped ETH if no payment token address specified)
-     * @param expirationTime Expiration time for the order, in seconds. An expiration time of 0 means "never expire"
+     * @param expirationTime Expiration time for the order, in seconds.
      * @param paymentTokenAddress Optional address for using an ERC-20 token in the order. If unspecified, defaults to W-ETH
      * @param sellOrder Optional sell order (like an English auction) to ensure fee and schema compatibility
      * @param referrerAddress The optional address that referred the order
      */
     OpenSeaPort.prototype.createBundleBuyOrder = function (_b) {
-        var assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? 0 : _c, paymentTokenAddress = _b.paymentTokenAddress, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
+        var assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, paymentTokenAddress = _b.paymentTokenAddress, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
         return __awaiter(this, void 0, void 0, function () {
             var order, hashedOrder, signature, error_1, orderWithSignature;
             return __generator(this, function (_d) {
@@ -545,11 +545,11 @@ var OpenSeaPort = /** @class */ (function () {
                         return [4 /*yield*/, this._makeBundleBuyOrder({
                                 assets: assets,
                                 collection: collection,
-                                quantities: quantities !== null && quantities !== void 0 ? quantities : assets.map(function (_a) { return 1; }),
+                                quantities: quantities,
                                 accountAddress: accountAddress,
                                 startAmount: startAmount,
                                 expirationTime: expirationTime,
-                                paymentTokenAddress: paymentTokenAddress !== null && paymentTokenAddress !== void 0 ? paymentTokenAddress : WyvernSchemas.tokens[this._networkName].canonicalWrappedEther.address,
+                                paymentTokenAddress: paymentTokenAddress,
                                 extraBountyBasisPoints: 0,
                                 sellOrder: sellOrder,
                                 referrerAddress: referrerAddress,
@@ -593,13 +593,13 @@ var OpenSeaPort = /** @class */ (function () {
      * @param accountAddress Address of the maker's wallet
      * @param startAmount Value of the offer, in units of the payment token (or wrapped ETH if no payment token address specified)
      * @param quantity The number of assets to bid for (if fungible or semi-fungible). Defaults to 1. In units, not base units, e.g. not wei.
-     * @param expirationTime Expiration time for the order, in seconds. An expiration time of 0 means "never expire"
+     * @param expirationTime Expiration time for the order, in seconds.
      * @param paymentTokenAddress Optional address for using an ERC-20 token in the order. If unspecified, defaults to W-ETH
      * @param sellOrder Optional sell order (like an English auction) to ensure fee and schema compatibility
      * @param referrerAddress The optional address that referred the order
      */
     OpenSeaPort.prototype.createBuyOrder = function (_b) {
-        var asset = _b.asset, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.quantity, quantity = _c === void 0 ? 1 : _c, _d = _b.expirationTime, expirationTime = _d === void 0 ? 0 : _d, paymentTokenAddress = _b.paymentTokenAddress, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
+        var asset = _b.asset, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.quantity, quantity = _c === void 0 ? 1 : _c, _d = _b.expirationTime, expirationTime = _d === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _d, paymentTokenAddress = _b.paymentTokenAddress, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
         return __awaiter(this, void 0, void 0, function () {
             var order, hashedOrder, signature, error_2, orderWithSignature;
             return __generator(this, function (_e) {
@@ -617,7 +617,7 @@ var OpenSeaPort = /** @class */ (function () {
                                 accountAddress: accountAddress,
                                 startAmount: startAmount,
                                 expirationTime: expirationTime,
-                                paymentTokenAddress: paymentTokenAddress !== null && paymentTokenAddress !== void 0 ? paymentTokenAddress : WyvernSchemas.tokens[this._networkName].canonicalWrappedEther.address,
+                                paymentTokenAddress: paymentTokenAddress,
                                 extraBountyBasisPoints: 0,
                                 sellOrder: sellOrder,
                                 referrerAddress: referrerAddress,
@@ -665,7 +665,7 @@ var OpenSeaPort = /** @class */ (function () {
      * @param endAmount Optional price of the asset at the end of its expiration time. Units are in the amount of a token above the token's decimal places (integer part). For example, for ether, expected units are in ETH, not wei.
      * @param quantity The number of assets to sell (if fungible or semi-fungible). Defaults to 1. In units, not base units, e.g. not wei.
      * @param listingTime Optional time when the order will become fulfillable, in UTC seconds. Undefined means it will start now.
-     * @param expirationTime Expiration time for the order, in UTC seconds. An expiration time of 0 means "never expire."
+     * @param expirationTime Expiration time for the order, in UTC seconds.
      * @param waitForHighestBid If set to true, this becomes an English auction that increases in price for every bid. The highest bid wins when the auction expires, as long as it's at least `startAmount`. `expirationTime` must be > 0.
      * @param englishAuctionReservePrice Optional price level, below which orders may be placed but will not be matched.  Orders below the reserve can be manually accepted but will not be automatically matched.
      * @param paymentTokenAddress Address of the ERC-20 token to accept in return. If undefined or null, uses Ether.
@@ -674,7 +674,7 @@ var OpenSeaPort = /** @class */ (function () {
      * @param buyerEmail Optional email of the user that's allowed to purchase this item. If specified, a user will have to verify this email before being able to take the order.
      */
     OpenSeaPort.prototype.createSellOrder = function (_b) {
-        var asset = _b.asset, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, _c = _b.quantity, quantity = _c === void 0 ? 1 : _c, listingTime = _b.listingTime, _d = _b.expirationTime, expirationTime = _d === void 0 ? 0 : _d, _e = _b.waitForHighestBid, waitForHighestBid = _e === void 0 ? false : _e, englishAuctionReservePrice = _b.englishAuctionReservePrice, paymentTokenAddress = _b.paymentTokenAddress, _f = _b.extraBountyBasisPoints, extraBountyBasisPoints = _f === void 0 ? 0 : _f, buyerAddress = _b.buyerAddress, buyerEmail = _b.buyerEmail;
+        var asset = _b.asset, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, _c = _b.quantity, quantity = _c === void 0 ? 1 : _c, listingTime = _b.listingTime, _d = _b.expirationTime, expirationTime = _d === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _d, _e = _b.waitForHighestBid, waitForHighestBid = _e === void 0 ? false : _e, englishAuctionReservePrice = _b.englishAuctionReservePrice, paymentTokenAddress = _b.paymentTokenAddress, _f = _b.extraBountyBasisPoints, extraBountyBasisPoints = _f === void 0 ? 0 : _f, buyerAddress = _b.buyerAddress, buyerEmail = _b.buyerEmail;
         return __awaiter(this, void 0, void 0, function () {
             var order, hashedOrder, signature, error_3, orderWithSignature;
             return __generator(this, function (_g) {
@@ -735,7 +735,7 @@ var OpenSeaPort = /** @class */ (function () {
      * @param endAmount Optional price of the asset at the end of its expiration time. If not specified, will be set to `startAmount`. Units are in the amount of a token above the token's decimal places (integer part). For example, for ether, expected units are in ETH, not wei.
      * @param quantity The number of assets to sell at one time (if fungible or semi-fungible). Defaults to 1. In units, not base units, e.g. not wei.
      * @param listingTime Optional time when the order will become fulfillable, in UTC seconds. Undefined means it will start now.
-     * @param expirationTime Expiration time for the order, in seconds. An expiration time of 0 means "never expire."
+     * @param expirationTime Expiration time for the order, in seconds.
      * @param waitForHighestBid If set to true, this becomes an English auction that increases in price for every bid. The highest bid wins when the auction expires, as long as it's at least `startAmount`. `expirationTime` must be > 0.
      * @param paymentTokenAddress Address of the ERC-20 token to accept in return. If undefined or null, uses Ether.
      * @param extraBountyBasisPoints Optional basis points (1/100th of a percent) to reward someone for referring the fulfillment of each order
@@ -745,7 +745,7 @@ var OpenSeaPort = /** @class */ (function () {
      * @returns The number of orders created in total
      */
     OpenSeaPort.prototype.createFactorySellOrders = function (_b) {
-        var assets = _b.assets, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, _c = _b.quantity, quantity = _c === void 0 ? 1 : _c, listingTime = _b.listingTime, _d = _b.expirationTime, expirationTime = _d === void 0 ? 0 : _d, _e = _b.waitForHighestBid, waitForHighestBid = _e === void 0 ? false : _e, paymentTokenAddress = _b.paymentTokenAddress, _f = _b.extraBountyBasisPoints, extraBountyBasisPoints = _f === void 0 ? 0 : _f, buyerAddress = _b.buyerAddress, buyerEmail = _b.buyerEmail, _g = _b.numberOfOrders, numberOfOrders = _g === void 0 ? 1 : _g;
+        var assets = _b.assets, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, _c = _b.quantity, quantity = _c === void 0 ? 1 : _c, listingTime = _b.listingTime, _d = _b.expirationTime, expirationTime = _d === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _d, _e = _b.waitForHighestBid, waitForHighestBid = _e === void 0 ? false : _e, paymentTokenAddress = _b.paymentTokenAddress, _f = _b.extraBountyBasisPoints, extraBountyBasisPoints = _f === void 0 ? 0 : _f, buyerAddress = _b.buyerAddress, buyerEmail = _b.buyerEmail, _g = _b.numberOfOrders, numberOfOrders = _g === void 0 ? 1 : _g;
         return __awaiter(this, void 0, void 0, function () {
             var dummyOrder, _makeAndPostOneSellOrder, range, batches, numOrdersCreated, _h, batches_1, subRange, batchOrdersCreated;
             var _this = this;
@@ -873,7 +873,7 @@ var OpenSeaPort = /** @class */ (function () {
      * @param startAmount Price of the asset at the start of the auction, or minimum acceptable bid if it's an English auction.
      * @param endAmount Optional price of the asset at the end of its expiration time. If not specified, will be set to `startAmount`.
      * @param listingTime Optional time when the order will become fulfillable, in UTC seconds. Undefined means it will start now.
-     * @param expirationTime Expiration time for the order, in seconds. An expiration time of 0 means "never expire."
+     * @param expirationTime Expiration time for the order, in seconds.
      * @param waitForHighestBid If set to true, this becomes an English auction that increases in price for every bid. The highest bid wins when the auction expires, as long as it's at least `startAmount`. `expirationTime` must be > 0.
      * @param englishAuctionReservePrice Optional price level, below which orders may be placed but will not be matched.  Orders below the reserve can be manually accepted but will not be automatically matched.
      * @param paymentTokenAddress Address of the ERC-20 token to accept in return. If undefined or null, uses Ether.
@@ -881,7 +881,7 @@ var OpenSeaPort = /** @class */ (function () {
      * @param buyerAddress Optional address that's allowed to purchase this bundle. If specified, no other address will be able to take the order, unless it's the null address.
      */
     OpenSeaPort.prototype.createBundleSellOrder = function (_b) {
-        var bundleName = _b.bundleName, bundleDescription = _b.bundleDescription, bundleExternalLink = _b.bundleExternalLink, assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? 0 : _c, listingTime = _b.listingTime, _d = _b.waitForHighestBid, waitForHighestBid = _d === void 0 ? false : _d, englishAuctionReservePrice = _b.englishAuctionReservePrice, paymentTokenAddress = _b.paymentTokenAddress, _e = _b.extraBountyBasisPoints, extraBountyBasisPoints = _e === void 0 ? 0 : _e, buyerAddress = _b.buyerAddress;
+        var bundleName = _b.bundleName, bundleDescription = _b.bundleDescription, bundleExternalLink = _b.bundleExternalLink, assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, listingTime = _b.listingTime, _d = _b.waitForHighestBid, waitForHighestBid = _d === void 0 ? false : _d, englishAuctionReservePrice = _b.englishAuctionReservePrice, paymentTokenAddress = _b.paymentTokenAddress, _e = _b.extraBountyBasisPoints, extraBountyBasisPoints = _e === void 0 ? 0 : _e, buyerAddress = _b.buyerAddress;
         return __awaiter(this, void 0, void 0, function () {
             var order, hashedOrder, signature, error_5, orderWithSignature;
             return __generator(this, function (_f) {
@@ -981,77 +981,6 @@ var OpenSeaPort = /** @class */ (function () {
             });
         });
     };
-    /**
-     * Returns estimated amount of gas required for Fullfilling the order.
-     * @param param0 __namedParamaters Object
-     * @param order The order to fulfill, a.k.a. "take"
-     * @param accountAddress The taker's wallet address
-     * @param recipientAddress The optional address to receive the order's item(s) or curriencies. If not specified, defaults to accountAddress.
-     * @param referrerAddress The optional address that referred the order
-     * @returns gasEstimation
-     */
-    OpenSeaPort.prototype.getFulfillOrderGasEstimation = function (_b) {
-        var order = _b.order, accountAddress = _b.accountAddress, recipientAddress = _b.recipientAddress, referrerAddress = _b.referrerAddress;
-        return __awaiter(this, void 0, void 0, function () {
-            var matchingOrder, _c, buy, sell, metadata, _d, args, txnData, wyvernProtocolReadOnly;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        matchingOrder = this._makeMatchingOrder({
-                            order: order,
-                            accountAddress: accountAddress,
-                            recipientAddress: recipientAddress || accountAddress,
-                        });
-                        _c = (0, utils_1.assignOrdersToSides)(order, matchingOrder), buy = _c.buy, sell = _c.sell;
-                        metadata = this._getMetadata(order, referrerAddress);
-                        return [4 /*yield*/, this._getAtomicMatchCallArgs({
-                                buy: buy,
-                                sell: sell,
-                                accountAddress: accountAddress,
-                                metadata: metadata,
-                            })];
-                    case 1:
-                        _d = _e.sent(), args = _d.args, txnData = _d.txnData;
-                        wyvernProtocolReadOnly = this._getWyvernProtocolForOrder(buy, true);
-                        return [2 /*return*/, this._getAtomicMatchGasEstimation({
-                                args: args,
-                                txnData: txnData,
-                                wyvernProtocolReadOnly: wyvernProtocolReadOnly,
-                            })];
-                }
-            });
-        });
-    };
-    /**
-     * Returns data required to fulfill the transaction.
-     * @param param0 __namedParamaters Object
-     * @param order The order to fulfill, a.k.a. "take"
-     * @param accountAddress The taker's wallet address
-     * @param recipientAddress The optional address to receive the order's item(s) or curriencies. If not specified, defaults to accountAddress.
-     * @param referrerAddress The optional address that referred the order
-     * @returns gasEstimation
-     */
-    OpenSeaPort.prototype.getFulfillOrderArgs = function (_b) {
-        var order = _b.order, accountAddress = _b.accountAddress, recipientAddress = _b.recipientAddress, referrerAddress = _b.referrerAddress;
-        return __awaiter(this, void 0, void 0, function () {
-            var matchingOrder, _c, buy, sell, metadata;
-            return __generator(this, function (_d) {
-                matchingOrder = this._makeMatchingOrder({
-                    order: order,
-                    accountAddress: accountAddress,
-                    recipientAddress: recipientAddress || accountAddress,
-                });
-                _c = (0, utils_1.assignOrdersToSides)(order, matchingOrder), buy = _c.buy, sell = _c.sell;
-                metadata = this._getMetadata(order, referrerAddress);
-                return [2 /*return*/, this._getAtomicMatchCallArgs({
-                        buy: buy,
-                        sell: sell,
-                        accountAddress: accountAddress,
-                        metadata: metadata,
-                    })];
-            });
-        });
-    };
     /**
      * Cancel an order on-chain, preventing it from ever being fulfilled.
      * @param param0 __namedParameters Object
@@ -2260,7 +2189,7 @@ var OpenSeaPort = /** @class */ (function () {
         });
     };
     OpenSeaPort.prototype._makeBuyOrder = function (_b) {
-        var asset = _b.asset, quantity = _b.quantity, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? 0 : _c, paymentTokenAddress = _b.paymentTokenAddress, _d = _b.extraBountyBasisPoints, extraBountyBasisPoints = _d === void 0 ? 0 : _d, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
+        var asset = _b.asset, quantity = _b.quantity, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, paymentTokenAddress = _b.paymentTokenAddress, _d = _b.extraBountyBasisPoints, extraBountyBasisPoints = _d === void 0 ? 0 : _d, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
         return __awaiter(this, void 0, void 0, function () {
             var schema, quantityBN, wyAsset, openSeaAsset, taker, _e, totalBuyerFeeBasisPoints, totalSellerFeeBasisPoints, _f, makerRelayerFee, takerRelayerFee, makerProtocolFee, takerProtocolFee, makerReferrerFee, feeRecipient, feeMethod, _g, target, calldata, replacementPattern, _h, basePrice, extra, paymentToken, times, _j, staticTarget, staticExtradata, exchange;
             return __generator(this, function (_k) {
@@ -2288,7 +2217,9 @@ var OpenSeaPort = /** @class */ (function () {
                         return [4 /*yield*/, this._getPriceParameters(types_1.OrderSide.Buy, paymentTokenAddress, expirationTime, startAmount)];
                     case 3:
                         _h = _k.sent(), basePrice = _h.basePrice, extra = _h.extra, paymentToken = _h.paymentToken;
-                        times = this._getTimeParameters(expirationTime);
+                        times = this._getTimeParameters({
+                            expirationTimestamp: expirationTime,
+                        });
                         return [4 /*yield*/, this._getStaticCallTargetAndExtraData({
                                 asset: openSeaAsset,
                                 useTxnOriginStaticCall: false,
@@ -2339,11 +2270,11 @@ var OpenSeaPort = /** @class */ (function () {
         });
     };
     OpenSeaPort.prototype._makeSellOrder = function (_b) {
-        var asset = _b.asset, quantity = _b.quantity, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, listingTime = _b.listingTime, expirationTime = _b.expirationTime, waitForHighestBid = _b.waitForHighestBid, _c = _b.englishAuctionReservePrice, englishAuctionReservePrice = _c === void 0 ? 0 : _c, paymentTokenAddress = _b.paymentTokenAddress, extraBountyBasisPoints = _b.extraBountyBasisPoints, buyerAddress = _b.buyerAddress;
+        var asset = _b.asset, quantity = _b.quantity, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, listingTime = _b.listingTime, _c = _b.expirationTime, expirationTime = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, waitForHighestBid = _b.waitForHighestBid, _d = _b.englishAuctionReservePrice, englishAuctionReservePrice = _d === void 0 ? 0 : _d, paymentTokenAddress = _b.paymentTokenAddress, extraBountyBasisPoints = _b.extraBountyBasisPoints, buyerAddress = _b.buyerAddress;
         return __awaiter(this, void 0, void 0, function () {
-            var schema, quantityBN, wyAsset, openSeaAsset, _d, totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints, sellerBountyBasisPoints, _e, target, calldata, replacementPattern, orderSaleKind, _f, basePrice, extra, paymentToken, reservePrice, times, _g, makerRelayerFee, takerRelayerFee, makerProtocolFee, takerProtocolFee, makerReferrerFee, feeRecipient, feeMethod, _h, staticTarget, staticExtradata, exchange;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            var schema, quantityBN, wyAsset, openSeaAsset, _e, totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints, sellerBountyBasisPoints, _f, target, calldata, replacementPattern, orderSaleKind, _g, basePrice, extra, paymentToken, reservePrice, times, _h, makerRelayerFee, takerRelayerFee, makerProtocolFee, takerProtocolFee, makerReferrerFee, feeRecipient, feeMethod, _j, staticTarget, staticExtradata, exchange;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         accountAddress = (0, utils_1.validateAndFormatWalletAddress)(this.web3, accountAddress);
                         schema = this._getSchema(asset.schemaName);
@@ -2351,34 +2282,38 @@ var OpenSeaPort = /** @class */ (function () {
                         wyAsset = (0, utils_1.getWyvernAsset)(schema, asset, quantityBN);
                         return [4 /*yield*/, this.api.getAsset(asset)];
                     case 1:
-                        openSeaAsset = _j.sent();
+                        openSeaAsset = _k.sent();
                         return [4 /*yield*/, this.computeFees({
                                 asset: openSeaAsset,
                                 side: types_1.OrderSide.Sell,
                                 extraBountyBasisPoints: extraBountyBasisPoints,
                             })];
                     case 2:
-                        _d = _j.sent(), totalSellerFeeBasisPoints = _d.totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints = _d.totalBuyerFeeBasisPoints, sellerBountyBasisPoints = _d.sellerBountyBasisPoints;
-                        _e = (0, schema_1.encodeSell)(schema, wyAsset, accountAddress, waitForHighestBid
+                        _e = _k.sent(), totalSellerFeeBasisPoints = _e.totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints = _e.totalBuyerFeeBasisPoints, sellerBountyBasisPoints = _e.sellerBountyBasisPoints;
+                        _f = (0, schema_1.encodeSell)(schema, wyAsset, accountAddress, waitForHighestBid
                             ? undefined
-                            : utils_1.merkleValidatorByNetwork[this._networkName]), target = _e.target, calldata = _e.calldata, replacementPattern = _e.replacementPattern;
+                            : utils_1.merkleValidatorByNetwork[this._networkName]), target = _f.target, calldata = _f.calldata, replacementPattern = _f.replacementPattern;
                         orderSaleKind = endAmount != null && endAmount !== startAmount
                             ? types_1.SaleKind.DutchAuction
                             : types_1.SaleKind.FixedPrice;
                         return [4 /*yield*/, this._getPriceParameters(types_1.OrderSide.Sell, paymentTokenAddress, expirationTime, startAmount, endAmount, waitForHighestBid, englishAuctionReservePrice)];
                     case 3:
-                        _f = _j.sent(), basePrice = _f.basePrice, extra = _f.extra, paymentToken = _f.paymentToken, reservePrice = _f.reservePrice;
-                        times = this._getTimeParameters(expirationTime, listingTime, waitForHighestBid);
-                        _g = this._getSellFeeParameters(totalBuyerFeeBasisPoints, totalSellerFeeBasisPoints, waitForHighestBid, sellerBountyBasisPoints), makerRelayerFee = _g.makerRelayerFee, takerRelayerFee = _g.takerRelayerFee, makerProtocolFee = _g.makerProtocolFee, takerProtocolFee = _g.takerProtocolFee, makerReferrerFee = _g.makerReferrerFee, feeRecipient = _g.feeRecipient, feeMethod = _g.feeMethod;
+                        _g = _k.sent(), basePrice = _g.basePrice, extra = _g.extra, paymentToken = _g.paymentToken, reservePrice = _g.reservePrice;
+                        times = this._getTimeParameters({
+                            expirationTimestamp: expirationTime,
+                            listingTimestamp: listingTime,
+                            waitingForBestCounterOrder: waitForHighestBid,
+                        });
+                        _h = this._getSellFeeParameters(totalBuyerFeeBasisPoints, totalSellerFeeBasisPoints, waitForHighestBid, sellerBountyBasisPoints), makerRelayerFee = _h.makerRelayerFee, takerRelayerFee = _h.takerRelayerFee, makerProtocolFee = _h.makerProtocolFee, takerProtocolFee = _h.takerProtocolFee, makerReferrerFee = _h.makerReferrerFee, feeRecipient = _h.feeRecipient, feeMethod = _h.feeMethod;
                         return [4 /*yield*/, this._getStaticCallTargetAndExtraData({
                                 asset: openSeaAsset,
                                 useTxnOriginStaticCall: waitForHighestBid,
                             })];
                     case 4:
-                        _h = _j.sent(), staticTarget = _h.staticTarget, staticExtradata = _h.staticExtradata;
+                        _j = _k.sent(), staticTarget = _j.staticTarget, staticExtradata = _j.staticExtradata;
                         return [4 /*yield*/, this._getOrderCreateWyvernExchangeAddress()];
                     case 5:
-                        exchange = _j.sent();
+                        exchange = _k.sent();
                         return [2 /*return*/, {
                                 exchange: exchange ||
                                     wyvern_js_1.WyvernProtocol.getExchangeContractAddress(this._networkName),
@@ -2502,7 +2437,7 @@ var OpenSeaPort = /** @class */ (function () {
         });
     };
     OpenSeaPort.prototype._makeBundleBuyOrder = function (_b) {
-        var assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? 0 : _c, paymentTokenAddress = _b.paymentTokenAddress, _d = _b.extraBountyBasisPoints, extraBountyBasisPoints = _d === void 0 ? 0 : _d, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
+        var assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, _c = _b.expirationTime, expirationTime = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, paymentTokenAddress = _b.paymentTokenAddress, _d = _b.extraBountyBasisPoints, extraBountyBasisPoints = _d === void 0 ? 0 : _d, sellOrder = _b.sellOrder, referrerAddress = _b.referrerAddress;
         return __awaiter(this, void 0, void 0, function () {
             var quantityBNs, bundle, orderedSchemas, taker, asset, _e, _f, totalBuyerFeeBasisPoints, totalSellerFeeBasisPoints, _g, makerRelayerFee, takerRelayerFee, makerProtocolFee, takerProtocolFee, makerReferrerFee, feeRecipient, feeMethod, _h, calldata, replacementPattern, _j, basePrice, extra, paymentToken, times, exchange;
             var _this = this;
@@ -2538,7 +2473,9 @@ var OpenSeaPort = /** @class */ (function () {
                         return [4 /*yield*/, this._getPriceParameters(types_1.OrderSide.Buy, paymentTokenAddress, expirationTime, startAmount)];
                     case 5:
                         _j = _k.sent(), basePrice = _j.basePrice, extra = _j.extra, paymentToken = _j.paymentToken;
-                        times = this._getTimeParameters(expirationTime);
+                        times = this._getTimeParameters({
+                            expirationTimestamp: expirationTime,
+                        });
                         return [4 /*yield*/, this._getOrderCreateWyvernExchangeAddress()];
                     case 6:
                         exchange = _k.sent();
@@ -2580,12 +2517,12 @@ var OpenSeaPort = /** @class */ (function () {
         });
     };
     OpenSeaPort.prototype._makeBundleSellOrder = function (_b) {
-        var bundleName = _b.bundleName, bundleDescription = _b.bundleDescription, bundleExternalLink = _b.bundleExternalLink, assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, listingTime = _b.listingTime, expirationTime = _b.expirationTime, waitForHighestBid = _b.waitForHighestBid, _c = _b.englishAuctionReservePrice, englishAuctionReservePrice = _c === void 0 ? 0 : _c, paymentTokenAddress = _b.paymentTokenAddress, extraBountyBasisPoints = _b.extraBountyBasisPoints, buyerAddress = _b.buyerAddress;
+        var bundleName = _b.bundleName, bundleDescription = _b.bundleDescription, bundleExternalLink = _b.bundleExternalLink, assets = _b.assets, collection = _b.collection, quantities = _b.quantities, accountAddress = _b.accountAddress, startAmount = _b.startAmount, endAmount = _b.endAmount, listingTime = _b.listingTime, _c = _b.expirationTime, expirationTime = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, waitForHighestBid = _b.waitForHighestBid, _d = _b.englishAuctionReservePrice, englishAuctionReservePrice = _d === void 0 ? 0 : _d, paymentTokenAddress = _b.paymentTokenAddress, extraBountyBasisPoints = _b.extraBountyBasisPoints, buyerAddress = _b.buyerAddress;
         return __awaiter(this, void 0, void 0, function () {
-            var quantityBNs, bundle, orderedSchemas, asset, _d, _e, totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints, sellerBountyBasisPoints, _f, calldata, replacementPattern, _g, basePrice, extra, paymentToken, reservePrice, times, orderSaleKind, _h, makerRelayerFee, takerRelayerFee, makerProtocolFee, takerProtocolFee, makerReferrerFee, feeRecipient, exchange;
+            var quantityBNs, bundle, orderedSchemas, asset, _e, _f, totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints, sellerBountyBasisPoints, _g, calldata, replacementPattern, _h, basePrice, extra, paymentToken, reservePrice, times, orderSaleKind, _j, makerRelayerFee, takerRelayerFee, makerProtocolFee, takerProtocolFee, makerReferrerFee, feeRecipient, exchange;
             var _this = this;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         accountAddress = (0, utils_1.validateAndFormatWalletAddress)(this.web3, accountAddress);
                         quantityBNs = quantities.map(function (quantity, i) {
@@ -2599,32 +2536,36 @@ var OpenSeaPort = /** @class */ (function () {
                         if (!collection) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.api.getAsset(assets[0])];
                     case 1:
-                        _d = _j.sent();
+                        _e = _k.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        _d = undefined;
-                        _j.label = 3;
+                        _e = undefined;
+                        _k.label = 3;
                     case 3:
-                        asset = _d;
+                        asset = _e;
                         return [4 /*yield*/, this.computeFees({
                                 asset: asset,
                                 side: types_1.OrderSide.Sell,
                                 extraBountyBasisPoints: extraBountyBasisPoints,
                             })];
                     case 4:
-                        _e = _j.sent(), totalSellerFeeBasisPoints = _e.totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints = _e.totalBuyerFeeBasisPoints, sellerBountyBasisPoints = _e.sellerBountyBasisPoints;
-                        _f = (0, schema_1.encodeAtomicizedSell)(orderedSchemas, bundle.assets, accountAddress, this._wyvernProtocol, this._networkName), calldata = _f.calldata, replacementPattern = _f.replacementPattern;
+                        _f = _k.sent(), totalSellerFeeBasisPoints = _f.totalSellerFeeBasisPoints, totalBuyerFeeBasisPoints = _f.totalBuyerFeeBasisPoints, sellerBountyBasisPoints = _f.sellerBountyBasisPoints;
+                        _g = (0, schema_1.encodeAtomicizedSell)(orderedSchemas, bundle.assets, accountAddress, this._wyvernProtocol, this._networkName), calldata = _g.calldata, replacementPattern = _g.replacementPattern;
                         return [4 /*yield*/, this._getPriceParameters(types_1.OrderSide.Sell, paymentTokenAddress, expirationTime, startAmount, endAmount, waitForHighestBid, englishAuctionReservePrice)];
                     case 5:
-                        _g = _j.sent(), basePrice = _g.basePrice, extra = _g.extra, paymentToken = _g.paymentToken, reservePrice = _g.reservePrice;
-                        times = this._getTimeParameters(expirationTime, listingTime, waitForHighestBid);
+                        _h = _k.sent(), basePrice = _h.basePrice, extra = _h.extra, paymentToken = _h.paymentToken, reservePrice = _h.reservePrice;
+                        times = this._getTimeParameters({
+                            expirationTimestamp: expirationTime,
+                            listingTimestamp: listingTime,
+                            waitingForBestCounterOrder: waitForHighestBid,
+                        });
                         orderSaleKind = endAmount != null && endAmount !== startAmount
                             ? types_1.SaleKind.DutchAuction
                             : types_1.SaleKind.FixedPrice;
-                        _h = this._getSellFeeParameters(totalBuyerFeeBasisPoints, totalSellerFeeBasisPoints, waitForHighestBid, sellerBountyBasisPoints), makerRelayerFee = _h.makerRelayerFee, takerRelayerFee = _h.takerRelayerFee, makerProtocolFee = _h.makerProtocolFee, takerProtocolFee = _h.takerProtocolFee, makerReferrerFee = _h.makerReferrerFee, feeRecipient = _h.feeRecipient;
+                        _j = this._getSellFeeParameters(totalBuyerFeeBasisPoints, totalSellerFeeBasisPoints, waitForHighestBid, sellerBountyBasisPoints), makerRelayerFee = _j.makerRelayerFee, takerRelayerFee = _j.takerRelayerFee, makerProtocolFee = _j.makerProtocolFee, takerProtocolFee = _j.takerProtocolFee, makerReferrerFee = _j.makerReferrerFee, feeRecipient = _j.feeRecipient;
                         return [4 /*yield*/, this._getOrderCreateWyvernExchangeAddress()];
                     case 6:
-                        exchange = _j.sent();
+                        exchange = _k.sent();
                         return [2 /*return*/, {
                                 exchange: exchange ||
                                     wyvern_js_1.WyvernProtocol.getExchangeContractAddress(this._networkName),
@@ -2700,7 +2641,10 @@ var OpenSeaPort = /** @class */ (function () {
             }
         };
         var _c = computeOrderParams(), target = _c.target, calldata = _c.calldata, replacementPattern = _c.replacementPattern;
-        var times = this._getTimeParameters(0);
+        var times = this._getTimeParameters({
+            expirationTimestamp: 0,
+            isMatchingOrder: true,
+        });
         // Compat for matching buy orders that have fee recipient still on them
         var feeRecipient = order.feeRecipient == constants_1.NULL_ADDRESS ? constants_1.OPENSEA_FEE_RECIPIENT : constants_1.NULL_ADDRESS;
         var matchingOrder = {
@@ -3283,43 +3227,52 @@ var OpenSeaPort = /** @class */ (function () {
      * @param listingTimestamp Timestamp to start the order (in seconds), or undefined to start it now
      * @param waitingForBestCounterOrder Whether this order should be hidden until the best match is found
      */
-    OpenSeaPort.prototype._getTimeParameters = function (expirationTimestamp, listingTimestamp, waitingForBestCounterOrder) {
-        if (waitingForBestCounterOrder === void 0) { waitingForBestCounterOrder = false; }
-        // Validation
-        var minExpirationTimestamp = Math.round(Date.now() / 1000 + constants_1.MIN_EXPIRATION_SECONDS);
+    OpenSeaPort.prototype._getTimeParameters = function (_b) {
+        var _c = _b.expirationTimestamp, expirationTimestamp = _c === void 0 ? (0, utils_1.getMaxOrderExpirationTimestamp)() : _c, listingTimestamp = _b.listingTimestamp, _d = _b.waitingForBestCounterOrder, waitingForBestCounterOrder = _d === void 0 ? false : _d, _e = _b.isMatchingOrder, isMatchingOrder = _e === void 0 ? false : _e;
+        var maxExpirationDate = new Date();
+        maxExpirationDate.setMonth(maxExpirationDate.getMonth() + constants_1.MAX_EXPIRATION_MONTHS);
+        var maxExpirationTimeStamp = Math.round(maxExpirationDate.getTime() / 1000);
         var minListingTimestamp = Math.round(Date.now() / 1000);
-        if (expirationTimestamp != 0 &&
-            expirationTimestamp < minExpirationTimestamp) {
-            throw new Error("Expiration time must be at least ".concat(constants_1.MIN_EXPIRATION_SECONDS, " seconds from now, or zero (non-expiring)."));
+        if (!isMatchingOrder && expirationTimestamp === 0) {
+            throw new Error("Expiration time cannot be 0");
         }
         if (listingTimestamp && listingTimestamp < minListingTimestamp) {
             throw new Error("Listing time cannot be in the past.");
         }
-        if (listingTimestamp &&
-            expirationTimestamp != 0 &&
-            listingTimestamp >= expirationTimestamp) {
+        if (listingTimestamp && listingTimestamp >= expirationTimestamp) {
             throw new Error("Listing time must be before the expiration time.");
         }
-        if (waitingForBestCounterOrder && expirationTimestamp == 0) {
-            throw new Error("English auctions must have an expiration time.");
-        }
         if (waitingForBestCounterOrder && listingTimestamp) {
             throw new Error("Cannot schedule an English auction for the future.");
         }
         if (parseInt(expirationTimestamp.toString()) != expirationTimestamp) {
             throw new Error("Expiration timestamp must be a whole number of seconds");
         }
+        if (expirationTimestamp > maxExpirationTimeStamp) {
+            throw new Error("Expiration time must not exceed six months from now");
+        }
         if (waitingForBestCounterOrder) {
             listingTimestamp = expirationTimestamp;
             // Expire one week from now, to ensure server can match it
             // Later, this will expire closer to the listingTime
             expirationTimestamp =
                 expirationTimestamp + constants_1.ORDER_MATCHING_LATENCY_SECONDS;
+            // The minimum expiration time has to be at least fifteen minutes from now
+            var minEnglishAuctionListingTimestamp = minListingTimestamp + constants_1.MIN_EXPIRATION_MINUTES * 60;
+            if (!isMatchingOrder &&
+                listingTimestamp < minEnglishAuctionListingTimestamp) {
+                throw new Error("Expiration time must be at least ".concat(constants_1.MIN_EXPIRATION_MINUTES, " minutes from now"));
+            }
         }
         else {
             // Small offset to account for latency
             listingTimestamp =
                 listingTimestamp || Math.round(Date.now() / 1000 - 100);
+            // The minimum expiration time has to be at least fifteen minutes from now
+            var minExpirationTimestamp = listingTimestamp + constants_1.MIN_EXPIRATION_MINUTES * 60;
+            if (!isMatchingOrder && expirationTimestamp < minExpirationTimestamp) {
+                throw new Error("Expiration time must be at least ".concat(constants_1.MIN_EXPIRATION_MINUTES, " minutes from the listing date"));
+            }
         }
         return {
             listingTime: (0, utils_1.makeBigNumber)(listingTimestamp),
@@ -3400,15 +3353,17 @@ var OpenSeaPort = /** @class */ (function () {
         }
         return undefined;
     };
-    OpenSeaPort.prototype._validateOrderMatch = function (_b) {
-        var buy = _b.buy, sell = _b.sell, accountAddress = _b.accountAddress;
+    OpenSeaPort.prototype._atomicMatch = function (_b) {
+        var buy = _b.buy, sell = _b.sell, accountAddress = _b.accountAddress, _c = _b.metadata, metadata = _c === void 0 ? constants_1.NULL_BLOCK_HASH : _c;
         return __awaiter(this, void 0, void 0, function () {
-            var shouldValidateBuy, shouldValidateSell;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var value, shouldValidateBuy, shouldValidateSell, wyvernProtocol, wyvernProtocolReadOnly, txHash, txnData, args, gasEstimate, error_13, error_14;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         shouldValidateBuy = true;
                         shouldValidateSell = true;
+                        wyvernProtocol = this._getWyvernProtocolForOrder(buy);
+                        wyvernProtocolReadOnly = this._getWyvernProtocolForOrder(buy, true);
                         if (!(sell.maker.toLowerCase() == accountAddress.toLowerCase())) return [3 /*break*/, 2];
                         // USER IS THE SELLER, only validate the buy order
                         return [4 /*yield*/, this._sellOrderValidationAndApprovals({
@@ -3417,11 +3372,11 @@ var OpenSeaPort = /** @class */ (function () {
                             })];
                     case 1:
                         // USER IS THE SELLER, only validate the buy order
-                        _c.sent();
+                        _d.sent();
                         shouldValidateSell = false;
-                        return [3 /*break*/, 4];
+                        return [3 /*break*/, 6];
                     case 2:
-                        if (!(buy.maker.toLowerCase() == accountAddress.toLowerCase())) return [3 /*break*/, 4];
+                        if (!(buy.maker.toLowerCase() == accountAddress.toLowerCase())) return [3 /*break*/, 6];
                         // USER IS THE BUYER, only validate the sell order
                         return [4 /*yield*/, this._buyOrderValidationAndApprovals({
                                 order: buy,
@@ -3430,43 +3385,30 @@ var OpenSeaPort = /** @class */ (function () {
                             })];
                     case 3:
                         // USER IS THE BUYER, only validate the sell order
-                        _c.sent();
+                        _d.sent();
                         shouldValidateBuy = false;
-                        return [3 /*break*/, 4];
-                    case 4: return [4 /*yield*/, this._validateMatch({
+                        if (!(buy.paymentToken == constants_1.NULL_ADDRESS)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this._getRequiredAmountForTakingSellOrder(sell)];
+                    case 4:
+                        value = _d.sent();
+                        _d.label = 5;
+                    case 5: return [3 /*break*/, 6];
+                    case 6: return [4 /*yield*/, this._validateMatch({
                             buy: buy,
                             sell: sell,
                             accountAddress: accountAddress,
                             shouldValidateBuy: shouldValidateBuy,
                             shouldValidateSell: shouldValidateSell,
                         })];
-                    case 5:
-                        _c.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    OpenSeaPort.prototype._getAtomicMatchCallArgs = function (_b) {
-        var buy = _b.buy, sell = _b.sell, accountAddress = _b.accountAddress, _c = _b.metadata, metadata = _c === void 0 ? constants_1.NULL_BLOCK_HASH : _c;
-        return __awaiter(this, void 0, void 0, function () {
-            var value, txnData, args;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        this._validateOrderMatch({ buy: buy, sell: sell, accountAddress: accountAddress });
-                        if (!(buy.maker.toLowerCase() == accountAddress.toLowerCase() &&
-                            buy.paymentToken == constants_1.NULL_ADDRESS)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this._getRequiredAmountForTakingSellOrder(sell)];
-                    case 1:
-                        // If using ETH to pay, set the value of the transaction to the current price
-                        value = _d.sent();
-                        _d.label = 2;
-                    case 2:
-                        txnData = {
-                            from: accountAddress,
-                            value: value,
-                        };
+                    case 7:
+                        _d.sent();
+                        this._dispatch(types_1.EventType.MatchOrders, {
+                            buy: buy,
+                            sell: sell,
+                            accountAddress: accountAddress,
+                            matchMetadata: metadata,
+                        });
+                        txnData = { from: accountAddress, value: value };
                         args = [
                             [
                                 buy.exchange,
@@ -3529,79 +3471,30 @@ var OpenSeaPort = /** @class */ (function () {
                                 metadata,
                             ],
                         ];
-                        return [2 /*return*/, {
-                                args: args,
-                                txnData: txnData,
-                            }];
-                }
-            });
-        });
-    };
-    OpenSeaPort.prototype._getAtomicMatchGasEstimation = function (_b) {
-        var args = _b.args, txnData = _b.txnData, wyvernProtocolReadOnly = _b.wyvernProtocolReadOnly;
-        return __awaiter(this, void 0, void 0, function () {
-            var gasEstimate, error_13;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 2, , 3]);
+                        _d.label = 8;
+                    case 8:
+                        _d.trys.push([8, 10, , 11]);
                         return [4 /*yield*/, wyvernProtocolReadOnly.wyvernExchange.atomicMatch_.estimateGasAsync(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], txnData)];
-                    case 1:
-                        gasEstimate = _c.sent();
-                        return [2 /*return*/, this._correctGasAmount(gasEstimate)];
-                    case 2:
-                        error_13 = _c.sent();
+                    case 9:
+                        gasEstimate = _d.sent();
+                        txnData.gas = this._correctGasAmount(gasEstimate);
+                        return [3 /*break*/, 11];
+                    case 10:
+                        error_13 = _d.sent();
                         console.error("Failed atomic match with args: ", args, error_13);
                         throw new Error("Oops, the Ethereum network rejected this transaction :( The OpenSea devs have been alerted, but this problem is typically due an item being locked or untransferrable. The exact error was \"".concat(error_13 instanceof Error
                             ? error_13.message.substr(0, debugging_1.MAX_ERROR_LENGTH)
                             : "unknown", "...\""));
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    OpenSeaPort.prototype._atomicMatch = function (_b) {
-        var buy = _b.buy, sell = _b.sell, accountAddress = _b.accountAddress, _c = _b.metadata, metadata = _c === void 0 ? constants_1.NULL_BLOCK_HASH : _c;
-        return __awaiter(this, void 0, void 0, function () {
-            var wyvernProtocol, wyvernProtocolReadOnly, _d, args, txnData, _e, txHash, error_14;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        wyvernProtocol = this._getWyvernProtocolForOrder(buy);
-                        wyvernProtocolReadOnly = this._getWyvernProtocolForOrder(buy, true);
-                        return [4 /*yield*/, this._getAtomicMatchCallArgs({
-                                buy: buy,
-                                sell: sell,
-                                accountAddress: accountAddress,
-                                metadata: metadata,
-                            })];
-                    case 1:
-                        _d = _f.sent(), args = _d.args, txnData = _d.txnData;
-                        _e = txnData;
-                        return [4 /*yield*/, this._getAtomicMatchGasEstimation({
-                                args: args,
-                                txnData: txnData,
-                                wyvernProtocolReadOnly: wyvernProtocolReadOnly,
-                            })];
-                    case 2:
-                        _e.gas = _f.sent();
-                        this._dispatch(types_1.EventType.MatchOrders, {
-                            buy: buy,
-                            sell: sell,
-                            accountAddress: accountAddress,
-                            matchMetadata: metadata,
-                        });
-                        _f.label = 3;
-                    case 3:
-                        _f.trys.push([3, 5, , 6]);
+                    case 11:
+                        _d.trys.push([11, 13, , 14]);
                         this.logger("Fulfilling order with gas set to ".concat(txnData.gas));
                         return [4 /*yield*/, wyvernProtocol.wyvernExchange.atomicMatch_.sendTransactionAsync(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], txnData)];
-                    case 4:
+                    case 12:
                         txHash =
-                            _f.sent();
-                        return [3 /*break*/, 6];
-                    case 5:
-                        error_14 = _f.sent();
+                            _d.sent();
+                        return [3 /*break*/, 14];
+                    case 13:
+                        error_14 = _d.sent();
                         console.error(error_14);
                         this._dispatch(types_1.EventType.TransactionDenied, {
                             error: error_14,
@@ -3613,7 +3506,7 @@ var OpenSeaPort = /** @class */ (function () {
                         throw new Error("Failed to authorize transaction: \"".concat(error_14 instanceof Error && error_14.message
                             ? error_14.message
                             : "user denied", "...\""));
-                    case 6: return [2 /*return*/, txHash];
+                    case 14: return [2 /*return*/, txHash];
                 }
             });
         });