Merge pull request #1513 from Conflux-Chain/dev

release 2.8.0
Conflux-Chain · Jan 14, 2025 · 5aa069c · 5aa069c
2 parents 23119f5 + c4dffbb
commit 5aa069c
Show file tree

Hide file tree

Showing 269 changed files with 2,502 additions and 1,312 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,9 +1,45 @@
 queue_rules:
-  - name: default queue
-    conditions:
+  - name: Automatic queue to dev on approval
+    queue_conditions:
+      - '#approved-reviews-by>=1'
+      - label!=work-in-progress
+      - label!=wip
+      - label!=no-auto-squash-merge
+      - base=dev
+      - head!=next
+      - -conflict
+      - -draft
+      - -locked
+      - status-success~=^version-check\s\(.*\)$
+      - status-success~=^lint\s\(.*\)$
+      - status-success~=^build\s\(.*\)$
+      - status-success~=^build-doc\s\(.*\)$
+      - status-success~=^unit-test\s\(.*\)$
+      - status-success~=^integration-test\s\(.*\)$
+      - '#review-threads-unresolved=0'
+    merge_conditions:
       - label!=work-in-progress
       - label!=wip
       - status-success~=^build\s\(.*\)$
+    merge_method: squash
+  - name: Automatic queue to dev on approval (__release-pkg)
+    queue_conditions:
+      - '#approved-reviews-by>=1'
+      - label!=work-in-progress
+      - label!=wip
+      - label!=no-auto-squash-merge
+      - base=dev
+      - head=__release-pkg
+      - -conflict
+      - -draft
+      - -locked
+      - status-success~=^build\s\(.*\)$
+      - '#review-threads-unresolved=0'
+    merge_conditions:
+      - label!=work-in-progress
+      - label!=wip
+      - status-success~=^build\s\(.*\)$
+    merge_method: squash
 
 pull_request_rules:
   - name: automatic approval for release package PR
@@ -26,43 +62,17 @@ pull_request_rules:
       - head!=main
     actions:
       update:
-  - name: Automatic queue to dev on approval [low]
-    conditions:
-      - "#approved-reviews-by>=1"
-      - label!=work-in-progress
-      - label!=wip
-      - label!=no-auto-squash-merge
-      - base=dev
-      - head!=next
-      - -conflict
-      - -draft
-      - -locked
-      - status-success~=^version-check\s\(.*\)$
-      - status-success~=^lint\s\(.*\)$
-      - status-success~=^build\s\(.*\)$
-      - status-success~=^build-doc\s\(.*\)$
-      - status-success~=^unit-test\s\(.*\)$
-      - status-success~=^integration-test\s\(.*\)$
-      - "#review-threads-unresolved=0"
-    actions:
-      queue:
-        name: default queue
-        method: squash
 
-  - name: Automatic queue to dev on approval (__release-pkg) [low]
+  - name: Automatic queue to dev on approval (__release-pkg)
     conditions:
-      - "#approved-reviews-by>=1"
-      - label!=work-in-progress
-      - label!=wip
-      - label!=no-auto-squash-merge
-      - base=dev
+      - author~=^ConfluxBot$
       - head=__release-pkg
-      - -conflict
-      - -draft
-      - -locked
-      - status-success~=^build\s\(.*\)$
-      - "#review-threads-unresolved=0"
     actions:
       queue:
-        name: default queue
-        method: squash
+        name: Automatic queue to dev on approval (__release-pkg)
+
+  - name: Automatic queue to dev on approval [low]
+    conditions: []
+    actions:
+      queue:
+        name: Automatic queue to dev on approval
diff --git a/.github/workflows/deploy-doc.yaml b/.github/workflows/deploy-doc.yaml
@@ -55,7 +55,7 @@ jobs:
           key: ${{ runner.os }}-yarn-and-maven-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('./shadow-cljs.edn') }}-${{ hashFiles('./deps.edn') }}
           restore-keys: |
             ${{ runner.os }}-yarn-and-maven-
-      - run: yarn install --immutable
+      - run: yarn install --immutable --no-check-resolutions
       - run: yarn workspace doc build
 
       - name: Deploy

diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -60,7 +60,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-and-maven-
 
-      - run: yarn install --immutable
+      - run: yarn install --immutable --no-check-resolutions
 
       - name: Set package version
         id: get-package-version
@@ -110,6 +110,7 @@ jobs:
           SNOWPACK_PUBLIC_SENTRY_DSN: ${{ secrets.SNOWPACK_PUBLIC_SENTRY_DSN }}
           SNOWPACK_PUBLIC_FLUENT_ENV: 'debug-release'
           SNOWPACK_PUBLIC_FLUENT_VERSION: ${{ fromJSON(steps.get-release-version-and-tag.outputs.result).version }}
