chore: update bundles with wrapscan URIs

Author: dOrgJelli

integration-tests/react-app/package.json

@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@polywrap/client-js": "~0.10.1",
-    "@polywrap/sys-config-bundle-js": "~0.10.1",
+    "@polywrap/client-js": "~0.12.0-pre.1",
+    "@polywrap/sys-config-bundle-js": "~0.12.0-pre.1",
     "@types/react": "^18.2.13",
     "@types/react-dom": "^18.2.6",
     "react": "^18.2.0",

packages/config-bundles/sys/package.json

@@ -18,16 +18,17 @@
     "lint": "eslint --color -c ../../../.eslintrc.js src/"
   },
   "dependencies": {
-    "@polywrap/concurrent-plugin-js": "~0.10.0",
+    "@polywrap/concurrent-plugin-js": "~0.12.0-pre.0",
     "@polywrap/config-bundle-types-js": "0.12.0-pre.1",
-    "@polywrap/datetime-plugin-js": "~0.10.0",
-    "@polywrap/file-system-plugin-js": "~0.10.0",
-    "@polywrap/http-plugin-js": "~0.10.0",
-    "@polywrap/logger-plugin-js": "~0.10.0",
+    "@polywrap/datetime-plugin-js": "~0.12.0-pre.0",
+    "@polywrap/file-system-plugin-js": "~0.12.0-pre.0",
+    "@polywrap/http-plugin-js": "~0.12.0-pre.0",
+    "@polywrap/logger-plugin-js": "~0.12.0-pre.0",
     "@polywrap/uri-resolver-extensions-js": "0.12.0-pre.1",
     "base64-to-uint8array": "1.0.0"
   },
   "devDependencies": {
+    "@polywrap/wrap-manifest-types-js": "~0.11.0",
     "doc-snippets": "~1.0.0",
     "rimraf": "3.0.2",
     "ts-node": "10.9.1",

packages/config-bundles/sys/scripts/embed-wraps.ts

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { WasmPackage } from "@polywrap/wasm-js";
+import { deserializeWrapManifest } from "@polywrap/wrap-manifest-types-js";
 
 async function main() {
 
@@ -25,12 +25,7 @@ async function main() {
 
     try {
       // Make sure we can load the wasm module
-      const tryLoad = WasmPackage.from(
-        infoBytes,
-        wasmBytes
-      );
-      const result = await tryLoad.getManifest();
-      if (!result.ok) throw result.error;
+      await deserializeWrapManifest(infoBytes);
     } catch (err) {
       throw Error(`Unable to load wrapper at ${wrapperDir}`);
     }

packages/config-bundles/sys/src/common.ts

@@ -21,93 +21,62 @@ export const bundle: Bundle = {
   logger: {
     uri: "plugin/logger@1.0.0",
     package: loggerPlugin({}) as IWrapPackage,
-    implements: ["wrapscan.io/polywrap/logger@1.0", "ens/wraps.eth:logger@1.0.0"],
-    redirectFrom: [
-      "wrapscan.io/polywrap/logger@1.0",
-      "ens/wraps.eth:logger@1.0.0",
-    ],
+    implements: ["wrapscan.io/polywrap/logger@1.0"],
+    redirectFrom: ["wrapscan.io/polywrap/logger@1.0"],
   },
   datetime: {
     uri: "plugin/datetime@1.0.0",
     package: dateTimePlugin({}) as IWrapPackage,
-    implements: [
-      "wrapscan.io/polywrap/datetime@1.0",
-      "ens/wraps.eth:datetime@1.0.0",
-    ],
-    redirectFrom: [
-      "wrapscan.io/polywrap/datetime@1.0",
-      "ens/wraps.eth:datetime@1.0.0",
-    ],
+    implements: ["wrapscan.io/polywrap/datetime@1.0"],
+    redirectFrom: ["wrapscan.io/polywrap/datetime@1.0"],
   },
   concurrent: {
     uri: "plugin/concurrent@1.0.0",
     package: concurrentPromisePlugin({}) as IWrapPackage,
-    implements: [
-      "wrapscan.io/polywrap/concurrent@1.0",
-      "ens/wraps.eth:concurrent@1.0.0",
-    ],
-    redirectFrom: [
-      "wrapscan.io/polywrap/concurrent@1.0",
-      "ens/wraps.eth:concurrent@1.0.0",
-    ],
+    implements: ["wrapscan.io/polywrap/concurrent@1.0"],
+    redirectFrom: ["wrapscan.io/polywrap/concurrent@1.0"],
   },
   http: {
     uri: "plugin/http@1.1.0",
     package: httpPlugin({}) as IWrapPackage,
-    implements: [
-      "wrapscan.io/polywrap/http@1.0",
-      "ens/wraps.eth:http@1.1.0",
-      "ens/wraps.eth:http@1.0.0",
-    ],
-    redirectFrom: [
-      "wrapscan.io/polywrap/http@1.0",
-      "ens/wraps.eth:http@1.1.0",
-      "ens/wraps.eth:http@1.0.0",
-    ],
+    implements: ["wrapscan.io/polywrap/http@1.0"],
+    redirectFrom: ["wrapscan.io/polywrap/http@1.0"],
   },
   githubResolver: {
-    uri: "wrap://ipfs/QmYPp2bQpRxR7WCoiAgWsWoiQzqxyFdqWxp1i65VW8wNv2",
+    uri: "wrapscan.io/polywrap/github-uri-resolver@1.0",
     implements: [ExtendableUriResolver.defaultExtInterfaceUris[0].uri],
   },
   httpResolver: {
-    uri: "embed/http-uri-resolver-ext@1.0.1",
+    uri: "embed/http-uri-resolver@1.0.0",
     package: httpResolver.wasmPackage,
     implements: [
-      "ens/wraps.eth:http-uri-resolver-ext@1.0.1",
-      ExtendableUriResolver.defaultExtInterfaceUris[0].uri,
-      ExtendableUriResolver.defaultExtInterfaceUris[2].uri,
+      "wrapscan.io/polywrap/http-uri-resolver@1.0",
+      ExtendableUriResolver.defaultExtInterfaceUris[0].uri
     ],
-    redirectFrom: ["ens/wraps.eth:http-uri-resolver-ext@1.0.1"],
+    redirectFrom: ["wrapscan.io/polywrap/http-uri-resolver@1.0"],
   },
   wrapscanResolver: {
     uri: "https://wraps.wrapscan.io/r/polywrap/wrapscan-uri-resolver@1.0",
     implements: [
       "wrapscan.io/polywrap/wrapscan-uri-resolver@1.0",
-      ExtendableUriResolver.defaultExtInterfaceUris[2].uri,
+      ExtendableUriResolver.defaultExtInterfaceUris[0].uri,
     ],
     redirectFrom: ["wrapscan.io/polywrap/wrapscan-uri-resolver@1.0"],
   },
   ipfsHttpClient: {
     uri: "embed/ipfs-http-client@1.0.0",
     package: ipfsHttpClient.wasmPackage,
-    implements: [
-      "wrapscan.io/polywrap/ipfs-http-client@1.0",
-      "ens/wraps.eth:ipfs-http-client@1.0.0",
-    ],
-    redirectFrom: [
-      "wrapscan.io/polywrap/ipfs-http-client@1.0",
-      "ens/wraps.eth:ipfs-http-client@1.0.0",
-    ],
+    implements: ["wrapscan.io/polywrap/ipfs-http-client@1.0"],
+    redirectFrom: ["wrapscan.io/polywrap/ipfs-http-client@1.0"],
   },
   ipfsResolver: {
-    uri: "embed/async-ipfs-uri-resolver-ext@1.0.1",
+    uri: "embed/async-ipfs-uri-resolver@1.0.0",
     package: ipfsResolver.wasmPackage,
     implements: [
-      "ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1",
+      "wrapscan.io/polywrap/async-ipfs-uri-resolver@1.0",
       ExtendableUriResolver.defaultExtInterfaceUris[0].uri,
-      ExtendableUriResolver.defaultExtInterfaceUris[2].uri,
     ],
-    redirectFrom: ["ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1"],
+    redirectFrom: ["wrapscan.io/polywrap/async-ipfs-uri-resolver@1.0"],
     env: {
       provider: ipfsProviders[0],
       fallbackProviders: ipfsProviders.slice(1),