chore(transfer): fix build

kadena-community · Jul 21, 2023 · 5daf4b1 · 5daf4b1
1 parent 399647c
commit 5daf4b1
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 155 deletions.
diff --git a/packages/apps/transfer/src/constants/client.ts b/packages/apps/transfer/src/constants/client.ts
@@ -0,0 +1,5 @@
+import { getClient } from "@kadena/client";
+
+const client = getClient();
+
+export default client;
diff --git a/packages/apps/transfer/src/pages/faucet/existing/index.tsx b/packages/apps/transfer/src/pages/faucet/existing/index.tsx
@@ -119,7 +119,7 @@ const ExistingAccountFaucetPage: FC = () => {
               leftIcon: SystemIcon.KIcon,
             }}
           />
-          <ChainSelect onChange={onChainSelectChange} value={chainID} />
+          <ChainSelect onChange={onChainSelectChange} value={chainID} ariaLabel={'hello'} />
         </StyledAccountForm>
         <StyledFormButton>
           <Button.Root

diff --git a/packages/apps/transfer/src/pages/transfer/account-transactions/index.tsx b/packages/apps/transfer/src/pages/transfer/account-transactions/index.tsx
@@ -128,7 +128,7 @@ const CheckTransactions: FC = () => {
         <StyledContent>
           <form className={formStyle} onSubmit={checkTransactionsEvent}>
             <StyledSmallField>
-              <ChainSelect onChange={onChainSelectChange} value={chainID} />
+              <ChainSelect onChange={onChainSelectChange} value={chainID} ariaLabel={'hello'} />
             </StyledSmallField>
             <StyledMediumField>
               <TextField

diff --git a/packages/apps/transfer/src/pages/transfer/cross-chain-transfer-finisher/index.tsx b/packages/apps/transfer/src/pages/transfer/cross-chain-transfer-finisher/index.tsx
@@ -1,5 +1,4 @@
 import { IPollResponse } from '@kadena/chainweb-node-client';
-import { ContCommand } from '@kadena/client';
 import {
   Breadcrumbs,
   Button,
@@ -49,6 +48,7 @@ import React, {
   useEffect,
   useState,
 } from 'react';
+import client from '@/constants/client';
 
 interface IPactResultError {
   status: 'failure';
@@ -121,19 +121,21 @@ const CrossChainTransferFinisher: FC = () => {
       return;
     }
 
-    const host = getKadenaConstantByNetwork(network).apiHost({
+    const proof = await client.pollCreateSpv(requestKey, pollResults.tx.receiver.chain, {
       networkId: chainNetwork[network].network,
-      chainId: pollResults.tx.receiver.chain,
+      chainId: pollResults.tx.sender.chain,
     });
 
-    const contCommand = await finishXChainTransfer(
-      requestKey,
-      pollResults.tx.step,
-      pollResults.tx.rollback,
-      network,
-      pollResults.tx.receiver.chain,
-      kadenaXChainGas,
-    );
+    console.log(proof);
+
+    // const contCommand = await finishXChainTransfer(
+    //   requestKey,
+    //   pollResults.tx.step,
+    //   pollResults.tx.rollback,
+    //   network,
+    //   pollResults.tx.receiver.chain,
+    //   kadenaXChainGas,
+    // );
 
     // if (!(contCommand instanceof ContCommand) && contCommand.error) {
     //   setTxError(contCommand.error);

diff --git a/packages/apps/transfer/src/pages/transfer/module-explorer/index.tsx b/packages/apps/transfer/src/pages/transfer/module-explorer/index.tsx
@@ -58,27 +58,6 @@ const ModuleExplorer: FC = () => {
     [modules, moduleSearch],
   );
 
-  useEffect(() => {
-    if (!moduleName) {
-      return;
-    }
-
-    const fetchModule = async (): Promise<void> => {
-      const data = await describeModule(
-        moduleName,
-        chainID,
-        network,
-        kadenaConstants.DEFAULT_SENDER,
-        kadenaConstants.GAS_PRICE,
-        1000,
-      );
-
-      setResults(data);
-    };
-
-    fetchModule().catch(console.error);
-  }, [chainID, moduleName, network]);
-
   const onModuleNameChange = useCallback<ChangeEventHandler<HTMLInputElement>>(
     (e) => {
       setModuleSearch(e.target.value);
@@ -94,7 +73,7 @@ const ModuleExplorer: FC = () => {
       </Breadcrumbs.Root>
       <StyledForm>
         <StyledAccountForm>
-          <ChainSelect onChange={onChainSelectChange} value={chainID} />
+          <ChainSelect onChange={onChainSelectChange} value={chainID} ariaLabel={'hello'} />
           <TextField
             label={t('Module Name')}
             inputProps={{
@@ -111,7 +90,7 @@ const ModuleExplorer: FC = () => {
         {filteredModules?.map((module) => (
           <StyledListItem key={module} data-module-name={module}>
             <a
-              href={`/transfer/module-explorer/networks/${network}/chains/${moduleChain}/modules/${module}`}
+              href={`/transfer/module-explorer/networks/${network}/chains/${chainID}/modules/${module}`}
             >
               {module}
             </a>

diff --git a/...ges/transfer/module-explorer/networks/[network]/chains/[chain]/modules/[module]/index.tsx b/...ges/transfer/module-explorer/networks/[network]/chains/[chain]/modules/[module]/index.tsx
@@ -62,8 +62,8 @@ const ModulePage = () => {
 
       console.log(pactModule);
 
-      setCapabilities(pactModule._raw[moduleName].defcaps);
-      setFunctions(pactModule._raw[moduleName].defuns);
+      // setCapabilities(pactModule._raw[moduleName].defcaps);
+      // setFunctions(pactModule._raw[moduleName].defuns);
     };
 
     fetchModule().catch(console.error);

diff --git a/packages/apps/transfer/src/services/cross-chain-transfer-finish/finish-xchain-transfer.ts b/packages/apps/transfer/src/services/cross-chain-transfer-finish/finish-xchain-transfer.ts
@@ -2,7 +2,7 @@ import {
   ChainwebChainId,
   ChainwebNetworkId,
 } from '@kadena/chainweb-node-client';
-import { ContCommand, getContCommand } from '@kadena/client';
+import { getClient, Pact } from '@kadena/client';
 
 import {
   getKadenaConstantByNetwork,
@@ -28,47 +28,49 @@ export async function finishXChainTransfer(
   network: Network,
   chainId: ChainwebChainId,
   sender: string,
-): Promise<ContCommand | { error: string }> {
+): Promise<any | { error: string }> {
   debug(finishXChainTransfer.name);
   const host = getKadenaConstantByNetwork(network).apiHost({
     networkId: chainNetwork[network].network,
     chainId,
   });
 
+  const { pollStatus } = getClient();
+
   try {
-    const contCommand = await getContCommand(
-      requestKey,
-      chainId,
-      host,
-      step + 1,
-      rollback,
-    );
+  //   const contCommand = await getContCommand(
+  //     chainId,
+  //     host,
+  //     step + 1,
+  //     rollback,
+  //   );
 
-    contCommand.setMeta(
-      {
-        chainId,
-        sender,
-        gasLimit,
-        gasPrice,
-      },
-      chainNetwork[network].network as ChainwebNetworkId,
-    );
+  //   contCommand.setMeta(
+  //     {
+  //       chainId,
+  //       sender,
+  //       gasLimit,
+  //       gasPrice,
+  //     },
+  //     chainNetwork[network].network as ChainwebNetworkId,
+  //   );
 
-    contCommand.createCommand();
+  //   contCommand.createCommand();
 
-    const localResult = await contCommand.local(host, {
-      preflight: false,
-      signatureVerification: false,
-    });
+  //   const localResult = await contCommand.local(host, {
+  //     preflight: false,
+  //     signatureVerification: false,
+  //   });
 
-    if (localResult.result.status !== 'success') {
-      debug(localResult.result.error.message);
-      return { error: localResult.result.error.message };
-    }
+  //   if (localResult.result.status !== 'success') {
+  //     debug(localResult.result.error.message);
+  //     return { error: localResult.result.error.message };
+  //   }
 
-    await contCommand.send(host);
+  //   await contCommand.send(host);
 
-    return contCommand;
+  //   return contCommand;
+    throw new Error('testing');
   } catch (e) {
     debug(e.message);
     return { error: e.message };

diff --git a/packages/apps/transfer/src/services/cross-chain-transfer-finish/get-transfer-data.ts b/packages/apps/transfer/src/services/cross-chain-transfer-finish/get-transfer-data.ts
@@ -80,10 +80,9 @@ export async function getTransferData({
 
     const { events, result } = found;
 
-    const errorMessage = result.error?.message;
-
-    if (errorMessage) {
-      return { error: errorMessage };
+    if ('error' in result) {
+      return result.error;
+      // return { error: ('message' in result.error ? (result.error.message as string) : 'An error occurred.' };
     }
 
     const [senderAccount, receiverAccount, guard, targetChain, amount] =

diff --git a/packages/apps/transfer/src/services/modules/describe-module.ts b/packages/apps/transfer/src/services/modules/describe-module.ts
@@ -36,8 +36,10 @@ export const describeModule = async (
     }),
   );
 
+  const modules: any = Pact.modules;
+  const describe: any = modules['describe-module'];
   const transaction = Pact.builder
-    .execution(Pact.modules['describe-module'](moduleName))
+    .execution(describe(moduleName))
     .setMeta({ gasLimit, gasPrice, ttl, sender, chainId })
     .setNetworkId(networkId)
     .createTransaction();
@@ -47,27 +49,11 @@ export const describeModule = async (
     signatureVerification: false,
   });
 
-  // const pactCommand = new PactCommand();
-  // pactCommand.code = createExp(`describe-module "${moduleName}"`);
-
-  // pactCommand.setMeta({ gasLimit, gasPrice, ttl, sender, chainId });
-
-  // const response = await pactCommand.local(
-  //   getKadenaConstantByNetwork(network).apiHost({
-  //     networkId: chainNetwork[network].network,
-  //     chainId,
-  //   }),
-  //   {
-  //     signatureVerification: false,
-  //     preflight: false,
-  //   },
-  // );
-
   const { reqKey, result } = response;
 
   return {
     reqKey,
     status: result.status,
-    code: result.data?.code,
+    code: ('data' in result) ? (result.data as string) : '',
   };
 };
diff --git a/packages/apps/transfer/src/services/modules/list-module.ts b/packages/apps/transfer/src/services/modules/list-module.ts
@@ -1,6 +1,5 @@
 import { ChainwebChainId } from '@kadena/chainweb-node-client';
 import { getClient, Pact } from '@kadena/client';
-import { createExp } from '@kadena/pactjs';
 
 import {
   getKadenaConstantByNetwork,
@@ -34,8 +33,9 @@ export const listModules = async (
     }),
   );
 
+  const modules: any = Pact.modules;
   const transaction = Pact.builder
-    .execution(Pact.modules['list-modules']())
+    .execution(modules['list-modules']())
     .setMeta({ gasLimit, gasPrice, ttl, sender, chainId })
     .setNetworkId(networkId)
     .createTransaction();
@@ -49,6 +49,6 @@ export const listModules = async (
 
   return {
     status: result.status,
-    data: result.data,
+    data: 'data' in result ? (result.data as string[]) : [],
   };
 };