Merge pull request #149 from Anchor-Protocol/feature/beth

Feature: bETH

.github/workflows/test.yml

@@ -58,16 +58,14 @@ jobs:
         run: yarn run lint
 
       - name: Test build packages
-        run: yarn run packages:build
+        run: yarn run app:pack
 
       - name: Test
         run: |
-          yarn run packages:coverage
-          yarn run base:coverage
           yarn run app:coverage
           yarn run landing:coverage
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
-          files: ./packages/coverage/coverage-final.json,./base/coverage/coverage-final.json,./app/coverage/coverage-final.json,./landing/coverage/coverage-final.json
+          files: ./app/coverage/coverage-final.json,./landing/coverage/coverage-final.json

README.md

@@ -14,15 +14,14 @@ And you can run scripts
 - `yarn run app:build` Build `/app` directory (`/app/build` directory will created)
 - `yarn run app:test`
 - `yarn run app:coverage`
+- `yarn run app:pack` Build `/app/src/@anchor-protocol` packages (`/app/out` directory will created)
+- `yarn run app:publish` Publish `/packages/out` directory to the NPM registry
+- `yarn run app:storybook` Development run Storybook
+- `yarn run app:build-storybook`
 - `yarn run landing:start` Development run `/landing` directory (web browser will open)
-- `yarn run landing:build` Build `/landing` directory (`/app/landing` directory will created)
+- `yarn run landing:build` Build `/landing` directory (`/landing/build` directory will created)
 - `yarn run landing:test`
 - `yarn run landing:coverage`
-- `yarn run packages:build` Build `/packages/src/@anchor-protocol` packages (`/packages/out` directory will created)
-- `yarn run packages:publish` Publish `/packages/out` directory to the NPM registry
-- `yarn run packages:storybook` Development run Storybook
-- `yarn run packages:build-storybook`
-- `yarn run packages:test`
 
 # Environments
 
@@ -51,56 +50,32 @@ IDE
 - JetBrains <https://plugins.jetbrains.com/plugin/8097-js-graphql>
 - VSCode <https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql>
 
