@fuel-ts/account 0.94.3 → 0.94.4

package/dist/test-utils.global.js

@@ -7610,8 +7610,8 @@
       var utils = require_utils();
       var Impl = require_URL_impl();
       var impl = utils.implSymbol;
-      function URL2(url) {
-        if (!this || this[impl] || !(this instanceof URL2)) {
+      function URL3(url) {
+        if (!this || this[impl] || !(this instanceof URL3)) {
           throw new TypeError("Failed to construct 'URL': Please use the 'new' operator, this DOM object constructor cannot be called as a function.");
         }
         if (arguments.length < 1) {
@@ -7627,7 +7627,7 @@
         }
         module.exports.setup(this, args);
       }
-      URL2.prototype.toJSON = function toJSON() {
+      URL3.prototype.toJSON = function toJSON() {
         if (!this || !module.exports.is(this)) {
           throw new TypeError("Illegal invocation");
         }
@@ -7637,7 +7637,7 @@
         }
         return this[impl].toJSON.apply(this[impl], args);
       };
-      Object.defineProperty(URL2.prototype, "href", {
+      Object.defineProperty(URL3.prototype, "href", {
         get() {
           return this[impl].href;
         },
@@ -7648,20 +7648,20 @@
         enumerable: true,
         configurable: true
       });
-      URL2.prototype.toString = function() {
+      URL3.prototype.toString = function() {
         if (!this || !module.exports.is(this)) {
           throw new TypeError("Illegal invocation");
         }
         return this.href;
       };
-      Object.defineProperty(URL2.prototype, "origin", {
+      Object.defineProperty(URL3.prototype, "origin", {
         get() {
           return this[impl].origin;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "protocol", {
+      Object.defineProperty(URL3.prototype, "protocol", {
         get() {
           return this[impl].protocol;
         },
@@ -7672,7 +7672,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "username", {
+      Object.defineProperty(URL3.prototype, "username", {
         get() {
           return this[impl].username;
         },
@@ -7683,7 +7683,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "password", {
+      Object.defineProperty(URL3.prototype, "password", {
         get() {
           return this[impl].password;
         },
@@ -7694,7 +7694,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "host", {
+      Object.defineProperty(URL3.prototype, "host", {
         get() {
           return this[impl].host;
         },
@@ -7705,7 +7705,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "hostname", {
+      Object.defineProperty(URL3.prototype, "hostname", {
         get() {
           return this[impl].hostname;
         },
@@ -7716,7 +7716,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "port", {
+      Object.defineProperty(URL3.prototype, "port", {
         get() {
           return this[impl].port;
         },
@@ -7727,7 +7727,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "pathname", {
+      Object.defineProperty(URL3.prototype, "pathname", {
         get() {
           return this[impl].pathname;
         },
@@ -7738,7 +7738,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "search", {
+      Object.defineProperty(URL3.prototype, "search", {
         get() {
           return this[impl].search;
         },
@@ -7749,7 +7749,7 @@
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(URL2.prototype, "hash", {
+      Object.defineProperty(URL3.prototype, "hash", {
         get() {
           return this[impl].hash;
         },
@@ -7765,7 +7765,7 @@
           return !!obj && obj[impl] instanceof Impl.implementation;
         },
         create(constructorArgs, privateData) {
-          let obj = Object.create(URL2.prototype);
+          let obj = Object.create(URL3.prototype);
           this.setup(obj, constructorArgs, privateData);
           return obj;
         },
@@ -7776,10 +7776,10 @@
           obj[impl] = new Impl.implementation(constructorArgs, privateData);
           obj[impl][utils.wrapperSymbol] = obj;
         },
-        interface: URL2,
+        interface: URL3,
         expose: {
-          Window: { URL: URL2 },
-          Worker: { URL: URL2 }
+          Window: { URL: URL3 },
+          Worker: { URL: URL3 }
         }
       };
     }
@@ -8113,7 +8113,7 @@
   }
   function parseURL(urlStr) {
     if (/^[a-zA-Z][a-zA-Z\d+\-.]*:/.exec(urlStr)) {
-      urlStr = new URL(urlStr).toString();
+      urlStr = new URL2(urlStr).toString();
     }
     return parse_url(urlStr);
   }
@@ -8407,7 +8407,7 @@
       stream.end();
     }
   }
-  var import_stream, import_http, import_url, import_whatwg_url, import_https, import_zlib, Readable, BUFFER, TYPE, Blob2, convert, INTERNALS, PassThrough, invalidTokenRegex, invalidHeaderCharRegex, MAP, Headers2, INTERNAL, HeadersIteratorPrototype, INTERNALS$1, STATUS_CODES, Response2, INTERNALS$2, URL, parse_url, format_url, streamDestructionSupported, Request, URL$1, PassThrough$1, isDomainOrSubdomain, isSameProtocol, lib_default;
+  var import_stream, import_http, import_url, import_whatwg_url, import_https, import_zlib, Readable, BUFFER, TYPE, Blob2, convert, INTERNALS, PassThrough, invalidTokenRegex, invalidHeaderCharRegex, MAP, Headers2, INTERNAL, HeadersIteratorPrototype, INTERNALS$1, STATUS_CODES, Response2, INTERNALS$2, URL2, parse_url, format_url, streamDestructionSupported, Request, URL$1, PassThrough$1, isDomainOrSubdomain, isSameProtocol, lib_default;
   var init_lib = __esm({
     "../../node_modules/.pnpm/node-fetch@2.7.0/node_modules/node-fetch/lib/index.mjs"() {
       import_stream = __toESM(__require("stream"), 1);
@@ -8930,7 +8930,7 @@
         configurable: true
       });
       INTERNALS$2 = Symbol("Request internals");
-      URL = import_url.default.URL || import_whatwg_url.default.URL;
+      URL2 = import_url.default.URL || import_whatwg_url.default.URL;
       parse_url = import_url.default.parse;
       format_url = import_url.default.format;
       streamDestructionSupported = "destroy" in import_stream.default.Readable.prototype;
@@ -31656,8 +31656,8 @@ spurious results.`);
   function getBuiltinVersions() {
     return {
       FORC: "0.63.3",
-      FUEL_CORE: "0.34.0",
-      FUELS: "0.94.3"
+      FUEL_CORE: "0.35.0",
+      FUELS: "0.94.4"
     };
   }
   function parseVersion(version) {
@@ -31820,7 +31820,7 @@ This unreleased fuel-core build may include features and updates not yet support
       return new _FuelError(error.code, error.message);
     }
     code;
-    constructor(code, message, metadata = {}, rawError = {}) {
+    constructor(code, message, metadata = {}, rawError = null) {
       super(message);
       this.code = code;
       this.name = "FuelError";
@@ -34057,44 +34057,16 @@ If you are attempting to transform a hex value, please make sure it is being pas
     return derivedKey;
   };
   var keccak256 = (data) => keccak_256(data);
-  var locked = false;
-  var helper2 = (data) => ripemd160(data);
-  var ripemd = helper2;
   function ripemd1602(_data) {
     const data = arrayify(_data, "data");
-    return ripemd(data);
+    return ripemd160(data);
   }
-  ripemd1602._ = helper2;
-  ripemd1602.lock = () => {
-    locked = true;
-  };
-  ripemd1602.register = (func) => {
-    if (locked) {
-      throw new FuelError(ErrorCode.HASHER_LOCKED, "ripemd160 is locked");
-    }
-    ripemd = func;
-  };
-  Object.freeze(ripemd1602);
   var bufferFromString = (string, encoding = "base64") => Uint8Array.from(Buffer.from(string, encoding));
-  var locked2 = false;
-  var PBKDF2 = (password, salt, iterations, keylen, algo) => (0, import_crypto2.pbkdf2Sync)(password, salt, iterations, keylen, algo);
-  var pBkdf2 = PBKDF2;
   function pbkdf22(_password, _salt, iterations, keylen, algo) {
     const password = arrayify(_password, "password");
     const salt = arrayify(_salt, "salt");
-    return hexlify(pBkdf2(password, salt, iterations, keylen, algo));
+    return hexlify((0, import_crypto2.pbkdf2Sync)(password, salt, iterations, keylen, algo));
   }
-  pbkdf22._ = PBKDF2;
-  pbkdf22.lock = () => {
-    locked2 = true;
-  };
-  pbkdf22.register = (func) => {
-    if (locked2) {
-      throw new FuelError(ErrorCode.HASHER_LOCKED, "pbkdf2 is locked");
-    }
-    pBkdf2 = func;
-  };
-  Object.freeze(pbkdf22);
   var randomBytes = (length) => {
     const randomValues = Uint8Array.from(import_crypto3.default.randomBytes(length));
     return randomValues;
@@ -34145,25 +34117,11 @@ If you are attempting to transform a hex value, please make sure it is being pas
     const decrypted = await Buffer.concat([decipher.update(data), decipher.final()]);
     return new Uint8Array(decrypted);
   }
-  var locked3 = false;
-  var COMPUTEHMAC = (algorithm, key, data) => (0, import_crypto5.createHmac)(algorithm, key).update(data).digest();
-  var computeHMAC = COMPUTEHMAC;
   function computeHmac(algorithm, _key, _data) {
     const key = arrayify(_key, "key");
     const data = arrayify(_data, "data");
-    return hexlify(computeHMAC(algorithm, key, data));
+    return hexlify((0, import_crypto5.createHmac)(algorithm, key).update(data).digest());
   }
-  computeHmac._ = COMPUTEHMAC;
-  computeHmac.lock = () => {
-    locked3 = true;
-  };
-  computeHmac.register = (func) => {
-    if (locked3) {
-      throw new FuelError(ErrorCode.HASHER_LOCKED, "computeHmac is locked");
-    }
-    computeHMAC = func;
-  };
-  Object.freeze(computeHmac);
   var randomUUID = () => (0, import_crypto6.randomUUID)();
   var api = {
     bufferFromString,
@@ -37941,20 +37899,14 @@ If you are attempting to transform a hex value, please make sure it is being pas
           const rows = text.split("\n");
           const rowWithUrl = rows.find((row) => row.indexOf(graphQLStartSubstring) !== -1);
           const [realIp, realPort] = rowWithUrl.split(" ").at(-1).trim().split(":");
-          setTimeout(
-            () => (
-              // Resolve with the cleanup method.
-              resolve({
-                cleanup,
-                ip: realIp,
-                port: realPort,
-                url: `http://${realIp}:${realPort}/v1/graphql`,
-                snapshotDir: snapshotDirToUse,
-                pid: child.pid
-              })
-            ),
-            500
-          );
+          resolve({
+            cleanup,
+            ip: realIp,
+            port: realPort,
+            url: `http://${realIp}:${realPort}/v1/graphql`,
+            snapshotDir: snapshotDirToUse,
+            pid: child.pid
+          });
         }
         if (/error/i.test(text)) {
           console.log(text);
@@ -43104,6 +43056,14 @@ ${ReceiptFragmentDoc}`;
   height
   header {
     time
+    daHeight
+    stateTransitionBytecodeVersion
+    transactionsCount
+    transactionsRoot
+    messageOutboxRoot
+    eventInboxRoot
+    prevRoot
+    applicationHash
   }
   transactions {
     id
@@ -44070,6 +44030,9 @@ ${MessageFragmentDoc}`;
     }
   };
 
+  // src/providers/message.ts
+  var isMessageCoin = (message) => !("data" in message);
+
   // src/providers/resource.ts
   var isCoin = (resource) => "id" in resource;
 
@@ -44498,20 +44461,22 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
     let reason = "";
     if (revertReceipt) {
       const reasonHex = bn(revertReceipt.val).toHex();
+      const lastLog = logs[logs.length - 1];
+      const lastButOneLog = logs[logs.length - 2];
       switch (reasonHex) {
         case FAILED_REQUIRE_SIGNAL: {
           reason = "require";
-          errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(logs[0]) : "an error."}.`;
+          errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(lastLog) : "an error."}.`;
           break;
         }
         case FAILED_ASSERT_EQ_SIGNAL: {
-          const sufix = logs.length >= 2 ? ` comparing ${stringify(logs[1])} and ${stringify(logs[0])}.` : ".";
+          const sufix = logs.length >= 2 ? ` comparing ${stringify(lastLog)} and ${stringify(lastButOneLog)}.` : ".";
           reason = "assert_eq";
           errorMessage = `The transaction reverted because of an "assert_eq" statement${sufix}`;
           break;
         }
         case FAILED_ASSERT_NE_SIGNAL: {
-          const sufix = logs.length >= 2 ? ` comparing ${stringify(logs[1])} and ${stringify(logs[0])}.` : ".";
+          const sufix = logs.length >= 2 ? ` comparing ${stringify(lastButOneLog)} and ${stringify(lastLog)}.` : ".";
           reason = "assert_ne";
           errorMessage = `The transaction reverted because of an "assert_ne" statement${sufix}`;
           break;
@@ -44570,7 +44535,9 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
   // 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 isRequestInputMessageWithoutData = (input) => input.type === InputType.Message && bn(input.data).isZero();
+  var isRequestInputCoinOrMessage = (input) => isRequestInputCoin(input) || isRequestInputMessage(input);
+  var isRequestInputResource = (input) => isRequestInputCoin(input) || isRequestInputMessageWithoutData(input);
   var getRequestInputResourceOwner = (input) => isRequestInputCoin(input) ? input.owner : input.recipient;
   var isRequestInputResourceFromOwner = (input, owner) => getRequestInputResourceOwner(input) === owner.toB256();
   var getAssetAmountInRequestInputs = (inputs, assetId, baseAsset) => inputs.filter(isRequestInputResource).reduce((acc, input) => {
@@ -44865,7 +44832,7 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
      * @param message - Message resource.
      */
     addMessageInput(message) {
-      const { recipient, sender, amount, predicate, nonce, assetId, predicateData } = message;
+      const { recipient, sender, amount, predicate, nonce, predicateData } = message;
       let witnessIndex;
       if (message.predicate) {
         witnessIndex = 0;
@@ -44880,13 +44847,16 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
         type: InputType.Message,
         sender: sender.toB256(),
         recipient: recipient.toB256(),
+        data: isMessageCoin(message) ? "0x" : message.data,
         amount,
         witnessIndex,
         predicate,
         predicateData
       };
       this.pushInput(input);
-      this.addChangeOutput(recipient, assetId);
+      if (isMessageCoin(message)) {
+        this.addChangeOutput(recipient, message.assetId);
+      }
     }
     /**
      * Adds a single resource to the transaction by adding a coin/message input and a
@@ -45018,6 +44988,8 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
      *
      * @param quantities - CoinQuantity Array.
      * @param baseAssetId - The base asset to fund the transaction.
+     * @deprecated - This method is deprecated and will be removed in future versions.
+     * Please use `Account.generateFakeResources` along with `this.addResources` instead.
      */
     fundWithFakeUtxos(quantities, baseAssetId, resourcesOwner) {
       const findAssetInput = (assetId) => this.inputs.find((input) => {
@@ -45086,7 +45058,7 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
       });
     }
     updatePredicateGasUsed(inputs) {
-      const inputsToExtractGasUsed = inputs.filter(isRequestInputResource);
+      const inputsToExtractGasUsed = inputs.filter(isRequestInputCoinOrMessage);
       this.inputs.filter(isRequestInputResource).forEach((i) => {
         const owner = getRequestInputResourceOwner(i);
         const correspondingInput = inputsToExtractGasUsed.find(
@@ -45170,10 +45142,7 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
   // src/providers/transaction-request/blob-transaction-request.ts
   var BlobTransactionRequest = class extends BaseTransactionRequest {
     static from(obj) {
-      if (obj instanceof this) {
-        return obj;
-      }
-      return new this(obj);
+      return new this(clone_default(obj));
     }
     /** Type of the transaction */
     type = TransactionType.Blob;
@@ -45256,10 +45225,7 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
   // src/providers/transaction-request/create-transaction-request.ts
   var CreateTransactionRequest = class extends BaseTransactionRequest {
     static from(obj) {
-      if (obj instanceof this) {
-        return obj;
-      }
-      return new this(obj);
+      return new this(clone_default(obj));
     }
     /** Type of the transaction */
     type = TransactionType.Create;
@@ -45369,10 +45335,7 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
   // src/providers/transaction-request/script-transaction-request.ts
   var ScriptTransactionRequest = class extends BaseTransactionRequest {
     static from(obj) {
-      if (obj instanceof this) {
-        return obj;
-      }
-      return new this(obj);
+      return new this(clone_default(obj));
     }
     /** Type of the transaction */
     type = TransactionType.Script;
@@ -46645,6 +46608,21 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
     };
   }
 
+  // src/providers/utils/handle-gql-error-message.ts
+  var handleGqlErrorMessage = (errorMessage, rawError) => {
+    switch (errorMessage) {
+      case "not enough coins to fit the target" /* NOT_ENOUGH_COINS */:
+        throw new FuelError(
+          ErrorCode.NOT_ENOUGH_FUNDS,
+          `The account(s) sending the transaction don't have enough funds to cover the transaction.`,
+          {},
+          rawError
+        );
+      default:
+        throw new FuelError(ErrorCode.INVALID_REQUEST, errorMessage);
+    }
+  };
+
   // src/providers/provider.ts
   var MAX_RETRIES = 10;
   var RESOURCES_PAGE_SIZE_LIMIT = 512;
@@ -46771,6 +46749,17 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
         return options.fetch ? options.fetch(url, fullRequest, options) : fetch(url, fullRequest);
       }, retryOptions);
     }
+    static extractBasicAuth(url) {
+      const parsedUrl = new URL(url);
+      const username = parsedUrl.username;
+      const password = parsedUrl.password;
+      const urlNoBasicAuth = `${parsedUrl.origin}${parsedUrl.pathname}`;
+      if (!(username && password)) {
+        return { url, auth: void 0 };
+      }
+      const auth = `Basic ${btoa(`${username}:${password}`)}`;
+      return { url: urlNoBasicAuth, auth };
+    }
     /**
      * Creates a new instance of the Provider class. This is the recommended way to initialize a Provider.
      *
@@ -46780,7 +46769,17 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
      * @returns A promise that resolves to a Provider instance.
      */
     static async create(url, options = {}) {
-      const provider = new _Provider(url, options);
+      const { url: urlToUse, auth } = this.extractBasicAuth(url);
+      const provider = new _Provider(urlToUse, {
+        ...options,
+        requestMiddleware: async (request) => {
+          if (auth) {
+            request.headers ??= {};
+            request.headers.Authorization = auth;
+          }
+          return options.requestMiddleware?.(request) ?? request;
+        }
+      });
       await provider.fetchChainAndNodeInfo();
       return provider;
     }
@@ -46886,10 +46885,9 @@ Supported fuel-core version: ${supportedVersion}.`
           if ("response" in response) {
             const graphQlResponse = response.response;
             if (Array.isArray(graphQlResponse?.errors)) {
-              throw new FuelError(
-                FuelError.CODES.INVALID_REQUEST,
-                graphQlResponse.errors.map((err) => err.message).join("\n\n")
-              );
+              for (const error of graphQlResponse.errors) {
+                handleGqlErrorMessage(error.message, error);
+              }
             }
           }
         }
@@ -46907,7 +46905,26 @@ Supported fuel-core version: ${supportedVersion}.`
         }
         return gqlClient.request(query, vars);
       };
-      return getSdk(executeQuery);
+      const customOperations = (requester) => ({
+        getBlobs(variables) {
+          const queryParams = variables.blobIds.map((_, i) => `$blobId${i}: BlobId!`).join(", ");
+          const blobParams = variables.blobIds.map((_, i) => `blob${i}: blob(id: $blobId${i}) { id }`).join("\n");
+          const updatedVariables = variables.blobIds.reduce(
+            (acc, blobId, i) => {
+              acc[`blobId${i}`] = blobId;
+              return acc;
+            },
+            {}
+          );
+          const document2 = lib_default2`
+          query getBlobs(${queryParams}) {
+            ${blobParams}
+          }
+        `;
+          return requester(document2, updatedVariables);
+        }
+      });
+      return { ...getSdk(executeQuery), ...customOperations(executeQuery) };
     }
     /**
      * Returns the version of the connected node.
@@ -47454,6 +47471,21 @@ Supported fuel-core version: ${supportedVersion}.`
       }).filter((v) => !!v);
       return coins;
     }
+    /**
+     * Returns an array of blobIds that exist on chain, for a given array of blobIds.
+     *
+     * @param blobIds - blobIds to check.
+     * @returns - A promise that resolves to an array of blobIds that exist on chain.
+     */
+    async getBlobs(blobIds) {
+      const res = await this.operations.getBlobs({ blobIds });
+      const blobs = [];
+      Object.keys(res).forEach((key) => {
+        const val = res[key];
+        blobs.push(val?.id ?? null);
+      });
+      return blobs.filter((v) => v);
+    }
     /**
      * Returns block matching the given ID or height.
      *
@@ -47475,11 +47507,22 @@ Supported fuel-core version: ${supportedVersion}.`
       if (!block2) {
         return null;
       }
+      const { header, height, id, transactions } = block2;
       return {
-        id: block2.id,
-        height: bn(block2.height),
-        time: block2.header.time,
-        transactionIds: block2.transactions.map((tx) => tx.id)
+        id,
+        height: bn(height),
+        time: header.time,
+        header: {
+          applicationHash: header.applicationHash,
+          daHeight: bn(header.daHeight),
+          eventInboxRoot: header.eventInboxRoot,
+          messageOutboxRoot: header.messageOutboxRoot,
+          prevRoot: header.prevRoot,
+          stateTransitionBytecodeVersion: header.stateTransitionBytecodeVersion,
+          transactionsCount: header.transactionsCount,
+          transactionsRoot: header.transactionsRoot
+        },
+        transactionIds: transactions.map((tx) => tx.id)
       };
     }
     /**
@@ -47501,6 +47544,16 @@ Supported fuel-core version: ${supportedVersion}.`
         id: block2.id,
         height: bn(block2.height),
         time: block2.header.time,
+        header: {
+          applicationHash: block2.header.applicationHash,
+          daHeight: bn(block2.header.daHeight),
+          eventInboxRoot: block2.header.eventInboxRoot,
+          messageOutboxRoot: block2.header.messageOutboxRoot,
+          prevRoot: block2.header.prevRoot,
+          stateTransitionBytecodeVersion: block2.header.stateTransitionBytecodeVersion,
+          transactionsCount: block2.header.transactionsCount,
+          transactionsRoot: block2.header.transactionsRoot
+        },
         transactionIds: block2.transactions.map((tx) => tx.id)
       }));
       return { blocks, pageInfo };
@@ -47528,6 +47581,16 @@ Supported fuel-core version: ${supportedVersion}.`
         id: block2.id,
         height: bn(block2.height, 10),
         time: block2.header.time,
+        header: {
+          applicationHash: block2.header.applicationHash,
+          daHeight: bn(block2.header.daHeight),
+          eventInboxRoot: block2.header.eventInboxRoot,
+          messageOutboxRoot: block2.header.messageOutboxRoot,
+          prevRoot: block2.header.prevRoot,
+          stateTransitionBytecodeVersion: block2.header.stateTransitionBytecodeVersion,
+          transactionsCount: block2.header.transactionsCount,
+          transactionsRoot: block2.header.transactionsRoot
+        },
         transactionIds: block2.transactions.map((tx) => tx.id),
         transactions: block2.transactions.map(
           (tx) => new TransactionCoder().decode(arrayify(tx.rawPayload), 0)?.[0]
@@ -47839,10 +47902,25 @@ Supported fuel-core version: ${supportedVersion}.`
      * @returns A promise that resolves to the Message object or null.
      */
     async getMessageByNonce(nonce) {
-      const { message } = await this.operations.getMessageByNonce({ nonce });
-      if (!message) {
+      const { message: rawMessage } = await this.operations.getMessageByNonce({ nonce });
+      if (!rawMessage) {
         return null;
       }
+      const message = {
+        messageId: InputMessageCoder.getMessageId({
+          sender: rawMessage.sender,
+          recipient: rawMessage.recipient,
+          nonce: rawMessage.nonce,
+          amount: bn(rawMessage.amount),
+          data: rawMessage.data
+        }),
+        sender: Address.fromAddressOrString(rawMessage.sender),
+        recipient: Address.fromAddressOrString(rawMessage.recipient),
+        nonce: rawMessage.nonce,
+        amount: bn(rawMessage.amount),
+        data: InputMessageCoder.decodeData(rawMessage.data),
+        daHeight: bn(rawMessage.daHeight)
+      };
       return message;
     }
     /**
@@ -48248,7 +48326,7 @@ Supported fuel-core version: ${supportedVersion}.`
           gasPrice
         });
         const totalBaseAssetOnInputs = getAssetAmountInRequestInputs(
-          request.inputs,
+          request.inputs.filter(isRequestInputResource),
           baseAssetId,
           baseAssetId
         );
@@ -48454,10 +48532,10 @@ Supported fuel-core version: ${supportedVersion}.`
       const requiredQuantities = mergeQuantities(coinOutputsQuantities, quantities);
       const transactionFeeForDryRun = [{ assetId: baseAssetId, amount: bn("100000000000000000") }];
       const findAssetInput = (assetId) => txRequestClone.inputs.find((input) => {
-        if ("assetId" in input) {
+        if (input.type === InputType.Coin) {
           return input.assetId === assetId;
         }
-        if ("recipient" in input) {
+        if (isRequestInputMessageWithoutData(input)) {
           return baseAssetId === assetId;
         }
         return false;