Merge remote-tracking branch 'origin/origin-dev' into move-fs-plugin-interface

# Conflicts:
#	packages/js/client-config-builder/README.md
#	packages/js/client-config-builder/src/bundles/getDefaultConfig.ts
#	packages/js/plugins/http/src/__tests__/helpers/getClient.ts

Author: krisbitney

packages/interfaces/http/README.md

@@ -530,10 +530,10 @@ export const defaultPackages = {
   ipfs: "wrap://ens/ipfs.polywrap.eth",
   ensResolver: "wrap://ens/ens-resolver.polywrap.eth",
   ethereum: "wrap://ens/ethereum.polywrap.eth",
-  http: "wrap://ens/http.polywrap.eth",
+  http: "wrap://plugin/http",
   httpResolver: "wrap://ens/http-resolver.polywrap.eth",
   logger: "wrap://plugin/logger",
-  fileSystem: "wrap://plugin/fs",
+  fileSystem: "wrap://ens/fs.polywrap.eth",
   fileSystemResolver: "wrap://ens/fs-resolver.polywrap.eth",
   ipfsResolver: "wrap://ens/ipfs-resolver.polywrap.eth",
   concurrent: "wrap://plugin/concurrent",
@@ -543,7 +543,7 @@ export const defaultInterfaces = {
   uriResolver: "wrap://ens/uri-resolver.core.polywrap.eth",
   concurrent: "wrap://ens/goerli/interface.concurrent.wrappers.eth",
   logger: "wrap://ens/wrappers.polywrap.eth:logger@1.0.0",
-  fileSystem: "wrap://ens/wrappers.polywrap.eth:file-system@1.0.0",
+  http: "wrap://ens/wrappers.polywrap.eth:http@1.1.0",
 };
 
 export const getDefaultConfig = (): ClientConfig<Uri> => {
@@ -581,12 +581,12 @@ export const getDefaultConfig = (): ClientConfig<Uri> => {
         to: new Uri(defaultPackages.logger),
       },
       {
-        from: new Uri("wrap://ens/fs.polywrap.eth"),
-        to: new Uri(defaultInterfaces.fileSystem),
+        from: new Uri("wrap://ens/http.polywrap.eth"),
+        to: new Uri(defaultInterfaces.http),
       },
       {
-        from: new Uri(defaultInterfaces.fileSystem),
-        to: new Uri(defaultPackages.fileSystem),
+        from: new Uri(defaultInterfaces.http),
+        to: new Uri(defaultPackages.http),
       },
     ],
     interfaces: [

packages/interfaces/http/deployment.json

@@ -35,7 +35,7 @@ export const defaultPackages = {
   ipfs: "wrap://ens/ipfs.polywrap.eth",
   ensResolver: "wrap://ens/ens-resolver.polywrap.eth",
   ethereum: "wrap://ens/ethereum.polywrap.eth",
-  http: "wrap://ens/http.polywrap.eth",
+  http: "wrap://plugin/http",
   httpResolver: "wrap://ens/http-resolver.polywrap.eth",
   logger: "wrap://plugin/logger",
   fileSystem: "wrap://plugin/fs",
@@ -48,6 +48,7 @@ export const defaultInterfaces = {
   uriResolver: "wrap://ens/uri-resolver.core.polywrap.eth",
   concurrent: "wrap://ens/goerli/interface.concurrent.wrappers.eth",
   logger: "wrap://ens/wrappers.polywrap.eth:logger@1.0.0",
+  http: "wrap://ens/wrappers.polywrap.eth:http@1.1.0",
   fileSystem: "wrap://ens/wrappers.polywrap.eth:file-system@1.0.0",
 };
 
@@ -85,6 +86,14 @@ export const getDefaultConfig = (): ClientConfig<Uri> => {
         from: new Uri(defaultInterfaces.logger),
         to: new Uri(defaultPackages.logger),
       },
+      {
+        from: new Uri("wrap://ens/http.polywrap.eth"),
+        to: new Uri(defaultInterfaces.http),
+      },
+      {
+        from: new Uri(defaultInterfaces.http),
+        to: new Uri(defaultPackages.http),
+      },
       {
         from: new Uri("wrap://ens/fs.polywrap.eth"),
         to: new Uri(defaultInterfaces.fileSystem),