wip: add contract and calling contracts works. Modifies @polkadot/api-contract

Author: peterwht

package.json

@@ -34,8 +34,9 @@
     "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^1.0.6",
     "@polkadot/api": "15.8.1",
-    "@polkadot/api-contract": "15.8.1",
+    "@polkadot/api-contract": "file:/Users/peter/dev/dot-repos/api/packages/api-contract/build",
     "@polkadot/extension-dapp": "^0.58.6",
+    "@polkadot/types": "file:/Users/peter/dev/dot-repos/api/packages/types/build",
     "@polkadot/ui-keyring": "^3.12.2",
     "@polkadot/ui-shared": "^3.12.2",
     "big.js": "^6.2.1",
@@ -44,6 +45,7 @@
     "date-fns": "^2.30.0",
     "dexie": "^3.2.4",
     "dexie-react-hooks": "1.1.7",
+    "ethers": "^6.13.5",
     "json5": "^2.2.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

src/lib/util.ts

@@ -74,7 +74,7 @@ export function isUndefined(value: unknown): value is undefined {
 
 export function isValidAddress(address: string | Uint8Array | null | undefined) {
   try {
-    encodeAddress(isHex(address) ? hexToU8a(address) : decodeAddress(address));
+    // encodeAddress(isHex(address) ? hexToU8a(address) : decodeAddress(address));
     return true;
   } catch (error) {
     return false;

src/services/chain/contract.ts

@@ -66,8 +66,8 @@ export function createInstantiateTx(
 }
 
 export async function getContractInfo(api: ApiPromise, address: string) {
-  if (isValidAddress(address)) {
-    return (await api.query.contracts.contractInfoOf(address)).unwrapOr(null);
+  if (isValidAddress(address) || true) {
+    return (await api.query.revive.contractInfoOf(address.substring(0, 42))).unwrapOr(null);
   }
 }
 

src/ui/components/contract/Interact.tsx

@@ -73,10 +73,10 @@ export const InteractTab = ({
     setCallResults([]);
   }, [abi.messages, setArgValues, address]);
 
-  const params: Parameters<typeof api.call.contractsApi.call> = useMemo(() => {
+  const params: Parameters<typeof api.call.reviveApi.call> = useMemo(() => {
     return [
       accountId,
-      address,
+      address.substring(0, 42),
       message?.isPayable
         ? api.registry.createType('Balance', value)
         : api.registry.createType('Balance', BN_ZERO),
@@ -101,7 +101,7 @@ export const InteractTab = ({
   useEffect((): void => {
     async function dryRun() {
       if (!message) return;
-      const newOutcome = await api.call.contractsApi.call(...params);
+      const newOutcome = await api.call.reviveApi.call(...params);
 
       // auto-generated @polkadot/type-augment data uses a different flag representation: `{"ok":{"flags":{"bits":0},"data":"0x00"}}`
       let convertedFlags = api.registry.createType('ContractReturnFlags', 0);
@@ -117,7 +117,7 @@ export const InteractTab = ({
         gasRequired: newOutcome.gasRequired,
         storageDeposit: newOutcome.storageDeposit,
         // debugMessage is Bytes, must convert to Text
-        debugMessage: new Text(api.registry, newOutcome.debugMessage.toUtf8()),
+        // debugMessage: new Text(api.registry, newOutcome.debugMessage.toUtf8()),
         result: newOutcome.result.isOk
           ? { Ok: { flags: convertedFlags, data: newOutcome.result.asOk.data } }
           : { Err: newOutcome.result.asErr },
@@ -136,7 +136,7 @@ export const InteractTab = ({
     }
 
     debouncedDryRun();
-  }, [api.call.contractsApi, message, params, nextResultId]);
+  }, [api.call.reviveApi, message, params, nextResultId]);
 
   useEffect(() => {
     async function processTx() {
@@ -185,10 +185,17 @@ export const InteractTab = ({
 
     const isValid = (result: SubmittableResult) => !result.isError && !result.dispatchError;
 
+    console.log('message');
+    console.log(message);
+    console.log('tx');
+    console.log(tx);
+    console.log(message.method);
+    console.log(transformUserInput(registry, message.args, argValues));
     const extrinsic = tx[message.method](
       options,
       ...transformUserInput(registry, message.args, argValues),
     );
+    console.log(extrinsic);
 
     newId.current = queue({
       extrinsic,

src/ui/hooks/useStoredContract.ts

@@ -37,7 +37,7 @@ export function useStoredContract(address: string): UIContract | undefined {
     displayName: document.name,
     tx: contract.tx,
     codeHash: document.codeHash,
-    address: contract.address.toString(),
+    address: contract.address.toString() + 'e'.repeat(24),
     date: document.date,
     id: document.id,
     type: document.external ? 'added' : 'instantiated',

src/ui/pages/AddressLookup.tsx

@@ -59,9 +59,14 @@ export function AddressLookup() {
     async function validate() {
       if (address !== searchString) {
         if (isValidAddress(searchString)) {
+          console.log(db);
+          console.log(await db.contracts.count());
+          // const isOnChain = true;// await getContractInfo(api, searchString);
           const isOnChain = await getContractInfo(api, searchString);
-          if (isOnChain) {
-            const contract = await db.contracts.get({ address: searchString });
+          if (true) {
+            // const contract = await db.contracts.get({ address: searchString });
+            const contract = undefined;
+
             // Contract is already instantiated in current UI
             if (contract) {
               navigate(`/contract/${searchString}`);