Merge pull request #489 from rsksmart/version-2.5.0-fixes

Version 2.5.1 -> master

Author: Luisfc68

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/openzeppelin-foundry-upgrades"]
+	path = lib/openzeppelin-foundry-upgrades
+	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

Makefile

@@ -415,10 +415,10 @@ npm ci
 make build
 
 # Test deployment (simulation)
-make deploy-lbc NETWORK=testnet
+make deploy-lbc NETWORK=rskTestnet
 
 # Actual deployment
-make deploy-lbc-broadcast NETWORK=testnet
+make deploy-lbc-broadcast NETWORK=rskTestnet
 ```
 
 #### Documentation
@@ -436,20 +436,20 @@ make deploy-lbc-broadcast NETWORK=testnet
 
 ```bash
 # Deployment
-make deploy-lbc NETWORK=testnet                    # Simulation
-make deploy-lbc-broadcast NETWORK=testnet          # Actual deployment
+make deploy-lbc NETWORK=rskTestnet                    # Simulation
+make deploy-lbc-broadcast NETWORK=rskTestnet          # Actual deployment
 
 # Upgrades
-make upgrade-lbc NETWORK=testnet                   # Simulation
-make upgrade-lbc-broadcast NETWORK=testnet         # Actual upgrade
+make upgrade-lbc NETWORK=rskTestnet                   # Simulation
+make upgrade-lbc-broadcast NETWORK=rskTestnet         # Actual upgrade
 
 # Fork testing
 make testnet-fork-deploy                           # Testnet fork simulation
 make testnet-fork-deploy-broadcast                 # Testnet fork actual deployment
 
 # Utilities
 make get-versions                                  # Get contract versions
-make check-env NETWORK=testnet                     # Environment validation
+make check-env NETWORK=rskTestnet                     # Environment validation
 make help                                          # Show all commands
 ```
 

README.md

@@ -172,16 +172,16 @@ These commands simulate deployments without broadcasting transactions:
 
 ```bash
 # Deploy LiquidityBridgeContract (simulation)
-make deploy-lbc NETWORK=testnet
+make deploy-lbc NETWORK=rskTestnet
 
 # Upgrade to V2 (simulation)
-make upgrade-lbc NETWORK=testnet
+make upgrade-lbc NETWORK=rskTestnet
 
 # Transfer ownership (simulation)
-make change-owner NETWORK=testnet
+make change-owner NETWORK=rskTestnet
 
 # High gas deployment (simulation)
-make deploy-lbc-high-gas NETWORK=testnet
+make deploy-lbc-high-gas NETWORK=rskTestnet
 ```
 
 ### Actual Deployment Commands
@@ -190,16 +190,16 @@ These commands broadcast real transactions:
 
 ```bash
 # Deploy LiquidityBridgeContract (actual)
-make deploy-lbc-broadcast NETWORK=testnet
+make deploy-lbc-broadcast NETWORK=rskTestnet
 
 # Upgrade to V2 (actual)
-make upgrade-lbc-broadcast NETWORK=testnet
+make upgrade-lbc-broadcast NETWORK=rskTestnet
 
 # Transfer ownership (actual)
-make change-owner-broadcast NETWORK=testnet
+make change-owner-broadcast NETWORK=rskTestnet
 
 # High gas deployment (actual)
-make deploy-lbc-high-gas-broadcast NETWORK=testnet
+make deploy-lbc-high-gas-broadcast NETWORK=rskTestnet
 ```
 
 ### Safe Deployment Commands
@@ -208,35 +208,36 @@ These include additional validation:
 
 ```bash
 # Safe deployment with validation
-make safe-deploy-lbc-broadcast NETWORK=mainnet
+make safe-deploy-lbc-broadcast NETWORK=rskMainnet
 
 # Safe upgrade with validation
-make safe-upgrade-lbc-broadcast NETWORK=mainnet
+make safe-upgrade-lbc-broadcast NETWORK=rskMainnet
 
 # Safe ownership transfer with validation
