wip: add implementation working for predicate deployment

FuelLabs · Oct 6, 2024 · 60b62ee · 60b62ee
1 parent eea9c8c
commit 60b62ee
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 22 deletions.
diff --git a/packages/contract/src/contract-factory.ts b/packages/contract/src/contract-factory.ts
@@ -13,6 +13,7 @@ import {
   BlobTransactionRequest,
   TransactionStatus,
   calculateGasFee,
+  getPredicateRoot,
 } from '@fuel-ts/account';
 import { randomBytes } from '@fuel-ts/crypto';
 import { ErrorCode, FuelError } from '@fuel-ts/errors';
@@ -388,17 +389,20 @@ export default class ContractFactory {
     loaderBytecode: Uint8Array;
     loaderBytecodeHexlified: string;
   }> {
-    /** TODO: Implement me */
-    // @ts-expect-error lol
+    const {
+      waitForResult,
+      blobId,
+      loaderBytecode,
+      loaderBytecodeHexlified,
+    } = await this.deployAsBlobTxForScript(configurableConstants);
+
     return Promise.resolve({
-      waitForResult: () =>
-        Promise.resolve({
-          transactionResult: {},
-          loaderBytecode: '',
-        }),
-      predicateRoot: '',
-      loaderBytecode: new Uint8Array(),
-      loaderBytecodeHexlified: '',
+      blobId,
+      waitForResult,
+      predicateRoot: getPredicateRoot(loaderBytecode),
+      loaderBytecode,
+      loaderBytecodeHexlified,
+      offset: 0, // TODO: Implement me
     });
   }
 
@@ -428,6 +432,7 @@ export default class ContractFactory {
       arrayify(this.bytecode),
       arrayify(blobId)
     );
+    console.dir(loaderBytecode, { depth: null });
 
     // Check the account can afford to deploy all chunks and loader
     let totalCost = bn(0);
@@ -457,6 +462,8 @@ export default class ContractFactory {
       let result: TransactionResult<TransactionType.Blob>;
 
       try {
+        // TODO: MAKE SURE WE QUERY THE BLOB TO SEE IF EXISTS
+        // query { blobExits(0x000000000000) }
         const blobTx = await account.sendTransaction(fundedBlobRequest);
         result = await blobTx.waitForResult();
       } catch (err: unknown) {

diff --git a/packages/contract/src/loader/predicate-script-loader-instructions.ts b/packages/contract/src/loader/predicate-script-loader-instructions.ts
@@ -135,7 +135,7 @@ export function getPredicateScriptLoaderInstructions(
     dataView.setBigUint64(0, BigInt(dataSection.length), false); // false for big-endian
 
     // Combine the instruction bytes, blob bytes, data section length, and the data section
-    return new Uint8Array([...instructionBytes, ...blobBytes]);
+    return new Uint8Array([...instructionBytes, ...blobBytes, ...dataSectionLenBytes, ...dataSection]);
   }
   // Handle case where there is no data section
   const numOfInstructions = getInstructionsNoDataSection(0).length;

diff --git a/packages/fuels/src/cli/commands/deploy/deployPredicates.ts b/packages/fuels/src/cli/commands/deploy/deployPredicates.ts
@@ -6,7 +6,6 @@ import { readFileSync } from 'fs';
 import {
   getABIPath,
   getBinaryPath,
-  getContractName,
   getPredicateName,
 } from '../../config/forcUtils';
 import type { DeployedPredicate, FuelsConfig } from '../../types';
@@ -28,16 +27,20 @@ export async function deployPredicate(
   const abi = JSON.parse(readFileSync(abiPath, 'utf-8'));
   const factory = new ContractFactory(bytecode, abi, wallet);
 
-  const { waitForResult, predicateRoot, loaderBytecode, loaderBytecodeHexlified } =
-    await factory.deployAsBlobTxForPredicate(configurableConstants);
+  try {
+    const { predicateRoot, loaderBytecode, loaderBytecodeHexlified } =
+      await factory.deployAsBlobTxForPredicate(configurableConstants);
+    // await waitForResult();
 
-  await waitForResult();
-
-  return {
-    predicateRoot,
-    loaderBytecode,
-    loaderBytecodeHexlified,
-  };
+    return {
+      predicateRoot,
+      loaderBytecode,
+      loaderBytecodeHexlified,
+    };
+  } catch (err) {
+    console.error(err);
+    throw err;
+  }
 }
 
 /**
@@ -50,7 +53,7 @@ export async function deployPredicates(config: FuelsConfig) {
 
   log(`Deploying predicates to: ${wallet.provider.url}`);
 
-  const predicatesLen = config.scripts.length;
+  const predicatesLen = config.predicates.length;
 
   for (let i = 0; i < predicatesLen; i++) {
     const predicatePath = config.predicates[i];

diff --git a/packages/fuels/src/cli/commands/deploy/index.ts b/packages/fuels/src/cli/commands/deploy/index.ts
@@ -26,6 +26,7 @@ export async function deploy(config: FuelsConfig) {
   /**
    * Deploy predicates and save deployed files to disk.
    */
+  console.log('config', config);
   const predicates = await deployPredicates(config);
   savePredicateFiles(predicates, config);