Mark token info as non-optional in v2 sanction

Author: fang377

packages/checkout/sdk/src/riskAssessment/riskAssessment.ts

@@ -24,15 +24,15 @@ export type AssessmentResult = {
 
 // New type for v2 request items
 type SanctionsCheckV2RequestItem = {
-  address?: string;
-  amount?: string;
-  token_addr?: string;
+  address: string;
+  amount: string;
+  token_addr: string;
 };
 
 export const fetchRiskAssessment = async (
   addresses: string[],
   config: CheckoutConfiguration,
-  tokenData?: Array<{ address: string; tokenAddr?: string; amount?: string }>,
+  tokenData: Array<{ address: string; tokenAddr: string; amount: string }>,
 ): Promise<AssessmentResult> => {
   const result = Object.fromEntries(
     addresses.map((address) => [address.toLowerCase(), { sanctioned: false }]),
@@ -51,15 +51,17 @@ export const fetchRiskAssessment = async (
 
     // Prepare v2 request payload
     const requestPayload: SanctionsCheckV2RequestItem[] = addresses.map((address) => {
-      const item: SanctionsCheckV2RequestItem = { address };
-
-      // Add token and amount data if available
-      if (tokenData) {
-        const tokenInfo = tokenData.find((t) => t.address.toLowerCase() === address.toLowerCase());
-        if (tokenInfo) {
-          if (tokenInfo.tokenAddr) item.token_addr = tokenInfo.tokenAddr;
-          if (tokenInfo.amount) item.amount = tokenInfo.amount;
-        }
+      const item: SanctionsCheckV2RequestItem = { 
+        address,
+        token_addr: '',
+        amount: '0'
+      };
+
+      // Add token and amount data
+      const tokenInfo = tokenData.find((t) => t.address.toLowerCase() === address.toLowerCase());
+      if (tokenInfo) {
+        item.token_addr = tokenInfo.tokenAddr;
+        item.amount = tokenInfo.amount;
       }
 
       return item;

packages/checkout/sdk/src/sdk.ts

@@ -228,12 +228,12 @@ export class Checkout {
   /**
    * Fetches risk assessment for the given addresses.
    * @param {string[]} addresses - The addresses to assess.
-   * @param {Array<{address: string; tokenAddr?: string; amount?: string}>} [tokenData] - Optional token and amount data for each address.
+   * @param {Array<{address: string; tokenAddr: string; amount: string}>} tokenData - Required token and amount data for each address.
    * @returns {Promise<AssessmentResult>} - A promise that resolves to the risk assessment result.
    */
   public async getRiskAssessment(
     addresses: string[],
-    tokenData?: Array<{ address: string; tokenAddr?: string; amount?: string }>,
+    tokenData: Array<{ address: string; tokenAddr: string; amount: string }>,
   ): Promise<AssessmentResult> {
     return await fetchRiskAssessment(addresses, this.config, tokenData);
   }

packages/checkout/widgets-lib/src/functions/checkSanctionedAddresses.ts

@@ -7,7 +7,7 @@ import {
 export const checkSanctionedAddresses = async (
   addresses: string[],
   config: CheckoutConfiguration,
-  tokenData?: Array<{ address: string; tokenAddr?: string; amount?: string }>,
+  tokenData: Array<{ address: string; tokenAddr: string; amount: string }>,
 ): Promise<boolean> => {
   const result = await fetchRiskAssessment(addresses, config, tokenData);
   return isAddressSanctioned(result, undefined);

packages/checkout/widgets-lib/src/widgets/add-tokens/views/AddTokens.tsx

@@ -428,11 +428,11 @@ export function AddTokens({
       && (await checkSanctionedAddresses(
         [toAddress],
         checkout.config,
-        selectedToken?.address && selectedAmount ? [{
+        [{
           address: toAddress,
-          tokenAddr: selectedToken.address,
-          amount: selectedAmount,
-        }] : undefined,
+          tokenAddr: selectedToken?.address || '',
+          amount: selectedAmount || '0',
+        }],
       ))
     ) {
       viewDispatch({
@@ -510,18 +510,18 @@ export function AddTokens({
       && (await checkSanctionedAddresses(
         [fromAddress, toAddress],
         checkout.config,
-        selectedToken?.address && selectedAmount ? [
+        [
           {
             address: fromAddress,
-            tokenAddr: selectedToken.address,
-            amount: selectedAmount,
+            tokenAddr: selectedToken?.address || '',
+            amount: selectedAmount || '0',
           },
           {
             address: toAddress,
-            tokenAddr: selectedToken.address,
-            amount: selectedAmount,
+            tokenAddr: selectedToken?.address || '',
+            amount: selectedAmount || '0',
           },
-        ] : undefined,
+        ],
       ))
     ) {
       viewDispatch({

packages/checkout/widgets-lib/src/widgets/bridge/components/BridgeForm.tsx

@@ -188,19 +188,19 @@ export function BridgeForm(props: BridgeFormProps) {
         addresses.push(to.walletAddress);
       }
 
-      // Prepare token data for v2 API if available
-      const tokenData = formToken && formAmount ? [
+      // Prepare token data for v2 API - now required
+      const tokenData = [
         {
           address: from.walletAddress,
-          tokenAddr: formToken.token.address,
-          amount: formAmount,
+          tokenAddr: formToken?.token.address || '',
+          amount: formAmount || '0',
         },
         ...(to.walletAddress.toLowerCase() !== from.walletAddress.toLowerCase() ? [{
           address: to.walletAddress,
-          tokenAddr: formToken.token.address,
-          amount: formAmount,
+          tokenAddr: formToken?.token.address || '',
+          amount: formAmount || '0',
         }] : []),
-      ] : undefined;
+      ];
 
       const assessment = await fetchRiskAssessment(addresses, checkout.config, tokenData);
       bridgeDispatch({

packages/checkout/widgets-lib/src/widgets/on-ramp/views/OnRampMain.tsx

@@ -231,12 +231,12 @@ export function OnRampMain({
     (async () => {
       const walletAddress = await (await provider.getSigner()).getAddress();
 
-      // Prepare token data for v2 API if available
-      const tokenData = tokenAddress && tokenAmount ? [{
+      // Prepare token data for v2 API - now required
+      const tokenData = [{
         address: walletAddress,
-        tokenAddr: tokenAddress,
-        amount: tokenAmount,
-      }] : undefined;
+        tokenAddr: tokenAddress || '',
+        amount: tokenAmount || '0',
+      }];
 
       const assessment = await fetchRiskAssessment([walletAddress], checkout.config, tokenData);
 

packages/checkout/widgets-lib/src/widgets/sale/context/SaleContextProvider.tsx

@@ -257,13 +257,15 @@ export function SaleContextProvider(props: {
         return;
       }
 
-      // Prepare token data for v2 API if available
+      // Prepare token data for v2 API - now required
       // Use selectedCurrency and orderQuote to get token address and amount when they exist
-      const tokenData = selectedCurrency?.address && orderQuote.totalAmount[selectedCurrency.name] ? [{
+      const tokenData = [{
         address,
-        tokenAddr: selectedCurrency.address,
-        amount: orderQuote.totalAmount[selectedCurrency.name].amount.toString(),
-      }] : undefined;
+        tokenAddr: selectedCurrency?.address || '',
+        amount: (selectedCurrency?.address && orderQuote.totalAmount[selectedCurrency.name]) 
+          ? orderQuote.totalAmount[selectedCurrency.name].amount.toString() 
+          : '0',
+      }];
 
       const assessment = await fetchRiskAssessment([address], checkout.config, tokenData);
       setRiskAssessment(assessment);

packages/checkout/widgets-lib/src/widgets/swap/SwapWidget.tsx

@@ -205,12 +205,12 @@ export default function SwapWidget({
         return;
       }
 
-      // Prepare token data for v2 API if available
-      const tokenData = fromTokenAddress && amount ? [{
+      // Prepare token data for v2 API - now required
+      const tokenData = [{
         address,
-        tokenAddr: fromTokenAddress,
-        amount,
-      }] : undefined;
+        tokenAddr: fromTokenAddress || '',
+        amount: amount || '0',
+      }];
 
       const assessment = await fetchRiskAssessment([address], checkout.config, tokenData);
       swapDispatch({