Support PolkaVM for Hardhat Upgrades Plugin

.changeset/ninety-rocks-flow.md

@@ -0,0 +1,6 @@
+---
+'@openzeppelin/hardhat-upgrades': minor
+'@openzeppelin/upgrades-core': minor
+---
+
+Supported hardhat-polkadot plugin for upgrades on Polkadot AssetHub

.eslintrc.js

@@ -42,5 +42,11 @@ module.exports = {
         it: 'readonly',
       },
     },
+    {
+      files: ['packages/plugin-hardhat/test-pvm/**'],
+      env: {
+        mocha: true,
+      },
+    },
   ],
 };

.github/actions/setup/action.yml

@@ -5,7 +5,7 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: yarn
 
     - name: Install dependencies

.github/workflows/checks.yml

@@ -41,6 +41,10 @@ jobs:
 
     - name: Run tests
       run: yarn --cwd "packages/${{matrix.package}}" run test
+    # This is temporary, later it would be integrated into the main run
+    - name: Run PVM tests
+      if: matrix.package == 'plugin-hardhat'
+      run: yarn --cwd "packages/${{matrix.package}}" run test:pvm
 
   coverage:
     runs-on: ubuntu-latest

.gitignore

@@ -11,3 +11,5 @@ coverage
 .env
 /examples
 package-lock.json
+artifacts-pvm
+cache-pvm

.node-version

@@ -1 +1 @@
-20
+22

packages/core/contracts/test/ValidationsNatspec.sol

@@ -63,26 +63,6 @@ contract HasImmutableStateVariableNatspec3 {
   uint immutable y = 2;
 }
 
-/// @custom:oz-upgrades-unsafe-allow selfdestruct
-contract HasSelfDestructNatspec1 {
-  function d() public {
-    selfdestruct(payable(msg.sender));
-  }
-}
-
-contract HasSelfDestructNatspec2 {
-  /// @custom:oz-upgrades-unsafe-allow selfdestruct
-  function d() public {
-    selfdestruct(payable(msg.sender));
-  }
-}
-
-contract HasSelfDestructNatspec3 {
-  function d() public {
-    /// @custom:oz-upgrades-unsafe-allow selfdestruct
-    selfdestruct(payable(msg.sender));
-  }
-}
 
 /// @custom:oz-upgrades-unsafe-allow delegatecall
 contract HasDelegateCallNatspec1 {
@@ -132,22 +112,6 @@ library SafeExternalLibraryNatspec {
   }
 }
 
-library UnsafeInternalLibraryNatspec {
-  function explode(uint x, uint y) internal {
-    x + y;
-    /// @custom:oz-upgrades-unsafe-allow selfdestruct
-    selfdestruct(payable(msg.sender));
-  }
-}
-
-library UnsafeExternalLibraryNatspec {
-  function explode(uint x, uint y) public {
-    x + y;
-    /// @custom:oz-upgrades-unsafe-allow selfdestruct
-    selfdestruct(payable(msg.sender));
-  }
-}
-
 // usage
 
 contract UsesImplicitSafeInternalLibraryNatspec {
@@ -169,25 +133,6 @@ contract UsesImplicitSafeExternalLibraryNatspec {
   }
 }
 
-contract UsesImplicitUnsafeInternalLibraryNatspec {
-  using UnsafeInternalLibraryNatspec for uint;
-  uint x;
-
-  function foo(uint y) public {
-    x.explode(y);
-  }
-}
-
-/// @custom:oz-upgrades-unsafe-allow external-library-linking
-contract UsesImplicitUnsafeExternalLibraryNatspec {
-  using UnsafeExternalLibraryNatspec for uint;
-  uint x;
-
-  function foo(uint y) public {
-    x.explode(y);
-  }
-}
-
 contract UsesExplicitSafeInternalLibraryNatspec {
   uint x;
 
@@ -205,19 +150,3 @@ contract UsesExplicitSafeExternalLibraryNatspec {
   }
 }
 
-contract UsesExplicitUnsafeInternalLibraryNatspec {
-  uint x;
-
-  function foo(uint y) public {
-    UnsafeInternalLibraryNatspec.explode(x, y);
-  }
-}
-
-/// @custom:oz-upgrades-unsafe-allow external-library-linking
-contract UsesExplicitUnsafeExternalLibraryNatspec {
-  uint x;
-
-  function foo(uint y) public {
-    UnsafeExternalLibraryNatspec.explode(x, y);
-  }
-}

