@manifoldxyz/marketplace-sdk 3.0.6 → 3.0.7-beta.2

package/dist/lib/MarketplaceListing.d.ts

@@ -45,12 +45,13 @@ declare class MarketplaceListing {
     constructor(marketplaceAddress: string, listingId: string | number, version?: number, listingData?: any, overrides?: Overrides | undefined);
     private _getABI;
     getMarketplaceContract(withSigner?: boolean, bridge?: boolean): Contract;
-    getERC20Contract(withSigner?: boolean): Contract;
+    getERC20Contract(withSigner?: boolean, bridge?: boolean): Contract;
     private _getMarketplaceContract;
     private _getERC20Contract;
     private _getERC721Contract;
     private _getERC1155Contract;
     private _getLazyDeliveryContract;
+    private _getIdentityVerifierContract;
     /**
      * Subscribe to a MarketplaceTopic for this listing
      */
@@ -129,14 +130,14 @@ declare class MarketplaceListing {
     cancelListing(): Promise<any>;
     editListing(price?: string, startTime?: number, endTime?: number): Promise<any>;
     createListing(price: string | undefined, tokenId: any, tokenContractAddress: any, marketplaceContractAddress: any): Promise<any>;
-    requestSpendApproval(): any;
+    requestSpendApproval(): Promise<any>;
     purchase(data?: string, referrer?: string): Promise<any>;
     purchaseMultiple(count: number, data?: string, referrer?: string): Promise<any>;
     purchaseDynamic(amount: string | number, data?: string, referrer?: string): Promise<any>;
     purchaseDynamicMultiple(amount: string | number | BigNumber, count: number, data?: string, referrer?: string): Promise<any>;
     bid(bidAmount: string | number, increase: boolean, data?: string, referrer?: string): Promise<any>;
     offer(offerAmount: string | number, increase: boolean, data?: string, referrer?: string): Promise<any>;
-    finalize(): any;
+    finalize(): Promise<any>;
     /**
      * Check to see if you can still act on the listing
      */
@@ -164,7 +165,6 @@ declare class MarketplaceListing {
      * Helper to process token data for consumption
      */
     private _processTokenData;
-    private _callWeb3WithServerFallback;
     private _fetchServer;
     /**
      * Get the api endpoint

package/dist/lib/MarketplaceListing.js

@@ -36,6 +36,7 @@ const contracts_1 = require("@ethersproject/contracts");
 const bytes_1 = require("@ethersproject/bytes");
 const units_1 = require("@ethersproject/units");
 const ens_batch_lookup_ethers_1 = require("@manifoldxyz/ens-batch-lookup-ethers");
+const Web3Protocol_1 = require("./Web3Protocol");
 let serverTime;
 let serverTimeFetch;
 var MarketplaceTopic;
@@ -61,6 +62,15 @@ const ADDRESSES_REGEX = /(.{42}?)(?:,|$)/;
 const MESSAGE_CONTACT_TYPE_STRINGS = {
     1: 'emails',
 };
+const identityVerifierMapping = {
+    1: {
+        abi: IdentityVerifierABIv1_json_1.IdentityVerifierABIv1
+    },
+    2: {
+        abi: IdentityVerifierABIv2_json_1.IdentityVerifierABIv2,
+        viewAbi: IdentityVerifierViewABIv2_json_1.IdentityVerifierViewABIv2
+    }
+};
 class MarketplaceListing {
     /**
      * Construct a marketplace listing instance
@@ -113,9 +123,9 @@ class MarketplaceListing {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return this._getMarketplaceContract(withSigner, true, bridge);
     }
-    getERC20Contract(withSigner = false) {
+    getERC20Contract(withSigner = false, bridge = false) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return this._getERC20Contract(withSigner, true);
+        return this._getERC20Contract(withSigner, true, bridge);
     }
     _getMarketplaceContract(withSigner = false, errorOnNoContract = true, bridge = false) {
         if (bridge)
@@ -167,6 +177,22 @@ class MarketplaceListing {
             throw new Error("Could not get a contract instance");
         return contract;
     }
+    _getIdentityVerifierContract(version, useView = false, errorOnNoContract = true, bridge = false) {
+        var _a;
+        if (!((_a = this.listing) === null || _a === void 0 ? void 0 : _a.identityVerifier))
+            throw new Error("Could not get a contract instance");
+        if (!Object.keys(identityVerifierMapping).includes(version.toString())) {
+            throw new Error("Invalid marketplace version provided");
+        }
+        // Use the view ABI (only valid for version 2)
+        const abi = useView && version > 1 ? identityVerifierMapping[version].viewAbi : identityVerifierMapping[version].abi;
+        if (bridge)
+            return new contracts_1.Contract(this.listing.identityVerifier, abi, this._getManifoldBridgeProvider());
+        const contract = window.ManifoldEthereumProvider.contractInstance(this.listing.identityVerifier, abi);
+        if (!contract && errorOnNoContract)
+            throw new Error("Could not get a contract instance");
+        return contract;
+    }
     /**
      * Subscribe to a MarketplaceTopic for this listing
      */
@@ -399,7 +425,7 @@ class MarketplaceListing {
                 this._convertBigNumberValues(listingData);
                 return listingData;
             }
-            return this._callWeb3WithServerFallback(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getListing', [listingId]);
+            return (0, Web3Protocol_1.callWeb3)(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getListing', [listingId]);
         });
     }
     /**
@@ -421,7 +447,8 @@ class MarketplaceListing {
     subscribeEmail(emailAdddress) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!window.ManifoldEthereumProvider.selectedAddress())
+            const connectedAddress = (0, Web3Protocol_1.getConnectedAddress)();
+            if (!connectedAddress)
                 throw new Error('Must log in to subscribe to email');
             yield this.listingPromise;
             if (!this.listing) {
@@ -432,7 +459,7 @@ class MarketplaceListing {
             const messageToSign = `Please sign to receive ${MESSAGE_CONTACT_TYPE_STRINGS[type]} for this listing`;
             const signature = yield ((_a = window.ManifoldEthereumProvider.provider()) === null || _a === void 0 ? void 0 : _a.getSigner().signMessage(messageToSign));
             yield this._fetchServer(`listing/${this.contractAddress}/${this.listing.id}/notifications`, true, 'POST', {
-                address: window.ManifoldEthereumProvider.selectedAddress(),
+                address: connectedAddress,
                 signature,
                 details: emailAdddress,
                 type: 1,
@@ -441,13 +468,13 @@ class MarketplaceListing {
     }
     fetchSubscriptions() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!window.ManifoldEthereumProvider.selectedAddress())
+            if (!(0, Web3Protocol_1.getConnectedAddress)())
                 throw new Error('Must log in to fetch subscriptions');
             yield this.listingPromise;
             if (!this.listing) {
                 throw new Error("Listing not loaded");
             }
-            return this._fetchServer(`listing/${this.contractAddress}/${this.listing.id}/notifications?address=${window.ManifoldEthereumProvider.selectedAddress()}`, true);
+            return this._fetchServer(`listing/${this.contractAddress}/${this.listing.id}/notifications?address=${(0, Web3Protocol_1.getConnectedAddress)()}`, true);
         });
     }
     getCurrentPrice() {
@@ -457,7 +484,7 @@ class MarketplaceListing {
             if (!this.listing) {
                 throw new Error("Listing not loaded");
             }
-            const currentPrice = yield this._callWeb3WithServerFallback(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getListingCurrentPrice', [this.listing.id]);
+            const currentPrice = yield (0, Web3Protocol_1.callWeb3)(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getListingCurrentPrice', [this.listing.id]);
             return bignumber_1.BigNumber.from(currentPrice);
         });
     }
@@ -483,7 +510,7 @@ class MarketplaceListing {
             if (!this.listing) {
                 throw new Error("Listing not loaded");
             }
-            const bidData = yield this._callWeb3WithServerFallback(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getBids', [this.listing.id]);
+            const bidData = yield (0, Web3Protocol_1.callWeb3)(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getBids', [this.listing.id]);
             const bids = [];
             for (const bid of bidData) {
                 bids.push(new Bid_1.Bid(bid.bidder, bid.referrer, bid.amount, bid.timestamp));
@@ -497,7 +524,7 @@ class MarketplaceListing {
             if (this.listing == undefined) {
                 throw new Error("Listing not loaded");
             }
-            const offerData = yield this._callWeb3WithServerFallback(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getOffers', [this.listing.id]);
+            const offerData = yield (0, Web3Protocol_1.callWeb3)(this._getMarketplaceContract(false, false), this._getMarketplaceContract(false, false, true), 'getOffers', [this.listing.id]);
             const offers = [];
             for (const offer of offerData) {
                 offers.push(new Offer_1.Offer(offer.offerer, offer.amount, offer.timestamp, offer.accepted));
@@ -518,23 +545,23 @@ class MarketplaceListing {
     }
     checkSpendApproval(amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!window.ManifoldEthereumProvider.selectedAddress())
+            if (!(0, Web3Protocol_1.getConnectedAddress)())
                 throw new Error('Not logged in');
             if (!this.listing.erc20)
                 return true;
-            const allowance = yield this.getERC20Contract().allowance(window.ManifoldEthereumProvider.selectedAddress(), this.contractAddress);
+            const allowance = yield (0, Web3Protocol_1.callWeb3)(this.getERC20Contract(), this.getERC20Contract(false, true), 'allowance', [(0, Web3Protocol_1.getConnectedAddress)(), this.contractAddress]);
             return bignumber_1.BigNumber.from(amount).lte(bignumber_1.BigNumber.from(allowance));
         });
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!window.ManifoldEthereumProvider.selectedAddress())
+            if (!(0, Web3Protocol_1.getConnectedAddress)())
                 throw new Error('No selected address.');
             if (this.listing.erc20) {
-                return this.getERC20Contract().balanceOf(window.ManifoldEthereumProvider.selectedAddress());
+                return (0, Web3Protocol_1.callWeb3)(this.getERC20Contract(), this.getERC20Contract(false, true), 'balanceOf', [(0, Web3Protocol_1.getConnectedAddress)()]);
             }
             else {
-                return window.ManifoldEthereumProvider.provider().getBalance(window.ManifoldEthereumProvider.selectedAddress());
+                return window.ManifoldEthereumProvider.provider().getBalance((0, Web3Protocol_1.getConnectedAddress)());
             }
         });
     }
@@ -544,11 +571,11 @@ class MarketplaceListing {
             if (!provider)
                 throw new Error('Not logged in');
             if (this.listing.erc20) {
-                const balance = yield this.getERC20Contract().balanceOf(window.ManifoldEthereumProvider.selectedAddress());
+                const balance = yield (0, Web3Protocol_1.callWeb3)(this.getERC20Contract(), this.getERC20Contract(false, true), 'balanceOf', [(0, Web3Protocol_1.getConnectedAddress)()]);
                 return bignumber_1.BigNumber.from(amount).lte(balance);
             }
             else {
-                const balance = yield provider.getBalance(window.ManifoldEthereumProvider.selectedAddress());
+                const balance = yield provider.getBalance((0, Web3Protocol_1.getConnectedAddress)());
                 return bignumber_1.BigNumber.from(amount).lte(bignumber_1.BigNumber.from(balance));
             }
         });
@@ -591,22 +618,14 @@ class MarketplaceListing {
             if (!this.listing.identityVerifier)
                 return true;
             if (this.version == 1) {
-                const abi = IdentityVerifierABIv1_json_1.IdentityVerifierABIv1;
-                const contract = window.ManifoldEthereumProvider.contractInstance(this.listing.identityVerifier, abi);
-                if (!contract)
-                    throw new Error("Could not get a contract instance");
                 if (!this.listing.erc20) {
-                    return contract.verify(window.ManifoldEthereumProvider.selectedAddress(), amount);
+                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verify', [(0, Web3Protocol_1.getConnectedAddress)(), amount]);
                 }
                 else {
-                    return contract.verify(window.ManifoldEthereumProvider.selectedAddress(), this.listing.erc20, amount);
+                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verify', [(0, Web3Protocol_1.getConnectedAddress)(), this.listing.erc20, amount]);
                 }
             }
             else if (this.version == 2) {
-                const abi = useView ? IdentityVerifierViewABIv2_json_1.IdentityVerifierViewABIv2 : IdentityVerifierABIv2_json_1.IdentityVerifierABIv2;
-                const contract = window.ManifoldEthereumProvider.contractInstance(this.listing.identityVerifier, abi);
-                if (!contract)
-                    throw new Error("Could not get a contract instance");
                 let tokenId;
                 if (this.listing instanceof Listing_1.TokenListing) {
                     //@ts-ignore
@@ -619,15 +638,15 @@ class MarketplaceListing {
                 }
                 if (useView) {
                     try {
-                        return yield contract.verifyView(this.listing.id, window.ManifoldEthereumProvider.selectedAddress(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data);
+                        return yield (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verifyView', [this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
                     }
                     catch (e) {
                         // Not using verify view, try checkVerify
-                        return contract.checkVerify(this.contractAddress, this.listing.id, window.ManifoldEthereumProvider.selectedAddress(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data);
+                        return yield (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'checkVerify', [this.contractAddress, this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
                     }
                 }
                 else {
-                    return contract.verify(this.listing.id, window.ManifoldEthereumProvider.selectedAddress(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data);
+                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verify', [this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
                 }
             }
             else {
@@ -643,33 +662,31 @@ class MarketplaceListing {
             const network = window.ManifoldEthereumProvider.network();
             if (!this.listing.erc20)
                 return network == frontend_provider_types_1.EthereumNetwork.OPTIMISM ? 'OETH' : 'ETH';
-            return this._callWeb3WithServerFallback(this._getERC20Contract(false, false), this._getERC20Contract(false, false, true), 'symbol', []);
+            return (0, Web3Protocol_1.callWeb3)(this._getERC20Contract(false, false), this._getERC20Contract(false, false, true), 'symbol', []);
         });
     }
     getCurrencyDecimals() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.listing.erc20)
                 return 18;
-            return this._callWeb3WithServerFallback(this._getERC20Contract(false, false), this._getERC20Contract(false, false, true), 'decimals', []);
+            return (0, Web3Protocol_1.callWeb3)(this._getERC20Contract(false, false), this._getERC20Contract(false, false, true), 'decimals', []);
         });
     }
     cancelListing() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this._checkListingActive();
-            const marketplaceContract = this.getMarketplaceContract(true);
-            return marketplaceContract.cancel((_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, 0);
+            return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'cancel', args: [(_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, 0] }, this._getManifoldBridgeProvider());
         });
     }
     editListing(price = "1", startTime = 0, endTime = 86400) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this._checkListingActive();
-            if (!window.ManifoldEthereumProvider.selectedAddress())
+            if (!(0, Web3Protocol_1.getConnectedAddress)())
                 throw new Error('Not logged in');
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.version > 1) {
-                return marketplaceContract['modifyListing(uint40,uint256,uint48,uint48)']((_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, (0, units_1.parseEther)(price), startTime, endTime);
+                return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'modifyListing(uint40,uint256,uint48,uint48)', args: [(_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, (0, units_1.parseEther)(price), startTime, endTime] }, this._getManifoldBridgeProvider());
             }
             else {
                 throw new Error("Cannot edit this listing.");
@@ -678,10 +695,10 @@ class MarketplaceListing {
     }
     createListing(price = "1", tokenId, tokenContractAddress, marketplaceContractAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!window.ManifoldEthereumProvider.selectedAddress())
+            if (!(0, Web3Protocol_1.getConnectedAddress)())
                 throw new Error('Not logged in');
             const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
-            const listingReceiverAddress = window.ManifoldEthereumProvider.selectedAddress();
+            const listingReceiverAddress = (0, Web3Protocol_1.getConnectedAddress)();
             const abiCoder = new abi_1.AbiCoder();
             const dataParam = abiCoder.encode([
                 "tuple(uint256 initialAmount, uint8 type_, uint24 totalAvailable, uint24 totalPerSale, uint16 extensionInterval, uint16 minIncrementBPS, address erc20, address identityVerifier, uint48 startTime, uint48 endTime) listing",
@@ -717,51 +734,39 @@ class MarketplaceListing {
                 true,
                 []
             ]);
-            const tokenContract = window.ManifoldEthereumProvider.contractInstance(tokenContractAddress, contract_abis_1.ERC721ABI, true);
-            return tokenContract['safeTransferFrom(address,address,uint256,bytes)'](listingReceiverAddress, marketplaceContractAddress, tokenId, dataParam);
+            return (0, Web3Protocol_1.writeWeb3)({ contractAddress: tokenContractAddress, abi: contract_abis_1.ERC721ABI, functionName: 'safeTransferFrom(address,address,uint256,bytes)', args: [listingReceiverAddress, marketplaceContractAddress, tokenId, dataParam] }, this._getManifoldBridgeProvider());
         });
     }
     requestSpendApproval() {
-        if (!window.ManifoldEthereumProvider.selectedAddress())
+        var _a;
+        if (!(0, Web3Protocol_1.getConnectedAddress)())
             throw new Error('Not logged in');
-        if (!this.listing.erc20)
+        if (!this.listing)
+            throw new Error("Listing not set up");
+        if (!((_a = this.listing) === null || _a === void 0 ? void 0 : _a.erc20))
             throw new Error('Spend approval not needed');
-        return this.getERC20Contract(true).approve(this.contractAddress, "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.listing.erc20, abi: contract_abis_1.ERC20ABI, functionName: 'approve', args: [this.contractAddress, "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"] }, this._getManifoldBridgeProvider());
     }
     purchase(data = "0x", referrer = NULL_ADDRESS) {
-        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             this._checkListingActive();
             if (referrer !== NULL_ADDRESS)
                 referrer = yield this._checkReferrer(referrer);
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.listing instanceof Listing_1.FixedPriceListing || this.listing instanceof Listing_1.LazyFixedPriceListing) {
                 if (this.listing.erc20) {
                     if (this.version > 1) {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(address,uint40,bytes)'](referrer, (_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, data);
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(address,uint40,bytes)'](referrer, this.listing.id, data, { gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,bytes)', args: [referrer, this.listing.id, data] }, this._getManifoldBridgeProvider());
                     }
                     else {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(uint256)']((_b = this.listing) === null || _b === void 0 ? void 0 : _b.id);
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(uint256)'](this.listing.id, { gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(uint256)', args: [this.listing.id] }, this._getManifoldBridgeProvider());
                     }
                 }
                 else {
                     if (this.version > 1) {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(address,uint40,bytes)'](referrer, (_c = this.listing) === null || _c === void 0 ? void 0 : _c.id, data, { value: this.listing.price });
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(address,uint40,bytes)'](referrer, this.listing.id, data, { value: this.listing.price, gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,bytes)', args: [referrer, this.listing.id, data], value: this.listing.price }, this._getManifoldBridgeProvider());
                     }
                     else {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(uint256)']((_d = this.listing) === null || _d === void 0 ? void 0 : _d.id, { value: this.listing.price });
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(uint256)'](this.listing.id, { value: this.listing.price, gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(uint256)', args: [this.listing.id], value: this.listing.price }, this._getManifoldBridgeProvider());
                     }
                 }
             }
@@ -773,22 +778,15 @@ class MarketplaceListing {
     purchaseMultiple(count, data = "0x", referrer = NULL_ADDRESS) {
         return __awaiter(this, void 0, void 0, function* () {
             this._checkListingActive();
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.version < 2) {
                 throw new Error("Only supported in marketplace v2 and above");
             }
             if (this.listing instanceof Listing_1.FixedPriceListing || this.listing instanceof Listing_1.LazyFixedPriceListing) {
                 if (this.listing.erc20) {
-                    let gasEstimate = yield marketplaceContract.estimateGas['purchase(address,uint40,uint24,bytes)'](referrer, this.listing.id, count, data);
-                    // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                    gasEstimate = gasEstimate.mul(125).div(100);
-                    return marketplaceContract['purchase(address,uint40,uint24,bytes)'](referrer, this.listing.id, count, data, { gasLimit: gasEstimate });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,uint24,bytes)', args: [referrer, this.listing.id, count, data] }, this._getManifoldBridgeProvider());
                 }
                 else {
-                    let gasEstimate = yield marketplaceContract.estimateGas['purchase(address,uint40,uint24,bytes)'](referrer, this.listing.id, count, data, { value: this.listing.price.mul(count) });
-                    // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                    gasEstimate = gasEstimate.mul(125).div(100);
-                    return marketplaceContract['purchase(address,uint40,uint24,bytes)'](referrer, this.listing.id, count, data, { value: this.listing.price.mul(count), gasLimit: gasEstimate });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,uint24,bytes)', args: [referrer, this.listing.id, count, data], value: this.listing.price.mul(count) }, this._getManifoldBridgeProvider());
                 }
             }
             else {
@@ -801,34 +799,21 @@ class MarketplaceListing {
             this._checkListingActive();
             if (referrer !== NULL_ADDRESS)
                 referrer = yield this._checkReferrer(referrer);
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.listing instanceof Listing_1.LazyDynamicPriceListing) {
                 if (this.listing.erc20) {
                     if (this.version > 1) {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(address,uint40,bytes)'](referrer, this.listing.id, data);
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(address,uint40,bytes)'](referrer, this.listing.id, data, { gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,bytes)', args: [referrer, this.listing.id, data] }, this._getManifoldBridgeProvider());
                     }
                     else {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(uint256)'](this.listing.id);
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(uint256)'](this.listing.id, { gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(uint256)', args: [this.listing.id] }, this._getManifoldBridgeProvider());
                     }
                 }
                 else {
                     if (this.version > 1) {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(address,uint40,bytes)'](referrer, this.listing.id, data, { value: amount });
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(address,uint40,bytes)'](referrer, this.listing.id, data, { value: amount, gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,bytes)', args: [referrer, this.listing.id, data], value: bignumber_1.BigNumber.from(amount) }, this._getManifoldBridgeProvider());
                     }
                     else {
-                        let gasEstimate = yield marketplaceContract.estimateGas['purchase(uint256)'](this.listing.id, { value: amount });
-                        // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                        gasEstimate = gasEstimate.mul(125).div(100);
-                        return marketplaceContract['purchase(uint256)'](this.listing.id, { value: amount, gasLimit: gasEstimate });
+                        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(uint256)', args: [this.listing.id], value: bignumber_1.BigNumber.from(amount) }, this._getManifoldBridgeProvider());
                     }
                 }
             }
@@ -842,16 +827,15 @@ class MarketplaceListing {
             this._checkListingActive();
             if (referrer !== NULL_ADDRESS)
                 referrer = yield this._checkReferrer(referrer);
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.version < 2) {
                 throw new Error("Only supported in marketplace v2 and above");
             }
             if (this.listing instanceof Listing_1.LazyDynamicPriceListing) {
                 if (this.listing.erc20) {
-                    return marketplaceContract['purchase(address,uint40,uint16,bytes)'](referrer, this.listing.id, count, data);
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,uint16,bytes)', args: [referrer, this.listing.id, count, data] }, this._getManifoldBridgeProvider());
                 }
                 else {
-                    return marketplaceContract['purchase(address,uint40,uint16,bytes)'](referrer, this.listing.id, count, data, { value: amount });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'purchase(address,uint40,uint16,bytes)', args: [referrer, this.listing.id, count, data], value: bignumber_1.BigNumber.from(amount) }, this._getManifoldBridgeProvider());
                 }
             }
             else {
@@ -860,60 +844,40 @@ class MarketplaceListing {
         });
     }
     bid(bidAmount, increase, data = "0x", referrer = NULL_ADDRESS) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             this._checkListingActive();
             if (referrer !== NULL_ADDRESS)
                 referrer = yield this._checkReferrer(referrer);
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.listing.erc20) {
                 if (this.version > 1) {
-                    let gasEstimate = yield marketplaceContract.estimateGas['bid(address,uint40,uint256,bool,bytes)'](referrer, (_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, bidAmount, increase, data);
-                    // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                    gasEstimate = gasEstimate.mul(125).div(100);
-                    return marketplaceContract['bid(address,uint40,uint256,bool,bytes)'](referrer, (_b = this.listing) === null || _b === void 0 ? void 0 : _b.id, bidAmount, increase, data, { gasLimit: gasEstimate });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'bid(address,uint40,uint256,bool,bytes)', args: [referrer, (_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, bidAmount, increase, data] }, this._getManifoldBridgeProvider());
                 }
                 else {
-                    let gasEstimate = yield marketplaceContract.estimateGas['bid(uint256,uint256,bool)']((_c = this.listing) === null || _c === void 0 ? void 0 : _c.id, bidAmount, increase);
-                    // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                    gasEstimate = gasEstimate.mul(125).div(100);
-                    return marketplaceContract['bid(uint256,uint256,bool)']((_d = this.listing) === null || _d === void 0 ? void 0 : _d.id, bidAmount, increase, { gasLimit: gasEstimate });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'bid(uint256,uint256,bool)', args: [(_b = this.listing) === null || _b === void 0 ? void 0 : _b.id, bidAmount, increase] }, this._getManifoldBridgeProvider());
                 }
             }
             else {
                 if (this.version > 1) {
-                    let gasEstimate = yield marketplaceContract.estimateGas['bid(address,uint40,bool,bytes)'](referrer, (_e = this.listing) === null || _e === void 0 ? void 0 : _e.id, increase, data, { value: bidAmount });
-                    // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                    gasEstimate = gasEstimate.mul(125).div(100);
-                    return marketplaceContract['bid(address,uint40,bool,bytes)'](referrer, (_f = this.listing) === null || _f === void 0 ? void 0 : _f.id, increase, data, { value: bidAmount, gasLimit: gasEstimate });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'bid(address,uint40,bool,bytes)', args: [referrer, (_c = this.listing) === null || _c === void 0 ? void 0 : _c.id, increase, data], value: bignumber_1.BigNumber.from(bidAmount) }, this._getManifoldBridgeProvider());
                 }
                 else {
-                    let gasEstimate = yield marketplaceContract.estimateGas['bid(uint256,bool)']((_g = this.listing) === null || _g === void 0 ? void 0 : _g.id, increase, { value: bidAmount });
-                    // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                    gasEstimate = gasEstimate.mul(125).div(100);
-                    return marketplaceContract['bid(uint256,bool)']((_h = this.listing) === null || _h === void 0 ? void 0 : _h.id, increase, { value: bidAmount, gasLimit: gasEstimate });
+                    return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'bid(uint256,bool)', args: [(_d = this.listing) === null || _d === void 0 ? void 0 : _d.id, increase], value: bignumber_1.BigNumber.from(bidAmount) }, this._getManifoldBridgeProvider());
                 }
             }
         });
     }
     offer(offerAmount, increase, data = "0x", referrer = NULL_ADDRESS) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this._checkListingActive();
             if (referrer !== NULL_ADDRESS)
                 referrer = yield this._checkReferrer(referrer);
-            const marketplaceContract = this.getMarketplaceContract(true);
             if (this.listing.erc20) {
-                let gasEstimate = yield marketplaceContract.estimateGas['offer(address,uint40,uint256,bool,bytes)'](referrer, (_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, offerAmount, increase, data);
-                // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                gasEstimate = gasEstimate.mul(125).div(100);
-                return marketplaceContract['offer(address,uint40,uint256,bool,bytes)'](referrer, (_b = this.listing) === null || _b === void 0 ? void 0 : _b.id, offerAmount, increase, data, { gasLimit: gasEstimate });
+                return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'offer(address,uint40,uint256,bool,bytes)', args: [referrer, (_a = this.listing) === null || _a === void 0 ? void 0 : _a.id, offerAmount, increase, data] }, this._getManifoldBridgeProvider());
             }
             else {
-                let gasEstimate = yield marketplaceContract.estimateGas['offer(address,uint40,bool,bytes)'](referrer, (_c = this.listing) === null || _c === void 0 ? void 0 : _c.id, increase, data, { value: offerAmount });
-                // Multiply gas estimate by 1.25 to account for inaccurate estimates from Metamask.
-                gasEstimate = gasEstimate.mul(125).div(100);
-                return marketplaceContract['offer(address,uint40,bool,bytes)'](referrer, (_d = this.listing) === null || _d === void 0 ? void 0 : _d.id, increase, data, { value: offerAmount, gasLimit: gasEstimate });
+                return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'offer(address,uint40,bool,bytes)', args: [referrer, (_b = this.listing) === null || _b === void 0 ? void 0 : _b.id, increase, data], value: bignumber_1.BigNumber.from(offerAmount) }, this._getManifoldBridgeProvider());
             }
         });
     }
@@ -925,7 +889,7 @@ class MarketplaceListing {
         if (this.listing.finalized) {
             throw new Error("Listing is finalized");
         }
-        return this.getMarketplaceContract(true).finalize((_a = this.listing) === null || _a === void 0 ? void 0 : _a.id);
+        return (0, Web3Protocol_1.writeWeb3)({ contractAddress: this.contractAddress, abi: this._getABI(), functionName: 'finalize', args: [(_a = this.listing) === null || _a === void 0 ? void 0 : _a.id] }, this._getManifoldBridgeProvider());
     }
     /**
      * Check to see if you can still act on the listing
@@ -1002,7 +966,7 @@ class MarketplaceListing {
                 bridgeContract = this._getLazyDeliveryContract(false, true);
                 contractFunctionName = 'assetURI';
             }
-            tokenURI = yield this._callWeb3WithServerFallback(contract, bridgeContract, contractFunctionName, [tokenId]);
+            tokenURI = yield (0, Web3Protocol_1.callWeb3)(contract, bridgeContract, contractFunctionName, [tokenId]);
             // Parse token data and return
             let tokenData;
             try {
@@ -1150,38 +1114,6 @@ class MarketplaceListing {
             data.animation_url = this._cleanURI(data.animation_url);
         }
     }
-    _callWeb3WithServerFallback(contract, bridgeContract, functionName, args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result;
-            const provider = window.ManifoldEthereumProvider.provider();
-            //@ts-ignore
-            if (!provider || provider._wsReady === false || !contract) {
-                // No available provider failure scenario, use the server endpoint
-                result = yield bridgeContract[functionName](...args);
-            }
-            else {
-                // We have a web3timeout race because there are certain situations where
-                // web3 requests will hang.  e.g. Safari websockets or Infura rate limiting
-                // ref: https://developer.apple.com/forums/thread/679576
-                // res: https://github.com/tilt-dev/tilt/issues/4746
-                const web3timeout = new Promise(resolve => setTimeout(resolve, 1500));
-                const web3result = new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        resolve(yield contract[functionName](...args));
-                    }
-                    catch (_a) {
-                        resolve(undefined);
-                    }
-                }));
-                result = yield Promise.race([web3timeout, web3result]);
-                if (!result) {
-                    // Fallback provider failure scenario, use the server endpoint
-                    result = yield bridgeContract[functionName](...args);
-                }
-            }
-            return result;
-        });
-    }
     _fetchServer(serverPath, serverResponseJson, method = 'GET', requestBody) {
         return __awaiter(this, void 0, void 0, function* () {
             const apiResponse = yield fetch(`${this._getEndpoint()}/${serverPath}`, {