Common Bundle - use Wrapscan URIs

.github/workflows/ci-javascript.yaml

@@ -80,12 +80,8 @@ jobs:
       - name: Build docs
         run: yarn build:docs
 
-  CI-WRAP-Test-Harness:
-    uses: ./.github/workflows/ci-wrap-test-harness.yaml
-
   Test:
     runs-on: ubuntu-latest
-    needs: CI-WRAP-Test-Harness
     timeout-minutes: 60
     if: ${{ always() }}
     steps:
@@ -118,18 +114,5 @@ jobs:
       - name: Build
         run: yarn build
 
-      - name: Get updated wrappers
-        if: ${{ needs.CI-WRAP-Test-Harness.outputs.rebuild_required == 'true' }}
-        uses: actions/download-artifact@v3
-        id: get-wrappers
-        with:
-          name: rebuilt-wrappers
-          path: ./wrappers
-
-      - if: ${{ needs.CI-WRAP-Test-Harness.outputs.rebuild_required == 'true' }}
-        run: |
-          rm -rf packages/test-cases/wrappers
-          mv wrappers packages/test-cases
-
       - name: Test
         run: yarn test

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/client/README.md

@@ -41,8 +41,8 @@ Invoke a wrapper.
 
 ```ts
   const result = await client.invoke({
-    uri: "ens/helloworld.dev.polywrap.eth",
-    method: "logMessage",
+    uri: "wrapscan.io/polywrap/logging@1",
+    method: "info",
     args: {
       message: "Hello World!"
     }

packages/client/examples/quickstart.ts

@@ -23,8 +23,8 @@ export async function invoke(): Promise<any> {
   const client = new PolywrapClient();
   // $start: quickstart-invoke
   const result = await client.invoke({
-    uri: "ens/helloworld.dev.polywrap.eth",
-    method: "logMessage",
+    uri: "wrapscan.io/polywrap/logging@1",
+    method: "info",
     args: {
       message: "Hello World!"
     }

packages/client/package.json

@@ -35,7 +35,6 @@
     "@polywrap/wrap-manifest-types-js": "0.12.0-pre.1"
   },
   "devDependencies": {
-    "@polywrap/cli-js": "~0.10.0",
     "@polywrap/sys-config-bundle-js": "0.12.0-pre.1",
     "@polywrap/test-cases": "0.12.0-pre.1",
     "@types/jest": "29.5.0",
@@ -44,7 +43,6 @@
     "bignumber.js": "9.0.2",
     "doc-snippets": "~1.0.0",
     "jest": "29.5.0",
-    "polywrap": "~0.10.0",
     "rimraf": "3.0.2",
     "ts-jest": "29.1.0",
     "ts-loader": "8.0.17",

packages/client/src/__tests__/core/error-structure.spec.ts

@@ -88,11 +88,11 @@ describe("Error structure", () => {
       expect(result.error?.innerError instanceof WrapError).toBeTruthy();
       const prev = result.error?.innerError as WrapError;
       expect(prev.name).toEqual("WrapError");
-      expect(prev.code).toEqual(WrapErrorCode.WRAPPER_INVOKE_ABORTED);
+      expect(prev.code).toEqual(WrapErrorCode.URI_NOT_FOUND);
       expect(prev.reason).toContain(
-        "A URI Resolver returned an error."
+        "Unable to find URI wrap://authority/imported-invoke"
       );
-      expect(prev.uri).toEqual("wrap://ens/wraps.eth:ens-uri-resolver-ext@1.0.1");
+      expect(prev.uri).toEqual("wrap://authority/imported-invoke");
     });
 
     describe("Wasm wrapper - Assemblyscript", () => {
@@ -165,8 +165,8 @@ describe("Error structure", () => {
         const config = new PolywrapClientConfigBuilder()
           .addDefaults()
           .setRedirects({
-            "ens/imported-invoke.eth": asInvokeWrapperUri.uri,
-            "ens/imported-subinvoke.eth": asSubinvokeWrapperUri.uri,
+            "authority/imported-invoke": asInvokeWrapperUri.uri,
+            "authority/imported-subinvoke": asSubinvokeWrapperUri.uri,
           })
           .build();
         const client = new PolywrapClient(config);
@@ -206,7 +206,7 @@ describe("Error structure", () => {
         expect(
           prev.reason.startsWith("SubInvocation exception encountered")
         ).toBeTruthy();
-        expect(prev.uri).toEqual("wrap://ens/imported-invoke.eth");
+        expect(prev.uri).toEqual("wrap://authority/imported-invoke");
         expect(prev.method).toEqual("invokeThrowError");
         expect(prev.args).toEqual('{\n  "a": "Hey"\n}' );
         expect(prev.source?.file).toEqual(
@@ -219,7 +219,7 @@ describe("Error structure", () => {
         expect(prevOfPrev.code).toEqual(WrapErrorCode.WRAPPER_INVOKE_ABORTED);
         expect(prevOfPrev.reason).toEqual("__wrap_abort: Hey");
         expect(
-          prevOfPrev.uri.endsWith("wrap://ens/imported-subinvoke.eth")
+          prevOfPrev.uri.endsWith("wrap://authority/imported-subinvoke")
         ).toBeTruthy();
         expect(prevOfPrev.method).toEqual("subinvokeThrowError");
         expect(prev.args).toEqual('{\n  "a": "Hey"\n}');
@@ -341,8 +341,8 @@ describe("Error structure", () => {
         const config = new PolywrapClientConfigBuilder()
           .addDefaults()
           .setRedirects({
-            "ens/imported-invoke.eth": rsInvokeWrapperUri.uri,
-            "ens/imported-subinvoke.eth": rsSubinvokeWrapperUri.uri,
+            "authority/imported-invoke": rsInvokeWrapperUri.uri,
+            "authority/imported-subinvoke": rsSubinvokeWrapperUri.uri,
           })
           .build();
 
@@ -381,7 +381,7 @@ describe("Error structure", () => {
         expect(
           prev.reason.startsWith("SubInvocation exception encountered")
         ).toBeTruthy();
-        expect(prev.uri).toEqual("wrap://ens/imported-invoke.eth");
+        expect(prev.uri).toEqual("wrap://authority/imported-invoke");
         expect(prev.method).toEqual("invokeThrowError");
         expect(prev.args).toEqual('{\n  "a": "Hey"\n}');
         expect(prev.source?.file).toEqual("src/lib.rs");
@@ -392,7 +392,7 @@ describe("Error structure", () => {
         expect(prevOfPrev.code).toEqual(WrapErrorCode.WRAPPER_INVOKE_ABORTED);
         expect(prevOfPrev.reason).toEqual("__wrap_abort: Hey");
         expect(
-          prevOfPrev.uri.endsWith("wrap://ens/imported-subinvoke.eth")
+          prevOfPrev.uri.endsWith("wrap://authority/imported-subinvoke")
         ).toBeTruthy();
         expect(prevOfPrev.method).toEqual("subinvokeThrowError");
         expect(prevOfPrev.args).toEqual('{\n  "a": "Hey"\n}');

packages/client/src/__tests__/core/plugin-wrapper.spec.ts

@@ -39,7 +39,7 @@ describe("plugin-wrapper", () => {
   };
 
   test("plugin map types", async () => {
-    const implementationUri = Uri.from("wrap://ens/some-implementation.eth");
+    const implementationUri = Uri.from("wrap://authority/some-implementation");
     const mockPlugin = mockMapPlugin();
     const client = new PolywrapClient({
       resolver: UriResolver.from([

packages/client/src/__tests__/core/sanity.spec.ts

@@ -24,9 +24,9 @@ describe("sanity", () => {
   });
 
   test("validate requested uri is available", async () => {
-    const subinvokeUri = Uri.from("ens/imported-subinvoke.eth");
-    const invokeUri = Uri.from("ens/imported-invoke.eth");
-    const consumerUri = Uri.from("ens/consumer.eth");
+    const subinvokeUri = Uri.from("authority/imported-subinvoke");
+    const invokeUri = Uri.from("authority/imported-invoke");
+    const consumerUri = Uri.from("authority/consumer");
 
     const getPackage = async (name: string) => {
       const manifest = await fs.promises.readFile(

packages/client/src/__tests__/core/type-test-cases.ts

@@ -12,7 +12,7 @@ export const typeTestCases = (implementation: string) => {
       const config = new PolywrapClientConfigBuilder()
         .addDefaults()
         .setPackage(
-          "wrap://ens/memory-storage.polywrap.eth",
+          "wrap://plugin/memory-storage",
           memoryStoragePlugin()
         )
         .build();

packages/client/src/__tests__/core/uri-resolution.spec.ts

@@ -29,15 +29,15 @@ const expectResolutionResult = async (
 
 describe("URI resolution", () => {
   it("sanity", async () => {
-    const uri = new Uri("ens/wraps.eth:uri-resolver-ext@1.1.0");
+    const uri = new Uri("wrapscan.io/polywrap/uri-resolver@1.0.0");
 
     const client = new PolywrapClient();
 
     const resolutionContext = new UriResolutionContext();
     const result = await client.tryResolveUri({ uri, resolutionContext });
 
     const expectResult = UriResolutionResult.ok(
-      Uri.from("wrap://ipfs/QmSAXrSLcmGUkQRrApAtG5qTPmuRMMX2Zf1wihpguDQfbm")
+      Uri.from("wrap://ipfs/QmeHyySwhkYvKqaPNtcq7wYDb1M9QnaqbaX1eDNDqW5fdt")
     );
 
     if (expectResult.ok) {
@@ -51,8 +51,8 @@ describe("URI resolution", () => {
   });
 
   it("can resolve uri with custom resolver", async () => {
-    const fromUri = new Uri(`test/from.eth`);
-    const redirectUri = new Uri(`test/to.eth`);
+    const fromUri = new Uri(`test/from`);
+    const redirectUri = new Uri(`test/to`);
 
     const config = new PolywrapClientConfigBuilder()
       .addDefaults()

packages/client/src/__tests__/core/wasm-wrapper.spec.ts

@@ -84,8 +84,8 @@ describe("wasm-wrapper", () => {
   it("should invoke wrapper with custom redirects", async () => {
     const config = new PolywrapClientConfigBuilder()
       .addDefaults()
-      .setRedirect(wrapperUri.uri, "wrap://ens/mock.polywrap.eth")
-      .setPackage("wrap://ens/mock.polywrap.eth", mockPlugin())
+      .setRedirect(wrapperUri.uri, "wrap://authority/mock.polywrap")
+      .setPackage("wrap://authority/mock.polywrap", mockPlugin())
       .build();
     const client = new PolywrapClient(config);
 
@@ -104,7 +104,7 @@ describe("wasm-wrapper", () => {
   it("should allow clone + reconfigure of redirects", async () => {
     let builder = new PolywrapClientConfigBuilder()
       .add({
-        packages: { "wrap://ens/mock.polywrap.eth": mockPlugin() },
+        packages: { "wrap://authority/mock.polywrap": mockPlugin() },
       })
       .addDefaults();
 
@@ -122,7 +122,7 @@ describe("wasm-wrapper", () => {
     expect(clientResult).toEqual(ResultOk(2));
 
     const redirects = {
-      [wrapperUri.uri]: "wrap://ens/mock.polywrap.eth",
+      [wrapperUri.uri]: "wrap://authority/mock.polywrap",
     };
 
     builder = builder.add({ redirects });
@@ -164,12 +164,12 @@ describe("wasm-wrapper", () => {
 
     const pluginClient = new PolywrapClient({
       resolver: UriResolver.from([
-        mockPluginRegistration("ens/mock-plugin.eth"),
+        mockPluginRegistration("authority/mock-plugin"),
       ]),
     });
 
     let pluginGetFileResult = await pluginClient.getFile(
-      "ens/mock-plugin.eth",
+      "authority/mock-plugin",
       {
         path: "./index.js",
       }