Merge remote-tracking branch 'origin/main'

qtumproject · May 20, 2024 · 8dce31f · 8dce31f
2 parents c29ae87 + 6e4a375
commit 8dce31f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/contracts/utils/UUPSSignableUpgradeable.sol b/contracts/utils/UUPSSignableUpgradeable.sol
@@ -30,4 +30,21 @@ abstract contract UUPSSignableUpgradeable is UUPSUpgradeable {
         _authorizeUpgrade(newImplementation_, signatures_);
         _upgradeToAndCallUUPS(newImplementation_, new bytes(0), false);
     }
+
+    /**
+     * @notice Upgrade the implementation of the proxy to `newImplementation`, and subsequently execute the function call
+     * encoded in `data`.
+     *
+     * Calls {_authorizeUpgrade} with the provided `newImplementation` and `signatures`.
+     *
+     * Emits an {Upgraded} event.
+     */
+    function upgradeToWithSigAndCall(
+        address newImplementation_,
+        bytes[] calldata signatures_,
+        bytes calldata data_
+    ) external virtual onlyProxy {
+        _authorizeUpgrade(newImplementation_, signatures_);
+        _upgradeToAndCallUUPS(newImplementation_, data_, false);
+    }
 }
diff --git a/test/bridge/Upgradeable.test.ts b/test/bridge/Upgradeable.test.ts
@@ -50,6 +50,10 @@ describe("Upgradeable", () => {
     await expect(newBridge.upgradeToWithSig(await newBridge.getAddress(), [])).to.be.rejectedWith(
       "Function must be called through delegatecall",
     );
+
+    await expect(newBridge.upgradeToWithSigAndCall(await newBridge.getAddress(), [], "0x")).to.be.rejectedWith(
+      "Function must be called through delegatecall",
+    );
   });
 
   it("should upgrade implementation", async () => {
@@ -85,6 +89,10 @@ describe("Upgradeable", () => {
     await expect(proxyBridge.connect(SECOND).upgradeToWithSig(await newBridge.getAddress(), [])).to.be.rejectedWith(
       "Ownable: caller is not the owner",
     );
+
+    await expect(
+      proxyBridge.connect(SECOND).upgradeToWithSigAndCall(await newBridge.getAddress(), [], "0x"),
+    ).to.be.rejectedWith("Ownable: caller is not the owner");
   });
 
   it("should receive ether through proxy", async () => {