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

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

@@ -14,6 +14,7 @@ export type BroadcasterFeeCacheState = {
 export declare class BroadcasterFeeCache {
     private static cache;
     private static authorizedFees;
+    private static averageAuthorizedFees;
     static lastSubscribedFeeMessageReceivedAt: Optional<number>;
     private static poiActiveListKeys;
     static init(poiActiveListKeys: string[]): void;
@@ -22,7 +23,8 @@ export declare class BroadcasterFeeCache {
     static feesForChain(chain: Chain): Optional<BroadcasterFeeNetworkCacheMap>;
     static feesForToken(chain: Chain, tokenAddress: string): Optional<BroadcasterFeeNetworkTokenCacheMap>;
     static supportsToken(chain: Chain, tokenAddress: string, useRelayAdapt: boolean): boolean;
-    static addAuthorizedFees(tokenFeeMap: MapType<CachedTokenFee>): void;
+    static addAuthorizedFees(signerAddress: string, tokenFeeMap: MapType<CachedTokenFee>): void;
+    private static updateAverageAuthorizedFees;
     static getAuthorizedFee(tokenAddress: string): Optional<CachedTokenFee>;
 }
 export {};

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

@@ -6,6 +6,7 @@ import { nameForBroadcaster, cachedFeeExpired, DEFAULT_BROADCASTER_IDENTIFIER, i
 export class BroadcasterFeeCache {
     static cache = { forNetwork: {} };
     static authorizedFees = {};
+    static averageAuthorizedFees = {};
     static lastSubscribedFeeMessageReceivedAt;
     static poiActiveListKeys;
     static init(poiActiveListKeys) {
@@ -81,16 +82,74 @@ export class BroadcasterFeeCache {
         const availableUnexpiredFee = cachedFees.find(cachedFee => !cachedFeeUnavailableOrExpired(cachedFee, chain, useRelayAdapt));
         return availableUnexpiredFee != null;
     }
-    static addAuthorizedFees(tokenFeeMap) {
+    static addAuthorizedFees(signerAddress, tokenFeeMap) {
         const newFees = Object.entries(tokenFeeMap);
-        const authorizedFees = {};
+        const signerAddressLC = signerAddress.toLowerCase();
+        this.authorizedFees[signerAddressLC] ??= {};
+        const updatedTokens = [];
         for (const [tokenAddress, feeMap] of newFees) {
-            authorizedFees[tokenAddress.toLowerCase()] = feeMap;
+            const tokenAddressLC = tokenAddress.toLowerCase();
+            const existing = this.authorizedFees[signerAddressLC][tokenAddressLC];
+            if (existing && existing.expiration >= feeMap.expiration) {
+                continue;
+            }
+            this.authorizedFees[signerAddressLC][tokenAddressLC] = feeMap;
+            updatedTokens.push(tokenAddressLC);
         }
-        this.authorizedFees = authorizedFees;
+        this.updateAverageAuthorizedFees(updatedTokens);
+    }
+    static updateAverageAuthorizedFees(tokenAddresses) {
+        const trustedSigners = BroadcasterConfig.trustedFeeSigner;
+        const isTrustedSignerConfigured = trustedSigners != null &&
+            (typeof trustedSigners === 'string' || trustedSigners.length > 0);
+        tokenAddresses.forEach(tokenAddressLC => {
+            const authorizedFeesForToken = [];
+            Object.keys(this.authorizedFees).forEach(signerAddress => {
+                if (isTrustedSignerConfigured) {
+                    if (typeof trustedSigners === 'string') {
+                        if (signerAddress !== trustedSigners.toLowerCase()) {
+                            return;
+                        }
+                    }
+                    else if (Array.isArray(trustedSigners)) {
+                        if (!trustedSigners
+                            .map(s => s.toLowerCase())
+                            .includes(signerAddress.toLowerCase())) {
+                            return;
+                        }
+                    }
+                }
+                const fee = this.authorizedFees[signerAddress][tokenAddressLC];
+                if (fee) {
+                    if (cachedFeeExpired(fee.expiration)) {
+                        delete this.authorizedFees[signerAddress][tokenAddressLC];
+                        return;
+                    }
+                    authorizedFeesForToken.push(fee);
+                }
+            });
+            if (authorizedFeesForToken.length === 0) {
+                delete this.averageAuthorizedFees[tokenAddressLC];
+                return;
+            }
+            if (authorizedFeesForToken.length === 1) {
+                this.averageAuthorizedFees[tokenAddressLC] = authorizedFeesForToken[0];
+                return;
+            }
+            let totalFee = 0n;
+            authorizedFeesForToken.forEach(fee => {
+                totalFee += BigInt(fee.feePerUnitGas);
+            });
+            const averageFee = totalFee / BigInt(authorizedFeesForToken.length);
+            const baseFee = authorizedFeesForToken[0];
+            this.averageAuthorizedFees[tokenAddressLC] = {
+                ...baseFee,
+                feePerUnitGas: '0x' + averageFee.toString(16),
+            };
+        });
     }
     static getAuthorizedFee(tokenAddress) {
-        return this.authorizedFees[tokenAddress.toLowerCase()];
+        return this.averageAuthorizedFees[tokenAddress.toLowerCase()];
     }
 }
 //# sourceMappingURL=broadcaster-fee-cache.js.map

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  private static authorizedFees: MapType<CachedTokenFee> = {};\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  static addAuthorizedFees(tokenFeeMap: MapType<CachedTokenFee>) {\n    const newFees = Object.entries(tokenFeeMap)\n    const authorizedFees: MapType<CachedTokenFee> = {}\n    for (const [tokenAddress, feeMap] of newFees) {\n      authorizedFees[tokenAddress.toLowerCase()] = feeMap\n    }\n    this.authorizedFees = authorizedFees\n  }\n\n  static getAuthorizedFee(tokenAddress: string): Optional<CachedTokenFee> {\n    return this.authorizedFees[tokenAddress.toLowerCase()];\n  }\n}\n"]}
+{"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  // signerAddress -> tokenAddress -> fee\n  private static authorizedFees: MapType<MapType<CachedTokenFee>> = {};\n  // tokenAddress -> fee (average)\n  private static averageAuthorizedFees: MapType<CachedTokenFee> = {};\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  static addAuthorizedFees(\n    signerAddress: string,\n    tokenFeeMap: MapType<CachedTokenFee>,\n  ) {\n    const newFees = Object.entries(tokenFeeMap);\n    const signerAddressLC = signerAddress.toLowerCase();\n    this.authorizedFees[signerAddressLC] ??= {};\n\n    const updatedTokens: string[] = [];\n\n    for (const [tokenAddress, feeMap] of newFees) {\n      const tokenAddressLC = tokenAddress.toLowerCase();\n      const existing = this.authorizedFees[signerAddressLC][tokenAddressLC];\n      if (existing && existing.expiration >= feeMap.expiration) {\n        continue;\n      }\n      this.authorizedFees[signerAddressLC][tokenAddressLC] = feeMap;\n      updatedTokens.push(tokenAddressLC);\n    }\n    this.updateAverageAuthorizedFees(updatedTokens);\n  }\n\n  private static updateAverageAuthorizedFees(tokenAddresses: string[]) {\n    const trustedSigners = BroadcasterConfig.trustedFeeSigner;\n    const isTrustedSignerConfigured =\n      trustedSigners != null &&\n      (typeof trustedSigners === 'string' || trustedSigners.length > 0);\n\n    tokenAddresses.forEach(tokenAddressLC => {\n      const authorizedFeesForToken: CachedTokenFee[] = [];\n\n      Object.keys(this.authorizedFees).forEach(signerAddress => {\n        if (isTrustedSignerConfigured) {\n          if (typeof trustedSigners === 'string') {\n            if (signerAddress !== trustedSigners.toLowerCase()) {\n              return;\n            }\n          } else if (Array.isArray(trustedSigners)) {\n            if (\n              !trustedSigners\n                .map(s => s.toLowerCase())\n                .includes(signerAddress.toLowerCase())\n            ) {\n              return;\n            }\n          }\n        }\n\n        const fee = this.authorizedFees[signerAddress][tokenAddressLC];\n        if (fee) {\n          if (cachedFeeExpired(fee.expiration)) {\n            delete this.authorizedFees[signerAddress][tokenAddressLC];\n            return;\n          }\n          authorizedFeesForToken.push(fee);\n        }\n      });\n\n      if (authorizedFeesForToken.length === 0) {\n        delete this.averageAuthorizedFees[tokenAddressLC];\n        return;\n      }\n\n      if (authorizedFeesForToken.length === 1) {\n        this.averageAuthorizedFees[tokenAddressLC] = authorizedFeesForToken[0];\n        return;\n      }\n\n      let totalFee = 0n;\n      authorizedFeesForToken.forEach(fee => {\n        totalFee += BigInt(fee.feePerUnitGas);\n      });\n      const averageFee = totalFee / BigInt(authorizedFeesForToken.length);\n\n      const baseFee = authorizedFeesForToken[0];\n      this.averageAuthorizedFees[tokenAddressLC] = {\n        ...baseFee,\n        feePerUnitGas: '0x' + averageFee.toString(16),\n      };\n    });\n  }\n\n  static getAuthorizedFee(tokenAddress: string): Optional<CachedTokenFee> {\n    return this.averageAuthorizedFees[tokenAddress.toLowerCase()];\n  }\n}\n"]}

package/dist/fees/handle-authorized-fees-message.d.ts

@@ -1,2 +1,2 @@
 import { BroadcasterFeeMessageData } from '@railgun-community/shared-models';
-export declare const handleAuthorizedFees: (feeMessageData: BroadcasterFeeMessageData) => void;
+export declare const handleAuthorizedFees: (feeMessageData: BroadcasterFeeMessageData, signerAddress: string) => void;

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

@@ -1,7 +1,7 @@
 import { BroadcasterDebug } from '../utils/broadcaster-debug.js';
 import { BroadcasterFeeCache } from './broadcaster-fee-cache.js';
 import { cachedFeeExpired } from '../utils/broadcaster-util.js';
-export const handleAuthorizedFees = (feeMessageData) => {
+export const handleAuthorizedFees = (feeMessageData, signerAddress) => {
     try {
         if (cachedFeeExpired(feeMessageData.feeExpiration)) {
             return;
@@ -11,11 +11,6 @@ export const handleAuthorizedFees = (feeMessageData) => {
         tokenAddresses.forEach(tokenAddress => {
             const feePerUnitGas = feeMessageData.fees[tokenAddress];
             if (feePerUnitGas) {
-                const existingFee = BroadcasterFeeCache.getAuthorizedFee(tokenAddress.toLowerCase());
-                if (existingFee &&
-                    existingFee.expiration >= feeMessageData.feeExpiration) {
-                    return;
-                }
                 const cachedFee = {
                     feePerUnitGas,
                     expiration: feeMessageData.feeExpiration,
@@ -28,7 +23,7 @@ export const handleAuthorizedFees = (feeMessageData) => {
             }
         });
         if (Object.keys(tokenFeeMap).length > 0) {
-            BroadcasterFeeCache.addAuthorizedFees(tokenFeeMap);
+            BroadcasterFeeCache.addAuthorizedFees(signerAddress, tokenFeeMap);
             BroadcasterDebug.log('Updated Authorized Fees');
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"handle-authorized-fees-message.js","sourceRoot":"","sources":["../../src/fees/handle-authorized-fees-message.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,cAAyC,EACzC,EAAE;IACF,IAAI,CAAC;QACH,IAAI,gBAAgB,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAA4B,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACxD,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACpC,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;gBACrF,IACE,WAAW;oBACX,WAAW,CAAC,UAAU,IAAI,cAAc,CAAC,aAAa,EACtD,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,MAAM,SAAS,GAAmB;oBAChC,aAAa;oBACb,UAAU,EAAE,cAAc,CAAC,aAAa;oBACxC,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;oBACjD,UAAU,EAAE,cAAc,CAAC,UAAU;oBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;iBACxC,CAAC;gBACF,WAAW,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;YACxC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,mBAAmB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACnD,gBAAgB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,gBAAgB,CAAC,KAAK,CAAC,GAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC,CAAC","sourcesContent":["import {\n  BroadcasterFeeMessageData,\n  CachedTokenFee,\n} from '@railgun-community/shared-models';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { BroadcasterFeeCache } from './broadcaster-fee-cache.js';\nimport { cachedFeeExpired } from '../utils/broadcaster-util.js';\n\nexport const handleAuthorizedFees = (\n  feeMessageData: BroadcasterFeeMessageData,\n) => {\n  try {\n    if (cachedFeeExpired(feeMessageData.feeExpiration)) {\n      return;\n    }\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 existingFee = BroadcasterFeeCache.getAuthorizedFee(tokenAddress.toLowerCase());\n        if (\n          existingFee &&\n          existingFee.expiration >= feeMessageData.feeExpiration\n        ) {\n          return;\n        }\n\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    if (Object.keys(tokenFeeMap).length > 0) {\n      BroadcasterFeeCache.addAuthorizedFees(tokenFeeMap);\n      BroadcasterDebug.log('Updated Authorized Fees');\n    }\n  } catch (err) {\n    BroadcasterDebug.error(err as Error);\n  }\n};\n"]}
+{"version":3,"file":"handle-authorized-fees-message.js","sourceRoot":"","sources":["../../src/fees/handle-authorized-fees-message.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,cAAyC,EACzC,aAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,IAAI,gBAAgB,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAA4B,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACxD,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACpC,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,SAAS,GAAmB;oBAChC,aAAa;oBACb,UAAU,EAAE,cAAc,CAAC,aAAa;oBACxC,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;oBACjD,UAAU,EAAE,cAAc,CAAC,UAAU;oBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;iBACxC,CAAC;gBACF,WAAW,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;YACxC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,mBAAmB,CAAC,iBAAiB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAClE,gBAAgB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,gBAAgB,CAAC,KAAK,CAAC,GAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC,CAAC","sourcesContent":["import {\n  BroadcasterFeeMessageData,\n  CachedTokenFee,\n} from '@railgun-community/shared-models';\nimport { BroadcasterDebug } from '../utils/broadcaster-debug.js';\nimport { BroadcasterFeeCache } from './broadcaster-fee-cache.js';\nimport { cachedFeeExpired } from '../utils/broadcaster-util.js';\n\nexport const handleAuthorizedFees = (\n  feeMessageData: BroadcasterFeeMessageData,\n  signerAddress: string,\n) => {\n  try {\n    if (cachedFeeExpired(feeMessageData.feeExpiration)) {\n      return;\n    }\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    if (Object.keys(tokenFeeMap).length > 0) {\n      BroadcasterFeeCache.addAuthorizedFees(signerAddress, tokenFeeMap);\n      BroadcasterDebug.log('Updated Authorized Fees');\n    }\n  } catch (err) {\n    BroadcasterDebug.error(err as Error);\n  }\n};\n"]}

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

@@ -74,11 +74,19 @@ export const handleBroadcasterFeesMessage = async (chain, message, contentTopic)
 const updateFeesForBroadcaster = (chain, feeMessageData) => {
     const tokenFeeMap = {};
     const tokenAddresses = Object.keys(feeMessageData.fees);
-    const isTrustedSigner = BroadcasterConfig.trustedFeeSigner &&
-        feeMessageData.railgunAddress.toLowerCase() ===
-            BroadcasterConfig.trustedFeeSigner.toLowerCase();
+    let isTrustedSigner = false;
+    if (BroadcasterConfig.trustedFeeSigner) {
+        if (typeof BroadcasterConfig.trustedFeeSigner === 'string') {
+            isTrustedSigner =
+                feeMessageData.railgunAddress.toLowerCase() ===
+                    BroadcasterConfig.trustedFeeSigner.toLowerCase();
+        }
+        else {
+            isTrustedSigner = BroadcasterConfig.trustedFeeSigner.map(s => s.toLowerCase()).includes(feeMessageData.railgunAddress.toLowerCase());
+        }
+    }
     if (isTrustedSigner) {
-        handleAuthorizedFees(feeMessageData);
+        handleAuthorizedFees(feeMessageData, feeMessageData.railgunAddress);
     }
     tokenAddresses.forEach(tokenAddress => {
         const feePerUnitGas = feeMessageData.fees[tokenAddress];

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":"AAAA,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,2BAA2B,CAAC;AAMnC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,MAAM,kBAAkB,GAAG,CACzB,SAAyB,EACzB,sBAAsC,EACtC,EAAE;IACF,IAAI,CAAC,SAAS,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,gBAAgB,GAAG,SAAS,CAAC;IACjC,IAAI,gBAAgB,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;QAE5C,gBAAgB,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACjE,CAAC;IAGD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,cAAc,GAAG,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3C,MAAM,iBAAiB,GAAG,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC;IACrE,IAAI,gBAAgB,EAAE,CAAC;QACrB,gBAAgB,CAAC,GAAG,CAClB,yCAAyC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,GAAG,IACrF,GAAG,CACJ,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,gBAAgB,CAAC,GAAG,CAClB,sCAAsC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,GAAG,IAClF,GAAG,CACJ,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,sBAAsB,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC;IACxE,OAAO,gBAAgB,IAAI,UAAU,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC/C,KAAY,EACZ,OAAiB,EACjB,YAAoB,EACpB,EAAE;IACF,IAAI,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,gBAAgB,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QACD,IAAI,YAAY,KAAK,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,gBAAgB,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;YACvE,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAG7C,CAAC;QACF,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAA8B,CAAC;QAC3E,MAAM,iBAAiB,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACjE,IAAI,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,CAAC;YAC7D,gBAAgB,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;YAC1D,gBAAgB,CAAC,GAAG,CAClB,mHAAmH,CACpH,CAAC;YACF,wBAAwB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAChD,OAAO;QACT,CAAC;QAED,IAAI,yBAAyB,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YACtD,gBAAgB,CAAC,GAAG,CAClB,+CAA+C,cAAc,CAAC,OAAO,KAAK,cAAc,CAAC,cAAc,EAAE,CAC1G,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QAC1C,MAAM,EAAE,gBAAgB,EAAE,GAAG,2BAA2B,CAAC,cAAc,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,0BAA0B,CAC/C,SAAS,EACT,IAAI,EACJ,gBAAgB,CACjB,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,wBAAwB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC/B,KAAY,EACZ,cAAyC,EACzC,EAAE;IACF,MAAM,WAAW,GAA4B,EAAE,CAAC;IAChD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,eAAe,GACnB,iBAAiB,CAAC,gBAAgB;QAClC,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE;YAC3C,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;IAEnD,IAAI,eAAe,EAAE,CAAC;QACpB,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACvC,CAAC;IAED,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACpC,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,eAAe,IAAI,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;gBAC3D,MAAM,aAAa,GAAG,mBAAmB,CAAC,gBAAgB,CACxD,YAAY,CAAC,WAAW,EAAE,CAC3B,CAAC;gBACF,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,mBAAmB,GAAG,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;oBAChE,MAAM,aAAa,GACjB,CAAC,mBAAmB;wBAClB,MAAM,CACJ,IAAI,CAAC,KAAK,CACR,iBAAiB,CAAC,oCAAoC,GAAG,GAAG,CAC7D,CACF,CAAC;wBACJ,IAAI,CAAC;oBACP,MAAM,aAAa,GACjB,CAAC,mBAAmB;wBAClB,MAAM,CACJ,IAAI,CAAC,KAAK,CACR,iBAAiB,CAAC,oCAAoC,GAAG,GAAG,CAC7D,CACF,CAAC;wBACJ,IAAI,CAAC;oBACP,MAAM,MAAM,GAAG,mBAAmB,GAAG,aAAa,CAAC;oBACnD,MAAM,MAAM,GAAG,mBAAmB,GAAG,aAAa,CAAC;oBAEnD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;oBACxC,IAAI,SAAS,GAAG,MAAM,IAAI,SAAS,GAAG,MAAM,EAAE,CAAC;wBAC7C,OAAO;oBACT,CAAC;gBACH,CAAC;qBAAM,CAAC;oBAEN,OAAO;gBACT,CAAC;YACH,CAAC;YAED,MAAM,SAAS,GAAmB;gBAChC,aAAa;gBACb,UAAU,EAAE,cAAc,CAAC,aAAa;gBACxC,MAAM,EAAE,cAAc,CAAC,MAAM;gBAC7B,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;gBACjD,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;aACxC,CAAC;YACF,WAAW,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;QACxC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,mBAAmB,CAAC,YAAY,CAC9B,KAAK,EACL,cAAc,CAAC,cAAc,EAC7B,cAAc,CAAC,aAAa,EAC5B,WAAW,EACX,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,OAAO,EACtB,cAAc,CAAC,mBAAmB,IAAI,EAAE,CACzC,CAAC;IACJ,CAAC;AACH,CAAC,CAAC","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 { type IMessage } from '@waku/sdk';\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';\nimport { handleAuthorizedFees } from './handle-authorized-fees-message.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. -- should be no longer an issue. \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 ${(Date.now() - messageTimestamp.getTime()) / 1000\n      }s`,\n    );\n  } else {\n    BroadcasterDebug.log(\n      `Broadcaster Fee receipt SUCCESS in ${(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};\n\nconst updateFeesForBroadcaster = (\n  chain: Chain,\n  feeMessageData: BroadcasterFeeMessageData,\n) => {\n  const tokenFeeMap: MapType<CachedTokenFee> = {};\n  const tokenAddresses = Object.keys(feeMessageData.fees);\n\n  const isTrustedSigner =\n    BroadcasterConfig.trustedFeeSigner &&\n    feeMessageData.railgunAddress.toLowerCase() ===\n    BroadcasterConfig.trustedFeeSigner.toLowerCase();\n\n  if (isTrustedSigner) {\n    handleAuthorizedFees(feeMessageData);\n  }\n\n  tokenAddresses.forEach(tokenAddress => {\n    const feePerUnitGas = feeMessageData.fees[tokenAddress];\n    if (feePerUnitGas) {\n      if (!isTrustedSigner && BroadcasterConfig.trustedFeeSigner) {\n        const authorizedFee = BroadcasterFeeCache.getAuthorizedFee(\n          tokenAddress.toLowerCase(),\n        );\n        if (authorizedFee) {\n          const authorizedFeeAmount = BigInt(authorizedFee.feePerUnitGas);\n          const varianceLower =\n            (authorizedFeeAmount *\n              BigInt(\n                Math.round(\n                  BroadcasterConfig.authorizedFeeVariancePercentageLower * 100,\n                ),\n              )) /\n            100n;\n          const varianceUpper =\n            (authorizedFeeAmount *\n              BigInt(\n                Math.round(\n                  BroadcasterConfig.authorizedFeeVariancePercentageUpper * 100,\n                ),\n              )) /\n            100n;\n          const minFee = authorizedFeeAmount - varianceLower;\n          const maxFee = authorizedFeeAmount + varianceUpper;\n\n          const feeAmount = BigInt(feePerUnitGas);\n          if (feeAmount < minFee || feeAmount > maxFee) {\n            return;\n          }\n        } else {\n          // No authorized fee, and we require one.\n          return;\n        }\n      }\n\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  if (Object.keys(tokenFeeMap).length > 0) {\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};\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 { type IMessage } from '@waku/sdk';\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';\nimport { handleAuthorizedFees } from './handle-authorized-fees-message.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. -- should be no longer an issue. \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 ${(Date.now() - messageTimestamp.getTime()) / 1000\n      }s`,\n    );\n  } else {\n    BroadcasterDebug.log(\n      `Broadcaster Fee receipt SUCCESS in ${(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};\n\nconst updateFeesForBroadcaster = (\n  chain: Chain,\n  feeMessageData: BroadcasterFeeMessageData,\n) => {\n  const tokenFeeMap: MapType<CachedTokenFee> = {};\n  const tokenAddresses = Object.keys(feeMessageData.fees);\n\n  let isTrustedSigner = false;\n  if (BroadcasterConfig.trustedFeeSigner) {\n    if (typeof BroadcasterConfig.trustedFeeSigner === 'string') {\n      isTrustedSigner =\n        feeMessageData.railgunAddress.toLowerCase() ===\n        BroadcasterConfig.trustedFeeSigner.toLowerCase();\n    } else {\n      isTrustedSigner = BroadcasterConfig.trustedFeeSigner.map(s =>\n        s.toLowerCase(),\n      ).includes(feeMessageData.railgunAddress.toLowerCase());\n    }\n  }\n\n  if (isTrustedSigner) {\n    handleAuthorizedFees(feeMessageData, feeMessageData.railgunAddress);\n  }\n\n  tokenAddresses.forEach(tokenAddress => {\n    const feePerUnitGas = feeMessageData.fees[tokenAddress];\n    if (feePerUnitGas) {\n      if (!isTrustedSigner && BroadcasterConfig.trustedFeeSigner) {\n        const authorizedFee = BroadcasterFeeCache.getAuthorizedFee(\n          tokenAddress.toLowerCase(),\n        );\n        if (authorizedFee) {\n          const authorizedFeeAmount = BigInt(authorizedFee.feePerUnitGas);\n          const varianceLower =\n            (authorizedFeeAmount *\n              BigInt(\n                Math.round(\n                  BroadcasterConfig.authorizedFeeVariancePercentageLower * 100,\n                ),\n              )) /\n            100n;\n          const varianceUpper =\n            (authorizedFeeAmount *\n              BigInt(\n                Math.round(\n                  BroadcasterConfig.authorizedFeeVariancePercentageUpper * 100,\n                ),\n              )) /\n            100n;\n          const minFee = authorizedFeeAmount - varianceLower;\n          const maxFee = authorizedFeeAmount + varianceUpper;\n\n          const feeAmount = BigInt(feePerUnitGas);\n          if (feeAmount < minFee || feeAmount > maxFee) {\n            return;\n          }\n        } else {\n          // No authorized fee, and we require one.\n          return;\n        }\n      }\n\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  if (Object.keys(tokenFeeMap).length > 0) {\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};\n"]}

package/dist/models/broadcaster-config.d.ts

@@ -4,8 +4,9 @@ export type CustomDNSConfig = {
 };
 export declare class BroadcasterConfig {
     static IS_DEV: boolean;
-    static trustedFeeSigner: string;
+    static trustedFeeSigner: string | string[];
     static feeExpirationTimeout: number;
+    static historicalLookBackTime: number;
     static authorizedFeeVariancePercentageLower: number;
     static authorizedFeeVariancePercentageUpper: number;
     static MINIMUM_BROADCASTER_VERSION: string;

package/dist/models/broadcaster-config.js

@@ -2,6 +2,7 @@ export class BroadcasterConfig {
     static IS_DEV = false;
     static trustedFeeSigner;
     static feeExpirationTimeout = 120_000;
+    static historicalLookBackTime = 1 * 60 * 1000;
     static authorizedFeeVariancePercentageLower = 0.10;
     static authorizedFeeVariancePercentageUpper = 0.30;
     static MINIMUM_BROADCASTER_VERSION = '8.0.0';

package/dist/models/broadcaster-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcaster-config.js","sourceRoot":"","sources":["../../src/models/broadcaster-config.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAEtB,MAAM,CAAC,gBAAgB,CAAS;IAEhC,MAAM,CAAC,oBAAoB,GAAG,OAAO,CAAC;IAEtC,MAAM,CAAC,oCAAoC,GAAG,IAAI,CAAC;IACnD,MAAM,CAAC,oCAAoC,GAAG,IAAI,CAAC;IAEnD,MAAM,CAAC,2BAA2B,GAAG,OAAO,CAAC;IAC7C,MAAM,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAE/C,MAAM,CAAC,eAAe,GAAG,KAAK,CAAA;IAC9B,MAAM,CAAC,SAAS,GAAgC,SAAS,CAAA","sourcesContent":["export type CustomDNSConfig = {\n  onlyCustom: boolean,\n  enrTreePeers: string[]\n}\nexport class BroadcasterConfig {\n  static IS_DEV = false;\n\n  static trustedFeeSigner: string;\n\n  static feeExpirationTimeout = 120_000; // 2 minutes\n\n  static authorizedFeeVariancePercentageLower = 0.10; // 10% lower variance\n  static authorizedFeeVariancePercentageUpper = 0.30; // 30% upper variance\n\n  static MINIMUM_BROADCASTER_VERSION = '8.0.0';\n  static MAXIMUM_BROADCASTER_VERSION = '8.999.0';\n\n  static useDNSDiscovery = false\n  static customDNS: CustomDNSConfig | undefined = undefined\n}\n"]}
+{"version":3,"file":"broadcaster-config.js","sourceRoot":"","sources":["../../src/models/broadcaster-config.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAEtB,MAAM,CAAC,gBAAgB,CAAoB;IAE3C,MAAM,CAAC,oBAAoB,GAAG,OAAO,CAAC;IACtC,MAAM,CAAC,sBAAsB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IAE9C,MAAM,CAAC,oCAAoC,GAAG,IAAI,CAAC;IACnD,MAAM,CAAC,oCAAoC,GAAG,IAAI,CAAC;IAEnD,MAAM,CAAC,2BAA2B,GAAG,OAAO,CAAC;IAC7C,MAAM,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAE/C,MAAM,CAAC,eAAe,GAAG,KAAK,CAAA;IAC9B,MAAM,CAAC,SAAS,GAAgC,SAAS,CAAA","sourcesContent":["export type CustomDNSConfig = {\n  onlyCustom: boolean,\n  enrTreePeers: string[]\n}\nexport class BroadcasterConfig {\n  static IS_DEV = false;\n\n  static trustedFeeSigner: string | string[];\n\n  static feeExpirationTimeout = 120_000; // 2 minutes\n  static historicalLookBackTime = 1 * 60 * 1000; // 1 minute\n\n  static authorizedFeeVariancePercentageLower = 0.10; // 10% lower variance\n  static authorizedFeeVariancePercentageUpper = 0.30; // 30% upper variance\n\n  static MINIMUM_BROADCASTER_VERSION = '8.0.0';\n  static MAXIMUM_BROADCASTER_VERSION = '8.999.0';\n\n  static useDNSDiscovery = false\n  static customDNS: CustomDNSConfig | undefined = undefined\n}\n"]}

package/dist/models/export-models.d.ts

@@ -1,12 +1,13 @@
 import { Chain, BroadcasterConnectionStatus } from '@railgun-community/shared-models';
 import type { CustomDNSConfig } from './broadcaster-config.js';
 export type BroadcasterOptions = {
-    trustedFeeSigner: string;
+    trustedFeeSigner: string | string[];
     poiActiveListKeys?: string[];
     pubSubTopic?: string;
     additionalDirectPeers?: string[];
     peerDiscoveryTimeout?: number;
     feeExpirationTimeout?: number;
+    historicalLookBackTime?: number;
     useDNSDiscovery?: boolean;
     useCustomDNS?: CustomDNSConfig;
     broadcasterVersionRange?: {

package/dist/models/export-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"export-models.js","sourceRoot":"","sources":["../../src/models/export-models.ts"],"names":[],"mappings":"","sourcesContent":["import {\n  Chain,\n  BroadcasterConnectionStatus,\n} from '@railgun-community/shared-models';\nimport type { CustomDNSConfig } from './broadcaster-config.js';\n\nexport type BroadcasterOptions = {\n  trustedFeeSigner: string;\n  poiActiveListKeys?: string[];\n  pubSubTopic?: string;\n  additionalDirectPeers?: string[];\n  peerDiscoveryTimeout?: number;\n  feeExpirationTimeout?: number;\n  useDNSDiscovery?: boolean;\n  useCustomDNS?: CustomDNSConfig,\n  broadcasterVersionRange?: {\n    minVersion: string;\n    maxVersion: string;\n  };\n};\n\nexport type BroadcasterConnectionStatusCallback = (\n  chain: Chain,\n  status: BroadcasterConnectionStatus,\n) => void;\n\nexport type BroadcasterDebugger = {\n  log: (msg: string) => void;\n  error: (error: Error) => void;\n};\n"]}
+{"version":3,"file":"export-models.js","sourceRoot":"","sources":["../../src/models/export-models.ts"],"names":[],"mappings":"","sourcesContent":["import {\n  Chain,\n  BroadcasterConnectionStatus,\n} from '@railgun-community/shared-models';\nimport type { CustomDNSConfig } from './broadcaster-config.js';\n\nexport type BroadcasterOptions = {\n  trustedFeeSigner: string | string[];\n  poiActiveListKeys?: string[];\n  pubSubTopic?: string;\n  additionalDirectPeers?: string[];\n  peerDiscoveryTimeout?: number;\n  feeExpirationTimeout?: number;\n  historicalLookBackTime?: number;\n  useDNSDiscovery?: boolean;\n  useCustomDNS?: CustomDNSConfig,\n  broadcasterVersionRange?: {\n    minVersion: string;\n    maxVersion: string;\n  };\n};\n\nexport type BroadcasterConnectionStatusCallback = (\n  chain: Chain,\n  status: BroadcasterConnectionStatus,\n) => void;\n\nexport type BroadcasterDebugger = {\n  log: (msg: string) => void;\n  error: (error: Error) => void;\n};\n"]}

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

@@ -75,6 +75,9 @@ export class WakuBroadcasterWakuCoreBase {
             BroadcasterConfig.feeExpirationTimeout =
                 broadcasterOptions.feeExpirationTimeout;
         }
+        if (isDefined(broadcasterOptions.historicalLookBackTime)) {
+            BroadcasterConfig.historicalLookBackTime = broadcasterOptions.historicalLookBackTime;
+        }
     }
     static async disconnect() {
         await WakuObservers.unsubscribe(this.waku);
@@ -128,7 +131,7 @@ export class WakuBroadcasterWakuCoreBase {
         const decoder = createDecoder(topic, WAKU_RAILGUN_DEFAULT_SHARD);
         try {
             const startTime = new Date();
-            startTime.setTime(Date.now() - (5 * 60 * 1000));
+            startTime.setTime(Date.now() - (BroadcasterConfig.historicalLookBackTime));
             const endTime = new Date(Date.now());
             const options = {
                 includeData: true,

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@railgun-community/waku-broadcaster-client-node",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "license": "MIT",
   "main": "dist/index.js",
   "type": "module",