Merge remote-tracking branch 'origin/develop' into develop

src/modules.ts

@@ -5,11 +5,10 @@ import { Level } from "level";
 let moduleStore: Level<string, Uint8Array>;
 
 const CORE_MODULES = {
-  swarm: "zdiLmwHCC15afFNLYzzT2DVV7m27SrBde7oXHdSzAe95GpFZXzdpatUN6b",
-  peerDiscoveryRegistry:
-    "zdiLW9MtAAMssP5vLBgd1FitouiVXzNUYZszFYG44uVKqCPDqUQox9aq1y",
-  ircPeerDiscovery: "zrjPHvVJ3j7Jfn834PV4n7KcWbSW7ZHkxvcPCKWjwAcjPX5",
-  s5: "zdiT6quMF8gh8BhQdXE7CZYhp8S1BxSgsucSS48WuTGdars1noejvak6Qo",
+  swarm: "zrjTDyEX8Mh2PdDdRj5YL2byFGrYe1ksczRwPaTRFaCGSMG",
+  peerDiscoveryRegistry: "zrjD6CEchDtSex5VHjzMNSAdkJpMNfCtbxSnftgtfvtnsdY",
+  ircPeerDiscovery: "zrjHTx8tSQFWnmZ9JzK7XmJirqJQi2WRBLYp3fASaL2AfBQ",
+  s5: "zrjLjKVByzt233rfcjWvTQXrMfGFa11oBLydPaUk7gwnC2d",
   networkRegistry: "zrjTCwTcK5Vco1h7cdUQKzs6yzeqm7vC5u5Lo9y1uhTyxnv",
 };
 

src/queries.ts

@@ -37,6 +37,7 @@ type WorkerLaunchFn = () => Promise<[Worker, Err]>;
 // a new worker gets launched for every query.
 interface Module {
   domain: string;
+  resolvedDomain: string;
   code: Uint8Array;
   launchWorker: WorkerLaunchFn;
   worker?: Worker;
@@ -223,10 +224,12 @@ function handleWorkerMessage(event: MessageEvent, mod: Module, worker: Worker) {
 async function createModule(
   workerCode: Uint8Array,
   domain: string,
+  resolvedDomain: string,
 ): Promise<[Module | null, Err]> {
   // Create the module object.
   const mod: Module = {
     domain,
+    resolvedDomain,
     code: workerCode,
     launchWorker: function (): Promise<[Worker, Err]> {
       return launchWorker(mod);
@@ -248,7 +251,7 @@ async function launchWorker(mod: Module): Promise<[Worker, Err]> {
   // Create and launch the worker.
   let worker: Worker;
   try {
-    worker = new Worker(mod.code, CID.decode(mod.domain));
+    worker = new Worker(mod.code, CID.decode(mod.resolvedDomain));
     await worker.ready;
   } catch (err: any) {
     logErr("worker", mod.domain, "unable to create worker", mod.domain, err);
@@ -593,7 +596,11 @@ async function handleModuleCall(
     }
 
     // Create a new module.
-    const [mod, errCM] = await createModule(moduleData, finalModule);
+    const [mod, errCM] = await createModule(
+      moduleData,
+      moduleDomain,
+      finalModule,
+    );
     if (errCM !== null) {
       const err = addContextToErr(errCM, "unable to create module");
       respondErr(event, messagePortal, isWorker, isInternal, err);

src/registry.ts

@@ -1,17 +1,17 @@
 const DEFAULT_MODULE_REGISTRY = new Map<string, string>(
   Object.entries({
     // swarm
-    zdiLmwHCC15afFNLYzzT2DVV7m27SrBde7oXHdSzAe95GpFZXzdpatUN6b:
-      "zduLvD6fRRmCy97T6RweYaPTxHdwFJmvmoygB4hCu3sJnZjHiYCKke4cG7",
+    zrjTDyEX8Mh2PdDdRj5YL2byFGrYe1ksczRwPaTRFaCGSMG:
+      "z2H78pADGKWPz2zWEgGKDc7jYYtSv6qBfDtKzU4Tq5zgFoejmiQD",
     // peerDiscoveryRegistry
-    zdiLW9MtAAMssP5vLBgd1FitouiVXzNUYZszFYG44uVKqCPDqUQox9aq1y:
-      "zduTMSXg16HNi4ggDz8uko7ZxX7q9yosGBT8MX2ng43epttTEQ3Xi7pr2B",
+    zrjD6CEchDtSex5VHjzMNSAdkJpMNfCtbxSnftgtfvtnsdY:
+      "z2H7AhnortTD6wL53XUdTotJZLADa7PbZCcHuSFJ6WgZ6td2bvaC",
     // ircPeerDiscovery
-    zrjPHvVJ3j7Jfn834PV4n7KcWbSW7ZHkxvcPCKWjwAcjPX5:
-      "zHnoaikfFJ9T5hEhV53bj8h5U5qgZrocCbfmTkogqGdaMkjLiE",
+    zrjHTx8tSQFWnmZ9JzK7XmJirqJQi2WRBLYp3fASaL2AfBQ:
+      "z2H7D35inXTkjuxevunyq7ojv1iomXJD1svDYgkLnknk2bXc14HC",
     // s5
-    zdiT6quMF8gh8BhQdXE7CZYhp8S1BxSgsucSS48WuTGdars1noejvak6Qo:
-      "z2H734ocqpAoorkhUk3nymFuwS6uU6YcBUppCU7YvBiasRvsbJ6E",
+    zrjLjKVByzt233rfcjWvTQXrMfGFa11oBLydPaUk7gwnC2d:
+      "z2H6yA5VLuVUukioBiSNYTBEMGBXHgV2uxcfppUnsSidZTwZHiWE",
     // networkRegistry
     zrjTCwTcK5Vco1h7cdUQKzs6yzeqm7vC5u5Lo9y1uhTyxnv:
       "z2H7J3strfaEAc1kyHqMNmEPzynRipVerfCeqEhfkkcrGNNhnJUo",