-# Domains
-
-## `/app`
-
-| master                           |
-| -------------------------------- |
-| <https://app.anchorprotocol.com> |
-| <https://app.anchor.money>       |
-| <https://app.anchor.market>      |
-
-## `/landing`
-
-| master                       |
-| ---------------------------- |
-| <https://anchorprotocol.com> |
-| <https://anchor.money>       |
-| <https://anchor.market>      |
-
-## `/packages`
-
-| develop                                     |
-| ------------------------------------------- |
-| <https://anchor-storybook.vercel.app/>      |
-| <https://www.npmjs.com/org/anchor-protocol> |
-| <https://www.npmjs.com/org/terra-dev>       |
-
-<!-- index packages/src/**/README.md -->
-
-- [packages/src/@anchor-protocol/icons/README.md](packages/src/@anchor-protocol/icons/README.md)
-- [packages/src/@anchor-protocol/notation/README.md](packages/src/@anchor-protocol/notation/README.md)
-- [packages/src/@anchor-protocol/token-icons/README.md](packages/src/@anchor-protocol/token-icons/README.md)
-- [packages/src/@terra-dev/audit-fastdom/README.md](packages/src/@terra-dev/audit-fastdom/README.md)
-- [packages/src/@terra-dev/big-interpolate/README.md](packages/src/@terra-dev/big-interpolate/README.md)
-- [packages/src/@terra-dev/big-math/README.md](packages/src/@terra-dev/big-math/README.md)
-- [packages/src/@terra-dev/is-touch-device/README.md](packages/src/@terra-dev/is-touch-device/README.md)
-- [packages/src/@terra-dev/is-zero/README.md](packages/src/@terra-dev/is-zero/README.md)
-- [packages/src/@terra-dev/neumorphism-ui/README.md](packages/src/@terra-dev/neumorphism-ui/README.md)
-- [packages/src/@terra-dev/sendinblue/README.md](packages/src/@terra-dev/sendinblue/README.md)
-- [packages/src/@terra-dev/snackbar/README.md](packages/src/@terra-dev/snackbar/README.md)
-- [packages/src/@terra-dev/styled-neumorphism/README.md](packages/src/@terra-dev/styled-neumorphism/README.md)
-- [packages/src/@terra-dev/use-dialog/README.md](packages/src/@terra-dev/use-dialog/README.md)
-- [packages/src/@terra-dev/use-element-intersection/README.md](packages/src/@terra-dev/use-element-intersection/README.md)
-- [packages/src/@terra-dev/use-google-analytics/README.md](packages/src/@terra-dev/use-google-analytics/README.md)
-- [packages/src/@terra-dev/use-interval/README.md](packages/src/@terra-dev/use-interval/README.md)
-- [packages/src/@terra-dev/use-local-storage/README.md](packages/src/@terra-dev/use-local-storage/README.md)
-- [packages/src/@terra-dev/use-resolve-last/README.md](packages/src/@terra-dev/use-resolve-last/README.md)
-- [packages/src/@terra-dev/use-restricted-input/README.md](packages/src/@terra-dev/use-restricted-input/README.md)
-- [packages/src/@terra-dev/use-router-scroll-restoration/README.md](packages/src/@terra-dev/use-router-scroll-restoration/README.md)
-- [packages/src/@terra-dev/use-string-bytes-length/README.md](packages/src/@terra-dev/use-string-bytes-length/README.md)
-- [packages/src/@terra-dev/use-time-end/README.md](packages/src/@terra-dev/use-time-end/README.md)
+# Sub packages
+
+<!-- index app/src/**/README.md -->
+
+- [app/src/@anchor-protocol/icons/README.md](app/src/@anchor-protocol/icons/README.md)
+- [app/src/@anchor-protocol/notation/README.md](app/src/@anchor-protocol/notation/README.md)
+- [app/src/@anchor-protocol/token-icons/README.md](app/src/@anchor-protocol/token-icons/README.md)
+- [app/src/@terra-dev/audit-fastdom/README.md](app/src/@terra-dev/audit-fastdom/README.md)
+- [app/src/@terra-dev/big-interpolate/README.md](app/src/@terra-dev/big-interpolate/README.md)
+- [app/src/@terra-dev/big-math/README.md](app/src/@terra-dev/big-math/README.md)
+- [app/src/@terra-dev/is-touch-device/README.md](app/src/@terra-dev/is-touch-device/README.md)
+- [app/src/@terra-dev/is-zero/README.md](app/src/@terra-dev/is-zero/README.md)
+- [app/src/@terra-dev/neumorphism-ui/README.md](app/src/@terra-dev/neumorphism-ui/README.md)
+- [app/src/@terra-dev/sendinblue/README.md](app/src/@terra-dev/sendinblue/README.md)
+- [app/src/@terra-dev/snackbar/README.md](app/src/@terra-dev/snackbar/README.md)
+- [app/src/@terra-dev/styled-neumorphism/README.md](app/src/@terra-dev/styled-neumorphism/README.md)
+- [app/src/@terra-dev/use-dialog/README.md](app/src/@terra-dev/use-dialog/README.md)
+- [app/src/@terra-dev/use-element-intersection/README.md](app/src/@terra-dev/use-element-intersection/README.md)
+- [app/src/@terra-dev/use-google-analytics/README.md](app/src/@terra-dev/use-google-analytics/README.md)
+- [app/src/@terra-dev/use-interval/README.md](app/src/@terra-dev/use-interval/README.md)
+- [app/src/@terra-dev/use-local-storage/README.md](app/src/@terra-dev/use-local-storage/README.md)
+- [app/src/@terra-dev/use-resolve-last/README.md](app/src/@terra-dev/use-resolve-last/README.md)
+- [app/src/@terra-dev/use-restricted-input/README.md](app/src/@terra-dev/use-restricted-input/README.md)
+- [app/src/@terra-dev/use-router-scroll-restoration/README.md](app/src/@terra-dev/use-router-scroll-restoration/README.md)
+- [app/src/@terra-dev/use-string-bytes-length/README.md](app/src/@terra-dev/use-string-bytes-length/README.md)
+- [app/src/@terra-dev/use-time-end/README.md](app/src/@terra-dev/use-time-end/README.md)
 
 <!-- /index -->
 

packages/.packages.json → app/.packages.json

@@ -1,15 +1,15 @@
 {
   "$schema": "https://rocket-hangar.github.io/rocket-punch/schemas/packages.json",
   "@terra-dev/*": {
-    "version": "0.18.0",
+    "version": "0.20.1",
     "tag": "latest"
   },
   "@terra-money/*": {
-    "version": "0.18.0",
+    "version": "0.20.1",
     "tag": "latest"
   },
   "@anchor-protocol/*": {
-    "version": "0.18.0",
+    "version": "0.20.1",
     "tag": "latest"
   }
 }

app/config-overrides.js

@@ -23,8 +23,6 @@ module.exports = {
     });
 
     aliasDangerous({
-      ...getWebpackAlias(path.resolve(__dirname, '../packages')),
-      ...getWebpackAlias(path.resolve(__dirname, '../base')),
       ...getWebpackAlias(__dirname),
       env: path.join(__dirname, 'src/env.ts'),
     })(config);
