Merge pull request #580 from stakwork/feat/check_last_withdrawal

PR: Added Rate Limits To Withdrawal

cypress/e2e/29_paymentHistory.cy.ts

@@ -26,10 +26,12 @@ describe('It Lists all payments in history', () => {
     cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
+    // Comment out withdraw becuase of the 1 hour withdrwal intervals
+
     const depositAmount = 10000;
-    const withdrawAmount = 1000;
+    const withdrawAmount = 0;
     const paymentAmount = 500;
-    const afterWithdrawAmount = depositAmount - withdrawAmount;
+    // const afterWithdrawAmount = depositAmount - withdrawAmount;
     const finalPaymentAmount = depositAmount - withdrawAmount - paymentAmount;
 
     // add workspace budget
@@ -51,31 +53,34 @@ describe('It Lists all payments in history', () => {
         cy.get('body').click(0, 0);
       });
 
+    // Comment out withdraw becuase of the 1 hour withdrwal intervals
     // Withdraw workspace budget
-    cy.contains('Withdraw').click();
-    cy.wait(1000);
+    // cy.contains('Withdraw').click();
+    // cy.wait(1000);
+
+    // cy.contains("Cannot withdraw: your last withdrawal is less than an hour");
 
     // generate lightning invoice and withdraw from workspace
-    cy.add_invoice({ amount: withdrawAmount }).then((res: any) => {
-      const invoice = res?.body.bolt11;
-      cy.get('[data-testid="withdrawInvoiceInput"]').type(invoice);
-      cy.contains('Confirm').click();
-      cy.wait(1000);
+    // cy.add_invoice({ amount: withdrawAmount }).then((res: any) => {
+    //   const invoice = res?.body.bolt11;
+    //   cy.get('[data-testid="withdrawInvoiceInput"]').type(invoice);
+    //   cy.contains('Confirm').click();
+    //   cy.wait(1000);
 
-      cy.contains('You are about to withdraw');
-      cy.get('[data-testid="confirm-withdraw"]').click();
-      cy.wait(2000);
+    //   cy.contains('You are about to withdraw');
+    //   cy.get('[data-testid="confirm-withdraw"]').click();
+    //   cy.wait(2000);
 
-      cy.contains('Successfully Withdraw');
-      cy.contains(`${withdrawAmount.toLocaleString()} SATS`);
-      cy.get('body').click(0, 0);
-      cy.wait(1000);
+    //   cy.contains('Successfully Withdraw');
+    //   cy.contains(`${withdrawAmount.toLocaleString()} SATS`);
+    //   cy.get('body').click(0, 0);
+    //   cy.wait(1000);
 
-      cy.contains(afterWithdrawAmount.toLocaleString()).should('exist', { timeout: 2000 });
-      cy.wait(500);
-    });
+    //   cy.contains(afterWithdrawAmount.toLocaleString()).should('exist', { timeout: 2000 });
+    //   cy.wait(500);
+    // });
 
-    cy.wait(1000);
+    // cy.wait(1000);
 
     //  create and pay bounty
     const bounty: Cypress.Bounty = {
@@ -124,12 +129,13 @@ describe('It Lists all payments in history', () => {
     cy.contains('History').click({ force: true });
     cy.wait(1000);
 
+    // Comment out withdraw becuase of the 1 hour withdrwal intervals
     cy.contains('Deposit');
     cy.contains('Payment');
-    cy.contains('Withdraw');
+    // cy.contains('Withdraw');
 
     cy.contains(formatSat(paymentAmount));
-    cy.contains(formatSat(withdrawAmount));
+    // cy.contains(formatSat(withdrawAmount));
     cy.contains(formatSat(depositAmount));
 
     // close the bounty

cypress/e2e/42_rolesWithdrawWorkspace.cy.ts

@@ -87,7 +87,7 @@ describe('Withdraw From Workspace Role Test', () => {
     cy.wait(1000);
 
     //Assert that 'Past your invoice' is visible
-    cy.contains('Paste your invoice').should('be.visible');
+    cy.contains('Cannot withdraw: your last withdrawal is less than an hour').should('be.visible');
     cy.wait(1000);
 
     cy.get('body').click(0, 0);

src/people/utils/AssignBounty.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { ConnectCardProps } from 'people/interfaces';
 import { useStores } from 'store';
 import { EuiGlobalToastList } from '@elastic/eui';
@@ -13,97 +13,25 @@ let interval;
 
 export default function AssignBounty(props: ConnectCardProps) {
   const color = colors['light'];
-  const { person, created, visible } = props;
+  const { visible } = props;
   const { main, ui } = useStores();
 
   const [bountyHours, setBountyHours] = useState(1);
-  const [lnInvoice, setLnInvoice] = useState('');
-  const [invoiceStatus, setInvoiceStatus] = useState(false);
+  const [lnInvoice] = useState('');
+  const [invoiceStatus] = useState(false);
 
   const pollMinutes = 2;
 
   const [toasts, setToasts]: any = useState([]);
 
-  const addToast = () => {
-    setToasts([
-      {
-        id: `${Math.random()}`,
-        title: 'Bounty has been assigned'
-      }
-    ]);
-  };
-
   const removeToast = () => {
     setToasts([]);
   };
 
-  const startPolling = useCallback(
-    async (paymentRequest: string) => {
-      let i = 0;
-      interval = setInterval(async () => {
-        try {
-          const invoiceData = await main.pollInvoice(paymentRequest);
-          if (invoiceData) {
-            if (invoiceData.success && invoiceData.response.settled) {
-              clearInterval(interval);
-
-              addToast();
-              setLnInvoice('');
-              setInvoiceStatus(true);
-              main.setAssignInvoice('');
-
-              // get new wanted list
-              main.getPeopleBounties({ page: 1, resetPage: true });
-
-              props.dismiss();
-              if (props.dismissConnectModal) props.dismissConnectModal();
-            }
-          }
-
-          i++;
-          if (i > 22) {
-            if (interval) clearInterval(interval);
-          }
-        } catch (e) {
-          console.warn('AssignBounty Modal Invoice Polling Error', e);
-        }
-      }, 5000);
-    },
-    [main, props]
-  );
-
-  const generateInvoice = async () => {
-    if (created) {
-      const data = await main.getLnInvoice({
-        amount: 200 * bountyHours,
-        memo: '',
-        owner_pubkey: person?.owner_pubkey ?? '',
-        user_pubkey: ui.meInfo?.owner_pubkey ?? '',
-        route_hint: person?.route_hint,
-        created: created ? created.toString() : '',
-        type: 'ASSIGN',
-        assigned_hours: bountyHours,
-        commitment_fee: bountyHours * 200,
-        bounty_expires: new Date(
-          moment().add(bountyHours, 'hours').format().toString()
-        ).toUTCString()
-      });
-
-      const paymentRequest = data.response.invoice;
-
-      if (paymentRequest) {
-        setLnInvoice(paymentRequest);
-        main.setAssignInvoice(paymentRequest);
-        startPolling(paymentRequest);
-      }
-    }
-  };
-
   useEffect(() => {
     if (main.assignInvoice !== '') {
       const expired = isInvoiceExpired(main.assignInvoice);
       if (!expired) {
-        startPolling(main.assignInvoice);
       } else {
         main.setAssignInvoice('');
       }
@@ -112,7 +40,7 @@ export default function AssignBounty(props: ConnectCardProps) {
     return () => {
       clearInterval(interval);
     };
-  }, [main, startPolling]);
+  }, [main]);
 
   return (
     <div onClick={(e: any) => e.stopPropagation()}>
@@ -150,7 +78,6 @@ export default function AssignBounty(props: ConnectCardProps) {
                   imgSize={27}
                   height={48}
                   width={'100%'}
-                  onClick={generateInvoice}
                 />
               </>
             )}

src/people/widgetViews/WorkspaceView.tsx

@@ -200,6 +200,7 @@ const Workspaces = (props: { person: Person }) => {
         await main.pollAllUserWorkspaceBudget();
 
         const count = await main.allUserWorkspaceInvoiceCount();
+
         if (count === 0) {
           getUserWorkspaces();
           clearInterval(interval);

src/people/widgetViews/workspace/WithdrawBudgetModal.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useIsMobile } from 'hooks/uiHooks';
 import { InvoiceForm, InvoiceInput, InvoiceLabel } from 'people/utils/style';
 import { useStores } from 'store';
@@ -85,6 +85,7 @@ const WithdrawBudgetModal = (props: WithdrawModalProps) => {
   const [amountInSats, setAmountInSats] = useState(0);
   const [paymentSettled, setPaymentSettled] = useState(false);
   const [paymentError, setPaymentError] = useState('');
+  const [lastWithdrawal, setLastWithdrawal] = useState(0);
 
   const isMobile = useIsMobile();
   const { ui, main } = useStores();
@@ -93,7 +94,7 @@ const WithdrawBudgetModal = (props: WithdrawModalProps) => {
   const withdrawBudget = async () => {
     const token = ui.meInfo?.websocketToken;
     const body = {
-      org_uuid: uuid ?? '',
+      workspace_uuid: uuid ?? '',
       payment_request: paymentRequest,
       websocket_token: token
     };
@@ -119,6 +120,18 @@ const WithdrawBudgetModal = (props: WithdrawModalProps) => {
     }
   };
 
+  const getLastWithdrawal = useCallback(
+    async (workspace_uuid: string) => {
+      const response = await main.getLastWithdrawal(workspace_uuid);
+      setLastWithdrawal(response);
+    },
+    [main]
+  );
+
+  useEffect(() => {
+    getLastWithdrawal(uuid ?? '');
+  }, [getLastWithdrawal, uuid]);
+
   const displayWuthdraw = !amountInSats && ui.meInfo?.owner_pubkey;
   const displayInvoiceSats =
     amountInSats > 0 && !paymentSettled && !paymentError && ui.meInfo?.owner_pubkey;
@@ -211,14 +224,19 @@ const WithdrawBudgetModal = (props: WithdrawModalProps) => {
                   display: 'block'
                 }}
               >
-                Paste your invoice
+                {lastWithdrawal < 1 ? (
+                  <>Cannot withdraw: your last withdrawal is less than an hour</>
+                ) : (
+                  <>Paste your invoice</>
+                )}
               </InvoiceLabel>
               <InvoiceInput
                 data-testid="withdrawInvoiceInput"
                 type="text"
                 style={{
                   width: '100%'
                 }}
+                disabled={lastWithdrawal < 1}
                 value={paymentRequest}
                 onChange={(e: any) => setPaymentRequest(e.target.value)}
               />

src/store/main.ts

@@ -2578,7 +2578,7 @@ export class MainStore {
   async withdrawBountyBudget(body: {
     websocket_token?: string;
     payment_request: string;
-    org_uuid: string;
+    workspace_uuid: string;
   }): Promise<BudgetWithdrawSuccess | InvoiceError> {
     try {
       if (!uiStore.meInfo)
@@ -2607,6 +2607,26 @@ export class MainStore {
     }
   }
 
+  async getLastWithdrawal(workspace_uuid: string): Promise<number> {
+    try {
+      if (!uiStore.meInfo) return 0;
+      const info = uiStore.meInfo;
+
+      const r: any = await fetch(`${TribesURL}/workspaces/${workspace_uuid}/lastwithdrawal`, {
+        method: 'GET',
+        mode: 'cors',
+        headers: {
+          'x-jwt': info.tribe_jwt,
+          'Content-Type': 'application/json'
+        }
+      });
+      return r.json();
+    } catch (e) {
+      console.error('Error getLastWithdrawal', e);
+      return 0;
+    }
+  }
+
   async pollInvoice(payment_request: string): Promise<InvoiceDetails | undefined> {
     try {
       if (!uiStore.meInfo) return undefined;