@0xsequence/marketplace-sdk 0.8.6 → 0.8.8

package/src/react/_internal/wagmi/__tests__/create-config.test.ts

@@ -8,9 +8,7 @@ import {
 	OrderbookKind,
 	type SdkConfig,
 } from '../../../../types';
-import { MissingConfigError } from '../../../../utils/_internal/error/transaction';
 import { createWagmiConfig } from '../create-config';
-import { getWaasConnectors } from '../get-connectors';
 
 describe('createWagmiConfig', () => {
 	let baseMarketplaceConfig: MarketplaceConfig;
@@ -18,6 +16,7 @@ describe('createWagmiConfig', () => {
 
 	beforeEach(() => {
 		baseMarketplaceConfig = {
+			projectId: 1,
 			cssString: '',
 			manifestUrl: '',
 			publisherId: 'test-publisher',
@@ -97,9 +96,7 @@ describe('createWagmiConfig', () => {
 
 			const sdkConfig: SdkConfig = {
 				...baseSdkConfig,
-				wallet: {
-					walletConnectProjectId: 'test-wc-project-id',
-				},
+				walletConnectProjectId: 'test-wc-project-id',
 			};
 
 			const config = createWagmiConfig(marketplaceConfig, sdkConfig);
@@ -108,6 +105,14 @@ describe('createWagmiConfig', () => {
 		});
 
 		it('should create config with embedded wallet setup', () => {
+			// Valid waas tenant key format - base64 encoded JSON string containing the actual key
+			const waasTenantKey = btoa(
+				JSON.stringify({
+					key: 'valid-waas-tenant-key',
+					projectId: 'test-project-id',
+				}),
+			);
+
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,
 				walletOptions: {
@@ -115,20 +120,17 @@ describe('createWagmiConfig', () => {
 					includeEIP6963Wallets: false,
 					walletType: MarketplaceWallet.EMBEDDED,
 					oidcIssuers: {},
+					waas: {
+						tenantKey: waasTenantKey,
+						emailEnabled: false,
+						providers: [],
+					},
 				},
 			};
 
 			const sdkConfig: SdkConfig = {
 				...baseSdkConfig,
-				wallet: {
-					embedded: {
-						waasConfigKey:
-							'eyJwcm9qZWN0SWQiOjEzNjM5LCJycGNTZXJ2ZXIiOiJodHRwczovL3dhYXMuc2VxdWVuY2UuYXBwIn0',
-						googleClientId: 'test-google-id',
-						appleClientId: 'test-apple-id',
-						appleRedirectURI: 'https://test.com/redirect',
-					},
-				},
+				walletConnectProjectId: 'test-wc-project-id',
 			};
 
 			const config = createWagmiConfig(marketplaceConfig, sdkConfig);
@@ -173,33 +175,6 @@ describe('createWagmiConfig', () => {
 	});
 
 	describe('failure cases', () => {
-		it('should throw error when trying to use embedded wallet without waasConfigKey', () => {
-			const sdkConfig: SdkConfig = {
-				...baseSdkConfig,
-				wallet: {
-					embedded: {
-						waasConfigKey: '',
-						googleClientId: 'test-google-id',
-						appleClientId: 'test-apple-id',
-						appleRedirectURI: 'https://test.com/redirect',
-					},
-				},
-			};
-
-			expect(() =>
-				getWaasConnectors({
-					...sdkConfig,
-					wallet: {
-						...sdkConfig.wallet,
-						embedded: {
-							...sdkConfig.wallet?.embedded,
-							waasConfigKey: '', // Empty waasConfigKey should trigger the error
-						},
-					},
-				}),
-			).toThrow(MissingConfigError);
-		});
-
 		it('should still create config when walletConnectProjectId is missing', () => {
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,

package/src/react/_internal/wagmi/create-config.ts

@@ -2,12 +2,8 @@ import { getDefaultChains } from '@0xsequence/connect';
 import { allNetworks, findNetworkConfig } from '@0xsequence/network';
 import type { Chain, Transport } from 'viem';
 import { http, cookieStorage, createConfig, createStorage } from 'wagmi';
-import {
-	type Env,
-	type MarketplaceConfig,
-	MarketplaceWallet,
-	type SdkConfig,
-} from '../../../types';
+import type { Env, SdkConfig } from '../../../types';
+import type { MarketplaceConfig } from '../../queries/marketplaceConfig';
 import { DEFAULT_NETWORK } from '../consts';
 import { getConnectors } from './get-connectors';
 
@@ -24,16 +20,7 @@ export const createWagmiConfig = (
 		nodeGatewayEnv,
 	);
 
-	let walletType = marketplaceConfig.walletOptions.walletType;
-
-	// TODO: This will bring issues.. But we relay on the waasConfigKey to detect if the boilerplates should use
-	// waas or universal.. we need to find a better way to do this..
-	if (
-		sdkConfig.wallet?.embedded?.waasConfigKey &&
-		walletType !== MarketplaceWallet.ECOSYSTEM
-	) {
-		walletType = MarketplaceWallet.EMBEDDED;
-	}
+	const walletType = marketplaceConfig.walletOptions.walletType;
 
 	const connectors = getConnectors({
 		marketplaceConfig,

package/src/react/_internal/wagmi/get-connectors.ts

@@ -17,13 +17,10 @@ import {
 } from '@0xsequence/connect';
 import React, { type FunctionComponent } from 'react';
 import type { CreateConnectorFn } from 'wagmi';
-import {
-	type Env,
-	type MarketplaceConfig,
-	MarketplaceWallet,
-	type SdkConfig,
-} from '../../../types';
+import type { Env, SdkConfig } from '../../../types';
 import { MissingConfigError } from '../../../utils/_internal/error/transaction';
+import type { MarketplaceConfig } from '../../queries/marketplaceConfig';
+import { MarketplaceWallet } from '../api/builder.gen';
 import { DEFAULT_NETWORK } from '../consts';
 
 export function getConnectors({
@@ -40,7 +37,7 @@ export function getConnectors({
 	if (walletType === MarketplaceWallet.UNIVERSAL) {
 		connectors.push(...getUniversalWalletConfigs(sdkConfig, marketplaceConfig));
 	} else if (walletType === MarketplaceWallet.EMBEDDED) {
-		connectors.push(...getWaasConnectors(sdkConfig));
+		connectors.push(...getWaasConnectors(sdkConfig, marketplaceConfig));
 	} else if (walletType === MarketplaceWallet.ECOSYSTEM) {
 		connectors.push(getEcosystemConnector(marketplaceConfig, sdkConfig));
 	} else {
@@ -57,7 +54,7 @@ function commonConnectors(
 	const wallets = [];
 	const { title: appName } = marketplaceConfig;
 	const walletOptions = marketplaceConfig.walletOptions;
-	const walletConnectProjectId = sdkConfig.wallet?.walletConnectProjectId;
+	const walletConnectProjectId = sdkConfig.walletConnectProjectId;
 
 	if (walletOptions.connectors.includes('coinbase')) {
 		wallets.push(
@@ -110,23 +107,36 @@ function getUniversalWalletConfigs(
 	] as const;
 }
 
-export function getWaasConnectors(sdkConfig: SdkConfig): Wallet[] {
-	const { projectAccessKey } = sdkConfig;
+export function getWaasConnectors(
+	config: SdkConfig,
+	marketplaceConfig: MarketplaceConfig,
+): Wallet[] {
+	const { projectAccessKey } = config;
 
-	const waasConfigKey = sdkConfig.wallet?.embedded?.waasConfigKey;
+	const waasConfigKey = marketplaceConfig.walletOptions.waas?.tenantKey;
 
-	if (!waasConfigKey) throw new MissingConfigError('waasConfigKey');
+	if (!waasConfigKey)
+		throw new MissingConfigError(
+			'Embedded wallet config is missing, please check your access key',
+		);
 
-	const { googleClientId, appleClientId, appleRedirectURI } =
-		sdkConfig.wallet?.embedded || {};
+	const waasOptions = marketplaceConfig.walletOptions.oidcIssuers;
+	const googleClientId = waasOptions.google;
+	const appleClientId = waasOptions.apple;
+	const appleRedirectURI = globalThis.window
+		? `https://${globalThis.window?.location?.origin}${globalThis.window?.location?.pathname}`
+		: undefined;
 
-	const wallets: Wallet[] = [
-		emailWaas({
-			projectAccessKey,
-			waasConfigKey,
-			network: DEFAULT_NETWORK,
-		}),
-	];
+	const wallets: Wallet[] = [];
+
+	if (marketplaceConfig.walletOptions.waas?.emailEnabled) {
+		wallets.push(
+			emailWaas({
+				projectAccessKey,
+				waasConfigKey,
+			}),
+		);
+	}
 
 	if (googleClientId) {
 		wallets.push(

package/src/react/_internal/wallet/__tests__/wallet.test.ts

@@ -3,8 +3,10 @@ import { server } from '@test';
 import {
 	type Account,
 	type Address,
+	BaseError,
 	type Chain,
 	type PublicClient,
+	UserRejectedRequestError as ViemUserRejectedRequestError,
 	type WalletClient,
 	hexToBigInt,
 } from 'viem';
@@ -264,6 +266,21 @@ describe('wallet', () => {
 				walletInstance.handleSignMessageStep(mockSignatureStep),
 			).rejects.toThrow(TransactionSignatureError);
 		});
+
+		it('should throw UserRejectedRequestError when user rejects signature', async () => {
+			const error = new TransactionSignatureError(
+				StepType.signEIP191,
+				new ViemUserRejectedRequestError(
+					new BaseError('User rejected request', {
+						cause: new Error('User rejected request'),
+					}),
+				),
+			);
+			vi.mocked(mockWalletClient.signMessage).mockRejectedValueOnce(error);
+			await expect(
+				walletInstance.handleSignMessageStep(mockSignatureStep),
+			).rejects.toThrow(UserRejectedRequestError);
+		});
 	});
 
 	describe('handleSendTransactionStep', () => {
@@ -315,6 +332,19 @@ describe('wallet', () => {
 			).rejects.toThrow(TransactionExecutionError);
 		});
 
+		it('should throw UserRejectedRequestError when user rejects transaction', async () => {
+			const error = new TransactionExecutionError(
+				StepType.buy,
+				new ViemUserRejectedRequestError(
+					new BaseError('User rejected request'),
+				),
+			);
+			vi.mocked(mockWalletClient.sendTransaction).mockRejectedValueOnce(error);
+			await expect(
+				walletInstance.handleSendTransactionStep(1, mockTxStep),
+			).rejects.toThrow(UserRejectedRequestError);
+		});
+
 		it('should handle transaction with contract interaction', async () => {
 			const mockContractTxStep: TransactionStep = {
 				id: StepType.buy,

package/src/react/_internal/wallet/wallet.ts

@@ -2,11 +2,13 @@ import type { TransactionReceipt } from '@0xsequence/indexer';
 import {
 	type Account,
 	type Address,
+	BaseError,
 	type Chain,
 	type Hex,
 	type PublicClient,
 	TransactionReceiptNotFoundError,
 	type TypedDataDomain,
+	UserRejectedRequestError as ViemUserRejectedRequestError,
 	type WalletClient as ViemWalletClient,
 	WaitForTransactionReceiptTimeoutError,
 	custom,
@@ -59,6 +61,7 @@ export interface WalletInstance {
 		contractAddress: Address;
 		spender: Address | 'sequenceMarketV1' | 'sequenceMarketV2';
 	}) => Promise<bigint | boolean>;
+	publicClient: PublicClient;
 }
 
 const isSequenceWallet = (connector: Connector) =>
@@ -147,8 +150,17 @@ export const wallet = ({
 						message: stepItem.signature!.value,
 					});
 				}
-			} catch (error) {
+			} catch (e) {
+				const error = e as TransactionSignatureError;
 				logger.error('Signature failed', error);
+
+				if (error.cause instanceof BaseError) {
+					const viemError = error.cause as BaseError;
+					if (viemError instanceof ViemUserRejectedRequestError) {
+						throw new UserRejectedRequestError();
+					}
+				}
+
 				throw new TransactionSignatureError(stepItem.id, error as Error);
 			}
 		},
@@ -180,8 +192,17 @@ export const wallet = ({
 						gas: hexToBigInt(stepItem.gas),
 					}),
 				});
-			} catch (error) {
+			} catch (e) {
+				const error = e as TransactionExecutionError;
 				logger.error('Transaction failed', error);
+
+				if (error.cause instanceof BaseError) {
+					const viemError = error.cause as BaseError;
+					if (viemError instanceof ViemUserRejectedRequestError) {
+						throw new UserRejectedRequestError();
+					}
+				}
+
 				throw new TransactionExecutionError(stepItem.id, error as Error);
 			}
 		},
@@ -197,6 +218,7 @@ export const wallet = ({
 				return receipt;
 			} catch (error) {
 				logger.error('Transaction confirmation failed', error);
+
 				throw new TransactionConfirmationError(txHash, error as Error);
 			}
 		},
@@ -243,6 +265,7 @@ export const wallet = ({
 					throw new Error('Unsupported contract type for approval checking');
 			}
 		},
+		publicClient,
 	};
 
 	return walletInstance;

package/src/react/hooks/__tests__/__snapshots__/useMarketplaceConfig.test.tsx.snap

@@ -0,0 +1,96 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`useMarketplaceConfig > should fetch marketplace config and styles successfully 1`] = `
+{
+  "bannerUrl": "",
+  "collections": [
+    {
+      "address": "0x0000000000000000000000000000000000000000",
+      "bannerUrl": "",
+      "chainId": 1,
+      "currencyOptions": [
+        "0x0000000000000000000000000000000000000000",
+        "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      ],
+      "destinationMarketplace": "sequence_marketplace_v2",
+      "exchanges": [],
+      "feePercentage": 3.5,
+      "filterSettings": {
+        "exclusions": [
+          {
+            "condition": "SPECIFIC_VALUE",
+            "key": "Type",
+            "value": "Sample",
+          },
+        ],
+        "filterOrder": [
+          "Type",
+          "Rarity",
+        ],
+      },
+      "marketplaceType": "ORDERBOOK",
+    },
+    {
+      "address": "0x1234567890123456789012345678901234567890",
+      "bannerUrl": "https://example.com/collection-banner.png",
+      "chainId": 137,
+      "currencyOptions": [
+        "0x0000000000000000000000000000000000000000",
+      ],
+      "destinationMarketplace": "opensea",
+      "exchanges": [],
+      "feePercentage": 2.5,
+      "filterSettings": {
+        "exclusions": [
+          {
+            "condition": "ENTIRE_KEY",
+            "key": "Category",
+          },
+          {
+            "condition": "SPECIFIC_VALUE",
+            "key": "Level",
+            "value": "Legendary",
+          },
+        ],
+        "filterOrder": [
+          "Category",
+          "Level",
+          "Element",
+        ],
+      },
+      "marketplaceType": "ORDERBOOK",
+    },
+  ],
+  "cssString": "
+  .marketplace-theme {
+    --primary-color: #000000;
+  }
+",
+  "faviconUrl": "https://example.com/favicon.png",
+  "landingBannerUrl": "https://example.com/banner.png",
+  "landingPageLayout": "default",
+  "logoUrl": "https://example.com/logo.png",
+  "manifestUrl": "https://api.sequence.build/marketplace//manifest.json",
+  "projectId": 1,
+  "publisherId": "test-publisher",
+  "shortDescription": "A test marketplace",
+  "socials": {
+    "discord": "https://discord.com/test",
+    "instagram": "https://instagram.com/test",
+    "tiktok": "",
+    "twitter": "https://twitter.com/test",
+    "website": "",
+    "youtube": "",
+  },
+  "title": "Test Marketplace",
+  "walletOptions": {
+    "connectors": [
+      "coinbase",
+      "walletconnect",
+    ],
+    "includeEIP6963Wallets": true,
+    "oidcIssuers": {},
+    "walletType": "UNIVERSAL",
+  },
+}
+`;

package/src/react/hooks/__tests__/useCollection.test.tsx

@@ -3,7 +3,7 @@ import { http, HttpResponse } from 'msw';
 import { zeroAddress } from 'viem';
 import { describe, expect, it } from 'vitest';
 import {
-	mockContractInfo,
+	mockEthCollection,
 	mockMetadataEndpoint,
 } from '../../_internal/api/__mocks__/metadata.msw';
 import type { UseCollectionArgs } from '../useCollection';
@@ -11,9 +11,8 @@ import { useCollection } from '../useCollection';
 
 describe('useCollection', () => {
 	const defaultArgs: UseCollectionArgs = {
-		chainId: 1,
-		collectionAddress: zeroAddress,
-		query: {},
+		chainId: mockEthCollection.chainId,
+		collectionAddress: mockEthCollection.address,
 	};
 
 	it('should fetch collection data successfully', async () => {
@@ -29,7 +28,7 @@ describe('useCollection', () => {
 		});
 
 		// Verify the data matches our mock
-		expect(result.current.data).toEqual(mockContractInfo);
+		expect(result.current.data).toEqual(mockEthCollection);
 		expect(result.current.error).toBeNull();
 	});
 

package/src/react/hooks/__tests__/useCurrencies.test.tsx

@@ -2,11 +2,11 @@ import { renderHook, server, waitFor } from '@test';
 import { USDC_ADDRESS } from '@test/const';
 import { http, HttpResponse } from 'msw';
 import { describe, expect, it } from 'vitest';
+import { mockConfig } from '../../_internal/api/__mocks__/builder.msw';
 import {
 	mockCurrencies,
 	mockMarketplaceEndpoint,
 } from '../../_internal/api/__mocks__/marketplace.msw';
-import { mockConfig } from '../options/__mocks__/marketplaceConfig.msw';
 import { useCurrencies } from '../useCurrencies';
 
 describe('useCurrencies', () => {

package/src/react/hooks/__tests__/useInventory.test.tsx

@@ -2,6 +2,10 @@ import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
 import { zeroAddress } from 'viem';
 import { beforeEach, describe, expect, it } from 'vitest';
+import {
+	createLookupMarketplaceConfigHandler,
+	mockConfig,
+} from '../../_internal/api/__mocks__/builder.msw';
 import {
 	mockIndexerEndpoint,
 	mockTokenBalance,
@@ -11,7 +15,6 @@ import {
 	mockMarketplaceEndpoint,
 } from '../../_internal/api/__mocks__/marketplace.msw';
 import type { UseInventoryArgs } from '../../queries/inventory';
-import { mockConfig } from '../options/__mocks__/marketplaceConfig.msw';
 import { useInventory } from '../useInventory';
 
 // Make sure mockCollectibleOrder has a tokenId of "1" for tests
@@ -128,21 +131,17 @@ describe('useInventory', () => {
 	it('should use isLaos721 flag from marketplaceConfig', async () => {
 		// Setup config with LAOS collection
 		const laosCollectionAddress = '0x1234567890123456789012345678901234567890';
-		server.use(
-			http.get('*/marketplace/*/settings.json', () => {
-				const configWithLaos = {
-					...mockConfig,
-					collections: [
-						{
-							...mockConfig.collections[0],
-							address: laosCollectionAddress,
-							isLAOSERC721: true,
-						},
-					],
-				};
-				return HttpResponse.json(configWithLaos);
-			}),
-		);
+		const configWithLaos = {
+			...mockConfig,
+			collections: [
+				{
+					...mockConfig.collections[0],
+					address: laosCollectionAddress,
+					isLAOSERC721: true,
+				},
+			],
+		};
+		server.use(createLookupMarketplaceConfigHandler(configWithLaos));
 
 		const laosArgs: UseInventoryArgs = {
 			...defaultArgs,