Update testnet branch

README.md

@@ -67,3 +67,17 @@ yarn build:frontier && yarn start:frontier
 ```
 
 Otherwise the non-frontier commands can be used with the env var set to true.
+
+### Testnet
+
+Dev:
+
+```bash
+yarn build:testnet && yarn dev:testnet
+```
+
+Deploy:
+
+```bash
+yarn build:testnet && yarn start:testnet
+```

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.3",
+  "version": "2.0.0",
   "useWorkspaces": true,
   "npmClient": "yarn",
   "packages": [

package.json

@@ -12,11 +12,14 @@
     "bootstrap": "lerna bootstrap",
     "dev": "lerna run dev --parallel",
     "dev:frontier": "cross-env NEXT_PUBLIC_IS_FRONTIER=true lerna run dev --parallel",
+    "dev:testnet": "cross-env NEXT_PUBLIC_IS_TESTNET=true lerna run dev --parallel",
     "start": "lerna run start --stream",
     "start:frontier": "cross-env NEXT_PUBLIC_IS_FRONTIER=true lerna run start --stream",
+    "start:testnet": "cross-env NEXT_PUBLIC_IS_TESTNET=true lerna run start --stream",
     "clean": "lerna run clean; rm -rf node_modules",
     "build": "lerna run build",
     "build:frontier": "cross-env NEXT_PUBLIC_IS_FRONTIER=true lerna run build",
+    "build:testnet": "cross-env NEXT_PUBLIC_IS_TESTNET=true lerna run build",
     "build:libs": "lerna run build --ignore @osmosis-labs/web",
     "analyze": "lerna run analyze",
     "test": "lerna run test --parallel",
@@ -52,5 +55,6 @@
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.2",
     "typescript": "4.5.4"
-  }
+  },
+  "dependencies": {}
 }

packages/math/jest.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",
-  testMatch: ["**/src/**/?(*.)+(spec|test).[jt]s?(x)"],
+  roots: ["<rootDir>/src/"],
+  testMatch: ["**/__tests__/?(*.)+(spec|test).[jt]s?(x)"],
 };

packages/math/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osmosis-labs/math",
-  "version": "0.0.3",
+  "version": "2.0.0",
   "main": "build/index.js",
   "typings": "types/index.d.ts",
   "author": "osmosis-labs",
@@ -38,7 +38,7 @@
     ]
   },
   "dependencies": {
-    "@keplr-wallet/types": "^0.10.4",
-    "@keplr-wallet/unit": "^0.10.4"
+    "@keplr-wallet/types": "^0.10.24",
+    "@keplr-wallet/unit": "^0.10.24"
   }
 }

packages/math/src/index.ts

@@ -1,2 +1,2 @@
-export * from "./weighted";
+export * from "./pool";
 export * from "./utils";

packages/math/src/weighted.spec.ts → packages/math/src/pool/__tests__/weighted.spec.ts

@@ -1,12 +1,13 @@
 import assert from "assert";
-import { WeightedPoolMath } from "./weighted";
+import * as WeightedPoolMath from "../weighted";
+import { pow } from "../../utils";
 import { Dec } from "@keplr-wallet/unit";
 
 const powPrecision = new Dec("0.00000001");
 
 describe("Test osmosis math", () => {
   test("Test pow", () => {
-    const s = WeightedPoolMath.pow(new Dec("1.68"), new Dec("0.32"));
+    const s = pow(new Dec("1.68"), new Dec("0.32"));
     const expected = new Dec("1.18058965");
     assert.strictEqual(
       expected.sub(s).abs().lte(powPrecision),