@fuel-ts/account 0.0.0-rc-1976-20240417161625 → 0.0.0-rc-2037-20240417202046

package/dist/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}

package/dist/index.global.js

@@ -31272,6 +31272,10 @@ This unreleased fuel-core build may include features and updates not yet support
     }
   };
 
+  // ../address/dist/configs.mjs
+  var ZeroBytes32 = "0x0000000000000000000000000000000000000000000000000000000000000000";
+  var BaseAssetId = ZeroBytes32;
+
   // ../math/dist/index.mjs
   var import_bn = __toESM(require_bn(), 1);
   var DEFAULT_PRECISION = 9;
@@ -31502,11 +31506,11 @@ This unreleased fuel-core build may include features and updates not yet support
     let max2;
     if (Array.isArray(coinQuantityLike)) {
       amount = coinQuantityLike[0];
-      assetId = coinQuantityLike[1];
-      max2 = coinQuantityLike[2];
+      assetId = coinQuantityLike[1] ?? BaseAssetId;
+      max2 = coinQuantityLike[2] ?? void 0;
     } else {
       amount = coinQuantityLike.amount;
-      assetId = coinQuantityLike.assetId;
+      assetId = coinQuantityLike.assetId ?? BaseAssetId;
       max2 = coinQuantityLike.max ?? void 0;
     }
     const bnAmount = bn(amount);
