refactor: generateNonce to avoid confusing packages

Author: wzrdx

src/components/job/JobInstances.tsx

@@ -1,6 +1,6 @@
 import { sendInstanceCommand } from '@lib/api/deeploy';
 import { getDevAddress, isUsingDevAddress } from '@lib/config';
-import { buildDeeployMessage, generateNonce } from '@lib/deeploy-utils';
+import { buildDeeployMessage, generateDeeployNonce } from '@lib/deeploy-utils';
 import { getShortAddressOrHash } from '@lib/utils';
 import { CompactCustomCard } from '@shared/cards/CompactCustomCard';
 import ContextMenuWithTrigger from '@shared/ContextMenuWithTrigger';
@@ -54,7 +54,7 @@ export default function JobInstances({
             return;
         }
 
-        const nonce = generateNonce();
+        const nonce = generateDeeployNonce();
 
         const payload = {
             app_id: jobAlias,

src/components/tunnels/TunnelingSecretsForm.tsx

@@ -2,7 +2,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { addSecrets } from '@lib/api/tunnels';
 import { getDevAddress, isUsingDevAddress } from '@lib/config';
 import { InteractionContextType, useInteractionContext } from '@lib/contexts/interaction';
-import { buildDeeployMessage } from '@lib/deeploy-utils';
+import { buildDeeployMessage, generateDeeployNonce } from '@lib/deeploy-utils';
 import { addSecretsSchema } from '@schemas/secrets';
 import { SlateCard } from '@shared/cards/SlateCard';
 import InputWithLabel from '@shared/InputWithLabel';
@@ -12,7 +12,6 @@ import { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
 import { RiPencilLine } from 'react-icons/ri';
-import { generateNonce } from 'siwe';
 import { useAccount, useSignMessage } from 'wagmi';
 import { z } from 'zod';
 
@@ -44,7 +43,7 @@ export default function TunnelingSecretsForm({
         try {
             setLoading(true);
 
-            const nonce = generateNonce();
+            const nonce = generateDeeployNonce();
 
             const message = buildDeeployMessage({
                 nonce,

src/lib/contexts/deployment/deployment-provider.tsx

@@ -1,7 +1,7 @@
 import { CspEscrowAbi } from '@blockchain/CspEscrow';
 import { getApps } from '@lib/api/deeploy';
 import { getDevAddress, isUsingDevAddress } from '@lib/config';
-import { buildDeeployMessage, generateNonce } from '@lib/deeploy-utils';
+import { buildDeeployMessage, generateDeeployNonce } from '@lib/deeploy-utils';
 import { SigningModal } from '@shared/SigningModal';
 import { EthAddress, R1Address } from '@typedefs/blockchain';
 import { Apps, DeeploySpecs, JobConfig, Plugin } from '@typedefs/deeployApi';
@@ -77,7 +77,7 @@ export const DeploymentProvider = ({ children }) => {
     };
 
     const signAndBuildGetAppsRequest = async (address: EthAddress) => {
-        const nonce = generateNonce();
+        const nonce = generateDeeployNonce();
 
         const message = buildDeeployMessage(
             {

src/lib/deeploy-utils.ts

@@ -128,7 +128,7 @@ export const downloadDataAsJson = (data: any, filename: string) => {
     URL.revokeObjectURL(url);
 };
 
-export const generateNonce = (): string => {
+export const generateDeeployNonce = (): string => {
     const now = new Date();
     const unixTimestamp = now.getTime();
     console.log({ now, unixTimestamp });
@@ -274,7 +274,7 @@ export const formatGenericJobPayload = (
         };
     }
 
-    const nonce = generateNonce();
+    const nonce = generateDeeployNonce();
 
     return {
         app_alias: deployment.jobAlias,
@@ -319,7 +319,7 @@ export const formatNativeJobPayload = (
 
     const spareNodes = formatNodes(deployment.spareNodes);
 
-    const nonce = generateNonce();
+    const nonce = generateDeeployNonce();
 
     let appParams = {
         PORT: deployment.port,
@@ -369,7 +369,7 @@ export const formatServiceJobPayload = (
     const targetNodes = formatNodes(deployment.targetNodes);
     const spareNodes = formatNodes(deployment.spareNodes);
 
-    const nonce = generateNonce();
+    const nonce = generateDeeployNonce();
 
     return {
         nonce,

src/pages/deeploys/job/EditJob.tsx

@@ -15,7 +15,7 @@ import {
     formatGenericJobPayload,
     formatNativeJobPayload,
     formatServiceJobPayload,
-    generateNonce,
+    generateDeeployNonce,
 } from '@lib/deeploy-utils';
 import { routePath } from '@lib/routes/route-paths';
 import { jobSchema } from '@schemas/index';
@@ -253,7 +253,7 @@ export default function EditJob() {
         targetNodes: string[],
         containerType: ContainerOrWorkerType,
     ) => {
-        const nonce = generateNonce();
+        const nonce = generateDeeployNonce();
 
         const payloadWithIdentifiers = {
             job_id: Number(job.id),

src/pages/tunnels/Tunnels.tsx

@@ -8,7 +8,7 @@ import { checkSecrets, getSecrets, getTunnels } from '@lib/api/tunnels';
 import { getDevAddress, isUsingDevAddress } from '@lib/config';
 import { InteractionContextType, useInteractionContext } from '@lib/contexts/interaction';
 import { TunnelsContextType, useTunnelsContext } from '@lib/contexts/tunnels';
-import { buildDeeployMessage, generateNonce } from '@lib/deeploy-utils';
+import { buildDeeployMessage, generateDeeployNonce } from '@lib/deeploy-utils';
 import ActionButton from '@shared/ActionButton';
 import { DetailedAlert } from '@shared/DetailedAlert';
 import EmptyData from '@shared/EmptyData';
@@ -73,7 +73,7 @@ function Tunnels() {
         try {
             setFetchingSecrets(true);
 
-            const nonce = generateNonce();
+            const nonce = generateDeeployNonce();
             const message = buildDeeployMessage(
                 {
                     nonce,

src/shared/jobs/CostAndDurationInterface.tsx

@@ -47,6 +47,8 @@ export default function CostAndDurationInterface({
         const epochs = BigInt(1 + paymentMonthsCount * 30);
         let totalCost = costPer24h * epochs;
 
+        console.log('[CostAndDurationInterface]', { totalCost, costPer24h, epochs });
+
         if (applyDiscount) {
             const discountPercentage = getDiscountPercentage(paymentMonthsCount);
 

src/shared/jobs/JobActions.tsx

@@ -3,15 +3,14 @@ import { deletePipeline, sendJobCommand } from '@lib/api/deeploy';
 import { getCurrentEpoch, getDevAddress, isUsingDevAddress } from '@lib/config';
 import { DeploymentContextType, useDeploymentContext } from '@lib/contexts/deployment';
 import { InteractionContextType, useInteractionContext } from '@lib/contexts/interaction';
-import { buildDeeployMessage } from '@lib/deeploy-utils';
+import { buildDeeployMessage, generateDeeployNonce } from '@lib/deeploy-utils';
 import { routePath } from '@lib/routes/route-paths';
 import ContextMenuWithTrigger from '@shared/ContextMenuWithTrigger';
 import { RunningJobWithResources } from '@typedefs/deeploys';
 import { useState } from 'react';
 import toast from 'react-hot-toast';
 import { RiArrowDownSLine } from 'react-icons/ri';
 import { useNavigate } from 'react-router-dom';
-import { generateNonce } from 'siwe';
 import { useAccount, useSignMessage } from 'wagmi';
 
 export default function JobActions({
@@ -61,7 +60,7 @@ export default function JobActions({
             return;
         }
 
-        const nonce = generateNonce();
+        const nonce = generateDeeployNonce();
 
         const payload = {
             app_id: job!.alias,
@@ -145,7 +144,7 @@ export default function JobActions({
             throw new Error('Job data unavailable');
         }
 
-        const nonce = generateNonce();
+        const nonce = generateDeeployNonce();
 
         const payload = {
             app_id: job.alias,