@fastnear/api 0.3.0 → 0.4.0

package/dist/umd/index.js

@@ -3640,7 +3640,7 @@ var FastNear = (() => {
     }
   }
   function withBlockId(params, blockId) {
-    return blockId === "final" || blockId === "optimistic" ? { ...params, finality: blockId } : !!blockId ? { ...params, block_id: blockId } : { ...params, finality: "optimistic" };
+    return blockId === "final" || blockId === "optimistic" ? { ...params, finality: blockId } : blockId ? { ...params, block_id: blockId } : { ...params, finality: "optimistic" };
   }
   async function queryRpc(method, params) {
     const response = await fetch(_config.nodeUrl, {
@@ -3736,10 +3736,10 @@ var FastNear = (() => {
       });
     }
     if (typeof s == "string") {
-      let match = s.match(/([0-9.,_]+)\s*([a-zA-Z]+)?/);
+      const match = s.match(/([0-9.,_]+)\s*([a-zA-Z]+)?/);
       if (match) {
-        let amount = match[1].replace(/[_,]/g, "");
-        let unitPart = match[2];
+        const amount = match[1].replace(/[_,]/g, "");
+        const unitPart = match[2];
         if (unitPart) {
           switch (unitPart.toLowerCase()) {
             case "near":
@@ -3749,9 +3749,10 @@ var FastNear = (() => {
             case "ggas":
               return big_default(amount).mul(big_default(10).pow(9)).toFixed(0);
             case "gas":
+            case "yoctonear":
               return big_default(amount).toFixed(0);
             default:
-              throw new Error(`Unknown unit: ${unit}`);
+              throw new Error(`Unknown unit: ${unitPart}`);
           }
         } else {
           return big_default(amount).toFixed(0);
@@ -3802,7 +3803,13 @@ var FastNear = (() => {
       return "SignedIn";
     },
     // Query Methods
-    async view({ contractId, methodName, args, argsBase64, blockId }) {
+    async view({
+      contractId,
+      methodName,
+      args,
+      argsBase64,
+      blockId
+    }) {
       const encodedArgs = argsBase64 || (args ? toBase64(JSON.stringify(args)) : "");
       const result = await queryRpc(
         "query",
@@ -3818,7 +3825,10 @@ var FastNear = (() => {
       );
       return parseJsonFromBytes(result.result);
     },
-    async account({ accountId, blockId }) {
+    async account({
+      accountId,
+      blockId
+    }) {
       return queryRpc(
         "query",
         withBlockId(
@@ -3833,7 +3843,11 @@ var FastNear = (() => {
     async block({ blockId }) {
       return queryRpc("block", withBlockId({}, blockId));
     },
-    async accessKey({ accountId, publicKey, blockId }) {
+    async accessKey({
+      accountId,
+      publicKey,
+      blockId
+    }) {
       return queryRpc(
         "query",
         withBlockId(
@@ -3853,7 +3867,11 @@ var FastNear = (() => {
       return [..._txHistory];
     },
     // Transaction Methods
-    async sendTx({ receiverId, actions, waitUntil }) {
+    async sendTx({
+      receiverId,
+      actions,
+      waitUntil
+    }) {
       const signerId = _state.accountId;
       if (!signerId) {
         throw new Error("Not signed in");
@@ -3873,7 +3891,7 @@ var FastNear = (() => {
           tx: jsonTransaction2,
           finalState: false
         });
-        const url = new URL(window.location.href);
+        const url = new URL(typeof window !== "undefined" ? window.location.href : "");
         url.searchParams.set("txIds", txId);
         _adapter.sendTransactions({
           transactions: [jsonTransaction2],
@@ -3882,16 +3900,18 @@ var FastNear = (() => {
           console.log("Transaction result:", result);
           if (result.url) {
             console.log("Redirecting to wallet:", result.url);
-            setTimeout(() => {
-              window.location.href = result.url;
-            }, 100);
+            if (typeof window !== "undefined") {
+              setTimeout(() => {
+                window.location.href = result.url;
+              }, 100);
+            }
           } else if (result.outcomes) {
-            result.outcomes.forEach((result2) => {
+            result.outcomes.forEach((r) => {
               updateTxHistory({
                 txId,
                 status: "Executed",
-                result: result2,
-                txHash: result2.transaction.hash,
+                result: r,
+                txHash: r.transaction.hash,
                 finalState: true
               });
             });
@@ -3919,10 +3939,11 @@ var FastNear = (() => {
         });
         return txId;
       }
-      const toDoPromises = {};
       let nonce = lsGet("nonce");
+      let block = lsGet("block");
+      const toDoPromises = {};
       if (nonce === null || nonce === void 0) {
-        toDoPromises.nonce = this.accessKey({
+        toDoPromises.nonce = api.accessKey({
           accountId: signerId,
           publicKey
         }).then((accessKey) => {
@@ -3933,30 +3954,30 @@ var FastNear = (() => {
           return accessKey.nonce;
         });
       }
-      let block = lsGet("block");
-      if (!block || parseFloat(block.header.timestamp_nanosec) / 1e6 + MaxBlockDelayMs < Date.now()) {
-        toDoPromises.block = this.block({ blockId: "final" }).then((block2) => {
-          block2 = {
+      if (!block || !block.header || parseFloat(block.header.timestamp_nanosec) / 1e6 + MaxBlockDelayMs < Date.now()) {
+        toDoPromises.block = api.block({ blockId: "final" }).then((b) => {
+          const newBlock = {
             header: {
-              prev_hash: block2.header.prev_hash,
-              timestamp_nanosec: block2.header.timestamp_nanosec
+              prev_hash: b.header.prev_hash,
+              timestamp_nanosec: b.header.timestamp_nanosec
             }
           };
-          lsSet("block", block2);
-          return block2;
+          lsSet("block", newBlock);
+          return newBlock;
         });
       }
       if (Object.keys(toDoPromises).length > 0) {
-        let results = await Promise.all(Object.values(toDoPromises));
-        for (let i = 0; i < results.length; i++) {
-          if (Object.keys(toDoPromises)[i] === "nonce") {
-            nonce = results[i];
-          } else if (Object.keys(toDoPromises)[i] === "block") {
-            block = results[i];
+        const results = await Promise.all(Object.values(toDoPromises));
+        const keys = Object.keys(toDoPromises);
+        results.forEach((res, i) => {
+          if (keys[i] === "nonce") {
+            nonce = res;
+          } else if (keys[i] === "block") {
+            block = res;
           }
-        }
+        });
       }
-      const newNonce = nonce + 1;
+      const newNonce = (nonce ?? 0) + 1;
       lsSet("nonce", newNonce);
       const blockHash = block.header.prev_hash;
       const jsonTransaction = {
@@ -3971,11 +3992,8 @@ var FastNear = (() => {
       const transaction = serializeTransaction(jsonTransaction);
       const txHash = binary_to_base58_default(sha256(transaction));
       const signature = signHash(txHash, privateKey);
-      const singedTransaction = serializeSignedTransaction(
-        jsonTransaction,
-        signature
-      );
-      const signedTxBase64 = toBase64(singedTransaction);
+      const signedTransaction = serializeSignedTransaction(jsonTransaction, signature);
+      const signedTxBase64 = toBase64(signedTransaction);
       updateTxHistory({
         status: "Pending",
         txId,
@@ -4008,9 +4026,11 @@ var FastNear = (() => {
       }
       if (result.url) {
         console.log("Redirecting to wallet:", result.url);
-        setTimeout(() => {
-          window.location.href = result.url;
-        }, 100);
+        if (typeof window !== "undefined") {
+          setTimeout(() => {
+            window.location.href = result.url;
+          }, 100);
+        }
       } else if (result.accountId) {
         updateState({
           accountId: result.accountId
@@ -4043,7 +4063,13 @@ var FastNear = (() => {
     },
     // Action Helpers
     actions: {
-      functionCall: ({ methodName, gas, deposit, args, argsBase64 }) => ({
+      functionCall: ({
+        methodName,
+        gas,
+        deposit,
+        args,
+        argsBase64
+      }) => ({
         type: "FunctionCall",
         methodName,
         args,
@@ -4104,66 +4130,68 @@ var FastNear = (() => {
     }
   };
   try {
-    const url = new URL(window.location.href);
-    const accountId = url.searchParams.get("account_id");
-    const publicKey = url.searchParams.get("public_key");
-    const errorCode = url.searchParams.get("errorCode");
-    const errorMessage = url.searchParams.get("errorMessage");
-    const transactionHashes = url.searchParams.get("transactionHashes");
-    const txIds = url.searchParams.get("txIds");
-    if (errorCode || errorMessage) {
-      console.warn(new Error(`Wallet error: ${errorCode} ${errorMessage}`));
-    }
-    if (accountId && publicKey) {
-      if (publicKey === _state.publicKey) {
-        updateState({
-          accountId
-        });
-      } else {
-        console.error(
-          new Error("Public key mismatch from wallet redirect"),
-          publicKey,
-          _state.publicKey
-        );
+    if (typeof window !== "undefined") {
+      const url = new URL(window.location.href);
+      const accountId = url.searchParams.get("account_id");
+      const publicKey = url.searchParams.get("public_key");
+      const errorCode = url.searchParams.get("errorCode");
+      const errorMessage = url.searchParams.get("errorMessage");
+      const transactionHashes = url.searchParams.get("transactionHashes");
+      const txIds = url.searchParams.get("txIds");
+      if (errorCode || errorMessage) {
+        console.warn(new Error(`Wallet error: ${errorCode} ${errorMessage}`));
       }
-    }
-    if (transactionHashes || txIds) {
-      const txHashes = transactionHashes ? transactionHashes.split(",") : [];
-      const txIdsArray = txIds ? txIds.split(",") : [];
-      if (txIdsArray.length > txHashes.length) {
-        txIdsArray.forEach((txId, i) => {
-          updateTxHistory({
-            txId,
-            status: "RejectedByUser",
-            finalState: true
+      if (accountId && publicKey) {
+        if (publicKey === _state.publicKey) {
+          updateState({
+            accountId
           });
-        });
-      } else if (txIdsArray.length === txHashes.length) {
-        txIdsArray.forEach((txId, i) => {
-          updateTxHistory({
-            txId,
-            status: "PendingGotTxHash",
-            txHash: txHashes[i],
-            finalState: false
+        } else {
+          console.error(
+            new Error("Public key mismatch from wallet redirect"),
+            publicKey,
+            _state.publicKey
+          );
+        }
+      }
+      if (transactionHashes || txIds) {
+        const txHashes = transactionHashes ? transactionHashes.split(",") : [];
+        const txIdsArray = txIds ? txIds.split(",") : [];
+        if (txIdsArray.length > txHashes.length) {
+          txIdsArray.forEach((txId, i) => {
+            updateTxHistory({
+              txId,
+              status: "RejectedByUser",
+              finalState: true
+            });
           });
-          afterTxSent(txId);
-        });
-      } else {
-        console.error(
-          new Error("Transaction hash mismatch from wallet redirect"),
-          txIdsArray,
-          txHashes
-        );
+        } else if (txIdsArray.length === txHashes.length) {
+          txIdsArray.forEach((txId, i) => {
+            updateTxHistory({
+              txId,
+              status: "PendingGotTxHash",
+              txHash: txHashes[i],
+              finalState: false
+            });
+            afterTxSent(txId);
+          });
+        } else {
+          console.error(
+            new Error("Transaction hash mismatch from wallet redirect"),
+            txIdsArray,
+            txHashes
+          );
+        }
       }
+      url.searchParams.delete("account_id");
+      url.searchParams.delete("public_key");
+      url.searchParams.delete("errorCode");
+      url.searchParams.delete("errorMessage");
+      url.searchParams.delete("all_keys");
+      url.searchParams.delete("transactionHashes");
+      url.searchParams.delete("txIds");
+      window.history.replaceState({}, "", url.toString());
     }
-    url.searchParams.delete("account_id");
-    url.searchParams.delete("public_key");
-    url.searchParams.delete("errorCode");
-    url.searchParams.delete("errorMessage");
-    url.searchParams.delete("all_keys");
-    url.searchParams.delete("transactionHashes");
-    url.searchParams.delete("txIds");
-    window.history.replaceState({}, "", url.toString());
   } catch (e) {
     console.error("Error handling wallet redirect:", e);
   }