chore: added method to duplicate predicate

packages/account/src/predicate/predicate.ts

@@ -48,6 +48,7 @@
   bytes: Uint8Array;
   predicateData: TData = [] as unknown as TData;
   interface: Interface;
+  configurableConstants: TConfigurables = {} as TConfigurables;
 
   /**
    * Creates an instance of the Predicate class.
@@ -65,21 +66,31 @@
     data,
     configurableConstants,
   }: PredicateParams<TData, TConfigurables>) {
-    const { predicateBytes, predicateInterface } = Predicate.processPredicateData(
-      bytecode,
-      abi,
-      configurableConstants
-    );
+    const { predicateBytes, predicateInterface } = Predicate.processPredicateData(bytecode, abi);
     const address = Address.fromB256(getPredicateRoot(predicateBytes));
     super(address, provider);
 
     this.bytes = predicateBytes;
     this.interface = predicateInterface;
-    if (data !== undefined && data.length > 0) {
+
+    if (configurableConstants && Object.keys(configurableConstants).length) {
+      this.configurableConstants = configurableConstants;
+    }
+    if (data && data.length) {
       this.predicateData = data;
     }
   }
 
+  /**
+   * Updates parameters of predicate
+   *
+   * @param params - Object containing optional new configurableConstants and data
+   */
+  setParams(params: { configurableConstants?: TConfigurables; data?: TData }) {
+    this.predicateData = params.data ?? this.predicateData;
+    this.configurableConstants = params.configurableConstants ?? this.configurableConstants;
+  }
+
   /**
    * Populates the transaction data with predicate data.
    *
@@ -100,7 +111,13 @@
     request.inputs.filter(isRequestInputCoinOrMessage).forEach((input) => {
       if (isRequestInputResourceFromOwner(input, this.address)) {
         // eslint-disable-next-line no-param-reassign
-        input.predicate = hexlify(this.bytes);
+        input.predicate = hexlify(
+          this.setConfigurableConstants(
+            this.bytes,
+            this.configurableConstants ?? {},
+            this.interface
+          )
+        );
         // eslint-disable-next-line no-param-reassign
         input.predicateData = hexlify(this.getPredicateData());
         // eslint-disable-next-line no-param-reassign
@@ -152,15 +169,10 @@
    *
    * @param bytes - The bytes of the predicate.
    * @param jsonAbi - The JSON ABI of the predicate.
-   * @param configurableConstants - Optional configurable constants for the predicate.
    * @returns An object containing the new predicate bytes and interface.
    */
-  private static processPredicateData(
-    bytes: BytesLike,
-    jsonAbi: JsonAbi,
-    configurableConstants?: { [name: string]: unknown }
-  ) {
+  private static processPredicateData(bytes: BytesLike, jsonAbi: JsonAbi) {
     let predicateBytes = arrayify(bytes);
     const abiInterface: Interface = new Interface(jsonAbi);
 
     if (abiInterface.functions.main === undefined) {
@@ -170,14 +182,6 @@
       );
     }
 
-    if (configurableConstants && Object.keys(configurableConstants).length) {
-      predicateBytes = Predicate.setConfigurableConstants(
-        predicateBytes,
-        configurableConstants,
-        abiInterface
-      );
-    }
-
     return {
       predicateBytes,
       predicateInterface: abiInterface,
@@ -202,7 +206,9 @@
     );
     return resources.map((resource) => ({
       ...resource,
-      predicate: hexlify(this.bytes),
+      predicate: hexlify(
+        this.setConfigurableConstants(this.bytes, this.configurableConstants ?? {}, this.interface)
+      ),
       predicateData: hexlify(this.getPredicateData()),
     }));
   }
@@ -216,11 +222,41 @@
   override generateFakeResources(coins: FakeResources[]): Array<Resource> {
     return super.generateFakeResources(coins).map((coin) => ({
       ...coin,
-      predicate: hexlify(this.bytes),
+      predicate: hexlify(
+        this.setConfigurableConstants(this.bytes, this.configurableConstants ?? {}, this.interface)
+      ),
       predicateData: hexlify(this.getPredicateData()),
     }));
   }
 
