From 28a4e2310df15b4d1b01eef1b8ecba99c6999ceb Mon Sep 17 00:00:00 2001
From: Septs <github@septs.pw>
Date: Fri, 31 Dec 2021 09:54:44 +0800
Subject: [PATCH 1/2] chore: replace conflict detect bot

---
 .github/detect-pull-requst-conflict.yml |  2 ++
 .github/workflows/bot.yml               | 25 -------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
 create mode 100644 .github/detect-pull-requst-conflict.yml
 delete mode 100644 .github/workflows/bot.yml

diff --git a/.github/detect-pull-requst-conflict.yml b/.github/detect-pull-requst-conflict.yml
new file mode 100644
index 000000000000..2aeff3f03d17
--- /dev/null
+++ b/.github/detect-pull-requst-conflict.yml
@@ -0,0 +1,2 @@
+enabled: true
+label: "Blocked: Has Conflict"
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
deleted file mode 100644
index 33f678eb1921..000000000000
--- a/.github/workflows/bot.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Bot
-
-on:
-  push:
-    branches: [master, develop*, released]
-  pull_request:
-    branches: [master, develop*, released]
-
-# Cancels all previous workflow runs for pull requests that have not completed.
-concurrency:
-  # The concurrency group contains the workflow name and the branch name for
-  # pull requests or the commit hash for any other events.
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  merge_conflict_check:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
-        with:
-          CONFLICT_LABEL_NAME: "Blocked: Has Conflict"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MAX_RETRIES: 5
-          WAIT_MS: 5000

From 71e587ad83c765ef7af2e0558afa8a9950e55433 Mon Sep 17 00:00:00 2001
From: Septs <github@septs.pw>
Date: Fri, 31 Dec 2021 09:57:49 +0800
Subject: [PATCH 2/2] fix: pnpm lockfile

---
 pnpm-lock.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1935102b547c..71abef900029 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1072,7 +1072,7 @@ packages:
       bintrees: 1.0.2
       bn.js: 4.12.0
       compare-versions: 3.6.0
-      ethereumjs-abi: 0.6.6
+      ethereumjs-abi: 0.6.8
       ethereumjs-blockstream: 2.0.7
       ethereumjs-util: 5.2.1
       find-versions: 2.0.0
@@ -9492,7 +9492,7 @@ packages:
   /axios/0.21.1:
     resolution: {integrity: sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==}
     dependencies:
-      follow-redirects: 1.14.6
+      follow-redirects: 1.14.5
     transitivePeerDependencies:
       - debug
     dev: false
@@ -13531,11 +13531,11 @@ packages:
     resolution: {integrity: sha512-5qwJ5n3YhjSpE6O/WEBXCAb2nagUgyagJ6C0lGUBWC4LjKp/rRzD+pwtDJ6KCiITFEAoX4eIrWOjRy0Sylq5Hg==}
     dev: false
 
-  /ethereumjs-abi/0.6.6:
-    resolution: {integrity: sha512-w8KubDsA/+OAuqtIR9RGsMcoZ5nhM8vxwjJAJvEIY+clhxA3BHoLG3+ClYQaQhD0n3mlDt3U5rBrmSVJvI3c8A==}
+  /ethereumjs-abi/0.6.8:
+    resolution: {integrity: sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==}
     dependencies:
       bn.js: 4.12.0
-      ethereumjs-util: 5.2.1
+      ethereumjs-util: 6.2.1
     dev: false
 
   /ethereumjs-account/2.0.5:
@@ -14372,7 +14372,6 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
-    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}