packages/core/contracts/test/ValidationsNatspecSelfdestruct.sol

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.2;
+
+/// @custom:oz-upgrades-unsafe-allow selfdestruct
+contract HasSelfDestructNatspec1 {
+    function d() public {
+        selfdestruct(payable(msg.sender));
+    }
+}
+
+contract HasSelfDestructNatspec2 {
+    /// @custom:oz-upgrades-unsafe-allow selfdestruct
+    function d() public {
+        selfdestruct(payable(msg.sender));
+    }
+}
+
+contract HasSelfDestructNatspec3 {
+    function d() public {
+        /// @custom:oz-upgrades-unsafe-allow selfdestruct
+        selfdestruct(payable(msg.sender));
+    }
+}
+
+library UnsafeInternalLibraryNatspec {
+    function explode(uint x, uint y) internal {
+        x + y;
+        /// @custom:oz-upgrades-unsafe-allow selfdestruct
+        selfdestruct(payable(msg.sender));
+    }
+}
+
+library UnsafeExternalLibraryNatspec {
+    function explode(uint x, uint y) public {
+        x + y;
+        /// @custom:oz-upgrades-unsafe-allow selfdestruct
+        selfdestruct(payable(msg.sender));
+    }
+}
+
+contract UsesImplicitUnsafeInternalLibraryNatspec {
+    using UnsafeInternalLibraryNatspec for uint;
+    uint x;
+
+    function foo(uint y) public {
+        x.explode(y);
+    }
+}
+
+/// @custom:oz-upgrades-unsafe-allow external-library-linking
+contract UsesImplicitUnsafeExternalLibraryNatspec {
+    using UnsafeExternalLibraryNatspec for uint;
+    uint x;
+
+    function foo(uint y) public {
+        x.explode(y);
+    }
+}
+
+contract UsesExplicitUnsafeInternalLibraryNatspec {
+    uint x;
+
+    function foo(uint y) public {
+        UnsafeInternalLibraryNatspec.explode(x, y);
+    }
+}
+
+/// @custom:oz-upgrades-unsafe-allow external-library-linking
+contract UsesExplicitUnsafeExternalLibraryNatspec {
+    uint x;
+
+    function foo(uint y) public {
+        UnsafeExternalLibraryNatspec.explode(x, y);
+    }
+}

packages/core/contracts/test/cli/Validate.sol

@@ -9,12 +9,6 @@ contract Safe {
   }
 }
 
-contract NonUpgradeable {
-  function sd() public {
-    selfdestruct(payable(msg.sender));
-  }
-}
-
 abstract contract Initializable {
   function initialize() virtual public;
 }
@@ -36,36 +30,6 @@ contract HasUpgradeToConstructorUnsafe {
   }
 }
 
-/**
- * @custom:oz-upgrades
- */
-contract MultipleUnsafe {
-  function sd() public {
-    selfdestruct(payable(msg.sender));
-  }
-
-  /// @custom:oz-upgrades-unsafe-allow selfdestruct
-  function sd2() public {
-    selfdestruct(payable(msg.sender));
-  }
-
-  function dc() public {
-    (bool s, ) = msg.sender.delegatecall("");
-    s;
-  }
-
-  function dc2() public {
-    (bool s, ) = msg.sender.delegatecall("");
-    s;
-  }
-}
-
-/**
- * @custom:oz-upgrades
- */
-contract InheritsMultipleUnsafe is MultipleUnsafe {
-}
-
 /**
  * @custom:oz-upgrades-from HasUpgradeTo
  */
@@ -85,62 +49,13 @@ contract StorageV1 {
   uint256[49] private __gap;
 }
 
-/**
- * @custom:oz-upgrades-from StorageV1
- */
-contract UnsafeAndStorageLayoutErrors {
-  uint256 public x;
-  uint256 public y;
-  uint256[49] private __gap;
-
-  function sd() public {
-    selfdestruct(payable(msg.sender));
-  }
-}
-
-/**
- * @custom:oz-upgrades-from MultipleUnsafe
- */
-contract BecomesSafe {
-  bool public x;
-}
-
-/**
- * @custom:oz-upgrades-from BecomesSafe
- */
-contract BecomesBadLayout {
-}
-
-/**
- * @custom:oz-upgrades-from NonUpgradeable
- */
-contract StillUnsafe {
-  function sd() public {
-    selfdestruct(payable(msg.sender));
-  }
-}
-
 abstract contract AbstractUpgradeable is Initializable {
 }
 
 contract InheritsAbstractUpgradeable is AbstractUpgradeable {
     function initialize() public virtual override {}
 }
 
-/**
- * @custom:oz-upgrades
- * @custom:oz-upgrades-from StorageV1
- */
-contract BothAnnotationsUnsafe {
-  uint256 public x;
-  uint256 public y;
-  uint256[49] private __gap;
-
-  function sd() public {
-    selfdestruct(payable(msg.sender));
-  }
-}
-
 contract StorageV2_Bad_NoAnnotation {
   uint256 public x;
   uint256 public y;