@@ -38870,9 +38874,6 @@ ${MessageCoinFragmentFragmentDoc}`;
     }
   };
 
-  // ../address/dist/configs.mjs
-  var ZeroBytes32 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-
   // src/providers/transaction-request/input.ts
   var inputify = (value) => {
     const { type: type3 } = value;
@@ -39524,6 +39525,32 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     name = "NoWitnessByOwnerError";
   };
 
+  // src/providers/transaction-request/helpers.ts
+  var isRequestInputCoin = (input) => input.type === InputType.Coin;
+  var isRequestInputMessage = (input) => input.type === InputType.Message;
+  var isRequestInputResource = (input) => isRequestInputCoin(input) || isRequestInputMessage(input);
+  var getRequestInputResourceOwner = (input) => {
+    if (isRequestInputCoin(input)) {
+      return input.owner;
+    }
+    return input.recipient;
+  };
+  var isRequestInputResourceFromOwner = (input, owner) => getRequestInputResourceOwner(input) === owner.toB256();
+  var cacheResources = (resources) => resources.reduce(
+    (cache2, resource) => {
+      if (isCoin(resource)) {
+        cache2.utxos.push(resource.id);
+      } else {
+        cache2.messages.push(resource.nonce);
+      }
+      return cache2;
+    },
+    {
+      utxos: [],
+      messages: []
+    }
+  );
+
   // src/providers/transaction-request/witness.ts
   var witnessify = (value) => {
     const data = arrayify(value);
@@ -39549,8 +39576,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     outputs = [];
     /** List of witnesses */
     witnesses = [];
-    /** Base asset ID - should be fetched from the chain */
-    baseAssetId;
     /**
      * Constructor for initializing a base transaction request.
      *
@@ -39563,9 +39588,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       witnessLimit,
       inputs,
       outputs,
-      witnesses,
-      baseAssetId
-    }) {
+      witnesses
+    } = {}) {
       this.gasPrice = bn(gasPrice);
       this.maturity = maturity ?? 0;
       this.witnessLimit = witnessLimit ? bn(witnessLimit) : void 0;
@@ -39573,7 +39597,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       this.inputs = inputs ?? [];
       this.outputs = outputs ?? [];
       this.witnesses = witnesses ?? [];
-      this.baseAssetId = baseAssetId;
     }
     static getPolicyMeta(req) {
       let policyTypes = 0;
@@ -39767,8 +39790,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param predicate - Predicate bytes.
      * @param predicateData - Predicate data bytes.
      */
-    addCoinInput(coin, predicate) {
-      const { assetId, owner, amount } = coin;
+    addCoinInput(coin) {
+      const { assetId, owner, amount, id, predicate } = coin;
       let witnessIndex;
       if (predicate) {
         witnessIndex = 0;
@@ -39779,14 +39802,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...coin,
+        id,
         type: InputType.Coin,
         owner: owner.toB256(),
         amount,
         assetId,
         txPointer: "0x00000000000000000000000000000000",
         witnessIndex,
-        predicate: predicate?.bytes
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(owner, assetId);
@@ -39797,9 +39820,11 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      *
      * @param message - Message resource.
      * @param predicate - Predicate bytes.
+     * @param predicateData - Predicate data bytes.
      */
-    addMessageInput(message, predicate) {
-      const { recipient, sender, amount } = message;
+    addMessageInput(message) {
+      const { recipient, sender, amount, predicate, nonce } = message;
+      const assetId = BaseAssetId;
       let witnessIndex;
       if (predicate) {
         witnessIndex = 0;
@@ -39810,16 +39835,16 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...message,
+        nonce,
         type: InputType.Message,
         sender: sender.toB256(),
         recipient: recipient.toB256(),
         amount,
         witnessIndex,
-        predicate: predicate?.bytes
+        predicate
       };
       this.pushInput(input);
-      this.addChangeOutput(recipient, this.baseAssetId);
+      this.addChangeOutput(recipient, assetId);
     }
     /**
      * Adds a single resource to the transaction by adding a coin/message input and a
@@ -39847,32 +39872,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       resources.forEach((resource) => this.addResource(resource));
       return this;
     }
-    /**
-     * Adds multiple resources to the transaction by adding coin/message inputs and change
-     * outputs from the related assetIds.
-     *
-     * @param resources - The resources to add.
-     * @returns This transaction.
-     */
-    addPredicateResource(resource, predicate) {
-      if (isCoin(resource)) {
-        this.addCoinInput(resource, predicate);
-      } else {
-        this.addMessageInput(resource, predicate);
-      }
-      return this;
-    }
-    /**
-     * Adds multiple predicate coin/message inputs to the transaction and change outputs
-     * from the related assetIds.
-     *
-     * @param resources - The resources to add.
-     * @returns This transaction.
-     */
-    addPredicateResources(resources, predicate) {
-      resources.forEach((resource) => this.addPredicateResource(resource, predicate));
-      return this;
-    }
     /**
      * Adds a coin output to the transaction.
      *
@@ -39880,12 +39879,12 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param amount - Amount of coin.
      * @param assetId - Asset ID of coin.
      */
-    addCoinOutput(to, amount, assetId) {
+    addCoinOutput(to, amount, assetId = BaseAssetId) {
       this.pushOutput({
         type: OutputType.Coin,
         to: addressify(to).toB256(),
         amount,
-        assetId: assetId ?? this.baseAssetId
+        assetId
       });
       return this;
     }
@@ -39912,7 +39911,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param to - Address of the owner.
      * @param assetId - Asset ID of coin.
      */
-    addChangeOutput(to, assetId) {
+    addChangeOutput(to, assetId = BaseAssetId) {
       const changeOutput = this.getChangeOutputs().find(
         (output3) => hexlify(output3.assetId) === assetId
       );
@@ -39920,7 +39919,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         this.pushOutput({
           type: OutputType.Change,
           to: addressify(to).toB256(),
-          assetId: assetId ?? this.baseAssetId
+          assetId
         });
       }
     }
@@ -39996,7 +39995,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
           ]);
         }
       };
-      updateAssetInput(this.baseAssetId, bn(1e11));
+      updateAssetInput(BaseAssetId, bn(1e11));
       quantities.forEach((q) => updateAssetInput(q.assetId, q.amount));
     }
     /**
@@ -40021,6 +40020,10 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     toJSON() {
       return normalizeJSON(this);
     }
+    removeWitness(index) {
+      this.witnesses.splice(index, 1);
+      this.adjustWitnessIndexes(index);
+    }
     updatePredicateInputs(inputs) {
       this.inputs.forEach((i) => {
         let correspondingInput;
@@ -40043,6 +40046,13 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       });
     }
+    adjustWitnessIndexes(removedIndex) {
+      this.inputs.filter(isRequestInputResource).forEach((input) => {
+        if (input.witnessIndex > removedIndex) {
+          input.witnessIndex -= 1;
+        }
+      });
+    }
   };
 
   // src/providers/transaction-request/hash-transaction.ts
@@ -40153,7 +40163,12 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      *
      * @param createTransactionRequestLike - The initial values for the instance
      */
-    constructor({ bytecodeWitnessIndex, salt, storageSlots, ...rest }) {
+    constructor({
+      bytecodeWitnessIndex,
+      salt,
+      storageSlots,
+      ...rest
+    } = {}) {
       super(rest);
       this.bytecodeWitnessIndex = bytecodeWitnessIndex ?? 0;
       this.salt = hexlify(salt ?? ZeroBytes32);
@@ -40268,7 +40283,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      *
      * @param scriptTransactionRequestLike - The initial values for the instance.
      */
-    constructor({ script, scriptData, gasLimit, ...rest }) {
+    constructor({ script, scriptData, gasLimit, ...rest } = {}) {
       super(rest);
       this.gasLimit = bn(gasLimit);
       this.script = arrayify(script ?? returnZeroScript.bytes);
@@ -41414,7 +41429,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         gasPerByte: bn(feeParams.gasPerByte),
         maxMessageDataLength: bn(predicateParams.maxMessageDataLength),
         chainId: bn(consensusParameters.chainId),
-        baseAssetId: consensusParameters.baseAssetId,
         gasCosts
       },
       gasCosts,
@@ -41657,17 +41671,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       } = this.getChain();
       return chainId.toNumber();
     }
-    /**
-     * Returns the base asset ID
-     *
-     * @returns A promise that resolves to the base asset ID
-     */
-    getBaseAssetId() {
-      const {
-        consensusParameters: { baseAssetId }
-      } = this.getChain();
-      return baseAssetId;
-    }
     /**
      * Submits a transaction to the chain to be executed.
      *
@@ -42724,9 +42727,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param assetId - The asset ID to check the balance for.
      * @returns A promise that resolves to the balance amount.
      */
-    async getBalance(assetId) {
-      const assetIdToFetch = assetId ?? this.provider.getBaseAssetId();
-      const amount = await this.provider.getBalance(this.address, assetIdToFetch);
+    async getBalance(assetId = BaseAssetId) {
+      const amount = await this.provider.getBalance(this.address, assetId);
       return amount;
     }
     /**
@@ -42764,10 +42766,9 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @returns A promise that resolves when the resources are added to the transaction.
      */
     async fund(request, coinQuantities, fee) {
-      const baseAssetId = this.provider.getBaseAssetId();
       const updatedQuantities = addAmountToAsset({
         amount: bn(fee),
-        assetId: baseAssetId,
+        assetId: BaseAssetId,
         coinQuantities
       });
       const quantitiesDict = {};
@@ -42791,8 +42792,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
               quantitiesDict[assetId].owned = quantitiesDict[assetId].owned.add(amount);
               cachedUtxos.push(input.id);
             }
-          } else if (input.recipient === owner && input.amount && quantitiesDict[baseAssetId]) {
-            quantitiesDict[baseAssetId].owned = quantitiesDict[baseAssetId].owned.add(input.amount);
+          } else if (input.recipient === owner && input.amount && quantitiesDict[BaseAssetId]) {
+            quantitiesDict[BaseAssetId].owned = quantitiesDict[BaseAssetId].owned.add(input.amount);
             cachedMessages.push(input.nonce);
           }
         }
@@ -42824,13 +42825,11 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
      * @returns A promise that resolves to the prepared transaction request.
      */
-    async createTransfer(destination, amount, assetId, txParams = {}) {
+    async createTransfer(destination, amount, assetId = BaseAssetId, txParams = {}) {
       const { minGasPrice } = this.provider.getGasConfig();
-      const baseAssetId = this.provider.getBaseAssetId();
-      const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-      const params = { gasPrice: minGasPrice, baseAssetId, ...txParams };
+      const params = { gasPrice: minGasPrice, ...txParams };
       const request = new ScriptTransactionRequest(params);
-      request.addCoinOutput(Address.fromAddressOrString(destination), amount, assetIdToTransfer);
+      request.addCoinOutput(Address.fromAddressOrString(destination), amount, assetId);
       const { maxFee, requiredQuantities, gasUsed, estimatedInputs } = await this.provider.getTransactionCost(request, [], {
         estimateTxDependencies: true,
         resourcesOwner: this
@@ -42856,15 +42855,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
      * @returns A promise that resolves to the transaction response.
      */
-    async transfer(destination, amount, assetId, txParams = {}) {
+    async transfer(destination, amount, assetId = BaseAssetId, txParams = {}) {
       if (bn(amount).lte(0)) {
         throw new FuelError(
           ErrorCode.INVALID_TRANSFER_AMOUNT,
           "Transfer amount must be a positive number."
         );
       }
-      const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-      const request = await this.createTransfer(destination, amount, assetIdToTransfer, txParams);
+      const request = await this.createTransfer(destination, amount, assetId, txParams);
       return this.sendTransaction(request, { estimateTxDependencies: false });
     }
     /**
@@ -42876,7 +42874,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param txParams - The optional transaction parameters.
      * @returns A promise that resolves to the transaction response.
      */
-    async transferToContract(contractId, amount, assetId, txParams = {}) {
+    async transferToContract(contractId, amount, assetId = BaseAssetId, txParams = {}) {
       if (bn(amount).lte(0)) {
         throw new FuelError(
           ErrorCode.INVALID_TRANSFER_AMOUNT,
@@ -42885,13 +42883,11 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       }
       const contractAddress = Address.fromAddressOrString(contractId);
       const { minGasPrice } = this.provider.getGasConfig();
-      const baseAssetId = this.provider.getBaseAssetId();
-      const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-      const params = { gasPrice: minGasPrice, baseAssetId, ...txParams };
+      const params = { gasPrice: minGasPrice, ...txParams };
       const { script, scriptData } = await assembleTransferToContractScript({
         hexlifiedContractId: contractAddress.toB256(),
         amountToTransfer: bn(amount),
-        assetId: assetIdToTransfer
+        assetId
       });
       const request = new ScriptTransactionRequest({
         ...params,
@@ -42901,7 +42897,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       request.addContractInputAndOutput(contractAddress);
       const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(
         request,
-        [{ amount: bn(amount), assetId: String(assetIdToTransfer) }]
+        [{ amount: bn(amount), assetId: String(assetId) }]
       );
       request.gasLimit = bn(params.gasLimit ?? gasUsed);
       this.validateGas({
@@ -42923,7 +42919,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      */
     async withdrawToBaseLayer(recipient, amount, txParams = {}) {
       const { minGasPrice } = this.provider.getGasConfig();
-      const baseAssetId = this.provider.getBaseAssetId();
       const recipientAddress = Address.fromAddressOrString(recipient);
       const recipientDataArray = arrayify(
         "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
@@ -42936,14 +42931,9 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         ...recipientDataArray,
         ...amountDataArray
       ]);
-      const params = {
-        script,
-        gasPrice: minGasPrice,
-        baseAssetId,
-        ...txParams
-      };
+      const params = { script, gasPrice: minGasPrice, ...txParams };
       const request = new ScriptTransactionRequest(params);
-      const forwardingQuantities = [{ amount: bn(amount), assetId: baseAssetId }];
+      const forwardingQuantities = [{ amount: bn(amount), assetId: BaseAssetId }];
       const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
         request,
         forwardingQuantities
@@ -47889,10 +47879,15 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     populateTransactionPredicateData(transactionRequestLike) {
       const request = transactionRequestify(transactionRequestLike);
       const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-      request.inputs?.forEach((input) => {
-        if (input.type === InputType.Coin && hexlify(input.owner) === this.address.toB256()) {
+      const placeholderIndex = this.getIndexFromPlaceholderWitness(request);
+      if (placeholderIndex !== -1) {
+        request.removeWitness(placeholderIndex);
+      }
+      request.inputs.filter(isRequestInputResource).forEach((input) => {
+        if (isRequestInputResourceFromOwner(input, this.address)) {
           input.predicate = this.bytes;
           input.predicateData = this.getPredicateData(policies.length);
+          input.witnessIndex = 0;
         }
       });
       return request;
@@ -47906,9 +47901,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
      * @returns A promise that resolves to the prepared transaction request.
      */
-    async createTransfer(destination, amount, assetId, txParams = {}) {
-      const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-      const request = await super.createTransfer(destination, amount, assetIdToTransfer, txParams);
+    async createTransfer(destination, amount, assetId = BaseAssetId, txParams = {}) {
+      const request = await super.createTransfer(destination, amount, assetId, txParams);
       return this.populateTransactionPredicateData(request);
     }
     /**
@@ -47931,6 +47925,20 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       const transactionRequest = this.populateTransactionPredicateData(transactionRequestLike);
       return super.simulateTransaction(transactionRequest);
     }
+    /**
+     * Retrieves resources satisfying the spend query for the account.
+     *
+     * @param quantities - IDs of coins to exclude.
+     * @param excludedIds - IDs of resources to be excluded from the query.
+     * @returns A promise that resolves to an array of Resources.
+     */
+    async getResourcesToSpend(quantities, excludedIds) {
+      const resources = await super.getResourcesToSpend(quantities, excludedIds);
+      return resources.map((resource) => ({
+        ...resource,
+        predicate: hexlify(this.bytes)
+      }));
+    }
     getPredicateData(policiesLength) {
       if (!this.predicateData.length) {
         return new Uint8Array();
@@ -48010,6 +48018,22 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       }
       return mutatedBytes;
     }
+    getIndexFromPlaceholderWitness(request) {
+      const predicateInputs = request.inputs.filter(isRequestInputResource).filter((input) => isRequestInputResourceFromOwner(input, this.address));
+      let index = -1;
+      const hasEmptyPredicateInputs = predicateInputs.find((input) => !input.predicate);
+      if (hasEmptyPredicateInputs) {
+        index = hasEmptyPredicateInputs.witnessIndex;
+        const allInputsAreEmpty = predicateInputs.every((input) => !input.predicate);
+        if (!allInputsAreEmpty) {
+          const wasFilledInputAddedFirst = !!predicateInputs[0]?.predicate;
+          if (wasFilledInputAddedFirst) {
+            index = -1;
+          }
+        }
+      }
+      return index;
+    }
   };
 
   // src/connectors/fuel-connector.ts