@railgun-community/waku-broadcaster-client-node 8.1.0 → 8.1.1

package/dist/fees/broadcaster-fee-cache.d.ts

@@ -13,6 +13,7 @@ export type BroadcasterFeeCacheState = {
 };
 export declare class BroadcasterFeeCache {
     private static cache;
+    static lastSubscribedFeeMessageReceivedAt: Optional<number>;
     private static poiActiveListKeys;
     static init(poiActiveListKeys: string[]): void;
     static addTokenFees(chain: Chain, railgunAddress: string, feeExpiration: number, tokenFeeMap: MapType<CachedTokenFee>, identifier: Optional<string>, version: string, requiredPOIListKeys: string[]): void;

package/dist/fees/broadcaster-fee-cache.js

@@ -5,9 +5,11 @@ import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
 import { nameForBroadcaster, cachedFeeExpired, DEFAULT_BROADCASTER_IDENTIFIER, invalidBroadcasterVersion, cachedFeeUnavailableOrExpired, } from '../utils/broadcaster-util.js';
 export class BroadcasterFeeCache {
     static cache = { forNetwork: {} };
+    static lastSubscribedFeeMessageReceivedAt;
     static poiActiveListKeys;
     static init(poiActiveListKeys) {
         this.poiActiveListKeys = poiActiveListKeys;
+        this.lastSubscribedFeeMessageReceivedAt = Date.now();
     }
     static addTokenFees(chain, railgunAddress, feeExpiration, tokenFeeMap, identifier, version, requiredPOIListKeys) {
         const network = networkForChain(chain);
@@ -45,6 +47,7 @@ export class BroadcasterFeeCache {
             this.cache.forNetwork[networkName].forToken[tokenAddress].forBroadcaster[railgunAddress].forIdentifier[identifier ?? DEFAULT_BROADCASTER_IDENTIFIER] =
                 tokenFeeMap[tokenAddress];
         });
+        BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt = Date.now();
     }
     static resetCache(chain) {
         const network = networkForChain(chain);

package/dist/fees/broadcaster-fee-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-fee-cache.js","sourceRoot":"","sources":["../../src/fees/broadcaster-fee-cache.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CachedTokenFee,\n  Chain,\n  networkForChain,\n} from '@railgun-community/shared-models';\nimport { AddressFilter } from '../filters/address-filter.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport {\n  nameForBroadcaster,\n  cachedFeeExpired,\n  DEFAULT_BROADCASTER_IDENTIFIER,\n  invalidBroadcasterVersion,\n  cachedFeeUnavailableOrExpired,\n} from '../utils/broadcaster-util.js';\n\n// {forNetwork: {forToken: {forBroadcaster: (fee, updatedAt)}}}\ntype BroadcasterFeeNetworkTokenBroadcasterCacheMap = {\n  forIdentifier: MapType<CachedTokenFee>;\n};\ntype BroadcasterFeeNetworkTokenCacheMap = {\n  forBroadcaster: MapType<BroadcasterFeeNetworkTokenBroadcasterCacheMap>;\n};\ntype BroadcasterFeeNetworkCacheMap = {\n  forToken: MapType<BroadcasterFeeNetworkTokenCacheMap>;\n};\nexport type BroadcasterFeeCacheState = {\n  forNetwork: MapType<BroadcasterFeeNetworkCacheMap>;\n};\n\nexport class BroadcasterFeeCache {\n  private static cache: BroadcasterFeeCacheState = { forNetwork: {} };\n\n  private static poiActiveListKeys: Optional<string[]>;\n\n  static init(poiActiveListKeys: string[]) {\n    this.poiActiveListKeys = poiActiveListKeys;\n  }\n\n  static addTokenFees(\n    chain: Chain,\n    railgunAddress: string,\n    feeExpiration: number,\n    tokenFeeMap: MapType<CachedTokenFee>,\n    identifier: Optional<string>,\n    version: string,\n    requiredPOIListKeys: string[],\n  ) {\n    const network = networkForChain(chain);\n    if (!network) {\n      return;\n    }\n\n    if (!this.poiActiveListKeys) {\n      throw new Error(\n        'Must define active POI list keys before adding any fees.',\n      );\n    }\n    for (const listKey of requiredPOIListKeys) {\n      if (!this.poiActiveListKeys.includes(listKey)) {\n        BroadcasterDebug.log(\n          `[Fees] Broadcaster ${railgunAddress} requires POI list key ${listKey}, which is not active.`,\n        );\n        return;\n      }\n    }\n\n    const broadcasterName = nameForBroadcaster(railgunAddress, identifier);\n    const networkName = network.name;\n\n    if (invalidBroadcasterVersion(version)) {\n      BroadcasterDebug.log(\n        `[Fees] Broadcaster version ${version} invalid (req ${BroadcasterConfig.MINIMUM_BROADCASTER_VERSION}-${BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION}): ${broadcasterName}`,\n      );\n      return;\n    }\n\n    if (cachedFeeExpired(feeExpiration)) {\n      BroadcasterDebug.log(\n        `[Fees] Fees expired for ${networkName} (${broadcasterName})`,\n      );\n      return;\n    }\n\n    const tokenAddresses = Object.keys(tokenFeeMap);\n    BroadcasterDebug.log(\n      `[Fees] Updating fees for ${networkName} (${broadcasterName}): ${tokenAddresses.length} tokens`,\n    );\n\n    this.cache.forNetwork[networkName] ??= { forToken: {} };\n\n    const tokenAddressesLowercase = tokenAddresses.map(address =>\n      address.toLowerCase(),\n    );\n    tokenAddressesLowercase.forEach(tokenAddress => {\n      this.cache.forNetwork[networkName].forToken[tokenAddress] ??= {\n        forBroadcaster: {},\n      };\n      this.cache.forNetwork[networkName].forToken[tokenAddress].forBroadcaster[\n        railgunAddress\n      ] ??= { forIdentifier: {} };\n\n      this.cache.forNetwork[networkName].forToken[tokenAddress].forBroadcaster[\n        railgunAddress\n      ].forIdentifier[identifier ?? DEFAULT_BROADCASTER_IDENTIFIER] =\n        tokenFeeMap[tokenAddress];\n    });\n  }\n\n  static resetCache(chain: Chain) {\n    const network = networkForChain(chain);\n    if (!network) {\n      return;\n    }\n    this.cache.forNetwork ??= {};\n    delete this.cache.forNetwork[network.name];\n  }\n\n  static feesForChain(chain: Chain): Optional<BroadcasterFeeNetworkCacheMap> {\n    const network = networkForChain(chain);\n    if (!network) {\n      throw new Error('Chain not found.');\n    }\n    return this.cache.forNetwork[network.name];\n  }\n\n  static feesForToken(\n    chain: Chain,\n    tokenAddress: string,\n  ): Optional<BroadcasterFeeNetworkTokenCacheMap> {\n    return this.feesForChain(chain)?.forToken[tokenAddress.toLowerCase()];\n  }\n\n  static supportsToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): boolean {\n    const feesForToken = this.feesForToken(chain, tokenAddress);\n    if (!feesForToken) {\n      return false;\n    }\n\n    const railgunAddresses = Object.keys(feesForToken.forBroadcaster);\n    const filteredRailgunAddresses = AddressFilter.filter(railgunAddresses);\n\n    const cachedFees: CachedTokenFee[] = filteredRailgunAddresses\n      .map(railgunAddress =>\n        Object.values(\n          feesForToken.forBroadcaster[railgunAddress].forIdentifier,\n        ),\n      )\n      .flat();\n\n    const availableUnexpiredFee = cachedFees.find(\n      cachedFee =>\n        !cachedFeeUnavailableOrExpired(cachedFee, chain, useRelayAdapt),\n    );\n    return availableUnexpiredFee != null;\n  }\n}\n"]}
+{"version":3,"file":"broadcaster-fee-cache.js","sourceRoot":"","sources":["../../src/fees/broadcaster-fee-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,GAChB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,8BAA8B,EAC9B,yBAAyB,EACzB,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,OAAO,mBAAmB;IACtB,MAAM,CAAC,KAAK,GAA6B,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IACpE,MAAM,CAAC,kCAAkC,CAAmB;IACpD,MAAM,CAAC,iBAAiB,CAAqB;IAErD,MAAM,CAAC,IAAI,CAAC,iBAA2B;QACrC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,kCAAkC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,YAAY,CACjB,KAAY,EACZ,cAAsB,EACtB,aAAqB,EACrB,WAAoC,EACpC,UAA4B,EAC5B,OAAe,EACf,mBAA6B;QAE7B,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;SACH;QACD,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE;YACzC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7C,gBAAgB,CAAC,GAAG,CAClB,sBAAsB,cAAc,0BAA0B,OAAO,wBAAwB,CAC9F,CAAC;gBACF,OAAO;aACR;SACF;QAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QAEjC,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE;YACtC,gBAAgB,CAAC,GAAG,CAClB,8BAA8B,OAAO,iBAAiB,iBAAiB,CAAC,2BAA2B,IAAI,iBAAiB,CAAC,2BAA2B,MAAM,eAAe,EAAE,CAC5K,CAAC;YACF,OAAO;SACR;QAED,IAAI,gBAAgB,CAAC,aAAa,CAAC,EAAE;YACnC,gBAAgB,CAAC,GAAG,CAClB,2BAA2B,WAAW,KAAK,eAAe,GAAG,CAC9D,CAAC;YACF,OAAO;SACR;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChD,gBAAgB,CAAC,GAAG,CAClB,4BAA4B,WAAW,KAAK,eAAe,MAAM,cAAc,CAAC,MAAM,SAAS,CAChG,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAExD,MAAM,uBAAuB,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAC3D,OAAO,CAAC,WAAW,EAAE,CACtB,CAAC;QACF,uBAAuB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC7C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK;gBAC5D,cAAc,EAAE,EAAE;aACnB,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,cAAc,CACtE,cAAc,CACf,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;YAE5B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,cAAc,CACtE,cAAc,CACf,CAAC,aAAa,CAAC,UAAU,IAAI,8BAA8B,CAAC;gBAC3D,WAAW,CAAC,YAAY,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,mBAAmB,CAAC,kCAAkC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,KAAY;QAC5B,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAY;QAC9B,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,YAAY,CACjB,KAAY,EACZ,YAAoB;QAEpB,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,aAAa,CAClB,KAAY,EACZ,YAAoB,EACpB,aAAsB;QAEtB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAClE,MAAM,wBAAwB,GAAG,aAAa,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAExE,MAAM,UAAU,GAAqB,wBAAwB;aAC1D,GAAG,CAAC,cAAc,CAAC,EAAE,CACpB,MAAM,CAAC,MAAM,CACX,YAAY,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,aAAa,CAC1D,CACF;aACA,IAAI,EAAE,CAAC;QAEV,MAAM,qBAAqB,GAAG,UAAU,CAAC,IAAI,CAC3C,SAAS,CAAC,EAAE,CACV,CAAC,6BAA6B,CAAC,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,CAClE,CAAC;QACF,OAAO,qBAAqB,IAAI,IAAI,CAAC;IACvC,CAAC","sourcesContent":["import {\n  CachedTokenFee,\n  Chain,\n  networkForChain,\n} from '@railgun-community/shared-models';\nimport { AddressFilter } from '../filters/address-filter.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport {\n  nameForBroadcaster,\n  cachedFeeExpired,\n  DEFAULT_BROADCASTER_IDENTIFIER,\n  invalidBroadcasterVersion,\n  cachedFeeUnavailableOrExpired,\n} from '../utils/broadcaster-util.js';\n\n// {forNetwork: {forToken: {forBroadcaster: (fee, updatedAt)}}}\ntype BroadcasterFeeNetworkTokenBroadcasterCacheMap = {\n  forIdentifier: MapType<CachedTokenFee>;\n};\ntype BroadcasterFeeNetworkTokenCacheMap = {\n  forBroadcaster: MapType<BroadcasterFeeNetworkTokenBroadcasterCacheMap>;\n};\ntype BroadcasterFeeNetworkCacheMap = {\n  forToken: MapType<BroadcasterFeeNetworkTokenCacheMap>;\n};\nexport type BroadcasterFeeCacheState = {\n  forNetwork: MapType<BroadcasterFeeNetworkCacheMap>;\n};\n\nexport class BroadcasterFeeCache {\n  private static cache: BroadcasterFeeCacheState = { forNetwork: {} };\n  static lastSubscribedFeeMessageReceivedAt: Optional<number>;\n  private static poiActiveListKeys: Optional<string[]>;\n\n  static init(poiActiveListKeys: string[]) {\n    this.poiActiveListKeys = poiActiveListKeys;\n    this.lastSubscribedFeeMessageReceivedAt = Date.now();\n  }\n\n  static addTokenFees(\n    chain: Chain,\n    railgunAddress: string,\n    feeExpiration: number,\n    tokenFeeMap: MapType<CachedTokenFee>,\n    identifier: Optional<string>,\n    version: string,\n    requiredPOIListKeys: string[],\n  ) {\n    const network = networkForChain(chain);\n    if (!network) {\n      return;\n    }\n\n    if (!this.poiActiveListKeys) {\n      throw new Error(\n        'Must define active POI list keys before adding any fees.',\n      );\n    }\n    for (const listKey of requiredPOIListKeys) {\n      if (!this.poiActiveListKeys.includes(listKey)) {\n        BroadcasterDebug.log(\n          `[Fees] Broadcaster ${railgunAddress} requires POI list key ${listKey}, which is not active.`,\n        );\n        return;\n      }\n    }\n\n    const broadcasterName = nameForBroadcaster(railgunAddress, identifier);\n    const networkName = network.name;\n\n    if (invalidBroadcasterVersion(version)) {\n      BroadcasterDebug.log(\n        `[Fees] Broadcaster version ${version} invalid (req ${BroadcasterConfig.MINIMUM_BROADCASTER_VERSION}-${BroadcasterConfig.MAXIMUM_BROADCASTER_VERSION}): ${broadcasterName}`,\n      );\n      return;\n    }\n\n    if (cachedFeeExpired(feeExpiration)) {\n      BroadcasterDebug.log(\n        `[Fees] Fees expired for ${networkName} (${broadcasterName})`,\n      );\n      return;\n    }\n\n    const tokenAddresses = Object.keys(tokenFeeMap);\n    BroadcasterDebug.log(\n      `[Fees] Updating fees for ${networkName} (${broadcasterName}): ${tokenAddresses.length} tokens`,\n    );\n\n    this.cache.forNetwork[networkName] ??= { forToken: {} };\n\n    const tokenAddressesLowercase = tokenAddresses.map(address =>\n      address.toLowerCase(),\n    );\n    tokenAddressesLowercase.forEach(tokenAddress => {\n      this.cache.forNetwork[networkName].forToken[tokenAddress] ??= {\n        forBroadcaster: {},\n      };\n      this.cache.forNetwork[networkName].forToken[tokenAddress].forBroadcaster[\n        railgunAddress\n      ] ??= { forIdentifier: {} };\n\n      this.cache.forNetwork[networkName].forToken[tokenAddress].forBroadcaster[\n        railgunAddress\n      ].forIdentifier[identifier ?? DEFAULT_BROADCASTER_IDENTIFIER] =\n        tokenFeeMap[tokenAddress];\n    });\n    BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt = Date.now();\n  }\n\n  static resetCache(chain: Chain) {\n    const network = networkForChain(chain);\n    if (!network) {\n      return;\n    }\n    this.cache.forNetwork ??= {};\n    delete this.cache.forNetwork[network.name];\n  }\n\n  static feesForChain(chain: Chain): Optional<BroadcasterFeeNetworkCacheMap> {\n    const network = networkForChain(chain);\n    if (!network) {\n      throw new Error('Chain not found.');\n    }\n    return this.cache.forNetwork[network.name];\n  }\n\n  static feesForToken(\n    chain: Chain,\n    tokenAddress: string,\n  ): Optional<BroadcasterFeeNetworkTokenCacheMap> {\n    return this.feesForChain(chain)?.forToken[tokenAddress.toLowerCase()];\n  }\n\n  static supportsToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): boolean {\n    const feesForToken = this.feesForToken(chain, tokenAddress);\n    if (!feesForToken) {\n      return false;\n    }\n\n    const railgunAddresses = Object.keys(feesForToken.forBroadcaster);\n    const filteredRailgunAddresses = AddressFilter.filter(railgunAddresses);\n\n    const cachedFees: CachedTokenFee[] = filteredRailgunAddresses\n      .map(railgunAddress =>\n        Object.values(\n          feesForToken.forBroadcaster[railgunAddress].forIdentifier,\n        ),\n      )\n      .flat();\n\n    const availableUnexpiredFee = cachedFees.find(\n      cachedFee =>\n        !cachedFeeUnavailableOrExpired(cachedFee, chain, useRelayAdapt),\n    );\n    return availableUnexpiredFee != null;\n  }\n}\n"]}

package/dist/fees/handle-fees-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-fees-message.js","sourceRoot":"","sources":["../../src/fees/handle-fees-message.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  verifyBroadcasterSignature,\n  getRailgunWalletAddressData,\n} from '@railgun-community/wallet';\nimport {\n  CachedTokenFee,\n  Chain,\n  BroadcasterFeeMessageData,\n} from '@railgun-community/shared-models';\nimport crypto from 'crypto';\nimport { IMessage } from '@waku/interfaces';\nimport { contentTopics } from '../waku/waku-topics.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { BroadcasterFeeCache } from './broadcaster-fee-cache.js';\nimport { invalidBroadcasterVersion } from '../utils/broadcaster-util.js';\nimport { bytesToUtf8, hexToUTF8String } from '../utils/conversion.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nconst isExpiredTimestamp = (\n  timestamp: Optional<Date>,\n  expirationFeeTimestamp: Optional<Date>,\n) => {\n  if (!timestamp || !expirationFeeTimestamp) {\n    return false;\n  }\n  let messageTimestamp = timestamp;\n  if (messageTimestamp.getFullYear() === 1970) {\n    // Waku timestamp bug.\n    messageTimestamp = new Date(messageTimestamp.getTime() * 1000);\n  }\n  // Expired if message originated > 45 seconds ago.\n  // check if fee expires within 45 seconds; if it doesn't ignore it.\n  const nowTime = Date.now();\n  const expirationMsec = nowTime - 45 * 1000;\n  // const expirationFeeMsec = nowTime + 45 * 1000;\n  const timestampExpired = messageTimestamp.getTime() < expirationMsec;\n  if (timestampExpired) {\n    BroadcasterDebug.log(\n      `Broadcaster Fee STALE: Difference was ${\n        (Date.now() - messageTimestamp.getTime()) / 1000\n      }s`,\n    );\n  } else {\n    BroadcasterDebug.log(\n      `Broadcaster Fee receipt SUCCESS in ${\n        (Date.now() - messageTimestamp.getTime()) / 1000\n      }s`,\n    );\n  }\n  // const feeExpired = expirationFeeTimestamp.getTime() < expirationFeeMsec;\n  return timestampExpired; //  || feeExpired;\n};\n\nexport const handleBroadcasterFeesMessage = async (\n  chain: Chain,\n  message: IMessage,\n  contentTopic: string,\n) => {\n  try {\n    if (!isDefined(message.payload)) {\n      BroadcasterDebug.log('Skipping Broadcaster fees message: NO PAYLOAD');\n      return;\n    }\n    if (contentTopic !== contentTopics.fees(chain)) {\n      BroadcasterDebug.log('Skipping Broadcaster fees message: WRONG TOPIC');\n      return;\n    }\n    const payload = bytesToUtf8(message.payload);\n    const { data, signature } = JSON.parse(payload) as {\n      data: string;\n      signature: string;\n    };\n    const utf8String = hexToUTF8String(data);\n    const feeMessageData = JSON.parse(utf8String) as BroadcasterFeeMessageData;\n    const feeExpirationTime = new Date(feeMessageData.feeExpiration);\n    if (isExpiredTimestamp(message.timestamp, feeExpirationTime)) {\n      BroadcasterDebug.log('Skipping fee message. Timestamp Expired.');\n      return;\n    }\n\n    if (!isDefined(crypto.subtle) && BroadcasterConfig.IS_DEV) {\n      BroadcasterDebug.log(\n        'Skipping Broadcaster fee validation in DEV. `crypto.subtle` does not exist (not secure: use https or localhost). ',\n      );\n      updateFeesForBroadcaster(chain, feeMessageData);\n      return;\n    }\n\n    if (invalidBroadcasterVersion(feeMessageData.version)) {\n      BroadcasterDebug.log(\n        `Skipping Broadcaster outside version range: ${feeMessageData.version}, ${feeMessageData.railgunAddress}`,\n      );\n      return;\n    }\n\n    const { railgunAddress } = feeMessageData;\n    const { viewingPublicKey } = getRailgunWalletAddressData(railgunAddress);\n    //TODO: rename this to verifyBroadcasterSignature\n    const verified = await verifyBroadcasterSignature(\n      signature,\n      data,\n      viewingPublicKey,\n    );\n    if (!verified) {\n      return;\n    }\n\n    updateFeesForBroadcaster(chain, feeMessageData);\n  } catch (cause) {\n    if (!(cause instanceof Error)) {\n      throw new Error('Unexpected non-error thrown', { cause });\n    }\n\n    BroadcasterDebug.error(\n      new Error('Error handling Broadcaster fees', { cause }),\n    );\n  }\n};\n\nconst updateFeesForBroadcaster = (\n  chain: Chain,\n  feeMessageData: BroadcasterFeeMessageData,\n) => {\n  const tokenFeeMap: MapType<CachedTokenFee> = {};\n  const tokenAddresses = Object.keys(feeMessageData.fees);\n  tokenAddresses.forEach(tokenAddress => {\n    const feePerUnitGas = feeMessageData.fees[tokenAddress];\n    if (feePerUnitGas) {\n      const cachedFee: CachedTokenFee = {\n        feePerUnitGas,\n        expiration: feeMessageData.feeExpiration,\n        feesID: feeMessageData.feesID,\n        availableWallets: feeMessageData.availableWallets,\n        relayAdapt: feeMessageData.relayAdapt,\n        reliability: feeMessageData.reliability,\n      };\n      tokenFeeMap[tokenAddress] = cachedFee;\n    }\n  });\n\n  BroadcasterFeeCache.addTokenFees(\n    chain,\n    feeMessageData.railgunAddress,\n    feeMessageData.feeExpiration,\n    tokenFeeMap,\n    feeMessageData.identifier,\n    feeMessageData.version,\n    feeMessageData.requiredPOIListKeys ?? [],\n  );\n};\n"]}
+{"version":3,"file":"handle-fees-message.js","sourceRoot":"","sources":["../../src/fees/handle-fees-message.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  verifyBroadcasterSignature,\n  getRailgunWalletAddressData,\n} from '@railgun-community/wallet';\nimport {\n  CachedTokenFee,\n  Chain,\n  BroadcasterFeeMessageData,\n} from '@railgun-community/shared-models';\nimport crypto from 'crypto';\nimport { IMessage } from '@waku/interfaces';\nimport { contentTopics } from '../waku/waku-topics.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { BroadcasterConfig } from '../models/broadcaster-config.js';\nimport { BroadcasterFeeCache } from './broadcaster-fee-cache.js';\nimport { invalidBroadcasterVersion } from '../utils/broadcaster-util.js';\nimport { bytesToUtf8, hexToUTF8String } from '../utils/conversion.js';\nimport { isDefined } from '../utils/is-defined.js';\n\nconst isExpiredTimestamp = (\n  timestamp: Optional<Date>,\n  expirationFeeTimestamp: Optional<Date>,\n) => {\n  if (!timestamp || !expirationFeeTimestamp) {\n    return false;\n  }\n  let messageTimestamp = timestamp;\n  if (messageTimestamp.getFullYear() === 1970) {\n    // Waku timestamp bug.\n    messageTimestamp = new Date(messageTimestamp.getTime() * 1000);\n  }\n  // Expired if message originated > 45 seconds ago.\n  // check if fee expires within 45 seconds; if it doesn't ignore it.\n  const nowTime = Date.now();\n  const expirationMsec = nowTime - 45 * 1000;\n  // const expirationFeeMsec = nowTime + 45 * 1000;\n  const timestampExpired = messageTimestamp.getTime() < expirationMsec;\n  if (timestampExpired) {\n    BroadcasterDebug.log(\n      `Broadcaster Fee STALE: Difference was ${\n        (Date.now() - messageTimestamp.getTime()) / 1000\n      }s`,\n    );\n  } else {\n    BroadcasterDebug.log(\n      `Broadcaster Fee receipt SUCCESS in ${\n        (Date.now() - messageTimestamp.getTime()) / 1000\n      }s`,\n    );\n  }\n  // const feeExpired = expirationFeeTimestamp.getTime() < expirationFeeMsec;\n  return timestampExpired; //  || feeExpired;\n};\n\nexport const handleBroadcasterFeesMessage = async (\n  chain: Chain,\n  message: IMessage,\n  contentTopic: string,\n) => {\n  try {\n    if (!isDefined(message.payload)) {\n      BroadcasterDebug.log('Skipping Broadcaster fees message: NO PAYLOAD');\n      return;\n    }\n    if (contentTopic !== contentTopics.fees(chain)) {\n      BroadcasterDebug.log('Skipping Broadcaster fees message: WRONG TOPIC');\n      return;\n    }\n    const payload = bytesToUtf8(message.payload);\n    const { data, signature } = JSON.parse(payload) as {\n      data: string;\n      signature: string;\n    };\n    const utf8String = hexToUTF8String(data);\n    const feeMessageData = JSON.parse(utf8String) as BroadcasterFeeMessageData;\n    const feeExpirationTime = new Date(feeMessageData.feeExpiration);\n    if (isExpiredTimestamp(message.timestamp, feeExpirationTime)) {\n      BroadcasterDebug.log('Skipping fee message. Timestamp Expired.');\n      return;\n    }\n\n    if (!isDefined(crypto.subtle) && BroadcasterConfig.IS_DEV) {\n      BroadcasterDebug.log(\n        'Skipping Broadcaster fee validation in DEV. `crypto.subtle` does not exist (not secure: use https or localhost). ',\n      );\n      updateFeesForBroadcaster(chain, feeMessageData);\n      return;\n    }\n\n    if (invalidBroadcasterVersion(feeMessageData.version)) {\n      BroadcasterDebug.log(\n        `Skipping Broadcaster outside version range: ${feeMessageData.version}, ${feeMessageData.railgunAddress}`,\n      );\n      return;\n    }\n\n    const { railgunAddress } = feeMessageData;\n    const { viewingPublicKey } = getRailgunWalletAddressData(railgunAddress);\n    const verified = await verifyBroadcasterSignature(\n      signature,\n      data,\n      viewingPublicKey,\n    );\n    if (!verified) {\n      return;\n    }\n\n    updateFeesForBroadcaster(chain, feeMessageData);\n  } catch (cause) {\n    if (!(cause instanceof Error)) {\n      throw new Error('Unexpected non-error thrown', { cause });\n    }\n\n    BroadcasterDebug.error(\n      new Error('Error handling Broadcaster fees', { cause }),\n    );\n  }\n};\n\nconst updateFeesForBroadcaster = (\n  chain: Chain,\n  feeMessageData: BroadcasterFeeMessageData,\n) => {\n  const tokenFeeMap: MapType<CachedTokenFee> = {};\n  const tokenAddresses = Object.keys(feeMessageData.fees);\n  tokenAddresses.forEach(tokenAddress => {\n    const feePerUnitGas = feeMessageData.fees[tokenAddress];\n    if (feePerUnitGas) {\n      const cachedFee: CachedTokenFee = {\n        feePerUnitGas,\n        expiration: feeMessageData.feeExpiration,\n        feesID: feeMessageData.feesID,\n        availableWallets: feeMessageData.availableWallets,\n        relayAdapt: feeMessageData.relayAdapt,\n        reliability: feeMessageData.reliability,\n      };\n      tokenFeeMap[tokenAddress] = cachedFee;\n    }\n  });\n\n  BroadcasterFeeCache.addTokenFees(\n    chain,\n    feeMessageData.railgunAddress,\n    feeMessageData.feeExpiration,\n    tokenFeeMap,\n    feeMessageData.identifier,\n    feeMessageData.version,\n    feeMessageData.requiredPOIListKeys ?? [],\n  );\n};\n"]}

package/dist/status/broadcaster-connection-status.d.ts

@@ -1,6 +1,7 @@
 import { Chain, BroadcasterConnectionStatus } from '@railgun-community/shared-models';
 export declare class BroadcasterStatus {
     static getBroadcasterConnectionStatus(chain: Chain): BroadcasterConnectionStatus;
+    static hasSubscriptionsStalled(): boolean;
     private static hasBroadcasterFeesForNetwork;
     private static getAggregatedInfoForBroadcasters;
 }

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

@@ -12,6 +12,11 @@ export class BroadcasterStatus {
         if (!WakuBroadcasterWakuCore.waku) {
             return BroadcasterConnectionStatus.Disconnected;
         }
+        if (this.hasSubscriptionsStalled()) {
+            BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt =
+                Date.now() + 5000;
+            return BroadcasterConnectionStatus.Disconnected;
+        }
         if (!this.hasBroadcasterFeesForNetwork(chain)) {
             return BroadcasterConnectionStatus.Searching;
         }
@@ -24,6 +29,15 @@ export class BroadcasterStatus {
         }
         return BroadcasterConnectionStatus.Connected;
     }
+    static hasSubscriptionsStalled() {
+        const now = Date.now();
+        const limit = 30000;
+        const lastSubscribed = BroadcasterFeeCache.lastSubscribedFeeMessageReceivedAt;
+        if (isDefined(lastSubscribed)) {
+            return now - lastSubscribed > limit;
+        }
+        return false;
+    }
     static hasBroadcasterFeesForNetwork(chain) {
         const broadcasterFees = BroadcasterFeeCache.feesForChain(chain);
         if (!isDefined(broadcasterFees) || !isDefined(broadcasterFees.forToken)) {

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.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  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 { 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"]}

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

@@ -1,14 +1,17 @@
 import { Chain } from '@railgun-community/shared-models';
-import { LightNode } from '@waku/interfaces';
+import { LightNode } from '@waku/sdk';
 import { BroadcasterOptions } from '../models/index.js';
 export declare class WakuBroadcasterWakuCore {
     static hasError: boolean;
+    static restartCallback: () => void;
     static waku: Optional<LightNode>;
     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>;

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

@@ -1,21 +1,21 @@
 import { promiseTimeout } from '@railgun-community/shared-models';
-import { waitForRemotePeer, createEncoder } from '@waku/core';
-import { Protocols } from '@waku/interfaces';
 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 { bootstrap } from '@libp2p/bootstrap';
 import { tcp } from '@libp2p/tcp';
-import { createLightNode } from '@waku/sdk';
+import { multiaddr } from '@multiformats/multiaddr';
+import { createLightNode, createEncoder, Protocols, } from '@waku/sdk';
 import { WAKU_RAILGUN_DEFAULT_PEERS_NODE, WAKU_RAILGUN_DEFAULT_SHARD, WAKU_RAILGUN_DEFAULT_SHARDS, WAKU_RAILGUN_PUB_SUB_TOPIC, } from '../models/constants.js';
 export class WakuBroadcasterWakuCore {
     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 initWaku = async (chain) => {
         try {
             await WakuBroadcasterWakuCore.connect();
@@ -34,12 +34,19 @@ export class WakuBroadcasterWakuCore {
             throw err;
         }
     };
+    static setWakuRestartCallback = (callback) => {
+        WakuBroadcasterWakuCore.restartCallback = callback;
+    };
     static reinitWaku = async (chain) => {
         if (isDefined(WakuBroadcasterWakuCore.waku) &&
             WakuBroadcasterWakuCore.waku.isStarted()) {
             await WakuBroadcasterWakuCore.disconnect();
         }
+        BroadcasterDebug.log(`Reinit Waku, ${++WakuBroadcasterWakuCore.restartCount}`);
         await WakuBroadcasterWakuCore.initWaku(chain);
+        if (WakuBroadcasterWakuCore.restartCallback) {
+            WakuBroadcasterWakuCore.restartCallback();
+        }
     };
     static setBroadcasterOptions(broadcasterOptions) {
         if (isDefined(broadcasterOptions.pubSubTopic)) {
@@ -66,21 +73,15 @@ export class WakuBroadcasterWakuCore {
                 ...WAKU_RAILGUN_DEFAULT_PEERS_NODE,
                 ...this.additionalDirectPeers,
             ];
-            const waitTimeoutBeforeBootstrap = 1250;
             const waku = await createLightNode({
                 networkConfig: WAKU_RAILGUN_DEFAULT_SHARDS,
                 libp2p: {
-                    transports: [tcp({})],
-                    peerDiscovery: [
-                        bootstrap({
-                            list: bootstrapPeers,
-                            timeout: waitTimeoutBeforeBootstrap,
-                        }),
-                    ],
+                    transports: [tcp()],
                 },
             });
             BroadcasterDebug.log('Start Waku.');
             await waku.start();
+            Promise.all(bootstrapPeers.map(m => multiaddr(m)).map(m => waku.libp2p.dial(m)));
             BroadcasterDebug.log('Waiting for remote peer.');
             await this.waitForRemotePeer(waku);
             if (!isDefined(waku.lightPush)) {
@@ -110,7 +111,7 @@ export class WakuBroadcasterWakuCore {
         return peers.length;
     }
     static async getLightPushPeerCount() {
-        const peers = this.waku?.lightPush.connectedPeers ?? [];
+        const peers = this.waku?.lightPush.protocol.connectedPeers ?? [];
         return peers.length;
     }
     static async getFilterPeerCount() {
@@ -120,7 +121,7 @@ export class WakuBroadcasterWakuCore {
     static async waitForRemotePeer(waku) {
         try {
             const protocols = [Protocols.LightPush, Protocols.Filter];
-            await promiseTimeout(waitForRemotePeer(waku, protocols), WakuBroadcasterWakuCore.peerDiscoveryTimeout);
+            await promiseTimeout(waku.waitForPeers(protocols), WakuBroadcasterWakuCore.peerDiscoveryTimeout);
         }
         catch (err) {
             if (!(err instanceof Error)) {

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

@@ -1 +1 @@
-{"version":3,"file":"waku-broadcaster-waku-core.js","sourceRoot":"","sources":["../../src/waku/waku-broadcaster-waku-core.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, promiseTimeout } from '@railgun-community/shared-models';\nimport { waitForRemotePeer, createEncoder } from '@waku/core';\nimport { Protocols, IMessage, LightNode } from '@waku/interfaces';\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 { bootstrap } from '@libp2p/bootstrap';\nimport { tcp } from '@libp2p/tcp';\nimport { createLightNode } from '@waku/sdk';\nimport { BroadcasterOptions } from '../models/index.js';\nimport {\n  WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n  WAKU_RAILGUN_DEFAULT_PEERS_WEB,\n  WAKU_RAILGUN_DEFAULT_SHARD,\n  WAKU_RAILGUN_DEFAULT_SHARDS,\n  WAKU_RAILGUN_PUB_SUB_TOPIC,\n} from '../models/constants.js';\n\nexport class WakuBroadcasterWakuCore {\n  static hasError = false;\n\n  static waku: Optional<LightNode>;\n\n  private static pubSubTopic = WAKU_RAILGUN_PUB_SUB_TOPIC;\n  private static additionalDirectPeers: string[] = [];\n  private static peerDiscoveryTimeout = 60000;\n  private static defaultShard = WAKU_RAILGUN_DEFAULT_SHARD;\n\n  static initWaku = async (chain: Chain): Promise<void> => {\n    try {\n      await WakuBroadcasterWakuCore.connect();\n      if (!WakuBroadcasterWakuCore.waku) {\n        BroadcasterDebug.log('No waku instance found');\n        return;\n      }\n      WakuObservers.resetCurrentChain();\n      await WakuObservers.setObserversForChain(\n        WakuBroadcasterWakuCore.waku,\n        chain,\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 reinitWaku = async (chain: Chain) => {\n    if (\n      isDefined(WakuBroadcasterWakuCore.waku) &&\n      WakuBroadcasterWakuCore.waku.isStarted()\n    ) {\n      // Reset fees, which will reset status to \"Searching\".\n      await WakuBroadcasterWakuCore.disconnect();\n    }\n\n    await WakuBroadcasterWakuCore.initWaku(chain);\n  };\n\n  static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions) {\n    if (isDefined(broadcasterOptions.pubSubTopic)) {\n      WakuBroadcasterWakuCore.pubSubTopic = broadcasterOptions.pubSubTopic;\n    }\n    if (broadcasterOptions.additionalDirectPeers) {\n      WakuBroadcasterWakuCore.additionalDirectPeers =\n        broadcasterOptions.additionalDirectPeers;\n    }\n    if (isDefined(broadcasterOptions.peerDiscoveryTimeout)) {\n      WakuBroadcasterWakuCore.peerDiscoveryTimeout =\n        broadcasterOptions.peerDiscoveryTimeout;\n    }\n  }\n\n  static disconnect = async () => {\n    await WakuBroadcasterWakuCore.waku?.stop();\n    WakuBroadcasterWakuCore.waku = undefined;\n  };\n\n  private static connect = async (): Promise<void> => {\n    try {\n      WakuBroadcasterWakuCore.hasError = false;\n\n      BroadcasterDebug.log(`Creating waku broadcast client`);\n\n      const bootstrapPeers: string[] = [\n        ...WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n        ...this.additionalDirectPeers,\n      ];\n      const waitTimeoutBeforeBootstrap = 1250; // 1250 ms - default is 1000ms\n      const waku: LightNode = await createLightNode({\n        // bootstrapPeers, this works also, while removing peerDiscovery from libp2p, peerDiscovery might be needed for native build?\n        networkConfig: WAKU_RAILGUN_DEFAULT_SHARDS,\n        libp2p: {\n          // @ts-ignore\n          transports: [tcp({})],\n          peerDiscovery: [\n            bootstrap({\n              list: bootstrapPeers,\n              timeout: waitTimeoutBeforeBootstrap,\n            }),\n          ],\n        },\n      });\n\n      BroadcasterDebug.log('Start Waku.');\n      await waku.start();\n\n      BroadcasterDebug.log('Waiting for remote peer.');\n      await this.waitForRemotePeer(waku);\n\n      if (!isDefined(waku.lightPush)) {\n        throw new Error('No Waku LightPush instantiated.');\n      }\n\n      BroadcasterDebug.log('Waku peers:');\n      for (const peer of waku.libp2p.getPeers()) {\n        BroadcasterDebug.log(JSON.stringify(peer));\n      }\n\n      BroadcasterDebug.log('Connected to Waku');\n      WakuBroadcasterWakuCore.waku = waku;\n      WakuBroadcasterWakuCore.hasError = false;\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      WakuBroadcasterWakuCore.hasError = true;\n      throw err;\n    }\n  };\n\n  static getMeshPeerCount(): number {\n    return this.getPubSubPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    const peers = this.waku?.libp2p.getPeers() ?? [];\n    return peers.length;\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    const peers = this.waku?.lightPush.connectedPeers ?? [];\n    return peers.length;\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    const peers = this.waku?.filter.connectedPeers ?? [];\n    return peers.length;\n  }\n\n  private static async waitForRemotePeer(waku: LightNode) {\n    try {\n      const protocols = [Protocols.LightPush, Protocols.Filter];\n      await promiseTimeout(\n        waitForRemotePeer(waku, protocols),\n        WakuBroadcasterWakuCore.peerDiscoveryTimeout,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw new Error(err.message);\n    }\n  }\n\n  static async broadcastMessage(\n    data: object,\n    contentTopic: string,\n  ): Promise<void> {\n    const dataString = JSON.stringify(data);\n    const payload = utf8ToBytes(dataString);\n    const message: IMessage = { payload };\n    try {\n      const encoder = createEncoder({\n        contentTopic,\n        pubsubTopicShardInfo: this.defaultShard,\n      });\n      await WakuBroadcasterWakuCore.waku?.lightPush.send(encoder, message);\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n    }\n  }\n}\n"]}
+{"version":3,"file":"waku-broadcaster-waku-core.js","sourceRoot":"","sources":["../../src/waku/waku-broadcaster-waku-core.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, promiseTimeout } 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 { tcp } from '@libp2p/tcp';\nimport { multiaddr } from '@multiformats/multiaddr';\nimport {\n  createLightNode,\n  createEncoder,\n  LightNode,\n  IMessage,\n  Protocols,\n} from '@waku/sdk';\nimport { BroadcasterOptions } from '../models/index.js';\nimport {\n  WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n  WAKU_RAILGUN_DEFAULT_SHARD,\n  WAKU_RAILGUN_DEFAULT_SHARDS,\n  WAKU_RAILGUN_PUB_SUB_TOPIC,\n} from '../models/constants.js';\n\nexport class WakuBroadcasterWakuCore {\n  static hasError = false;\n  static restartCallback: () => void;\n\n  static waku: Optional<LightNode>;\n\n  private static pubSubTopic = WAKU_RAILGUN_PUB_SUB_TOPIC;\n  private static additionalDirectPeers: string[] = [];\n  private static peerDiscoveryTimeout = 60000;\n  private static defaultShard = WAKU_RAILGUN_DEFAULT_SHARD;\n  public static restartCount = 0;\n\n  static initWaku = async (chain: Chain): Promise<void> => {\n    try {\n      await WakuBroadcasterWakuCore.connect();\n      if (!WakuBroadcasterWakuCore.waku) {\n        BroadcasterDebug.log('No waku instance found');\n        return;\n      }\n      WakuObservers.resetCurrentChain();\n      await WakuObservers.setObserversForChain(\n        WakuBroadcasterWakuCore.waku,\n        chain,\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 setWakuRestartCallback = (callback: () => void) => {\n    WakuBroadcasterWakuCore.restartCallback = callback;\n  };\n\n  static reinitWaku = async (chain: Chain) => {\n    if (\n      isDefined(WakuBroadcasterWakuCore.waku) &&\n      WakuBroadcasterWakuCore.waku.isStarted()\n    ) {\n      // Reset fees, which will reset status to \"Searching\".\n      await WakuBroadcasterWakuCore.disconnect();\n    }\n    BroadcasterDebug.log(\n      `Reinit Waku, ${++WakuBroadcasterWakuCore.restartCount}`,\n    );\n    await WakuBroadcasterWakuCore.initWaku(chain);\n    if (WakuBroadcasterWakuCore.restartCallback) {\n      WakuBroadcasterWakuCore.restartCallback();\n    }\n  };\n\n  static setBroadcasterOptions(broadcasterOptions: BroadcasterOptions) {\n    if (isDefined(broadcasterOptions.pubSubTopic)) {\n      WakuBroadcasterWakuCore.pubSubTopic = broadcasterOptions.pubSubTopic;\n    }\n    if (broadcasterOptions.additionalDirectPeers) {\n      WakuBroadcasterWakuCore.additionalDirectPeers =\n        broadcasterOptions.additionalDirectPeers;\n    }\n    if (isDefined(broadcasterOptions.peerDiscoveryTimeout)) {\n      WakuBroadcasterWakuCore.peerDiscoveryTimeout =\n        broadcasterOptions.peerDiscoveryTimeout;\n    }\n  }\n\n  static disconnect = async () => {\n    await WakuBroadcasterWakuCore.waku?.stop();\n    WakuBroadcasterWakuCore.waku = undefined;\n  };\n\n  private static connect = async (): Promise<void> => {\n    try {\n      WakuBroadcasterWakuCore.hasError = false;\n\n      BroadcasterDebug.log(`Creating waku broadcast client`);\n\n      const bootstrapPeers: string[] = [\n        ...WAKU_RAILGUN_DEFAULT_PEERS_NODE,\n        ...this.additionalDirectPeers,\n      ];\n      const waku: LightNode = await createLightNode({\n        networkConfig: WAKU_RAILGUN_DEFAULT_SHARDS,\n        libp2p: {\n          transports: [tcp() as unknown as any],\n        },\n      });\n\n      BroadcasterDebug.log('Start Waku.');\n      await waku.start();\n      Promise.all(\n        bootstrapPeers.map(m => multiaddr(m)).map(m => waku.libp2p.dial(m)),\n      );\n\n      BroadcasterDebug.log('Waiting for remote peer.');\n      await this.waitForRemotePeer(waku);\n\n      if (!isDefined(waku.lightPush)) {\n        throw new Error('No Waku LightPush instantiated.');\n      }\n\n      BroadcasterDebug.log('Waku peers:');\n      for (const peer of waku.libp2p.getPeers()) {\n        BroadcasterDebug.log(JSON.stringify(peer));\n      }\n\n      BroadcasterDebug.log('Connected to Waku');\n      WakuBroadcasterWakuCore.waku = waku;\n      WakuBroadcasterWakuCore.hasError = false;\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      WakuBroadcasterWakuCore.hasError = true;\n      throw err;\n    }\n  };\n\n  static getMeshPeerCount(): number {\n    return this.getPubSubPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    const peers = this.waku?.libp2p.getPeers() ?? [];\n    return peers.length;\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    const peers = this.waku?.lightPush.protocol.connectedPeers ?? [];\n    return peers.length;\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    const peers = this.waku?.filter.connectedPeers ?? [];\n    return peers.length;\n  }\n\n  private static async waitForRemotePeer(waku: LightNode) {\n    try {\n      const protocols = [Protocols.LightPush, Protocols.Filter];\n      await promiseTimeout(\n        waku.waitForPeers(protocols),\n        WakuBroadcasterWakuCore.peerDiscoveryTimeout,\n      );\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n      throw new Error(err.message);\n    }\n  }\n\n  static async broadcastMessage(\n    data: object,\n    contentTopic: string,\n  ): Promise<void> {\n    const dataString = JSON.stringify(data);\n    const payload = utf8ToBytes(dataString);\n    const message: IMessage = { payload };\n    try {\n      const encoder = createEncoder({\n        contentTopic,\n        pubsubTopicShardInfo: this.defaultShard,\n      });\n      await WakuBroadcasterWakuCore.waku?.lightPush.send(encoder, message);\n    } catch (err) {\n      if (!(err instanceof Error)) {\n        throw err;\n      }\n      BroadcasterDebug.error(err);\n    }\n  }\n}\n"]}

package/dist/waku/waku-observers.d.ts

@@ -1,5 +1,5 @@
 import { Chain } from '@railgun-community/shared-models';
-import { LightNode } from '@waku/interfaces';
+import { LightNode } from '@waku/sdk';
 export declare class WakuObservers {
     private static currentChain;
     private static currentContentTopics;
@@ -10,7 +10,6 @@ export declare class WakuObservers {
     private static removeAllObservers;
     private static getDecodersForChain;
     private static addChainObservers;
-    static hasStartedPinging: boolean;
     static addTransportSubscription(waku: Optional<LightNode>, topic: string, callback: (message: any) => void): Promise<void>;
     private static addSubscriptions;
     static getCurrentContentTopics(): string[];

package/dist/waku/waku-observers.js

@@ -1,11 +1,11 @@
 import { compareChains, delay } from '@railgun-community/shared-models';
-import { createDecoder } from '@waku/core';
+import { createDecoder, } from '@waku/sdk';
 import { contentTopics } from './waku-topics.js';
 import { handleBroadcasterFeesMessage } from '../fees/handle-fees-message.js';
 import { BroadcasterTransactResponse } from '../transact/broadcaster-transact-response.js';
 import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
 import { isDefined } from '../utils/is-defined.js';
-import { WAKU_RAILGUN_DEFAULT_SHARD, } from '../models/constants.js';
+import { WAKU_RAILGUN_DEFAULT_SHARD } from '../models/constants.js';
 export class WakuObservers {
     static currentChain;
     static currentContentTopics = [];
@@ -29,11 +29,10 @@ export class WakuObservers {
         WakuObservers.currentChain = undefined;
     };
     static checkSubscriptionsHealth = async (waku) => {
-        BroadcasterDebug.log(`WAKU Health Status: ${waku?.health.health.overallStatus}`);
-        if (isDefined(WakuObservers.currentSubscriptions)) {
-            if (WakuObservers.currentSubscriptions.length === 0) {
+        BroadcasterDebug.log(`WAKU Health Status: ${waku?.health.getHealthStatus()}`);
+        if (isDefined(this.currentSubscriptions)) {
+            if (this.currentSubscriptions.length === 0) {
                 BroadcasterDebug.log('No subscriptions to ping');
-                throw new Error('No subscriptions to ping');
             }
         }
         await delay(15 * 1000);
@@ -44,8 +43,13 @@ export class WakuObservers {
             return;
         }
         if (isDefined(this.currentSubscriptions)) {
-            for (const { unsubscribe } of this.currentSubscriptions) {
-                await unsubscribe();
+            for (const { unsubscribe, params } of this.currentSubscriptions) {
+                if (unsubscribe instanceof Function) {
+                    await unsubscribe();
+                }
+                else {
+                    await unsubscribe.subscription?.unsubscribe([params.topic]);
+                }
             }
             this.currentSubscriptions = [];
             this.currentContentTopics = [];
@@ -74,20 +78,16 @@ export class WakuObservers {
         if (!isDefined(waku.filter)) {
             return;
         }
-        await WakuObservers.addSubscriptions(chain, waku).catch(err => {
+        const subscriptionResult = await WakuObservers.addSubscriptions(chain, waku).catch(err => {
             BroadcasterDebug.log(`Error adding Observers. ${err.message}`);
+            return undefined;
         });
-        if (!WakuObservers.hasStartedPinging) {
-            WakuObservers.hasStartedPinging = true;
-            WakuObservers.checkSubscriptionsHealth(waku);
-        }
         const currentContentTopics = WakuObservers.getCurrentContentTopics();
         BroadcasterDebug.log('Waku content topics:');
         for (const observer of currentContentTopics) {
             BroadcasterDebug.log(observer);
         }
     };
-    static hasStartedPinging;
     static async addTransportSubscription(waku, topic, callback) {
         if (!isDefined(waku)) {
             BroadcasterDebug.log('No waku instance found, Transport Subscription not added.');
@@ -100,7 +100,9 @@ export class WakuObservers {
             decoder,
             callback,
         };
-        const unsubscribe = await waku.filter.subscribeWithUnsubscribe(decoder, callback);
+        const unsubscribe = await waku.filter.subscribe(decoder, callback, {}, {
+            keepAlive: 30000,
+        });
         WakuObservers.currentSubscriptions?.push({
             unsubscribe,
             params,
@@ -115,10 +117,20 @@ export class WakuObservers {
         const subscriptionParams = WakuObservers.getDecodersForChain(chain);
         const topics = subscriptionParams.map(params => params.topic);
         const newTopics = topics.filter(topic => !WakuObservers.currentContentTopics.includes(topic));
-        WakuObservers.currentContentTopics.push(...newTopics);
+        this.currentContentTopics.push(...newTopics);
         for (const params of subscriptionParams) {
             const { decoder, callback } = params;
-            const unsubscribe = await waku.filter.subscribeWithUnsubscribe(decoder, callback);
+            const unsubscribe = await waku.filter
+                .subscribe(decoder, callback, {}, {
+                keepAlive: 30000,
+            })
+                .catch(err => {
+                BroadcasterDebug.error(err);
+                return undefined;
+            });
+            if (!unsubscribe) {
+                return;
+            }
             WakuObservers.currentSubscriptions?.push({
                 unsubscribe,
                 params,

package/dist/waku/waku-observers.js.map

@@ -1 +1 @@
-{"version":3,"file":"waku-observers.js","sourceRoot":"","sources":["../../src/waku/waku-observers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, compareChains, delay } from '@railgun-community/shared-models';\nimport { createDecoder } from '@waku/core';\nimport { contentTopics } from './waku-topics.js';\nimport {\n  LightNode,\n  IMessage,\n  IDecoder,\n  type Unsubscribe,\n} from '@waku/interfaces';\nimport { handleBroadcasterFeesMessage } from '../fees/handle-fees-message.js';\nimport { BroadcasterTransactResponse } from '../transact/broadcaster-transact-response.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport {\n  WAKU_RAILGUN_DEFAULT_SHARD,\n  WAKU_RAILGUN_PUB_SUB_TOPIC,\n} from '../models/constants.js';\n\ntype SubscriptionParams = {\n  topic: string;\n  decoder: IDecoder<any> | IDecoder<any>[];\n  callback: (message: any) => void;\n};\n\ntype ActiveSubscription = {\n  unsubscribe: Unsubscribe;\n  params: SubscriptionParams;\n};\n\nexport class WakuObservers {\n  private static currentChain: Optional<Chain>;\n  private static currentContentTopics: string[] = [];\n  private static currentSubscriptions: ActiveSubscription[] | undefined = [];\n\n  static setObserversForChain = async (\n    waku: Optional<LightNode>,\n    chain: Chain,\n  ) => {\n    if (!waku) {\n      return;\n    }\n    if (\n      WakuObservers.currentChain &&\n      compareChains(WakuObservers.currentChain, chain)\n    ) {\n      return;\n    }\n    BroadcasterDebug.log(\n      `Add Waku observers for chain: ${chain.type}:${chain.id}`,\n    );\n    WakuObservers.currentChain = chain;\n    await WakuObservers.removeAllObservers(waku);\n    BroadcasterDebug.log('Removed all observers');\n    await WakuObservers.addChainObservers(waku, chain);\n    BroadcasterDebug.log(\n      `Waku listening for events on chain: ${chain.type}:${chain.id}`,\n    );\n  };\n\n  static resetCurrentChain = () => {\n    WakuObservers.currentChain = undefined;\n  };\n\n  static checkSubscriptionsHealth = async (waku: Optional<LightNode>) => {\n    BroadcasterDebug.log(\n      // @ts-ignore\n      `WAKU Health Status: ${waku?.health.health.overallStatus}`,\n    );\n    if (isDefined(WakuObservers.currentSubscriptions)) {\n      if (WakuObservers.currentSubscriptions.length === 0) {\n        BroadcasterDebug.log('No subscriptions to ping');\n        throw new Error('No subscriptions to ping');\n      }\n    }\n    await delay(15 * 1000);\n    WakuObservers.checkSubscriptionsHealth(waku);\n  };\n\n  private static removeAllObservers = async (waku: Optional<LightNode>) => {\n    if (!isDefined(waku?.lightPush)) {\n      return;\n    }\n    if (isDefined(this.currentSubscriptions)) {\n      for (const { unsubscribe } of this.currentSubscriptions) {\n        await unsubscribe();\n      }\n      this.currentSubscriptions = [];\n      this.currentContentTopics = [];\n    }\n  };\n\n  private static getDecodersForChain = (chain: Chain) => {\n    const contentTopicFees = contentTopics.fees(chain);\n    const contentTopicTransactResponse = contentTopics.transactResponse(chain);\n    const feesDecoder = createDecoder(\n      contentTopicFees,\n      WAKU_RAILGUN_DEFAULT_SHARD,\n    );\n    const transactResponseDecoder = createDecoder(\n      contentTopicTransactResponse,\n      WAKU_RAILGUN_DEFAULT_SHARD,\n    );\n    const feesCallback = (message: IMessage) =>\n      handleBroadcasterFeesMessage(chain, message, contentTopicFees);\n    const transactResponseCallback =\n      BroadcasterTransactResponse.handleBroadcasterTransactionResponseMessage;\n\n    const feesSubscriptionParams = {\n      topic: contentTopicFees,\n      decoder: feesDecoder,\n      callback: feesCallback,\n    };\n    const transactResponseSubscriptionParams = {\n      topic: contentTopicTransactResponse,\n      decoder: transactResponseDecoder,\n      callback: transactResponseCallback,\n    };\n    return [feesSubscriptionParams, transactResponseSubscriptionParams];\n  };\n\n  private static addChainObservers = async (waku: LightNode, chain: Chain) => {\n    if (!isDefined(waku.filter)) {\n      return;\n    }\n\n    await WakuObservers.addSubscriptions(chain, waku).catch(err => {\n      BroadcasterDebug.log(`Error adding Observers. ${err.message}`);\n    });\n    if (!WakuObservers.hasStartedPinging) {\n      WakuObservers.hasStartedPinging = true;\n      WakuObservers.checkSubscriptionsHealth(waku);\n    }\n    // Log current list of observers\n    const currentContentTopics = WakuObservers.getCurrentContentTopics();\n    BroadcasterDebug.log('Waku content topics:');\n    for (const observer of currentContentTopics) {\n      BroadcasterDebug.log(observer);\n    }\n  };\n  static hasStartedPinging: boolean;\n\n  static async addTransportSubscription(\n    waku: Optional<LightNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    if (!isDefined(waku)) {\n      BroadcasterDebug.log(\n        'No waku instance found, Transport Subscription not added.',\n      );\n      return;\n    }\n    const transportTopic = contentTopics.encrypted(topic);\n    const decoder = createDecoder(transportTopic, WAKU_RAILGUN_DEFAULT_SHARD);\n    const params: SubscriptionParams = {\n      topic: transportTopic,\n      decoder,\n      callback,\n    };\n    const unsubscribe = await waku.filter.subscribeWithUnsubscribe(\n      decoder,\n      callback,\n    );\n    WakuObservers.currentSubscriptions?.push({\n      unsubscribe,\n      params,\n    });\n    WakuObservers.currentContentTopics.push(transportTopic);\n  }\n\n  private static async addSubscriptions(\n    chain: Optional<Chain>,\n    waku: Optional<LightNode>,\n  ) {\n    if (!isDefined(chain) || !isDefined(waku)) {\n      BroadcasterDebug.log('AddSubscription: No Waku or Chain defined.');\n      return;\n    }\n    const subscriptionParams = WakuObservers.getDecodersForChain(chain);\n    const topics = subscriptionParams.map(params => params.topic);\n    const newTopics = topics.filter(\n      topic => !WakuObservers.currentContentTopics.includes(topic),\n    );\n    WakuObservers.currentContentTopics.push(...newTopics);\n    for (const params of subscriptionParams) {\n      const { decoder, callback } = params;\n      const unsubscribe = await waku.filter.subscribeWithUnsubscribe(\n        decoder,\n        callback,\n      );\n      WakuObservers.currentSubscriptions?.push({\n        unsubscribe,\n        params,\n      });\n    }\n  }\n\n  static getCurrentContentTopics(): string[] {\n    return WakuObservers.currentContentTopics;\n  }\n}\n"]}
+{"version":3,"file":"waku-observers.js","sourceRoot":"","sources":["../../src/waku/waku-observers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chain, compareChains, delay } from '@railgun-community/shared-models';\nimport {\n  createDecoder,\n  LightNode,\n  IMessage,\n  IDecoder,\n  type Unsubscribe,\n  type SubscribeResult,\n} from '@waku/sdk';\nimport { contentTopics } from './waku-topics.js';\nimport { handleBroadcasterFeesMessage } from '../fees/handle-fees-message.js';\nimport { BroadcasterTransactResponse } from '../transact/broadcaster-transact-response.js';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { isDefined } from '../utils/is-defined.js';\nimport { WAKU_RAILGUN_DEFAULT_SHARD } from '../models/constants.js';\n\ntype SubscriptionParams = {\n  topic: string;\n  decoder: IDecoder<any> | IDecoder<any>[];\n  callback: (message: any) => void;\n};\n\ntype ActiveSubscription = {\n  unsubscribe: SubscribeResult | Unsubscribe;\n  params: SubscriptionParams;\n};\n\nexport class WakuObservers {\n  private static currentChain: Optional<Chain>;\n  private static currentContentTopics: string[] = [];\n  private static currentSubscriptions: ActiveSubscription[] | undefined = [];\n\n  static setObserversForChain = async (\n    waku: Optional<LightNode>,\n    chain: Chain,\n  ) => {\n    if (!waku) {\n      return;\n    }\n    if (\n      WakuObservers.currentChain &&\n      compareChains(WakuObservers.currentChain, chain)\n    ) {\n      return;\n    }\n    BroadcasterDebug.log(\n      `Add Waku observers for chain: ${chain.type}:${chain.id}`,\n    );\n    WakuObservers.currentChain = chain;\n    await WakuObservers.removeAllObservers(waku);\n\n    BroadcasterDebug.log('Removed all observers');\n    await WakuObservers.addChainObservers(waku, chain);\n    BroadcasterDebug.log(\n      `Waku listening for events on chain: ${chain.type}:${chain.id}`,\n    );\n  };\n\n  static resetCurrentChain = () => {\n    WakuObservers.currentChain = undefined;\n  };\n\n  static checkSubscriptionsHealth = async (waku: Optional<LightNode>) => {\n    BroadcasterDebug.log(\n      // @ts-ignore\n      `WAKU Health Status: ${waku?.health.getHealthStatus()}`,\n    );\n    if (isDefined(this.currentSubscriptions)) {\n      if (this.currentSubscriptions.length === 0) {\n        BroadcasterDebug.log('No subscriptions to ping');\n        // throw new Error('No subscriptions to ping');\n      }\n    }\n    await delay(15 * 1000);\n    WakuObservers.checkSubscriptionsHealth(waku);\n  };\n\n  private static removeAllObservers = async (waku: Optional<LightNode>) => {\n    if (!isDefined(waku?.lightPush)) {\n      return;\n    }\n    if (isDefined(this.currentSubscriptions)) {\n      for (const { unsubscribe, params } of this.currentSubscriptions) {\n        if (unsubscribe instanceof Function) {\n          await unsubscribe();\n        } else {\n          await unsubscribe.subscription?.unsubscribe([params.topic]);\n        }\n      }\n      this.currentSubscriptions = [];\n      this.currentContentTopics = [];\n    }\n  };\n\n  private static getDecodersForChain = (chain: Chain) => {\n    const contentTopicFees = contentTopics.fees(chain);\n    const contentTopicTransactResponse = contentTopics.transactResponse(chain);\n    const feesDecoder = createDecoder(\n      contentTopicFees,\n      WAKU_RAILGUN_DEFAULT_SHARD,\n    );\n    const transactResponseDecoder = createDecoder(\n      contentTopicTransactResponse,\n      WAKU_RAILGUN_DEFAULT_SHARD,\n    );\n    const feesCallback = (message: IMessage) =>\n      handleBroadcasterFeesMessage(chain, message, contentTopicFees);\n    const transactResponseCallback =\n      BroadcasterTransactResponse.handleBroadcasterTransactionResponseMessage;\n\n    const feesSubscriptionParams = {\n      topic: contentTopicFees,\n      decoder: feesDecoder,\n      callback: feesCallback,\n    };\n    const transactResponseSubscriptionParams = {\n      topic: contentTopicTransactResponse,\n      decoder: transactResponseDecoder,\n      callback: transactResponseCallback,\n    };\n    return [feesSubscriptionParams, transactResponseSubscriptionParams];\n  };\n\n  private static addChainObservers = async (waku: LightNode, chain: Chain) => {\n    if (!isDefined(waku.filter)) {\n      return;\n    }\n\n    const subscriptionResult = await WakuObservers.addSubscriptions(\n      chain,\n      waku,\n    ).catch(err => {\n      BroadcasterDebug.log(`Error adding Observers. ${err.message}`);\n      return undefined;\n    });\n    // Log current list of observers\n    const currentContentTopics = WakuObservers.getCurrentContentTopics();\n    BroadcasterDebug.log('Waku content topics:');\n    for (const observer of currentContentTopics) {\n      BroadcasterDebug.log(observer);\n    }\n  };\n\n  static async addTransportSubscription(\n    waku: Optional<LightNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    if (!isDefined(waku)) {\n      BroadcasterDebug.log(\n        'No waku instance found, Transport Subscription not added.',\n      );\n      return;\n    }\n    const transportTopic = contentTopics.encrypted(topic);\n    const decoder = createDecoder(transportTopic, WAKU_RAILGUN_DEFAULT_SHARD);\n    const params: SubscriptionParams = {\n      topic: transportTopic,\n      decoder,\n      callback,\n    };\n    const unsubscribe = await waku.filter.subscribe(\n      decoder,\n      callback,\n      {},\n      {\n        keepAlive: 30_000,\n      },\n    );\n    WakuObservers.currentSubscriptions?.push({\n      unsubscribe,\n      params,\n    });\n    WakuObservers.currentContentTopics.push(transportTopic);\n  }\n\n  private static async addSubscriptions(\n    chain: Optional<Chain>,\n    waku: Optional<LightNode>,\n  ) {\n    if (!isDefined(chain) || !isDefined(waku)) {\n      BroadcasterDebug.log('AddSubscription: No Waku or Chain defined.');\n      return;\n    }\n    const subscriptionParams = WakuObservers.getDecodersForChain(chain);\n    const topics = subscriptionParams.map(params => params.topic);\n    const newTopics = topics.filter(\n      topic => !WakuObservers.currentContentTopics.includes(topic),\n    );\n    this.currentContentTopics.push(...newTopics);\n    for (const params of subscriptionParams) {\n      const { decoder, callback } = params;\n      const unsubscribe = await waku.filter\n        .subscribe(\n          decoder,\n          callback,\n          {},\n          {\n            keepAlive: 30_000,\n          },\n        )\n        .catch(err => {\n          BroadcasterDebug.error(err);\n          return undefined;\n        });\n      if (!unsubscribe) {\n        return;\n      }\n      WakuObservers.currentSubscriptions?.push({\n        unsubscribe,\n        params,\n      });\n    }\n  }\n\n  static getCurrentContentTopics(): string[] {\n    return WakuObservers.currentContentTopics;\n  }\n}\n"]}

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

@@ -31,4 +31,5 @@ export declare class WakuBroadcasterClient {
     static addTransportSubscription(waku: Optional<LightNode>, topic: string, callback: (message: any) => void): Promise<void>;
     static sendTransport(data: object, topic: string): void;
     static getWakuCore(): Optional<LightNode>;
+    static setRestartCallback(callback: () => void): void;
 }

package/dist/waku-broadcaster-client.js

@@ -166,5 +166,8 @@ export class WakuBroadcasterClient {
     static getWakuCore() {
         return WakuBroadcasterWakuCore.waku;
     }
+    static setRestartCallback(callback) {
+        WakuBroadcasterWakuCore.setWakuRestartCallback(callback);
+    }
 }
 //# sourceMappingURL=waku-broadcaster-client.js.map

package/dist/waku-broadcaster-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"waku-broadcaster-client.js","sourceRoot":"","sources":["../src/waku-broadcaster-client.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Chain,\n  delay,\n  POI_REQUIRED_LISTS,\n  BroadcasterConnectionStatus,\n  SelectedBroadcaster,\n} from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from './fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from './filters/address-filter.js';\nimport {\n  BroadcasterConnectionStatusCallback,\n  BroadcasterDebugger,\n  BroadcasterOptions,\n} from './models/export-models.js';\nimport { BroadcasterSearch } from './search/best-broadcaster.js';\nimport { BroadcasterStatus } from './status/broadcaster-connection-status.js';\nimport { BroadcasterDebug } from './utils/broadcaster-debug.js';\nimport { WakuObservers } from './waku/waku-observers.js';\nimport { WakuBroadcasterWakuCore } from './waku/waku-broadcaster-waku-core.js';\nimport type { LightNode } from '@waku/interfaces';\nimport { contentTopics } from './waku/waku-topics.js';\n\nexport class WakuBroadcasterClient {\n  private static chain: Chain;\n  private static statusCallback: BroadcasterConnectionStatusCallback;\n  private static started = false;\n  private static isRestarting = false;\n\n  static pollDelay = 3000;\n\n  static async start(\n    chain: Chain,\n    broadcasterOptions: BroadcasterOptions,\n    statusCallback: BroadcasterConnectionStatusCallback,\n    broadcasterDebugger?: BroadcasterDebugger,\n  ) {\n    this.chain = chain;\n    this.statusCallback = statusCallback;\n\n    WakuBroadcasterWakuCore.setBroadcasterOptions(broadcasterOptions);\n\n    if (broadcasterDebugger) {\n      BroadcasterDebug.setDebugger(broadcasterDebugger);\n    }\n\n    BroadcasterFeeCache.init(\n      broadcasterOptions.poiActiveListKeys ??\n        POI_REQUIRED_LISTS.map(list => list.key),\n    );\n\n    try {\n      this.started = false;\n      await WakuBroadcasterWakuCore.initWaku(chain);\n      this.started = true;\n\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.pollStatus();\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      throw new Error('Cannot connect to Broadcaster network.', { cause });\n    }\n  }\n  private static peerRetryCount = 0;\n  private static pollConnection = async () => {\n    const peerCount = WakuBroadcasterWakuCore.getMeshPeerCount();\n    if (peerCount < 1) {\n      if (this.peerRetryCount >= 2) {\n        this.peerRetryCount = 0;\n        await this.restart();\n      } else {\n        this.peerRetryCount += 1;\n      }\n    } else {\n      this.peerRetryCount = 0;\n    }\n    await delay(WakuBroadcasterClient.pollDelay);\n    this.pollConnection();\n  };\n\n  static async stop() {\n    await WakuBroadcasterWakuCore.disconnect();\n    this.started = false;\n    this.updateStatus();\n  }\n\n  static isStarted() {\n    return this.started;\n  }\n\n  static async setChain(chain: Chain): Promise<void> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    WakuBroadcasterClient.chain = chain;\n    await WakuObservers.setObserversForChain(\n      WakuBroadcasterWakuCore.waku,\n      chain,\n    );\n    WakuBroadcasterClient.updateStatus();\n  }\n\n  static getContentTopics(): string[] {\n    return WakuObservers.getCurrentContentTopics();\n  }\n\n  static getMeshPeerCount(): number {\n    return WakuBroadcasterWakuCore.getMeshPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    return WakuBroadcasterWakuCore.getPubSubPeerCount();\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getLightPushPeerCount();\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getFilterPeerCount();\n  }\n  /**\n   * The function `findBestBroadcaster` finds the broadcaster with the lowest fees for a given chain and token.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findBestBroadcaster(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBestBroadcaster(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  /**\n   * The function `findAllBroadcastersForChain` returns an array of all available broadcasters fee-tokens for a given chain.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find all broadcasters for.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findAllBroadcastersForChain(\n    chain: Chain,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return [];\n    }\n\n    return BroadcasterSearch.findAllBroadcastersForChain(chain, useRelayAdapt);\n  }\n\n  /**\n   * The function `findRandomBroadcasterForToken` selects a random broadcaster from a list of broadcasters that is based on\n   * their fees for a specific token, and how much higher their fees are compared to the broadcaster with\n   * the lowest fees.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @param {number} [percentageThreshold=5] - The `percentageThreshold` parameter is a number that\n   * represents the maximum percentage increase in fees that a broadcaster can have compared to the broadcaster\n   * with the lowest fees. For example, if the `percentageThreshold` is set to 5, it means that a\n   * broadcaster can have a maximum of 5% higher fees than the broadcaster with the lowest fees and still be selected.\n   * Defaults to 5.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findRandomBroadcasterForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    percentageThreshold: number = 5,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findRandomBroadcasterForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n      percentageThreshold,\n    );\n  }\n\n  /**\n   * The function `findBroadcastersForToken` takes in a chain, token address, and a boolean flag, and\n   * returns an array of selected broadcasters based on the provided parameters.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network; a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findBroadcastersForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  static setAddressFilters(\n    allowlist: Optional<string[]>,\n    blocklist: Optional<string[]>,\n  ): void {\n    AddressFilter.setAllowlist(allowlist);\n    AddressFilter.setBlocklist(blocklist);\n  }\n\n  static async tryReconnect(): Promise<void> {\n    // Reset fees, which will reset status to \"Searching\".\n    BroadcasterFeeCache.resetCache(WakuBroadcasterClient.chain);\n    WakuBroadcasterClient.updateStatus();\n\n    await WakuBroadcasterClient.restart();\n  }\n\n  static supportsToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ) {\n    return BroadcasterFeeCache.supportsToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  private static async restart(): Promise<void> {\n    if (this.isRestarting || !this.started) {\n      return;\n    }\n    this.isRestarting = true;\n    try {\n      BroadcasterDebug.log('Restarting Waku...');\n      await WakuBroadcasterWakuCore.reinitWaku(this.chain);\n      this.isRestarting = false;\n    } catch (cause) {\n      this.isRestarting = false;\n      if (!(cause instanceof Error)) {\n        return;\n      }\n      BroadcasterDebug.error(\n        new Error('Error reinitializing Waku Broadcaster Client', { cause }),\n      );\n    }\n  }\n\n  /**\n   * Start keep-alive poller which checks Broadcaster status every few seconds.\n   */\n  private static async pollStatus(): Promise<void> {\n    if (!this.isRestarting) {\n      this.updateStatus();\n    } else {\n      this.updateStatus();\n    }\n    await delay(WakuBroadcasterClient.pollDelay);\n\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    this.pollStatus();\n  }\n\n  private static updateStatus() {\n    const status = BroadcasterStatus.getBroadcasterConnectionStatus(this.chain);\n\n    this.statusCallback(this.chain, status);\n    if (\n      status === BroadcasterConnectionStatus.Disconnected ||\n      status === BroadcasterConnectionStatus.Error\n    ) {\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.restart();\n    }\n  }\n\n  // Waku Transport functions\n  static async addTransportSubscription(\n    waku: Optional<LightNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    await WakuObservers.addTransportSubscription(\n      WakuBroadcasterWakuCore.waku,\n      topic,\n      callback,\n    );\n  }\n\n  static sendTransport(data: object, topic: string): void {\n    const customTopic = contentTopics.encrypted(topic);\n    WakuBroadcasterWakuCore.broadcastMessage(data, customTopic);\n  }\n\n  static getWakuCore(): Optional<LightNode> {\n    return WakuBroadcasterWakuCore.waku;\n  }\n}\n"]}
+{"version":3,"file":"waku-broadcaster-client.js","sourceRoot":"","sources":["../src/waku-broadcaster-client.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Chain,\n  delay,\n  POI_REQUIRED_LISTS,\n  BroadcasterConnectionStatus,\n  SelectedBroadcaster,\n} from '@railgun-community/shared-models';\nimport { BroadcasterFeeCache } from './fees/broadcaster-fee-cache.js';\nimport { AddressFilter } from './filters/address-filter.js';\nimport {\n  BroadcasterConnectionStatusCallback,\n  BroadcasterDebugger,\n  BroadcasterOptions,\n} from './models/export-models.js';\nimport { BroadcasterSearch } from './search/best-broadcaster.js';\nimport { BroadcasterStatus } from './status/broadcaster-connection-status.js';\nimport { BroadcasterDebug } from './utils/broadcaster-debug.js';\nimport { WakuObservers } from './waku/waku-observers.js';\nimport { WakuBroadcasterWakuCore } from './waku/waku-broadcaster-waku-core.js';\nimport type { LightNode } from '@waku/interfaces';\nimport { contentTopics } from './waku/waku-topics.js';\n\nexport class WakuBroadcasterClient {\n  private static chain: Chain;\n  private static statusCallback: BroadcasterConnectionStatusCallback;\n  private static started = false;\n  private static isRestarting = false;\n\n  static pollDelay = 3000;\n\n  static async start(\n    chain: Chain,\n    broadcasterOptions: BroadcasterOptions,\n    statusCallback: BroadcasterConnectionStatusCallback,\n    broadcasterDebugger?: BroadcasterDebugger,\n  ) {\n    this.chain = chain;\n    this.statusCallback = statusCallback;\n\n    WakuBroadcasterWakuCore.setBroadcasterOptions(broadcasterOptions);\n\n    if (broadcasterDebugger) {\n      BroadcasterDebug.setDebugger(broadcasterDebugger);\n    }\n\n    BroadcasterFeeCache.init(\n      broadcasterOptions.poiActiveListKeys ??\n        POI_REQUIRED_LISTS.map(list => list.key),\n    );\n\n    try {\n      this.started = false;\n      await WakuBroadcasterWakuCore.initWaku(chain);\n      this.started = true;\n\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.pollStatus();\n    } catch (cause) {\n      if (!(cause instanceof Error)) {\n        throw new Error('Unexpected non-error thrown', { cause });\n      }\n      throw new Error('Cannot connect to Broadcaster network.', { cause });\n    }\n  }\n  private static peerRetryCount = 0;\n  private static pollConnection = async () => {\n    const peerCount = WakuBroadcasterWakuCore.getMeshPeerCount();\n    if (peerCount < 1) {\n      if (this.peerRetryCount >= 2) {\n        this.peerRetryCount = 0;\n        await this.restart();\n      } else {\n        this.peerRetryCount += 1;\n      }\n    } else {\n      this.peerRetryCount = 0;\n    }\n    await delay(WakuBroadcasterClient.pollDelay);\n    this.pollConnection();\n  };\n\n  static async stop() {\n    await WakuBroadcasterWakuCore.disconnect();\n    this.started = false;\n    this.updateStatus();\n  }\n\n  static isStarted() {\n    return this.started;\n  }\n\n  static async setChain(chain: Chain): Promise<void> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    WakuBroadcasterClient.chain = chain;\n    await WakuObservers.setObserversForChain(\n      WakuBroadcasterWakuCore.waku,\n      chain,\n    );\n    WakuBroadcasterClient.updateStatus();\n  }\n\n  static getContentTopics(): string[] {\n    return WakuObservers.getCurrentContentTopics();\n  }\n\n  static getMeshPeerCount(): number {\n    return WakuBroadcasterWakuCore.getMeshPeerCount();\n  }\n\n  static getPubSubPeerCount(): number {\n    return WakuBroadcasterWakuCore.getPubSubPeerCount();\n  }\n\n  static async getLightPushPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getLightPushPeerCount();\n  }\n\n  static async getFilterPeerCount(): Promise<number> {\n    return await WakuBroadcasterWakuCore.getFilterPeerCount();\n  }\n  /**\n   * The function `findBestBroadcaster` finds the broadcaster with the lowest fees for a given chain and token.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findBestBroadcaster(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBestBroadcaster(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  /**\n   * The function `findAllBroadcastersForChain` returns an array of all available broadcasters fee-tokens for a given chain.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find all broadcasters for.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findAllBroadcastersForChain(\n    chain: Chain,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return [];\n    }\n\n    return BroadcasterSearch.findAllBroadcastersForChain(chain, useRelayAdapt);\n  }\n\n  /**\n   * The function `findRandomBroadcasterForToken` selects a random broadcaster from a list of broadcasters that is based on\n   * their fees for a specific token, and how much higher their fees are compared to the broadcaster with\n   * the lowest fees.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network, a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @param {number} [percentageThreshold=5] - The `percentageThreshold` parameter is a number that\n   * represents the maximum percentage increase in fees that a broadcaster can have compared to the broadcaster\n   * with the lowest fees. For example, if the `percentageThreshold` is set to 5, it means that a\n   * broadcaster can have a maximum of 5% higher fees than the broadcaster with the lowest fees and still be selected.\n   * Defaults to 5.\n   * @returns an Optional<SelectedBroadcaster> object.\n   */\n  static findRandomBroadcasterForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n    percentageThreshold: number = 5,\n  ): Optional<SelectedBroadcaster> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findRandomBroadcasterForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n      percentageThreshold,\n    );\n  }\n\n  /**\n   * The function `findBroadcastersForToken` takes in a chain, token address, and a boolean flag, and\n   * returns an array of selected broadcasters based on the provided parameters.\n   * @param {Chain} chain - The `chain` parameter is a Chain object that represents the network to find a broadcaster for.\n   * @param {string} tokenAddress - The `tokenAddress` parameter is a string that represents the\n   * address of an ERC20 Token on the network; a broadcaster broadcasting fees for this token will be selected.\n   * @param {boolean} useRelayAdapt - A boolean value indicating whether to select broadcasters that\n   * support RelayAdapt transactions.\n   * @returns an Optional<SelectedBroadcaster[]> object.\n   */\n  static findBroadcastersForToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ): Optional<SelectedBroadcaster[]> {\n    if (!WakuBroadcasterClient.started) {\n      return;\n    }\n\n    return BroadcasterSearch.findBroadcastersForToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  static setAddressFilters(\n    allowlist: Optional<string[]>,\n    blocklist: Optional<string[]>,\n  ): void {\n    AddressFilter.setAllowlist(allowlist);\n    AddressFilter.setBlocklist(blocklist);\n  }\n\n  static async tryReconnect(): Promise<void> {\n    // Reset fees, which will reset status to \"Searching\".\n    BroadcasterFeeCache.resetCache(WakuBroadcasterClient.chain);\n    WakuBroadcasterClient.updateStatus();\n\n    await WakuBroadcasterClient.restart();\n  }\n\n  static supportsToken(\n    chain: Chain,\n    tokenAddress: string,\n    useRelayAdapt: boolean,\n  ) {\n    return BroadcasterFeeCache.supportsToken(\n      chain,\n      tokenAddress,\n      useRelayAdapt,\n    );\n  }\n\n  private static async restart(): Promise<void> {\n    if (this.isRestarting || !this.started) {\n      return;\n    }\n    this.isRestarting = true;\n    try {\n      BroadcasterDebug.log('Restarting Waku...');\n      await WakuBroadcasterWakuCore.reinitWaku(this.chain);\n      this.isRestarting = false;\n    } catch (cause) {\n      this.isRestarting = false;\n      if (!(cause instanceof Error)) {\n        return;\n      }\n      BroadcasterDebug.error(\n        new Error('Error reinitializing Waku Broadcaster Client', { cause }),\n      );\n    }\n  }\n\n  /**\n   * Start keep-alive poller which checks Broadcaster status every few seconds.\n   */\n  private static async pollStatus(): Promise<void> {\n    if (!this.isRestarting) {\n      this.updateStatus();\n    } else {\n      this.updateStatus();\n    }\n    await delay(WakuBroadcasterClient.pollDelay);\n\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    this.pollStatus();\n  }\n\n  private static updateStatus() {\n    const status = BroadcasterStatus.getBroadcasterConnectionStatus(this.chain);\n\n    this.statusCallback(this.chain, status);\n    if (\n      status === BroadcasterConnectionStatus.Disconnected ||\n      status === BroadcasterConnectionStatus.Error\n    ) {\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.restart();\n    }\n  }\n\n  // Waku Transport functions\n  static async addTransportSubscription(\n    waku: Optional<LightNode>,\n    topic: string,\n    callback: (message: any) => void,\n  ): Promise<void> {\n    await WakuObservers.addTransportSubscription(\n      WakuBroadcasterWakuCore.waku,\n      topic,\n      callback,\n    );\n  }\n\n  static sendTransport(data: object, topic: string): void {\n    const customTopic = contentTopics.encrypted(topic);\n    WakuBroadcasterWakuCore.broadcastMessage(data, customTopic);\n  }\n\n  static getWakuCore(): Optional<LightNode> {\n    return WakuBroadcasterWakuCore.waku;\n  }\n\n  static setRestartCallback(callback: () => void): void {\n    WakuBroadcasterWakuCore.setWakuRestartCallback(callback);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@railgun-community/waku-broadcaster-client-node",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "license": "MIT",
   "main": "dist/index.js",
   "type": "module",
@@ -25,31 +25,18 @@
   },
   "dependencies": {
     "@libp2p/bootstrap": "^10.1.2",
-    "@libp2p/identify": "^2.1.2",
-    "@libp2p/interface": "1.1.4",
-    "@libp2p/mplex": "^10.1.2",
-    "@libp2p/ping": "^1.1.2",
     "@libp2p/tcp": "10.0.7",
-    "@libp2p/websockets": "^8.1.4",
-    "@noble/hashes": "^1.3.3",
-    "@waku/core": "0.0.32",
-    "@waku/discovery": "0.0.5",
-    "@waku/interfaces": "0.0.27",
-    "@waku/message-hash": "0.1.16",
-    "@waku/proto": "0.0.8",
-    "@waku/sdk": "0.0.28",
-    "@waku/utils": "0.0.20",
-    "libp2p": "^1.8.1",
-    "patch-package": "^8.0.0"
+    "@waku/sdk": "0.0.29",
+    "patch-package": "^8.0.0",
+    "@multiformats/multiaddr": "12.3.1"
   },
   "peerDependencies": {
-    "@railgun-community/shared-models": "7.4.4",
-    "@railgun-community/wallet": "10.2.5",
-    "ethers": "github:Railgun-Community/ethers.js#v6.7.10"
+    "@railgun-community/shared-models": "7.5.0",
+    "@railgun-community/wallet": "10.3.0"
   },
   "devDependencies": {
-    "@railgun-community/shared-models": "7.4.4",
-    "@railgun-community/wallet": "10.2.5",
+    "@railgun-community/shared-models": "7.5.0",
+    "@railgun-community/wallet": "10.3.0",
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
     "@types/leveldown": "^4.0.3",
@@ -65,7 +52,7 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.27.5",
-    "ethers": "github:Railgun-Community/ethers.js#v6.7.10",
+    "ethers": "6.13.1",
     "leveldown": "^6.1.1",
     "madge": "^6.1.0",
     "mocha": "^10.2.0",