@@ -41,8 +39,6 @@ module.exports = {
 
     config.modulePaths.push(
       '<rootDir>/src/',
-      '<rootDir>/../base/src/',
-      '<rootDir>/../packages/src/',
     );
 
     return config;

app/package.json

@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "license": "Apache-2.0",
   "private": true,
-  "// how to enable local https": "@see https://iamssen.medium.com/localhost%EC%97%90-ssl-%EC%A0%81%EC%9A%A9%ED%95%98%EA%B8%B0-b76acbaea079",
   "scripts": {
     "start": "multiplerun start",
     "start:pwa": "multiplerun pwa",
@@ -12,7 +11,11 @@
     "app:start:puppeteer": "HTTPS=true PORT=9433 TS_NODE_PROJECT=tsconfig.script.json node -r ts-node/register -r tsconfig-paths/register scripts/start.ts",
     "build": "CI=true react-app-rewired build",
     "test": "react-app-rewired test --colors",
-    "coverage": "react-app-rewired test --colors --coverage"
+    "coverage": "react-app-rewired test --colors --coverage",
+    "pack": "TS_NODE_PROJECT=tsconfig.script.json node -r ts-node/register -r tsconfig-paths/register scripts/pack.ts",
+    "publish": "rocket-punch publish",
+    "storybook": "start-storybook -h localhost -p 6006 -s public",
+    "build-storybook": "build-storybook -s public"
   },
   "multiplerun": {
     "start": [
@@ -53,50 +56,55 @@
     ]
   },
   "dependencies": {
-    "@anchor-protocol/anchor.js": "^1.0.2",
+    "@anchor-protocol/anchor.js": "^1.1.0",
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.11.2",
     "@rocket-scripts/utils": "^3.2.0",
-    "@rx-stream/pipe": "^0.7.0",
-    "@rx-stream/react": "^0.7.0",
-    "@sentry/react": "^6.7.2",
-    "@sentry/tracing": "^6.7.2",
-    "@terra-dev/browser-check": "^1.2.4-alpha.1",
-    "@terra-dev/wallet-types": "^1.2.4-alpha.1",
-    "@terra-money/terra.js": "^1.8.4",
-    "@terra-money/wallet-provider": "^1.2.4-alpha.1",
+    "@rx-stream/pipe": "^0.7.1",
+    "@rx-stream/react": "^0.7.1",
+    "@sentry/react": "^6.8.0",
+    "@sentry/tracing": "^6.8.0",
+    "@terra-dev/browser-check": "^1.2.4",
+    "@terra-dev/wallet-types": "^1.2.4",
+    "@terra-money/terra.js": "^1.8.5",
+    "@terra-money/wallet-provider": "^1.2.4",
     "big.js": "^6.1.1",
     "color": "^3.1.3",
+    "d3-ease": "^2.0.0",
+    "d3-interpolate": "^2.0.1",
     "d3-scale": "^3.3.0",
     "d3-selection": "^2.0.0",
     "d3-shape": "^2.1.0",
+    "d3-timer": "^2.0.0",
     "date-fns": "^2.22.1",
     "downshift": "^6.1.3",
+    "event-target-shim": "^6.0.2",
+    "fast-deep-equal": "^3.1.3",
     "fastdom": "^1.0.10",
-    "firebase": "^8.6.8",
+    "firebase": "^8.7.1",
     "fix-hmr": "^1.0.2",
     "graphql": "^15.5.1",
     "graphql-request": "^3.4.0",
-    "graphql-tag": "^2.12.4",
+    "graphql-tag": "^2.12.5",
     "multiplerun": "^2.0.1",
     "numeral": "^2.0.6",
-    "puppeteer": "^10.0.0",
+    "puppeteer": "^10.1.0",
     "react": "^17.0.2",
     "react-app-rewire-alias": "^1.0.3",
     "react-app-rewired": "^2.1.8",
     "react-dom": "^17.0.2",
     "react-ga": "^3.3.0",
     "react-is": "^17.0.2",
-    "react-query": "^3.17.2",
+    "react-query": "^3.18.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.3",
     "react-spinners-kit": "^1.9.1",
     "react-use-clipboard": "^1.0.7",
     "resize-observer-polyfill": "^1.5.1",
-    "rxjs": "^7.1.0",
+    "rxjs": "^7.2.0",
     "styled-components": "^5.3.0",
     "use-resize-observer": "^7.0.0",
-    "web-vitals": "^2.0.1",
+    "web-vitals": "^2.1.0",
     "workbox-background-sync": "^6.1.5",
     "workbox-broadcast-update": "^6.1.5",
     "workbox-cacheable-response": "^6.1.5",
@@ -113,28 +121,42 @@
   "devDependencies": {
     "@peculiar/webcrypto": "^1.1.7",
     "@ssen/jest-transform": "^3.0.0",
+    "@storybook/addon-actions": "^6.3.4",
+    "@storybook/addon-essentials": "^6.3.4",
+    "@storybook/addon-links": "^6.3.4",
+    "@storybook/addon-storysource": "^6.3.4",
+    "@storybook/addons": "^6.3.4",
+    "@storybook/node-logger": "^6.3.4",
+    "@storybook/preset-create-react-app": "^3.2.0",
+    "@storybook/react": "^6.3.4",
+    "@storybook/theming": "^6.3.4",
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^11.2.7",
+    "@testing-library/react": "^12.0.0",
+    "@testing-library/react-hooks": "^7.0.1",
     "@testing-library/user-event": "^13.1.9",
     "@types/big.js": "^6.1.1",
     "@types/color": "^3.0.1",
-    "@types/d3-scale": "^3.3.0",
-    "@types/d3-selection": "^2.0.0",
-    "@types/d3-shape": "^2.1.0",
-    "@types/jest": "^26.0.23",
-    "@types/node": "^15.12.4",
+    "@types/d3-ease": "^2.0.1",
+    "@types/d3-interpolate": "^2.0.2",
+    "@types/d3-scale": "^3.3.2",
+    "@types/d3-selection": "^2.0.1",
+    "@types/d3-shape": "^2.1.3",
+    "@types/d3-timer": "^2.0.1",
+    "@types/jest": "^26.0.24",
+    "@types/node": "^16.3.1",
     "@types/numeral": "^2.0.1",
-    "@types/puppeteer": "^5.4.3",
-    "@types/ramda": "^0.27.40",
-    "@types/react": "^17.0.11",
-    "@types/react-dom": "^17.0.8",
+    "@types/puppeteer": "^5.4.4",
+    "@types/ramda": "^0.27.44",
+    "@types/react": "^17.0.14",
+    "@types/react-dom": "^17.0.9",
     "@types/react-is": "^17.0.1",
-    "@types/react-router-dom": "^5.1.7",
-    "@types/styled-components": "^5.1.10",
+    "@types/react-router-dom": "^5.1.8",
+    "@types/styled-components": "^5.1.11",
     "@types/testing-library__jest-dom": "^5.14.0",
     "@types/testing-library__user-event": "^4.2.0",
-    "ts-node": "^10.0.0",
-    "tsconfig-paths": "^3.9.0",
-    "typescript": "^4.3.4"
+    "rocket-punch": "^3.0.1",
+    "ts-node": "^10.1.0",
+    "tsconfig-paths": "^3.10.1",
+    "typescript": "^4.3.5"
   }
 }

app/public/fetchWorker.js

@@ -1,17 +1,22 @@
 onmessage = function (event) {
-  fetch(event.data.endpoint, {
-    ...event.data.requestInit,
-    method: 'POST',
-    headers: {
-      ...event.data.requestInit?.headers,
-      'Content-Type': 'application/json',
-      'Accept': 'application/json',
-    },
-    body: JSON.stringify({
-      query: event.data.query,
-      variables: event.data.variables,
+  fetch(
+    event.data.endpoint,
+    Object.assign({}, event.data.requestInit, {
+      method: 'POST',
+      headers: Object.assign(
+        {},
+        event.data.requestInit ? event.data.requestInit.headers : undefined,
+        {
+          'Content-Type': 'application/json',
+          'Accept': 'application/json',
+        },
+      ),
+      body: JSON.stringify({
+        query: event.data.query,
+        variables: event.data.variables,
+      }),
     }),
-  })
+  )
     .then((res) => res.json())
     .then(({ data, errors }) => {
       if (!!errors) {

packages/src/@anchor-protocol/notation/currency.format.ts → app/src/@anchor-protocol/notation/currency.format.ts

@@ -2,6 +2,7 @@ import {
   ANC,
   AncUstLP,
   aUST,
+  bAsset,
   bLuna,
   bLunaLunaLP,
   LPToken,
@@ -79,6 +80,10 @@ export function formatLunaInput<C extends Luna<BigSource> | bLuna<BigSource>>(
   return d6InputFormatter(n) as any;
 }
 
+export function formatBAssetInput<C extends bAsset<BigSource>>(n: C): bAsset {
+  return d6InputFormatter(n) as any;
+}
+
 export function formatANCInput<C extends ANC<BigSource>>(
   n: C,
 ): C extends ANC<BigSource> ? ANC : never {
@@ -142,6 +147,15 @@ export function formatLunaWithPostfixUnits(
   return bn.gte(MILLION) ? d3Formatter(bn.div(MILLION)) + 'M' : d3Formatter(bn);
 }
 
+export function formatBAsset(n: bAsset<BigSource>): string {
+  return d6Formatter(n);
+}
+
+export function formatBAssetWithPostfixUnits(n: bAsset<BigSource>): string {
+  const bn = big(n);
+  return bn.gte(MILLION) ? d3Formatter(bn.div(MILLION)) + 'M' : d3Formatter(bn);
+}
+
 // ---------------------------------------------
 // unspecific format functions
 // ---------------------------------------------