-make safe-change-owner-broadcast NETWORK=mainnet
+make safe-change-owner-broadcast NETWORK=rskMainnet
 ```
 
 ## Network Configuration
 
 ### Supported Networks
 
-| Network | Chain ID | RPC URL     | Description         |
-| ------- | -------- | ----------- | ------------------- |
-| mainnet | 30       | RSK Mainnet | Production network  |
-| testnet | 31       | RSK Testnet | Test network        |
-| dev     | 1337     | Local       | Development network |
+| Network        | Chain ID | RPC URL     | Description                                   |
+| -------------- | -------- | ----------- | --------------------------------------------- |
+| rskMainnet     | 30       | RSK Mainnet | Production network                            |
+| rskTestnet     | 31       | RSK Testnet | Test network                                  |
+| rskDevelopment | 31       | RSK Testnet | Development addresses (same chain as testnet) |
+| rskRegtest     | 33       | RSK Regtest | Local regtest node                            |
 
 ### Network-Specific Commands
 
 ```bash
 # Mainnet operations
-make deploy-lbc NETWORK=mainnet
-make upgrade-lbc-broadcast NETWORK=mainnet
+make deploy-lbc NETWORK=rskMainnet
+make upgrade-lbc-broadcast NETWORK=rskMainnet
 
 # Testnet operations
-make deploy-lbc NETWORK=testnet
-make change-owner-broadcast NETWORK=testnet
+make deploy-lbc NETWORK=rskTestnet
+make change-owner-broadcast NETWORK=rskTestnet
 
 # Dev operations
 make dev-deploy
@@ -267,10 +268,10 @@ make mainnet-fork-deploy-broadcast
 
 ```bash
 # Specify fork block
-make deploy-lbc NETWORK=testnet FORK_BLOCK=6020639
+make deploy-lbc NETWORK=rskTestnet FORK_BLOCK=6020639
 
 # Use latest block
-make deploy-lbc NETWORK=mainnet FORK_BLOCK=latest
+make deploy-lbc NETWORK=rskMainnet FORK_BLOCK=latest
 ```
 
 ## Safety Features
@@ -281,10 +282,10 @@ The Makefile includes built-in safety checks:
 
 ```bash
 # Check environment configuration
-make check-env NETWORK=testnet
+make check-env NETWORK=rskTestnet
 
 # Validate deployment prerequisites
-make validate-deploy NETWORK=mainnet
+make validate-deploy NETWORK=rskMainnet
 ```
 
 ### Mainnet Protection
@@ -293,20 +294,20 @@ Mainnet deployments require explicit confirmation:
 
 ```bash
 # This will prompt for confirmation
-make safe-deploy-lbc-broadcast NETWORK=mainnet
+make safe-deploy-lbc-broadcast NETWORK=rskMainnet
 ```
 
 ### Gas Management
 
 ```bash
 # Default gas limit (10M)
-make deploy-lbc NETWORK=testnet
+make deploy-lbc NETWORK=rskTestnet
 
 # High gas limit (15M)
-make deploy-lbc-high-gas NETWORK=testnet
+make deploy-lbc-high-gas NETWORK=rskTestnet
 
 # Custom gas limit
-make deploy-lbc NETWORK=testnet GAS_LIMIT=20000000
+make deploy-lbc NETWORK=rskTestnet GAS_LIMIT=20000000
 ```
 
 ## Utility Commands
@@ -370,7 +371,7 @@ make help
 **Solution**: Use high gas commands:
 
 ```bash
-make deploy-lbc-high-gas NETWORK=testnet
+make deploy-lbc-high-gas NETWORK=rskTestnet
 ```
 
 #### 3. EIP-1559 Fee Errors
@@ -403,7 +404,7 @@ forge install
 
 ```bash
 # Check if private key is set
-make check-env NETWORK=testnet
+make check-env NETWORK=rskTestnet
 
 # Set in .env file
 TESTNET_SIGNER_PRIVATE_KEY=your_private_key
@@ -432,13 +433,13 @@ make install
 make build
 
 # 4. Test deployment (simulation)
-make deploy-lbc NETWORK=testnet
+make deploy-lbc NETWORK=rskTestnet
 
 # 5. Check environment
-make check-env NETWORK=testnet
+make check-env NETWORK=rskTestnet
 
 # 6. Actual deployment
-make deploy-lbc-broadcast NETWORK=testnet
+make deploy-lbc-broadcast NETWORK=rskTestnet
 
 # 7. Verify deployment
 make get-versions
@@ -461,13 +462,13 @@ make testnet-fork-deploy-broadcast
 
 ```bash
 # 1. Test upgrade (simulation)
