[SDK] Fix setting allowance or approvals gaslessly (#450)

thirdweb-dev · Dec 5, 2022 · cac6c30 · cac6c30
1 parent e7740a5
commit cac6c30
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/.changeset/shaggy-rings-compare.md b/.changeset/shaggy-rings-compare.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/sdk": patch
+---
+
+Fix setting allowance or approvals gaslessly
diff --git a/packages/sdk/src/evm/common/currency.ts b/packages/sdk/src/evm/common/currency.ts
@@ -124,7 +124,7 @@ export async function setErc20Allowance(
       signer || provider,
       currencyAddress,
       ERC20Abi,
-      {},
+      contractToApprove.options,
     );
 
     const owner = await contractToApprove.getSignerAddress();
@@ -151,7 +151,7 @@ export async function approveErc20Allowance(
     signer || provider,
     currencyAddress,
     ERC20Abi,
-    {},
+    contractToApprove.options,
   );
   const owner = await contractToApprove.getSignerAddress();
   const spender = contractToApprove.readContract.address;

diff --git a/packages/sdk/src/evm/common/marketplace.ts b/packages/sdk/src/evm/common/marketplace.ts
@@ -3,7 +3,6 @@ import {
   InterfaceId_IERC1155,
   InterfaceId_IERC721,
 } from "../constants/contract";
-import { SignerOrProvider } from "../core";
 import { ContractWrapper } from "../core/classes/contract-wrapper";
 import {
   NewAuctionListing,
@@ -76,24 +75,24 @@ export async function isTokenApprovedForTransfer(
 /**
  * Checks if the marketplace is approved to make transfers on the assetContract
  * If not, it tries to set the approval.
- * @param signerOrProvider
+ * @param contractWrapper
  * @param marketplaceAddress
  * @param assetContract
  * @param tokenId
  * @param from
  */
 export async function handleTokenApproval(
-  signerOrProvider: SignerOrProvider,
+  contractWrapper: ContractWrapper<any>,
   marketplaceAddress: string,
   assetContract: string,
   tokenId: BigNumberish,
   from: string,
 ): Promise<void> {
   const erc165 = new ContractWrapper<IERC165>(
-    signerOrProvider,
+    contractWrapper.getSignerOrProvider(),
     assetContract,
     ERC165Abi,
-    {},
+    contractWrapper.options,
   );
   const isERC721 = await erc165.readContract.supportsInterface(
     InterfaceId_IERC721,
@@ -104,10 +103,10 @@ export async function handleTokenApproval(
   // check for token approval
   if (isERC721) {
     const asset = new ContractWrapper<IERC721>(
-      signerOrProvider,
+      contractWrapper.getSignerOrProvider(),
       assetContract,
       ERC721Abi,
-      {},
+      contractWrapper.options,
     );
     const approved = await asset.readContract.isApprovedForAll(
       from,
@@ -127,10 +126,10 @@ export async function handleTokenApproval(
     }
   } else if (isERC1155) {
     const asset = new ContractWrapper<IERC1155>(
-      signerOrProvider,
+      contractWrapper.getSignerOrProvider(),
       assetContract,
       ERC1155Abi,
-      {},
+      contractWrapper.options,
     );
 
     const approved = await asset.readContract.isApprovedForAll(

diff --git a/packages/sdk/src/evm/core/classes/marketplace-auction.ts b/packages/sdk/src/evm/core/classes/marketplace-auction.ts
@@ -207,7 +207,7 @@ export class MarketplaceAuction {
     validateNewListingParam(listing);
 
     await handleTokenApproval(
-      this.contractWrapper.getSignerOrProvider(),
+      this.contractWrapper,
       this.getAddress(),
       listing.assetContractAddress,
       listing.tokenId,

diff --git a/packages/sdk/src/evm/core/classes/marketplace-direct.ts b/packages/sdk/src/evm/core/classes/marketplace-direct.ts
@@ -162,7 +162,7 @@ export class MarketplaceDirect {
     validateNewListingParam(listing);
 
     await handleTokenApproval(
-      this.contractWrapper.getSignerOrProvider(),
+      this.contractWrapper,
       this.getAddress(),
       listing.assetContractAddress,
       listing.tokenId,

diff --git a/packages/sdk/src/evm/core/classes/rpc-connection-handler.ts b/packages/sdk/src/evm/core/classes/rpc-connection-handler.ts
@@ -14,7 +14,7 @@ import EventEmitter from "eventemitter3";
 export class RPCConnectionHandler extends EventEmitter {
   private provider: providers.Provider;
   private signer: Signer | undefined;
-  protected readonly options: SDKOptionsOutput;
+  public readonly options: SDKOptionsOutput;
 
   constructor(network: NetworkOrSignerOrProvider, options: SDKOptions) {
     super();