thirdweb 5.73.1-nightly-33c23e789e577bd6463e135cec4e25cfcfc9964a-20241205000340 → 5.75.0-nightly-ec84ed37d6db8281d3afb12bc47a20ccc5fe9713-20241207000341

package/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdraw.ts

@@ -0,0 +1,159 @@
+import type { AbiParameterToPrimitiveType } from "abitype";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../../transaction/types.js";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
+import { once } from "../../../../../utils/promise/once.js";
+import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+
+/**
+ * Represents the parameters for the "withdraw" function.
+ */
+export type WithdrawParams = WithOverrides<{
+  to: AbiParameterToPrimitiveType<{ type: "address"; name: "to" }>;
+  token: AbiParameterToPrimitiveType<{ type: "address"; name: "token" }>;
+  amount: AbiParameterToPrimitiveType<{ type: "uint256"; name: "amount" }>;
+}>;
+
+export const FN_SELECTOR = "0xd9caed12" as const;
+const FN_INPUTS = [
+  {
+    type: "address",
+    name: "to",
+  },
+  {
+    type: "address",
+    name: "token",
+  },
+  {
+    type: "uint256",
+    name: "amount",
+  },
+] as const;
+const FN_OUTPUTS = [] as const;
+
+/**
+ * Checks if the `withdraw` method is supported by the given contract.
+ * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
+ * @returns A boolean indicating if the `withdraw` method is supported.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { isWithdrawSupported } from "thirdweb/extensions/erc7579";
+ *
+ * const supported = isWithdrawSupported(["0x..."]);
+ * ```
+ */
+export function isWithdrawSupported(availableSelectors: string[]) {
+  return detectMethod({
+    availableSelectors,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+  });
+}
+
+/**
+ * Encodes the parameters for the "withdraw" function.
+ * @param options - The options for the withdraw function.
+ * @returns The encoded ABI parameters.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { encodeWithdrawParams } from "thirdweb/extensions/erc7579";
+ * const result = encodeWithdrawParams({
+ *  to: ...,
+ *  token: ...,
+ *  amount: ...,
+ * });
+ * ```
+ */
+export function encodeWithdrawParams(options: WithdrawParams) {
+  return encodeAbiParameters(FN_INPUTS, [
+    options.to,
+    options.token,
+    options.amount,
+  ]);
+}
+
+/**
+ * Encodes the "withdraw" function into a Hex string with its parameters.
+ * @param options - The options for the withdraw function.
+ * @returns The encoded hexadecimal string.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { encodeWithdraw } from "thirdweb/extensions/erc7579";
+ * const result = encodeWithdraw({
+ *  to: ...,
+ *  token: ...,
+ *  amount: ...,
+ * });
+ * ```
+ */
+export function encodeWithdraw(options: WithdrawParams) {
+  // we do a "manual" concat here to avoid the overhead of the "concatHex" function
+  // we can do this because we know the specific formats of the values
+  return (FN_SELECTOR +
+    encodeWithdrawParams(options).slice(2)) as `${typeof FN_SELECTOR}${string}`;
+}
+
+/**
+ * Prepares a transaction to call the "withdraw" function on the contract.
+ * @param options - The options for the "withdraw" function.
+ * @returns A prepared transaction object.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { sendTransaction } from "thirdweb";
+ * import { withdraw } from "thirdweb/extensions/erc7579";
+ *
+ * const transaction = withdraw({
+ *  contract,
+ *  to: ...,
+ *  token: ...,
+ *  amount: ...,
+ *  overrides: {
+ *    ...
+ *  }
+ * });
+ *
+ * // Send the transaction
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function withdraw(
+  options: BaseTransactionOptions<
+    | WithdrawParams
+    | {
+        asyncParams: () => Promise<WithdrawParams>;
+      }
+  >,
+) {
+  const asyncOptions = once(async () => {
+    return "asyncParams" in options ? await options.asyncParams() : options;
+  });
+
+  return prepareContractCall({
+    contract: options.contract,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [
+        resolvedOptions.to,
+        resolvedOptions.token,
+        resolvedOptions.amount,
+      ] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+  });
+}

package/src/extensions/erc7579/__generated__/ModularAccountFactory/write/withdrawStake.ts

@@ -0,0 +1,137 @@
+import type { AbiParameterToPrimitiveType } from "abitype";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../../transaction/types.js";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
+import { once } from "../../../../../utils/promise/once.js";
+import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+
+/**
+ * Represents the parameters for the "withdrawStake" function.
+ */
+export type WithdrawStakeParams = WithOverrides<{
+  to: AbiParameterToPrimitiveType<{ type: "address"; name: "to" }>;
+}>;
+
+export const FN_SELECTOR = "0xc23a5cea" as const;
+const FN_INPUTS = [
+  {
+    type: "address",
+    name: "to",
+  },
+] as const;
+const FN_OUTPUTS = [] as const;
+
+/**
+ * Checks if the `withdrawStake` method is supported by the given contract.
+ * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
+ * @returns A boolean indicating if the `withdrawStake` method is supported.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { isWithdrawStakeSupported } from "thirdweb/extensions/erc7579";
+ *
+ * const supported = isWithdrawStakeSupported(["0x..."]);
+ * ```
+ */
+export function isWithdrawStakeSupported(availableSelectors: string[]) {
+  return detectMethod({
+    availableSelectors,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+  });
+}
+
+/**
+ * Encodes the parameters for the "withdrawStake" function.
+ * @param options - The options for the withdrawStake function.
+ * @returns The encoded ABI parameters.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { encodeWithdrawStakeParams } from "thirdweb/extensions/erc7579";
+ * const result = encodeWithdrawStakeParams({
+ *  to: ...,
+ * });
+ * ```
+ */
+export function encodeWithdrawStakeParams(options: WithdrawStakeParams) {
+  return encodeAbiParameters(FN_INPUTS, [options.to]);
+}
+
+/**
+ * Encodes the "withdrawStake" function into a Hex string with its parameters.
+ * @param options - The options for the withdrawStake function.
+ * @returns The encoded hexadecimal string.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { encodeWithdrawStake } from "thirdweb/extensions/erc7579";
+ * const result = encodeWithdrawStake({
+ *  to: ...,
+ * });
+ * ```
+ */
+export function encodeWithdrawStake(options: WithdrawStakeParams) {
+  // we do a "manual" concat here to avoid the overhead of the "concatHex" function
+  // we can do this because we know the specific formats of the values
+  return (FN_SELECTOR +
+    encodeWithdrawStakeParams(options).slice(
+      2,
+    )) as `${typeof FN_SELECTOR}${string}`;
+}
+
+/**
+ * Prepares a transaction to call the "withdrawStake" function on the contract.
+ * @param options - The options for the "withdrawStake" function.
+ * @returns A prepared transaction object.
+ * @extension ERC7579
+ * @example
+ * ```ts
+ * import { sendTransaction } from "thirdweb";
+ * import { withdrawStake } from "thirdweb/extensions/erc7579";
+ *
+ * const transaction = withdrawStake({
+ *  contract,
+ *  to: ...,
+ *  overrides: {
+ *    ...
+ *  }
+ * });
+ *
+ * // Send the transaction
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function withdrawStake(
+  options: BaseTransactionOptions<
+    | WithdrawStakeParams
+    | {
+        asyncParams: () => Promise<WithdrawStakeParams>;
+      }
+  >,
+) {
+  const asyncOptions = once(async () => {
+    return "asyncParams" in options ? await options.asyncParams() : options;
+  });
+
+  return prepareContractCall({
+    contract: options.contract,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.to] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+  });
+}

package/src/extensions/marketplace/direct-listings/direct-listings.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { ANVIL_CHAIN } from "../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
@@ -7,11 +7,18 @@ import {
   TEST_ACCOUNT_B,
   TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
-import { getContract } from "../../../contract/contract.js";
+import {
+  type ThirdwebContract,
+  getContract,
+} from "../../../contract/contract.js";
 import { parseEventLogs } from "../../../event/actions/parse-logs.js";
+import { getApprovalForTransaction } from "../../../extensions/erc20/write/getApprovalForTransaction.js";
 import { setApprovalForAll as setApprovalForAll721 } from "../../../extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.js";
 import { mintTo as mintToErc1155 } from "../../../extensions/erc1155/write/mintTo.js";
+import { deployERC20Contract } from "../../../extensions/prebuilts/deploy-erc20.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import { sendTransaction } from "../../../transaction/actions/send-transaction.js";
+import { resolvePromisedValue } from "../../../utils/promise/resolve-promised-value.js";
 import { balanceOf as balanceOfErc721 } from "../../erc721/__generated__/IERC721A/read/balanceOf.js";
 import { mintTo as mintToErc721 } from "../../erc721/write/mintTo.js";
 import { balanceOf as balanceOfErc1155 } from "../../erc1155/__generated__/IERC1155/read/balanceOf.js";
@@ -32,7 +39,11 @@ const chain = ANVIL_CHAIN;
 const client = TEST_CLIENT;
 
 describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
-  it("should work with ERC721 and ERC1155", async () => {
+  let marketplaceContract: ThirdwebContract;
+  let erc721Contract: ThirdwebContract;
+  let erc1155Contract: ThirdwebContract;
+
+  beforeAll(async () => {
     const marketplaceAddress = await deployMarketplaceContract({
       account: TEST_ACCOUNT_A,
       chain,
@@ -63,17 +74,17 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
       },
     });
 
-    const marketplaceContract = getContract({
+    marketplaceContract = getContract({
       address: marketplaceAddress,
       chain,
       client,
     });
-    const erc721Contract = getContract({
+    erc721Contract = getContract({
       address: erc721Address,
       chain,
       client,
     });
-    const erc1155Contract = getContract({
+    erc1155Contract = getContract({
       address: erc1155Address,
       chain,
       client,
@@ -119,9 +130,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
         }),
       }),
     ]);
-
     // ---- set up completed ---- //
+  }, 120_000);
 
+  it("should work with ERC721", async () => {
     // listings should be 0 length to start
     const [allListings, totalListingCount] = await Promise.all([
       getAllListings({
@@ -244,14 +256,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(nftBalanceOfAccountAAfterPurchase).toBe(1n);
     // expect the seller to no longer have the nft
     expect(nftBalanceOfAccountBAfterPurchase).toBe(0n);
+  }, 120_000);
 
-    /**
-     * ============ now do the same tests but for ERC1155 =============
-     */
-
+  it("should work with ERC1155", async () => {
     // this should fail because we're listing more than we have
     await expect(
-      sendAndConfirmTransaction({
+      sendTransaction({
         transaction: createListing({
           contract: marketplaceContract,
           assetContractAddress: erc1155Contract.address,
@@ -284,7 +294,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
       logs: receipt1155.logs,
     });
 
-    expect(listingEvents.length).toBe(1);
+    expect(listingEvents1155.length).toBe(1);
 
     // biome-ignore lint/style/noNonNullAssertion: OK in tests
     const listingEvent1155 = listingEvents1155[0]!;
@@ -384,5 +394,55 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
     expect(nft1155BalanceOfAccountAAfterPurchase).toBe(1n);
     // expect the seller to have one less 1155 token
     expect(nft1155BalanceOfAccountCAfterPurchase).toBe(99n);
-  });
+
+    /**
+     * buyFromListing transaction (for listing with ERC20 currency) should have proper erc20 value
+     * so that getApprovalForTransaction can work properly
+     */
+    const erc20Address = await deployERC20Contract({
+      chain,
+      client,
+      account: TEST_ACCOUNT_C,
+      type: "TokenERC20",
+      params: {
+        name: "MyToken",
+        contractURI: TEST_CONTRACT_URI,
+      },
+    });
+    await sendAndConfirmTransaction({
+      transaction: createListing({
+        contract: marketplaceContract,
+        assetContractAddress: erc1155Contract.address,
+        tokenId: 0n,
+        pricePerToken: "0.01",
+        quantity: 1n,
+        currencyContractAddress: erc20Address,
+      }),
+      account: TEST_ACCOUNT_C,
+    });
+    // get the last listing id
+    const _allListings = await getAllListings({
+      contract: marketplaceContract,
+    });
+    const latestListing = _allListings.at(-1);
+    expect(latestListing).toBeDefined();
+    if (!latestListing) {
+      throw new Error("Cannot get listings");
+    }
+    const buyListingTx = buyFromListing({
+      contract: marketplaceContract,
+      listingId: latestListing.id,
+      quantity: 1n,
+      recipient: TEST_ACCOUNT_C.address,
+    });
+    expect(await resolvePromisedValue(buyListingTx.erc20Value)).toStrictEqual({
+      amountWei: BigInt(1e16),
+      tokenAddress: erc20Address,
+    });
+    const approveTx = await getApprovalForTransaction({
+      transaction: buyListingTx,
+      account: TEST_ACCOUNT_A,
+    });
+    expect(approveTx).not.toBe(null);
+  }, 120_000);
 });

package/src/extensions/marketplace/direct-listings/write/buyFromListing.ts

@@ -66,6 +66,12 @@ export function buyFromListing(
             ? listing.pricePerToken * options.quantity
             : 0n,
           extraGas: 50_000n, // add extra gas to account for router call
+          erc20Value: isNativeTokenAddress(listing.currencyContractAddress)
+            ? undefined
+            : {
+                amountWei: listing.pricePerToken * options.quantity,
+                tokenAddress: listing.currencyContractAddress,
+              },
         },
       };
     },

package/src/extensions/pack/createNewPack.ts

@@ -13,6 +13,7 @@ import {
   createPack,
 } from "./__generated__/IPack/write/createPack.js";
 
+// biome-ignore lint/nursery/noEnum: fine here
 export enum PACK_TOKEN_TYPE {
   ERC20 = 0,
   ERC721 = 1,