Version Packages (#347)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/config.json

@@ -7,7 +7,7 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": [],
+  "ignore": ["e2e-cra-5", "e2e-next-12", "e2e-vite-3"],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "updateInternalDependents": "always",
     "onlyUpdatePeerDependentsWhenOutOfRange": true

.github/workflows/size.yml

@@ -15,3 +15,5 @@ jobs:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           strip-hash: "\\-(\\w{8})(?:\\.esm|\\.cjs)"
           minimum-change-threshold: 100
+          # exclude source maps, node modules and any test related files
+          exclude: "{**/*.map,**/node_modules/**,**/test/**}"

packages/auth/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @thirdweb-dev/auth
 
+## 2.0.23
+
 ## 2.0.22
 
 ## 2.0.21

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/auth",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "exports": {
     "./next": {
       "module": "./next/dist/thirdweb-dev-auth-next.esm.js",

packages/cli/CHANGELOG.md

@@ -1,5 +1,12 @@
 # thirdweb
 
+## 0.8.9
+
+### Patch Changes
+
+- Updated dependencies [[`21c21c1`](https://github.com/thirdweb-dev/js/commit/21c21c1adfd09b60ad563bfd4c308597140de33c), [`3522917`](https://github.com/thirdweb-dev/js/commit/352291791ee900e1500f84f095290497934d2f60)]:
+  - @thirdweb-dev/sdk@3.4.2
+
 ## 0.8.8
 
 ### Patch Changes

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thirdweb",
   "main": "dist/cli/index.js",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/react/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @thirdweb-dev/react
 
+## 3.4.2
+
+### Patch Changes
+
+- [#348](https://github.com/thirdweb-dev/js/pull/348) [`7d9a4c6`](https://github.com/thirdweb-dev/js/commit/7d9a4c6abcad1b4f43e431ce7b0b38db9016ea9a) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - [SOL] - add `useUpdateRoyaltySettings()` hook
+  [SOL] - change `useRoyalty()` hook -> `useRoyaltySettings()` for consistency
+
+- [#352](https://github.com/thirdweb-dev/js/pull/352) [`3522917`](https://github.com/thirdweb-dev/js/commit/352291791ee900e1500f84f095290497934d2f60) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - expose useExecuteAuctionSale and useAcceptDirectListingOffer
+
+- [#351](https://github.com/thirdweb-dev/js/pull/351) [`aabbb14`](https://github.com/thirdweb-dev/js/commit/aabbb149e81d6824015a4797b2b6c929ca359545) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - fix wallet connection during dev (hot reload)
+
 ## 3.4.1
 
 ### Patch Changes

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/react/src/evm/contexts/thirdweb-wallet.tsx

@@ -33,7 +33,17 @@ export const ThirdwebConnectedWalletProvider: React.FC<
   const { rpcUrlMap } = useThirdwebConfigContext();
 
   const [contextValue, setContextValue] =
-    useState<ThirdwebConnectedWalletContext>(INITIAL_CONTEXT_VALUE);
+    useState<ThirdwebConnectedWalletContext>({
+      ...INITIAL_CONTEXT_VALUE,
+      signer: signer ? signer : undefined,
+    });
+
+  useEffect(() => {
+    setContextValue((val) => ({
+      ...val,
+      signer: signer ? signer : undefined,
+    }));
+  }, [signer]);
 
   useEffect(() => {
     let s = signer;

packages/react/src/evm/hooks/async/marketplace.ts

@@ -3,7 +3,13 @@ import {
   requiredParamInvariant,
 } from "../../../core/query-utils/required-param";
 import { useSDKChainId } from "../../providers/base";
-import { BuyNowParams, MakeBidParams, MakeOfferParams } from "../../types";
+import {
+  AcceptDirectOffer,
+  BuyNowParams,
+  ExecuteAuctionSale,
+  MakeBidParams,
+  MakeOfferParams,
+} from "../../types";
 import {
   cacheKeys,
   invalidateContractAndBalances,
@@ -572,6 +578,120 @@ export function useMakeOffer(contract: RequiredParam<Marketplace>) {
   );
 }
 
+/**
+ * Accept an offer on a direct listing from an offeror, will accept the latest offer by the given offeror.
+ *
+ * @example
+ * ```jsx
+ * const Component = () => {
+ *   const {
+ *     mutate: acceptOffer,
+ *     isLoading,
+ *     error,
+ *   } = useAcceptDirectListingOffer(">>YourMarketplaceContractInstance<<");
+ *
+ *   if (error) {
+ *     console.error("failed to accept offer", error);
+ *   }
+ *
+ *   return (
+ *     <button
+ *       disabled={isLoading}
+ *       onClick={() => acceptOffer({ listingId: 1, addressOfOfferor: "0x..." })}
+ *     >
+ *       Accept offer
+ *     </button>
+ *   );
+ * };
+ * ```
+ *
+ * @param contract - an instance of a Marketplace contract
+ * @returns a mutation object that can be used to accept an offer on a direct listing
+ * @beta
+ */
+export function useAcceptDirectListingOffer(
+  contract: RequiredParam<Marketplace>,
+) {
+  const activeChainId = useSDKChainId();
+  const contractAddress = contract?.getAddress();
+  const queryClient = useQueryClient();
+  const walletAddress = useAddress();
+  return useMutation(
+    async (data: AcceptDirectOffer) => {
+      invariant(walletAddress, "no wallet connected, cannot make bid");
+      requiredParamInvariant(contract?.direct, "No Direct instance provided");
+      return await contract.direct.acceptOffer(
+        data.listingId,
+        data.addressOfOfferor,
+      );
+    },
+    {
+      onSettled: () =>
+        invalidateContractAndBalances(
+          queryClient,
+          contractAddress,
+          activeChainId,
+        ),
+    },
+  );
+}
+
+/**
+ * Execute an auction sale. Can only be executed once the auction has ended and the auction has a winning bid.
+ *
+ * @example
+ * ```jsx
+ * const Component = () => {
+ *   const {
+ *     mutate: executeAuctionSale,
+ *     isLoading,
+ *     error,
+ *   } = useExecuteAuctionSale(">>YourMarketplaceContractInstance<<");
+ *
+ *   if (error) {
+ *     console.error("failed to execute sale", error);
+ *   }
+ *
+ *   return (
+ *     <button
+ *       disabled={isLoading}
+ *       onClick={() => executeAuctionSale({ listingId: 1 })}
+ *     >
+ *       Execute sale
+ *     </button>
+ *   );
+ * };
+ * ```
+ *
+ * @param contract - an instance of a Marketplace contract
+ * @returns a mutation object that can be used to accept an offer on a direct listing
+ * @beta
+ */
+export function useExecuteAuctionSale(contract: RequiredParam<Marketplace>) {
+  const activeChainId = useSDKChainId();
+  const contractAddress = contract?.getAddress();
+  const queryClient = useQueryClient();
+  const walletAddress = useAddress();
+  return useMutation(
+    async (data: ExecuteAuctionSale) => {
+      invariant(walletAddress, "no wallet connected, cannot make bid");
+      requiredParamInvariant(
+        contract?.auction,
+        "No Auction marketplace instance provided",
+      );
+      return await contract.auction.executeSale(data.listingId);
+    },
+    {
+      onSettled: () =>
+        invalidateContractAndBalances(
+          queryClient,
+          contractAddress,
+          activeChainId,
+        ),
+    },
+  );
+}
+
 /**
  * Get all the offers for a listing
  *
@@ -583,6 +703,7 @@ export function useMakeOffer(contract: RequiredParam<Marketplace>) {
  *
  * @param contract - an instance of a Marketplace contract
  * @param listingId - the id of the listing to fetch offers for
+ * @beta
  */
 export function useOffers(
   contract: RequiredParam<Marketplace>,

packages/react/src/evm/providers/base.tsx

@@ -21,7 +21,7 @@ import {
 } from "@thirdweb-dev/sdk";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import { Signer } from "ethers";
-import { createContext, useContext, useEffect, useMemo } from "react";
+import { createContext, useContext, useEffect, useMemo, useState } from "react";
 import invariant from "tiny-invariant";
 
 interface TWSDKContext {
@@ -60,21 +60,36 @@ export const WrappedThirdwebSDKProvider: ComponentWithChildren<
 }) => {
   const { signer } = useThirdwebConnectedWalletContext();
 
-  const sdk = useMemo(() => {
+  const [sdk, setSDK] = useState<ThirdwebSDK>();
+
+  useEffect(() => {
     if (!desiredChainId || typeof window === "undefined") {
       return undefined;
     }
+
     const _sdk = new ThirdwebSDK(provider, sdkOptions, storageInterface);
+    // if we already have a signer from the wallet context, use it immediately
+    if (signer) {
+      _sdk.updateSignerOrProvider(signer);
+    }
+
     (_sdk as any)._constructedAt = Date.now();
     (_sdk as any)._chainId = desiredChainId;
-    return _sdk;
+    setSDK(_sdk);
+
+    // explicitly *not* passing the signer, if we have it we use it if we don't we don't
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [provider, sdkOptions, storageInterface, desiredChainId]);
 
   useEffect(() => {
-    if (signer && sdk && (sdk as any)._chainId === desiredChainId) {
-      sdk.updateSignerOrProvider(signer);
+    if (sdk && (sdk as any)._chainId === desiredChainId) {
+      if (signer) {
+        sdk.updateSignerOrProvider(signer);
+      } else {
+        sdk.updateSignerOrProvider(provider);
+      }
     }
-  }, [signer, sdk, desiredChainId]);
+  }, [signer, sdk, desiredChainId, provider]);
 
   const ctxValue = useMemo(
     () => ({

packages/react/src/evm/types.ts

@@ -217,6 +217,13 @@ export type MakeOfferParams = {
   pricePerToken: Price;
   quantity?: Amount;
 };
+export type AcceptDirectOffer = {
+  listingId: BigNumberish;
+  addressOfOfferor: string;
+};
+export type ExecuteAuctionSale = {
+  listingId: BigNumberish;
+};
 
 export type BuyNowParams<TListingType = ListingType> =
   TListingType extends ListingType.Direct

packages/react/src/solana/hooks/nft/useRoyaltySettings.ts

@@ -30,7 +30,7 @@ export function nftRoyaltyQuery(
  *
  * export default function Component() {
  *   const { program } = useProgram("{{program_address}}");
- *   const { data: royalty, isLoading } = useRoyalty(program);
+ *   const { data: royalty, isLoading } = useRoyaltySettings(program);
  *
  *   return (
  *     <p>{royalty}</p>
@@ -40,6 +40,6 @@ export function nftRoyaltyQuery(
  *
  * @public
  */
-export function useRoyalty(program: RequiredParam<NFTCollection | NFTDrop>) {
+export function useRoyaltySettings(program: RequiredParam<NFTCollection | NFTDrop>) {
   return useQuery(nftRoyaltyQuery(program));
 }

packages/react/src/solana/hooks/nft/useUpdateRoyaltySettings.ts

@@ -0,0 +1,47 @@
+import { createSOLProgramQueryKey } from "../../../core/query-utils/query-key";
+import {
+  requiredParamInvariant,
+  RequiredParam,
+} from "../../../core/query-utils/required-param";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import type { NFTCollection, NFTDrop } from "@thirdweb-dev/sdk/solana";
+
+/**
+ * Update the royalty for an NFT program
+ * @param program - The NFT program instance to update the royalty for
+ *
+ * @example
+ * ```jsx
+ * import { useProgram, useUpdateRoyaltySettings } from "@thirdweb-dev/react/solana";
+ *
+ * export default function Component() {
+ *   const { program } = useProgram("{{program_address}}");
+ *   const { mutateAsync: updateRoyalties, isLoading, error } = useUpdateRoyaltySettings(program);
+ *
+ *   return (
+ *     <button
+ *       onClick={() => updateRoyalties(300)}
+ *     >
+ *       Update Royalties
+ *     </button>
+ *   )
+ * }
+ * ```
+ *
+ * @public
+ */
+export function useUpdateRoyaltySettings(
+  program: RequiredParam<NFTCollection | NFTDrop>,
+) {
+  const queryClient = useQueryClient();
+  return useMutation(
+    async (sellerFeeBasisPoints: number) => {
+      requiredParamInvariant(program, "program is required");
+      return await program.updateRoyalty(sellerFeeBasisPoints);
+    },
+    {
+      onSettled: () =>
+        queryClient.invalidateQueries(createSOLProgramQueryKey(program)),
+    },
+  );
+}

packages/react/src/solana/index.ts

@@ -14,6 +14,8 @@ export * from "./hooks/program/useProgramAccountType";
 export * from "./hooks/nft/useNFTs";
 export * from "./hooks/nft/useTransferNFT";
 export * from "./hooks/nft/useBurnNFT";
+export * from "./hooks/nft/useRoyaltySettings";
+export * from "./hooks/nft/useUpdateRoyaltySettings";
 
 // NFT Collection
 export * from "./hooks/nft/collection/useMintNFT";

packages/sdk/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @thirdweb-dev/sdk
 
+## 3.4.2
+
+### Patch Changes
+
+- [#344](https://github.com/thirdweb-dev/js/pull/344) [`21c21c1`](https://github.com/thirdweb-dev/js/commit/21c21c1adfd09b60ad563bfd4c308597140de33c) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Update internal function resolveContractUriFromAddress -> resolveContractUriFromAddress
+
+- [#352](https://github.com/thirdweb-dev/js/pull/352) [`3522917`](https://github.com/thirdweb-dev/js/commit/352291791ee900e1500f84f095290497934d2f60) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Expose marketplace.auction.executeSale(listingId)
+
 ## 3.4.1
 
 ### Patch Changes

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/sdk",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "The main thirdweb SDK.",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk",
   "license": "Apache-2.0",

packages/sdk/src/evm/core/classes/contract-publisher.ts

@@ -195,13 +195,13 @@ export class ContractPublisher extends RPCConnectionHandler {
    * @internal
    * TODO clean this up (see method above, too)
    */
-  public async resolveReleasesFromAddress(address: string) {
+  public async resolveContractUriFromAddress(address: string) {
     const contractUri = await resolveContractUriFromAddress(
       address,
       this.getProvider(),
     );
     invariant(contractUri, "Could not resolve contract URI from address");
-    return await this.resolvePublishMetadataFromCompilerMetadata(contractUri);
+    return contractUri;
   }
 
   /**

packages/sdk/src/evm/core/classes/marketplace-auction.ts

@@ -26,9 +26,13 @@ import {
   Offer,
 } from "../../types/marketplace";
 import { TransactionResult, TransactionResultWithId } from "../types";
+import { ContractEncoder } from "./contract-encoder";
 import { ContractWrapper } from "./contract-wrapper";
 import type { IMarketplace, Marketplace } from "@thirdweb-dev/contracts-js";
-import { ListingAddedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/Marketplace";
+import {
+  ListingAddedEvent,
+  Marketplace as MarketplaceContract,
+} from "@thirdweb-dev/contracts-js/dist/declarations/src/Marketplace";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, ethers, constants } from "ethers";
 import invariant from "tiny-invariant";
@@ -40,6 +44,7 @@ import invariant from "tiny-invariant";
 export class MarketplaceAuction {
   private contractWrapper: ContractWrapper<Marketplace>;
   private storage: ThirdwebStorage;
+  public encoder: ContractEncoder<MarketplaceContract>;
 
   constructor(
     contractWrapper: ContractWrapper<Marketplace>,
@@ -47,6 +52,7 @@ export class MarketplaceAuction {
   ) {
     this.contractWrapper = contractWrapper;
     this.storage = storage;
+    this.encoder = new ContractEncoder<Marketplace>(contractWrapper);
   }
 
   getAddress(): string {
@@ -401,9 +407,9 @@ export class MarketplaceAuction {
   }
 
   /**
-   * Close the Auction
+   * Close the Auction for the buyer or the seller
    *
-   * @remarks Closes the Auction and executes the sale.
+   * @remarks Closes the Auction and executes the sale for the buyer or the seller.
    *
    * @example
    * ```javascript
@@ -442,6 +448,49 @@ export class MarketplaceAuction {
     }
   }
 
+  /**
+   * Execute the Auction Sale
+   *
+   * @remarks Closes the Auction and executes the sale for both parties.
+   *
+   * @example
+   * ```javascript
+   * // The listing ID of the auction listing you want to close
+   * const listingId = "0";
+   * await contract.auction.executeSale(listingId);
+   * ```
+   *
+   * @param listingId - the auction  listing ud to close
+   */
+  public async executeSale(listingId: BigNumberish) {
+    const listing = await this.validateListing(BigNumber.from(listingId));
+    try {
+      const winningBid = await this.getWinningBid(listingId);
+      invariant(winningBid, "No winning bid found");
+      const closeForSeller = this.encoder.encode("closeAuction", [
+        listingId,
+        listing.sellerAddress,
+      ]);
+      const closeForBuyer = this.encoder.encode("closeAuction", [
+        listingId,
+        winningBid.buyerAddress,
+      ]);
+      return await this.contractWrapper.multiCall([
+        closeForSeller,
+        closeForBuyer,
+      ]);
+    } catch (err: any) {
+      if (err.message.includes("cannot close auction before it has ended")) {
+        throw new AuctionHasNotEndedError(
+          listingId.toString(),
+          listing.endTimeInEpochSeconds.toString(),
+        );
+      } else {
+        throw err;
+      }
+    }
+  }
+
   /**
    * Update an Auction listing with new metadata
    * @param listing - the listing id to update

packages/sdk/test/evm/marketplace.test.ts

@@ -429,13 +429,7 @@ describe("Marketplace Contract", async () => {
         "The buyer should start with no tokens",
       );
 
-      await marketplaceContract.makeOffer(
-        directListingId,
-        10,
-        tokenAddress,
-        0.034,
-        new Date(Date.now() + 60 * 60 * 24 * 10 * 1000),
-      );
+      await marketplaceContract.makeOffer(directListingId, 0.034, 10);
 
       await sdk.updateSignerOrProvider(adminWallet);
       await marketplaceContract.direct.acceptOffer(
@@ -527,12 +521,7 @@ describe("Marketplace Contract", async () => {
       assert.equal(offer.listingId.toString(), directListingId.toString());
 
       sdk.updateSignerOrProvider(samWallet);
-      await marketplaceContract.makeOffer(
-        directListingId,
-        1,
-        tokenAddress,
-        "1",
-      );
+      await marketplaceContract.makeOffer(directListingId, 1, "1");
 
       const secondOffer = (await marketplaceContract.direct.getActiveOffer(
         directListingId,
@@ -610,21 +599,11 @@ describe("Marketplace Contract", async () => {
     it("should return all offers for a listing when queried", async () => {
       // make an offer as bob
       sdk.updateSignerOrProvider(bobWallet);
-      await marketplaceContract.makeOffer(
-        directListingId,
-        1,
-        tokenAddress,
-        "0.5",
-      );
+      await marketplaceContract.makeOffer(directListingId, "0.5", 1);
 
       // make an offer as sam
       sdk.updateSignerOrProvider(samWallet);
-      await marketplaceContract.makeOffer(
-        directListingId,
-        1,
-        tokenAddress,
-        "1",
-      );
+      await marketplaceContract.makeOffer(directListingId, "1", 1);
 
       // fetch all offers for the listing
       sdk.updateSignerOrProvider(adminWallet);