execute contract success

Author: sdqede

templates/chain-admin/components/contract/deploy/DeployJsContract.tsx

@@ -6,6 +6,7 @@ import { DeliverTxResponse } from 'hyperwebjs';
 import {
   formatTxFee,
   getContractIndex,
+  getContractAddress,
   shortenAddress,
   readFileContent,
 } from '@/utils';
@@ -73,6 +74,7 @@ export const DeployJsContract = ({
       txResult.events.find((e) => e.type === 'tx')?.attributes[0].value ?? '';
 
     const contractIndex = getContractIndex(txResult);
+    const contractAddress = getContractAddress(txResult);
 
     const infoItems: TxInfoItem[] = [
       {
@@ -81,6 +83,12 @@ export const DeployJsContract = ({
         copyValue: contractIndex,
         showCopy: true,
       },
+      {
+        label: 'Contract Address',
+        value: contractAddress,
+        copyValue: contractAddress,
+        showCopy: true,
+      },
       {
         label: 'Tx Hash',
         value: shortenAddress(txResult.transactionHash),
@@ -109,7 +117,7 @@ export const DeployJsContract = ({
               width="$full"
               variant="primary"
               onClick={() => {
-                switchTab?.(contractIndex, TabLabel.Query);
+                switchTab?.(contractAddress, TabLabel.Query);
               }}
             >
               Query
@@ -118,7 +126,7 @@ export const DeployJsContract = ({
               width="$full"
               variant="primary"
               onClick={() => {
-                switchTab?.(contractIndex, TabLabel.Execute);
+                switchTab?.(contractAddress, TabLabel.Execute);
               }}
             >
               Execute

templates/chain-admin/components/contract/execute/ExecuteJsContract.tsx

@@ -101,8 +101,8 @@ export const ExecuteJsContract = ({
         />
       </InputField>
       <Button
-        onClick={handleExecute}
         disabled={isButtonDisabled}
+        onClick={handleExecute}
         isLoading={isLoading}
         width="100%"
         variant="primary"

templates/chain-admin/components/contract/execute/ExecuteTab.tsx

@@ -2,7 +2,7 @@ import { useIsHyperwebChain } from '@/hooks';
 import { ExecuteJsContract } from './ExecuteJsContract';
 import { ExecuteWasmContract } from './ExecuteWasmContract';
 
-export type ExecuteTabProps = {
+type ExecuteTabProps = {
   show: boolean;
   addressValue: string;
   onAddressInput: (input: string) => void;

templates/chain-admin/hooks/contract/useExecuteContractTx.tsx

@@ -8,6 +8,7 @@ import { toUint8Array } from '@/utils';
 
 import { useHandleTx } from './useHandleTx';
 import { useRpcEndpoint } from '../common';
+import { useJsdQueryClient } from './useJsdQueryClient';
 
 interface ExecuteTxParams {
   address: string;
@@ -32,6 +33,7 @@ export const useExecuteContractTx = (chainName: string) => {
   const { data: rpcEndpoint } = useRpcEndpoint(chainName);
   const { chain, wallet } = useChain(chainName);
   const handleTx = useHandleTx(chainName);
+  const { data: jsdQueryClient } = useJsdQueryClient();
 
   const executeTx = async ({
     address,
@@ -75,14 +77,70 @@ export const useExecuteContractTx = (chainName: string) => {
           throw new Error('Keplr wallet not available');
         }
 
+        if (!jsdQueryClient) {
+          throw new Error('Query client not available');
+        }
+
+        // Get contract address from contract index using listContracts
+        const contractsResponse =
+          await jsdQueryClient.hyperweb.hvm.listContracts({
+            pagination: {
+              limit: 1000n,
+              reverse: true,
+              countTotal: false,
+              key: new Uint8Array(),
+              offset: 0n,
+            },
+          });
+
+        const contractInfo = contractsResponse.contracts.find(
+          (contract) => contract.index.toString() === contractIndex
+        );
+
+        if (!contractInfo) {
+          throw new Error(`Contract not found for index ${contractIndex}`);
+        }
+
+        // Debug: Log the contract info structure
+        console.log('Contract Info:', contractInfo);
+        console.log('Contract Info Keys:', Object.keys(contractInfo));
+
+        // Try to extract contract address from different possible fields
+        let contractAddress;
+
+        // Try common field names
+        if ((contractInfo as any).address) {
+          contractAddress = (contractInfo as any).address;
+        } else if ((contractInfo as any).contractAddress) {
+          contractAddress = (contractInfo as any).contractAddress;
+        } else if (
+          (contractInfo as any).contract &&
+          (contractInfo as any).contract.address
+        ) {
+          contractAddress = (contractInfo as any).contract.address;
+        } else {
+          // If we can't find the address, let's try using the index directly
+          // as the system might expect it
+          contractAddress = contractIndex;
+          console.warn(
+            'Could not find contract address field, using index directly'
+          );
+        }
+
+        if (!contractAddress) {
+          throw new Error(
+            `Contract address not found for index ${contractIndex}`
+          );
+        }
+
         // Create signing client using hyperwebjs 1.1.1
         const signingClient = await getSigningHyperwebClient({
           rpcEndpoint,
           signer: (window as any).keplr.getOfflineSigner(chainId),
         });
 
         const msg = hyperweb.hvm.MessageComposer.fromPartial.eval({
-          address: contractIndex, // Contract address in 1.1.1
+          address: contractAddress, // Use the contract address from getContractByIndex
           creator: address,
           callee: fnName,
           args: [arg],

templates/chain-admin/utils/contract.ts

@@ -206,6 +206,25 @@ export const getContractIndex = (txResult: DeliverJsdTxResponse) => {
   return response.index.toString();
 };
 
+export const getContractAddress = (txResult: DeliverJsdTxResponse) => {
+  const response = hyperweb.hvm.MsgInstantiateResponse.fromProtoMsg(
+    // @ts-ignore
+    txResult.msgResponses[0]
+  );
+  return response.address;
+};
+
+export const getContractInfo = (txResult: DeliverJsdTxResponse) => {
+  const response = hyperweb.hvm.MsgInstantiateResponse.fromProtoMsg(
+    // @ts-ignore
+    txResult.msgResponses[0]
+  );
+  return {
+    index: response.index.toString(),
+    address: response.address,
+  };
+};
+
 export const readFileContent = (file: File): Promise<string> => {
   return new Promise((resolve, reject) => {
     const reader = new FileReader();