Merge pull request #475 from polywrap/prealpha-dev

Prep 0.0.1-prealpha.43
polywrap · Sep 17, 2021 · 443b217 · 443b217
2 parents 8d0721b + 4e37d30
commit 443b217
Show file tree

Hide file tree

Showing 30 changed files with 483 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Web3API 0.0.1-prealpha.43
+## Features
+* `@web3api/client-js`: Added the `client.subscribe(...)` method, enabling users to easily send queries at a specified frequency.
+
+## Bugs
+* `@web3api/tracing-js`: Replaced the `util-inspect` dependency with a browser compatible one.
+
 # Web3API 0.0.1-prealpha.42
 ## Bugs
 * `@web3api/schema-parse`: Removed unnecessary sanitization for imported methods without any arguments.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.1-prealpha.42
+0.0.1-prealpha.43
diff --git a/packages/apis/uniswapv2/src/__tests__/e2e/fetch_e2e.spec.ts b/packages/apis/uniswapv2/src/__tests__/e2e/fetch_e2e.spec.ts
@@ -1,8 +1,8 @@
 import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js";
-import { UriRedirect, Web3ApiClient } from "@web3api/client-js";
+import { ClientConfig, Web3ApiClient } from "@web3api/client-js";
 import { ChainId, Pair, Token, TokenAmount } from "./types";
 import path from "path";
-import { getRedirects, getTokenList } from "../testUtils";
+import { getPlugins, getTokenList } from "../testUtils";
 import * as uni from "@uniswap/sdk";
 import * as ethers from "ethers";
 
