[CHAIN-49] add constants so named proxies have different bytecode (#17)

plumenetwork · Sep 16, 2024 · 0b0dfaf · 0b0dfaf
1 parent d09bfc2
commit 0b0dfaf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/nest/src/proxy/AggregateTokenProxy.sol b/nest/src/proxy/AggregateTokenProxy.sol
@@ -10,6 +10,12 @@ import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy
  */
 contract AggregateTokenProxy is ERC1967Proxy {
 
+    /// @notice Name of the proxy, used to ensure each named proxy has unique bytecode
+    bytes32 public constant PROXY_NAME = keccak256("AggregateTokenProxy");
+
     constructor(address logic, bytes memory data) ERC1967Proxy(logic, data) { }
 
+    /// @dev Fallback function to silence compiler warnings
+    receive() external payable { }
+
 }
diff --git a/nest/src/proxy/FakeComponentTokenProxy.sol b/nest/src/proxy/FakeComponentTokenProxy.sol
@@ -10,6 +10,12 @@ import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy
  */
 contract FakeComponentTokenProxy is ERC1967Proxy {
 
+    /// @notice Name of the proxy, used to ensure each named proxy has unique bytecode
+    bytes32 public constant PROXY_NAME = keccak256("FakeComponentTokenProxy");
+
     constructor(address logic, bytes memory data) ERC1967Proxy(logic, data) { }
 
+    /// @dev Fallback function to silence compiler warnings
+    receive() external payable { }
+
 }
diff --git a/nest/src/proxy/NestStakingProxy.sol b/nest/src/proxy/NestStakingProxy.sol
@@ -10,6 +10,12 @@ import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy
  */
 contract NestStakingProxy is ERC1967Proxy {
 
+    /// @notice Name of the proxy, used to ensure each named proxy has unique bytecode
+    bytes32 public constant PROXY_NAME = keccak256("NestStakingProxy");
+
     constructor(address logic, bytes memory data) ERC1967Proxy(logic, data) { }
 
+    /// @dev Fallback function to silence compiler warnings
+    receive() external payable { }
+
 }
diff --git a/p/src/proxy/PProxy.sol b/p/src/proxy/PProxy.sol
@@ -10,6 +10,12 @@ import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy
  */
 contract PProxy is ERC1967Proxy {
 
+    /// @notice Name of the proxy, used to ensure each named proxy has unique bytecode
+    bytes32 public constant PROXY_NAME = keccak256("PProxy");
+
     constructor(address logic, bytes memory data) ERC1967Proxy(logic, data) { }
 
+    /// @dev Fallback function to silence compiler warnings
+    receive() external payable { }
+
 }