Merge pull request #52 from hemilabs/add-merkle-mainnet

Add MerkleBox mainnet address
hemilabs · Nov 14, 2024 · 9b96ce2 · 9b96ce2
2 parents 7fdb1a0 + 33e0469
commit 9b96ce2
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 144 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,25 @@
+{
+  "extends": ["bloq", "prettier"],
+  "ignorePatterns": ["site/out"],
+  "overrides": [
+    {
+      "extends": ["bloq/node", "prettier"],
+      "files": ["packages/**/*.js"]
+    },
+    {
+      "extends": ["bloq/mocha", "prettier"],
+      "files": ["*.spec.js"]
+    },
+    {
+      "extends": ["bloq/next", "prettier"],
+      "files": ["site/**/*.js"],
+      "rules": {
+        "@next/next/no-html-link-for-pages": ["warn", "site/pages"],
+        "complexity": ["warn", 20]
+      }
+    }
+  ],
+  "rules": {
+    "promise/no-nesting": "off"
+  }
+}
diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml
@@ -0,0 +1,41 @@
+name: Deployment
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  purefinance-build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: bloq/actions/notify-deploy-to-slack@v1
+        with:
+          app-name: Hemi Pure Finance
+          environment: production
+          reference: ${{ github.event.head_commit.message }}
+          slack-mention: ${{ vars.SLACK_MENTION }}
+          slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
+          status: 'started :stopwatch:'
+      - uses: actions/checkout@v4
+      - uses: bloq/actions/setup-node-env@v1
+      - run: npm run build
+      - uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.HOSTINGER_HOST }}
+          username: ${{ secrets.HOSTINGER_USER }}
+          port: ${{ secrets.HOSTINGER_PORT }}
+          key: ${{ secrets.HOSTINGER_SSH_KEY }}
+          source: site/out/*
+          target: public_html/pure.finance
+          rm: true
+          strip_components: 2
+      - if: ${{ !cancelled() }}
+        uses: bloq/actions/notify-deploy-to-slack@v1
+        with:
+          app-name: Hemi Pure Finance
+          environment: production
+          slack-mention: ${{ vars.SLACK_MENTION }}
+          slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
+          status: ${{ job.status == 'failure' && 'failed :boom:' || 'finished :ok:' }}
diff --git a/.github/workflows/purefinance_deployment.yaml b/.github/workflows/purefinance_deployment.yaml
diff --git a/.huskyrc.json b/.huskyrc.json
@@ -0,0 +1,6 @@
+{
+  "hooks": {
+    "pre-commit": "lint-staged",
+    "pre-push": "npm run test && npm run deps:check"
+  }
+}
diff --git a/.lintstagedrc.json b/.lintstagedrc.json
@@ -0,0 +1,4 @@
+{
+  "!(*.js)": ["prettier --ignore-unknown --write"],
+  "*.js": ["eslint --cache --fix --quiet", "prettier --write"]
+}
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,7 @@
+{
+  "arrowParens": "avoid",
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none"
+}
diff --git a/README.md b/README.md
@@ -56,13 +56,3 @@ Then run the tests:
 ```sh
 npm run test:e2e
 ```
-
-## Deployment
-
-```sh
-npm ci
-cd site
-npm run build
-```
-
-Then upload the folder `site/out` to the hosting server.
diff --git a/package.json b/package.json
@@ -30,78 +30,5 @@
     "prettier": "^2.3.1",
     "prettier-plugin-tailwind": "^2.2.12",
     "tailwindcss": "^2.2.7"
-  },
-  "eslintConfig": {
-    "extends": [
-      "bloq",
-      "prettier"
-    ],
-    "ignorePatterns": [
-      "site/out"
-    ],
-    "overrides": [
-      {
-        "extends": [
-          "bloq/node",
-          "prettier"
-        ],
-        "files": [
-          "packages/**/*.js"
-        ]
-      },
-      {
-        "extends": [
-          "bloq/mocha",
-          "prettier"
-        ],
-        "files": [
-          "*.spec.js"
-        ]
-      },
-      {
-        "extends": [
-          "bloq/next",
-          "prettier"
-        ],
-        "files": [
-          "site/**/*.js"
-        ],
-        "rules": {
-          "@next/next/no-html-link-for-pages": [
-            "warn",
-            "site/pages"
-          ],
-          "complexity": [
-            "warn",
-            20
-          ]
-        }
-      }
-    ],
-    "rules": {
-      "promise/no-nesting": "off"
-    }
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "pre-push": "npm run test && npm run deps:check"
-    }
-  },
-  "lint-staged": {
-    "!(*.js)": [
-      "prettier --ignore-unknown --write"
-    ],
-    "*.js": [
-      "eslint --cache --fix --quiet",
-      "prettier --write"
-    ]
-  },
-  "prettier": {
-    "arrowParens": "avoid",
-    "semi": false,
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "none"
   }
 }
