From e1dbbfb0ae5e939b8503f46d1cb479e5e0da2aa0 Mon Sep 17 00:00:00 2001
From: echo <hujw77@gmail.com>
Date: Thu, 30 May 2024 15:28:04 +0800
Subject: [PATCH 1/2] v2

---
 lib/sphinx                   |  2 +-
 package.json                 |  2 +-
 script/common/Proposal.s.sol |  4 ++--
 yarn.lock                    | 30 +++++++++++++++---------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/sphinx b/lib/sphinx
index 32a06f4..413a3b9 160000
--- a/lib/sphinx
+++ b/lib/sphinx
@@ -1 +1 @@
-Subproject commit 32a06f468674dfd5e30022a120fb967289359522
+Subproject commit 413a3b978b40ad8f6ec9a9e04399ddcdc71bfca3
diff --git a/package.json b/package.json
index 8ffe1d0..28969f8 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@hujw77/plugins": "0.1.10"
+    "@hujw77/plugins": "0.1.11"
   }
 }
diff --git a/script/common/Proposal.s.sol b/script/common/Proposal.s.sol
index 48c7e90..a0dd4dd 100644
--- a/script/common/Proposal.s.sol
+++ b/script/common/Proposal.s.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "../Connect.s.sol";
+import "../Deploy.s.sol";
 
-contract Proposal is ConnectScript {}
+contract Proposal is DeployScript {}
diff --git a/yarn.lock b/yarn.lock
index fe76a0a..79e54f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -494,24 +494,24 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
   integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
-"@hujw77/contracts@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@hujw77/contracts/-/contracts-0.1.10.tgz#08ffc9599fcd8852ee33965a32e9c7da2935821d"
-  integrity sha512-x16hYYiC+nRXNm6Y9Hzwl0L7ECyhwnPp2Hi27l9QBBSy4FgEIYPeDY6BGxirlM2+6Du8kzNFehpHh0rts5q58Q==
+"@hujw77/contracts@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@hujw77/contracts/-/contracts-0.1.11.tgz#a55d8666e5cb290e6171ba318a0847163fcb9b30"
+  integrity sha512-6a011L7bjnul0oFOtb0T0xlBs0gaH2dxniCVSAqBLf1QNGWfSvezBlfI99JGrqy687ctcvJzSXI1yzZyyP7/bQ==
   dependencies:
     "@openzeppelin/contracts" "4.9.3"
     ethers "^6.7.0"
     solmate "6.2.0"
 
-"@hujw77/core@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@hujw77/core/-/core-0.1.10.tgz#38fce2e8dc6be7531d8fff51d7177f06bf2e5479"
-  integrity sha512-wQuRHAHgYzEaTf+LyQH8IwINzu5RpqQntb2ygr0CtZJlTVRu9riMjhZdsL9voqAxKDDjZH/MpB9h9zr7XKsk7w==
+"@hujw77/core@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@hujw77/core/-/core-0.1.11.tgz#98010531b3eafe0a3004760d4ce587de61029651"
+  integrity sha512-S5rU/DtH6V2OgIoCcTlP05Ict72GMMdNwB8egmGxi5TPpGqwxJ9fG43NCCIMTenbvsZZMlt8VZp8sebpoWiPUQ==
   dependencies:
     "@amplitude/node" "^1.10.2"
     "@eth-optimism/common-ts" "^0.7.1"
     "@ethersproject/bignumber" "^5.7.0"
-    "@hujw77/contracts" "^0.1.10"
+    "@hujw77/contracts" "^0.1.11"
     "@nomicfoundation/hardhat-ethers" "^3.0.4"
     "@nomicfoundation/hardhat-verify" "^2.0.2"
     "@openzeppelin/hardhat-upgrades" "^1.22.1"
@@ -531,16 +531,16 @@
     undici "^5.21.1"
     yesno "^0.4.0"
 
-"@hujw77/plugins@0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@hujw77/plugins/-/plugins-0.1.10.tgz#b51699b942a62250e821211d7acf768dfbc2bdbe"
-  integrity sha512-nNCk3JVPvCrRQfwC3LhuImcwnebloFrr1ccXDMl4yDQLwxxG8daDd3zYh6dmGddBhualt2CARI64cXlpodSDqw==
+"@hujw77/plugins@0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@hujw77/plugins/-/plugins-0.1.11.tgz#2f4391edfd17684ba3ef512343359907ce433541"
+  integrity sha512-QyDJyTUU2vwpyIqktcOcBUruwpu+8kSzZj3pD+EhLXw5fV//hIKeI+g/QE5TOaNYjPm5xbGF7KsOuYM0D/Osvg==
   dependencies:
     "@eth-optimism/common-ts" "^0.7.1"
     "@eth-optimism/contracts" "^0.5.40"
     "@ethersproject/bignumber" "^5.7.0"
-    "@hujw77/contracts" "^0.1.10"
-    "@hujw77/core" "^0.1.10"
+    "@hujw77/contracts" "^0.1.11"
+    "@hujw77/core" "^0.1.11"
     "@nomicfoundation/hardhat-ethers" "^3.0.5"
     "@openzeppelin/contracts" "^4.8.1"
     "@openzeppelin/hardhat-upgrades" "^1.22.1"

From 74359a204a496addadedfadf51903a79dd08996e Mon Sep 17 00:00:00 2001
From: echo <hujw77@gmail.com>
Date: Thu, 30 May 2024 15:31:52 +0800
Subject: [PATCH 2/2] pin to v2

---
 lib/ORMP             | 2 +-
 lib/darwinia-msgport | 2 +-
 lib/subapi           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ORMP b/lib/ORMP
index 34f2c61..2665a54 160000
--- a/lib/ORMP
+++ b/lib/ORMP
@@ -1 +1 @@
-Subproject commit 34f2c6172421d741b10a2b4b55e896f1c3dbb418
+Subproject commit 2665a54323a9da18bf06510d8b2cf41e1ad88b0a
diff --git a/lib/darwinia-msgport b/lib/darwinia-msgport
index ce97d55..73e3565 160000
--- a/lib/darwinia-msgport
+++ b/lib/darwinia-msgport
@@ -1 +1 @@
-Subproject commit ce97d5502958d63c4d2ec3b66e1f9d95ad2910e9
+Subproject commit 73e356551c771760d8f77111020f208828b16479
diff --git a/lib/subapi b/lib/subapi
index 7777e75..9b8603e 160000
--- a/lib/subapi
+++ b/lib/subapi
@@ -1 +1 @@
-Subproject commit 7777e7560eb60a6c31d1f1b3e4af3bd245ea61d5
+Subproject commit 9b8603ea7961a7241cdbb9a05ab3241cee87540a