+          VIEW_PACKAGE_VERSION: ${{ fromJSON(steps.get-release-version-and-tag.outputs.result).version }}
         run: yarn build
 
       - name: zip files

diff --git a/.github/workflows/prod-release.yaml b/.github/workflows/prod-release.yaml
@@ -59,7 +59,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-and-maven-
 
-      - run: yarn install --immutable
+      - run: yarn install --immutable --no-check-resolutions
 
       - name: Set package version
         id: get-package-version
@@ -98,6 +98,7 @@ jobs:
           SNOWPACK_PUBLIC_SENTRY_DSN: ${{ secrets.SNOWPACK_PUBLIC_SENTRY_DSN }}
           SNOWPACK_PUBLIC_FLUENT_ENV: 'production'
           SNOWPACK_PUBLIC_FLUENT_VERSION: ${{ steps.get-package-version.outputs.PACKAGE_VERSION }}
+          VIEW_PACKAGE_VERSION: ${{ fromJSON(steps.get-release-version-and-tag.outputs.result).prod_version }}
         run: yarn build
 
       - name: zip files

diff --git a/.github/workflows/publish-npm-package.yaml b/.github/workflows/publish-npm-package.yaml
@@ -58,12 +58,12 @@ jobs:
           key: ${{ runner.os }}-yarn-and-maven-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('./shadow-cljs.edn') }}-${{ hashFiles('./deps.edn') }}
           restore-keys: |
             ${{ runner.os }}-yarn-and-maven-
-      - run: yarn install --immutable
+      - run: yarn install --immutable --no-check-resolutions
       - run: yarn version apply --all || true
       - run: rm -rf .yarn/versions || true
       - env:
           YARN_NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-        run: ./scripts/any-packages-version-changed.sh && yarn workspaces foreach --topological --no-private --verbose --parallel --interlaced npm publish --access public --tolerate-republish || true
+        run: ./scripts/any-packages-version-changed.sh && yarn workspaces foreach -A --topological --no-private --verbose --parallel --interlaced npm publish --access public --tolerate-republish || true
       - run: git add .
       - run: |
           git -c user.name='ConfluxBot' \

diff --git a/.yarn/versions/01a87f4a.yml b/.yarn/versions/01a87f4a.yml
diff --git a/examples/basic-dapp/index.html b/examples/basic-dapp/index.html
@@ -42,7 +42,12 @@
           <footer>Address: <span id="address">N/A</span></footer>
         </article>
         <article>
-          <header>Send native token</header>
+          <label for="tx-type">transaction type:</label>
+          <select id="tx-type">
+            <option value="0x0">legacy</option>
+            <option value="0x2">eip1559</option>
+            <option value="0x1">eip2930</option>
+          <select>
           <button id="send_native_token" disabled="true">
             send native token to myself
           </button>

diff --git a/examples/basic-dapp/index.js b/examples/basic-dapp/index.js
@@ -421,10 +421,14 @@ async function walletInitialized() {
   // send 1 native token to the connected address
   sendNativeTokenButton.onclick = async () => {
     const [connectedAddress] = await provider.request({method: 'cfx_accounts'})
+
+    const txType = document.querySelector('#tx-type').value
+
     const tx = {
       from: connectedAddress,
       value: '0xde0b6b3a7640000',
       to: connectedAddress,
+      type: txType,
     }
 
     provider

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "helios",
   "private": true,
-  "version": "2.7.10",
+  "version": "2.8.0",
   "workspaces": [
     "websites/*",
     "packages/doc-ui/*",
@@ -94,7 +94,7 @@
     "@types/serve-static": "^1",
     "@types/webpack-bundle-analyzer": "^4",
     "@vitejs/plugin-react": "4.3.1",
-    "@vitest/coverage-v8": "2.0.5",
+    "@vitest/coverage-v8": "2.1.8",
     "@yarnpkg/esbuild-plugin-pnp": "3.0.0-rc.2",
     "@yqrashawn/snowpack": "3.8.6-fix-6",
     "autoprefixer": "10.4.20",
@@ -157,7 +157,7 @@
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^26.0.0",
     "tailwindcss": "^3.1.1",
-    "vitest": "2.0.5",
+    "vitest": "2.1.8",
     "wait-for-expect": "3.0.2",
     "web-ext": "7.0.0",
     "webpack": "5.93.0",