@railgun-community/waku-broadcaster-client-node 8.4.0 → 9.0.1

package/dist/search/best-broadcaster.js

@@ -3,15 +3,16 @@ import { AddressFilter } from '../filters/address-filter.js';
 import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
 import { cachedFeeUnavailableOrExpired, shortenAddress, } from '../utils/broadcaster-util.js';
 import { isDefined } from '../utils/is-defined.js';
+import { BroadcasterConfig } from '../models/broadcaster-config.js';
 const SelectedBroadcasterAscendingFee = (a, b) => {
     const feeAmount = BigInt(a.tokenFee.feePerUnitGas) - BigInt(b.tokenFee.feePerUnitGas);
     if (feeAmount === BigInt(0)) {
-        return 0;
+        return b.tokenFee.reliability - a.tokenFee.reliability;
     }
     return feeAmount > BigInt(0) ? 1 : -1;
 };
 export class BroadcasterSearch {
-    static findBroadcastersForToken(chain, tokenAddress, useRelayAdapt) {
+    static findBroadcastersForToken(chain, tokenAddress, useRelayAdapt, ignoreMissingAuthorizedFee = false) {
         const tokenAddressLowercase = tokenAddress.toLowerCase();
         const broadcasterTokenFees = BroadcasterFeeCache.feesForChain(chain)?.forToken[tokenAddressLowercase]
             ?.forBroadcaster;
@@ -27,6 +28,25 @@ export class BroadcasterSearch {
                 .join(', ')}`);
         }
         const selectedBroadcasters = [];
+        const authorizedFee = BroadcasterFeeCache.getAuthorizedFee(tokenAddressLowercase);
+        let minFee;
+        let maxFee;
+        if (BroadcasterConfig.trustedFeeSigner) {
+            if (authorizedFee) {
+                const authorizedFeeAmount = BigInt(authorizedFee.feePerUnitGas);
+                const varianceLower = (authorizedFeeAmount *
+                    BigInt(Math.round(BroadcasterConfig.authorizedFeeVariancePercentageLower * 100))) /
+                    100n;
+                const varianceUpper = (authorizedFeeAmount *
+                    BigInt(Math.round(BroadcasterConfig.authorizedFeeVariancePercentageUpper * 100))) /
+                    100n;
+                minFee = authorizedFeeAmount - varianceLower;
+                maxFee = authorizedFeeAmount + varianceUpper;
+            }
+            else if (!ignoreMissingAuthorizedFee) {
+                return [];
+            }
+        }
         broadcasterAddresses.forEach((broadcasterAddress) => {
             const identifiers = Object.keys(broadcasterTokenFees[broadcasterAddress].forIdentifier);
             identifiers.forEach((identifier) => {
@@ -34,6 +54,12 @@ export class BroadcasterSearch {
                 if (cachedFeeUnavailableOrExpired(nextCachedFee, chain, useRelayAdapt)) {
                     return;
                 }
+                if (isDefined(minFee) && isDefined(maxFee)) {
+                    const incomingFeeAmount = BigInt(nextCachedFee.feePerUnitGas);
+                    if (incomingFeeAmount < minFee || incomingFeeAmount > maxFee) {
+                        return;
+                    }
+                }
                 const selectedBroadcaster = {
                     railgunAddress: broadcasterAddress,
                     tokenFee: nextCachedFee,
@@ -45,7 +71,7 @@ export class BroadcasterSearch {
         selectedBroadcasters.sort((a, b) => b.tokenFee.reliability - a.tokenFee.reliability);
         return selectedBroadcasters;
     }
-    static findAllBroadcastersForChain(chain, useRelayAdapt) {
+    static findAllBroadcastersForChain(chain, useRelayAdapt, ignoreMissingAuthorizedFee = false) {
         const broadcasterTokenFees = BroadcasterFeeCache.feesForChain(chain)?.forToken;
         if (!isDefined(broadcasterTokenFees)) {
             return undefined;
@@ -53,12 +79,13 @@ export class BroadcasterSearch {
         const allTokens = Object.keys(broadcasterTokenFees);
         const selectedBroadcasters = [];
         allTokens.forEach((tokenAddress) => {
-            const broadcastersForToken = this.findBroadcastersForToken(chain, tokenAddress, useRelayAdapt);
+            const broadcastersForToken = this.findBroadcastersForToken(chain, tokenAddress, useRelayAdapt, ignoreMissingAuthorizedFee);
             if (!broadcastersForToken) {
                 return;
             }
             selectedBroadcasters.push(...broadcastersForToken);
         });
+        selectedBroadcasters.sort(SelectedBroadcasterAscendingFee);
         return selectedBroadcasters;
     }
     static findRandomBroadcasterForToken(chain, tokenAddress, useRelayAdapt, percentageThreshold) {

package/dist/search/best-broadcaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"best-broadcaster.js","sourceRoot":"","sources":["../../src/search/best-broadcaster.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, SelectedBroadcaster } from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from '../filters/address-filter.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport {\n  cachedFeeUnavailableOrExpired,\n  shortenAddress,\n} from '../utils/broadcaster-util.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nconst SelectedBroadcasterAscendingFee = (\n  a: SelectedBroadcaster,\n  b: SelectedBroadcaster,\n) => {\n  const feeAmount =\n    BigInt(a.tokenFee.feePerUnitGas) - BigInt(b.tokenFee.feePerUnitGas);\n  if (feeAmount === BigInt(0)) {\n    return 0;\n  }\n  return feeAmount > BigInt(0) ? 1 : -1;\n};\nexport class BroadcasterSearch {\n  static findBroadcastersForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    const tokenAddressLowercase = tokenAddress.toLowerCase();\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken[tokenAddressLowercase]\n        ?.forBroadcaster;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n\n    const unfilteredAddresses = Object.keys(broadcasterTokenFees);\n    const broadcasterAddresses = AddressFilter.filter(unfilteredAddresses);\n    if (unfilteredAddresses.length !== broadcasterAddresses.length) {\n      const removedAddresses = unfilteredAddresses.filter(\n        address => !broadcasterAddresses.includes(address),\n      );\n      BroadcasterDebug.log(\n        `Filtered RAILGUN broadcaster addresses ${\n          removedAddresses.length\n        }: ${removedAddresses\n          .map(address => shortenAddress(address))\n          .join(', ')}`,\n      );\n    }\n\n    const selectedBroadcasters: SelectedBroadcaster[] = [];\n\n    broadcasterAddresses.forEach((broadcasterAddress: string) => {\n      const identifiers: string[] = Object.keys(\n        broadcasterTokenFees[broadcasterAddress].forIdentifier,\n      );\n      identifiers.forEach((identifier: string) => {\n        const nextCachedFee =\n          broadcasterTokenFees[broadcasterAddress].forIdentifier[identifier];\n        if (\n          cachedFeeUnavailableOrExpired(nextCachedFee, chain, useRelayAdapt)\n        ) {\n          return;\n        }\n        const selectedBroadcaster: SelectedBroadcaster = {\n          railgunAddress: broadcasterAddress,\n          tokenFee: nextCachedFee,\n          tokenAddress,\n        };\n        selectedBroadcasters.push(selectedBroadcaster);\n      });\n    });\n\n    selectedBroadcasters.sort(\n      (a, b) => b.tokenFee.reliability - a.tokenFee.reliability,\n    );\n    return selectedBroadcasters;\n  }\n\n  static findAllBroadcastersForChain(\n    chain: Chain,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n    const allTokens = Object.keys(broadcasterTokenFees);\n    const selectedBroadcasters: SelectedBroadcaster[] = [];\n    allTokens.forEach((tokenAddress: string) => {\n      const broadcastersForToken = this.findBroadcastersForToken(\n        chain,\n        tokenAddress,\n        useRelayAdapt,\n      );\n      if (!broadcastersForToken) {\n        return;\n      }\n      selectedBroadcasters.push(...broadcastersForToken);\n    });\n    return selectedBroadcasters;\n  }\n\n  static findRandomBroadcasterForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    percentageThreshold: number,\n  ): Optional<SelectedBroadcaster> {\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n\n    const broadcastersForToken = this.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n    if (!isDefined(broadcastersForToken)) {\n      return undefined;\n    }\n    if (broadcastersForToken.length === 0) {\n      return undefined;\n    }\n\n    const sortedBroadcasters = broadcastersForToken.sort(\n      SelectedBroadcasterAscendingFee,\n    );\n\n    const minFee = BigInt(sortedBroadcasters[0].tokenFee.feePerUnitGas);\n    const feeThreshold = (minFee * (100n + BigInt(percentageThreshold))) / 100n;\n    const eligibleBroadcasters = sortedBroadcasters.filter(\n      broadcaster => BigInt(broadcaster.tokenFee.feePerUnitGas) <= feeThreshold,\n    );\n    const randomIndex = Math.floor(Math.random() * eligibleBroadcasters.length);\n\n    return eligibleBroadcasters[randomIndex];\n  }\n\n  static findBestBroadcaster(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster> {\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n\n    const broadcastersForToken = this.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n    if (!isDefined(broadcastersForToken)) {\n      return undefined;\n    }\n\n    const sortedBroadcasters = broadcastersForToken.sort(\n      SelectedBroadcasterAscendingFee,\n    );\n\n    return sortedBroadcasters[0];\n  }\n}\n"]}
+{"version":3,"file":"best-broadcaster.js","sourceRoot":"","sources":["../../src/search/best-broadcaster.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, SelectedBroadcaster } from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from '../filters/address-filter.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport {\n  cachedFeeUnavailableOrExpired,\n  shortenAddress,\n} from '../utils/broadcaster-util.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\n\nconst SelectedBroadcasterAscendingFee = (\n  a: SelectedBroadcaster,\n  b: SelectedBroadcaster,\n) => {\n  const feeAmount =\n    BigInt(a.tokenFee.feePerUnitGas) - BigInt(b.tokenFee.feePerUnitGas);\n  if (feeAmount === BigInt(0)) {\n    return b.tokenFee.reliability - a.tokenFee.reliability;\n  }\n  return feeAmount > BigInt(0) ? 1 : -1;\n};\nexport class BroadcasterSearch {\n  static findBroadcastersForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    ignoreMissingAuthorizedFee = false,\n  ): Optional<SelectedBroadcaster[]> {\n    const tokenAddressLowercase = tokenAddress.toLowerCase();\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken[tokenAddressLowercase]\n        ?.forBroadcaster;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n\n    const unfilteredAddresses = Object.keys(broadcasterTokenFees);\n    const broadcasterAddresses = AddressFilter.filter(unfilteredAddresses);\n    if (unfilteredAddresses.length !== broadcasterAddresses.length) {\n      const removedAddresses = unfilteredAddresses.filter(\n        address => !broadcasterAddresses.includes(address),\n      );\n      BroadcasterDebug.log(\n        `Filtered RAILGUN broadcaster addresses ${removedAddresses.length\n        }: ${removedAddresses\n          .map(address => shortenAddress(address))\n          .join(', ')}`,\n      );\n    }\n\n    const selectedBroadcasters: SelectedBroadcaster[] = [];\n\n    const authorizedFee =\n      BroadcasterFeeCache.getAuthorizedFee(tokenAddressLowercase);\n    let minFee: bigint | undefined;\n    let maxFee: bigint | undefined;\n\n    if (BroadcasterConfig.trustedFeeSigner) {\n      if (authorizedFee) {\n        const authorizedFeeAmount = BigInt(authorizedFee.feePerUnitGas);\n        const varianceLower =\n          (authorizedFeeAmount *\n            BigInt(\n              Math.round(\n                BroadcasterConfig.authorizedFeeVariancePercentageLower * 100,\n              ),\n            )) /\n          100n;\n        const varianceUpper =\n          (authorizedFeeAmount *\n            BigInt(\n              Math.round(\n                BroadcasterConfig.authorizedFeeVariancePercentageUpper * 100,\n              ),\n            )) /\n          100n;\n        minFee = authorizedFeeAmount - varianceLower;\n        maxFee = authorizedFeeAmount + varianceUpper;\n      } else if (!ignoreMissingAuthorizedFee) {\n        return [];\n      }\n    }\n\n    broadcasterAddresses.forEach((broadcasterAddress: string) => {\n      const identifiers: string[] = Object.keys(\n        broadcasterTokenFees[broadcasterAddress].forIdentifier,\n      );\n      identifiers.forEach((identifier: string) => {\n        const nextCachedFee =\n          broadcasterTokenFees[broadcasterAddress].forIdentifier[identifier];\n        if (\n          cachedFeeUnavailableOrExpired(nextCachedFee, chain, useRelayAdapt)\n        ) {\n          return;\n        }\n\n        if (isDefined(minFee) && isDefined(maxFee)) {\n          const incomingFeeAmount = BigInt(nextCachedFee.feePerUnitGas);\n          if (incomingFeeAmount < minFee || incomingFeeAmount > maxFee) {\n            return;\n          }\n        }\n\n        const selectedBroadcaster: SelectedBroadcaster = {\n          railgunAddress: broadcasterAddress,\n          tokenFee: nextCachedFee,\n          tokenAddress,\n        };\n        selectedBroadcasters.push(selectedBroadcaster);\n      });\n    });\n\n    // selectedBroadcasters.sort(SelectedBroadcasterAscendingFee);\n    selectedBroadcasters.sort(\n      (a, b) => b.tokenFee.reliability - a.tokenFee.reliability,\n    );\n    return selectedBroadcasters;\n  }\n\n  static findAllBroadcastersForChain(\n    chain: Chain,\n    useRelayAdapt: boolean,\n    ignoreMissingAuthorizedFee = false,\n  ): Optional<SelectedBroadcaster[]> {\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n    const allTokens = Object.keys(broadcasterTokenFees);\n    const selectedBroadcasters: SelectedBroadcaster[] = [];\n    allTokens.forEach((tokenAddress: string) => {\n      const broadcastersForToken = this.findBroadcastersForToken(\n        chain,\n        tokenAddress,\n        useRelayAdapt,\n        ignoreMissingAuthorizedFee,\n      );\n      if (!broadcastersForToken) {\n        return;\n      }\n      selectedBroadcasters.push(...broadcastersForToken);\n    });\n    selectedBroadcasters.sort(SelectedBroadcasterAscendingFee);\n    return selectedBroadcasters;\n  }\n\n  static findRandomBroadcasterForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    percentageThreshold: number,\n  ): Optional<SelectedBroadcaster> {\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n\n    const broadcastersForToken = this.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n    if (!isDefined(broadcastersForToken)) {\n      return undefined;\n    }\n    if (broadcastersForToken.length === 0) {\n      return undefined;\n    }\n\n    const sortedBroadcasters = broadcastersForToken.sort(\n      SelectedBroadcasterAscendingFee,\n    );\n\n    const minFee = BigInt(sortedBroadcasters[0].tokenFee.feePerUnitGas);\n    const feeThreshold = (minFee * (100n + BigInt(percentageThreshold))) / 100n;\n    const eligibleBroadcasters = sortedBroadcasters.filter(\n      broadcaster => BigInt(broadcaster.tokenFee.feePerUnitGas) <= feeThreshold,\n    );\n    const randomIndex = Math.floor(Math.random() * eligibleBroadcasters.length);\n\n    return eligibleBroadcasters[randomIndex];\n  }\n\n  static findBestBroadcaster(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster> {\n    const broadcasterTokenFees =\n      BroadcasterFeeCache.feesForChain(chain)?.forToken;\n    if (!isDefined(broadcasterTokenFees)) {\n      return undefined;\n    }\n\n    const broadcastersForToken = this.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n    if (!isDefined(broadcastersForToken)) {\n      return undefined;\n    }\n\n    const sortedBroadcasters = broadcastersForToken.sort(\n      SelectedBroadcasterAscendingFee,\n    );\n\n    return sortedBroadcasters[0];\n  }\n}\n"]}

package/dist/status/broadcaster-connection-status.js

@@ -3,6 +3,7 @@ import { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';
 import { AddressFilter } from '../filters/address-filter.js';
 import { cachedFeeExpired } from '../utils/broadcaster-util.js';
 import { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';
+import { BroadcasterConfig } from '../models/broadcaster-config.js';
 import { isDefined } from '../utils/is-defined.js';
 export class BroadcasterStatus {
     static getBroadcasterConnectionStatus(chain) {
@@ -31,7 +32,7 @@ export class BroadcasterStatus {
     }
     static hasSubscriptionsStalled() {
         const now = Date.now();
-        const limit = 30000;
+        const limit = BroadcasterConfig.feeExpirationTimeout;
         const lastSubscribed = BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt;
         if (isDefined(lastSubscribed)) {
             return now - lastSubscribed > limit;

package/dist/status/broadcaster-connection-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-connection-status.js","sourceRoot":"","sources":["../../src/status/broadcaster-connection-status.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CachedTokenFee,\n  Chain,\n  BroadcasterConnectionStatus,\n} from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from '../filters/address-filter.js';\nimport { cachedFeeExpired } from '../utils/broadcaster-util.js';\nimport { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nexport class BroadcasterStatus {\n  static getBroadcasterConnectionStatus(\n    chain: Chain,\n  ): BroadcasterConnectionStatus {\n    if (WakuBroadcasterWakuCore.hasError) {\n      return BroadcasterConnectionStatus.Error;\n    }\n    if (!WakuBroadcasterWakuCore.waku) {\n      return BroadcasterConnectionStatus.Disconnected;\n    }\n    if (this.hasSubscriptionsStalled()) {\n      BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt =\n        Date.now() + 5000;\n      return BroadcasterConnectionStatus.Disconnected;\n    }\n    if (!this.hasBroadcasterFeesForNetwork(chain)) {\n      return BroadcasterConnectionStatus.Searching;\n    }\n\n    const { allBroadcasterFeesExpired, anyBroadcastersAvailable } =\n      this.getAggregatedInfoForBroadcasters(chain);\n    if (allBroadcasterFeesExpired) {\n      return BroadcasterConnectionStatus.Disconnected;\n    }\n    if (!anyBroadcastersAvailable) {\n      return BroadcasterConnectionStatus.AllUnavailable;\n    }\n\n    return BroadcasterConnectionStatus.Connected;\n  }\n  static hasSubscriptionsStalled() {\n    const now = Date.now();\n    const limit = 30_000; // 30 seconds\n    const lastSubscribed =\n      BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt;\n    if (isDefined(lastSubscribed)) {\n      return now - lastSubscribed > limit;\n    }\n    return false;\n  }\n\n  private static hasBroadcasterFeesForNetwork(chain: Chain) {\n    const broadcasterFees = BroadcasterFeeCache.feesForChain(chain);\n    if (!isDefined(broadcasterFees) || !isDefined(broadcasterFees.forToken)) {\n      return false;\n    }\n\n    const cachedTokenBroadcasters = Object.values(broadcasterFees.forToken);\n\n    return (\n      cachedTokenBroadcasters.find(tokenBroadcasterMap => {\n        const unfilteredBroadcasterAddresses = Object.keys(\n          tokenBroadcasterMap.forBroadcaster,\n        );\n        const filteredBroadcasterAddresses = AddressFilter.filter(\n          unfilteredBroadcasterAddresses,\n        );\n        return filteredBroadcasterAddresses.length > 0;\n      }) != null\n    );\n  }\n\n  private static getAggregatedInfoForBroadcasters(chain: Chain) {\n    const broadcasterFees = BroadcasterFeeCache.feesForChain(chain);\n    if (!isDefined(broadcasterFees) || !isDefined(broadcasterFees.forToken)) {\n      return {\n        allBroadcasterFeesExpired: false,\n        anyBroadcastersAvailable: false,\n      };\n    }\n\n    const cachedTokenBroadcasters = Object.values(broadcasterFees.forToken);\n\n    let allBroadcasterFeesExpired = true;\n    let anyBroadcastersAvailable = false;\n\n    cachedTokenBroadcasters.forEach(tokenBroadcasterMap => {\n      const unfilteredRailgunAddresses = Object.keys(\n        tokenBroadcasterMap.forBroadcaster,\n      );\n      const filteredRailgunAddresses = AddressFilter.filter(\n        unfilteredRailgunAddresses,\n      );\n      filteredRailgunAddresses.forEach(railgunAddress => {\n        const identifiers: string[] = Object.keys(\n          tokenBroadcasterMap.forBroadcaster[railgunAddress].forIdentifier,\n        );\n\n        // Loops until we hit `return false`.\n        identifiers.every(identifier => {\n          const tokenFee: CachedTokenFee =\n            tokenBroadcasterMap.forBroadcaster[railgunAddress].forIdentifier[\n              identifier\n            ];\n          if (cachedFeeExpired(tokenFee.expiration)) {\n            return true; // continue\n          }\n\n          // Any unexpired means we didn't time out.\n          allBroadcasterFeesExpired = false;\n\n          if (tokenFee.availableWallets > 0) {\n            anyBroadcastersAvailable = true;\n            return false; // break\n          }\n          return true; //continue\n        });\n      });\n    });\n\n    return { allBroadcasterFeesExpired, anyBroadcastersAvailable };\n  }\n}\n"]}
+{"version":3,"file":"broadcaster-connection-status.js","sourceRoot":"","sources":["../../src/status/broadcaster-connection-status.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CachedTokenFee,\n  Chain,\n  BroadcasterConnectionStatus,\n} from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from '../filters/address-filter.js';\nimport { cachedFeeExpired } from '../utils/broadcaster-util.js';\nimport { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nexport class BroadcasterStatus {\n  static getBroadcasterConnectionStatus(\n    chain: Chain,\n  ): BroadcasterConnectionStatus {\n    if (WakuBroadcasterWakuCore.hasError) {\n      return BroadcasterConnectionStatus.Error;\n    }\n    if (!WakuBroadcasterWakuCore.waku) {\n      return BroadcasterConnectionStatus.Disconnected;\n    }\n\n    if (this.hasSubscriptionsStalled()) {\n      BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt =\n        Date.now() + 5000;\n      return BroadcasterConnectionStatus.Disconnected;\n    }\n\n    if (!this.hasBroadcasterFeesForNetwork(chain)) {\n      return BroadcasterConnectionStatus.Searching;\n    }\n\n    const { allBroadcasterFeesExpired, anyBroadcastersAvailable } =\n      this.getAggregatedInfoForBroadcasters(chain);\n    if (allBroadcasterFeesExpired) {\n      return BroadcasterConnectionStatus.Disconnected;\n    }\n    if (!anyBroadcastersAvailable) {\n      return BroadcasterConnectionStatus.AllUnavailable;\n    }\n\n    return BroadcasterConnectionStatus.Connected;\n  }\n\n  static hasSubscriptionsStalled() {\n    const now = Date.now();\n    const limit = BroadcasterConfig.feeExpirationTimeout;\n    const lastSubscribed =\n      BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt;\n    if (isDefined(lastSubscribed)) {\n      return now - lastSubscribed > limit;\n    }\n    return false;\n  }\n\n  private static hasBroadcasterFeesForNetwork(chain: Chain) {\n    const broadcasterFees = BroadcasterFeeCache.feesForChain(chain);\n    if (!isDefined(broadcasterFees) || !isDefined(broadcasterFees.forToken)) {\n      return false;\n    }\n\n    const cachedTokenBroadcasters = Object.values(broadcasterFees.forToken);\n\n    return (\n      cachedTokenBroadcasters.find(tokenBroadcasterMap => {\n        const unfilteredBroadcasterAddresses = Object.keys(\n          tokenBroadcasterMap.forBroadcaster,\n        );\n        const filteredBroadcasterAddresses = AddressFilter.filter(\n          unfilteredBroadcasterAddresses,\n        );\n        return filteredBroadcasterAddresses.length > 0;\n      }) != null\n    );\n  }\n\n  private static getAggregatedInfoForBroadcasters(chain: Chain) {\n    const broadcasterFees = BroadcasterFeeCache.feesForChain(chain);\n    if (!isDefined(broadcasterFees) || !isDefined(broadcasterFees.forToken)) {\n      return {\n        allBroadcasterFeesExpired: false,\n        anyBroadcastersAvailable: false,\n      };\n    }\n\n    const cachedTokenBroadcasters = Object.values(broadcasterFees.forToken);\n\n    let allBroadcasterFeesExpired = true;\n    let anyBroadcastersAvailable = false;\n\n    cachedTokenBroadcasters.forEach(tokenBroadcasterMap => {\n      const unfilteredRailgunAddresses = Object.keys(\n        tokenBroadcasterMap.forBroadcaster,\n      );\n      const filteredRailgunAddresses = AddressFilter.filter(\n        unfilteredRailgunAddresses,\n      );\n      filteredRailgunAddresses.forEach(railgunAddress => {\n        const identifiers: string[] = Object.keys(\n          tokenBroadcasterMap.forBroadcaster[railgunAddress].forIdentifier,\n        );\n\n        // Loops until we hit `return false`.\n        identifiers.every(identifier => {\n          const tokenFee: CachedTokenFee =\n            tokenBroadcasterMap.forBroadcaster[railgunAddress].forIdentifier[\n            identifier\n            ];\n          if (cachedFeeExpired(tokenFee.expiration)) {\n            return true; // continue\n          }\n\n          // Any unexpired means we didn't time out.\n          allBroadcasterFeesExpired = false;\n\n          if (tokenFee.availableWallets > 0) {\n            anyBroadcastersAvailable = true;\n            return false; // break\n          }\n          return true; //continue\n        });\n      });\n    });\n\n    return { allBroadcasterFeesExpired, anyBroadcastersAvailable };\n  }\n}\n"]}

package/dist/transact/broadcaster-transact-response.d.ts

@@ -1,4 +1,4 @@
-import { IMessage } from '@waku/interfaces';
+import { type IMessage } from '@waku/sdk';
 export type WakuTransactResponse = {
     id: string;
     txHash?: string;

package/dist/transact/broadcaster-transact-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-transact-response.js","sourceRoot":"","sources":["../../src/transact/broadcaster-transact-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAQnD,MAAM,OAAO,2BAA2B;IACtC,MAAM,CAAC,yBAAyB,CAAiC;IACjE,MAAM,CAAC,SAAS,CAAuB;IAEvC,MAAM,CAAC,YAAY,GAAG,CAAC,GAAe,EAAE,EAAE;QACxC,2BAA2B,CAAC,SAAS,GAAG,GAAG,CAAC;QAC5C,2BAA2B,CAAC,yBAAyB,GAAG,SAAS,CAAC;IACpE,CAAC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,GAAG,EAAE;QAC3B,2BAA2B,CAAC,SAAS,GAAG,SAAS,CAAC;QAClD,2BAA2B,CAAC,yBAAyB,GAAG,SAAS,CAAC;IACpE,CAAC,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,OAAiB;QACxE,gBAAgB,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QACpD,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE;YAC1C,OAAO;SACR;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/B,OAAO;SACR;QACD,IAAI;YACF,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAE7C,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAEnD,CAAC;YAEF,MAAM,SAAS,GAAG,gBAAgB,CAChC,aAAa,EACb,2BAA2B,CAAC,SAAS,CACtC,CAAC;YACF,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,OAAO;aACR;YAED,gBAAgB,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;YACtE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YAEhD,2BAA2B,CAAC,yBAAyB;gBACnD,SAAiC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE;gBAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;aAC3D;YACD,gBAAgB,CAAC,KAAK,CACpB,IAAI,KAAK,CAAC,kDAAkD,EAAE;gBAC5D,KAAK;aACN,CAAC,CACH,CAAC;SACH;IACH,CAAC","sourcesContent":["import { decryptAESGCM256 } from '@railgun-community/wallet';\nimport { IMessage } from '@waku/interfaces';\nimport { bytesToUtf8 } from '../utils/conversion.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nexport type WakuTransactResponse = {\n  id: string;\n  txHash?: string;\n  error?: string;\n};\n\nexport class BroadcasterTransactResponse {\n  static storedTransactionResponse: Optional<WakuTransactResponse>;\n  static sharedKey: Optional<Uint8Array>;\n\n  static setSharedKey = (key: Uint8Array) => {\n    BroadcasterTransactResponse.sharedKey = key;\n    BroadcasterTransactResponse.storedTransactionResponse = undefined;\n  };\n\n  static clearSharedKey = () => {\n    BroadcasterTransactResponse.sharedKey = undefined;\n    BroadcasterTransactResponse.storedTransactionResponse = undefined;\n  };\n\n  static async handleBroadcasterTransactionResponseMessage(message: IMessage) {\n    BroadcasterDebug.log('Transact Response received.');\n    if (!BroadcasterTransactResponse.sharedKey) {\n      return;\n    }\n    if (!isDefined(message.payload)) {\n      return;\n    }\n    try {\n      const payload = bytesToUtf8(message.payload);\n\n      const { result: encryptedData } = JSON.parse(payload) as {\n        result: [string, string];\n      };\n\n      const decrypted = decryptAESGCM256(\n        encryptedData,\n        BroadcasterTransactResponse.sharedKey,\n      );\n      if (decrypted == null) {\n        return;\n      }\n\n      BroadcasterDebug.log('Handle Broadcaster transact-response message:');\n      BroadcasterDebug.log(JSON.stringify(decrypted));\n\n      BroadcasterTransactResponse.storedTransactionResponse =\n        decrypted as WakuTransactResponse;\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      BroadcasterDebug.error(\n        new Error('Could not handle Broadcaster tx response message', {\n          cause,\n        }),\n      );\n    }\n  }\n}\n"]}
+{"version":3,"file":"broadcaster-transact-response.js","sourceRoot":"","sources":["../../src/transact/broadcaster-transact-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAQnD,MAAM,OAAO,2BAA2B;IACtC,MAAM,CAAC,yBAAyB,CAAiC;IACjE,MAAM,CAAC,SAAS,CAAuB;IAEvC,MAAM,CAAC,YAAY,GAAG,CAAC,GAAe,EAAE,EAAE;QACxC,2BAA2B,CAAC,SAAS,GAAG,GAAG,CAAC;QAC5C,2BAA2B,CAAC,yBAAyB,GAAG,SAAS,CAAC;IACpE,CAAC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,GAAG,EAAE;QAC3B,2BAA2B,CAAC,SAAS,GAAG,SAAS,CAAC;QAClD,2BAA2B,CAAC,yBAAyB,GAAG,SAAS,CAAC;IACpE,CAAC,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,OAAiB;QACxE,gBAAgB,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QACpD,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAE7C,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAEnD,CAAC;YAEF,MAAM,SAAS,GAAG,gBAAgB,CAChC,aAAa,EACb,2BAA2B,CAAC,SAAS,CACtC,CAAC;YACF,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YAED,gBAAgB,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;YACtE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YAEhD,2BAA2B,CAAC,yBAAyB;gBACnD,SAAiC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5D,CAAC;YACD,gBAAgB,CAAC,KAAK,CACpB,IAAI,KAAK,CAAC,kDAAkD,EAAE;gBAC5D,KAAK;aACN,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC","sourcesContent":["import { decryptAESGCM256 } from '@railgun-community/wallet';\nimport { type IMessage } from '@waku/sdk';\nimport { bytesToUtf8 } from '../utils/conversion.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nexport type WakuTransactResponse = {\n  id: string;\n  txHash?: string;\n  error?: string;\n};\n\nexport class BroadcasterTransactResponse {\n  static storedTransactionResponse: Optional<WakuTransactResponse>;\n  static sharedKey: Optional<Uint8Array>;\n\n  static setSharedKey = (key: Uint8Array) => {\n    BroadcasterTransactResponse.sharedKey = key;\n    BroadcasterTransactResponse.storedTransactionResponse = undefined;\n  };\n\n  static clearSharedKey = () => {\n    BroadcasterTransactResponse.sharedKey = undefined;\n    BroadcasterTransactResponse.storedTransactionResponse = undefined;\n  };\n\n  static async handleBroadcasterTransactionResponseMessage(message: IMessage) {\n    BroadcasterDebug.log('Transact Response received.');\n    if (!BroadcasterTransactResponse.sharedKey) {\n      return;\n    }\n    if (!isDefined(message.payload)) {\n      return;\n    }\n    try {\n      const payload = bytesToUtf8(message.payload);\n\n      const { result: encryptedData } = JSON.parse(payload) as {\n        result: [string, string];\n      };\n\n      const decrypted = decryptAESGCM256(\n        encryptedData,\n        BroadcasterTransactResponse.sharedKey,\n      );\n      if (decrypted == null) {\n        return;\n      }\n\n      BroadcasterDebug.log('Handle Broadcaster transact-response message:');\n      BroadcasterDebug.log(JSON.stringify(decrypted));\n\n      BroadcasterTransactResponse.storedTransactionResponse =\n        decrypted as WakuTransactResponse;\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      BroadcasterDebug.error(\n        new Error('Could not handle Broadcaster tx response message', {\n          cause,\n        }),\n      );\n    }\n  }\n}\n"]}

package/dist/transact/broadcaster-transaction.js

@@ -109,7 +109,14 @@ export class BroadcasterTransaction {
         switch (broadcastRetryState) {
             case BroadcastRetryState.RetryTransact:
                 BroadcasterDebug.log(`Broadcast Waku message: ${this.messageData.method} via ${this.contentTopic}`);
-                await WakuBroadcasterWakuCore.broadcastMessage(this.messageData, this.contentTopic);
+                try {
+                    await WakuBroadcasterWakuCore.broadcastMessage(this.messageData, this.contentTopic);
+                }
+                catch (err) {
+                    if (err instanceof Error) {
+                        BroadcasterDebug.log(`Broadcast error: ${err.message}`);
+                    }
+                }
                 break;
             case BroadcastRetryState.Wait:
                 break;
@@ -117,6 +124,8 @@ export class BroadcasterTransaction {
                 throw new Error('Request timed out.');
         }
         const pollIterations = SECONDS_PER_RETRY / POLL_DELAY_SECONDS;
+        const responseTopic = contentTopics.transactResponse(this.chain);
+        await WakuBroadcasterWakuCore.retrieveHistoricalForTopic(responseTopic);
         const response = await poll(async () => this.getTransactionResponse(), (result) => result != null, POLL_DELAY_SECONDS * 1000, pollIterations);
         if (isDefined(response)) {
             if (isDefined(response.txHash)) {

package/dist/transact/broadcaster-transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-transaction.js","sourceRoot":"","sources":["../../src/transact/broadcaster-transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getRailgunWalletAddressData,\n  encryptDataWithSharedKey,\n  getCompletedTxidFromNullifiers,\n} from '@railgun-community/wallet';\nimport {\n  Chain,\n  EncryptDataWithSharedKeyResponse,\n  poll,\n  PreTransactionPOIsPerTxidLeafPerList,\n  BroadcasterEncryptedMethodParams,\n  BroadcasterRawParamsTransact,\n  TXIDVersion,\n} from '@railgun-community/shared-models';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { bytesToHex } from '../utils/conversion.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';\nimport { contentTopics } from '../waku/waku-topics.js';\nimport {\n  WakuTransactResponse,\n  BroadcasterTransactResponse,\n} from './broadcaster-transact-response.js';\nimport { getAddress, isHexString } from 'ethers';\n\n//\n// Transact: Encryption Flow\n//\n// Client:\n// 1. Generates random 16 bytes: `responseKey` and adds to transact data\n// 2. Generates a `sharedKey` from a random `privkey` and the Broadcaster's `pubkey`\n// 3. Encrypts the transact data asymmetrically, using `sharedKey` (`encryptedData = encrypt(transactData, sharedKey)`)\n// 4. Includes `publicKey` and `encryptedData` in transact message\n// 5. Sends the message\n//\n// Broadcaster:\n// 1. Decrypts the `encryptedData` using Broadcaster privkey and `sharedKey` (if error, it's not addressed to us)\n// 2. Processes transaction\n// 3. Encrypts response (`txHash` or `error`) using `responseKey` (symmetric: AES-GCM-256)\n// 4. Sends back encrypted response on transact-response: {encryptedData}\n//\n// Client:\n// 1. Catches all `transact-response`'s after sending a transaction.\n// 2. Decrypts each using the `responseKey`. (If error, not addressed to us)\n// 3. After successful decryption, parses `txHash` or `error`.\n//\n\nenum BroadcastRetryState {\n  RetryTransact = 'RetryTransact',\n  Wait = 'Wait',\n  Timeout = 'Timeout',\n}\n\ntype BroadcastMessageData = {\n  method: string;\n  params: BroadcasterEncryptedMethodParams;\n};\n\n// NOTE: Broadcaster default transaction-send timeout is 45 seconds.\nconst SECONDS_PER_RETRY = 2;\nconst POLL_DELAY_SECONDS = 0.1;\nconst RETRY_TRANSACTION_SECONDS = 20;\nconst POST_ALERT_TOTAL_WAITING_SECONDS = 120;\n\nexport class BroadcasterTransaction {\n  private messageData: BroadcastMessageData;\n  private contentTopic: string;\n  private txidVersionForInputs: TXIDVersion;\n  private chain: Chain;\n  private nullifiers: string[];\n\n  private constructor(\n    encryptedDataResponse: EncryptDataWithSharedKeyResponse,\n    txidVersionForInputs: TXIDVersion,\n    chain: Chain,\n    nullifiers: string[],\n  ) {\n    this.messageData = {\n      method: 'transact',\n      params: {\n        pubkey: encryptedDataResponse.randomPubKey,\n        encryptedData: encryptedDataResponse.encryptedData,\n      },\n    };\n    this.contentTopic = contentTopics.transact(chain);\n    this.txidVersionForInputs = txidVersionForInputs;\n    this.chain = chain;\n    this.nullifiers = nullifiers;\n    BroadcasterTransactResponse.setSharedKey(encryptedDataResponse.sharedKey);\n  }\n\n  static async create(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    nullifiers: string[],\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<BroadcasterTransaction> {\n    const encryptedDataResponse = await this.encryptTransaction(\n      txidVersionForInputs,\n      to,\n      data,\n      broadcasterRailgunAddress,\n      broadcasterFeesID,\n      chain,\n      overallBatchMinGasPrice,\n      useRelayAdapt,\n      preTransactionPOIsPerTxidLeafPerList,\n    );\n    return new BroadcasterTransaction(\n      encryptedDataResponse,\n      txidVersionForInputs,\n      chain,\n      nullifiers,\n    );\n  }\n\n  private static async encryptTransaction(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<EncryptDataWithSharedKeyResponse> {\n    if (!isHexString(data)) {\n      throw new Error('Data field must be a hex string.');\n    }\n\n    const { viewingPublicKey: broadcasterViewingKey } =\n      getRailgunWalletAddressData(broadcasterRailgunAddress);\n\n    const transactData: BroadcasterRawParamsTransact = {\n      txidVersion: txidVersionForInputs,\n      to: getAddress(to),\n      data,\n      broadcasterViewingKey: bytesToHex(broadcasterViewingKey),\n      chainID: chain.id,\n      chainType: chain.type,\n      minGasPrice: overallBatchMinGasPrice.toString(),\n      feesID: broadcasterFeesID,\n      useRelayAdapt,\n      devLog: BroadcasterConfig.IS_DEV,\n      minVersion: BroadcasterConfig.MINIMUM_BROADCASTER_VERSION,\n      maxVersion: BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION,\n      preTransactionPOIsPerTxidLeafPerList,\n    };\n\n    const encryptedDataResponse = await encryptDataWithSharedKey(\n      transactData,\n      broadcasterViewingKey,\n    );\n\n    return encryptedDataResponse;\n  }\n\n  private async findMatchingNullifierTxid(): Promise<Optional<string>> {\n    try {\n      const { txid } = await getCompletedTxidFromNullifiers(\n        this.txidVersionForInputs,\n        this.chain,\n        this.nullifiers,\n      );\n      return txid;\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      BroadcasterDebug.error(\n        new Error('Failed to find matching nullifier txid', { cause }),\n      );\n      return undefined;\n    }\n  }\n\n  private async getTransactionResponse(): Promise<\n    Optional<WakuTransactResponse>\n  > {\n    if (BroadcasterTransactResponse.storedTransactionResponse) {\n      return BroadcasterTransactResponse.storedTransactionResponse;\n    }\n\n    const nullifiersTxid = await this.findMatchingNullifierTxid();\n    if (isDefined(nullifiersTxid)) {\n      return {\n        id: 'nullifier-transaction',\n        txHash: nullifiersTxid,\n      };\n    }\n\n    return undefined;\n  }\n\n  private getBroadcastRetryState(retryNumber: number): BroadcastRetryState {\n    const retrySeconds = retryNumber * SECONDS_PER_RETRY;\n    if (retrySeconds <= RETRY_TRANSACTION_SECONDS) {\n      return BroadcastRetryState.RetryTransact;\n    }\n    if (retrySeconds >= POST_ALERT_TOTAL_WAITING_SECONDS) {\n      return BroadcastRetryState.Timeout;\n    }\n    return BroadcastRetryState.Wait;\n  }\n\n  async send(): Promise<string> {\n    return this.broadcast();\n  }\n\n  private async broadcast(retryNumber = 0): Promise<string> {\n    const broadcastRetryState = this.getBroadcastRetryState(retryNumber);\n    switch (broadcastRetryState) {\n      case BroadcastRetryState.RetryTransact:\n        // 0-20 seconds.\n        BroadcasterDebug.log(\n          `Broadcast Waku message: ${this.messageData.method} via ${this.contentTopic}`,\n        );\n        await WakuBroadcasterWakuCore.broadcastMessage(\n          this.messageData,\n          this.contentTopic,\n        );\n        break;\n      case BroadcastRetryState.Wait:\n        // 21-60 seconds.\n        // Do nothing.\n        break;\n      case BroadcastRetryState.Timeout:\n        // Exactly 60 seconds.\n        throw new Error('Request timed out.');\n    }\n\n    // 15 iterations (1.5 sec total, iterate every 100ms).\n    const pollIterations = SECONDS_PER_RETRY / POLL_DELAY_SECONDS;\n\n    const response: Optional<WakuTransactResponse> = await poll(\n      async () => this.getTransactionResponse(),\n      (result: Optional<WakuTransactResponse>) => result != null,\n      POLL_DELAY_SECONDS * 1000,\n      pollIterations,\n    );\n    if (isDefined(response)) {\n      if (isDefined(response.txHash)) {\n        BroadcasterTransactResponse.clearSharedKey();\n        return response.txHash;\n      }\n      if (isDefined(response.error)) {\n        BroadcasterDebug.log(`Broadcast error: ${response.error}`);\n        BroadcasterTransactResponse.clearSharedKey();\n        throw new Error('Received response error from broadcaster.', {\n          cause: new Error(response.error),\n        });\n      }\n    }\n\n    // Retry.\n    return this.broadcast(retryNumber + 1);\n  }\n}\n"]}
+{"version":3,"file":"broadcaster-transaction.js","sourceRoot":"","sources":["../../src/transact/broadcaster-transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getRailgunWalletAddressData,\n  encryptDataWithSharedKey,\n  getCompletedTxidFromNullifiers,\n} from '@railgun-community/wallet';\nimport {\n  Chain,\n  EncryptDataWithSharedKeyResponse,\n  poll,\n  PreTransactionPOIsPerTxidLeafPerList,\n  BroadcasterEncryptedMethodParams,\n  BroadcasterRawParamsTransact,\n  TXIDVersion,\n} from '@railgun-community/shared-models';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { bytesToHex } from '../utils/conversion.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WakuBroadcasterWakuCore } from '../waku/waku-broadcaster-waku-core.js';\nimport { contentTopics } from '../waku/waku-topics.js';\nimport {\n  WakuTransactResponse,\n  BroadcasterTransactResponse,\n} from './broadcaster-transact-response.js';\nimport { getAddress, isHexString } from 'ethers';\n\n//\n// Transact: Encryption Flow\n//\n// Client:\n// 1. Generates random 16 bytes: `responseKey` and adds to transact data\n// 2. Generates a `sharedKey` from a random `privkey` and the Broadcaster's `pubkey`\n// 3. Encrypts the transact data asymmetrically, using `sharedKey` (`encryptedData = encrypt(transactData, sharedKey)`)\n// 4. Includes `publicKey` and `encryptedData` in transact message\n// 5. Sends the message\n//\n// Broadcaster:\n// 1. Decrypts the `encryptedData` using Broadcaster privkey and `sharedKey` (if error, it's not addressed to us)\n// 2. Processes transaction\n// 3. Encrypts response (`txHash` or `error`) using `responseKey` (symmetric: AES-GCM-256)\n// 4. Sends back encrypted response on transact-response: {encryptedData}\n//\n// Client:\n// 1. Catches all `transact-response`'s after sending a transaction.\n// 2. Decrypts each using the `responseKey`. (If error, not addressed to us)\n// 3. After successful decryption, parses `txHash` or `error`.\n//\n\nenum BroadcastRetryState {\n  RetryTransact = 'RetryTransact',\n  Wait = 'Wait',\n  Timeout = 'Timeout',\n}\n\ntype BroadcastMessageData = {\n  method: string;\n  params: BroadcasterEncryptedMethodParams;\n};\n\n// NOTE: Broadcaster default transaction-send timeout is 45 seconds.\nconst SECONDS_PER_RETRY = 2;\nconst POLL_DELAY_SECONDS = 0.1;\nconst RETRY_TRANSACTION_SECONDS = 20;\nconst POST_ALERT_TOTAL_WAITING_SECONDS = 120;\n\nexport class BroadcasterTransaction {\n  private messageData: BroadcastMessageData;\n  private contentTopic: string;\n  private txidVersionForInputs: TXIDVersion;\n  private chain: Chain;\n  private nullifiers: string[];\n\n  private constructor(\n    encryptedDataResponse: EncryptDataWithSharedKeyResponse,\n    txidVersionForInputs: TXIDVersion,\n    chain: Chain,\n    nullifiers: string[],\n  ) {\n    this.messageData = {\n      method: 'transact',\n      params: {\n        pubkey: encryptedDataResponse.randomPubKey,\n        encryptedData: encryptedDataResponse.encryptedData,\n      },\n    };\n    this.contentTopic = contentTopics.transact(chain);\n    this.txidVersionForInputs = txidVersionForInputs;\n    this.chain = chain;\n    this.nullifiers = nullifiers;\n    BroadcasterTransactResponse.setSharedKey(encryptedDataResponse.sharedKey);\n  }\n\n  static async create(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    nullifiers: string[],\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<BroadcasterTransaction> {\n    const encryptedDataResponse = await this.encryptTransaction(\n      txidVersionForInputs,\n      to,\n      data,\n      broadcasterRailgunAddress,\n      broadcasterFeesID,\n      chain,\n      overallBatchMinGasPrice,\n      useRelayAdapt,\n      preTransactionPOIsPerTxidLeafPerList,\n    );\n    return new BroadcasterTransaction(\n      encryptedDataResponse,\n      txidVersionForInputs,\n      chain,\n      nullifiers,\n    );\n  }\n\n  private static async encryptTransaction(\n    txidVersionForInputs: TXIDVersion,\n    to: string,\n    data: string,\n    broadcasterRailgunAddress: string,\n    broadcasterFeesID: string,\n    chain: Chain,\n    overallBatchMinGasPrice: bigint,\n    useRelayAdapt: boolean,\n    preTransactionPOIsPerTxidLeafPerList: PreTransactionPOIsPerTxidLeafPerList,\n  ): Promise<EncryptDataWithSharedKeyResponse> {\n    if (!isHexString(data)) {\n      throw new Error('Data field must be a hex string.');\n    }\n\n    const { viewingPublicKey: broadcasterViewingKey } =\n      getRailgunWalletAddressData(broadcasterRailgunAddress);\n\n    const transactData: BroadcasterRawParamsTransact = {\n      txidVersion: txidVersionForInputs,\n      to: getAddress(to),\n      data,\n      broadcasterViewingKey: bytesToHex(broadcasterViewingKey),\n      chainID: chain.id,\n      chainType: chain.type,\n      minGasPrice: overallBatchMinGasPrice.toString(),\n      feesID: broadcasterFeesID,\n      useRelayAdapt,\n      devLog: BroadcasterConfig.IS_DEV,\n      minVersion: BroadcasterConfig.MINIMUM_BROADCASTER_VERSION,\n      maxVersion: BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION,\n      preTransactionPOIsPerTxidLeafPerList,\n    };\n\n    const encryptedDataResponse = await encryptDataWithSharedKey(\n      transactData,\n      broadcasterViewingKey,\n    );\n\n    return encryptedDataResponse;\n  }\n\n  private async findMatchingNullifierTxid(): Promise<Optional<string>> {\n    try {\n      const { txid } = await getCompletedTxidFromNullifiers(\n        this.txidVersionForInputs,\n        this.chain,\n        this.nullifiers,\n      );\n      return txid;\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      BroadcasterDebug.error(\n        new Error('Failed to find matching nullifier txid', { cause }),\n      );\n      return undefined;\n    }\n  }\n\n  private async getTransactionResponse(): Promise<\n    Optional<WakuTransactResponse>\n  > {\n    if (BroadcasterTransactResponse.storedTransactionResponse) {\n      return BroadcasterTransactResponse.storedTransactionResponse;\n    }\n\n    const nullifiersTxid = await this.findMatchingNullifierTxid();\n    if (isDefined(nullifiersTxid)) {\n      return {\n        id: 'nullifier-transaction',\n        txHash: nullifiersTxid,\n      };\n    }\n\n    return undefined;\n  }\n\n  private getBroadcastRetryState(retryNumber: number): BroadcastRetryState {\n    const retrySeconds = retryNumber * SECONDS_PER_RETRY;\n    if (retrySeconds <= RETRY_TRANSACTION_SECONDS) {\n      return BroadcastRetryState.RetryTransact;\n    }\n    if (retrySeconds >= POST_ALERT_TOTAL_WAITING_SECONDS) {\n      return BroadcastRetryState.Timeout;\n    }\n    return BroadcastRetryState.Wait;\n  }\n\n  async send(): Promise<string> {\n    return this.broadcast();\n  }\n\n  private async broadcast(retryNumber = 0): Promise<string> {\n    const broadcastRetryState = this.getBroadcastRetryState(retryNumber);\n    switch (broadcastRetryState) {\n      case BroadcastRetryState.RetryTransact:\n        // 0-20 seconds.\n        BroadcasterDebug.log(\n          `Broadcast Waku message: ${this.messageData.method} via ${this.contentTopic}`,\n        );\n        try {\n          await WakuBroadcasterWakuCore.broadcastMessage(\n            this.messageData,\n            this.contentTopic,\n          );\n        } catch (err) {\n          if (err instanceof Error) {\n            BroadcasterDebug.log(`Broadcast error: ${err.message}`);\n          }\n        }\n        break;\n      case BroadcastRetryState.Wait:\n        // 21-60 seconds.\n        // Do nothing.\n        break;\n      case BroadcastRetryState.Timeout:\n        // Exactly 60 seconds.\n        throw new Error('Request timed out.');\n    }\n\n    // 15 iterations (1.5 sec total, iterate every 100ms).\n    const pollIterations = SECONDS_PER_RETRY / POLL_DELAY_SECONDS;\n\n    const responseTopic = contentTopics.transactResponse(this.chain);\n    await WakuBroadcasterWakuCore.retrieveHistoricalForTopic(responseTopic);\n\n    const response: Optional<WakuTransactResponse> = await poll(\n      async () => this.getTransactionResponse(),\n      (result: Optional<WakuTransactResponse>) => result != null,\n      POLL_DELAY_SECONDS * 1000,\n      pollIterations,\n    );\n    if (isDefined(response)) {\n      if (isDefined(response.txHash)) {\n        BroadcasterTransactResponse.clearSharedKey();\n        return response.txHash;\n      }\n      if (isDefined(response.error)) {\n        BroadcasterDebug.log(`Broadcast error: ${response.error}`);\n        BroadcasterTransactResponse.clearSharedKey();\n        throw new Error('Received response error from broadcaster.', {\n          cause: new Error(response.error),\n        });\n      }\n    }\n\n    // Retry.\n    return this.broadcast(retryNumber + 1);\n  }\n}\n"]}

package/dist/utils/broadcaster-debug.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-debug.js","sourceRoot":"","sources":["../../src/utils/broadcaster-debug.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IACnB,MAAM,CAAC,KAAK,CAAgC;IAEpD,MAAM,CAAC,WAAW,CAAC,KAA0B;QAC3C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAW;QACpB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACrB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAU,EAAE,aAAa,GAAG,KAAK;QAC5C,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACvB;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,aAAa,EAAE;YAErD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;IACH,CAAC;CACF","sourcesContent":["import { BroadcasterDebugger } from '../models/export-models.js';\n\nexport class BroadcasterDebug {\n  private static debug: Optional<BroadcasterDebugger>;\n\n  static setDebugger(debug: BroadcasterDebugger) {\n    this.debug = debug;\n  }\n\n  static log(msg: string) {\n    if (this.debug) {\n      this.debug.log(msg);\n    }\n  }\n\n  static error(err: Error, ignoreInTests = false) {\n    if (this.debug) {\n      this.debug.error(err);\n    }\n    if (process.env.NODE_ENV === 'test' && !ignoreInTests) {\n      // eslint-disable-next-line no-console\n      console.error(err);\n    }\n  }\n}\n"]}
+{"version":3,"file":"broadcaster-debug.js","sourceRoot":"","sources":["../../src/utils/broadcaster-debug.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IACnB,MAAM,CAAC,KAAK,CAAgC;IAEpD,MAAM,CAAC,WAAW,CAAC,KAA0B;QAC3C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAW;QACpB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAU,EAAE,aAAa,GAAG,KAAK;QAC5C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAEtD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;CACF","sourcesContent":["import { BroadcasterDebugger } from '../models/export-models.js';\n\nexport class BroadcasterDebug {\n  private static debug: Optional<BroadcasterDebugger>;\n\n  static setDebugger(debug: BroadcasterDebugger) {\n    this.debug = debug;\n  }\n\n  static log(msg: string) {\n    if (this.debug) {\n      this.debug.log(msg);\n    }\n  }\n\n  static error(err: Error, ignoreInTests = false) {\n    if (this.debug) {\n      this.debug.error(err);\n    }\n    if (process.env.NODE_ENV === 'test' && !ignoreInTests) {\n      // eslint-disable-next-line no-console\n      console.error(err);\n    }\n  }\n}\n"]}

package/dist/utils/broadcaster-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-util.js","sourceRoot":"","sources":["../../src/utils/broadcaster-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EACf,cAAc,GACf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAE1C,MAAM,CAAC,MAAM,8BAA8B,GAAG,SAAS,CAAC;AAExD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAe,EAAU,EAAE;IACxD,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE,EAAE;QACvB,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,cAAsB,EACtB,UAA4B,EAC5B,EAAE;IACF,MAAM,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;IACpD,IAAI,SAAS,CAAC,UAAU,CAAC,EAAE;QACzB,OAAO,GAAG,YAAY,KAAK,UAAU,EAAE,CAAC;KACzC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAGxD,OAAO,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,2BAA2B,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAyB,EAAE,EAAE;IACrE,OAAO,CACL,cAAc,CACZ,OAAO,IAAI,OAAO,EAClB,iBAAiB,CAAC,2BAA2B,CAC9C,GAAG,CAAC;QACL,cAAc,CACZ,OAAO,IAAI,OAAO,EAClB,iBAAiB,CAAC,2BAA2B,CAC9C,GAAG,CAAC,CACN,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,SAAyB,EACzB,KAAY,EACZ,aAAsB,EACtB,EAAE;IACF,IAAI,aAAa,EAAE;QACjB,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QACxC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,IAAI,CAAC;SACb;QACD,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;SAChD;QAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QAErD,IAAI,UAAU,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1D,OAAO,IAAI,CAAC;SACb;KACF;IAED,IAAI,SAAS,CAAC,gBAAgB,KAAK,CAAC,EAAE;QAEpC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC","sourcesContent":["import {\n  CachedTokenFee,\n  Chain,\n  networkForChain,\n  versionCompare,\n} from '@railgun-community/shared-models';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { isDefined } from './is-defined.js';\n\nconst FEE_EXPIRATION_MINIMUM_MSEC = 40000;\n\nexport const DEFAULT_BROADCASTER_IDENTIFIER = 'default';\n\nexport const shortenAddress = (address: string): string => {\n  if (address.length < 13) {\n    return address;\n  }\n  // 12 chars separated by '...'\n  return `${address.slice(0, 8)}...${address.slice(-4)}`;\n};\n\nexport const nameForBroadcaster = (\n  railgunAddress: string,\n  identifier: Optional<string>,\n) => {\n  const shortAddress = shortenAddress(railgunAddress);\n  if (isDefined(identifier)) {\n    return `${shortAddress}: ${identifier}`;\n  }\n  return shortAddress;\n};\n\nexport const cachedFeeExpired = (feeExpiration: number) => {\n  // Minimum of 40sec until expiration, in order to run the proof and submit.\n  // If submitted after feeCacheID expires, it risks \"Bad token fee\" error from Broadcaster.\n  return feeExpiration < Date.now() + FEE_EXPIRATION_MINIMUM_MSEC;\n};\n\nexport const invalidBroadcasterVersion = (version: Optional<string>) => {\n  return (\n    versionCompare(\n      version ?? '0.0.0',\n      BroadcasterConfig.MINIMUM_BROADCASTER_VERSION,\n    ) < 0 ||\n    versionCompare(\n      version ?? '0.0.0',\n      BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION,\n    ) > 0\n  );\n};\n\nexport const cachedFeeUnavailableOrExpired = (\n  cachedFee: CachedTokenFee,\n  chain: Chain,\n  useRelayAdapt: boolean,\n) => {\n  if (useRelayAdapt) {\n    const relayAdapt = cachedFee.relayAdapt;\n    if (!relayAdapt) {\n      return true;\n    }\n    const network = networkForChain(chain);\n    if (!network) {\n      throw new Error(`Unrecognized chain ${chain}`);\n    }\n\n    const expectedRelayAdapt = network.relayAdaptHistory;\n    // TODO: switch back when all testing and migration to new adapt has completed.\n    if (relayAdapt && !expectedRelayAdapt.includes(relayAdapt)) {\n      return true;\n    }\n  }\n\n  if (cachedFee.availableWallets === 0) {\n    // No available wallets.\n    return true;\n  }\n\n  if (cachedFeeExpired(cachedFee.expiration)) {\n    return true;\n  }\n\n  return false;\n};\n"]}
+{"version":3,"file":"broadcaster-util.js","sourceRoot":"","sources":["../../src/utils/broadcaster-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EACf,cAAc,GACf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAE1C,MAAM,CAAC,MAAM,8BAA8B,GAAG,SAAS,CAAC;AAExD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAe,EAAU,EAAE;IACxD,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,cAAsB,EACtB,UAA4B,EAC5B,EAAE;IACF,MAAM,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;IACpD,IAAI,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,GAAG,YAAY,KAAK,UAAU,EAAE,CAAC;IAC1C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAGxD,OAAO,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,2BAA2B,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAyB,EAAE,EAAE;IACrE,OAAO,CACL,cAAc,CACZ,OAAO,IAAI,OAAO,EAClB,iBAAiB,CAAC,2BAA2B,CAC9C,GAAG,CAAC;QACL,cAAc,CACZ,OAAO,IAAI,OAAO,EAClB,iBAAiB,CAAC,2BAA2B,CAC9C,GAAG,CAAC,CACN,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,SAAyB,EACzB,KAAY,EACZ,aAAsB,EACtB,EAAE;IACF,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QACxC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QAErD,IAAI,UAAU,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,SAAS,CAAC,gBAAgB,KAAK,CAAC,EAAE,CAAC;QAErC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC","sourcesContent":["import {\n  CachedTokenFee,\n  Chain,\n  networkForChain,\n  versionCompare,\n} from '@railgun-community/shared-models';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { isDefined } from './is-defined.js';\n\nconst FEE_EXPIRATION_MINIMUM_MSEC = 40000;\n\nexport const DEFAULT_BROADCASTER_IDENTIFIER = 'default';\n\nexport const shortenAddress = (address: string): string => {\n  if (address.length < 13) {\n    return address;\n  }\n  // 12 chars separated by '...'\n  return `${address.slice(0, 8)}...${address.slice(-4)}`;\n};\n\nexport const nameForBroadcaster = (\n  railgunAddress: string,\n  identifier: Optional<string>,\n) => {\n  const shortAddress = shortenAddress(railgunAddress);\n  if (isDefined(identifier)) {\n    return `${shortAddress}: ${identifier}`;\n  }\n  return shortAddress;\n};\n\nexport const cachedFeeExpired = (feeExpiration: number) => {\n  // Minimum of 40sec until expiration, in order to run the proof and submit.\n  // If submitted after feeCacheID expires, it risks \"Bad token fee\" error from Broadcaster.\n  return feeExpiration < Date.now() + FEE_EXPIRATION_MINIMUM_MSEC;\n};\n\nexport const invalidBroadcasterVersion = (version: Optional<string>) => {\n  return (\n    versionCompare(\n      version ?? '0.0.0',\n      BroadcasterConfig.MINIMUM_BROADCASTER_VERSION,\n    ) < 0 ||\n    versionCompare(\n      version ?? '0.0.0',\n      BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION,\n    ) > 0\n  );\n};\n\nexport const cachedFeeUnavailableOrExpired = (\n  cachedFee: CachedTokenFee,\n  chain: Chain,\n  useRelayAdapt: boolean,\n) => {\n  if (useRelayAdapt) {\n    const relayAdapt = cachedFee.relayAdapt;\n    if (!relayAdapt) {\n      return true;\n    }\n    const network = networkForChain(chain);\n    if (!network) {\n      throw new Error(`Unrecognized chain ${chain}`);\n    }\n\n    const expectedRelayAdapt = network.relayAdaptHistory;\n    // TODO: switch back when all testing and migration to new adapt has completed.\n    if (relayAdapt && !expectedRelayAdapt.includes(relayAdapt)) {\n      return true;\n    }\n  }\n\n  if (cachedFee.availableWallets === 0) {\n    // No available wallets.\n    return true;\n  }\n\n  if (cachedFeeExpired(cachedFee.expiration)) {\n    return true;\n  }\n\n  return false;\n};\n"]}

package/dist/utils/is-defined.d.ts

@@ -1 +1 @@
-export declare const isDefined: <T>(a: T | null | undefined) => a is T;
+export declare const isDefined: <T>(a: T | undefined | null) => a is T;

package/dist/waku/waku-broadcaster-waku-core-base.d.ts

@@ -0,0 +1,31 @@
+import { Chain } from '@railgun-community/shared-models';
+import { type LightNode } from '@waku/sdk';
+import { BroadcasterOptions } from '../models/index.js';
+export declare abstract class WakuBroadcasterWakuCoreBase {
+    static hasError: boolean;
+    static restartCallback: () => void;
+    static waku: Optional<LightNode>;
+    protected static pubSubTopic: string;
+    protected static additionalDirectPeers: string[];
+    protected static peerDiscoveryTimeout: number;
+    protected static defaultShard: {
+        clusterId: number;
+        shard: number;
+        shardId: number;
+        pubsubTopic: string;
+    };
+    static restartCount: number;
+    static initWaku(chain: Chain): Promise<void>;
+    static pollHistoricalTopics(): Promise<void>;
+    static setWakuRestartCallback(callback: () => void): void;
+    static reinitWaku(chain: Chain): Promise<void>;
+    static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions): void;
+    static disconnect(): Promise<void>;
+    protected static connect(): Promise<void>;
+    static getMeshPeerCount(): number;
+    static getPubSubPeerCount(): number;
+    static getLightPushPeerCount(): Promise<number>;
+    static getFilterPeerCount(): Promise<number>;
+    static broadcastMessage(data: object, topic: string): Promise<void>;
+    static retrieveHistoricalForTopic(topic: string): Promise<void>;
+}

package/dist/waku/waku-broadcaster-waku-core-base.js

@@ -0,0 +1,168 @@
+import { delay } from '@railgun-community/shared-models';
+import { WakuObservers } from './waku-observers.js';
+import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
+import { utf8ToBytes } from '../utils/conversion.js';
+import { isDefined } from '../utils/is-defined.js';
+import { createEncoder, createDecoder, } from '@waku/sdk';
+import { WAKU_RAILGUN_DEFAULT_SHARD, WAKU_RAILGUN_PUB_SUB_TOPIC, } from '../models/constants.js';
+import { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';
+import { BroadcasterConfig } from '../models/broadcaster-config.js';
+export class WakuBroadcasterWakuCoreBase {
+    static hasError = false;
+    static restartCallback;
+    static waku;
+    static pubSubTopic = WAKU_RAILGUN_PUB_SUB_TOPIC;
+    static additionalDirectPeers = [];
+    static peerDiscoveryTimeout = 60000;
+    static defaultShard = WAKU_RAILGUN_DEFAULT_SHARD;
+    static restartCount = 0;
+    static async initWaku(chain) {
+        try {
+            await this.connect();
+            if (!this.waku) {
+                BroadcasterDebug.log('No waku instance found');
+                return;
+            }
+            WakuObservers.resetCurrentChain();
+            await WakuObservers.setObserversForChain(this.waku, chain);
+            this.pollHistoricalTopics();
+        }
+        catch (err) {
+            if (!(err instanceof Error)) {
+                throw err;
+            }
+            BroadcasterDebug.error(err);
+            throw err;
+        }
+    }
+    static async pollHistoricalTopics() {
+        BroadcasterDebug.log("Polling historical messages");
+        const topics = WakuObservers.getCurrentContentTopics();
+        for (const topic of topics) {
+            await this.retrieveHistoricalForTopic(topic);
+        }
+        await delay(10_000);
+    }
+    static setWakuRestartCallback(callback) {
+        this.restartCallback = callback;
+    }
+    static async reinitWaku(chain) {
+        if (isDefined(this.waku) &&
+            this.waku.isStarted()) {
+            await this.disconnect();
+        }
+        BroadcasterFeeCache.resetCache(chain);
+        BroadcasterDebug.log(`Reinit Waku, ${++this.restartCount}`);
+        await this.initWaku(chain);
+        if (this.restartCallback) {
+            this.restartCallback();
+        }
+    }
+    static setBroadcasterOptions(broadcasterOptions) {
+        BroadcasterConfig.trustedFeeSigner = broadcasterOptions.trustedFeeSigner;
+        if (isDefined(broadcasterOptions.pubSubTopic)) {
+            this.pubSubTopic = broadcasterOptions.pubSubTopic;
+        }
+        if (broadcasterOptions.additionalDirectPeers) {
+            this.additionalDirectPeers =
+                broadcasterOptions.additionalDirectPeers;
+        }
+        if (isDefined(broadcasterOptions.peerDiscoveryTimeout)) {
+            this.peerDiscoveryTimeout =
+                broadcasterOptions.peerDiscoveryTimeout;
+        }
+        if (isDefined(broadcasterOptions.feeExpirationTimeout)) {
+            BroadcasterConfig.feeExpirationTimeout =
+                broadcasterOptions.feeExpirationTimeout;
+        }
+    }
+    static async disconnect() {
+        await WakuObservers.unsubscribe(this.waku);
+        await this.waku?.stop();
+        this.waku = undefined;
+    }
+    static connect() {
+        throw new Error("Method 'connect' must be implemented.");
+    }
+    static getMeshPeerCount() {
+        return 0;
+    }
+    static getPubSubPeerCount() {
+        return 0;
+    }
+    static async getLightPushPeerCount() {
+        if (!this.waku)
+            return 0;
+        return this.waku.libp2p.getConnections().length;
+    }
+    static async getFilterPeerCount() {
+        if (!this.waku)
+            return 0;
+        return this.waku.libp2p.getConnections().length;
+    }
+    static async broadcastMessage(data, topic) {
+        if (!this.waku) {
+            throw new Error('Waku not initialized');
+        }
+        const encoder = createEncoder({
+            contentTopic: topic,
+            routingInfo: WAKU_RAILGUN_DEFAULT_SHARD
+        });
+        const payload = utf8ToBytes(JSON.stringify(data));
+        const result = await this.waku.lightPush.send(encoder, {
+            payload,
+        });
+        if (result.failures && result.failures.length > 0) {
+            throw new Error(`Failed to send message: ${result.failures.map(f => f.error).join(', ')}`);
+        }
+    }
+    static async retrieveHistoricalForTopic(topic) {
+        if (!this.waku) {
+            return;
+        }
+        const callback = WakuObservers.getCallbackForTopic(topic);
+        if (!callback) {
+            BroadcasterDebug.log(`No callback found for topic: ${topic}`);
+            return;
+        }
+        const decoder = createDecoder(topic, WAKU_RAILGUN_DEFAULT_SHARD);
+        try {
+            const startTime = new Date();
+            startTime.setTime(Date.now() - (5 * 60 * 1000));
+            const endTime = new Date(Date.now());
+            const options = {
+                includeData: true,
+                pubsubTopic: this.pubSubTopic,
+                contentTopics: [topic],
+                paginationForward: true,
+            };
+            const lastMessage = WakuObservers.getLastMessage(topic);
+            if (lastMessage) {
+                const cursor = this.waku.store.createCursor(lastMessage);
+                options.paginationCursor = cursor;
+            }
+            else {
+                options.timeStart = startTime;
+                options.timeEnd = endTime;
+            }
+            const generator = this.waku.store.queryGenerator([decoder], options);
+            for await (const messagesPromises of generator) {
+                messagesPromises.reverse();
+                for (const messagePromise of messagesPromises) {
+                    if (isDefined(messagePromise)) {
+                        const message = await messagePromise;
+                        if (isDefined(message)) {
+                            callback(message);
+                        }
+                    }
+                }
+            }
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                BroadcasterDebug.log(`Error retrieving historical messages: ${err.message}`);
+            }
+        }
+    }
+}
+//# sourceMappingURL=waku-broadcaster-waku-core-base.js.map

package/dist/waku/waku-broadcaster-waku-core-base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"waku-broadcaster-waku-core-base.js","sourceRoot":"","sources":["../../src/waku/waku-broadcaster-waku-core-base.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, delay } from '@railgun-community/shared-models';\nimport { WakuObservers } from './waku-observers.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { utf8ToBytes } from '../utils/conversion.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport {\n  createEncoder,\n  createDecoder,\n  type LightNode,\n  type IDecodedMessage,\n  type QueryRequestParams,\n} from '@waku/sdk';\nimport { BroadcasterOptions } from '../models/index.js';\nimport {\n  WAKU_RAILGUN_DEFAULT_SHARD,\n  WAKU_RAILGUN_PUB_SUB_TOPIC,\n} from '../models/constants.js';\nimport { BroadcasterFeeCache } from '../fees/broadcaster-fee-cache.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\n\nexport abstract class WakuBroadcasterWakuCoreBase {\n  static hasError = false;\n  static restartCallback: () => void;\n\n  static waku: Optional<LightNode>;\n\n  protected static pubSubTopic = WAKU_RAILGUN_PUB_SUB_TOPIC;\n  protected static additionalDirectPeers: string[] = [];\n  protected static peerDiscoveryTimeout = 60000;\n  protected static defaultShard = WAKU_RAILGUN_DEFAULT_SHARD;\n  public static restartCount = 0;\n\n  static async initWaku(chain: Chain): Promise<void> {\n    try {\n      await this.connect();\n      if (!this.waku) {\n        BroadcasterDebug.log('No waku instance found');\n        return;\n      }\n      WakuObservers.resetCurrentChain();\n      await WakuObservers.setObserversForChain(\n        this.waku,\n        chain,\n      );\n\n      this.pollHistoricalTopics()\n\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw err;\n    }\n  }\n\n  static async pollHistoricalTopics() {\n    BroadcasterDebug.log(\"Polling historical messages\")\n    const topics = WakuObservers.getCurrentContentTopics();\n    for (const topic of topics) {\n      await this.retrieveHistoricalForTopic(topic);\n    }\n    await delay(10_000)\n  }\n\n  static setWakuRestartCallback(callback: () => void) {\n    this.restartCallback = callback;\n  }\n\n  static async reinitWaku(chain: Chain) {\n    if (\n      isDefined(this.waku) &&\n      this.waku.isStarted()\n    ) {\n      // Reset fees, which will reset status to \"Searching\".\n      await this.disconnect();\n    }\n    BroadcasterFeeCache.resetCache(chain);\n    BroadcasterDebug.log(\n      `Reinit Waku, ${++this.restartCount}`,\n    );\n    await this.initWaku(chain);\n    if (this.restartCallback) {\n      this.restartCallback();\n    }\n  }\n\n  static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions) {\n    BroadcasterConfig.trustedFeeSigner = broadcasterOptions.trustedFeeSigner;\n\n    if (isDefined(broadcasterOptions.pubSubTopic)) {\n      this.pubSubTopic = broadcasterOptions.pubSubTopic;\n    }\n    if (broadcasterOptions.additionalDirectPeers) {\n      this.additionalDirectPeers =\n        broadcasterOptions.additionalDirectPeers;\n    }\n    if (isDefined(broadcasterOptions.peerDiscoveryTimeout)) {\n      this.peerDiscoveryTimeout =\n        broadcasterOptions.peerDiscoveryTimeout;\n    }\n    if (isDefined(broadcasterOptions.feeExpirationTimeout)) {\n      BroadcasterConfig.feeExpirationTimeout =\n        broadcasterOptions.feeExpirationTimeout;\n    }\n  }\n\n  static async disconnect() {\n    await WakuObservers.unsubscribe(this.waku);\n    await this.waku?.stop();\n    this.waku = undefined;\n  }\n\n  protected static connect(): Promise<void> {\n    throw new Error(\"Method 'connect' must be implemented.\");\n  }\n\n  static getMeshPeerCount(): number {\n    return 0;\n  }\n\n  static getPubSubPeerCount(): number {\n    return 0;\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    if (!this.waku) return 0;\n    return this.waku.libp2p.getConnections().length;\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    if (!this.waku) return 0;\n    return this.waku.libp2p.getConnections().length;\n  }\n\n\n\n  static async broadcastMessage(data: object, topic: string): Promise<void> {\n    if (!this.waku) {\n      throw new Error('Waku not initialized');\n    }\n    const encoder = createEncoder({\n      contentTopic: topic,\n      routingInfo: WAKU_RAILGUN_DEFAULT_SHARD\n    });\n\n    const payload = utf8ToBytes(JSON.stringify(data));\n\n    const result = await this.waku.lightPush.send(encoder, {\n      payload,\n    });\n\n    if (result.failures && result.failures.length > 0) {\n      throw new Error(`Failed to send message: ${result.failures.map(f => f.error).join(', ')}`);\n    }\n  }\n\n  static async retrieveHistoricalForTopic(topic: string): Promise<void> {\n    if (!this.waku) {\n      return;\n    }\n\n    const callback = WakuObservers.getCallbackForTopic(topic);\n    if (!callback) {\n      BroadcasterDebug.log(`No callback found for topic: ${topic}`);\n      return;\n    }\n\n    const decoder = createDecoder(topic, WAKU_RAILGUN_DEFAULT_SHARD);\n\n    try {\n      const startTime = new Date()\n      // TODO: make a variable\n      startTime.setTime(Date.now() - (5 * 60 * 1000))\n      const endTime = new Date(Date.now())\n      const options: QueryRequestParams = {\n        includeData: true,\n        pubsubTopic: this.pubSubTopic,\n        contentTopics: [topic],\n        paginationForward: true,\n      }\n      const lastMessage = WakuObservers.getLastMessage(topic);\n      if (lastMessage) {\n        const cursor = this.waku.store.createCursor(lastMessage)\n        options.paginationCursor = cursor\n      } else {\n        options.timeStart = startTime\n        options.timeEnd = endTime\n      }\n      const generator = this.waku.store.queryGenerator([decoder], options);\n      for await (const messagesPromises of generator) {\n        messagesPromises.reverse()\n        for (const messagePromise of messagesPromises) {\n          if (isDefined(messagePromise)) {\n            const message = await messagePromise\n            if (isDefined(message)) {\n              callback(message);\n            }\n          }\n        }\n      }\n    } catch (err) {\n      if (err instanceof Error) {\n        BroadcasterDebug.log(\n          `Error retrieving historical messages: ${err.message}`,\n        );\n      }\n    }\n  }\n}\n"]}

package/dist/waku/waku-broadcaster-waku-core.d.ts

@@ -1,25 +1,4 @@
-import { Chain } from '@railgun-community/shared-models';
-import { type RelayNode } from '@waku/interfaces';
-import { BroadcasterOptions } from '../models/index.js';
-export declare class WakuBroadcasterWakuCore {
-    static hasError: boolean;
-    static restartCallback: () => void;
-    static waku: Optional<RelayNode>;
-    private static pubSubTopic;
-    private static additionalDirectPeers;
-    private static peerDiscoveryTimeout;
-    private static defaultShard;
-    static restartCount: number;
-    static initWaku: (chain: Chain) => Promise<void>;
-    static setWakuRestartCallback: (callback: () => void) => void;
-    static reinitWaku: (chain: Chain) => Promise<void>;
-    static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions): void;
-    static disconnect: () => Promise<void>;
-    private static connect;
-    static getMeshPeerCount(): number;
-    static getPubSubPeerCount(): number;
-    static getLightPushPeerCount(): Promise<number>;
-    static getFilterPeerCount(): Promise<number>;
-    private static waitForRemotePeer;
-    static broadcastMessage(data: object, contentTopic: string): Promise<void>;
+import { WakuBroadcasterWakuCoreBase } from './waku-broadcaster-waku-core-base.js';
+export declare class WakuBroadcasterWakuCore extends WakuBroadcasterWakuCoreBase {
+    protected static connect(): Promise<void>;
 }