@@ -20,8 +20,8 @@ describe("Fetch", () => {
   beforeAll(async () => {
     const { ethereum: testEnvEtherem, ensAddress, ipfs } = await initTestEnvironment();
     // get client
-    const redirects: UriRedirect[] = getRedirects(testEnvEtherem, ipfs, ensAddress);
-    client = new Web3ApiClient({ redirects });
+    const config: ClientConfig = getPlugins(testEnvEtherem, ipfs, ensAddress);
+    client = new Web3ApiClient(config);
     // deploy api
     const apiPath: string = path.resolve(__dirname + "/../../../");
     const api = await buildAndDeployApi(apiPath, ipfs, ensAddress);

diff --git a/packages/apis/uniswapv2/src/__tests__/e2e/pair_e2e.spec.ts b/packages/apis/uniswapv2/src/__tests__/e2e/pair_e2e.spec.ts
@@ -1,8 +1,8 @@
-import { UriRedirect, Web3ApiClient } from "@web3api/client-js";
+import { ClientConfig, Web3ApiClient } from "@web3api/client-js";
 import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js";
 import * as path from "path";
 import { Pair, Token, TokenAmount } from "./types";
-import { getPairData, getRedirects, getTokenList, getUniPairs } from "../testUtils";
+import { getPairData, getPlugins, getTokenList, getUniPairs } from "../testUtils";
 import * as uni from "@uniswap/sdk";
 
 jest.setTimeout(150000);
@@ -17,8 +17,8 @@ describe('Pair', () => {
   beforeAll(async () => {
     const { ethereum: testEnvEtherem, ensAddress, ipfs } = await initTestEnvironment();
     // get client
-    const redirects: UriRedirect[] = getRedirects(testEnvEtherem, ipfs, ensAddress);
-    client = new Web3ApiClient({ redirects });
+    const config: ClientConfig = getPlugins(testEnvEtherem, ipfs, ensAddress);
+    client = new Web3ApiClient(config);
     // deploy api
     const apiPath: string = path.resolve(__dirname + "/../../../");
     const api = await buildAndDeployApi(apiPath, ipfs, ensAddress);

diff --git a/packages/apis/uniswapv2/src/__tests__/e2e/route_e2e.spec.ts b/packages/apis/uniswapv2/src/__tests__/e2e/route_e2e.spec.ts
@@ -1,8 +1,8 @@
-import { UriRedirect, Web3ApiClient } from "@web3api/client-js";
+import { ClientConfig, Web3ApiClient } from "@web3api/client-js";
 import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js";
 import * as path from "path";
 import { Pair, Route, Token } from "./types";
-import { getPairData, getRedirects, getTokenList, getUniPairs } from "../testUtils";
+import { getPairData, getPlugins, getTokenList, getUniPairs } from "../testUtils";
 import * as uni from "@uniswap/sdk";
 
 jest.setTimeout(360000);
@@ -19,8 +19,8 @@ describe('Route', () => {
   beforeAll(async () => {
     const { ethereum: testEnvEtherem, ensAddress, ipfs } = await initTestEnvironment();
     // get client
-    const redirects: UriRedirect[] = getRedirects(testEnvEtherem, ipfs, ensAddress);
-    client = new Web3ApiClient({ redirects });
+    const config: ClientConfig = getPlugins(testEnvEtherem, ipfs, ensAddress);
+    client = new Web3ApiClient(config);
     // deploy api
     const apiPath: string = path.resolve(__dirname + "/../../../");
     const api = await buildAndDeployApi(apiPath, ipfs, ensAddress);

diff --git a/packages/apis/uniswapv2/src/__tests__/e2e/router_e2e.spec.ts b/packages/apis/uniswapv2/src/__tests__/e2e/router_e2e.spec.ts
@@ -1,5 +1,5 @@
 import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js";
-import { UriRedirect, Web3ApiClient } from "@web3api/client-js";
+import { ClientConfig, Web3ApiClient } from "@web3api/client-js";
 import {
   ChainId,
   Pair,
@@ -16,7 +16,7 @@ import {
   getBestTradeExactIn,
   getBestTradeExactOut,
   getPairData,
-  getRedirects,
+  getPlugins,
   getTokenList,
   getUniPairs
 } from "../testUtils";
@@ -40,8 +40,8 @@ describe("Router", () => {
   beforeAll(async () => {
     const { ethereum: testEnvEtherem, ensAddress, ipfs } = await initTestEnvironment();
     // get client
-    const redirects: UriRedirect[] = getRedirects(testEnvEtherem, ipfs, ensAddress);
-    client = new Web3ApiClient({ redirects: redirects, tracingEnabled: true });
+    const config: ClientConfig = getPlugins(testEnvEtherem, ipfs, ensAddress);
+    client = new Web3ApiClient(config);
 
     // deploy api
     const apiPath: string = path.resolve(__dirname + "../../../../");

diff --git a/packages/apis/uniswapv2/src/__tests__/e2e/swap_e2e.spec.ts b/packages/apis/uniswapv2/src/__tests__/e2e/swap_e2e.spec.ts
@@ -1,12 +1,12 @@
 import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js";
-import { UriRedirect, Web3ApiClient } from "@web3api/client-js";
+import { ClientConfig, Web3ApiClient } from "@web3api/client-js";
 import { Currency, Pair, Token, Trade, TxResponse } from "./types";
 import path from "path";
-import { getRedirects, getTokenList } from "../testUtils";
+import { getPlugins, getTokenList } from "../testUtils";
 import { Contract, ethers, providers } from "ethers";
 import erc20ABI from "./testData/erc20ABI.json";
 
-jest.setTimeout(120000);
+jest.setTimeout(360000);
 
 describe("Swap", () => {
 
@@ -23,8 +23,8 @@ describe("Swap", () => {
   beforeAll(async () => {
     const { ethereum: testEnvEtherem, ensAddress, ipfs } = await initTestEnvironment();
     // get client
-    const redirects: UriRedirect[] = getRedirects(testEnvEtherem, ipfs, ensAddress);
-    client = new Web3ApiClient({ redirects: redirects, tracingEnabled: true });
+    const config: ClientConfig = getPlugins(testEnvEtherem, ipfs, ensAddress);
+    client = new Web3ApiClient(config);
 
     // deploy api
     const apiPath: string = path.resolve(__dirname + "../../../../");

diff --git a/packages/apis/uniswapv2/src/__tests__/e2e/trade_e2e.spec.ts b/packages/apis/uniswapv2/src/__tests__/e2e/trade_e2e.spec.ts
@@ -1,8 +1,8 @@
-import { UriRedirect, Web3ApiClient } from "@web3api/client-js";
+import { ClientConfig, Web3ApiClient } from "@web3api/client-js";
 import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js";
 import * as path from "path";
 import { ChainId, Pair, Route, Token, TokenAmount, Trade } from "./types";
-import { getPairData, getRedirects, getTokenList, getUniPairs } from "../testUtils";
+import { getPairData, getPlugins, getTokenList, getUniPairs } from "../testUtils";
 import * as uni from "@uniswap/sdk";
 
 jest.setTimeout(120000);
@@ -19,8 +19,8 @@ describe('trade e2e', () => {
   beforeAll(async () => {
     const { ethereum: testEnvEtherem, ensAddress, ipfs } = await initTestEnvironment();
     // get client
-    const redirects: UriRedirect[] = getRedirects(testEnvEtherem, ipfs, ensAddress);
-    client = new Web3ApiClient({ redirects });
+    const config: ClientConfig = getPlugins(testEnvEtherem, ipfs, ensAddress);
+    client = new Web3ApiClient(config);
     // deploy api
     const apiPath: string = path.resolve(__dirname + "/../../../");
     const api = await buildAndDeployApi(apiPath, ipfs, ensAddress);

diff --git a/packages/apis/uniswapv2/src/__tests__/query/router.spec.ts b/packages/apis/uniswapv2/src/__tests__/query/router.spec.ts
@@ -82,7 +82,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromValue<u32>(50),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromNull<u32>(),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -96,7 +96,7 @@ describe("swapCallParameters", () => {
         "0x0000000000000000000000000000000000000004"
       ]);
       expect(result.value).toStrictEqual("0x64");
-      const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+      const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
       expect(deadlineDifference < 5).toBe(true);
     });
 
@@ -126,7 +126,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromNull<u32>(),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromValue<u32>(50),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -164,7 +164,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromValue<u32>(50),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromNull<u32>(),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -179,7 +179,7 @@ describe("swapCallParameters", () => {
         "0x0000000000000000000000000000000000000004"
       ]);
       expect(result.value).toStrictEqual("0x0");
-      const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+      const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
       expect(deadlineDifference < 5).toBe(true);
     });
 
@@ -201,7 +201,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromValue<u32>(50),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromNull<u32>(),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -216,7 +216,7 @@ describe("swapCallParameters", () => {
         "0x0000000000000000000000000000000000000004"
       ]);
       expect(result.value).toStrictEqual("0x0");
-      const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+      const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
       expect(deadlineDifference < 5).toBe(true);
     });
   });
@@ -244,7 +244,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromValue<u32>(50),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromNull<u32>(),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -258,7 +258,7 @@ describe("swapCallParameters", () => {
         "0x0000000000000000000000000000000000000004"
       ]);
       expect(result.value).toStrictEqual("0x80");
-      const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+      const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
       expect(deadlineDifference < 5).toBe(true);
     });
 
@@ -288,7 +288,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromValue<u32>(50),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromNull<u32>(),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -303,7 +303,7 @@ describe("swapCallParameters", () => {
         "0x0000000000000000000000000000000000000004"
       ]);
       expect(result.value).toStrictEqual("0x0");
-      const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+      const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
       expect(deadlineDifference < 5).toBe(true);
     });
 
@@ -325,7 +325,7 @@ describe("swapCallParameters", () => {
         tradeOptions: {
           ttl: Nullable.fromValue<u32>(50),
           recipient: "0x0000000000000000000000000000000000000004",
-          unixTimestamp: Date.now() / 1000,
+          unixTimestamp: <u32>Date.now() / 1000,
           allowedSlippage: "0.01",
           deadline: Nullable.fromNull<u32>(),
           feeOnTransfer: Nullable.fromNull<boolean>()
@@ -340,7 +340,7 @@ describe("swapCallParameters", () => {
         "0x0000000000000000000000000000000000000004"
       ]);
       expect(result.value).toStrictEqual("0x0");
-      const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+      const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
       expect(deadlineDifference < 5).toBe(true);
     });
   });
@@ -373,7 +373,7 @@ describe("swapCallParameters", () => {
           tradeOptions: {
             ttl: Nullable.fromValue<u32>(50),
             recipient: "0x0000000000000000000000000000000000000004",
-            unixTimestamp: Date.now() / 1000,
+            unixTimestamp: <u32>Date.now() / 1000,
             allowedSlippage: "0.01",
             deadline: Nullable.fromNull<u32>(),
             feeOnTransfer: Nullable.fromValue<boolean>(true)
@@ -387,7 +387,7 @@ describe("swapCallParameters", () => {
           "0x0000000000000000000000000000000000000004"
         ]);
         expect(result.value).toStrictEqual("0x64");
-        const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+        const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
         expect(deadlineDifference < 5).toBe(true);
       });
 
@@ -413,7 +413,7 @@ describe("swapCallParameters", () => {
           tradeOptions: {
             ttl: Nullable.fromValue<u32>(50),
             recipient: "0x0000000000000000000000000000000000000004",
-            unixTimestamp: Date.now() / 1000,
+            unixTimestamp: <u32>Date.now() / 1000,
             allowedSlippage: "0.01",
             deadline: Nullable.fromNull<u32>(),
             feeOnTransfer: Nullable.fromValue<boolean>(true)
@@ -428,7 +428,7 @@ describe("swapCallParameters", () => {
           "0x0000000000000000000000000000000000000004"
         ]);
         expect(result.value).toStrictEqual("0x0");
-        const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+        const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
         expect(deadlineDifference < 5).toBe(true);
       });
 
@@ -450,7 +450,7 @@ describe("swapCallParameters", () => {
           tradeOptions: {
             ttl: Nullable.fromValue<u32>(50),
             recipient: "0x0000000000000000000000000000000000000004",
-            unixTimestamp: Date.now() / 1000,
+            unixTimestamp: <u32>Date.now() / 1000,
             allowedSlippage: "0.01",
             deadline: Nullable.fromNull<u32>(),
             feeOnTransfer: Nullable.fromValue<boolean>(true)
@@ -465,7 +465,7 @@ describe("swapCallParameters", () => {
           "0x0000000000000000000000000000000000000004"
         ]);
         expect(result.value).toStrictEqual("0x0");
-        const deadlineDifference = (Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
+        const deadlineDifference = (<u32>Date.now() / 1000) as number - parseInt(result.args[result.args.length - 1]) as number;
         expect(deadlineDifference < 5).toBe(true);
       });
     });
@@ -494,7 +494,7 @@ describe("swapCallParameters", () => {
             tradeOptions: {
               ttl: Nullable.fromValue<u32>(50),
               recipient: "0x0000000000000000000000000000000000000004",
-              unixTimestamp: Date.now() / 1000,
+              unixTimestamp: <u32>Date.now() / 1000,
               allowedSlippage: "0.01",
               deadline: Nullable.fromNull<u32>(),
               feeOnTransfer: Nullable.fromValue<boolean>(true)
@@ -530,7 +530,7 @@ describe("swapCallParameters", () => {
             tradeOptions: {
               ttl: Nullable.fromValue<u32>(50),
               recipient: "0x0000000000000000000000000000000000000004",
-              unixTimestamp: Date.now() / 1000,
+              unixTimestamp: <u32>Date.now() / 1000,
               allowedSlippage: "0.01",
               deadline: Nullable.fromNull<u32>(),
               feeOnTransfer: Nullable.fromValue<boolean>(true)
@@ -558,7 +558,7 @@ describe("swapCallParameters", () => {
             tradeOptions: {
               ttl: Nullable.fromValue<u32>(50),
               recipient: "0x0000000000000000000000000000000000000004",
-              unixTimestamp: Date.now() / 1000,
+              unixTimestamp: <u32>Date.now() / 1000,
               allowedSlippage: "0.01",
               deadline: Nullable.fromNull<u32>(),
               feeOnTransfer: Nullable.fromValue<boolean>(true)