change openzeppelin version

primus-labs · Dec 13, 2024 · f989461 · f989461
1 parent 11f4cea
commit f989461
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 82 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,11 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = v4.9.0
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+	branch = v4.9.0
diff --git a/docs/src/README.md b/docs/src/README.md
@@ -48,17 +48,9 @@ $ anvil
 ### Deploy
 
 ```shell
-$ forge script script/PrimusZKTLS.s.sol --rpc-url <your_rpc_url> --private-key <your_private_key> --broadcast
+$ forge script script/Counter.s.sol:CounterScript --rpc-url <your_rpc_url> --private-key <your_private_key>
 ```
 
-### Upgrade
-
-```shell
-$ forge script script/UpgradeZKTLS.s.sol --rpc-url <your_rpc_url> --private-key <your_private_key> --broadcast
-
-```
-
-
 ### Cast
 
 ```shell

diff --git a/docs/src/src/IPrimusZkTLS.sol/interface.IPrimusZkTLS.md b/docs/src/src/IPrimusZkTLS.sol/interface.IPrimusZkTLS.md
@@ -1,5 +1,5 @@
 # IPrimusZKTLS
-[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/598ebb1789581520b0b29d02a686bfae9b7ffe60/src/IPrimusZKTLS.sol)
+[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/11f4cead3677496fd937372843f5c9fca4283fc1/src/IPrimusZKTLS.sol)
 
 *Interface of PrimusZKTLS, which defines functions for handling attestations and related operations.*
 

diff --git a/docs/src/src/IPrimusZkTLS.sol/struct.AttNetworkRequest.md b/docs/src/src/IPrimusZkTLS.sol/struct.AttNetworkRequest.md
@@ -1,5 +1,5 @@
 # AttNetworkRequest
-[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/598ebb1789581520b0b29d02a686bfae9b7ffe60/src/IPrimusZKTLS.sol)
+[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/11f4cead3677496fd937372843f5c9fca4283fc1/src/IPrimusZKTLS.sol)
 
 *Structure for representing a network request send to jsk and related to the attestation.*
 

diff --git a/docs/src/src/IPrimusZkTLS.sol/struct.AttNetworkResponseResolve.md b/docs/src/src/IPrimusZkTLS.sol/struct.AttNetworkResponseResolve.md
@@ -1,5 +1,5 @@
 # AttNetworkResponseResolve
-[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/598ebb1789581520b0b29d02a686bfae9b7ffe60/src/IPrimusZKTLS.sol)
+[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/11f4cead3677496fd937372843f5c9fca4283fc1/src/IPrimusZKTLS.sol)
 
 *Structure for resolving responses from a network request.*
 

diff --git a/docs/src/src/IPrimusZkTLS.sol/struct.Attestation.md b/docs/src/src/IPrimusZkTLS.sol/struct.Attestation.md
@@ -1,5 +1,5 @@
 # Attestation
-[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/598ebb1789581520b0b29d02a686bfae9b7ffe60/src/IPrimusZKTLS.sol)
+[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/11f4cead3677496fd937372843f5c9fca4283fc1/src/IPrimusZKTLS.sol)
 
 *Structure representing an attestation, which is a signed statement of fact.*
 

diff --git a/docs/src/src/IPrimusZkTLS.sol/struct.Attestor.md b/docs/src/src/IPrimusZkTLS.sol/struct.Attestor.md
@@ -1,5 +1,5 @@
 # Attestor
-[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/598ebb1789581520b0b29d02a686bfae9b7ffe60/src/IPrimusZKTLS.sol)
+[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/11f4cead3677496fd937372843f5c9fca4283fc1/src/IPrimusZKTLS.sol)
 
 *Structure representing an attestor, who is responsible for signing the attestation.*
 

diff --git a/docs/src/src/PrimusZkTLS.sol/contract.PrimusZkTLS.md b/docs/src/src/PrimusZkTLS.sol/contract.PrimusZkTLS.md
@@ -1,5 +1,5 @@
 # PrimusZKTLS
-[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/598ebb1789581520b0b29d02a686bfae9b7ffe60/src/PrimusZKTLS.sol)
+[Git Source](https://github.com/primus-labs/zkTLS-contracts/blob/11f4cead3677496fd937372843f5c9fca4283fc1/src/PrimusZKTLS.sol)
 
 **Inherits:**
 OwnableUpgradeable, [IPrimusZKTLS](/src/IPrimusZKTLS.sol/interface.IPrimusZKTLS.md)
@@ -36,11 +36,11 @@ This function is called during the contract deployment.*
 function initialize(address _owner) public initializer;
 ```
 
-### setupDefaultAttestor
+### _setupDefaultAttestor
 
 
 ```solidity
-function setupDefaultAttestor(address defaultAddr) internal;
+function _setupDefaultAttestor(address _defaultAddr) internal;
 ```
 
 ### setAttestor

diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/script/Counter.s.sol b/script/Counter.s.sol
diff --git a/script/PrimusZKTLS.s.sol b/script/PrimusZKTLS.s.sol
@@ -17,7 +17,7 @@ contract DeployPrimusZKTLS is Script {
         PrimusZKTLS logic = new PrimusZKTLS();
 
         // 3. Deploy ProxyAdmin
-        ProxyAdmin proxyAdmin = new ProxyAdmin(deployerAddress);
+        ProxyAdmin proxyAdmin = new ProxyAdmin();
 
         // 4. Prepare initialization data
         bytes memory initializeData = abi.encodeWithSelector(

diff --git a/src/Counter.sol b/src/Counter.sol
diff --git a/src/PrimusZKTLS.sol b/src/PrimusZKTLS.sol
@@ -32,18 +32,18 @@ contract PrimusZKTLS is OwnableUpgradeable, IPrimusZKTLS {
      * This function is called during the contract deployment.
      */
     function initialize(address _owner) public initializer {
-        __Ownable_init(_owner);
-        setupDefaultAttestor(_owner);
+        __Ownable_init();
+        _setupDefaultAttestor(_owner);
     }
 
-    function setupDefaultAttestor(address defaultAddr) internal {
-        require(defaultAddr != address(0), "Invalid address");
-        _attestorsMapping[defaultAddr] = Attestor({
-            attestorAddr: defaultAddr,
+    function _setupDefaultAttestor(address _defaultAddr) internal {
+        require(_defaultAddr != address(0), "Invalid address");
+        _attestorsMapping[_defaultAddr] = Attestor({
+            attestorAddr: _defaultAddr,
             url: "https://primuslabs.xyz/"
         });
         _attestors.push(Attestor({
-            attestorAddr: defaultAddr,
+            attestorAddr: _defaultAddr,
             url: "https://primuslabs.xyz/"
         }));
     }

diff --git a/test/Counter.t.sol b/test/Counter.t.sol