From 4dd0fc4b1f2f8214e4a2c8d70188e352baf49b93 Mon Sep 17 00:00:00 2001 From: nerfZael Date: Fri, 29 Sep 2023 15:45:48 +0200 Subject: [PATCH 1/3] using default ipfs providers from the default config --- packages/cli/src/lib/test-env/client-config.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/lib/test-env/client-config.ts b/packages/cli/src/lib/test-env/client-config.ts index 7b5f67312d..66e4183430 100644 --- a/packages/cli/src/lib/test-env/client-config.ts +++ b/packages/cli/src/lib/test-env/client-config.ts @@ -29,12 +29,19 @@ export function getTestEnvClientConfig(): Partial { const ensAddress = ETH_ENS_IPFS_MODULE_CONSTANTS.ensAddresses.ensAddress; const testnetEnsResolverUri = "proxy/testnet-ens-contenthash-uri-resolver"; - const builder = new PolywrapClientConfigBuilder() - .addDefaults() + const builder = new PolywrapClientConfigBuilder().addDefaults(); + + const ipfsResolverEnv = builder.config.envs[Sys.bundle.ipfsResolver.uri]; + + builder .addEnvs({ [Sys.bundle.ipfsResolver.uri]: { provider: ipfsProvider, - retries: { tryResolveUri: 1, getFile: 1 }, + fallbackProviders: [ + ipfsResolverEnv.provider, + ipfsResolverEnv.fallbackProviders, + ], + retries: { tryResolveUri: 2, getFile: 2 }, }, [testnetEnsResolverUri]: { registryAddress: ensAddress, From c111edf97b42b9c5ac2736230f4ea55f6d48f2a7 Mon Sep 17 00:00:00 2001 From: nerfZael Date: Fri, 29 Sep 2023 19:03:31 +0200 Subject: [PATCH 2/3] formatting the ipfs resolver uri --- packages/cli/src/lib/test-env/client-config.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/lib/test-env/client-config.ts b/packages/cli/src/lib/test-env/client-config.ts index 66e4183430..999bca5a55 100644 --- a/packages/cli/src/lib/test-env/client-config.ts +++ b/packages/cli/src/lib/test-env/client-config.ts @@ -13,7 +13,7 @@ import { Connections, Connection, } from "@polywrap/ethereum-wallet-js"; -import { IWrapPackage } from "@polywrap/core-js"; +import { IWrapPackage, Uri } from "@polywrap/core-js"; export function getTestEnvClientConfig(): Partial { // TODO: move this into its own package, since it's being used everywhere? @@ -31,7 +31,8 @@ export function getTestEnvClientConfig(): Partial { const builder = new PolywrapClientConfigBuilder().addDefaults(); - const ipfsResolverEnv = builder.config.envs[Sys.bundle.ipfsResolver.uri]; + const ipfsResolverEnv = + builder.config.envs[Uri.from(Sys.bundle.ipfsResolver.uri).toString()]; builder .addEnvs({ From fc2667aacf30d6516167ec0e56d64f61754816f9 Mon Sep 17 00:00:00 2001 From: nerfZael Date: Sat, 30 Sep 2023 02:55:00 +0200 Subject: [PATCH 3/3] fixed not adding array properly --- packages/cli/src/lib/test-env/client-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/lib/test-env/client-config.ts b/packages/cli/src/lib/test-env/client-config.ts index 999bca5a55..7128b2f9ae 100644 --- a/packages/cli/src/lib/test-env/client-config.ts +++ b/packages/cli/src/lib/test-env/client-config.ts @@ -40,7 +40,7 @@ export function getTestEnvClientConfig(): Partial { provider: ipfsProvider, fallbackProviders: [ ipfsResolverEnv.provider, - ipfsResolverEnv.fallbackProviders, + ...(ipfsResolverEnv.fallbackProviders as string[]), ], retries: { tryResolveUri: 2, getFile: 2 }, },