diff --git a/packages/token-list/package-lock.json b/packages/token-list/package-lock.json
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
@@ -10,7 +10,7 @@
     "deps:check": "dependency-check --no-dev ."
   },
   "dependencies": {
-    "@hemilabs/token-list": "^1.0.0",
+    "@hemilabs/token-list": "^1.1.1",
     "@sushiswap/default-token-list": "^18.3.0",
     "@uniswap/default-token-list": "^2.1.0",
     "lodash": "4.17.21",

diff --git a/site/components/svg/Chevron.js b/site/components/svg/Chevron.js
@@ -1,10 +1,10 @@
 const Chevron = props => (
   <svg viewBox="0 0 9 6" xmlns="http://www.w3.org/2000/svg" {...props}>
     <path
-      clip-rule="evenodd"
+      clipRule="evenodd"
       d="M0.220011 1.22C0.360637 1.07955 0.551261 1.00066 0.750011 1.00066C0.948762 1.00066 1.13939 1.07955 1.28001 1.22L4.00001 3.94L6.72001 1.22C6.78867 1.14631 6.87147 1.08721 6.96347 1.04622C7.05547 1.00523 7.15479 0.983186 7.25549 0.981409C7.35619 0.979633 7.45622 0.998157 7.54961 1.03588C7.643 1.0736 7.72783 1.12974 7.79905 1.20096C7.87027 1.27218 7.92641 1.35701 7.96413 1.4504C8.00185 1.54379 8.02038 1.64382 8.0186 1.74452C8.01683 1.84523 7.99478 1.94454 7.95379 2.03654C7.9128 2.12854 7.8537 2.21134 7.78001 2.28L4.53001 5.53C4.38939 5.67045 4.19876 5.74934 4.00001 5.74934C3.80126 5.74934 3.61064 5.67045 3.47001 5.53L0.220011 2.28C0.0795608 2.13938 0.000671387 1.94875 0.000671387 1.75C0.000671387 1.55125 0.0795608 1.36063 0.220011 1.22Z"
       fill="currentColor"
-      fill-rule="evenodd"
+      fillRule="evenodd"
     />
   </svg>
 )

diff --git a/site/messages/en.json b/site/messages/en.json
@@ -41,7 +41,7 @@
   "error-no-ethereum-provider": "No Ethereum browser extension detected, install MetaMask on desktop or visit from a dApp browser on mobile.",
   "error-rejected-wallet-connection": "Please authorize this website to access your Ethereum account.",
   "error-unknown": "An unknown error occurred.",
-  "error-unsupported-network": "You're connected to an unsupported network.",
+  "error-unsupported-network": "Only Hemi networks are supported.",
   "error": "Error",
   "estimated-tx-fee": "Estimated network fee",
   "floored": "Floored",

diff --git a/site/messages/zh.json b/site/messages/zh.json
@@ -41,7 +41,7 @@
   "error-no-ethereum-provider": "未检测到以太坊浏览器扩展，请在桌面上安装 MetaMask 或从移动设备上的 dApp 浏览器访问。",
   "error-rejected-wallet-connection": "请授权本网站访问您的以太坊账户。",
   "error-unknown": "出现未知错误。",
-  "error-unsupported-network": "您连接到不受支持的网络。",
+  "error-unsupported-network": "仅支持 Hemi 网络。",
   "error": "错误",
   "estimated-tx-fee": "预估网络费用",
   "floored": "有地板的",

diff --git a/site/utils/utilsConfig.json b/site/utils/utilsConfig.json
@@ -1,17 +1,7 @@
 {
   "43111": {
-    "dp-auctions": {
-      "address": ""
-    },
-    "merkle": {
-      "address": ""
-    },
-    "payment-streams": {
-      "address": "",
-      "birthblock": ""
-    },
-    "sablier": {
-      "address": ""
+    "merkleClaim": {
+      "address": "0x112de51b708c77C628532120Ffe2c0200f067399"
     }
   },
   "743111": {