@fuel-ts/account 0.0.0-pr-1699-20240214105147 → 0.0.0-pr-1699-20240214162234

package/dist/index.js

@@ -73,13 +73,11 @@ __export(src_exports, {
   FuelConnectorEventType: () => FuelConnectorEventType,
   FuelConnectorEventTypes: () => FuelConnectorEventTypes,
   FuelConnectorMethods: () => FuelConnectorMethods,
-  FuelWalletConnector: () => FuelWalletConnector,
-  FuelWalletDevelopmentConnector: () => FuelWalletDevelopmentConnector,
   FuelWalletLocked: () => FuelWalletLocked,
   FuelWalletProvider: () => FuelWalletProvider,
-  FueletWalletConnector: () => FueletWalletConnector,
   HDWallet: () => hdwallet_default,
   Language: () => Language,
+  LocalStorage: () => LocalStorage,
   MNEMONIC_SIZES: () => MNEMONIC_SIZES,
   MemoryStorage: () => MemoryStorage,
   MessageTypes: () => MessageTypes,
@@ -116,7 +114,6 @@ __export(src_exports, {
   calculatePriceWithFactor: () => calculatePriceWithFactor,
   calculateTransactionFee: () => calculateTransactionFee,
   coinQuantityfy: () => coinQuantityfy,
-  defaultConnectors: () => defaultConnectors,
   deferPromise: () => deferPromise,
   dispatchFuelConnectorEvent: () => dispatchFuelConnectorEvent,
   english: () => english,
@@ -3904,23 +3901,6 @@ var _Provider = class {
     if (estimateTxDependencies) {
       await this.estimateTxDependencies(transactionRequest);
     }
-    const { gasUsed, minGasPrice } = await this.getTransactionCost(transactionRequest, [], {
-      estimateTxDependencies: false,
-      estimatePredicates: false
-    });
-    if ((0, import_math14.bn)(minGasPrice).gt((0, import_math14.bn)(transactionRequest.gasPrice))) {
-      throw new import_errors13.FuelError(
-        import_errors13.ErrorCode.GAS_PRICE_TOO_LOW,
-        `Gas price '${transactionRequest.gasPrice}' is lower than the required: '${minGasPrice}'.`
-      );
-    }
-    const isScriptTransaction = transactionRequest.type === import_transactions17.TransactionType.Script;
-    if (isScriptTransaction && (0, import_math14.bn)(gasUsed).gt((0, import_math14.bn)(transactionRequest.gasLimit))) {
-      throw new import_errors13.FuelError(
-        import_errors13.ErrorCode.GAS_LIMIT_TOO_LOW,
-        `Gas limit '${transactionRequest.gasLimit}' is lower than the required: '${gasUsed}'.`
-      );
-    }
     const encodedTransaction = (0, import_ethers18.hexlify)(transactionRequest.toTransactionBytes());
     if (awaitExecution) {
       const subscription = this.operations.submitAndAwait({ encodedTransaction });
@@ -4880,10 +4860,14 @@ var Account = class extends import_interfaces.AbstractAccount {
     const request = new ScriptTransactionRequest(params);
     request.addCoinOutput(import_address4.Address.fromAddressOrString(destination), amount, assetId);
     const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(request);
-    const gasPriceToUse = (0, import_math17.bn)(txParams.gasPrice ?? minGasPrice);
-    const gasLimitToUse = (0, import_math17.bn)(txParams.gasLimit ?? gasUsed);
-    request.gasPrice = gasPriceToUse;
-    request.gasLimit = gasLimitToUse;
+    request.gasPrice = (0, import_math17.bn)(txParams.gasPrice ?? minGasPrice);
+    request.gasLimit = (0, import_math17.bn)(txParams.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return request;
   }
@@ -4928,7 +4912,13 @@ var Account = class extends import_interfaces.AbstractAccount {
       request,
       [{ amount: (0, import_math17.bn)(amount), assetId: String(assetId) }]
     );
-    request.gasLimit = (0, import_math17.bn)(params.gasLimit || gasUsed);
+    request.gasLimit = (0, import_math17.bn)(params.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
@@ -4941,6 +4931,7 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @returns A promise that resolves to the transaction response.
    */
   async withdrawToBaseLayer(recipient, amount, txParams = {}) {
+    const { minGasPrice } = this.provider.getGasConfig();
     const recipientAddress = import_address4.Address.fromAddressOrString(recipient);
     const recipientDataArray = (0, import_ethers21.getBytesCopy)(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
@@ -4953,14 +4944,20 @@ var Account = class extends import_interfaces.AbstractAccount {
       ...recipientDataArray,
       ...amountDataArray
     ]);
-    const params = { script, ...txParams };
+    const params = { script, gasPrice: minGasPrice, ...txParams };
     const request = new ScriptTransactionRequest(params);
     const forwardingQuantities = [{ amount: (0, import_math17.bn)(amount), assetId: import_configs10.BaseAssetId }];
     const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
       request,
       forwardingQuantities
     );
-    request.gasLimit = params.gasLimit ? (0, import_math17.bn)(params.gasLimit) : gasUsed;
+    request.gasLimit = (0, import_math17.bn)(params.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
@@ -4989,6 +4986,25 @@ var Account = class extends import_interfaces.AbstractAccount {
     await this.provider.estimateTxDependencies(transactionRequest);
     return this.provider.simulate(transactionRequest, { estimateTxDependencies: false });
   }
+  validateGas({
+    gasUsed,
+    gasPrice,
+    gasLimit,
+    minGasPrice
+  }) {
+    if (minGasPrice.gt(gasPrice)) {
+      throw new import_errors15.FuelError(
+        import_errors15.ErrorCode.GAS_PRICE_TOO_LOW,
+        `Gas price '${gasPrice}' is lower than the required: '${minGasPrice}'.`
+      );
+    }
+    if (gasUsed.gt(gasLimit)) {
+      throw new import_errors15.FuelError(
+        import_errors15.ErrorCode.GAS_LIMIT_TOO_LOW,
+        `Gas limit '${gasLimit}' is lower than the required: '${gasUsed}'.`
+      );
+    }
+  }
 };
 
 // src/wallet/base-wallet-unlocked.ts
@@ -8640,10 +8656,6 @@ var Predicate = class extends Account {
   }
 };
 
-// src/connectors/fuel-wallet-connector.ts
-var import_json_rpc_2 = require("json-rpc-2.0");
-var import_uuid2 = require("uuid");
-
 // src/connectors/fuel-connector.ts
 var import_events2 = require("events");
 
@@ -8703,6 +8715,26 @@ var MessageTypes = /* @__PURE__ */ ((MessageTypes2) => {
   return MessageTypes2;
 })(MessageTypes || {});
 
+// src/connectors/types/local-storage.ts
+var LocalStorage = class {
+  storage;
+  constructor(localStorage) {
+    this.storage = localStorage;
+  }
+  async setItem(key, value) {
+    this.storage.setItem(key, value);
+  }
+  async getItem(key) {
+    return this.storage.getItem(key);
+  }
+  async removeItem(key) {
+    this.storage.removeItem(key);
+  }
+  async clear() {
+    this.storage.clear();
+  }
+};
+
 // src/connectors/fuel-connector.ts
 var FuelConnector = class extends import_events2.EventEmitter {
   name = "";
@@ -8921,261 +8953,6 @@ var FuelConnector = class extends import_events2.EventEmitter {
   }
 };
 
-// src/connectors/fuel-wallet-connector.ts
-var FuelWalletConnector = class extends FuelConnector {
-  name = "";
-  connected = false;
-  installed = false;
-  events = FuelConnectorEventTypes;
-  metadata = {
-    image: "/connectors/fuel-wallet.svg",
-    install: {
-      action: "Install",
-      description: "To connect your Fuel Wallet, install the browser extension.",
-      link: "https://chrome.google.com/webstore/detail/fuel-wallet/dldjpboieedgcmpkchcjcbijingjcgok"
-    }
-  };
-  client;
-  constructor(name = "Fuel Wallet") {
-    super();
-    this.name = name;
-    this.setMaxListeners(100);
-    this.client = new import_json_rpc_2.JSONRPCClient(this.sendRequest.bind(this), this.createRequestId);
-    this.setupListener();
-    this.setupConnector();
-  }
-  /**
-   * ============================================================
-   * Application communication methods
-   * ============================================================
-   */
-  setupConnector() {
-    if (typeof window !== "undefined") {
-      this.ping().then(() => {
-        window.dispatchEvent(new CustomEvent("FuelConnector", { detail: this }));
-      }).catch(() => {
-      });
-    }
-  }
-  acceptMessage(message) {
-    const { data: event } = message;
-    return message.origin === window.origin && event.type !== "request" /* request */ && event.connectorName === this.name && event.target === CONNECTOR_SCRIPT;
-  }
-  setupListener() {
-    if (typeof window === "undefined") {
-      return;
-    }
-    window.addEventListener(EVENT_MESSAGE, this.onMessage.bind(this));
-  }
-  createRequestId() {
-    return (0, import_uuid2.v4)();
-  }
-  postMessage(message, origin) {
-    window.postMessage(message, origin || window.origin);
-  }
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async sendRequest(request) {
-    if (!request) {
-      return;
-    }
-    this.postMessage({
-      type: "request" /* request */,
-      target: CONTENT_SCRIPT_NAME,
-      connectorName: this.name,
-      request
-    });
-  }
-  onResponse(message) {
-    this.client.receive(message.response);
-  }
-  onEvent(message) {
-    message.events.forEach((eventData) => {
-      if (eventData.event === "start") {
-        this.setupConnector();
-      } else {
-        this.emit(eventData.event, ...eventData.params);
-      }
-    });
-  }
-  onMessage = (message) => {
-    const messageFroze = Object.freeze(message);
-    if (!this.acceptMessage(messageFroze)) {
-      return;
-    }
-    const { data: event } = messageFroze;
-    this.onCommunicationMessage(event);
-  };
-  onCommunicationMessage = (message) => {
-    switch (message.type) {
-      case "response" /* response */:
-        this.onResponse(message);
-        break;
-      case "event" /* event */:
-        this.onEvent(message);
-        break;
-      default:
-    }
-  };
-  /**
-   * ============================================================
-   * Connector methods
-   * ============================================================
-   */
-  async ping() {
-    return this.client.timeout(800).request("ping", {});
-  }
-  async isConnected() {
-    try {
-      return await this.client.request("isConnected", {});
-    } catch {
-      return false;
-    }
-  }
-  async connect() {
-    return this.client.request("connect", {});
-  }
-  async disconnect() {
-    return this.client.request("disconnect", {});
-  }
-  async accounts() {
-    return this.client.request("accounts", {});
-  }
-  async currentAccount() {
-    return this.client.request("currentAccount", {});
-  }
-  async signMessage(address, message) {
-    if (!message.trim()) {
-      throw new Error("Message is required");
-    }
-    return this.client.request("signMessage", {
-      address,
-      message
-    });
-  }
-  async sendTransaction(address, transaction) {
-    if (!transaction) {
-      throw new Error("Transaction is required");
-    }
-    const txRequest = transactionRequestify(transaction);
-    const network = await this.currentNetwork();
-    const provider = {
-      url: network.url
-    };
-    return this.client.request("sendTransaction", {
-      address,
-      transaction: JSON.stringify(txRequest),
-      provider
-    });
-  }
-  async assets() {
-    return this.client.request("assets", {});
-  }
-  async addAsset(asset) {
-    return this.addAssets([asset]);
-  }
-  async addAssets(assets) {
-    const assetsData = assets.map((asset) => {
-      const fuelNetworkAsset = asset.networks.find((n) => n.type === "fuel");
-      if (!fuelNetworkAsset) {
-        throw new Error("Asset for Fuel Network not found!");
-      }
-      return {
-        ...asset,
-        imageUrl: asset.icon,
-        decimals: fuelNetworkAsset.decimals,
-        assetId: fuelNetworkAsset.assetId
-      };
-    });
-    return this.client.request("addAssets", {
-      assets: assetsData
-    });
-  }
-  async addABI(contractId, abi) {
-    return this.client.request("addAbi", {
-      abiMap: {
-        [contractId]: abi
-      }
-    });
-  }
-  async getABI(contractId) {
-    return this.client.request("getAbi", {
-      contractId
-    });
-  }
-  async hasABI(contractId) {
-    const abi = await this.getABI(contractId);
-    return !!abi;
-  }
-  async currentNetwork() {
-    return this.client.request("network", {});
-  }
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async selectNetwork(_network) {
-    throw new Error("Method not implemented.");
-  }
-  async networks() {
-    return this.client.request("networks", {});
-  }
-  async addNetwork(networkUrl) {
-    const provider = await Provider.create(networkUrl);
-    return this.client.request("addNetwork", {
-      network: {
-        url: provider.url,
-        name: provider.getChain().name
-      }
-    });
-  }
-  async version() {
-    return this.client.request("version", {
-      app: "0.0.0",
-      network: "0.0.0"
-    });
-  }
-};
-
-// src/connectors/fuel-wallet-development-connector.ts
-var FuelWalletDevelopmentConnector = class extends FuelWalletConnector {
-  metadata = {
-    image: "/connectors/fuel-wallet-dev.svg",
-    install: {
-      action: "Install",
-      description: "To connect your Fuel Wallet, you need to install the browser extension first.",
-      link: "https://chrome.google.com/webstore/detail/fuel-wallet-development/hcgmehahnlbhpilepakbdinkhhaackmc"
-    }
-  };
-  constructor() {
-    super("Fuel Wallet Development");
-  }
-};
-
-// src/connectors/fuelet-wallet-connector.ts
-var FueletWalletConnector = class extends FuelWalletConnector {
-  name = "Fuelet Wallet";
-  metadata = {
-    image: {
-      light: "/connectors/fuelet-light.svg",
-      dark: "/connectors/fuelet-dark.svg"
-    },
-    install: {
-      action: "Install",
-      description: "Install Fuelet Wallet in order to connect it.",
-      link: "https://fuelet.app/download/"
-    }
-  };
-  constructor() {
-    super("Fuelet Wallet");
-  }
-};
-
-// src/connectors/default-connector.ts
-function defaultConnectors({ devMode } = {}) {
-  const connectors = [new FuelWalletConnector(), new FueletWalletConnector()];
-  if (devMode) {
-    connectors.push(new FuelWalletDevelopmentConnector());
-  }
-  return connectors;
-}
-
 // src/connectors/fuel-wallet-locked.ts
 var FuelWalletLocked = class extends WalletLocked {
   connector;
@@ -9288,9 +9065,7 @@ var _Fuel = class extends FuelConnector {
   constructor(config = _Fuel.defaultConfig) {
     super();
     this.setMaxListeners(1e3);
-    this._connectors = config.connectors ?? defaultConnectors({
-      devMode: config.devMode
-    });
+    this._connectors = config.connectors ?? [];
     this._targetObject = this.getTargetObject(config.targetObject);
     this._storage = config.storage === void 0 ? this.getStorage() : config.storage;
     this.setupMethods();
@@ -9317,15 +9092,15 @@ var _Fuel = class extends FuelConnector {
    */
   getStorage() {
     if (typeof window !== "undefined") {
-      return window.localStorage;
+      return new LocalStorage(window.localStorage);
     }
     return void 0;
   }
   /**
    * Setup the default connector from the storage.
    */
-  setDefaultConnector() {
-    const connectorName = this._storage?.getItem(_Fuel.STORAGE_KEY) || this._connectors[0]?.name;
+  async setDefaultConnector() {
+    const connectorName = await this._storage?.getItem(_Fuel.STORAGE_KEY) || this._connectors[0]?.name;
     if (connectorName) {
       return this.selectConnector(connectorName, {
         emitEvents: false
@@ -9513,7 +9288,7 @@ var _Fuel = class extends FuelConnector {
       this._currentConnector = connector;
       this.emit(this.events.currentConnector, connector);
       this.setupConnectorEvents(Object.values(FuelConnectorEventTypes));
-      this._storage?.setItem(_Fuel.STORAGE_KEY, connector.name);
+      await this._storage?.setItem(_Fuel.STORAGE_KEY, connector.name);
       if (options.emitEvents) {
         this.triggerConnectorEvents();
       }
@@ -9595,15 +9370,15 @@ var _Fuel = class extends FuelConnector {
   /**
    * Clean all the data from the storage.
    */
-  clean() {
-    this._storage?.removeItem(_Fuel.STORAGE_KEY);
+  async clean() {
+    await this._storage?.removeItem(_Fuel.STORAGE_KEY);
   }
   /**
    * Removes all listeners and cleans the storage.
    */
-  destroy() {
+  async destroy() {
     this.unsubscribe();
-    this.clean();
+    await this.clean();
   }
 };
 var Fuel = _Fuel;
@@ -9627,13 +9402,11 @@ __publicField(Fuel, "defaultConfig", {});
   FuelConnectorEventType,
   FuelConnectorEventTypes,
   FuelConnectorMethods,
-  FuelWalletConnector,
-  FuelWalletDevelopmentConnector,
   FuelWalletLocked,
   FuelWalletProvider,
-  FueletWalletConnector,
   HDWallet,
   Language,
+  LocalStorage,
   MNEMONIC_SIZES,
   MemoryStorage,
   MessageTypes,
@@ -9670,7 +9443,6 @@ __publicField(Fuel, "defaultConfig", {});
   calculatePriceWithFactor,
   calculateTransactionFee,
   coinQuantityfy,
-  defaultConnectors,
   deferPromise,
   dispatchFuelConnectorEvent,
   english,