@fastnear/api 0.8.0 → 0.9.0

package/dist/cjs/state.cjs

@@ -26,27 +26,23 @@ __export(state_exports, {
   WIDGET_URL: () => WIDGET_URL,
   _adapter: () => _adapter,
   _config: () => _config,
-  _eventListeners: () => _eventListeners,
   _state: () => _state,
   _txHistory: () => _txHistory,
   _unbroadcastedEvents: () => _unbroadcastedEvents,
+  events: () => events,
   getConfig: () => getConfig,
   getTxHistory: () => getTxHistory,
   getWalletAdapterState: () => getWalletAdapterState,
-  notifyAccountListeners: () => notifyAccountListeners,
-  notifyTxListeners: () => notifyTxListeners,
-  onAccount: () => onAccount,
   onAdapterStateUpdate: () => onAdapterStateUpdate,
-  onTx: () => onTx,
   resetTxHistory: () => resetTxHistory,
   setConfig: () => setConfig,
-  updateState: () => updateState,
+  update: () => update,
   updateTxHistory: () => updateTxHistory
 });
 module.exports = __toCommonJS(state_exports);
 var import_utils = require("@fastnear/utils");
 var import_wallet_adapter = require("@fastnear/wallet-adapter");
-const WIDGET_URL = "https://wallet-adapter.fastnear.com";
+const WIDGET_URL = "https://js.cdn.fastnear.com";
 const DEFAULT_NETWORK_ID = "mainnet";
 const NETWORKS = {
   testnet: {
@@ -65,7 +61,7 @@ let _state = (0, import_utils.lsGet)("state") || {};
 const onAdapterStateUpdate = /* @__PURE__ */ __name((state) => {
   console.log("Adapter state update:", state);
   const { accountId, lastWalletId, privateKey } = state;
-  updateState({
+  update({
     accountId: accountId || void 0,
     lastWalletId: lastWalletId || void 0,
     ...privateKey ? { privateKey } : {}
@@ -92,15 +88,59 @@ try {
   (0, import_utils.lsSet)("nonce", null);
 }
 let _txHistory = (0, import_utils.lsGet)("txHistory") || {};
-const _eventListeners = {
-  account: /* @__PURE__ */ new Set(),
-  tx: /* @__PURE__ */ new Set()
-};
 const _unbroadcastedEvents = {
   account: [],
   tx: []
 };
-const updateState = /* @__PURE__ */ __name((newState) => {
+const events = {
+  _eventListeners: {
+    account: /* @__PURE__ */ new Set(),
+    tx: /* @__PURE__ */ new Set()
+  },
+  notifyAccountListeners: /* @__PURE__ */ __name((accountId) => {
+    if (events._eventListeners.account.size === 0) {
+      _unbroadcastedEvents.account.push(accountId);
+      return;
+    }
+    events._eventListeners.account.forEach((callback) => {
+      try {
+        callback(accountId);
+      } catch (e) {
+        console.error(e);
+      }
+    });
+  }, "notifyAccountListeners"),
+  notifyTxListeners: /* @__PURE__ */ __name((tx) => {
+    if (events._eventListeners.tx.size === 0) {
+      _unbroadcastedEvents.tx.push(tx);
+      return;
+    }
+    events._eventListeners.tx.forEach((callback) => {
+      try {
+        callback(tx);
+      } catch (e) {
+        console.error(e);
+      }
+    });
+  }, "notifyTxListeners"),
+  onAccount: /* @__PURE__ */ __name((callback) => {
+    events._eventListeners.account.add(callback);
+    if (_unbroadcastedEvents.account.length > 0) {
+      const accountEvent = _unbroadcastedEvents.account;
+      _unbroadcastedEvents.account = [];
+      accountEvent.forEach(events.notifyAccountListeners);
+    }
+  }, "onAccount"),
+  onTx: /* @__PURE__ */ __name((callback) => {
+    events._eventListeners.tx.add(callback);
+    if (_unbroadcastedEvents.tx.length > 0) {
+      const txEvent = _unbroadcastedEvents.tx;
+      _unbroadcastedEvents.tx = [];
+      txEvent.forEach(events.notifyTxListeners);
+    }
+  }, "onTx")
+};
+const update = /* @__PURE__ */ __name((newState) => {
   const oldState = _state;
   _state = { ..._state, ...newState };
   (0, import_utils.lsSet)("state", {
@@ -114,12 +154,12 @@ const updateState = /* @__PURE__ */ __name((newState) => {
     (0, import_utils.lsSet)("nonce", null);
   }
   if (newState.accountId !== oldState.accountId) {
-    notifyAccountListeners(newState.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());
   }
-}, "updateState");
+}, "update");
 const updateTxHistory = /* @__PURE__ */ __name((txStatus) => {
   const txId = txStatus.txId;
   _txHistory[txId] = {
@@ -128,50 +168,8 @@ const updateTxHistory = /* @__PURE__ */ __name((txStatus) => {
     updateTimestamp: Date.now()
   };
   (0, import_utils.lsSet)("txHistory", _txHistory);
-  notifyTxListeners(_txHistory[txId]);
+  events.notifyTxListeners(_txHistory[txId]);
 }, "updateTxHistory");
-const notifyAccountListeners = /* @__PURE__ */ __name((accountId) => {
-  if (_eventListeners.account.size === 0) {
-    _unbroadcastedEvents.account.push(accountId);
-    return;
-  }
-  _eventListeners.account.forEach((callback) => {
-    try {
-      callback(accountId);
-    } catch (e) {
-      console.error(e);
-    }
-  });
-}, "notifyAccountListeners");
-const notifyTxListeners = /* @__PURE__ */ __name((tx) => {
-  if (_eventListeners.tx.size === 0) {
-    _unbroadcastedEvents.tx.push(tx);
-    return;
-  }
-  _eventListeners.tx.forEach((callback) => {
-    try {
-      callback(tx);
-    } catch (e) {
-      console.error(e);
-    }
-  });
-}, "notifyTxListeners");
-const onAccount = /* @__PURE__ */ __name((callback) => {
-  _eventListeners.account.add(callback);
-  if (_unbroadcastedEvents.account.length > 0) {
-    const events = _unbroadcastedEvents.account;
-    _unbroadcastedEvents.account = [];
-    events.forEach(notifyAccountListeners);
-  }
-}, "onAccount");
-const onTx = /* @__PURE__ */ __name((callback) => {
-  _eventListeners.tx.add(callback);
-  if (_unbroadcastedEvents.tx.length > 0) {
-    const events = _unbroadcastedEvents.tx;
-    _unbroadcastedEvents.tx = [];
-    events.forEach(notifyTxListeners);
-  }
-}, "onTx");
 const getConfig = /* @__PURE__ */ __name(() => {
   return _config;
 }, "getConfig");
@@ -193,21 +191,17 @@ const resetTxHistory = /* @__PURE__ */ __name(() => {
   WIDGET_URL,
   _adapter,
   _config,
-  _eventListeners,
   _state,
   _txHistory,
   _unbroadcastedEvents,
+  events,
   getConfig,
   getTxHistory,
   getWalletAdapterState,
-  notifyAccountListeners,
-  notifyTxListeners,
-  onAccount,
   onAdapterStateUpdate,
-  onTx,
   resetTxHistory,
   setConfig,
-  updateState,
+  update,
   updateTxHistory
 });
 //# sourceMappingURL=state.cjs.map

package/dist/cjs/state.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state.ts"],"sourcesContent":["import {\n  lsSet,\n  lsGet,\n  publicKeyFromPrivate,\n} from \"@fastnear/utils\";\nimport {WalletAdapter} from \"@fastnear/wallet-adapter\";\n\nexport const WIDGET_URL = \"https://wallet-adapter.fastnear.com\";\n\nexport const DEFAULT_NETWORK_ID = \"mainnet\";\nexport const NETWORKS = {\n  testnet: {\n    networkId: \"testnet\",\n    nodeUrl: \"https://rpc.testnet.fastnear.com/\",\n  },\n  mainnet: {\n    networkId: \"mainnet\",\n    nodeUrl: \"https://rpc.mainnet.fastnear.com/\",\n  },\n};\n\nexport interface NetworkConfig {\n  networkId: string;\n  nodeUrl?: string;\n  walletUrl?: string;\n  helperUrl?: string;\n  explorerUrl?: string;\n\n  [key: string]: any;\n}\n\nexport interface AppState {\n  accountId?: string | null;\n  privateKey?: string | null;\n  lastWalletId?: string | null;\n  publicKey?: string | null;\n  accessKeyContractId?: string | null;\n\n  [key: string]: any;\n}\n\nexport interface TxStatus {\n  txId: string;\n  updateTimestamp?: number;\n\n  [key: string]: any;\n}\n\nexport type TxHistory = Record<string, TxStatus>;\n\nexport interface EventListeners {\n  account: Set<(accountId: string) => void>;\n  tx: Set<(tx: TxStatus) => void>;\n}\n\nexport interface UnbroadcastedEvents {\n  account: string[];\n  tx: TxStatus[];\n}\n\nexport interface WalletAdapterState {\n  publicKey?: string | null;\n  privateKey?: string | null;\n  accountId?: string | null;\n  lastWalletId?: string | null;\n  networkId: string;\n}\n\n\n// Load config from localStorage or default to the network's config\nexport let _config: NetworkConfig = lsGet(\"config\") || {\n  ...NETWORKS[DEFAULT_NETWORK_ID]\n};\n\n// Load application state from localStorage\nexport let _state: AppState = lsGet(\"state\") || {};\n\n// Triggered by the wallet adapter\nexport const onAdapterStateUpdate = (state: WalletAdapterState) => {\n  console.log(\"Adapter state update:\", state);\n  const { accountId, lastWalletId, privateKey } = state;\n  updateState({\n    accountId: accountId || undefined,\n    lastWalletId: lastWalletId || undefined,\n    ...(privateKey ? { privateKey } : {}),\n  });\n}\n\nexport const getWalletAdapterState = (): WalletAdapterState => {\n  return {\n    publicKey: _state.publicKey,\n    accountId: _state.accountId,\n    lastWalletId: _state.lastWalletId,\n    networkId: DEFAULT_NETWORK_ID,\n  };\n}\n\n// We can create an adapter instance here\nexport let _adapter = new WalletAdapter({\n  onStateUpdate: onAdapterStateUpdate,\n  lastState: getWalletAdapterState(),\n  widgetUrl: WIDGET_URL,\n});\n\n// Attempt to set publicKey if we have a privateKey\ntry {\n  _state.publicKey = _state.privateKey\n    ? publicKeyFromPrivate(_state.privateKey)\n    : null;\n} catch (e) {\n  console.error(\"Error parsing private key:\", e);\n  _state.privateKey = null;\n  lsSet(\"nonce\", null);\n}\n\n// Transaction history\nexport let _txHistory: TxHistory = lsGet(\"txHistory\") || {};\n\n// Event listeners\nexport const _eventListeners: EventListeners = {\n  account: new Set(),\n  tx: new Set(),\n};\n\nexport const _unbroadcastedEvents: UnbroadcastedEvents = {\n  account: [],\n  tx: [],\n};\n\n// Mutators\n// @todo: in favor of limiting when out of alpha\n//    but haven't given it enough thought ~ mike\nexport const updateState = (newState: Partial<AppState>) => {\n  const oldState = _state;\n  _state = {..._state, ...newState};\n\n  lsSet(\"state\", {\n    accountId: _state.accountId,\n    privateKey: _state.privateKey,\n    lastWalletId: _state.lastWalletId,\n    accessKeyContractId: _state.accessKeyContractId,\n  });\n\n  if (\n    newState.hasOwnProperty(\"privateKey\") &&\n    newState.privateKey !== oldState.privateKey\n  ) {\n    _state.publicKey = newState.privateKey\n      ? publicKeyFromPrivate(newState.privateKey as string)\n      : null;\n    lsSet(\"nonce\", null);\n  }\n\n  if (newState.accountId !== oldState.accountId) {\n    notifyAccountListeners(newState.accountId as string);\n  }\n\n  if (\n    (newState.hasOwnProperty(\"lastWalletId\") &&\n      newState.lastWalletId !== oldState.lastWalletId) ||\n    (newState.hasOwnProperty(\"accountId\") &&\n      newState.accountId !== oldState.accountId) ||\n    (newState.hasOwnProperty(\"privateKey\") &&\n      newState.privateKey !== oldState.privateKey)\n  ) {\n    _adapter.setState(getWalletAdapterState());\n  }\n}\n\nexport const updateTxHistory = (txStatus: TxStatus) => {\n  const txId = txStatus.txId;\n  _txHistory[txId] = {\n    ...(_txHistory[txId] || {}),\n    ...txStatus,\n    updateTimestamp: Date.now(),\n  };\n  lsSet(\"txHistory\", _txHistory);\n  notifyTxListeners(_txHistory[txId]);\n}\n\n\n\n// Event Notifiers\nexport const notifyAccountListeners = (accountId: string) => {\n  if (_eventListeners.account.size === 0) {\n    _unbroadcastedEvents.account.push(accountId);\n    return;\n  }\n  _eventListeners.account.forEach((callback) => {\n    try {\n      callback(accountId);\n    } catch (e) {\n      console.error(e);\n    }\n  });\n}\n\nexport const notifyTxListeners = (tx: TxStatus) => {\n  if (_eventListeners.tx.size === 0) {\n    _unbroadcastedEvents.tx.push(tx);\n    return;\n  }\n  _eventListeners.tx.forEach((callback) => {\n    try {\n      callback(tx);\n    } catch (e) {\n      console.error(e);\n    }\n  });\n}\n\n// Event Handlers\nexport const onAccount = (callback: (accountId: string) => void) => {\n  _eventListeners.account.add(callback);\n  if (_unbroadcastedEvents.account.length > 0) {\n    const events = _unbroadcastedEvents.account;\n    _unbroadcastedEvents.account = [];\n    events.forEach(notifyAccountListeners);\n  }\n};\n\nexport const onTx = (callback: (tx: TxStatus) => void): void => {\n  _eventListeners.tx.add(callback);\n  if (_unbroadcastedEvents.tx.length > 0) {\n    const events = _unbroadcastedEvents.tx;\n    _unbroadcastedEvents.tx = [];\n    events.forEach(notifyTxListeners);\n  }\n};\n\nexport const getConfig = (): NetworkConfig => {\n  return _config;\n}\n\nexport const getTxHistory = (): TxHistory => {\n  return _txHistory;\n}\n\n// Exposed \"write\" functions\nexport const setConfig = (newConf: NetworkConfig): void => {\n  _config = { ...NETWORKS[newConf.networkId], ...newConf };\n  lsSet(\"config\", _config);\n}\n\nexport const resetTxHistory = (): void => {\n  _txHistory = {};\n  lsSet(\"txHistory\", _txHistory);\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/state.ts"],"sourcesContent":["import {\n  lsSet,\n  lsGet,\n  publicKeyFromPrivate,\n} from \"@fastnear/utils\";\nimport {WalletAdapter} from \"@fastnear/wallet-adapter\";\n\nexport const WIDGET_URL = \"https://js.cdn.fastnear.com\";\n\nexport const DEFAULT_NETWORK_ID = \"mainnet\";\nexport const NETWORKS = {\n  testnet: {\n    networkId: \"testnet\",\n    nodeUrl: \"https://rpc.testnet.fastnear.com/\",\n  },\n  mainnet: {\n    networkId: \"mainnet\",\n    nodeUrl: \"https://rpc.mainnet.fastnear.com/\",\n  },\n};\n\nexport interface NetworkConfig {\n  networkId: string;\n  nodeUrl?: string;\n  walletUrl?: string;\n  helperUrl?: string;\n  explorerUrl?: string;\n\n  [key: string]: any;\n}\n\nexport interface AppState {\n  accountId?: string | null;\n  privateKey?: string | null;\n  lastWalletId?: string | null;\n  publicKey?: string | null;\n  accessKeyContractId?: string | null;\n\n  [key: string]: any;\n}\n\nexport interface TxStatus {\n  txId: string;\n  updateTimestamp?: number;\n\n  [key: string]: any;\n}\n\nexport type TxHistory = Record<string, TxStatus>;\n\nexport interface EventListeners {\n  account: Set<(accountId: string) => void>;\n  tx: Set<(tx: TxStatus) => void>;\n}\n\nexport interface UnbroadcastedEvents {\n  account: string[];\n  tx: TxStatus[];\n}\n\nexport interface WalletAdapterState {\n  publicKey?: string | null;\n  privateKey?: string | null;\n  accountId?: string | null;\n  lastWalletId?: string | null;\n  networkId: string;\n}\n\n\n// Load config from localStorage or default to the network's config\nexport let _config: NetworkConfig = lsGet(\"config\") || {\n  ...NETWORKS[DEFAULT_NETWORK_ID]\n};\n\n// Load application state from localStorage\nexport let _state: AppState = lsGet(\"state\") || {};\n\n// Triggered by the wallet adapter\nexport const onAdapterStateUpdate = (state: WalletAdapterState) => {\n  console.log(\"Adapter state update:\", state);\n  const { accountId, lastWalletId, privateKey } = state;\n  update({\n    accountId: accountId || undefined,\n    lastWalletId: lastWalletId || undefined,\n    ...(privateKey ? { privateKey } : {}),\n  });\n}\n\nexport const getWalletAdapterState = (): WalletAdapterState => {\n  return {\n    publicKey: _state.publicKey,\n    accountId: _state.accountId,\n    lastWalletId: _state.lastWalletId,\n    networkId: DEFAULT_NETWORK_ID,\n  };\n}\n\n// We can create an adapter instance here\nexport let _adapter = new WalletAdapter({\n  onStateUpdate: onAdapterStateUpdate,\n  lastState: getWalletAdapterState(),\n  widgetUrl: WIDGET_URL,\n});\n\n// Attempt to set publicKey if we have a privateKey\ntry {\n  _state.publicKey = _state.privateKey\n    ? publicKeyFromPrivate(_state.privateKey)\n    : null;\n} catch (e) {\n  console.error(\"Error parsing private key:\", e);\n  _state.privateKey = null;\n  lsSet(\"nonce\", null);\n}\n\n// Transaction history\nexport let _txHistory: TxHistory = lsGet(\"txHistory\") || {};\n\n\nexport const _unbroadcastedEvents: UnbroadcastedEvents = {\n  account: [],\n  tx: [],\n};\n\n// events / listeners\nexport const events = {\n  _eventListeners: {\n    account: new Set(),\n    tx: new Set(),\n  },\n\n  notifyAccountListeners: (accountId: string) => {\n    if (events._eventListeners.account.size === 0) {\n      _unbroadcastedEvents.account.push(accountId);\n      return;\n    }\n    events._eventListeners.account.forEach((callback: any) => {\n      try {\n        callback(accountId);\n      } catch (e) {\n        console.error(e);\n      }\n    });\n  },\n\n  notifyTxListeners: (tx: TxStatus) => {\n    if (events._eventListeners.tx.size === 0) {\n      _unbroadcastedEvents.tx.push(tx);\n      return;\n    }\n    events._eventListeners.tx.forEach((callback: any) => {\n      try {\n        callback(tx);\n      } catch (e) {\n        console.error(e);\n      }\n    });\n  },\n\n  onAccount: (callback: (accountId: string) => void) => {\n    events._eventListeners.account.add(callback);\n    if (_unbroadcastedEvents.account.length > 0) {\n      const accountEvent = _unbroadcastedEvents.account;\n      _unbroadcastedEvents.account = [];\n      accountEvent.forEach(events.notifyAccountListeners);\n    }\n  },\n\n  onTx: (callback: (tx: TxStatus) => void): void => {\n    events._eventListeners.tx.add(callback);\n    if (_unbroadcastedEvents.tx.length > 0) {\n      const txEvent = _unbroadcastedEvents.tx;\n      _unbroadcastedEvents.tx = [];\n      txEvent.forEach(events.notifyTxListeners);\n    }\n  }\n}\n\n// Mutators\n// @todo: in favor of limiting when out of alpha\n//    but haven't given it enough thought ~ mike\nexport const update = (newState: Partial<AppState>) => {\n  const oldState = _state;\n  _state = {..._state, ...newState};\n\n  lsSet(\"state\", {\n    accountId: _state.accountId,\n    privateKey: _state.privateKey,\n    lastWalletId: _state.lastWalletId,\n    accessKeyContractId: _state.accessKeyContractId,\n  });\n\n  if (\n    newState.hasOwnProperty(\"privateKey\") &&\n    newState.privateKey !== oldState.privateKey\n  ) {\n    _state.publicKey = newState.privateKey\n      ? publicKeyFromPrivate(newState.privateKey as string)\n      : null;\n    lsSet(\"nonce\", null);\n  }\n\n  if (newState.accountId !== oldState.accountId) {\n    events.notifyAccountListeners(newState.accountId as string);\n  }\n\n  if (\n    (newState.hasOwnProperty(\"lastWalletId\") &&\n      newState.lastWalletId !== oldState.lastWalletId) ||\n    (newState.hasOwnProperty(\"accountId\") &&\n      newState.accountId !== oldState.accountId) ||\n    (newState.hasOwnProperty(\"privateKey\") &&\n      newState.privateKey !== oldState.privateKey)\n  ) {\n    _adapter.setState(getWalletAdapterState());\n  }\n}\n\nexport const updateTxHistory = (txStatus: TxStatus) => {\n  const txId = txStatus.txId;\n  _txHistory[txId] = {\n    ...(_txHistory[txId] || {}),\n    ...txStatus,\n    updateTimestamp: Date.now(),\n  };\n  lsSet(\"txHistory\", _txHistory);\n  events.notifyTxListeners(_txHistory[txId]);\n}\n\nexport const getConfig = (): NetworkConfig => {\n  return _config;\n}\n\nexport const getTxHistory = (): TxHistory => {\n  return _txHistory;\n}\n\n// Exposed \"write\" functions\nexport const setConfig = (newConf: NetworkConfig): void => {\n  _config = { ...NETWORKS[newConf.networkId], ...newConf };\n  lsSet(\"config\", _config);\n}\n\nexport const resetTxHistory = (): void => {\n  _txHistory = {};\n  lsSet(\"txHistory\", _txHistory);\n}\n"],"mappings":"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","names":[]}

package/dist/esm/index.d.ts

@@ -1,18 +1,5 @@
-import { WalletAdapter } from '@fastnear/wallet-adapter';
 import * as borsh from 'borsh';
 
-declare const WIDGET_URL = "https://wallet-adapter.fastnear.com";
-declare const DEFAULT_NETWORK_ID = "mainnet";
-declare const NETWORKS: {
-    testnet: {
-        networkId: string;
-        nodeUrl: string;
-    };
-    mainnet: {
-        networkId: string;
-        nodeUrl: string;
-    };
-};
 interface NetworkConfig {
     networkId: string;
     nodeUrl?: string;
@@ -21,63 +8,42 @@ interface NetworkConfig {
     explorerUrl?: string;
     [key: string]: any;
 }
-interface AppState {
-    accountId?: string | null;
-    privateKey?: string | null;
-    lastWalletId?: string | null;
-    publicKey?: string | null;
-    accessKeyContractId?: string | null;
-    [key: string]: any;
-}
 interface TxStatus {
     txId: string;
     updateTimestamp?: number;
     [key: string]: any;
 }
 type TxHistory = Record<string, TxStatus>;
-interface EventListeners {
-    account: Set<(accountId: string) => void>;
-    tx: Set<(tx: TxStatus) => void>;
-}
-interface UnbroadcastedEvents {
-    account: string[];
-    tx: TxStatus[];
-}
-interface WalletAdapterState {
-    publicKey?: string | null;
-    privateKey?: string | null;
-    accountId?: string | null;
-    lastWalletId?: string | null;
-    networkId: string;
-}
-declare let _config: NetworkConfig;
-declare let _state: AppState;
-declare const onAdapterStateUpdate: (state: WalletAdapterState) => void;
-declare const getWalletAdapterState: () => WalletAdapterState;
-declare let _adapter: WalletAdapter;
-declare let _txHistory: TxHistory;
-declare const _eventListeners: EventListeners;
-declare const _unbroadcastedEvents: UnbroadcastedEvents;
-declare const updateState: (newState: Partial<AppState>) => void;
-declare const updateTxHistory: (txStatus: TxStatus) => void;
-declare const notifyAccountListeners: (accountId: string) => void;
-declare const notifyTxListeners: (tx: TxStatus) => void;
-declare const onAccount: (callback: (accountId: string) => void) => void;
-declare const onTx: (callback: (tx: TxStatus) => void) => void;
-declare const getConfig: () => NetworkConfig;
-declare const getTxHistory: () => TxHistory;
-declare const setConfig: (newConf: NetworkConfig) => void;
-declare const resetTxHistory: () => void;
 
 declare const MaxBlockDelayMs: number;
 interface AccessKeyWithError {
-    nonce: number;
-    permission?: any;
+    result: {
+        nonce: number;
+        permission?: any;
+        error?: string;
+    };
+}
+interface WalletTxResult {
+    url?: string;
+    outcomes?: Array<{
+        transaction: {
+            hash: string;
+        };
+    }>;
+    rejected?: boolean;
     error?: string;
 }
 interface BlockView {
+    result: {
+        header: {
+            hash: string;
+            timestamp_nanosec: string;
+        };
+    };
+}
+interface LastKnownBlock {
     header: {
-        prev_hash: string;
+        hash: string;
         timestamp_nanosec: string;
     };
 }
@@ -110,6 +76,17 @@ declare const accountId: () => string | null | undefined;
 declare const publicKey: () => string | null | undefined;
 declare const config: (newConfig?: Record<string, any>) => NetworkConfig;
 declare const authStatus: () => string | Record<string, any>;
+declare const getPublicKeyForContract: (opts?: any) => string | null | undefined;
+declare const selected: () => {
+    network: string;
+    nodeUrl: string | undefined;
+    walletUrl: string | undefined;
+    helperUrl: string | undefined;
+    explorerUrl: string | undefined;
+    account: string | null | undefined;
+    contract: string | null | undefined;
+    publicKey: string | null | undefined;
+};
 declare const requestSignIn: ({ contractId }: {
     contractId: string;
 }) => Promise<void>;
@@ -177,6 +154,8 @@ declare const exp: {
     };
 };
 declare const utils: {};
+declare const state: {};
+declare const event: any;
 declare const actions: {
     functionCall: ({ methodName, gas, deposit, args, argsBase64, }: {
         methodName: string;
@@ -251,4 +230,4 @@ declare const actions: {
     };
 };
 
-export { type AccessKeyView, type AppState, DEFAULT_NETWORK_ID, type EventListeners, MaxBlockDelayMs, NETWORKS, type NetworkConfig, type TxHistory, type TxStatus, type UnbroadcastedEvents, WIDGET_URL, type WalletAdapterState, _adapter, _config, _eventListeners, _state, _txHistory, _unbroadcastedEvents, accountId, actions, afterTxSent, authStatus, config, exp, generateTxId, getConfig, getTxHistory, getWalletAdapterState, localTxHistory, notifyAccountListeners, notifyTxListeners, onAccount, onAdapterStateUpdate, onTx, publicKey, queryAccessKey, queryAccount, queryBlock, queryTx, requestSignIn, resetTxHistory, sendRpc, sendTx, sendTxToRpc, setConfig, signOut, updateState, updateTxHistory, utils, view, withBlockId };
+export { type AccessKeyView, type AccessKeyWithError, type BlockView, type LastKnownBlock, MaxBlockDelayMs, type WalletTxResult, accountId, actions, afterTxSent, authStatus, config, event, exp, generateTxId, getPublicKeyForContract, localTxHistory, publicKey, queryAccessKey, queryAccount, queryBlock, queryTx, requestSignIn, selected, sendRpc, sendTx, sendTxToRpc, signOut, state, utils, view, withBlockId };

package/dist/esm/index.js

@@ -1,5 +1,4 @@
 /* ⋈ 🏃🏻💨 FastNEAR API - ESM (@fastnear/api version 0.8.0) */
 /* https://www.npmjs.com/package/@fastnear/api/v/0.8.0 */
-export * from "./state.js";
 export * from "./near.js";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["// See tsup.config.ts for additional banner/footer js\nexport * from \"./state.js\"\nexport * from \"./near.js\";\n"],"mappings":";;AACA,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["// See tsup.config.ts for additional banner/footer js\nexport * from \"./near.js\";\n"],"mappings":";;AACA,cAAc;","names":[]}

package/dist/esm/near.js

@@ -25,7 +25,7 @@ import {
   DEFAULT_NETWORK_ID,
   NETWORKS,
   getTxHistory,
-  updateState,
+  update,
   updateTxHistory
 } from "./state.js";
 import {
@@ -35,6 +35,7 @@ import {
 } from "./state.js";
 import { sha256 } from "@noble/hashes/sha2";
 import * as reExportAllUtils from "@fastnear/utils";
+import * as stateExports from "./state.js";
 Big.DP = 27;
 const MaxBlockDelayMs = 1e3 * 60 * 60 * 6;
 function withBlockId(params, blockId) {
@@ -125,7 +126,7 @@ const config = /* @__PURE__ */ __name((newConfig) => {
   if (newConfig) {
     if (newConfig.networkId && current.networkId !== newConfig.networkId) {
       setConfig(newConfig.networkId);
-      updateState({ accountId: null, privateKey: null, lastWalletId: null });
+      update({ accountId: null, privateKey: null, lastWalletId: null });
       lsSet("block", null);
       resetTxHistory();
     }
@@ -139,9 +140,32 @@ const authStatus = /* @__PURE__ */ __name(() => {
   }
   return "SignedIn";
 }, "authStatus");
+const getPublicKeyForContract = /* @__PURE__ */ __name((opts) => {
+  return publicKey();
+}, "getPublicKeyForContract");
+const selected = /* @__PURE__ */ __name(() => {
+  const network = getConfig().networkId;
+  const nodeUrl = getConfig().nodeUrl;
+  const walletUrl = getConfig().walletUrl;
+  const helperUrl = getConfig().helperUrl;
+  const explorerUrl = getConfig().explorerUrl;
+  const account = accountId();
+  const contract = _state.accessKeyContractId;
+  const publicKey2 = getPublicKeyForContract();
+  return {
+    network,
+    nodeUrl,
+    walletUrl,
+    helperUrl,
+    explorerUrl,
+    account,
+    contract,
+    publicKey: publicKey2
+  };
+}, "selected");
 const requestSignIn = /* @__PURE__ */ __name(async ({ contractId }) => {
   const privateKey = privateKeyFromRandom();
-  updateState({ accessKeyContractId: contractId, accountId: null, privateKey });
+  update({ accessKeyContractId: contractId, accountId: null, privateKey });
   const pubKey = publicKeyFromPrivate(privateKey);
   const result = await _adapter.signIn({
     networkId: getConfig().networkId,
@@ -158,7 +182,7 @@ const requestSignIn = /* @__PURE__ */ __name(async ({ contractId }) => {
       }, 100);
     }
   } else if (result.accountId) {
-    updateState({ accountId: result.accountId });
+    update({ accountId: result.accountId });
   }
 }, "requestSignIn");
 const view = /* @__PURE__ */ __name(async ({
@@ -215,7 +239,7 @@ const localTxHistory = /* @__PURE__ */ __name(() => {
   return getTxHistory();
 }, "localTxHistory");
 const signOut = /* @__PURE__ */ __name(() => {
-  updateState({ accountId: null, privateKey: null, contractId: null });
+  update({ accountId: null, privateKey: null, contractId: null });
   setConfig(NETWORKS[DEFAULT_NETWORK_ID]);
 }, "signOut");
 const sendTx = /* @__PURE__ */ __name(async ({
@@ -233,6 +257,14 @@ const sendTx = /* @__PURE__ */ __name(async ({
     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],
@@ -279,10 +311,10 @@ const sendTx = /* @__PURE__ */ __name(async ({
   let nonce = lsGet("nonce");
   if (nonce == null) {
     const accessKey = await queryAccessKey({ accountId: signerId, publicKey: publicKey2 });
-    if (accessKey.error) {
-      throw new Error(`Access key error: ${accessKey.error} when attempting to get nonce for ${signerId} for public key ${publicKey2}`);
+    if (accessKey.result.error) {
+      throw new Error(`Access key error: ${accessKey.result.error} when attempting to get nonce for ${signerId} for public key ${publicKey2}`);
     }
-    nonce = accessKey.nonce;
+    nonce = accessKey.result.nonce;
     lsSet("nonce", nonce);
   }
   let lastKnownBlock = lsGet("block");
@@ -290,15 +322,15 @@ const sendTx = /* @__PURE__ */ __name(async ({
     const latestBlock = await queryBlock({ blockId: "final" });
     lastKnownBlock = {
       header: {
-        prev_hash: latestBlock.header.prev_hash,
-        timestamp_nanosec: latestBlock.header.timestamp_nanosec
+        hash: latestBlock.result.header.hash,
+        timestamp_nanosec: latestBlock.result.header.timestamp_nanosec
       }
     };
     lsSet("block", lastKnownBlock);
   }
   nonce += 1;
   lsSet("nonce", nonce);
-  const blockHash = lastKnownBlock.header.prev_hash;
+  const blockHash = lastKnownBlock.header.hash;
   const plainTransactionObj = {
     signerId,
     publicKey: publicKey2,
@@ -338,6 +370,12 @@ for (const key in reExportAllUtils) {
   exp.utils[key] = reExportAllUtils[key];
 }
 const utils = exp.utils;
+const state = {};
+for (const key in stateExports) {
+  state[key] = stateExports[key];
+}
+const event = state["events"];
+delete state["events"];
 try {
   if (typeof window !== "undefined") {
     const url = new URL(window.location.href);
@@ -345,16 +383,22 @@ try {
     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 error: ${errCode} ${errMsg}`));
+      console.warn(new Error(`Wallet raises:
+code: ${errCode}
+message: ${decodedErrMsg}`));
     }
     if (accId && pubKey) {
       if (pubKey === _state.publicKey) {
-        updateState({ accountId: accId });
+        update({ accountId: accId });
       } else {
-        console.error(new Error("Public key mismatch from wallet redirect"), pubKey, _state.publicKey);
+        if (authStatus() === "SignedIn") {
+          console.warn("Public key mismatch from wallet redirect", pubKey, _state.publicKey);
+        }
+        url.searchParams.delete("public_key");
       }
     }
     if (txHashes || txIds) {
@@ -378,14 +422,6 @@ try {
         console.error(new Error("Transaction hash mismatch from wallet redirect"), idArr, hashArr);
       }
     }
-    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);
@@ -457,8 +493,10 @@ export {
   afterTxSent,
   authStatus,
   config,
+  event,
   exp,
   generateTxId,
+  getPublicKeyForContract,
   localTxHistory,
   publicKey,
   queryAccessKey,
@@ -466,10 +504,12 @@ export {
   queryBlock,
   queryTx,
   requestSignIn,
+  selected,
   sendRpc,
   sendTx,
   sendTxToRpc,
   signOut,
+  state,
   utils,
   view,
   withBlockId