remove copy-pasted OZ proxy contracts; remove rudimentary scripts

DMDcoin · Dec 27, 2023 · e8cee84 · e8cee84
1 parent 62d417d
commit e8cee84
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 413 deletions.
diff --git a/contracts/upgradeability/Import.sol b/contracts/upgradeability/Import.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache 2.0
+pragma solidity =0.8.17;
+
+import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+
+// Base ProxyAdmin does not provide a way to set contract owner in constructor
+// - that's why this contract exists.
+contract ProxyAdminOwnable is ProxyAdmin {
+    constructor(address initialOwner) {
+        transferOwnership(initialOwner);
+    }
+}
diff --git a/contracts/upgradeability/ProxyAdmin.sol b/contracts/upgradeability/ProxyAdmin.sol
diff --git a/contracts/upgradeability/TransparentUpgradeableProxy.sol b/contracts/upgradeability/TransparentUpgradeableProxy.sol
diff --git a/initial-contracts.json b/initial-contracts.json
@@ -42,7 +42,7 @@
         }
     ],
     "admin": {
-        "name": "ProxyAdmin",
+        "name": "ProxyAdminOwnable",
         "address": "0x8000000000000000000000000000000000000000"
     },
     "registry": {

diff --git a/package.json b/package.json
@@ -11,8 +11,7 @@
         "flat": "bash scripts/make_flat.sh",
         "solidity-docgen": "rm -rf docs/docs/api* && npm i && npx hardhat docgen --exclude interfaces,libs,ERC677BridgeTokenRewardable.sol . contracts docs && node docs/website/sidebars-fix.js",
         "generate-uml": "sol2uml ./contracts -o docs/classDiagram.svg",
-        "test": "node scripts/check_for_clashing.js && npx hardhat test",
-        "testNoUpgradeProxy": "export CONTRACTS_NO_UPGRADE_PROXY=true && node scripts/check_for_clashing.js && bash scripts/test.sh",
+        "test": "npx hardhat test",
         "testOnTestnet": "export CONTRACTS_NO_UPGRADE_PROXY=true && ./node_modules/.bin/truffle test  --network testNet test/KeyGenHistory.js test/mockContracts/BlockRewardHbbftMock.sol  test/mockContracts/RandomHbbftMock.sol test/mockContracts/ValidatorSetHbbftMock.sol test/mockContracts/StakingHbbftMock.sol",
         "getFunctionSignatures": "node scripts/getFunctionSignatures.js"
     },

diff --git a/scripts/check_for_clashing.js b/scripts/check_for_clashing.js