+  /**
+   *
+   * @param account - The account used to pay the deployment costs.
+   * @returns The _blobId_ and a _waitForResult_ callback that returns the deployed predicate
+   * once the blob deployment transaction finishes.
+   *
+   * The returned loader predicate will have the same configurable constants
+   * as the original predicate which was used to generate the loader predicate.
+   */
+  async deploy<T = this>(account: Account) {
+    return deployScriptOrPredicate<T>({
+      deployer: account,
+      abi: this.interface.jsonAbi,
+      bytecode: this.setConfigurableConstants(
+        this.bytes,
+        this.configurableConstants ?? {},
+        this.interface
+      ),
+      loaderInstanceCallback: (loaderBytecode, newAbi) =>
+        new Predicate({
+          bytecode: loaderBytecode,
+          abi: newAbi,
+          provider: this.provider,
+          data: this.predicateData,
+        }) as T,
+    });
+  }
+
   /**
    * Sets the configurable constants for the predicate.
    *
@@ -229,7 +265,7 @@
    * @param abiInterface - The ABI interface of the predicate.
    * @returns The mutated bytes with the configurable constants set.
    */
-  private static setConfigurableConstants(
+  private setConfigurableConstants(
     bytes: Uint8Array,
     configurableConstants: { [name: string]: unknown },
     abiInterface: Interface
@@ -259,7 +295,7 @@
         mutatedBytes.set(encoded, offset);
       });
     } catch (err) {
       throw new FuelError(
         ErrorCode.INVALID_CONFIGURABLE_CONSTANTS,
         `Error setting configurable constants: ${(<Error>err).message}.`
       );
@@ -306,28 +342,4 @@
 
     return index;
   }
-
-  /**
-   *
-   * @param account - The account used to pay the deployment costs.
-   * @returns The _blobId_ and a _waitForResult_ callback that returns the deployed predicate
-   * once the blob deployment transaction finishes.
-   *
-   * The returned loader predicate will have the same configurable constants
-   * as the original predicate which was used to generate the loader predicate.
-   */
-  async deploy<T = this>(account: Account) {
-    return deployScriptOrPredicate<T>({
-      deployer: account,
-      abi: this.interface.jsonAbi,
-      bytecode: this.bytes,
-      loaderInstanceCallback: (loaderBytecode, newAbi) =>
-        new Predicate({
-          bytecode: loaderBytecode,
-          abi: newAbi,
-          provider: this.provider,
-          data: this.predicateData,
-        }) as T,
-    });
-  }
 }

packages/account/test/fixtures/predicate-abi.ts

@@ -30,5 +30,11 @@ export const predicateAbi: JsonAbi = {
   ],
   loggedTypes: [],
   messagesTypes: [],
-  configurables: [],
+  configurables: [
+    {
+      name: 'value',
+      concreteTypeId: 'b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903',
+      offset: 0,
+    },
+  ],
 };

packages/fuel-gauge/src/predicate/utils/predicate/fundPredicate.ts

@@ -1,9 +1,12 @@
 import type { InputValue, BigNumberish, WalletUnlocked, Predicate } from 'fuels';
 import { ScriptTransactionRequest, BN } from 'fuels';
 
-export const fundPredicate = async <T extends InputValue[]>(
+export const fundPredicate = async <
+  T extends InputValue[] = InputValue[],
+  C extends { [name: string]: unknown } | undefined = { [name: string]: unknown },
+>(
   wallet: WalletUnlocked,
-  predicate: Predicate<T>,
+  predicate: Predicate<T, C>,
   amountToPredicate: BigNumberish,
   utxosAmount: number = 1
 ): Promise<BN> => {

templates/nextjs/src/components/Predicate.tsx

@@ -16,7 +16,7 @@ export default function Predicate() {
     successNotification,
   } = useNotification();
   useNotification();
-  const [predicate, setPredicate] = useState<FuelPredicate<InputValue[]>>();
+  const [predicate, setPredicate] = useState<FuelPredicate<InputValue[], undefined>>();
   const [predicatePin, setPredicatePin] = useState<string>();
   const [isLoading, setIsLoading] = useState(false);
 

templates/vite/src/components/Predicate.tsx

@@ -15,7 +15,7 @@ export default function Predicate() {
     transactionSuccessNotification,
     successNotification,
   } = useNotification();
-  const [predicate, setPredicate] = useState<FuelPredicate<InputValue[]>>();
+  const [predicate, setPredicate] = useState<FuelPredicate<InputValue[], undefined>>();
   const [predicatePin, setPredicatePin] = useState<string>();
   const [isLoading, setIsLoading] = useState(false);