feat(instantiate): spike, instantiate on revive. Doesn't import deployed contract

Author: peterwht

snapshots.js

@@ -1,6 +1,3 @@
-// Copyright 2022-2024 use-ink/contracts-ui authors & contributors
-// SPDX-License-Identifier: GPL-3.0-only
-
 module.exports = {
   __version: '13.13.3',
   'Storage Types Contract': {

src/lib/getContractFromPatron.ts

@@ -29,7 +29,7 @@ function getFromPatron(field: string, hash: string) {
 
 export function getContractFromPatron(codeHash: string): Promise<File> {
   const metadataPromise = getFromPatron('metadata', codeHash);
-  const wasmPromise = getFromPatron('wasm', codeHash);
+  const wasmPromise = getFromPatron('contract_binary', codeHash);
   return Promise.all([metadataPromise, wasmPromise]).then(([metadataResponse, wasmResponse]) => {
     const result = Buffer.from(wasmResponse as ArrayBuffer).toString('hex');
 

src/services/chain/contract.ts

@@ -11,6 +11,7 @@ import {
   InstantiateData,
   SubmittableExtrinsic,
 } from 'types';
+import { stringToU8a, compactAddLength, u8aToU8a } from '@polkadot/util';
 
 export function createInstantiateTx(
   api: ApiPromise,
@@ -25,7 +26,7 @@ export function createInstantiateTx(
     storageDepositLimit,
   }: Omit<InstantiateData, 'name'>,
 ): SubmittableExtrinsic<'promise'> {
-  const wasm = metadata?.info.source.wasm;
+  const wasm = u8aToU8a(metadata?.json.source.contract_binary);
   const isValid = codeHash || !!wasm;
 
   if (isValid && metadata && isNumber(constructorIndex) && metadata && argValues) {
@@ -38,15 +39,27 @@ export function createInstantiateTx(
       value,
     };
 
-    const codeOrBlueprint = codeHash
-      ? new BlueprintPromise(api, metadata, codeHash)
-      : new CodePromise(api, metadata, wasm && wasm.toU8a());
-
+    const parsed_wasm = compactAddLength(wasm.slice(0));
+    // const codeOrBlueprint = codeHash
+    //   ? new BlueprintPromise(api, metadata, codeHash)
+    //   : new CodePromise(api, metadata, wasm && wasm);
     const transformed = transformUserInput(api.registry, constructor.args, argValues);
 
-    return constructor.args.length > 0
-      ? codeOrBlueprint.tx[constructor.method](options, ...transformed)
-      : codeOrBlueprint.tx[constructor.method](options);
+    const data = constructor.toU8a(transformed);
+
+    const tx = api.tx.revive.instantiateWithCode(
+      value!,
+      gasLimit!,
+      storageDepositLimit!,
+      parsed_wasm,
+      data,
+      salt,
+    );
+
+    return tx;
+    // return constructor.args.length > 0
+    //   ? tx[constructor.method](options, ...transformed)
+    //   : tx[constructor.method](options);
   } else {
     throw new Error('Error creating instantiate tx');
   }

src/ui/components/instantiate/Step2.tsx

@@ -64,6 +64,8 @@ export function Step2() {
 
   const [isUsingSalt, toggleIsUsingSalt] = useToggle(true);
 
+  const wasm = metadata?.info.source.wasm;
+
   const params: Parameters<typeof api.call.contractsApi.instantiate> = useMemo(() => {
     return [
       accountId,
@@ -72,7 +74,9 @@ export function Step2() {
         : api.registry.createType('Balance', BN_ZERO),
       getGasLimit(isCustom, refTime.limit, proofSize.limit, api.registry),
       getStorageDepositLimit(storageDepositLimit.isActive, storageDepositLimit.value, api.registry),
-      codeHashUrlParam ? { Existing: codeHashUrlParam } : { Upload: metadata?.info.source.wasm },
+      codeHashUrlParam
+        ? { Existing: codeHashUrlParam }
+        : { Upload: metadata?.json.source.contract_binary }, // TODO: update type
       inputData ?? '',
       isUsingSalt ? salt.value : '',
     ];
@@ -96,7 +100,7 @@ export function Step2() {
   useEffect((): void => {
     async function dryRun() {
       try {
-        const result = await api.call.contractsApi.instantiate(...params);
+        const result = await api.call.reviveApi.instantiate(...params);
 
         // default is no revert
         let convertedFlags = api.registry.createType('ContractReturnFlags', 0);
@@ -123,7 +127,7 @@ export function Step2() {
           gasRequired: result.gasRequired,
           storageDeposit: result.storageDeposit,
           // debugMessage is Bytes, must convert to Text
-          debugMessage: api.registry.createType('Text', result.debugMessage.toU8a()),
+          // debugMessage: api.registry.createType('Text', result.debugMessage.toU8a()),
           result: instantiateResult,
         });