@fastnear/api 0.9.7 → 0.9.8

package/dist/umd/browser.global.js

@@ -45,8 +45,10 @@ var near = (() => {
     sendRpc: () => sendRpc,
     sendTx: () => sendTx,
     sendTxToRpc: () => sendTxToRpc,
+    signMessage: () => signMessage,
     signOut: () => signOut,
     state: () => state,
+    useWallet: () => useWallet,
     utils: () => utils,
     view: () => view,
     withBlockId: () => withBlockId
@@ -1568,7 +1570,7 @@ var near = (() => {
         const points = [];
         let p = elm;
         let base = p;
-        for (let window2 = 0; window2 < windows; window2++) {
+        for (let window = 0; window < windows; window++) {
           base = p;
           points.push(base);
           for (let i = 1; i < windowSize; i++) {
@@ -1593,8 +1595,8 @@ var near = (() => {
         const mask = BigInt(2 ** W - 1);
         const maxNumber = 2 ** W;
         const shiftBy = BigInt(W);
-        for (let window2 = 0; window2 < windows; window2++) {
-          const offset = window2 * windowSize;
+        for (let window = 0; window < windows; window++) {
+          const offset = window * windowSize;
           let wbits = Number(n & mask);
           n >>= shiftBy;
           if (wbits > windowSize) {
@@ -1603,7 +1605,7 @@ var near = (() => {
           }
           const offset1 = offset;
           const offset2 = offset + Math.abs(wbits) - 1;
-          const cond1 = window2 % 2 !== 0;
+          const cond1 = window % 2 !== 0;
           const cond2 = wbits < 0;
           if (wbits === 0) {
             f = f.add(constTimeNegate(cond1, precomputes[offset1]));
@@ -1626,8 +1628,8 @@ var near = (() => {
         const mask = BigInt(2 ** W - 1);
         const maxNumber = 2 ** W;
         const shiftBy = BigInt(W);
-        for (let window2 = 0; window2 < windows; window2++) {
-          const offset = window2 * windowSize;
+        for (let window = 0; window < windows; window++) {
+          const offset = window * windowSize;
           if (n === _0n3)
             break;
           let wbits = Number(n & mask);
@@ -2362,11 +2364,11 @@ var near = (() => {
   };
   var sha256 = /* @__PURE__ */ wrapConstructor(() => new SHA256());
 
-  // ../../node_modules/base58-js/base58_chars.mjs
+  // ../utils/node_modules/base58-js/base58_chars.js
   var base58_chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
   var base58_chars_default = base58_chars;
 
-  // ../../node_modules/base58-js/base58_to_binary.mjs
+  // ../utils/node_modules/base58-js/base58_to_binary.js
   function base58_to_binary(base58String) {
     if (!base58String || typeof base58String !== "string")
       throw new Error(`Expected base58 string but got \u201C${base58String}\u201D`);
@@ -2397,7 +2399,7 @@ var near = (() => {
   __name(base58_to_binary, "base58_to_binary");
   var base58_to_binary_default = base58_to_binary;
 
-  // ../../node_modules/base58-js/create_base58_map.mjs
+  // ../utils/node_modules/base58-js/create_base58_map.js
   var create_base58_map = /* @__PURE__ */ __name(() => {
     const base58M = Array(256).fill(-1);
     for (let i = 0; i < base58_chars_default.length; ++i)
@@ -2406,7 +2408,7 @@ var near = (() => {
   }, "create_base58_map");
   var create_base58_map_default = create_base58_map;
 
-  // ../../node_modules/base58-js/binary_to_base58.mjs
+  // ../utils/node_modules/base58-js/binary_to_base58.js
   var base58Map = create_base58_map_default();
   function binary_to_base58(uint8array) {
     const result = [];
@@ -3562,8 +3564,6 @@ var near = (() => {
   __export(state_exports, {
     DEFAULT_NETWORK_ID: () => DEFAULT_NETWORK_ID,
     NETWORKS: () => NETWORKS,
-    WIDGET_URL: () => WIDGET_URL,
-    _adapter: () => _adapter,
     _config: () => _config,
     _state: () => _state,
     _txHistory: () => _txHistory,
@@ -3571,177 +3571,13 @@ var near = (() => {
     events: () => events,
     getConfig: () => getConfig,
     getTxHistory: () => getTxHistory,
-    getWalletAdapterState: () => getWalletAdapterState,
-    onAdapterStateUpdate: () => onAdapterStateUpdate,
+    getWalletProvider: () => getWalletProvider,
     resetTxHistory: () => resetTxHistory,
     setConfig: () => setConfig,
+    setWalletProvider: () => setWalletProvider,
     update: () => update,
     updateTxHistory: () => updateTxHistory
   });
-
-  // ../wallet-adapter/src/index.ts
-  var WalletAdapter = class _WalletAdapter {
-    static {
-      __name(this, "WalletAdapter");
-    }
-    /** @type {HTMLIFrameElement} */
-    #iframe = null;
-    /** @type {string} */
-    #targetOrigin;
-    /** @type {string} */
-    #widgetUrl;
-    /** @type {Map<string, Function>} */
-    #pending = /* @__PURE__ */ new Map();
-    /** @type {WalletState} */
-    #state;
-    /** @type {Function} */
-    #onStateUpdate;
-    /** @type {string} */
-    #callbackUrl;
-    /** @type {string} */
-    static defaultWidgetUrl = "https://wallet-adapter.fastnear.com";
-    /**
-     * @param {WalletAdapterConfig} [config]
-     */
-    constructor({
-      widgetUrl = _WalletAdapter.defaultWidgetUrl,
-      targetOrigin = "*",
-      onStateUpdate,
-      lastState,
-      callbackUrl = window.location.href
-    } = {}) {
-      this.#targetOrigin = targetOrigin;
-      this.#widgetUrl = widgetUrl;
-      this.#onStateUpdate = onStateUpdate;
-      this.#callbackUrl = callbackUrl;
-      this.#state = lastState || {};
-      window.addEventListener("message", this.#handleMessage.bind(this));
-    }
-    /**
-     * Creates an iframe for wallet interaction
-     * @param {string} path - Path to load in iframe
-     * @returns {HTMLIFrameElement}
-     */
-    #createIframe(path) {
-      if (this.#iframe) {
-        this.#iframe.remove();
-      }
-      const url = new URL(path, this.#widgetUrl);
-      const iframe = document.createElement("iframe");
-      iframe.src = url.toString();
-      iframe.allow = "usb";
-      iframe.style.border = "none";
-      iframe.style.zIndex = "10000";
-      iframe.style.position = "fixed";
-      iframe.style.display = "block";
-      iframe.style.top = "0";
-      iframe.style.left = "0";
-      iframe.style.width = "100%";
-      iframe.style.height = "100%";
-      document.body.appendChild(iframe);
-      this.#iframe = iframe;
-      return iframe;
-    }
-    /**
-     * Handles messages from the wallet widget
-     * @param {MessageEvent} event
-     */
-    #handleMessage(event2) {
-      if (this.#targetOrigin !== "*" && event2.origin !== this.#targetOrigin) {
-        return;
-      }
-      const { id, type, action, payload } = event2.data;
-      if (type !== "wallet-adapter") return;
-      if (action === "close") {
-        this.#iframe?.remove();
-        this.#iframe = null;
-        return;
-      }
-      if (payload?.state) {
-        this.#state = { ...this.#state, ...payload.state };
-        this.#onStateUpdate?.(this.#state);
-      }
-      const resolve = this.#pending.get(id);
-      if (resolve) {
-        this.#pending.delete(id);
-        this.#iframe?.remove();
-        this.#iframe = null;
-        resolve(payload);
-      }
-    }
-    /**
-     * Sends a message to the wallet widget
-     * @param {string} path - Path to load in iframe
-     * @param {string} method - Method to call
-     * @param {Object} params - Parameters to pass
-     * @returns {Promise<any>}
-     */
-    async #sendMessage(path, method, params) {
-      return new Promise((resolve) => {
-        const id = Math.random().toString(36).slice(2);
-        this.#pending.set(id, resolve);
-        const iframe = this.#createIframe(path);
-        iframe.onload = () => {
-          iframe.contentWindow?.postMessage(
-            {
-              type: "wallet-adapter",
-              method,
-              params: {
-                id,
-                ...params,
-                state: this.#state,
-                callbackUrl: params.callbackUrl || this.#callbackUrl
-              }
-            },
-            this.#targetOrigin
-          );
-        };
-      });
-    }
-    /**
-     * Get current wallet state
-     * @returns {WalletState}
-     */
-    getState() {
-      return { ...this.#state };
-    }
-    /**
-     * Set current wallet state
-     * @param state
-     */
-    setState(state2) {
-      this.#state = state2;
-    }
-    /**
-     * Sign in with a NEAR wallet
-     * @param {SignInConfig} config
-     * @returns {Promise<any>}
-     *
-     * Should be returning SignInResult
-     */
-    async signIn(config2) {
-      return this.#sendMessage("/login.html", "signIn", config2);
-    }
-    /**
-     * Send a transaction using connected wallet
-     * @param {TransactionConfig} config
-     * @returns {Promise<TransactionResult>}
-     */
-    async sendTransactions(config2) {
-      return this.#sendMessage("/send.html", "sendTransactions", config2);
-    }
-    /**
-     * Clean up adapter resources
-     */
-    destroy() {
-      window.removeEventListener("message", this.#handleMessage);
-      this.#iframe?.remove();
-      this.#iframe = null;
-    }
-  };
-
-  // src/state.ts
-  var WIDGET_URL = "https://js.cdn.fastnear.com";
   var DEFAULT_NETWORK_ID = "mainnet";
   var NETWORKS = {
     testnet: {
@@ -3757,28 +3593,13 @@ var near = (() => {
     ...NETWORKS[DEFAULT_NETWORK_ID]
   };
   var _state = lsGet("state") || {};
-  var onAdapterStateUpdate = /* @__PURE__ */ __name((state2) => {
-    console.log("Adapter state update:", state2);
-    const { accountId: accountId2, lastWalletId, privateKey } = state2;
-    update({
-      accountId: accountId2 || void 0,
-      lastWalletId: lastWalletId || void 0,
-      ...privateKey ? { privateKey } : {}
-    });
-  }, "onAdapterStateUpdate");
-  var getWalletAdapterState = /* @__PURE__ */ __name(() => {
-    return {
-      publicKey: _state.publicKey,
-      accountId: _state.accountId,
-      lastWalletId: _state.lastWalletId,
-      networkId: _config.networkId
-    };
-  }, "getWalletAdapterState");
-  var _adapter = new WalletAdapter({
-    onStateUpdate: onAdapterStateUpdate,
-    lastState: getWalletAdapterState(),
-    widgetUrl: WIDGET_URL
-  });
+  var _walletProvider = null;
+  var setWalletProvider = /* @__PURE__ */ __name((provider) => {
+    _walletProvider = provider;
+  }, "setWalletProvider");
+  var getWalletProvider = /* @__PURE__ */ __name(() => {
+    return _walletProvider;
+  }, "getWalletProvider");
   try {
     _state.publicKey = _state.privateKey ? publicKeyFromPrivate(_state.privateKey) : null;
   } catch (e) {
@@ -3855,9 +3676,6 @@ var near = (() => {
     if (newState.accountId !== oldState.accountId) {
       events.notifyAccountListeners(newState.accountId);
     }
-    if (newState.hasOwnProperty("lastWalletId") && newState.lastWalletId !== oldState.lastWalletId || newState.hasOwnProperty("accountId") && newState.accountId !== oldState.accountId || newState.hasOwnProperty("privateKey") && newState.privateKey !== oldState.privateKey) {
-      _adapter.setState(getWalletAdapterState());
-    }
   }, "update");
   var updateTxHistory = /* @__PURE__ */ __name((txStatus) => {
     const txId = txStatus.txId;
@@ -4012,27 +3830,28 @@ var near = (() => {
       publicKey: publicKey2
     };
   }, "selected");
-  var requestSignIn = /* @__PURE__ */ __name(async ({ contractId }) => {
-    const privateKey = privateKeyFromRandom();
-    update({ accessKeyContractId: contractId, accountId: null, privateKey });
-    const pubKey = publicKeyFromPrivate(privateKey);
-    const result = await _adapter.signIn({
-      networkId: getConfig().networkId,
+  var requestSignIn = /* @__PURE__ */ __name(async ({
+    contractId,
+    excludedWallets,
+    features
+  } = {}) => {
+    const provider = getWalletProvider();
+    if (!provider) {
+      throw new Error("No wallet provider set. Call useWallet() first or load the @fastnear/wallet IIFE bundle.");
+    }
+    if (provider.isConnected()) {
+      await provider.disconnect();
+    }
+    const result = await provider.connect({
       contractId,
-      publicKey: pubKey
+      network: getConfig().networkId,
+      excludedWallets,
+      features
     });
-    if (result.error) {
-      throw new Error(`Wallet error: ${result.error}`);
-    }
-    if (result.url) {
-      if (typeof window !== "undefined") {
-        setTimeout(() => {
-          window.location.href = result.url;
-        }, 100);
-      }
-    } else if (result.accountId) {
-      update({ accountId: result.accountId });
+    if (!result) {
+      return;
     }
+    update({ accountId: result.accountId });
   }, "requestSignIn");
   var view = /* @__PURE__ */ __name(async ({
     contractId,
@@ -4087,7 +3906,11 @@ var near = (() => {
   var localTxHistory = /* @__PURE__ */ __name(() => {
     return getTxHistory();
   }, "localTxHistory");
-  var signOut = /* @__PURE__ */ __name(() => {
+  var signOut = /* @__PURE__ */ __name(async () => {
+    const provider = getWalletProvider();
+    if (provider?.isConnected()) {
+      await provider.disconnect();
+    }
     update({ accountId: null, privateKey: null, contractId: null });
     setConfig(NETWORKS[DEFAULT_NETWORK_ID]);
   }, "signOut");
@@ -4098,56 +3921,36 @@ var near = (() => {
   }) => {
     const signerId = _state.accountId;
     if (!signerId) throw new Error("Must sign in");
-    const publicKey2 = _state.publicKey ?? "";
+    const pubKey = _state.publicKey ?? "";
     const privKey = _state.privateKey;
     const txId = generateTxId();
     if (!privKey || receiverId !== _state.accessKeyContractId || !canSignWithLAK(actions2)) {
       const jsonTx = { signerId, receiverId, actions: actions2 };
       updateTxHistory({ status: "Pending", txId, tx: jsonTx, finalState: false });
-      const url = new URL(typeof window !== "undefined" ? window.location.href : "");
-      url.searchParams.set("txIds", txId);
-      const existingParams = new URLSearchParams(window.location.search);
-      existingParams.forEach((value, key) => {
-        if (!url.searchParams.has(key)) {
-          url.searchParams.set(key, value);
-        }
-      });
-      url.searchParams.delete("errorCode");
-      url.searchParams.delete("errorMessage");
       try {
-        const result = await _adapter.sendTransactions({
-          transactions: [jsonTx],
-          callbackUrl: url.toString()
-        });
-        if (result.url) {
-          if (typeof window !== "undefined") {
-            setTimeout(() => {
-              window.location.href = result.url;
-            }, 100);
-          }
-        } else if (result.outcomes?.length) {
+        const provider = getWalletProvider();
+        if (!provider?.isConnected()) {
+          throw new Error("Must sign in");
+        }
+        const result = await provider.sendTransaction(jsonTx);
+        if (!result) {
+          updateTxHistory({ txId, status: "RejectedByUser", finalState: true });
+          return { rejected: true };
+        }
+        if (result.outcomes?.length) {
           result.outcomes.forEach(
             (r) => updateTxHistory({
               txId,
               status: "Executed",
               result: r,
-              txHash: r.transaction.hash,
+              txHash: r.transaction?.hash,
               finalState: true
             })
           );
-        } else if (result.rejected) {
-          updateTxHistory({ txId, status: "RejectedByUser", finalState: true });
-        } else if (result.error) {
-          updateTxHistory({
-            txId,
-            status: "Error",
-            error: tryParseJson(result.error),
-            finalState: true
-          });
         }
         return result;
       } catch (err) {
-        console.error("fastnear: error sending tx using adapter:", err);
+        console.error("fastnear: error sending tx using wallet provider:", err);
         updateTxHistory({
           txId,
           status: "Error",
@@ -4159,9 +3962,9 @@ var near = (() => {
     }
     let nonce = lsGet("nonce");
     if (nonce == null) {
-      const accessKey = await queryAccessKey({ accountId: signerId, publicKey: publicKey2 });
+      const accessKey = await queryAccessKey({ accountId: signerId, publicKey: pubKey });
       if (accessKey.result.error) {
-        throw new Error(`Access key error: ${accessKey.result.error} when attempting to get nonce for ${signerId} for public key ${publicKey2}`);
+        throw new Error(`Access key error: ${accessKey.result.error} when attempting to get nonce for ${signerId} for public key ${pubKey}`);
       }
       nonce = accessKey.result.nonce;
       lsSet("nonce", nonce);
@@ -4182,7 +3985,7 @@ var near = (() => {
     const blockHash = lastKnownBlock.header.hash;
     const plainTransactionObj = {
       signerId,
-      publicKey: publicKey2,
+      publicKey: pubKey,
       nonce,
       receiverId,
       blockHash,
@@ -4209,6 +4012,19 @@ var near = (() => {
       console.error("Error Sending Transaction:", error, plainTransactionObj, signedTxBase64);
     }
   }, "sendTx");
+  var signMessage = /* @__PURE__ */ __name(async (message) => {
+    const provider = getWalletProvider();
+    if (!provider?.isConnected()) {
+      throw new Error("Must sign in");
+    }
+    if (!provider.signMessage) {
+      throw new Error("Connected wallet does not support signMessage");
+    }
+    return provider.signMessage(message);
+  }, "signMessage");
+  var useWallet = /* @__PURE__ */ __name((provider) => {
+    setWalletProvider(provider);
+  }, "useWallet");
   var exp2 = {
     utils: {},
     // we will map this in a moment, giving keys, for IDE hints
@@ -4225,61 +4041,6 @@ var near = (() => {
   }
   var event = state["events"];
   delete state["events"];
-  try {
-    if (typeof window !== "undefined") {
-      const url = new URL(window.location.href);
-      const accId = url.searchParams.get("account_id");
-      const pubKey = url.searchParams.get("public_key");
-      const errCode = url.searchParams.get("errorCode");
-      const errMsg = url.searchParams.get("errorMessage");
-      const decodedErrMsg = errMsg ? decodeURIComponent(errMsg) : null;
-      const txHashes = url.searchParams.get("transactionHashes");
-      const txIds = url.searchParams.get("txIds");
-      if (errCode || errMsg) {
-        console.warn(new Error(`Wallet raises:
-code: ${errCode}
-message: ${decodedErrMsg}`));
-      }
-      if (accId && pubKey) {
-        if (pubKey === _state.publicKey) {
-          update({ accountId: accId });
-        } else {
-          if (authStatus() === "SignedIn") {
-            console.warn("Public key mismatch from wallet redirect", pubKey, _state.publicKey);
-          }
-          url.searchParams.delete("public_key");
-        }
-      }
-      if (txHashes || txIds) {
-        const hashArr = txHashes ? txHashes.split(",") : [];
-        const idArr = txIds ? txIds.split(",") : [];
-        if (idArr.length > hashArr.length) {
-          idArr.forEach((id) => {
-            updateTxHistory({ txId: id, status: "RejectedByUser", finalState: true });
-          });
-        } else if (idArr.length === hashArr.length) {
-          idArr.forEach((id, i) => {
-            updateTxHistory({
-              txId: id,
-              status: "PendingGotTxHash",
-              txHash: hashArr[i],
-              finalState: false
-            });
-            afterTxSent(id);
-          });
-        } else {
-          console.error(new Error("Transaction hash mismatch from wallet redirect"), idArr, hashArr);
-        }
-      }
-      url.searchParams.delete("txIds");
-      if (authStatus() === "SignedOut") {
-        url.searchParams.delete("errorCode");
-        url.searchParams.delete("errorMessage");
-      }
-    }
-  } catch (e) {
-    console.error("Error handling wallet redirect:", e);
-  }
   var actions = {
     functionCall: /* @__PURE__ */ __name(({
       methodName,
@@ -4365,7 +4126,7 @@ message: ${decodedErrMsg}`));
 
 try {
   Object.defineProperty(globalThis, 'near', {
-    value: near,    
+    value: near,
     enumerable: true,
     configurable: false,
   });
@@ -4376,4 +4137,8 @@ try {
 
 window.$$ = near.utils.convertUnit;
 
+if (typeof globalThis.nearWallet !== 'undefined') {
+  near.useWallet(globalThis.nearWallet);
+}
+
 //# sourceMappingURL=browser.global.js.map