-make upgrade-lbc NETWORK=testnet
+make upgrade-lbc NETWORK=rskTestnet
 
 # 2. Check environment
-make check-env NETWORK=testnet
+make check-env NETWORK=rskTestnet
 
 # 3. Perform upgrade
-make upgrade-lbc-broadcast NETWORK=testnet
+make upgrade-lbc-broadcast NETWORK=rskTestnet
 
 # 4. Verify upgrade
 make get-versions
@@ -477,13 +478,13 @@ make get-versions
 
 ```bash
 # 1. Test ownership transfer (simulation)
-make change-owner NETWORK=testnet
+make change-owner NETWORK=rskTestnet
 
 # 2. Validate multisig configuration
-make check-env NETWORK=testnet
+make check-env NETWORK=rskTestnet
 
 # 3. Transfer ownership
-make change-owner-broadcast NETWORK=testnet
+make change-owner-broadcast NETWORK=rskTestnet
 ```
 
 ## Best Practices
@@ -492,8 +493,8 @@ make change-owner-broadcast NETWORK=testnet
 
 ```bash
 # Always run simulation before actual deployment
-make deploy-lbc NETWORK=testnet
-make deploy-lbc-broadcast NETWORK=testnet
+make deploy-lbc NETWORK=rskTestnet
+make deploy-lbc-broadcast NETWORK=rskTestnet
 ```
 
 ### 2. Use Fork Testing
@@ -508,14 +509,14 @@ make mainnet-fork-deploy
 
 ```bash
 # Check configuration before deployment
-make check-env NETWORK=mainnet
+make check-env NETWORK=rskMainnet
 ```
 
 ### 4. Use Safe Commands for Mainnet
 
 ```bash
 # Safe commands include additional validation
-make safe-deploy-lbc-broadcast NETWORK=mainnet
+make safe-deploy-lbc-broadcast NETWORK=rskMainnet
 ```
 
 ### 5. Monitor Gas Usage
@@ -525,7 +526,7 @@ make safe-deploy-lbc-broadcast NETWORK=mainnet
 make gas-report
 
 # Use high gas for complex deployments
-make deploy-lbc-high-gas NETWORK=testnet
+make deploy-lbc-high-gas NETWORK=rskTestnet
 ```
 
 ### 6. Keep Dependencies Updated

docs/FOUNDRY_MAKEFILE_GUIDE.md

@@ -16,6 +16,7 @@ export default [
       "coverage/*",
       "broadcast/*",
       "out/*",
+      "lib/*",
     ],
   },
   pluginJs.configs.recommended,

eslint.config.mjs

@@ -1,5 +1,17 @@
 {
   "lib/forge-std": {
     "rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
+  },
+  "lib/openzeppelin-contracts-upgradeable": {
+    "tag": {
+      "name": "v5.6.1",
+      "rev": "7bf4727aacdbfaa0f36cbd664654d0c9e1dc52bf"
+    }
+  },
+  "lib/openzeppelin-foundry-upgrades": {
+    "tag": {
+      "name": "v0.4.0",
+      "rev": "cbce1e00305e943aa1661d43f41e5ac72c662b07"
+    }
   }
 }

foundry.lock

@@ -9,6 +9,9 @@ optimizer = true
 optimizer_runs = 1
 via_ir = false
 ffi = true
+ast = true
+build_info = true
+extra_output = ["storageLayout"]
 fs_permissions = [
     { access = "read", path = "./" },
     { access = "read-write", path = "./broadcast" },
@@ -24,7 +27,9 @@ remappings = [
   "@rsksmart/=node_modules/@rsksmart/",
   "@rsksmart/btc-transaction-solidity-helper/=node_modules/@rsksmart/btc-transaction-solidity-helper/",
   "forge-std/=lib/forge-std/src/",
-  "src/=src/"
+  "src/=src/",
+  "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/",
+  "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/"
 ]
 
 [fuzz]