diff --git a/rskj-core/src/main/java/co/rsk/peg/Bridge.java b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
index da79afb75f0..9e6144675ca 100644
--- a/rskj-core/src/main/java/co/rsk/peg/Bridge.java
+++ b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
@@ -29,6 +29,7 @@
 import co.rsk.panic.PanicProcessor;
 import co.rsk.peg.BridgeMethods.BridgeMethodExecutor;
 import co.rsk.peg.feeperkb.FeePerKbResponseCode;
+import co.rsk.peg.lockingcap.LockingCapIllegalArgumentException;
 import co.rsk.peg.vote.ABICallSpec;
 import co.rsk.peg.bitcoin.MerkleBranch;
 import co.rsk.peg.federation.Federation;
@@ -461,7 +462,7 @@ private boolean shouldReturnNullOnVoidMethods() {
         return !activations.isActive(RSKIP417);
     }
 
-    private void teardown() throws IOException {
+    private void teardown() {
         bridgeSupport.save();
     }
 
@@ -902,7 +903,7 @@ public long getRetiringFederationCreationBlockNumber(Object[] args) {
         return bridgeSupport.getRetiringFederationCreationBlockNumber();
     }
 
-    public Integer createFederation(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer createFederation(Object[] args) {
         logger.trace("createFederation");
 
         return bridgeSupport.voteFederationChange(
@@ -911,7 +912,7 @@ public Integer createFederation(Object[] args) throws BridgeIllegalArgumentExcep
         );
     }
 
-    public Integer addFederatorPublicKey(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer addFederatorPublicKey(Object[] args) {
         logger.trace("addFederatorPublicKey");
 
         byte[] publicKeyBytes;
@@ -928,7 +929,7 @@ public Integer addFederatorPublicKey(Object[] args) throws BridgeIllegalArgument
         );
     }
 
-    public Integer addFederatorPublicKeyMultikey(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer addFederatorPublicKeyMultikey(Object[] args) {
         logger.trace("addFederatorPublicKeyMultikey");
 
         byte[] btcPublicKeyBytes = (byte[]) args[0];
@@ -944,7 +945,7 @@ public Integer addFederatorPublicKeyMultikey(Object[] args) throws BridgeIllegal
         );
     }
 
-    public Integer commitFederation(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer commitFederation(Object[] args) {
         logger.trace("commitFederation");
 
         byte[] hash;
@@ -961,7 +962,7 @@ public Integer commitFederation(Object[] args) throws BridgeIllegalArgumentExcep
         );
     }
 
-    public Integer rollbackFederation(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer rollbackFederation(Object[] args) {
         logger.trace("rollbackFederation");
 
         return bridgeSupport.voteFederationChange(
@@ -1163,13 +1164,12 @@ public byte[] getActivePowpegRedeemScript(Object[] args) {
 
     public boolean increaseLockingCap(Object[] args) throws BridgeIllegalArgumentException {
         logger.trace("increaseLockingCap");
-
         Coin newLockingCap = BridgeUtils.getCoinFromBigInteger((BigInteger) args[0]);
-        if (newLockingCap.getValue() <= 0) {
-            throw new BridgeIllegalArgumentException("Locking cap must be bigger than zero");
+        try {
+            return bridgeSupport.increaseLockingCap(rskTx, newLockingCap);
+        } catch (LockingCapIllegalArgumentException e) {
+            throw new BridgeIllegalArgumentException(e);
         }
-
-        return bridgeSupport.increaseLockingCap(rskTx, newLockingCap);
     }
 
     public void registerBtcCoinbaseTransaction(Object[] args) throws VMException {
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeIllegalArgumentException.java b/rskj-core/src/main/java/co/rsk/peg/BridgeIllegalArgumentException.java
index 0cb15cfe5a2..96f0145150e 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeIllegalArgumentException.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeIllegalArgumentException.java
@@ -36,4 +36,8 @@ public BridgeIllegalArgumentException(String s) {
     public BridgeIllegalArgumentException(String message, Throwable cause) {
         super(message, cause);
     }
+
+    public BridgeIllegalArgumentException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeStorageIndexKey.java b/rskj-core/src/main/java/co/rsk/peg/BridgeStorageIndexKey.java
index 47da68f3def..9c42f5952ed 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeStorageIndexKey.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeStorageIndexKey.java
@@ -8,7 +8,6 @@ public enum BridgeStorageIndexKey {
     RELEASE_REQUEST_QUEUE("releaseRequestQueue"),
     PEGOUTS_WAITING_FOR_CONFIRMATIONS("releaseTransactionSet"),
     PEGOUTS_WAITING_FOR_SIGNATURES("rskTxsWaitingFS"),
-    LOCKING_CAP_KEY("lockingCap"),
     RELEASE_REQUEST_QUEUE_WITH_TXHASH("releaseRequestQueueWithTxHash"),
     PEGOUTS_WAITING_FOR_CONFIRMATIONS_WITH_TXHASH_KEY("releaseTransactionSetWithTxHash"),
     RECEIVE_HEADERS_TIMESTAMP("receiveHeadersLastTimestamp"),
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java b/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java
index 38c821473cc..1b9797bd1c5 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java
@@ -62,8 +62,6 @@ public class BridgeStorageProvider {
     private PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations;
     private SortedMap<Keccak256, BtcTransaction> pegoutsWaitingForSignatures;
 
-    private Coin lockingCap;
-
     private HashMap<Sha256Hash, Long> btcTxHashesToSave;
 
     private Map<Sha256Hash, CoinbaseInformation> coinbaseInformationMap;
@@ -250,26 +248,6 @@ public void savePegoutsWaitingForSignatures() {
         safeSaveToRepository(PEGOUTS_WAITING_FOR_SIGNATURES, pegoutsWaitingForSignatures, BridgeSerializationUtils::serializeMap);
     }
 
-    public void saveLockingCap() {
-        if (activations.isActive(RSKIP134)) {
-            safeSaveToRepository(LOCKING_CAP_KEY, this.getLockingCap(), BridgeSerializationUtils::serializeCoin);
-        }
-    }
-
-    public void setLockingCap(Coin lockingCap) {
-        this.lockingCap = lockingCap;
-    }
-
-    public Coin getLockingCap() {
-        if (activations.isActive(RSKIP134)) {
-            if (this.lockingCap == null) {
-                this.lockingCap = safeGetFromRepository(LOCKING_CAP_KEY, BridgeSerializationUtils::deserializeCoin);
-            }
-            return this.lockingCap;
-        }
-        return null;
-    }
-
     public CoinbaseInformation getCoinbaseInformation(Sha256Hash blockHash) {
         if (!activations.isActive(RSKIP143)) {
             return null;
@@ -395,15 +373,15 @@ public Optional<FlyoverFederationInformation> getFlyoverFederationInformation(by
             return Optional.empty();
         }
 
-        FlyoverFederationInformation flyoverFederationInformation = this.safeGetFromRepository(
+        FlyoverFederationInformation flyoverFederationInformationInStorage = this.safeGetFromRepository(
             getStorageKeyForFlyoverFederationInformation(flyoverFederationRedeemScriptHash),
             data -> BridgeSerializationUtils.deserializeFlyoverFederationInformation(data, flyoverFederationRedeemScriptHash)
         );
-        if (flyoverFederationInformation == null) {
+        if (flyoverFederationInformationInStorage == null) {
             return Optional.empty();
         }
 
-        return Optional.of(flyoverFederationInformation);
+        return Optional.of(flyoverFederationInformationInStorage);
     }
 
     public void setFlyoverFederationInformation(FlyoverFederationInformation flyoverFederationInformation) {
@@ -542,15 +520,13 @@ protected void savePegoutTxSigHashes() {
         ));
     }
 
-    public void save() throws IOException {
+    public void save() {
         saveBtcTxHashesAlreadyProcessed();
 
         saveReleaseRequestQueue();
         savePegoutsWaitingForConfirmations();
         savePegoutsWaitingForSignatures();
 
-        saveLockingCap();
-
         saveHeightBtcTxHashAlreadyProcessed();
 
         saveCoinbaseInformations();
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index 6a864cff6e6..1d8bd8a64f0 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -34,10 +34,7 @@
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
 import co.rsk.panic.PanicProcessor;
-import co.rsk.peg.bitcoin.BitcoinUtils;
-import co.rsk.peg.bitcoin.CoinbaseInformation;
-import co.rsk.peg.bitcoin.MerkleBranch;
-import co.rsk.peg.bitcoin.RskAllowUnconfirmedCoinSelector;
+import co.rsk.peg.bitcoin.*;
 import co.rsk.peg.btcLockSender.BtcLockSender.TxSenderAddressType;
 import co.rsk.peg.btcLockSender.BtcLockSenderProvider;
 import co.rsk.peg.federation.*;
@@ -45,6 +42,8 @@
 import co.rsk.peg.feeperkb.FeePerKbSupport;
 import co.rsk.peg.flyover.FlyoverFederationInformation;
 import co.rsk.peg.flyover.FlyoverTxResponseCodes;
+import co.rsk.peg.lockingcap.LockingCapIllegalArgumentException;
+import co.rsk.peg.lockingcap.LockingCapSupport;
 import co.rsk.peg.pegin.*;
 import co.rsk.peg.pegininstructions.PeginInstructionsException;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
@@ -70,9 +69,7 @@
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.PrecompiledContracts;
 import org.ethereum.vm.exception.VMException;
-import org.ethereum.vm.program.InternalTransaction;
-import org.ethereum.vm.program.Program;
-import org.ethereum.vm.program.ProgramResult;
+import org.ethereum.vm.program.*;
 import org.ethereum.vm.program.invoke.TransferInvoke;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -116,6 +113,7 @@ public class BridgeSupport {
     private final FeePerKbSupport feePerKbSupport;
     private final WhitelistSupport whitelistSupport;
     private final FederationSupport federationSupport;
+    private final LockingCapSupport lockingCapSupport;
 
     private final Context btcContext;
     private final BtcBlockStoreWithCache.Factory btcBlockStoreFactory;
@@ -138,6 +136,7 @@ public BridgeSupport(
         FeePerKbSupport feePerKbSupport,
         WhitelistSupport whitelistSupport,
         FederationSupport federationSupport,
+        LockingCapSupport lockingCapSupport,
         BtcBlockStoreWithCache.Factory btcBlockStoreFactory,
         ActivationConfig.ForBlock activations,
         SignatureCache signatureCache) {
@@ -152,6 +151,7 @@ public BridgeSupport(
         this.feePerKbSupport = feePerKbSupport;
         this.whitelistSupport = whitelistSupport;
         this.federationSupport = federationSupport;
+        this.lockingCapSupport = lockingCapSupport;
         this.btcBlockStoreFactory = btcBlockStoreFactory;
         this.activations = activations;
         this.signatureCache = signatureCache;
@@ -173,11 +173,12 @@ InputStream getCheckPoints() {
         return checkpoints;
     }
 
-    public void save() throws IOException {
+    public void save() {
         provider.save();
         feePerKbSupport.save();
         whitelistSupport.save();
         federationSupport.save();
+        lockingCapSupport.save();
     }
 
     /**
@@ -271,10 +272,9 @@ private boolean cannotProcessNextBlock(StoredBlock previousBlock) {
      * Get the wallet for the currently active federation
      * @return A BTC wallet for the currently active federation
      *
-     * @throws IOException
      * @param shouldConsiderFlyoverUTXOs
      */
-    public Wallet getActiveFederationWallet(boolean shouldConsiderFlyoverUTXOs) throws IOException {
+    public Wallet getActiveFederationWallet(boolean shouldConsiderFlyoverUTXOs) {
         Federation federation = getActiveFederation();
         List<UTXO> utxos = federationSupport.getActiveFederationBtcUTXOs();
 
@@ -292,15 +292,14 @@ public Wallet getActiveFederationWallet(boolean shouldConsiderFlyoverUTXOs) thro
      * or null if there's currently no retiring federation
      * @return A BTC wallet for the currently active federation
      *
-     * @throws IOException
      * @param shouldConsiderFlyoverUTXOs
      */
-    protected Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs) throws IOException {
+    protected Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs) {
         List<UTXO> retiringFederationBtcUTXOs = federationSupport.getRetiringFederationBtcUTXOs();
         return getRetiringFederationWallet(shouldConsiderFlyoverUTXOs, retiringFederationBtcUTXOs.size());
     }
 
-    private Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs, int utxosSizeLimit) throws IOException {
+    private Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs, int utxosSizeLimit) {
         Federation federation = getRetiringFederation();
         if (federation == null) {
             logger.debug("[getRetiringFederationWallet] No retiring federation found");
@@ -633,7 +632,7 @@ private void processPegInVersion1(
         }
     }
 
-    private void executePegIn(BtcTransaction btcTx, PeginInformation peginInformation, Coin amount) throws IOException {
+    private void executePegIn(BtcTransaction btcTx, PeginInformation peginInformation, Coin amount) {
         RskAddress rskDestinationAddress = peginInformation.getRskDestinationAddress();
         Address senderBtcAddress = peginInformation.getSenderBtcAddress();
         TxSenderAddressType senderBtcAddressType = peginInformation.getSenderBtcAddressType();
@@ -759,7 +758,7 @@ private void transferTo(RskAddress receiver, co.rsk.core.Coin amount) {
     /*
       Add the btcTx outputs that send btc to the federation(s) to the UTXO list
      */
-    private void saveNewUTXOs(BtcTransaction btcTx) throws IOException {
+    private void saveNewUTXOs(BtcTransaction btcTx) {
         // Outputs to the active federation
         Wallet activeFederationWallet = getActiveFederationWallet(false);
         List<TransactionOutput> outputsToTheActiveFederation = btcTx.getWalletOutputs(
@@ -972,9 +971,11 @@ private void processFundsMigration(Transaction rskTx) throws IOException {
             long federationAge = rskExecutionBlock.getNumber() - activeFederation.getCreationBlockNumber();
             logger.trace("[processFundsMigration] Active federation (age={}) is in migration age.", federationAge);
             if (hasMinimumFundsToMigrate(retiringFederationWallet)){
+                Coin retiringFederationBalance = retiringFederationWallet.getBalance();
+                String retiringFederationBalanceInFriendlyFormat = retiringFederationBalance.toFriendlyString();
                 logger.info(
                     "[processFundsMigration] Retiring federation has funds to migrate: {}.",
-                    retiringFederationWallet.getBalance().toFriendlyString()
+                    retiringFederationBalanceInFriendlyFormat
                 );
 
                 migrateFunds(
@@ -988,9 +989,11 @@ private void processFundsMigration(Transaction rskTx) throws IOException {
 
         if (retiringFederationWallet != null && federationIsPastMigrationAge(activeFederation)) {
             if (retiringFederationWallet.getBalance().isGreaterThan(Coin.ZERO)) {
+                Coin retiringFederationBalance = retiringFederationWallet.getBalance();
+                String retiringFederationBalanceInFriendlyFormat = retiringFederationBalance.toFriendlyString();
                 logger.info(
                     "[processFundsMigration] Federation is past migration age and will try to migrate remaining balance: {}.",
-                    retiringFederationWallet.getBalance().toFriendlyString()
+                    retiringFederationBalanceInFriendlyFormat
                 );
 
                 try {
@@ -2025,7 +2028,7 @@ private List<Federation> getLiveFederations() {
         return liveFederations;
     }
 
-    public Integer voteFederationChange(Transaction tx, ABICallSpec callSpec) throws BridgeIllegalArgumentException {
+    public Integer voteFederationChange(Transaction tx, ABICallSpec callSpec) {
         return federationSupport.voteFederationChange(tx, callSpec, signatureCache, eventLogger);
     }
 
@@ -2103,14 +2106,7 @@ public Integer setLockWhitelistDisableBlockDelay(Transaction tx, BigInteger disa
     }
 
     public Coin getLockingCap() {
-        // Before returning the locking cap, check if it was already set
-        if (activations.isActive(ConsensusRule.RSKIP134) && this.provider.getLockingCap() == null) {
-            // Set the initial locking cap value
-            logger.debug("Setting initial locking cap value");
-            this.provider.setLockingCap(bridgeConstants.getInitialLockingCap());
-        }
-
-        return this.provider.getLockingCap();
+        return lockingCapSupport.getLockingCap().orElse(null);
     }
 
     /**
@@ -2122,29 +2118,8 @@ public Optional<Script> getActiveFederationRedeemScript() {
         return federationSupport.getActiveFederationRedeemScript();
     }
 
-    public boolean increaseLockingCap(Transaction tx, Coin newCap) {
-        // Only pre-configured addresses can modify locking cap
-        AddressBasedAuthorizer authorizer = bridgeConstants.getIncreaseLockingCapAuthorizer();
-        if (!authorizer.isAuthorized(tx, signatureCache)) {
-            logger.warn("not authorized address tried to increase locking cap. Address: {}", tx.getSender(signatureCache));
-            return false;
-        }
-        // new locking cap must be bigger than current locking cap
-        Coin currentLockingCap = this.getLockingCap();
-        if (newCap.compareTo(currentLockingCap) < 0) {
-            logger.warn("attempted value doesn't increase locking cap. Attempted: {}", newCap.value);
-            return false;
-        }
-        Coin maxLockingCap = currentLockingCap.multiply(bridgeConstants.getLockingCapIncrementsMultiplier());
-        if (newCap.compareTo(maxLockingCap) > 0) {
-            logger.warn("attempted value increases locking cap above its limit. Attempted: {}", newCap.value);
-            return false;
-        }
-
-        logger.info("increased locking cap: {}", newCap.value);
-        this.provider.setLockingCap(newCap);
-
-        return true;
+    public boolean increaseLockingCap(Transaction tx, Coin newLockingCap) throws LockingCapIllegalArgumentException {
+        return lockingCapSupport.increaseLockingCap(tx, newLockingCap);
     }
 
     public void registerBtcCoinbaseTransaction(byte[] btcTxSerialized, Sha256Hash blockHash, byte[] pmtSerialized, Sha256Hash witnessMerkleRoot, byte[] witnessReservedValue) throws VMException {
@@ -2555,7 +2530,7 @@ protected void saveFlyoverActiveFederationDataInStorage(
             Keccak256 derivationHash,
             FlyoverFederationInformation flyoverFederationInformation,
             List<UTXO> utxosList
-    ) throws IOException {
+    ) {
         provider.markFlyoverDerivationHashAsUsed(btcTxHash, derivationHash);
         provider.setFlyoverFederationInformation(flyoverFederationInformation);
         federationSupport.getActiveFederationBtcUTXOs().addAll(utxosList);
@@ -2566,7 +2541,7 @@ protected void saveFlyoverRetiringFederationDataInStorage(
         Keccak256 derivationHash,
         FlyoverFederationInformation flyoverRetiringFederationInformation,
         List<UTXO> utxosList
-    ) throws IOException {
+    ) {
         provider.markFlyoverDerivationHashAsUsed(btcTxHash, derivationHash);
         provider.setFlyoverRetiringFederationInformation(flyoverRetiringFederationInformation);
         federationSupport.getRetiringFederationBtcUTXOs().addAll(utxosList);
@@ -2619,14 +2594,12 @@ private Pair<BtcTransaction, List<UTXO>> createMigrationTransaction(Wallet origi
                 }
 
                 List<UTXO> selectedUTXOs = originWallet
-                        .getUTXOProvider().getOpenTransactionOutputs(originWallet.getWatchedAddresses()).stream()
-                        .filter(utxo ->
-                                migrationBtcTx.getInputs().stream().anyMatch(input ->
-                                        input.getOutpoint().getHash().equals(utxo.getHash()) &&
-                                                input.getOutpoint().getIndex() == utxo.getIndex()
-                                )
-                        )
-                        .collect(Collectors.toList());
+                    .getUTXOProvider()
+                    .getOpenTransactionOutputs(originWallet.getWatchedAddresses())
+                    .stream()
+                    .filter(utxo -> migrationBtcTx.getInputs().stream().anyMatch(input ->
+                        input.getOutpoint().getHash().equals(utxo.getHash()) && input.getOutpoint().getIndex() == utxo.getIndex()
+                    )).collect(Collectors.toList());
 
                 return Pair.of(migrationBtcTx, selectedUTXOs);
             } catch (InsufficientMoneyException | Wallet.ExceededMaxTransactionSize | Wallet.CouldNotAdjustDownwards e) {
@@ -2758,16 +2731,16 @@ private void generateRejectionRelease(
     }
 
     private boolean verifyLockDoesNotSurpassLockingCap(BtcTransaction btcTx, Coin totalAmount) {
-        if (!activations.isActive(ConsensusRule.RSKIP134)) {
+        Optional<Coin> lockingCap = lockingCapSupport.getLockingCap();
+        if (!lockingCap.isPresent()) {
             return true;
         }
 
         Coin fedCurrentFunds = getBtcLockedInFederation();
-        Coin lockingCap = this.getLockingCap();
         logger.trace("Evaluating locking cap for: TxId {}. Value to lock {}. Current funds {}. Current locking cap {}", btcTx.getHash(true), totalAmount, fedCurrentFunds, lockingCap);
         Coin fedUTXOsAfterThisLock = fedCurrentFunds.add(totalAmount);
         // If the federation funds (including this new UTXO) are smaller than or equals to the current locking cap, we are fine.
-        if (fedUTXOsAfterThisLock.compareTo(lockingCap) <= 0) {
+        if (fedUTXOsAfterThisLock.compareTo(lockingCap.get()) <= 0) {
             return true;
         }
 
@@ -2870,7 +2843,7 @@ protected boolean validationsForRegisterBtcTransaction(Sha256Hash btcTxHash, int
         return true;
     }
 
-    private Coin computeTotalAmountSent(BtcTransaction btcTx) throws IOException {
+    private Coin computeTotalAmountSent(BtcTransaction btcTx) {
         // Compute the total amount sent. Value could have been sent both to the
         // currently active federation and to the currently retiring federation.
         // Add both amounts up in that case.
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
index ab0d67c72a1..d6783f8e4ae 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
@@ -27,6 +27,8 @@
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.*;
 import co.rsk.peg.feeperkb.constants.FeePerKbConstants;
+import co.rsk.peg.lockingcap.*;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.storage.BridgeStorageAccessorImpl;
 import co.rsk.peg.storage.StorageAccessor;
@@ -82,7 +84,12 @@ public BridgeSupport newInstance(
 
         FeePerKbSupport feePerKbSupport = getFeePerKbSupportInstance(bridgeStorageAccessor);
         WhitelistSupport whitelistSupport = getWhitelistSupportInstance(bridgeStorageAccessor, activations);
-        FederationSupport federationSupport = getFederationSupportInstance(bridgeStorageAccessor, executionBlock, activations);
+        FederationSupport federationSupport = getFederationSupportInstance(
+            bridgeStorageAccessor,
+            executionBlock,
+            activations
+        );
+        LockingCapSupport lockingCapSupport = getLockingCapSupportInstance(bridgeStorageAccessor, activations);
 
         BridgeEventLogger eventLogger = null;
         if (logs != null) {
@@ -108,6 +115,7 @@ public BridgeSupport newInstance(
             feePerKbSupport,
             whitelistSupport,
             federationSupport,
+            lockingCapSupport,
             btcBlockStoreFactory,
             activations,
             signatureCache
@@ -138,4 +146,11 @@ private FederationSupport getFederationSupportInstance(StorageAccessor bridgeSto
         FederationStorageProvider federationStorageProvider = new FederationStorageProviderImpl(bridgeStorageAccessor);
         return new FederationSupportImpl(federationConstants, federationStorageProvider, rskExecutionBlock, activations);
     }
+
+    private LockingCapSupport getLockingCapSupportInstance(StorageAccessor bridgeStorageAccessor, ActivationConfig.ForBlock activations) {
+        LockingCapConstants lockingCapConstants = bridgeConstants.getLockingCapConstants();
+        LockingCapStorageProvider lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+
+        return new LockingCapSupportImpl(lockingCapStorageProvider, activations, lockingCapConstants, signatureCache);
+    }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java
index dacd9127a5c..165681b8770 100644
--- a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java
+++ b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java
@@ -21,9 +21,8 @@
 import co.rsk.bitcoinj.core.Coin;
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.peg.federation.constants.FederationConstants;
-import co.rsk.peg.vote.AddressBasedAuthorizer;
-
 import co.rsk.peg.feeperkb.constants.FeePerKbConstants;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
 import co.rsk.peg.whitelist.constants.WhitelistConstants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
@@ -34,6 +33,7 @@ public abstract class BridgeConstants {
     protected FeePerKbConstants feePerKbConstants;
     protected WhitelistConstants whitelistConstants;
     protected FederationConstants federationConstants;
+    protected LockingCapConstants lockingCapConstants;
 
     protected int btc2RskMinimumAcceptableConfirmations;
     protected int btc2RskMinimumAcceptableConfirmationsOnRsk;
@@ -48,14 +48,6 @@ public abstract class BridgeConstants {
     protected Coin legacyMinimumPegoutTxValue;
     protected Coin minimumPegoutTxValue;
 
-    protected AddressBasedAuthorizer federationChangeAuthorizer;
-
-    protected AddressBasedAuthorizer increaseLockingCapAuthorizer;
-
-    protected Coin initialLockingCap;
-
-    protected int lockingCapIncrementsMultiplier;
-
     protected int btcHeightWhenBlockIndexActivates;
     protected int maxDepthToSearchBlocksBelowIndexActivation;
     protected long minSecondsBetweenCallsReceiveHeader;
@@ -82,6 +74,8 @@ public NetworkParameters getBtcParams() {
 
     public FederationConstants getFederationConstants() { return federationConstants; }
 
+    public LockingCapConstants getLockingCapConstants() { return lockingCapConstants; }
+
     public String getBtcParamsString() {
         return btcParamsString;
     }
@@ -110,12 +104,6 @@ public Coin getMinimumPeginTxValue(ActivationConfig.ForBlock activations) {
 
     public Coin getMinimumPegoutTxValue() { return minimumPegoutTxValue; }
 
-    public AddressBasedAuthorizer getIncreaseLockingCapAuthorizer() { return increaseLockingCapAuthorizer; }
-
-    public int getLockingCapIncrementsMultiplier() { return lockingCapIncrementsMultiplier; }
-
-    public Coin getInitialLockingCap() { return initialLockingCap; }
-
     public Coin getMaxRbtc() { return Coin.valueOf(21_000_000, 0); }
 
     public int getBtcHeightWhenBlockIndexActivates() { return btcHeightWhenBlockIndexActivates; }
diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeDevNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeDevNetConstants.java
index 72182875a96..17abc14551e 100644
--- a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeDevNetConstants.java
+++ b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeDevNetConstants.java
@@ -18,35 +18,11 @@
 
 package co.rsk.peg.constants;
 
-import co.rsk.bitcoinj.core.BtcECKey;
 import co.rsk.bitcoinj.core.Coin;
 import co.rsk.bitcoinj.core.NetworkParameters;
-import co.rsk.peg.vote.AddressBasedAuthorizer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.bouncycastle.util.encoders.Hex;
-import org.ethereum.crypto.ECKey;
 
 public class BridgeDevNetConstants extends BridgeConstants {
-    // IMPORTANT: BTC, RSK and MST keys are the same.
-    // Change upon implementation of the <INSERT FORK NAME HERE> fork.
-    public static final List<BtcECKey> DEVNET_FEDERATION_PUBLIC_KEYS = Collections.unmodifiableList(Arrays.asList(
-        BtcECKey.fromPublicOnly(
-            Hex.decode("03d68975ab0f6ab782febc37aaa486ae19cc5e72c6900e34e21317285c88915ed6")
-        ),
-        BtcECKey.fromPublicOnly(
-            Hex.decode("02914c05df0b11862ac6931c226ad40ebc4f5624ee6dca34278d3bbfa73b914cbd")
-        ),
-        BtcECKey.fromPublicOnly(
-            Hex.decode("0309d9df35855aa45235a04e30d228889eb03e462874588e631359d5f9cdea6519")
-        )
-    ));
-    private static final BridgeDevNetConstants instance = new BridgeDevNetConstants(DEVNET_FEDERATION_PUBLIC_KEYS);
-
-    public BridgeDevNetConstants(List<BtcECKey> federationPublicKeys) {
+    public BridgeDevNetConstants() {
         btcParamsString = NetworkParameters.ID_TESTNET;
 
         btc2RskMinimumAcceptableConfirmations = 1;
@@ -62,35 +38,6 @@ public BridgeDevNetConstants(List<BtcECKey> federationPublicKeys) {
         minimumPeginTxValue = Coin.valueOf(500_000);
         minimumPegoutTxValue = Coin.valueOf(250_000);
 
-        // Keys generated with GenNodeKey using generators 'auth-a' through 'auth-e'
-        List<ECKey> federationChangeAuthorizedKeys = Arrays.stream(new String[]{
-            "04dde17c5fab31ffc53c91c2390136c325bb8690dc135b0840075dd7b86910d8ab9e88baad0c32f3eea8833446a6bc5ff1cd2efa99ecb17801bcb65fc16fc7d991",
-            "04af886c67231476807e2a8eee9193878b9d94e30aa2ee469a9611d20e1e1c1b438e5044148f65e6e61bf03e9d72e597cb9cdea96d6fc044001b22099f9ec403e2",
-            "045d4dedf9c69ab3ea139d0f0da0ad00160b7663d01ce7a6155cd44a3567d360112b0480ab6f31cac7345b5f64862205ea7ccf555fcf218f87fa0d801008fecb61",
-            "04709f002ac4642b6a87ea0a9dc76eeaa93f71b3185985817ec1827eae34b46b5d869320efb5c5cbe2a5c13f96463fe0210710b53352a4314188daffe07bd54154",
-//           "04aff62315e9c18004392a5d9e39496ff5794b2d9f43ab4e8ade64740d7fdfe896969be859b43f26ef5aa4b5a0d11808277b4abfa1a07cc39f2839b89cc2bc6b4c"
-            "0447b4aba974c61c6c4045893267346730ec965b308e7ca04a899cf06a901face3106e1eef1bdad04928cd8263522eda4872d20d3fe1ef5e551785c4a482656a6e"
-        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
-
-        federationChangeAuthorizer = new AddressBasedAuthorizer(
-            federationChangeAuthorizedKeys,
-            AddressBasedAuthorizer.MinimumRequiredCalculation.MAJORITY
-        );
-
-        // Key generated with GenNodeKey using generator 'auth-increase_locking_cap'
-        List<ECKey> increaseLockingCapAuthorizedKeys = Arrays.stream(new String[]{
-            "04450bbaab83ec48b3cb8fbb077c950ee079733041c039a8c4f1539e5181ca1a27589eeaf0fbf430e49d2909f14c767bf6909ad6845831f683416ee12b832e36ed"
-        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
-
-        increaseLockingCapAuthorizer = new AddressBasedAuthorizer(
-            increaseLockingCapAuthorizedKeys,
-            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
-        );
-
-        initialLockingCap = Coin.COIN.multiply(1_000L); // 1_000 BTC
-
-        lockingCapIncrementsMultiplier = 2;
-
         btcHeightWhenBlockIndexActivates = 700_000;
         maxDepthToSearchBlocksBelowIndexActivation = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
 
@@ -107,8 +54,4 @@ public BridgeDevNetConstants(List<BtcECKey> federationPublicKeys) {
         btcHeightWhenPegoutTxIndexActivates = 1_000_000;
         pegoutTxIndexGracePeriodInBtcBlocks = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
     }
-
-    public static BridgeDevNetConstants getInstance() {
-        return instance;
-    }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java
index 13200fd9ed7..6cd47e7fe9b 100644
--- a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java
+++ b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java
@@ -4,13 +4,8 @@
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.peg.federation.constants.FederationMainNetConstants;
 import co.rsk.peg.feeperkb.constants.FeePerKbMainNetConstants;
-import co.rsk.peg.vote.AddressBasedAuthorizer;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
 import co.rsk.peg.whitelist.constants.WhitelistMainNetConstants;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.bouncycastle.util.encoders.Hex;
-import org.ethereum.crypto.ECKey;
 
 public class BridgeMainNetConstants extends BridgeConstants {
     private static final BridgeMainNetConstants instance = new BridgeMainNetConstants();
@@ -20,6 +15,7 @@ private BridgeMainNetConstants() {
         feePerKbConstants = FeePerKbMainNetConstants.getInstance();
         whitelistConstants = WhitelistMainNetConstants.getInstance();
         federationConstants = FederationMainNetConstants.getInstance();
+        lockingCapConstants = LockingCapMainNetConstants.getInstance();
 
         btc2RskMinimumAcceptableConfirmations = 100;
         btc2RskMinimumAcceptableConfirmationsOnRsk = 1000;
@@ -34,20 +30,6 @@ private BridgeMainNetConstants() {
         minimumPeginTxValue = Coin.valueOf(500_000);
         minimumPegoutTxValue = Coin.valueOf(400_000);
 
-        List<ECKey> increaseLockingCapAuthorizedKeys = Arrays.stream(new String[]{
-            "0448f51638348b034995b1fd934fe14c92afde783e69f120a46ee16eb6bdc2e4f6b5e37772094c68c0dea2b1be3d96ea9651a9eebda7304914c8047f4e3e251378",
-            "0484c66f75548baf93e322574adac4e4579b6a53f8d11fab640e14c90118e6983ef24b0de349a3e88f72e81e771ae1c897cef446fd7f4da71778c532aee3b6c41b",
-            "04bb6435dc1ea12da843ebe213893d136c1624acd681fff82551498ae00bf28e9323164b00daf925fa75177463b8254a2aae8a1713e4d851a84ea369c193e9ce51"
-        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
-
-        increaseLockingCapAuthorizer = new AddressBasedAuthorizer(
-            increaseLockingCapAuthorizedKeys,
-            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
-        );
-
-        lockingCapIncrementsMultiplier = 2;
-        initialLockingCap = Coin.COIN.multiply(300); // 300 BTC
-
         btcHeightWhenBlockIndexActivates = 696_022;
         maxDepthToSearchBlocksBelowIndexActivation = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java
index e22042cb48e..21abf6fa72f 100644
--- a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java
+++ b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java
@@ -23,18 +23,15 @@
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.peg.federation.constants.FederationRegTestConstants;
 import co.rsk.peg.feeperkb.constants.FeePerKbRegTestConstants;
-import co.rsk.peg.vote.AddressBasedAuthorizer;
+import co.rsk.peg.lockingcap.constants.LockingCapRegTestConstants;
 import co.rsk.peg.whitelist.constants.WhitelistRegTestConstants;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.bouncycastle.util.encoders.Hex;
-import org.ethereum.crypto.ECKey;
 
 public class BridgeRegTestConstants extends BridgeConstants {
-
     private static final List<BtcECKey> defaultFederationPublicKeys = Collections.unmodifiableList(Stream.of(
         "0362634ab57dae9cb373a5d536e66a8c4f67468bbcfb063809bab643072d78a124",
         "03c5946b3fbae03a654237da863c9ed534e0878657175b132b8ca630f245df04db",
@@ -50,6 +47,7 @@ public BridgeRegTestConstants(List<BtcECKey> federationPublicKeys) {
         feePerKbConstants = FeePerKbRegTestConstants.getInstance();
         whitelistConstants = WhitelistRegTestConstants.getInstance();
         federationConstants = new FederationRegTestConstants(federationPublicKeys);
+        lockingCapConstants = LockingCapRegTestConstants.getInstance();
 
         btc2RskMinimumAcceptableConfirmations = 3;
         btc2RskMinimumAcceptableConfirmationsOnRsk = 5;
@@ -64,24 +62,10 @@ public BridgeRegTestConstants(List<BtcECKey> federationPublicKeys) {
         minimumPeginTxValue = Coin.COIN.div(2);
         minimumPegoutTxValue = Coin.valueOf(250_000);
 
-        initialLockingCap = Coin.COIN.multiply(1_000L); // 1_000 BTC
-
-        lockingCapIncrementsMultiplier = 2;
-
         minSecondsBetweenCallsReceiveHeader = 300;  // 5 minutes in seconds
 
         maxDepthBlockchainAccepted = 25;
 
-        // Key generated with GenNodeKey using generator 'auth-increase_locking_cap'
-        List<ECKey> increaseLockingCapAuthorizedKeys = Arrays.stream(new String[]{
-            "04450bbaab83ec48b3cb8fbb077c950ee079733041c039a8c4f1539e5181ca1a27589eeaf0fbf430e49d2909f14c767bf6909ad6845831f683416ee12b832e36ed"
-        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
-
-        increaseLockingCapAuthorizer = new AddressBasedAuthorizer(
-            increaseLockingCapAuthorizedKeys,
-            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
-        );
-
         btcHeightWhenBlockIndexActivates = 10;
         maxDepthToSearchBlocksBelowIndexActivation = 5;
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java
index 040262d4922..ba52b2a9546 100644
--- a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java
+++ b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java
@@ -21,14 +21,9 @@
 import co.rsk.bitcoinj.core.Coin;
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.peg.federation.constants.FederationTestNetConstants;
-import co.rsk.peg.vote.AddressBasedAuthorizer;
-import co.rsk.peg.whitelist.constants.WhitelistTestNetConstants;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 import co.rsk.peg.feeperkb.constants.FeePerKbTestNetConstants;
-import org.bouncycastle.util.encoders.Hex;
-import org.ethereum.crypto.ECKey;
+import co.rsk.peg.lockingcap.constants.LockingCapTestNetConstants;
+import co.rsk.peg.whitelist.constants.WhitelistTestNetConstants;
 
 public class BridgeTestNetConstants extends BridgeConstants {
     private static final BridgeTestNetConstants instance = new BridgeTestNetConstants();
@@ -38,6 +33,7 @@ public class BridgeTestNetConstants extends BridgeConstants {
         feePerKbConstants = FeePerKbTestNetConstants.getInstance();
         whitelistConstants = WhitelistTestNetConstants.getInstance();
         federationConstants = FederationTestNetConstants.getInstance();
+        lockingCapConstants = LockingCapTestNetConstants.getInstance();
 
         btc2RskMinimumAcceptableConfirmations = 10;
         btc2RskMinimumAcceptableConfirmationsOnRsk = 10;
@@ -52,20 +48,6 @@ public class BridgeTestNetConstants extends BridgeConstants {
         legacyMinimumPegoutTxValue = Coin.valueOf(500_000);
         minimumPegoutTxValue = Coin.valueOf(250_000);
 
-        List<ECKey> increaseLockingCapAuthorizedKeys = Arrays.stream(new String[]{
-            "04701d1d27f8c2ae97912d96fb1f82f10c2395fd320e7a869049268c6b53d2060dfb2e22e3248955332d88cd2ae29a398f8f3858e48dd6d8ffbc37dfd6d1aa4934",
-            "045ef89e4a5645dc68895dbc33b4c966c3a0a52bb837ecdd2ba448604c4f47266456d1191420e1d32bbe8741f8315fde4d1440908d400e5998dbed6549d499559b",
-            "0455db9b3867c14e84a6f58bd2165f13bfdba0703cb84ea85788373a6a109f3717e40483aa1f8ef947f435ccdf10e530dd8b3025aa2d4a7014f12180ee3a301d27"
-        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
-
-        increaseLockingCapAuthorizer = new AddressBasedAuthorizer(
-            increaseLockingCapAuthorizedKeys,
-            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
-        );
-
-        lockingCapIncrementsMultiplier = 2;
-        initialLockingCap = Coin.COIN.multiply(200); // 200 BTC
-
         btcHeightWhenBlockIndexActivates = 2_039_594;
         maxDepthToSearchBlocksBelowIndexActivation = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
index e0526a7b8bf..0f623dc6eb1 100644
--- a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
@@ -47,7 +47,12 @@ public interface FederationSupport {
     byte[] getPendingFederatorBtcPublicKey(int index);
     byte[] getPendingFederatorPublicKeyOfType(int index, FederationMember.KeyType keyType);
 
-    int voteFederationChange(Transaction tx, ABICallSpec callSpec, SignatureCache signatureCache, BridgeEventLogger eventLogger);
+    int voteFederationChange(
+        Transaction tx,
+        ABICallSpec callSpec,
+        SignatureCache signatureCache,
+        BridgeEventLogger eventLogger
+    );
     long getActiveFederationCreationBlockHeight();
     Optional<Script> getLastRetiredFederationP2SHScript();
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapIllegalArgumentException.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapIllegalArgumentException.java
new file mode 100644
index 00000000000..d3f4afcea28
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapIllegalArgumentException.java
@@ -0,0 +1,18 @@
+package co.rsk.peg.lockingcap;
+
+import org.ethereum.vm.exception.VMException;
+
+public class LockingCapIllegalArgumentException extends VMException {
+
+    public LockingCapIllegalArgumentException() {
+        super();
+    }
+
+    public LockingCapIllegalArgumentException(String message) {
+        super(message);
+    }
+
+    public LockingCapIllegalArgumentException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageIndexKey.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageIndexKey.java
new file mode 100644
index 00000000000..38fed2b0cab
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageIndexKey.java
@@ -0,0 +1,17 @@
+package co.rsk.peg.lockingcap;
+
+import org.ethereum.vm.DataWord;
+
+public enum LockingCapStorageIndexKey {
+    LOCKING_CAP("lockingCap");
+
+    private final String key;
+
+    LockingCapStorageIndexKey(String key) {
+        this.key = key;
+    }
+
+    public DataWord getKey() {
+        return DataWord.fromString(key);
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageProvider.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageProvider.java
new file mode 100644
index 00000000000..724777694ae
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageProvider.java
@@ -0,0 +1,14 @@
+package co.rsk.peg.lockingcap;
+
+import co.rsk.bitcoinj.core.Coin;
+import java.util.Optional;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+
+public interface LockingCapStorageProvider {
+
+    Optional<Coin> getLockingCap(ActivationConfig.ForBlock activations);
+
+    void setLockingCap(Coin lockingCap);
+
+    void save(ActivationConfig.ForBlock activations);
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImpl.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImpl.java
new file mode 100644
index 00000000000..a9cd99f27c7
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImpl.java
@@ -0,0 +1,55 @@
+package co.rsk.peg.lockingcap;
+
+import static co.rsk.peg.lockingcap.LockingCapStorageIndexKey.LOCKING_CAP;
+import static org.ethereum.config.blockchain.upgrades.ConsensusRule.RSKIP134;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.BridgeSerializationUtils;
+import co.rsk.peg.storage.StorageAccessor;
+import java.util.Optional;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+
+public class LockingCapStorageProviderImpl implements LockingCapStorageProvider {
+
+    private Coin lockingCap;
+    private final StorageAccessor bridgeStorageAccessor;
+
+    public LockingCapStorageProviderImpl(StorageAccessor bridgeStorageAccessor) {
+        this.bridgeStorageAccessor = bridgeStorageAccessor;
+    }
+
+    @Override
+    public Optional<Coin> getLockingCap(ActivationConfig.ForBlock activations) {
+        if (!activations.isActive(RSKIP134)) {
+            return Optional.empty();
+        }
+
+        if (lockingCap == null) {
+            initializeLockingCap();
+        }
+        return Optional.ofNullable(lockingCap);
+    }
+
+    private synchronized void initializeLockingCap() {
+        lockingCap = bridgeStorageAccessor.getFromRepository(LOCKING_CAP.getKey(), BridgeSerializationUtils::deserializeCoin);
+    }
+
+    @Override
+    public void setLockingCap(Coin lockingCap) {
+        this.lockingCap = lockingCap;
+    }
+
+    @Override
+    public void save(ActivationConfig.ForBlock activations) {
+        if (!activations.isActive(RSKIP134)) {
+            return;
+        }
+
+        Coin currentLockingCap = getLockingCap(activations).orElse(null);
+        bridgeStorageAccessor.saveToRepository(
+            LOCKING_CAP.getKey(),
+            currentLockingCap,
+            BridgeSerializationUtils::serializeCoin
+        );
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapSupport.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapSupport.java
new file mode 100644
index 00000000000..762c092f6ea
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapSupport.java
@@ -0,0 +1,14 @@
+package co.rsk.peg.lockingcap;
+
+import co.rsk.bitcoinj.core.Coin;
+import java.util.Optional;
+import org.ethereum.core.Transaction;
+
+public interface LockingCapSupport {
+
+    Optional<Coin> getLockingCap();
+
+    boolean increaseLockingCap(Transaction tx, Coin newCap) throws LockingCapIllegalArgumentException;
+
+    void save();
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapSupportImpl.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapSupportImpl.java
new file mode 100644
index 00000000000..3696d2cfbd5
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/LockingCapSupportImpl.java
@@ -0,0 +1,95 @@
+package co.rsk.peg.lockingcap;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
+import co.rsk.peg.vote.AddressBasedAuthorizer;
+import java.util.Optional;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+import org.ethereum.config.blockchain.upgrades.ConsensusRule;
+import org.ethereum.core.SignatureCache;
+import org.ethereum.core.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LockingCapSupportImpl implements LockingCapSupport {
+
+    private static final Logger logger = LoggerFactory.getLogger(LockingCapSupportImpl.class);
+    private final LockingCapStorageProvider storageProvider;
+    private final ActivationConfig.ForBlock activations;
+    private final LockingCapConstants constants;
+    private final SignatureCache signatureCache;
+
+    public LockingCapSupportImpl(
+        LockingCapStorageProvider storageProvider,
+        ActivationConfig.ForBlock activations,
+        LockingCapConstants constants,
+        SignatureCache signatureCache
+    ) {
+        this.storageProvider = storageProvider;
+        this.activations = activations;
+        this.constants = constants;
+        this.signatureCache = signatureCache;
+    }
+
+    @Override
+    public Optional<Coin> getLockingCap() {
+        Optional<Coin> lockingCap = storageProvider.getLockingCap(activations);
+
+        // Before returning the locking cap, check if it was already set
+        if (!lockingCap.isPresent() && activations.isActive(ConsensusRule.RSKIP134)) {
+            // Set the initial Locking Cap value
+            logger.debug("[getLockingCap] {}", "Setting initial Locking Cap value");
+            storageProvider.setLockingCap(constants.getInitialValue());
+        }
+        return storageProvider.getLockingCap(activations);
+    }
+
+    @Override
+    public boolean increaseLockingCap(Transaction tx, Coin newLockingCap) throws LockingCapIllegalArgumentException {
+        final String INCREASE_LOCKING_CAP_TAG = "increaseLockingCap";
+
+        if (newLockingCap.getValue() <= 0) {
+            String baseMessage = String.format("Locking Cap must be greater than zero. Value attempted: %d", newLockingCap.value);
+            logger.warn("[{}] {}}", INCREASE_LOCKING_CAP_TAG, baseMessage);
+            throw new LockingCapIllegalArgumentException(baseMessage);
+        }
+
+        // Only pre-configured addresses can modify Locking Cap
+        AddressBasedAuthorizer authorizer = constants.getIncreaseAuthorizer();
+        if (!authorizer.isAuthorized(tx, signatureCache)) {
+            logger.warn("[{}] An unauthorized address tried to increase Locking Cap. Address: {}", INCREASE_LOCKING_CAP_TAG, tx.getSender(signatureCache));
+            return false;
+        }
+
+        // New Locking Cap must be bigger than current Locking Cap
+        Optional<Coin> currentLockingCap = getLockingCap();
+
+        if (!currentLockingCap.isPresent()) {
+            logger.warn("[{}] Current Locking Cap is not set since RSKIP134 is not active. Value attempted: {}", INCREASE_LOCKING_CAP_TAG, newLockingCap.value);
+            return false;
+        }
+
+        Coin lockingCap = currentLockingCap.get();
+
+        if (newLockingCap.compareTo(lockingCap) < 0) {
+            logger.warn("[{}] Attempted value doesn't increase Locking Cap. Value attempted: {}", INCREASE_LOCKING_CAP_TAG, newLockingCap.value);
+            return false;
+        }
+
+        Coin maxLockingCapVoteValueAllowed = lockingCap.multiply(constants.getIncrementsMultiplier());
+        if (newLockingCap.compareTo(maxLockingCapVoteValueAllowed) > 0) {
+            logger.warn("[{}] Attempted value tries to increase Locking Cap above its limit. Value attempted: {} . maxLockingCapVoteValueAllowed: {}", INCREASE_LOCKING_CAP_TAG, newLockingCap.value, maxLockingCapVoteValueAllowed.value);
+            return false;
+        }
+
+        storageProvider.setLockingCap(newLockingCap);
+        logger.info("[{}] Increased locking cap: {}", INCREASE_LOCKING_CAP_TAG, newLockingCap.value);
+
+        return true;
+    }
+
+    @Override
+    public void save() {
+        storageProvider.save(activations);
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapConstants.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapConstants.java
new file mode 100644
index 00000000000..b0a916dcb67
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapConstants.java
@@ -0,0 +1,23 @@
+package co.rsk.peg.lockingcap.constants;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.vote.AddressBasedAuthorizer;
+
+public class LockingCapConstants {
+
+    protected AddressBasedAuthorizer increaseAuthorizer;
+    protected Coin initialValue;
+    protected int incrementsMultiplier;
+
+    public AddressBasedAuthorizer getIncreaseAuthorizer() {
+        return increaseAuthorizer;
+    }
+
+    public Coin getInitialValue() {
+        return initialValue;
+    }
+
+    public int getIncrementsMultiplier() {
+        return incrementsMultiplier;
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapMainNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapMainNetConstants.java
new file mode 100644
index 00000000000..01e0e2b37bf
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapMainNetConstants.java
@@ -0,0 +1,35 @@
+package co.rsk.peg.lockingcap.constants;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.vote.AddressBasedAuthorizer;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.bouncycastle.util.encoders.Hex;
+import org.ethereum.crypto.ECKey;
+
+public class LockingCapMainNetConstants extends LockingCapConstants {
+
+    private static final LockingCapMainNetConstants instance = new LockingCapMainNetConstants();
+
+    private LockingCapMainNetConstants() {
+        List<ECKey> increaseAuthorizedKeys = Collections.unmodifiableList(Stream.of(
+            "0448f51638348b034995b1fd934fe14c92afde783e69f120a46ee16eb6bdc2e4f6b5e37772094c68c0dea2b1be3d96ea9651a9eebda7304914c8047f4e3e251378",
+            "0484c66f75548baf93e322574adac4e4579b6a53f8d11fab640e14c90118e6983ef24b0de349a3e88f72e81e771ae1c897cef446fd7f4da71778c532aee3b6c41b",
+            "04bb6435dc1ea12da843ebe213893d136c1624acd681fff82551498ae00bf28e9323164b00daf925fa75177463b8254a2aae8a1713e4d851a84ea369c193e9ce51"
+        ).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList()));
+
+        increaseAuthorizer = new AddressBasedAuthorizer(
+            increaseAuthorizedKeys,
+            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
+        );
+
+        initialValue = Coin.COIN.multiply(300L); // 300 BTC
+        incrementsMultiplier = 2;
+    }
+
+    public static LockingCapMainNetConstants getInstance() {
+        return instance;
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapRegTestConstants.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapRegTestConstants.java
new file mode 100644
index 00000000000..2df976a04ff
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapRegTestConstants.java
@@ -0,0 +1,33 @@
+package co.rsk.peg.lockingcap.constants;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.vote.AddressBasedAuthorizer;
+import java.util.Collections;
+import java.util.List;
+import org.bouncycastle.util.encoders.Hex;
+import org.ethereum.crypto.ECKey;
+
+public class LockingCapRegTestConstants extends LockingCapConstants {
+
+    private static final LockingCapRegTestConstants instance = new LockingCapRegTestConstants();
+
+    private LockingCapRegTestConstants() {
+        ECKey authorizerPublicKey = ECKey.fromPublicOnly(Hex.decode(
+            "04450bbaab83ec48b3cb8fbb077c950ee079733041c039a8c4f1539e5181ca1a27589eeaf0fbf430e49d2909f14c767bf6909ad6845831f683416ee12b832e36ed"
+        ));
+
+        List<ECKey> increaseAuthorizedKeys = Collections.singletonList(authorizerPublicKey);
+
+        increaseAuthorizer = new AddressBasedAuthorizer(
+            increaseAuthorizedKeys,
+            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
+        );
+
+        initialValue = Coin.COIN.multiply(1_000L); // 1000 BTC
+        incrementsMultiplier = 2;
+    }
+
+    public static LockingCapRegTestConstants getInstance() {
+        return instance;
+    }
+}
diff --git a/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapTestNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapTestNetConstants.java
new file mode 100644
index 00000000000..1a8985907c5
--- /dev/null
+++ b/rskj-core/src/main/java/co/rsk/peg/lockingcap/constants/LockingCapTestNetConstants.java
@@ -0,0 +1,35 @@
+package co.rsk.peg.lockingcap.constants;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.vote.AddressBasedAuthorizer;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.bouncycastle.util.encoders.Hex;
+import org.ethereum.crypto.ECKey;
+
+public class LockingCapTestNetConstants extends LockingCapConstants {
+
+    private static final LockingCapTestNetConstants instance = new LockingCapTestNetConstants();
+
+    private LockingCapTestNetConstants() {
+        List<ECKey> increaseAuthorizedKeys = Collections.unmodifiableList(Stream.of(
+            "04701d1d27f8c2ae97912d96fb1f82f10c2395fd320e7a869049268c6b53d2060dfb2e22e3248955332d88cd2ae29a398f8f3858e48dd6d8ffbc37dfd6d1aa4934",
+            "045ef89e4a5645dc68895dbc33b4c966c3a0a52bb837ecdd2ba448604c4f47266456d1191420e1d32bbe8741f8315fde4d1440908d400e5998dbed6549d499559b",
+            "0455db9b3867c14e84a6f58bd2165f13bfdba0703cb84ea85788373a6a109f3717e40483aa1f8ef947f435ccdf10e530dd8b3025aa2d4a7014f12180ee3a301d27"
+        ).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList()));
+
+        increaseAuthorizer = new AddressBasedAuthorizer(
+            increaseAuthorizedKeys,
+            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
+        );
+
+        initialValue = Coin.COIN.multiply(200L); // 200 BTC
+        incrementsMultiplier = 2;
+    }
+
+    public static LockingCapTestNetConstants getInstance() {
+        return instance;
+    }
+}
diff --git a/rskj-core/src/main/java/org/ethereum/config/Constants.java b/rskj-core/src/main/java/org/ethereum/config/Constants.java
index 906c468e327..984c335d53d 100644
--- a/rskj-core/src/main/java/org/ethereum/config/Constants.java
+++ b/rskj-core/src/main/java/org/ethereum/config/Constants.java
@@ -239,17 +239,17 @@ public static Constants mainnet() {
         );
     }
 
-    public static Constants devnetWithFederation(List<BtcECKey> federationPublicKeys) {
+    public static Constants devnetWithFederation() {
         return new Constants(
-                DEVNET_CHAIN_ID,
-                false,
-                14,
-                new BlockDifficulty(BigInteger.valueOf(131072)),
-                new BlockDifficulty(BigInteger.valueOf((long) 14E15)),
-                BigInteger.valueOf(50),
-                540,
-                new BridgeDevNetConstants(federationPublicKeys),
-                new BlockDifficulty(new BigInteger("550000000"))
+            DEVNET_CHAIN_ID,
+            false,
+            14,
+            new BlockDifficulty(BigInteger.valueOf(131072)),
+            new BlockDifficulty(BigInteger.valueOf((long) 14E15)),
+            BigInteger.valueOf(50),
+            540,
+            new BridgeDevNetConstants(),
+            new BlockDifficulty(new BigInteger("550000000"))
         );
     }
 
diff --git a/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java b/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
index 925d1604aca..0f30adb8b27 100644
--- a/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
+++ b/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
@@ -20,7 +20,6 @@
 package org.ethereum.config;
 
 import co.rsk.bitcoinj.core.BtcECKey;
-import co.rsk.peg.constants.BridgeDevNetConstants;
 import co.rsk.config.ConfigLoader;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
@@ -180,9 +179,7 @@ public Constants getNetworkConstants() {
                     constants = Constants.testnet(getActivationConfig());
                     break;
                 case "devnet":
-                    constants = Constants.devnetWithFederation(
-                            getGenesisFederationPublicKeys().orElse(BridgeDevNetConstants.DEVNET_FEDERATION_PUBLIC_KEYS)
-                    );
+                    constants = Constants.devnetWithFederation();
                     break;
                 case "regtest":
                     constants = getGenesisFederationPublicKeys()
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
index fdd61330e53..553712e46b5 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
@@ -102,8 +102,8 @@ void createInstance() throws IOException {
 
     @Test
     void createSaveAndRecreateInstanceWithProcessedHashes() throws IOException {
-        Sha256Hash hash1 = PegTestUtils.createHash();
-        Sha256Hash hash2 = PegTestUtils.createHash();
+        Sha256Hash hash1 = BitcoinTestUtils.createHash(1);
+        Sha256Hash hash2 = BitcoinTestUtils.createHash(2);
 
         Repository repository = createRepository();
         Repository track = repository.startTracking();
@@ -218,23 +218,30 @@ void getReleaseRequestQueue_after_rskip_146_activation() throws IOException {
 
         Repository repositoryMock = mock(Repository.class);
 
-        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).
-            thenReturn(BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Arrays.asList(oldEntry)))));
+        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).thenReturn(
+            BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Collections.singletonList(oldEntry))))
+        );
 
-        BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"), testnetBtcParams,
-            activations);
+        BridgeStorageProvider storageProvider = new BridgeStorageProvider(
+            repositoryMock,
+            mockAddress("aabbccdd"),
+            testnetBtcParams,
+            activations
+        );
 
         ReleaseRequestQueue releaseRequestQueue = storageProvider.getReleaseRequestQueue();
 
-        releaseRequestQueue.add(Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
+        releaseRequestQueue.add(
+            Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
             Coin.COIN,
-            PegTestUtils.createHash3(0));
+            PegTestUtils.createHash3(0)
+        );
 
         ReleaseRequestQueue result = storageProvider.getReleaseRequestQueue();
 
-        Assertions.assertEquals(2, result.getEntries().size());
-        Assertions.assertEquals(result.getEntries().get(0), oldEntry);
-        Assertions.assertEquals(result.getEntries().get(1), newEntry);
+        assertEquals(2, result.getEntries().size());
+        assertEquals(result.getEntries().get(0), oldEntry);
+        assertEquals(result.getEntries().get(1), newEntry);
     }
 
     @Test
@@ -248,10 +255,9 @@ void saveReleaseRequestQueue_before_rskip_146_activation() throws IOException {
                 Coin.COIN)));
 
         ReleaseRequestQueue releaseRequestQueue = storageProvider.getReleaseRequestQueue();
-        releaseRequestQueue.add(Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mmWJhA74Pd6peL39V3AmtGHdGdJ4PyeXvL"),
-            Coin.COIN);
+        releaseRequestQueue.add(Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mmWJhA74Pd6peL39V3AmtGHdGdJ4PyeXvL"), Coin.COIN);
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             List<ReleaseRequestQueue.Entry> entries = BridgeSerializationUtils.deserializeReleaseRequestQueue(i.getArgument(2), testnetBtcParams);
             Assertions.assertEquals(oldEntriesList, entries);
             return true;
@@ -268,22 +274,21 @@ void saveReleaseRequestQueue_after_rskip_146_activation() throws IOException {
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP146)).thenReturn(true);
 
-        ReleaseRequestQueue.Entry newEntry =
-            new ReleaseRequestQueue.Entry(
-                Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
-                Coin.COIN,
-                PegTestUtils.createHash3(0)
-            );
+        ReleaseRequestQueue.Entry newEntry = new ReleaseRequestQueue.Entry(
+            Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
+            Coin.COIN,
+            PegTestUtils.createHash3(0)
+        );
 
-        ReleaseRequestQueue.Entry oldEntry =
-            new ReleaseRequestQueue.Entry(
-                Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
-                Coin.COIN
-            );
+        ReleaseRequestQueue.Entry oldEntry = new ReleaseRequestQueue.Entry(
+            Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
+            Coin.COIN
+        );
 
         Repository repositoryMock = mock(Repository.class);
-        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).
-            thenReturn(BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Arrays.asList(oldEntry)))));
+        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).thenReturn(
+            BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Collections.singletonList(oldEntry))))
+        );
 
         BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"), testnetBtcParams, activations);
         ReleaseRequestQueue releaseRequestQueue = storageProvider.getReleaseRequestQueue();
@@ -293,15 +298,15 @@ void saveReleaseRequestQueue_after_rskip_146_activation() throws IOException {
             PegTestUtils.createHash3(0)
         );
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             List<ReleaseRequestQueue.Entry> entries = BridgeSerializationUtils.deserializeReleaseRequestQueue(i.getArgument(2), testnetBtcParams);
-            Assertions.assertEquals(entries, new ArrayList<>(Arrays.asList(oldEntry)));
+            Assertions.assertEquals(entries, new ArrayList<>(Collections.singletonList(oldEntry)));
             return true;
         }).when(repositoryMock).addStorageBytes(any(RskAddress.class), eq(RELEASE_REQUEST_QUEUE.getKey()), any(byte[].class));
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             List<ReleaseRequestQueue.Entry> entries = BridgeSerializationUtils.deserializeReleaseRequestQueue(i.getArgument(2), testnetBtcParams, true);
-            Assertions.assertEquals(entries, new ArrayList<>(Arrays.asList(newEntry)));
+            Assertions.assertEquals(entries, new ArrayList<>(Collections.singletonList(newEntry)));
             return true;
         }).when(repositoryMock).addStorageBytes(any(RskAddress.class), eq(RELEASE_REQUEST_QUEUE_WITH_TXHASH.getKey()), any(byte[].class));
 
@@ -348,18 +353,25 @@ void getPegoutsWaitingForConfirmations_after_rskip_146_activation() throws IOExc
         when(repositoryMock.getStorageBytes(any(RskAddress.class), eq(PEGOUTS_WAITING_FOR_CONFIRMATIONS.getKey())))
             .thenReturn(BridgeSerializationUtils.serializePegoutsWaitingForConfirmations(new PegoutsWaitingForConfirmations(oldEntriesSet)));
 
-        BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"),
-            testnetBtcParams, activations);
+        BridgeStorageProvider storageProvider = new BridgeStorageProvider(
+            repositoryMock,
+            mockAddress("aabbccdd"),
+            testnetBtcParams,
+            activations
+        );
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = storageProvider.getPegoutsWaitingForConfirmations();
 
-        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(testnetBtcParams, PegTestUtils.createHash(0)),
+        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(
+            testnetBtcParams,
+            BitcoinTestUtils.createHash(0)),
             1L,
-            PegTestUtils.createHash3(0));
+            PegTestUtils.createHash3(0)
+        );
 
         PegoutsWaitingForConfirmations result = storageProvider.getPegoutsWaitingForConfirmations();
 
-        Assertions.assertEquals(2, result.getEntries().size());
+        assertEquals(2, result.getEntries().size());
     }
 
     @Test
@@ -374,7 +386,7 @@ void savePegoutsWaitingForConfirmations_before_rskip_146_activations() throws IO
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = storageProvider.getPegoutsWaitingForConfirmations();
         pegoutsWaitingForConfirmations.add(new BtcTransaction(testnetBtcParams), 1L);
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             Set<PegoutsWaitingForConfirmations.Entry> entries = BridgeSerializationUtils.deserializePegoutsWaitingForConfirmations(i.getArgument(2), testnetBtcParams).getEntries();
             Assertions.assertEquals(oldEntriesSet, entries);
             return true;
@@ -407,17 +419,20 @@ void savePegoutsWaitingForConfirmations_after_rskip_146_activations() throws IOE
         BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"), testnetBtcParams, activations);
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = storageProvider.getPegoutsWaitingForConfirmations();
 
-        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(testnetBtcParams, PegTestUtils.createHash(1)),
+        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(
+            testnetBtcParams,
+            BitcoinTestUtils.createHash(1)),
             1L,
-            PegTestUtils.createHash3(0));
+            PegTestUtils.createHash3(0)
+        );
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             Set<PegoutsWaitingForConfirmations.Entry> entries = BridgeSerializationUtils.deserializePegoutsWaitingForConfirmations(i.getArgument(2), testnetBtcParams).getEntries();
             Assertions.assertEquals(entries, oldEntriesSet);
             return true;
         }).when(repositoryMock).addStorageBytes(any(RskAddress.class), eq(PEGOUTS_WAITING_FOR_CONFIRMATIONS.getKey()), any(byte[].class));
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             Set<PegoutsWaitingForConfirmations.Entry> entries = BridgeSerializationUtils.deserializePegoutsWaitingForConfirmations(i.getArgument(2), testnetBtcParams, true).getEntries();
             Assertions.assertEquals(entries, newEntriesSet);
             return true;
@@ -469,112 +484,6 @@ void getReleaseTransaction_after_rskip_146_activations() throws IOException {
         Assertions.assertEquals(0, provider.getPegoutsWaitingForSignatures().size());
     }
 
-    @Test
-    void setLockingCap_before_fork() {
-        Repository repository = mock(Repository.class);
-
-        BridgeStorageProvider provider0 = new BridgeStorageProvider(
-            repository, bridgeAddress,
-            testnetBtcParams, activationsBeforeFork
-        );
-
-        provider0.setLockingCap(Coin.ZERO);
-        provider0.saveLockingCap();
-
-        // If the network upgrade is not enabled we shouldn't be writing in the repository
-        verify(repository, never()).addStorageBytes(any(), any(), any());
-    }
-
-    @Test
-    void setLockingCap_after_fork() {
-        Repository repository = mock(Repository.class);
-
-        BridgeStorageProvider provider0 = new BridgeStorageProvider(
-            repository,
-            bridgeAddress,
-            testnetBtcParams,
-            activationsAllForks
-        );
-
-        provider0.setLockingCap(Coin.ZERO);
-        provider0.saveLockingCap();
-
-        // Once the network upgrade is active, we will store the locking cap in the repository
-        verify(repository, times(1)).addStorageBytes(
-            bridgeAddress,
-            LOCKING_CAP_KEY.getKey(),
-            BridgeSerializationUtils.serializeCoin(Coin.ZERO)
-        );
-    }
-
-    @Test
-    void getLockingCap_before_fork() {
-        Repository repository = mock(Repository.class);
-
-        BridgeStorageProvider provider0 = new BridgeStorageProvider(
-            repository,
-            bridgeAddress,
-            testnetBtcParams,
-            activationsBeforeFork
-        );
-
-        assertNull(provider0.getLockingCap());
-
-        // If the network upgrade is not enabled we shouldn't be reading the repository
-        verify(repository, never()).getStorageBytes(bridgeAddress, LOCKING_CAP_KEY.getKey());
-    }
-
-    @Test
-    void getLockingCap_after_fork() {
-        Repository repository = mock(Repository.class);
-        // If by chance the repository is called I want to force the tests to fail
-        when(repository.getStorageBytes(bridgeAddress, LOCKING_CAP_KEY.getKey())).thenReturn(new byte[] { 1 });
-
-        BridgeStorageProvider provider0 = new BridgeStorageProvider(
-            repository,
-            bridgeAddress,
-            testnetBtcParams,
-            activationsAllForks
-        );
-
-        assertEquals(Coin.SATOSHI, provider0.getLockingCap());
-
-        // If the network upgrade is not enabled we shouldn't be reading the repository
-        verify(repository, atLeastOnce()).getStorageBytes(bridgeAddress, LOCKING_CAP_KEY.getKey());
-    }
-
-    @Test
-    void setLockingCapAndGetLockingCap() {
-        Repository repository = createRepository();
-        Repository track = repository.startTracking();
-
-        BridgeStorageProvider provider0 = new BridgeStorageProvider(
-            track,
-            bridgeAddress,
-            testnetBtcParams,
-            activationsAllForks
-        );
-
-        Coin expectedCoin = Coin.valueOf(666);
-
-        // We store the locking cap
-        provider0.setLockingCap(expectedCoin);
-        provider0.saveLockingCap();
-        track.commit();
-
-        track = repository.startTracking();
-
-        BridgeStorageProvider provider = new BridgeStorageProvider(
-            track,
-            bridgeAddress,
-            testnetBtcParams,
-            activationsAllForks
-        );
-
-        // And then we get it back
-        assertEquals(expectedCoin, provider.getLockingCap());
-    }
-
     @Test
     void getHeightIfBtcTxhashIsAlreadyProcessed_before_RSKIP134_does_not_use_new_storage() throws IOException {
         Repository repository = mock(Repository.class);
@@ -812,7 +721,7 @@ void setCoinBaseInformation_after_RSKIP143() {
     }
 
     @Test
-    void saveCoinBaseInformation_before_RSKIP143() throws IOException {
+    void saveCoinBaseInformation_before_RSKIP143() {
         Repository repository = mock(Repository.class);
 
         Sha256Hash hash = Sha256Hash.ZERO_HASH;
@@ -841,7 +750,7 @@ void saveCoinBaseInformation_before_RSKIP143() throws IOException {
     }
 
     @Test
-    void saveCoinBaseInformation_after_RSKIP143() throws IOException {
+    void saveCoinBaseInformation_after_RSKIP143() {
         Repository repository = mock(Repository.class);
 
         Sha256Hash hash = Sha256Hash.ZERO_HASH;
@@ -905,7 +814,7 @@ void getBtcBestBlockHashByHeight_afterRskip199_hashNotFound() {
 
     @Test
     void getBtcBestBlockHashByHeight_afterRskip199() {
-        Sha256Hash blockHash = PegTestUtils.createHash(2);
+        Sha256Hash blockHash = BitcoinTestUtils.createHash(2);
         byte[] serializedHash = BridgeSerializationUtils.serializeSha256Hash(blockHash);
 
         Repository repository = mock(Repository.class);
@@ -926,9 +835,9 @@ void getBtcBestBlockHashByHeight_afterRskip199() {
     }
 
     @Test
-    void saveBtcBlocksIndex_beforeRskip199() throws IOException {
+    void saveBtcBlocksIndex_beforeRskip199() {
         int blockHeight = 100;
-        Sha256Hash blockHash = PegTestUtils.createHash(2);
+        Sha256Hash blockHash = BitcoinTestUtils.createHash(2);
         byte[] serializedHash = BridgeSerializationUtils.serializeSha256Hash(blockHash);
 
         DataWord storageKey = DataWord.fromLongString("btcBlockHeight-" + blockHeight);
@@ -953,11 +862,11 @@ void saveBtcBlocksIndex_beforeRskip199() throws IOException {
     }
 
     @Test
-    void saveBtcBlocksIndex_afterRskip199() throws IOException {
+    void saveBtcBlocksIndex_afterRskip199() {
         int blockHeight = 100;
         DataWord storageKey = DataWord.fromLongString("btcBlockHeight-" + blockHeight);
 
-        Sha256Hash blockHash = PegTestUtils.createHash(2);
+        Sha256Hash blockHash = BitcoinTestUtils.createHash(2);
         byte[] serializedHash = BridgeSerializationUtils.serializeSha256Hash(blockHash);
 
         Repository repository = mock(Repository.class);
@@ -1010,7 +919,7 @@ void isFlyoverFederationDerivationHashUsed_beforeRSKIP176_returnFalse() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(false);
@@ -1031,7 +940,7 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsNull_returnFalse() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         when(repository.getStorageBytes(
             bridgeAddress,
@@ -1057,7 +966,7 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsEmpty_returnFalse() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         when(repository.getStorageBytes(
             bridgeAddress,
@@ -1083,7 +992,7 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsWrongValue_returnFalse(
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         when(repository.getStorageBytes(
             bridgeAddress,
@@ -1105,11 +1014,11 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsWrongValue_returnFalse(
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_afterRSKIP176_ok() throws IOException {
+    void saveDerivationArgumentsScriptHash_afterRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(true);
@@ -1134,7 +1043,7 @@ void saveDerivationArgumentsScriptHash_afterRSKIP176_ok() throws IOException {
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullBtcTxHash_notSaved() throws IOException {
+    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullBtcTxHash_notSaved() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
@@ -1156,11 +1065,10 @@ void saveDerivationArgumentsScriptHash_afterRSKIP176_nullBtcTxHash_notSaved() th
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullDerivationHash_notSaved()
-        throws IOException {
+    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullDerivationHash_notSaved() {
         Repository repository = mock(Repository.class);
 
-        Sha256Hash btcTxHash = PegTestUtils.createHash(1);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(1);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(true);
@@ -1180,11 +1088,11 @@ void saveDerivationArgumentsScriptHash_afterRSKIP176_nullDerivationHash_notSaved
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_beforeRSKIP176_ok() throws IOException {
+    void saveDerivationArgumentsScriptHash_beforeRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(false);
@@ -1337,7 +1245,7 @@ void getFlyoverFederationInformation_arrayEmpty_returnEmpty() {
     }
 
     @Test
-    void saveFlyoverFederationInformation_afterRSKIP176_ok() throws IOException {
+    void saveFlyoverFederationInformation_afterRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(2);
@@ -1370,7 +1278,7 @@ void saveFlyoverFederationInformation_afterRSKIP176_ok() throws IOException {
     }
 
     @Test
-    void saveFlyoverFederationInformation_beforeRSKIP176_ok() throws IOException {
+    void saveFlyoverFederationInformation_beforeRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(2);
@@ -1403,7 +1311,7 @@ void saveFlyoverFederationInformation_beforeRSKIP176_ok() throws IOException {
     }
 
     @Test
-    void saveFlyoverFederationInformation_alreadySet_dont_set_again() throws IOException {
+    void saveFlyoverFederationInformation_alreadySet_dont_set_again() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(2);
@@ -1483,7 +1391,7 @@ void getReceiveHeadersLastTimestamp_not_in_repository() {
     }
 
     @Test
-    void saveReceiveHeadersLastTimestamp_before_RSKIP200() throws IOException {
+    void saveReceiveHeadersLastTimestamp_before_RSKIP200() {
         Repository repository = mock(Repository.class);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -1502,7 +1410,7 @@ void saveReceiveHeadersLastTimestamp_before_RSKIP200() throws IOException {
     }
 
     @Test
-    void saveReceiveHeadersLastTimestamp_after_RSKIP200() throws IOException {
+    void saveReceiveHeadersLastTimestamp_after_RSKIP200() {
         Repository repository = mock(Repository.class);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -1522,7 +1430,7 @@ void saveReceiveHeadersLastTimestamp_after_RSKIP200() throws IOException {
     }
 
     @Test
-    void saveReceiveHeadersLastTimestamp_not_set() throws IOException {
+    void saveReceiveHeadersLastTimestamp_not_set() {
         Repository repository = mock(Repository.class);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -1666,7 +1574,11 @@ void getReleaseRequestQueueSize_when_releaseRequestQueue_is_not_null() throws IO
 
     private BtcTransaction createTransaction() {
         BtcTransaction tx = new BtcTransaction(testnetBtcParams);
-        tx.addInput(PegTestUtils.createHash(), transactionOffset++, ScriptBuilder.createInputScript(new TransactionSignature(BigInteger.ONE, BigInteger.TEN)));
+        tx.addInput(
+            BitcoinTestUtils.createHash(1),
+            transactionOffset++,
+            ScriptBuilder.createInputScript(new TransactionSignature(BigInteger.ONE, BigInteger.TEN))
+        );
 
         return tx;
     }
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java
index 703d4e89d90..325d72a477a 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportAddSignatureTest.java
@@ -2,6 +2,7 @@
 
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.FeePerKbSupport;
+import co.rsk.peg.lockingcap.LockingCapSupport;
 import co.rsk.peg.whitelist.WhitelistSupport;
 import java.time.Instant;
 import java.math.BigInteger;
@@ -81,6 +82,7 @@ class BridgeSupportAddSignatureTest {
     private ActivationConfig.ForBlock activationsAfterForks;
     private BridgeSupportBuilder bridgeSupportBuilder;
     private WhitelistSupport whitelistSupport;
+    private LockingCapSupport lockingCapSupport;
 
     @BeforeEach
     void setUpOnEachTest() {
@@ -88,6 +90,7 @@ void setUpOnEachTest() {
         activationsAfterForks = ActivationConfigsForTest.all().forBlock(0);
         bridgeSupportBuilder = new BridgeSupportBuilder();
         whitelistSupport = mock(WhitelistSupport.class);
+        lockingCapSupport = mock(LockingCapSupport.class);
     }
 
     @Test
@@ -125,6 +128,7 @@ void addSignature_fedPubKey_belongs_to_active_federation() throws Exception {
             feePerKbSupport,
             whitelistSupport,
             mockFederationSupport,
+            lockingCapSupport,
             null,
             null,
             null
@@ -160,6 +164,7 @@ void addSignature_fedPubKey_belongs_to_retiring_federation() throws Exception {
             feePerKbSupport,
             whitelistSupport,
             mockFederationSupport,
+            lockingCapSupport,
             null,
             null,
             null
@@ -226,6 +231,7 @@ void addSignature_fedPubKey_no_belong_to_retiring_or_active_federation() throws
             feePerKbSupport,
             whitelistSupport,
             mockFederationSupport,
+            lockingCapSupport,
             null,
             null,
             null
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
index ec8cf2953eb..5ad61c3762e 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
@@ -35,6 +35,7 @@
 import co.rsk.peg.feeperkb.FeePerKbSupport;
 import co.rsk.peg.flyover.FlyoverFederationInformation;
 import co.rsk.peg.flyover.FlyoverTxResponseCodes;
+import co.rsk.peg.lockingcap.LockingCapSupport;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.storage.BridgeStorageAccessorImpl;
 import co.rsk.peg.storage.StorageAccessor;
@@ -79,6 +80,7 @@ class BridgeSupportFlyoverTest {
     protected final NetworkParameters btcRegTestParams = bridgeConstantsRegtest.getBtcParams();
     protected final NetworkParameters btcMainnetParams = bridgeConstantsMainnet.getBtcParams();
     private BridgeSupportBuilder bridgeSupportBuilder;
+    private LockingCapSupport lockingCapSupport;
     private WhitelistSupport whitelistSupport;
     private FederationSupportBuilder federationSupportBuilder;
     private ActivationConfig.ForBlock activations;
@@ -91,6 +93,7 @@ void setUpOnEachTest() {
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(true);
         when(activations.isActive(ConsensusRule.RSKIP219)).thenReturn(true);
         bridgeSupportBuilder = new BridgeSupportBuilder();
+        lockingCapSupport = mock(LockingCapSupport.class);
         whitelistSupport = mock(WhitelistSupport.class);
         federationSupportBuilder = new FederationSupportBuilder();
     }
@@ -732,8 +735,9 @@ private BigInteger sendFundsSurpassesLockingCapToAnyAddress(
         when(federationStorageProvider.getNewFederation(bridgeConstantsRegtest.getFederationConstants(), activations)).thenReturn(activeFederation);
         when(federationStorageProvider.getOldFederation(bridgeConstantsRegtest.getFederationConstants(), activations)).thenReturn(retiringFederation);
 
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(lockingCapValue));
+
         BridgeStorageProvider provider = mock(BridgeStorageProvider.class);
-        when(provider.getLockingCap()).thenReturn(lockingCapValue);
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = new PegoutsWaitingForConfirmations(new HashSet<>());
         when(provider.getPegoutsWaitingForConfirmations()).thenReturn(pegoutsWaitingForConfirmations);
@@ -772,6 +776,7 @@ private BigInteger sendFundsSurpassesLockingCapToAnyAddress(
             .withExecutionBlock(executionBlock)
             .withRepository(repository)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         Keccak256 derivationArgumentsHash = PegTestUtils.createHash3(0);
@@ -1865,9 +1870,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
         FederationStorageProvider federationStorageProvider = new FederationStorageProviderImpl(bridgeStorageAccessor);
         federationStorageProvider.setNewFederation(activeFederation);
 
-        Coin lockingCapValue = Coin.COIN;
         BridgeStorageProvider provider = spy(new BridgeStorageProvider(repository, PrecompiledContracts.BRIDGE_ADDR, bridgeConstants.getBtcParams(), activations));
-        provider.setLockingCap(lockingCapValue);
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = new PegoutsWaitingForConfirmations(new HashSet<>());
         doReturn(pegoutsWaitingForConfirmations).when(provider).getPegoutsWaitingForConfirmations();
@@ -1884,6 +1887,9 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
         FeePerKbSupport feePerKbSupport = mock(FeePerKbSupport.class);
         when(feePerKbSupport.getFeePerKb()).thenReturn(Coin.MILLICOIN);
 
+        Coin lockingCap = Coin.COIN;
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(lockingCap));
+
         FederationSupport federationSupport = federationSupportBuilder
             .withFederationConstants(federationConstantsSpy)
             .withFederationStorageProvider(federationStorageProvider)
@@ -1900,6 +1906,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
             .withRepository(repository)
             .withFederationSupport(federationSupport)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         Keccak256 derivationArgumentsHash = PegTestUtils.createHash3(0);
@@ -2072,9 +2079,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
         FederationStorageProvider federationStorageProvider = new FederationStorageProviderImpl(bridgeStorageAccessor);
         federationStorageProvider.setNewFederation(activeFederation);
 
-        Coin lockingCapValue = Coin.COIN;
         BridgeStorageProvider provider = spy(new BridgeStorageProvider(repository, PrecompiledContracts.BRIDGE_ADDR, bridgeConstants.getBtcParams(), activations));
-        provider.setLockingCap(lockingCapValue);
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = new PegoutsWaitingForConfirmations(new HashSet<>());
         doReturn(pegoutsWaitingForConfirmations).when(provider).getPegoutsWaitingForConfirmations();
@@ -2091,6 +2096,9 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
         FeePerKbSupport feePerKbSupport = mock(FeePerKbSupport.class);
         when(feePerKbSupport.getFeePerKb()).thenReturn(Coin.MILLICOIN);
 
+        Coin lockingCapValue = Coin.COIN;
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(lockingCapValue));
+
         FederationSupport federationSupport = federationSupportBuilder
             .withFederationConstants(bridgeConstants.getFederationConstants())
             .withFederationStorageProvider(federationStorageProvider)
@@ -2106,6 +2114,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
             .withRepository(repository)
             .withFeePerKbSupport(feePerKbSupport)
             .withFederationSupport(federationSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         Keccak256 derivationArgumentsHash = PegTestUtils.createHash3(0);
@@ -2230,7 +2239,8 @@ void registerFlyoverBtcTransaction_failed_when_tx_with_witness_surpassing_lockin
         // Perform another flyover pegin using the same BtcTx but without witness and no surpassing locking cap this time
         // We expect the pegin gets processed successfully
         btcTx.setWitness(0, null);
-        provider.setLockingCap(lockingCapValue.multiply(3));
+
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(lockingCapValue.multiply(3)));
 
         result = bridgeSupport.registerFlyoverBtcTransaction(
             rskTx,
@@ -2287,7 +2297,8 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_surpassing_loc
 
         Coin lockingCapValue = Coin.COIN;
         BridgeStorageProvider provider = spy(new BridgeStorageProvider(repository, PrecompiledContracts.BRIDGE_ADDR, bridgeConstants.getBtcParams(), activations));
-        provider.setLockingCap(lockingCapValue);
+
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(lockingCapValue));
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = new PegoutsWaitingForConfirmations(new HashSet<>());
         doReturn(pegoutsWaitingForConfirmations).when(provider).getPegoutsWaitingForConfirmations();
@@ -2320,6 +2331,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_surpassing_loc
             .withRepository(repository)
             .withFederationSupport(federationSupport)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         Keccak256 derivationArgumentsHash = PegTestUtils.createHash3(0);
@@ -2475,7 +2487,8 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_surpassing_loc
 
         Coin lockingCapValue = Coin.COIN;
         BridgeStorageProvider provider = spy(new BridgeStorageProvider(repository, PrecompiledContracts.BRIDGE_ADDR, bridgeConstants.getBtcParams(), activations));
-        provider.setLockingCap(lockingCapValue);
+
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(lockingCapValue));
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = new PegoutsWaitingForConfirmations(new HashSet<>());
         doReturn(pegoutsWaitingForConfirmations).when(provider).getPegoutsWaitingForConfirmations();
@@ -2508,6 +2521,7 @@ void registerFlyoverBtcTransaction_failed_when_tx_without_witness_surpassing_loc
             .withRepository(repository)
             .withFederationSupport(federationSupport)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         Keccak256 derivationArgumentsHash = PegTestUtils.createHash3(0);
@@ -2957,6 +2971,7 @@ void registerFlyoverBtcTransaction_amount_sent_is_0()
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3028,6 +3043,8 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_t
         FeePerKbSupport feePerKbSupport = mock(FeePerKbSupport.class);
         when(feePerKbSupport.getFeePerKb()).thenReturn(Coin.MILLICOIN);
 
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(Coin.COIN));
+
         BridgeSupport bridgeSupport = spy(new BridgeSupport(
             bridgeConstantsRegtest,
             provider,
@@ -3040,6 +3057,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_t
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3048,7 +3066,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_t
 
         doReturn(genesisFederation).when(bridgeSupport).getActiveFederation();
         doReturn(true).when(bridgeSupport).validationsForRegisterBtcTransaction(any(), anyInt(), any(), any());
-        doReturn(Coin.COIN).when(bridgeSupport).getLockingCap();
+
         doReturn(PegTestUtils.createHash3(1)).when(bridgeSupport).getFlyoverDerivationHash(
             any(Keccak256.class),
             any(Address.class),
@@ -3121,6 +3139,8 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_f
         FeePerKbSupport feePerKbSupport = mock(FeePerKbSupport.class);
         when(feePerKbSupport.getFeePerKb()).thenReturn(Coin.MILLICOIN);
 
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(Coin.COIN));
+
         BridgeSupport bridgeSupport = spy(new BridgeSupport(
             bridgeConstantsRegtest,
             provider,
@@ -3133,6 +3153,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_f
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3142,7 +3163,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_f
 
         doReturn(genesisFederation).when(bridgeSupport).getActiveFederation();
         doReturn(true).when(bridgeSupport).validationsForRegisterBtcTransaction(any(), anyInt(), any(), any());
-        doReturn(Coin.COIN).when(bridgeSupport).getLockingCap();
+
         doReturn(PegTestUtils.createHash3(1)).when(bridgeSupport).getFlyoverDerivationHash(
             any(Keccak256.class),
             any(Address.class),
@@ -3228,6 +3249,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_tries_to_register_a
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3237,9 +3259,9 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_tries_to_register_a
         doReturn(genesisFederation).when(bridgeSupport).getActiveFederation();
         doReturn(true).when(bridgeSupport).validationsForRegisterBtcTransaction(any(), anyInt(), any(), any());
         doReturn(
-            Coin.COIN, // The first time we simulate a lower locking cap than the value to register, to force the reimburse
-            Coin.FIFTY_COINS // The next time we simulate a hight locking cap, to verify the user can't attempt to register the already reimbursed tx
-        ).when(bridgeSupport).getLockingCap();
+            Optional.of(Coin.COIN), // The first time we simulate a lower locking cap than the value to register, to force the reimburse
+            Optional.of(Coin.FIFTY_COINS) // The next time we simulate a height locking cap, to verify the user can't attempt to register the already reimbursed tx
+        ).when(lockingCapSupport).getLockingCap();
         doReturn(PegTestUtils.createHash3(1)).when(bridgeSupport).getFlyoverDerivationHash(
             any(Keccak256.class),
             any(Address.class),
@@ -3338,6 +3360,7 @@ void registerFlyoverBtcTransaction_OK()
             feePerKbSupport,
             whitelistSupport,
             federationSupport,
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3449,6 +3472,7 @@ void createFlyoverFederationInformation_OK() {
             feePerKbSupport,
             whitelistSupport,
             federationSupport,
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3501,6 +3525,7 @@ void getFlyoverWallet_ok() {
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
index 387e7c3adec..278dc839795 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
@@ -45,6 +45,11 @@
 import co.rsk.peg.federation.FederationMember.KeyType;
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.FeePerKbSupport;
+import co.rsk.peg.lockingcap.LockingCapStorageProvider;
+import co.rsk.peg.lockingcap.LockingCapStorageProviderImpl;
+import co.rsk.peg.lockingcap.LockingCapSupport;
+import co.rsk.peg.lockingcap.LockingCapSupportImpl;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.simples.SimpleBlockChain;
 import co.rsk.peg.storage.*;
@@ -125,6 +130,7 @@ public class BridgeSupportIT {
     private FeePerKbSupport feePerKbSupport;
     private WhitelistSupport whitelistSupport;
     private WhitelistStorageProvider whitelistStorageProvider;
+    private LockingCapSupport lockingCapSupport;
 
     @BeforeEach
     void setUpOnEachTest() {
@@ -146,6 +152,13 @@ void setUpOnEachTest() {
             activations,
             signatureCache
         );
+        LockingCapStorageProvider lockingCapStorageProvider = new LockingCapStorageProviderImpl(inMemoryStorage);
+        lockingCapSupport = new LockingCapSupportImpl(
+            lockingCapStorageProvider,
+            activations,
+            LockingCapMainNetConstants.getInstance(),
+            signatureCache
+        );
     }
 
     @Test
@@ -310,6 +323,7 @@ void testGetBtcBlockchainBlockLocatorWithBtcCheckpoints() throws Exception {
             feePerKbSupport,
             whitelistSupport,
             federationSupport,
+            lockingCapSupport,
             btcBlockStoreFactory,
             mock(ActivationConfig.ForBlock.class),
             signatureCache
@@ -913,12 +927,23 @@ void callUpdateCollectionsChangeGetsOutOfDust() throws IOException {
     void callUpdateCollectionsWithTransactionsWaitingForConfirmationWithEnoughConfirmations() throws IOException {
         try (MockedStatic<BridgeUtils> bridgeUtilsMocked = mockStatic(BridgeUtils.class)) {
             // Fake wallet returned every time
-            bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(any(Context.class), any(Federation.class), any(List.class), anyBoolean(), any())).thenReturn(mock(Wallet.class));
+            bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(
+                any(Context.class),
+                any(Federation.class),
+                any(List.class),
+                anyBoolean(),
+                any()
+            )).thenReturn(mock(Wallet.class));
 
             Repository repository = createRepository();
             Repository track = repository.startTracking();
 
-            BridgeStorageProvider provider0 = new BridgeStorageProvider(track, PrecompiledContracts.BRIDGE_ADDR, bridgeConstants.getBtcParams(), activationsBeforeForks);
+            BridgeStorageProvider provider0 = new BridgeStorageProvider(
+                track,
+                PrecompiledContracts.BRIDGE_ADDR,
+                bridgeConstants.getBtcParams(),
+                activationsBeforeForks
+            );
 
             BtcTransaction txs = new BtcTransaction(btcParams);
             txs.addOutput(Coin.FIFTY_COINS, new BtcECKey());
@@ -2291,7 +2316,6 @@ void getRetiringFederationMethods_presentNewActive() {
         );
 
         Block mockedBlock = mock(Block.class);
-        Repository mockedRepository = mock(Repository.class);
 
         // New federation should be active in this block
         when(mockedBlock.getNumber()).thenReturn(25L);
@@ -2349,15 +2373,27 @@ void getPendingFederationMethods_present() {
         assertEquals(5, bridgeSupport.getPendingFederationSize().intValue());
         List<FederationMember> members = FederationTestUtils.getFederationMembers(5);
         for (int i = 0; i < 5; i++) {
-            assertTrue(Arrays.equals(members.get(i).getBtcPublicKey().getPubKey(), bridgeSupport.getPendingFederatorBtcPublicKey(i)));
-            assertTrue(Arrays.equals(members.get(i).getBtcPublicKey().getPubKey(), bridgeSupport.getPendingFederatorPublicKeyOfType(i, FederationMember.KeyType.BTC)));
-            assertTrue(Arrays.equals(members.get(i).getRskPublicKey().getPubKey(true), bridgeSupport.getPendingFederatorPublicKeyOfType(i, FederationMember.KeyType.RSK)));
-            assertTrue(Arrays.equals(members.get(i).getMstPublicKey().getPubKey(true), bridgeSupport.getPendingFederatorPublicKeyOfType(i, FederationMember.KeyType.MST)));
+            assertArrayEquals(
+                members.get(i).getBtcPublicKey().getPubKey(),
+                bridgeSupport.getPendingFederatorBtcPublicKey(i)
+            );
+            assertArrayEquals(
+                members.get(i).getBtcPublicKey().getPubKey(),
+                bridgeSupport.getPendingFederatorPublicKeyOfType(i, KeyType.BTC)
+            );
+            assertArrayEquals(
+                members.get(i).getRskPublicKey().getPubKey(true),
+                bridgeSupport.getPendingFederatorPublicKeyOfType(i, KeyType.RSK)
+            );
+            assertArrayEquals(
+                members.get(i).getMstPublicKey().getPubKey(true),
+                bridgeSupport.getPendingFederatorPublicKeyOfType(i, KeyType.MST)
+            );
         }
     }
 
     @Test
-    void voteFederationChange_methodNotAllowed() throws BridgeIllegalArgumentException {
+    void voteFederationChange_methodNotAllowed() {
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2368,11 +2404,14 @@ void voteFederationChange_methodNotAllowed() throws BridgeIllegalArgumentExcepti
             null
         );
         ABICallSpec spec = new ABICallSpec("a-random-method", new byte[][]{});
-        assertEquals(FederationChangeResponseCode.GENERIC_ERROR.getCode(), bridgeSupport.voteFederationChange(mock(Transaction.class), spec));
+        assertEquals(
+            FederationChangeResponseCode.GENERIC_ERROR.getCode(),
+            bridgeSupport.voteFederationChange(mock(Transaction.class), spec)
+        );
     }
 
     @Test
-    void voteFederationChange_notAuthorized() throws BridgeIllegalArgumentException {
+    void voteFederationChange_notAuthorized() {
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2385,7 +2424,10 @@ void voteFederationChange_notAuthorized() throws BridgeIllegalArgumentException
         ABICallSpec spec = new ABICallSpec("create", new byte[][]{});
         Transaction mockedTx = mock(Transaction.class);
         when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(12L)).getAddress()));
-        assertEquals(FederationChangeResponseCode.GENERIC_ERROR.getCode(), bridgeSupport.voteFederationChange(mockedTx, spec));
+        assertEquals(
+            FederationChangeResponseCode.GENERIC_ERROR.getCode(),
+            bridgeSupport.voteFederationChange(mockedTx, spec)
+        );
     }
 
     private static class VotingMocksProvider {
@@ -2438,13 +2480,13 @@ public void setWinner(ABICallSpec winner) {
             this.winner = winner;
         }
 
-        public int execute(BridgeSupport bridgeSupport) throws BridgeIllegalArgumentException {
+        public int execute(BridgeSupport bridgeSupport) {
             return bridgeSupport.voteFederationChange(tx, spec);
         }
     }
 
     @Test
-    void createFederation_ok() throws BridgeIllegalArgumentException {
+    void createFederation_ok() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, true);
 
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
@@ -2473,7 +2515,7 @@ void createFederation_ok() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void createFederation_pendingExists() throws BridgeIllegalArgumentException {
+    void createFederation_pendingExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, false);
 
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
@@ -2495,7 +2537,7 @@ void createFederation_pendingExists() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void createFederation_withPendingActivation() throws BridgeIllegalArgumentException {
+    void createFederation_withPendingActivation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, false);
         NetworkParameters btcParams = NetworkParameters.fromID(NetworkParameters.ID_REGTEST);
 
@@ -2547,7 +2589,7 @@ void createFederation_withPendingActivation() throws BridgeIllegalArgumentExcept
     }
 
     @Test
-    void createFederation_withExistingRetiringFederation() throws BridgeIllegalArgumentException {
+    void createFederation_withExistingRetiringFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, false);
         NetworkParameters btcParams = NetworkParameters.fromID(NetworkParameters.ID_REGTEST);
 
@@ -2599,7 +2641,7 @@ void createFederation_withExistingRetiringFederation() throws BridgeIllegalArgum
     }
 
     @Test
-    void addFederatorPublicKey_okNoKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_okNoKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, true);
@@ -2647,14 +2689,14 @@ void addFederatorPublicKey_okNoKeys() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_okKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")
         }, true);
 
-        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
+        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Collections.singletonList(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-        })));
+        )));
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2691,7 +2733,7 @@ void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
         assertArrayEquals(
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.MST)
-);
+        );
 
         assertArrayEquals(
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
@@ -2700,7 +2742,7 @@ void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
         assertArrayEquals(
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.BTC)
-);
+        );
         assertArrayEquals(
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.RSK)
@@ -2715,7 +2757,7 @@ void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKey_noPendingFederation() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")
         }, false);
@@ -2739,14 +2781,14 @@ void addFederatorPublicKey_noPendingFederation() throws BridgeIllegalArgumentExc
     }
 
     @Test
-    void addFederatorPublicKey_keyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_keyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
+        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Collections.singletonList(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-        })));
+        )));
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2766,7 +2808,7 @@ void addFederatorPublicKey_keyExists() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKey_invalidKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("aabbccdd")
         }, false);
@@ -2790,7 +2832,7 @@ void addFederatorPublicKey_invalidKey() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_okNoKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_okNoKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("026289413837ab836eb76428406a3b4f200418d31d99c259a0532b8e435f35153b"),
@@ -2819,22 +2861,31 @@ void addFederatorPublicKeyMultikey_okNoKeys() throws BridgeIllegalArgumentExcept
         mocksProvider.setWinner(mocksProvider.getSpec());
         assertEquals(1, mocksProvider.execute(bridgeSupport));
         assertEquals(1, bridgeSupport.getPendingFederationSize().intValue());
-        assertTrue(Arrays.equals(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.BTC)));
-        assertTrue(Arrays.equals(Hex.decode("026289413837ab836eb76428406a3b4f200418d31d99c259a0532b8e435f35153b"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.RSK)));
-        assertTrue(Arrays.equals(Hex.decode("03e12efa1146037bc9325574b0f15749ba6dc0eec360b1670b05029eead511a6ff"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.MST)));
+        assertArrayEquals(
+            Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.BTC)
+        );
+        assertArrayEquals(
+            Hex.decode("026289413837ab836eb76428406a3b4f200418d31d99c259a0532b8e435f35153b"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.RSK)
+        );
+        assertArrayEquals(
+            Hex.decode("03e12efa1146037bc9325574b0f15749ba6dc0eec360b1670b05029eead511a6ff"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.MST)
+        );
         verify(mocksProvider.getElection(), times(1)).clearWinners();
         verify(mocksProvider.getElection(), never()).clear();
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_okKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_okKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             Hex.decode("03f64d2c022bca70f3ff0b1e95336be2c1507daa2ad37a484e0b66cbda86cfc6c5"),
             Hex.decode("03eed62698319f754407a31fde9a51da8b2be0ab40e9c4c695bb057757729be37f")
         }, true);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("02ebd9e8b2caff48b10e661e69fe107d6986d2df1ce7e377f2ef927f3194a61b99")),
             ECKey.fromPublicOnly(Hex.decode("02a23343f50363dc9a4c29f0c0a8386780cc8bf469211f4de51d50f8c0f274e9a7")),
             ECKey.fromPublicOnly(Hex.decode("030dd584c286275ab2ce249096d0d7e6c78853e0902db061b14f2e39df068f95bc"))
@@ -2860,20 +2911,38 @@ void addFederatorPublicKeyMultikey_okKeys() throws BridgeIllegalArgumentExceptio
         mocksProvider.setWinner(mocksProvider.getSpec());
         assertEquals(1, mocksProvider.execute(bridgeSupport));
         assertEquals(2, bridgeSupport.getPendingFederationSize().intValue());
-        assertTrue(Arrays.equals(Hex.decode("02ebd9e8b2caff48b10e661e69fe107d6986d2df1ce7e377f2ef927f3194a61b99"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.BTC)));
-        assertTrue(Arrays.equals(Hex.decode("02a23343f50363dc9a4c29f0c0a8386780cc8bf469211f4de51d50f8c0f274e9a7"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.RSK)));
-        assertTrue(Arrays.equals(Hex.decode("030dd584c286275ab2ce249096d0d7e6c78853e0902db061b14f2e39df068f95bc"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.MST)));
+        assertArrayEquals(
+            Hex.decode("02ebd9e8b2caff48b10e661e69fe107d6986d2df1ce7e377f2ef927f3194a61b99"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.BTC)
+        );
+        assertArrayEquals(
+            Hex.decode("02a23343f50363dc9a4c29f0c0a8386780cc8bf469211f4de51d50f8c0f274e9a7"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.RSK)
+        );
+        assertArrayEquals(
+            Hex.decode("030dd584c286275ab2ce249096d0d7e6c78853e0902db061b14f2e39df068f95bc"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.MST)
+        );
 
-        assertTrue(Arrays.equals(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"), bridgeSupport.getPendingFederatorPublicKeyOfType(1, FederationMember.KeyType.BTC)));
-        assertTrue(Arrays.equals(Hex.decode("03f64d2c022bca70f3ff0b1e95336be2c1507daa2ad37a484e0b66cbda86cfc6c5"), bridgeSupport.getPendingFederatorPublicKeyOfType(1, FederationMember.KeyType.RSK)));
-        assertTrue(Arrays.equals(Hex.decode("03eed62698319f754407a31fde9a51da8b2be0ab40e9c4c695bb057757729be37f"), bridgeSupport.getPendingFederatorPublicKeyOfType(1, FederationMember.KeyType.MST)));
+        assertArrayEquals(
+            Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.BTC)
+        );
+        assertArrayEquals(
+            Hex.decode("03f64d2c022bca70f3ff0b1e95336be2c1507daa2ad37a484e0b66cbda86cfc6c5"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.RSK)
+        );
+        assertArrayEquals(
+            Hex.decode("03eed62698319f754407a31fde9a51da8b2be0ab40e9c4c695bb057757729be37f"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.MST)
+        );
 
         verify(mocksProvider.getElection(), times(1)).clearWinners();
         verify(mocksProvider.getElection(), never()).clear();
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_noPendingFederation() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             Hex.decode("0259323a848372c51673622b29298b6e5854b28d45de297fe7cff67915ad900a59"),
@@ -2899,14 +2968,14 @@ void addFederatorPublicKeyMultikey_noPendingFederation() throws BridgeIllegalArg
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_btcKeyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_btcKeyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053"),
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")),
             ECKey.fromPublicOnly(Hex.decode("03981d06bd7bc419612aa09f860188f08d3c3010796dcb41cdfc43a6875600efa8")),
             ECKey.fromPublicOnly(Hex.decode("0365e45f68d6347aaa03c76f3d6f47000df6090801e49eef6d49f547f5c19de5dd"))
@@ -2930,14 +2999,14 @@ void addFederatorPublicKeyMultikey_btcKeyExists() throws BridgeIllegalArgumentEx
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_rskKeyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_rskKeyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053"),
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("0290d68bf50a8389e541a19d47c51447b443f41a13049e0783db6a25c419d612db")),
             ECKey.fromPublicOnly(Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053")),
             ECKey.fromPublicOnly(Hex.decode("0365e45f68d6347aaa03c76f3d6f47000df6090801e49eef6d49f547f5c19de5dd"))
@@ -2961,14 +3030,14 @@ void addFederatorPublicKeyMultikey_rskKeyExists() throws BridgeIllegalArgumentEx
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_mstKeyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_mstKeyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053"),
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("0290d68bf50a8389e541a19d47c51447b443f41a13049e0783db6a25c419d612db")),
             ECKey.fromPublicOnly(Hex.decode("033174d2fb7a3d7a0c87d43fa3e9ba43d4962014960b82bcd793706c05f68111c8")),
             ECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
@@ -2992,7 +3061,7 @@ void addFederatorPublicKeyMultikey_mstKeyExists() throws BridgeIllegalArgumentEx
     }
 
     @Test
-    void addFederatorPublicKey_invalidBtcKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidBtcKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("aabbccdd"),
             Hex.decode("0245db19d3d4b8c3567a47189ae60588e18e1305f3473a7fe99b6ef559bb1d1dc6"),
@@ -3018,7 +3087,7 @@ void addFederatorPublicKey_invalidBtcKey() throws BridgeIllegalArgumentException
     }
 
     @Test
-    void addFederatorPublicKey_invalidRskKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidRskKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("0245db19d3d4b8c3567a47189ae60588e18e1305f3473a7fe99b6ef559bb1d1dc6"),
             Hex.decode("aabbccdd"),
@@ -3044,7 +3113,7 @@ void addFederatorPublicKey_invalidRskKey() throws BridgeIllegalArgumentException
     }
 
     @Test
-    void addFederatorPublicKey_invalidMstKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidMstKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("0245db19d3d4b8c3567a47189ae60588e18e1305f3473a7fe99b6ef559bb1d1dc6"),
             Hex.decode("029664581b2e8dc9ba7885696a03134aaebe4be834ce0049d62f80499bbe130206"),
@@ -3070,13 +3139,13 @@ void addFederatorPublicKey_invalidMstKey() throws BridgeIllegalArgumentException
     }
 
     @Test
-    void rollbackFederation_ok() throws BridgeIllegalArgumentException {
+    void rollbackFederation_ok() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("rollback", new byte[][]{}, true);
 
-        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
+        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(
             BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-        })));
+        )));
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -3103,7 +3172,7 @@ void rollbackFederation_ok() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void rollbackFederation_noPendingFederation() throws BridgeIllegalArgumentException {
+    void rollbackFederation_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("rollback", new byte[][]{}, true);
 
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
@@ -3125,7 +3194,7 @@ void rollbackFederation_noPendingFederation() throws BridgeIllegalArgumentExcept
     }
 
     @Test
-    void commitFederation_ok() throws BridgeIllegalArgumentException {
+    void commitFederation_ok() {
         NetworkParameters btcParams = NetworkParameters.fromID(NetworkParameters.ID_REGTEST);
         PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(
             BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
@@ -3160,14 +3229,11 @@ void commitFederation_ok() throws BridgeIllegalArgumentException {
             expectedFedArgs
         );
 
-        List<FederationMember> newFederationMembers =
-            FederationTestUtils.getFederationMembersWithKeys(
-                Arrays.asList(
-                    BtcECKey.fromPublicOnly(Hex.decode("0346cb6b905e4dee49a862eeb2288217d06afcd4ace4b5ca77ebedfbc6afc1c19d")),
-                    BtcECKey.fromPublicOnly(Hex.decode("0269a0dbe7b8f84d1b399103c466fb20531a56b1ad3a7b44fe419e74aad8c46db7")),
-                    BtcECKey.fromPublicOnly(Hex.decode("026192d8ab41bd402eb0431457f6756a3f3ce15c955c534d2b87f1e0372d8ba338"))
-                )
-            );
+        List<FederationMember> newFederationMembers = FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(
+            BtcECKey.fromPublicOnly(Hex.decode("0346cb6b905e4dee49a862eeb2288217d06afcd4ace4b5ca77ebedfbc6afc1c19d")),
+            BtcECKey.fromPublicOnly(Hex.decode("0269a0dbe7b8f84d1b399103c466fb20531a56b1ad3a7b44fe419e74aad8c46db7")),
+            BtcECKey.fromPublicOnly(Hex.decode("026192d8ab41bd402eb0431457f6756a3f3ce15c955c534d2b87f1e0372d8ba338"))
+        ));
         FederationArgs newFederationArgs = new FederationArgs(newFederationMembers,
             Instant.ofEpochMilli(5005L),
             0L,
@@ -3242,7 +3308,7 @@ void commitFederation_ok() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void commitFederation_noPendingFederation() throws BridgeIllegalArgumentException {
+    void commitFederation_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("commit", new byte[][]{
             new Keccak256(HashUtil.keccak256(Hex.decode("aabbcc"))).getBytes()
         }, true);
@@ -3265,12 +3331,12 @@ void commitFederation_noPendingFederation() throws BridgeIllegalArgumentExceptio
     }
 
     @Test
-    void commitFederation_incompleteFederation() throws BridgeIllegalArgumentException {
-        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
+    void commitFederation_incompleteFederation() {
+        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Collections.singletonList(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-        })));
+        )));
 
-        VotingMocksProvider mocksProvider = new VotingMocksProvider("commit", new byte[][]{
+        VotingMocksProvider mocksProvider = new VotingMocksProvider(FederationChangeFunction.COMMIT.getKey(), new byte[][]{
             new Keccak256(HashUtil.keccak256(Hex.decode("aabbcc"))).getBytes()
         }, true);
 
@@ -3293,7 +3359,7 @@ void commitFederation_incompleteFederation() throws BridgeIllegalArgumentExcepti
     }
 
     @Test
-    void commitFederation_hashMismatch() throws BridgeIllegalArgumentException {
+    void commitFederation_hashMismatch() {
         PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")),
             BtcECKey.fromPublicOnly(Hex.decode("025eefeeeed5cdc40822880c7db1d0a88b7b986945ed3fc05a0b45fe166fe85e12"))
@@ -3322,7 +3388,7 @@ void commitFederation_hashMismatch() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void getActiveFederationWallet() throws IOException {
+    void getActiveFederationWallet() {
         List<FederationMember> expectedFederationMembers =
             FederationTestUtils.getFederationMembersWithBtcKeys(
                 Arrays.asList(
@@ -3360,7 +3426,7 @@ void getActiveFederationWallet() throws IOException {
             bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(any(), any(), any(), anyBoolean(), any())).then((InvocationOnMock m) -> {
                 assertEquals(m.<Context>getArgument(0), expectedContext);
                 assertEquals(m.<Federation>getArgument(1), expectedFederation);
-                assertEquals(m.<Object>getArgument(2), expectedUtxos);
+                assertEquals(m.getArgument(2), expectedUtxos);
                 return expectedWallet;
             });
 
@@ -3369,7 +3435,7 @@ void getActiveFederationWallet() throws IOException {
     }
 
     @Test
-    void getRetiringFederationWallet_nonEmpty() throws IOException {
+    void getRetiringFederationWallet_nonEmpty() {
         FederationArgs mockedFedArgs = new FederationArgs(FederationTestUtils.getFederationMembers(2),
             Instant.ofEpochMilli(2000),
             10L,
@@ -3379,11 +3445,10 @@ void getRetiringFederationWallet_nonEmpty() throws IOException {
             mockedFedArgs
         );
 
-        List<FederationMember> expectedFederationMembers = FederationTestUtils.getFederationMembersWithBtcKeys(
-            Arrays.asList(new BtcECKey[]{
-                BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
-                BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-            }));
+        List<FederationMember> expectedFederationMembers = FederationTestUtils.getFederationMembersWithBtcKeys(Arrays.asList(
+            BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
+            BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
+        ));
         FederationArgs expectedFederationArgs = new FederationArgs(
             expectedFederationMembers,
             Instant.ofEpochMilli(5005L),
@@ -3419,7 +3484,7 @@ void getRetiringFederationWallet_nonEmpty() throws IOException {
             bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(any(), any(), any(), anyBoolean(), any())).then((InvocationOnMock m) -> {
                 assertEquals(m.<Context>getArgument(0), expectedContext);
                 assertEquals(m.<Federation>getArgument(1), expectedFederation);
-                assertEquals(m.<Object>getArgument(2), expectedUtxos);
+                assertEquals(m.getArgument(2), expectedUtxos);
                 return expectedWallet;
             });
 
@@ -3824,8 +3889,6 @@ void getBtcTransactionConfirmationsGetCost_getBestChainHeightError() {
 
     @Test
     void getBtcTransactionConfirmationsGetCost_blockTooDeep() {
-        ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
-
         Repository repository = createRepository();
         Repository track = repository.startTracking();
 
@@ -3925,8 +3988,9 @@ private BridgeStorageProvider getBridgeStorageProviderMockWithProcessedHashes()
         BridgeStorageProvider providerMock = mock(BridgeStorageProvider.class);
 
         for (int i = 0; i < 10; i++) {
-            when(providerMock.getHeightIfBtcTxhashIsAlreadyProcessed(Sha256Hash.of(("hash_" + i).getBytes())))
-                .thenReturn(Optional.of(Long.valueOf(i)));
+            when(providerMock.getHeightIfBtcTxhashIsAlreadyProcessed(Sha256Hash.of(("hash_" + i).getBytes()))).thenReturn(
+                Optional.of((long) i)
+            );
         }
 
         return providerMock;
@@ -4107,8 +4171,8 @@ class FederationHolder {
             private Federation retiringFederation;
             private ABICallElection federationElection;
 
-            public List<UTXO> retiringUTXOs = new ArrayList<>();
-            public List<UTXO> activeUTXOs = new ArrayList<>();
+            public final List<UTXO> retiringUTXOs = new ArrayList<>();
+            public final List<UTXO> activeUTXOs = new ArrayList<>();
 
             PendingFederation getPendingFederation() {
                 return pendingFederation;
@@ -4169,15 +4233,15 @@ public void setFederationElection(ABICallElection federationElection) {
             return holder.getFederationElection();
         });
         doAnswer((InvocationOnMock m) -> {
-            holder.setActiveFederation(m.<Federation>getArgument(0));
+            holder.setActiveFederation(m.getArgument(0));
             return null;
         }).when(federationStorageProvider).setNewFederation(any());
         doAnswer((InvocationOnMock m) -> {
-            holder.setRetiringFederation(m.<Federation>getArgument(0));
+            holder.setRetiringFederation(m.getArgument(0));
             return null;
         }).when(federationStorageProvider).setOldFederation(any());
         doAnswer((InvocationOnMock m) -> {
-            holder.setPendingFederation(m.<PendingFederation>getArgument(0));
+            holder.setPendingFederation(m.getArgument(0));
             return null;
         }).when(federationStorageProvider).setPendingFederation(any());
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRegisterBtcTransactionTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRegisterBtcTransactionTest.java
index 0a0cc7425d8..eb01b9a7a7b 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRegisterBtcTransactionTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportRegisterBtcTransactionTest.java
@@ -26,6 +26,7 @@
 import co.rsk.peg.federation.*;
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.*;
+import co.rsk.peg.lockingcap.LockingCapSupport;
 import co.rsk.peg.pegin.RejectedPeginReason;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.storage.BridgeStorageAccessorImpl;
@@ -533,7 +534,8 @@ private PartialMerkleTree createPmtAndMockBlockStore(BtcTransaction btcTransacti
     private BridgeSupport buildBridgeSupport(ActivationConfig.ForBlock activations) {
         Repository repository = mock(Repository.class);
         when(repository.getBalance(PrecompiledContracts.BRIDGE_ADDR)).thenReturn(co.rsk.core.Coin.fromBitcoin(bridgeMainnetConstants.getMaxRbtc()));
-        when(provider.getLockingCap()).thenReturn(bridgeMainnetConstants.getMaxRbtc());
+        LockingCapSupport lockingCapSupport =  mock(LockingCapSupport.class);
+        when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(bridgeMainnetConstants.getMaxRbtc()));
 
         StorageAccessor bridgeStorageAccessor = new BridgeStorageAccessorImpl(repository);
         FeePerKbStorageProvider feePerKbStorageProvider = new FeePerKbStorageProviderImpl(bridgeStorageAccessor);
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
index 61e998033aa..87c76d07591 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
@@ -31,6 +31,9 @@
 import co.rsk.crypto.Keccak256;
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.*;
+import co.rsk.peg.lockingcap.*;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
 import co.rsk.peg.storage.*;
 import co.rsk.peg.bitcoin.*;
 import co.rsk.peg.btcLockSender.*;
@@ -42,7 +45,6 @@
 import co.rsk.peg.pegin.RejectedPeginReason;
 import co.rsk.peg.utils.UnrefundablePeginReason;
 import co.rsk.peg.vote.ABICallSpec;
-import co.rsk.peg.vote.AddressBasedAuthorizer;
 import co.rsk.peg.whitelist.*;
 import co.rsk.peg.whitelist.constants.WhitelistMainNetConstants;
 import co.rsk.test.builders.BridgeSupportBuilder;
@@ -93,6 +95,7 @@ class BridgeSupportTest {
     private WhitelistSupport whitelistSupport;
     private WhitelistStorageProvider whitelistStorageProvider;
     private FederationSupportBuilder federationSupportBuilder;
+    private LockingCapSupport lockingCapSupport;
 
     private static final String TO_ADDRESS = "0000000000000000000000000000000000000006";
     private static final BigInteger DUST_AMOUNT = new BigInteger("1");
@@ -123,6 +126,8 @@ void setUpOnEachTest() {
             signatureCache
         );
         federationSupportBuilder = new FederationSupportBuilder();
+        LockingCapStorageProvider lockingCapStorageProvider = new LockingCapStorageProviderImpl(inMemoryStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, mock(ActivationConfig.ForBlock.class), LockingCapMainNetConstants.getInstance(), signatureCache);
     }
 
     @Test
@@ -511,127 +516,68 @@ void updateFederationCreationBlockHeights_callsFederationSupportUpdateFederation
         }
 
         @Test
-        void save_callsFederationSupportSave() throws IOException {
+        void save_callsFederationSupportSave() {
             bridgeSupport.save();
             verify(federationSupport).save();
         }
     }
 
-    @Test
-    void getLockingCap() {
-        ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
-        when(activations.isActive(ConsensusRule.RSKIP134)).thenReturn(true);
-
-        BridgeConstants constants = mock(BridgeConstants.class);
-        when(constants.getInitialLockingCap()).thenReturn(Coin.SATOSHI);
-
-        BridgeStorageProvider provider = mock(BridgeStorageProvider.class);
-        when(provider.getLockingCap()).thenReturn(null).thenReturn(constants.getInitialLockingCap());
-
-        BridgeSupport bridgeSupport = bridgeSupportBuilder
-            .withBridgeConstants(constants)
-            .withProvider(provider)
-            .withActivations(activations)
-            .build();
-
-        // First time should also call setLockingCap as it was null
-        assertEquals(constants.getInitialLockingCap(), bridgeSupport.getLockingCap());
-        // Second time should just return the value
-        assertEquals(constants.getInitialLockingCap(), bridgeSupport.getLockingCap());
-        // Verify the set was called just once
-        verify(provider, times(1)).setLockingCap(constants.getInitialLockingCap());
-    }
-
-    @Test
-    void increaseLockingCap_unauthorized() {
-        AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(false);
-
-        BridgeConstants constants = mock(BridgeConstants.class);
-        when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
-
-        BridgeSupport bridgeSupport = bridgeSupportBuilder
-            .withBridgeConstants(constants)
-            .withActivations(ActivationConfigsForTest.all().forBlock(0))
-            .build();
-
-        assertFalse(bridgeSupport.increaseLockingCap(mock(Transaction.class), Coin.SATOSHI));
-    }
-
-    @Test
-    void increaseLockingCap_below_current_value() {
-        BridgeStorageProvider provider = mock(BridgeStorageProvider.class);
-        when(provider.getLockingCap()).thenReturn(Coin.COIN);
-
-        AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(true);
-
-        BridgeConstants constants = mock(BridgeConstants.class);
-        when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
-
-        BridgeSupport bridgeSupport = bridgeSupportBuilder
-            .withBridgeConstants(constants)
-            .withProvider(provider)
-            .withActivations(ActivationConfigsForTest.all().forBlock(0))
-            .build();
-
-        assertFalse(bridgeSupport.increaseLockingCap(mock(Transaction.class), Coin.SATOSHI));
-    }
-
-    @Test
-    void increaseLockingCap_above_upper_value() {
-        BridgeStorageProvider provider = mock(BridgeStorageProvider.class);
-        when(provider.getLockingCap()).thenReturn(Coin.COIN);
-
-        AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(true);
+    @Nested
+    @Tag("LockingCap")
+    class LockingCapTest {
 
-        BridgeConstants constants = mock(BridgeConstants.class);
-        when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
+        private LockingCapSupport lockingCapSupport;
+        private BridgeSupport bridgeSupport;
+        private final LockingCapConstants constants = LockingCapMainNetConstants.getInstance();
 
-        int multiplier = 2;
-        when(constants.getLockingCapIncrementsMultiplier()).thenReturn(multiplier);
+        @BeforeEach
+        void setUp() {
+            lockingCapSupport = mock(LockingCapSupportImpl.class);
+            bridgeSupport = bridgeSupportBuilder
+                .withLockingCapSupport(lockingCapSupport)
+                .build();
+        }
 
-        BridgeSupport bridgeSupport = bridgeSupportBuilder
-            .withBridgeConstants(constants)
-            .withProvider(provider)
-            .withActivations(ActivationConfigsForTest.all().forBlock(0))
-            .build();
+        @Test
+        void getLockingCap_whenNoValueExistsInStorage_shouldReturnInitialValue() {
+            // Arrange
+            Optional<Coin> expectedLockingCap = Optional.of(constants.getInitialValue());
+            when(lockingCapSupport.getLockingCap()).thenReturn(expectedLockingCap);
 
-        assertFalse(bridgeSupport.increaseLockingCap(mock(Transaction.class), Coin.COIN.multiply(multiplier).plus(Coin.SATOSHI)));
-    }
+            // Act
+            Optional<Coin> actualLockingCap = Optional.of(bridgeSupport.getLockingCap());
 
-    @Test
-    void increaseLockingCap() {
-        Coin lastValue = Coin.COIN;
-        BridgeStorageProvider provider = mock(BridgeStorageProvider.class);
-        when(provider.getLockingCap()).thenReturn(lastValue);
-
-        AddressBasedAuthorizer authorizer = mock(AddressBasedAuthorizer.class);
-        when(authorizer.isAuthorized(any(Transaction.class), any())).thenReturn(true);
+            // Assert
+            assertEquals(expectedLockingCap, actualLockingCap);
+        }
 
-        BridgeConstants constants = mock(BridgeConstants.class);
-        when(constants.getIncreaseLockingCapAuthorizer()).thenReturn(authorizer);
-        int multiplier = 2;
-        when(constants.getLockingCapIncrementsMultiplier()).thenReturn(multiplier);
+        @Test
+        void getLockingCap_whenLockingCapIsEmpty_shouldReturnNull() {
+            // Arrange
+            when(lockingCapSupport.getLockingCap()).thenReturn(Optional.empty());
 
-        BridgeSupport bridgeSupport = bridgeSupportBuilder
-            .withBridgeConstants(constants)
-            .withProvider(provider)
-            .withActivations(ActivationConfigsForTest.all().forBlock(0))
-            .build();
+            // Act
+            Coin actualLockingCap = bridgeSupport.getLockingCap();
 
-        // Accepts up to the last value (increment 0)
-        assertTrue(bridgeSupport.increaseLockingCap(mock(Transaction.class), lastValue));
+            // Assert
+            assertNull(actualLockingCap);
+        }
 
-        // Accepts up to the last value plus one
-        assertTrue(bridgeSupport.increaseLockingCap(mock(Transaction.class), lastValue.plus(Coin.SATOSHI)));
+        @Test
+        void increaseLockingCap() throws VMException {
+            // Arrange
+            Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+            Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+            when(lockingCapSupport.increaseLockingCap(tx, newLockingCap)).thenReturn(true);
+            when(lockingCapSupport.getLockingCap()).thenReturn(Optional.of(newLockingCap));
 
-        // Accepts a value in the middle
-        assertTrue(bridgeSupport.increaseLockingCap(mock(Transaction.class), lastValue.plus(Coin.CENT)));
+            // Act
+            boolean actualResult = bridgeSupport.increaseLockingCap(tx, newLockingCap);
 
-        // Accepts up to the last value times multiplier
-        assertTrue(bridgeSupport.increaseLockingCap(mock(Transaction.class), lastValue.multiply(multiplier)));
+            // Assert
+            assertTrue(actualResult);
+            assertEquals(newLockingCap, bridgeSupport.getLockingCap());
+        }
     }
 
     @Test
@@ -1782,7 +1728,8 @@ void registerBtcTransaction_sending_segwit_tx_twice_locks_just_once() throws Blo
         when(provider.getCoinbaseInformation(registerHeader.getHash())).thenReturn(new CoinbaseInformation(witnessMerkleRoot));
         WhitelistStorageProvider whitelistProvider = mock(WhitelistStorageProvider.class);
         when(whitelistProvider.getLockWhitelist(activationsBeforeForks, btcRegTestParams)).thenReturn(new LockWhitelist(new HashMap<>(), 0));
-        when(provider.getLockingCap()).thenReturn(Coin.FIFTY_COINS);
+        LockingCapSupport lockingCapSupportMock = mock(LockingCapSupport.class);
+        when(lockingCapSupportMock.getLockingCap()).thenReturn(Optional.of(Coin.FIFTY_COINS));
         // mock an actual store for the processed txs
         HashMap<Sha256Hash, Long> processedTxs = new HashMap<>();
         doAnswer(a -> {
@@ -1822,6 +1769,7 @@ void registerBtcTransaction_sending_segwit_tx_twice_locks_just_once() throws Blo
             .withFeePerKbSupport(feePerKbSupport)
             .withActivations(mockedActivations)
             .withFederationSupport(federationSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         int height = 30;
@@ -6591,6 +6539,7 @@ void validationsForRegisterBtcTransaction_invalid_block_merkle_root() throws IOE
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             btcBlockStoreFactory,
             mock(ActivationConfig.ForBlock.class),
             signatureCache
@@ -6661,6 +6610,7 @@ void validationsForRegisterBtcTransaction_successful() throws IOException, Block
             feePerKbSupport,
             whitelistSupport,
             mock(FederationSupport.class),
+            lockingCapSupport,
             btcBlockStoreFactory,
             mock(ActivationConfig.ForBlock.class),
             signatureCache
@@ -7432,7 +7382,8 @@ private void assertRefundInProcessPegInVersionLegacy(
         when(provider.getPegoutsWaitingForConfirmations()).thenReturn(pegoutsWaitingForConfirmations);
 
         if (mockLockingCap) {
-            when(provider.getLockingCap()).thenReturn(Coin.COIN.multiply(1));
+            LockingCapSupport lockingCapSupportMock = mock(LockingCapSupport.class);
+            when(lockingCapSupportMock.getLockingCap()).thenReturn(Optional.of(Coin.COIN.multiply(1)));
         }
 
         BtcLockSenderProvider btcLockSenderProvider = getBtcLockSenderProvider(lockSenderAddressType, btcAddress, rskAddress);
@@ -7455,6 +7406,7 @@ private void assertRefundInProcessPegInVersionLegacy(
             .withSignatureCache(signatureCache)
             .withFederationSupport(federationSupport)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         // Act
@@ -7959,8 +7911,8 @@ private void assertRefundInProcessPegInVersion1(
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = new PegoutsWaitingForConfirmations(new HashSet<>());
         when(provider.getPegoutsWaitingForConfirmations()).thenReturn(pegoutsWaitingForConfirmations);
-
-        when(provider.getLockingCap()).thenReturn(Coin.COIN.multiply(1));
+        LockingCapSupport lockingCapSupportMock = mock(LockingCapSupport.class);
+        when(lockingCapSupportMock.getLockingCap()).thenReturn(Optional.of(Coin.COIN.multiply(1)));
 
         BtcLockSenderProvider btcLockSenderProvider = getBtcLockSenderProvider(lockSenderAddressType, btcSenderAddress, rskAddress);
 
@@ -7990,6 +7942,7 @@ private void assertRefundInProcessPegInVersion1(
             .withSignatureCache(signatureCache)
             .withFederationSupport(federationSupport)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupportMock)
             .build();
 
         // Act
@@ -8042,10 +7995,14 @@ private void assertLockingCap(
         when(bridgeConstants.getFederationConstants()).thenReturn(federationConstants);
 
         // Configure locking cap
-        when(bridgeConstants.getInitialLockingCap()).thenReturn(lockingCap);
+        LockingCapConstants lockingCapConstants = mock(LockingCapConstants.class);
+        when(lockingCapConstants.getInitialValue()).thenReturn(lockingCap);
 
         Repository repository = createRepository();
 
+        LockingCapStorageProvider lockingCapStorageProvider = new LockingCapStorageProviderImpl(new BridgeStorageAccessorImpl(repository));
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, lockingCapConstants, signatureCache);
+
         Federation oldFederation = PegTestUtils.createSimpleActiveFederation(bridgeConstants);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -8182,6 +8139,7 @@ private void assertLockingCap(
             .withFederationSupport(federationSupport)
             .withFeePerKbSupport(feePerKbSupport)
             .withWhitelistSupport(whitelistSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         // Simulate blockchain
@@ -8262,6 +8220,7 @@ private BridgeSupport getBridgeSupport(BridgeConstants constants, BridgeStorageP
             feePerKbSupport,
             whitelistSupport,
             federationSupport,
+            lockingCapSupport,
             blockStoreFactory,
             activations,
             signatureCache
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java
index 17d1f03d835..3e02fd7cb03 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeTest.java
@@ -153,7 +153,7 @@ void increaseLockingCap_before_RSKIP134_activation() {
     @ParameterizedTest()
     @MethodSource("lockingCapValues")
     void increaseLockingCap_after_RSKIP134_activation(long newLockingCapValue) throws VMException {
-        ActivationConfig activationConfig = ActivationConfigsForTest.papyrus200();
+        ActivationConfig activationConfig = ActivationConfigsForTest.all();
         CallTransaction.Function increaseLockingCapFunction = Bridge.INCREASE_LOCKING_CAP;
 
         BridgeSupport bridgeSupportMock = mock(BridgeSupport.class);
@@ -183,30 +183,18 @@ private static Stream<Arguments> lockingCapValues() {
     }
 
     @Test
-    void increaseLockingCap_invalidParameter() {
-        ActivationConfig activationConfig = ActivationConfigsForTest.papyrus200();
-        CallTransaction.Function increaseLockingCapFunction = BridgeMethods.INCREASE_LOCKING_CAP.getFunction();
-
+    void increaseLockingCap_whenNewLockingCapIsInvalidParameter_shouldThrowVMException() {
+        ActivationConfig activationConfig = ActivationConfigsForTest.all();
+        CallTransaction.Function increaseLockingCapFunction = Bridge.INCREASE_LOCKING_CAP;
         Bridge bridge = bridgeBuilder
             .activationConfig(activationConfig)
             .build();
 
-        // Uses the proper signature but with no argument
-        // The solidity decoder in the Bridge will convert the undefined argument as 0,
-        // but the initial validation in the method will reject said value
-        final byte[] noArgumentData = increaseLockingCapFunction.encodeSignature();
-        assertThrows(VMException.class, () -> bridge.execute(noArgumentData));
-
         // Uses the proper signature but appends invalid data type
         // This will be rejected by the solidity decoder in the Bridge directly
         final byte[] invalidTypeData = ByteUtil.merge(increaseLockingCapFunction.encodeSignature(), Hex.decode("ab"));
         assertThrows(VMException.class, () -> bridge.execute(invalidTypeData));
 
-        // Uses the proper signature and data type, but with an invalid value
-        // This will be rejected by the initial validation in the method
-        final byte[] invalidValueData = increaseLockingCapFunction.encode(-1);
-        assertThrows(VMException.class, () -> bridge.execute(invalidValueData));
-
         // Uses the proper signature and data type, but with a value that exceeds the long max value
         final byte[] aboveMaxLengthData = ByteUtil.merge(
             increaseLockingCapFunction.encodeSignature(),
@@ -215,6 +203,54 @@ void increaseLockingCap_invalidParameter() {
         assertThrows(VMException.class, () -> bridge.execute(aboveMaxLengthData));
     }
 
+    @Test
+    void increaseLockingCap_whenNoArgumentsInTheMethodSignature_shouldThrowVMException() {
+        // Arrange
+        ActivationConfig activationConfig = ActivationConfigsForTest.all();
+        CallTransaction.Function increaseLockingCapFunction = Bridge.INCREASE_LOCKING_CAP;
+        Bridge bridge = bridgeBuilder
+            .activationConfig(activationConfig)
+            .build();
+
+        // No arguments signature
+        final byte[] noArgumentData = increaseLockingCapFunction.encodeArguments();
+
+        // Act / Assert
+        assertThrows(VMException.class, () -> bridge.execute(noArgumentData));
+    }
+
+    @Test
+    void increaseLockingCap_whenNewLockingCapIsNegativeValue_shouldThrowVMException() {
+        // Arrange
+        ActivationConfig activationConfig = ActivationConfigsForTest.all();
+        CallTransaction.Function increaseLockingCapFunction = Bridge.INCREASE_LOCKING_CAP;
+        Bridge bridge = bridgeBuilder
+            .activationConfig(activationConfig)
+            .build();
+
+        // When new LockingCap is a negative value
+        final byte[] negativeValueData = increaseLockingCapFunction.encodeArguments(Coin.NEGATIVE_SATOSHI.getValue());
+
+        // Act / Assert
+        assertThrows(VMException.class, () -> bridge.execute(negativeValueData));
+    }
+
+    @Test
+    void increaseLockingCap_whenNewLockingCapIsZeroValue_shouldThrowVMException() {
+        // Arrange
+        ActivationConfig activationConfig = ActivationConfigsForTest.all();
+        CallTransaction.Function increaseLockingCapFunction = Bridge.INCREASE_LOCKING_CAP;
+        Bridge bridge = bridgeBuilder
+            .activationConfig(activationConfig)
+            .build();
+
+        // When new LockingCap is a zero value
+        final byte[] negativeValueData = increaseLockingCapFunction.encodeArguments(Coin.ZERO.getValue());
+
+        // Act / Assert
+        assertThrows(VMException.class, () -> bridge.execute(negativeValueData));
+    }
+
     @Test
     void registerBtcCoinbaseTransaction_before_RSKIP143_activation() {
         ActivationConfig activationConfig = ActivationConfigsForTest.wasabi100();
@@ -646,7 +682,7 @@ void registerFlyoverBtcTransaction_after_RSKIP176_activation_generic_error() thr
     }
 
     @Test
-    void registerFlyoverBtcTransaction_after_RSKIP176_null_parameter() throws VMException {
+    void registerFlyoverBtcTransaction_after_RSKIP176_null_parameter() {
         ActivationConfig activationConfig = ActivationConfigsForTest.iris300();
 
         Bridge bridge = bridgeBuilder
@@ -672,8 +708,8 @@ void receiveHeader_before_RSKIP200() {
         co.rsk.bitcoinj.core.BtcBlock block = new co.rsk.bitcoinj.core.BtcBlock(
             networkParameters,
             1,
-            PegTestUtils.createHash(1),
-            PegTestUtils.createHash(1),
+            BitcoinTestUtils.createHash(1),
+            BitcoinTestUtils.createHash(1),
             1,
             Utils.encodeCompactBits(networkParameters.getMaxTarget()),
             1,
@@ -746,8 +782,8 @@ void receiveHeader_bridgeSupport_Exception() throws IOException, BlockStoreExcep
         co.rsk.bitcoinj.core.BtcBlock block = new co.rsk.bitcoinj.core.BtcBlock(
             networkParameters,
             1,
-            PegTestUtils.createHash(1),
-            PegTestUtils.createHash(1),
+            BitcoinTestUtils.createHash(1),
+            BitcoinTestUtils.createHash(1),
             1,
             Utils.encodeCompactBits(networkParameters.getMaxTarget()),
             1,
@@ -823,7 +859,7 @@ void getBtcBlockchainBestChainHeightOnlyAllowsLocalCalls_beforeRskip220() {
     }
 
     @Test
-    void activeAndRetiringFederationOnly_activeFederationIsNotFromFederateMember_retiringFederationIsNull_throwsVMException() throws Exception {
+    void activeAndRetiringFederationOnly_activeFederationIsNotFromFederateMember_retiringFederationIsNull_throwsVMException() {
         // Given
         BridgeMethods.BridgeMethodExecutor executor = Bridge.activeAndRetiringFederationOnly(
             null,
@@ -855,7 +891,7 @@ void activeAndRetiringFederationOnly_activeFederationIsNotFromFederateMember_ret
     }
 
     @Test
-    void activeAndRetiringFederationOnly_activeFederationIsNotFromFederateMember_retiringFederationIsNotNull_retiringFederationIsNotFromFederateMember_throwsVMException() throws Exception {
+    void activeAndRetiringFederationOnly_activeFederationIsNotFromFederateMember_retiringFederationIsNotNull_retiringFederationIsNotFromFederateMember_throwsVMException() {
         // Given
         BridgeMethods.BridgeMethodExecutor executor = Bridge.activeAndRetiringFederationOnly(
             null,
@@ -1050,7 +1086,7 @@ void getQueuedPegoutsCount_after_RSKIP271_activation() throws VMException, IOExc
     }
 
     @Test
-    void getEstimatedFeesForNextPegOutEvent_before_RSKIP271_activation() throws VMException {
+    void getEstimatedFeesForNextPegOutEvent_before_RSKIP271_activation() {
         ActivationConfig activationConfig = ActivationConfigsForTest.iris300();
 
         Bridge bridge = bridgeBuilder
diff --git a/rskj-core/src/test/java/co/rsk/peg/constants/BridgeConstantsTest.java b/rskj-core/src/test/java/co/rsk/peg/constants/BridgeConstantsTest.java
index 42fe82de8e3..7535ea77f61 100644
--- a/rskj-core/src/test/java/co/rsk/peg/constants/BridgeConstantsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/constants/BridgeConstantsTest.java
@@ -1,10 +1,15 @@
 package co.rsk.peg.constants;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.federation.constants.*;
+import co.rsk.peg.feeperkb.constants.*;
+import co.rsk.peg.lockingcap.constants.*;
+import co.rsk.peg.whitelist.constants.*;
 import java.util.stream.Stream;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
@@ -26,10 +31,11 @@ private static Stream<Arguments> minimumPeginTxValueArgProvider() {
 
     @ParameterizedTest()
     @MethodSource("minimumPeginTxValueArgProvider")
-    void test_getMinimumPeginTxValue(BridgeConstants bridgeConstants, boolean isRSKIP219Active){
+    void getMinimumPeginTxValue(BridgeConstants bridgeConstants, boolean isRSKIP219Active){
         // Arrange
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP219)).thenReturn(isRSKIP219Active);
+
         // Act
         Coin minimumPeginTxValue = bridgeConstants.getMinimumPeginTxValue(activations);
 
@@ -51,7 +57,7 @@ private static Stream<Arguments> getBtcHeightWhenPegoutTxIndexActivatesArgProvid
 
     @ParameterizedTest()
     @MethodSource("getBtcHeightWhenPegoutTxIndexActivatesArgProvider")
-    void test_getBtcHeightWhenPegoutTxIndexActivates(BridgeConstants bridgeConstants, int expectedValue){
+    void getBtcHeightWhenPegoutTxIndexActivates(BridgeConstants bridgeConstants, int expectedValue){
         // Act
         int btcHeightWhenPegoutTxIndexActivates = bridgeConstants.getBtcHeightWhenPegoutTxIndexActivates();
 
@@ -76,4 +82,78 @@ void getPegoutTxIndexGracePeriodInBtcBlocks(BridgeConstants bridgeConstants, int
         // assert
         assertEquals(expectedValue, pegoutTxIndexGracePeriodInBtcBlocks);
     }
+
+    @ParameterizedTest()
+    @MethodSource("getFeePerKbConstantsProvider")
+    void getFeePerKbConstants(BridgeConstants bridgeConstants, FeePerKbConstants expectedValue) {
+        // Act
+        FeePerKbConstants actualFeePerKbConstants = bridgeConstants.getFeePerKbConstants();
+
+        // Assert
+        assertInstanceOf(expectedValue.getClass(), actualFeePerKbConstants);
+    }
+
+    private static Stream<Arguments> getFeePerKbConstantsProvider() {
+        return Stream.of(
+            Arguments.of(BridgeMainNetConstants.getInstance(), FeePerKbMainNetConstants.getInstance()),
+            Arguments.of(BridgeTestNetConstants.getInstance(), FeePerKbTestNetConstants.getInstance()),
+            Arguments.of(new BridgeRegTestConstants(), FeePerKbRegTestConstants.getInstance())
+        );
+    }
+
+    @ParameterizedTest()
+    @MethodSource("getWhitelistConstantsProvider")
+    void getWhitelistConstants(BridgeConstants bridgeConstants, WhitelistConstants expectedValue) {
+        // Act
+        WhitelistConstants actualWhitelistConstants = bridgeConstants.getWhitelistConstants();
+
+        // Assert
+        assertInstanceOf(expectedValue.getClass(), actualWhitelistConstants);
+    }
+
+    private static Stream<Arguments> getWhitelistConstantsProvider() {
+        return Stream.of(
+            Arguments.of(BridgeMainNetConstants.getInstance(), WhitelistMainNetConstants.getInstance()),
+            Arguments.of(BridgeTestNetConstants.getInstance(), WhitelistTestNetConstants.getInstance()),
+            Arguments.of(new BridgeRegTestConstants(), WhitelistRegTestConstants.getInstance())
+        );
+    }
+
+    @ParameterizedTest()
+    @MethodSource("getFederationConstantsProvider")
+    void getFederationConstants(BridgeConstants bridgeConstants, FederationConstants expectedValue) {
+        // Act
+        FederationConstants actualFederationConstants = bridgeConstants.getFederationConstants();
+
+        // Assert
+        assertInstanceOf(expectedValue.getClass(), actualFederationConstants);
+    }
+
+    private static Stream<Arguments> getFederationConstantsProvider() {
+        BridgeConstants bridgeRegTestConstants = new BridgeRegTestConstants();
+        FederationConstants federationRegTestConstants = bridgeRegTestConstants.getFederationConstants();
+        return Stream.of(
+            Arguments.of(BridgeMainNetConstants.getInstance(), FederationMainNetConstants.getInstance()),
+            Arguments.of(BridgeTestNetConstants.getInstance(), FederationTestNetConstants.getInstance()),
+            Arguments.of(bridgeRegTestConstants, new FederationRegTestConstants(federationRegTestConstants.getGenesisFederationPublicKeys()))
+        );
+    }
+
+    @ParameterizedTest()
+    @MethodSource("getLockingCapConstantsProvider")
+    void getLockingCapConstants(BridgeConstants bridgeConstants, LockingCapConstants expectedValue){
+        // Act
+        LockingCapConstants actualLockingCapConstants = bridgeConstants.getLockingCapConstants();
+
+        // Assert
+        assertInstanceOf(expectedValue.getClass(), actualLockingCapConstants);
+    }
+
+    private static Stream<Arguments> getLockingCapConstantsProvider() {
+        return Stream.of(
+            Arguments.of(BridgeMainNetConstants.getInstance(), LockingCapMainNetConstants.getInstance()),
+            Arguments.of(BridgeTestNetConstants.getInstance(), LockingCapTestNetConstants.getInstance()),
+            Arguments.of(new BridgeRegTestConstants(), LockingCapRegTestConstants.getInstance())
+        );
+    }
 }
diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java b/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java
index af2e3210b30..6d27819f97e 100644
--- a/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java
@@ -14,7 +14,10 @@
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.FeePerKbSupport;
 import co.rsk.peg.PegoutsWaitingForConfirmations.Entry;
+import co.rsk.peg.lockingcap.*;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
 import co.rsk.peg.storage.BridgeStorageAccessorImpl;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.storage.StorageAccessor;
 import co.rsk.peg.vote.ABICallSpec;
 import co.rsk.peg.bitcoin.BitcoinUtils;
@@ -32,9 +35,7 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
-import org.ethereum.core.Block;
-import org.ethereum.core.Repository;
-import org.ethereum.core.Transaction;
+import org.ethereum.core.*;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.crypto.HashUtil;
 import org.ethereum.db.MutableRepository;
@@ -95,7 +96,6 @@ private void testChangePowpeg(
         );
 
         repository.addBalance(PrecompiledContracts.BRIDGE_ADDR, co.rsk.core.Coin.fromBitcoin(bridgeConstants.getMaxRbtc()));
-        bridgeStorageProvider.setLockingCap(bridgeConstants.getMaxRbtc());
 
         BtcBlockStoreWithCache.Factory btcBlockStoreFactory = new RepositoryBtcBlockStoreWithCache.Factory(
             btcParams,
@@ -227,6 +227,15 @@ private void testChangePowpeg(
         }
         assertTrue(federationStorageProvider.getNewFederationBtcUTXOs(btcParams, activations).isEmpty());
 
+        SignatureCache signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+        LockingCapStorageProvider lockingCapStorageProvider = new LockingCapStorageProviderImpl(new InMemoryStorage());
+        LockingCapSupport lockingCapSupport = new LockingCapSupportImpl(
+            lockingCapStorageProvider,
+            activations,
+            LockingCapMainNetConstants.getInstance(),
+            signatureCache
+        );
+
         // Trying to create a new powpeg again should fail
         // -2 corresponds to a new powpeg was elected and the Bridge is waiting for this new powpeg to activate
         BridgeSupport bridgeSupport = new BridgeSupportBuilder()
@@ -240,6 +249,7 @@ private void testChangePowpeg(
             .withPeginInstructionsProvider(new PeginInstructionsProvider())
             .withFederationSupport(federationSupportImpl)
             .withFeePerKbSupport(feePerKbSupport)
+            .withLockingCapSupport(lockingCapSupport)
             .build();
 
         attemptToCreateNewFederation(bridgeSupport, -2);
diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapCaller.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapCaller.java
new file mode 100644
index 00000000000..27b89ce362d
--- /dev/null
+++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapCaller.java
@@ -0,0 +1,20 @@
+package co.rsk.peg.lockingcap;
+
+import co.rsk.core.RskAddress;
+
+public enum LockingCapCaller {
+    FIRST_AUTHORIZED("a02db0ed94a5894bc6f9079bb9a2d93ada1917f3"),
+    SECOND_AUTHORIZED("180a7edda4e640ea5a3e495e17a1efad260c39e9"),
+    THIRD_AUTHORIZED("8418edc8fea47183116b4c8cd6a12e51a7e169c1"),
+    UNAUTHORIZED("e2a5070b4e2cb77fe22dff05d9dcdc4d3eaa6ead");
+
+    private final String rskAddress;
+
+    LockingCapCaller(String rskAddress) {
+        this.rskAddress = rskAddress;
+    }
+
+    public RskAddress getRskAddress() {
+        return new RskAddress(rskAddress);
+    }
+}
diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapIT.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapIT.java
new file mode 100644
index 00000000000..546d6cc6b0e
--- /dev/null
+++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapIT.java
@@ -0,0 +1,269 @@
+package co.rsk.peg.lockingcap;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.net.utils.TransactionUtils;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
+import co.rsk.peg.storage.InMemoryStorage;
+import co.rsk.peg.storage.StorageAccessor;
+import java.util.Optional;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
+import org.ethereum.core.*;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+@TestInstance(Lifecycle.PER_CLASS)
+class LockingCapIT {
+    private final LockingCapConstants constants = LockingCapMainNetConstants.getInstance();
+    private LockingCapSupport lockingCapSupport;
+    private LockingCapStorageProvider lockingCapStorageProvider;
+    private SignatureCache signatureCache;
+    private StorageAccessor bridgeStorageAccessor;
+    private Coin currentLockingCap; // it is used to guarantee the value from getLockingCap() contains the value expected
+
+    @BeforeAll
+    void setUp() {
+        bridgeStorageAccessor = new InMemoryStorage();
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+
+        ActivationConfig.ForBlock activations = ActivationConfigsForTest.all().forBlock(0);
+        lockingCapSupport = new LockingCapSupportImpl(
+            lockingCapStorageProvider,
+            activations,
+            constants,
+            signatureCache
+        );
+    }
+
+    @Test
+    @Order(-1)
+    void increaseLockingCap_prePapyrus200_whenLockingCapIsNotSet_shouldNotSavedNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        // Previously to the genesis of the Locking Cap
+        ActivationConfig.ForBlock wasabiActivations = ActivationConfigsForTest.wasabi100().forBlock(0);
+        LockingCapSupport wasabiLockingCapSupport = new LockingCapSupportImpl(
+            lockingCapStorageProvider,
+            wasabiActivations,
+            constants,
+            signatureCache
+        );
+
+        // Setting up new Locking Cap value
+        Coin newLockingCap = constants.getInitialValue();
+        Transaction tx = TransactionUtils.getTransactionFromCaller(
+            signatureCache,
+            LockingCapCaller.FIRST_AUTHORIZED.getRskAddress()
+        );
+
+        // Act
+        boolean isIncreased = wasabiLockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(isIncreased);
+    }
+
+    @Test
+    @Order(0)
+    void getInitialValue_whenFirstTimeGettingLockingCap_shouldReturnInitialValue() {
+        // The first time the Locking Cap is requested, it should return the initial value
+        Coin expectedLockingCap = constants.getInitialValue();
+
+        // Actual / Assert
+        assertLockingCapValue(expectedLockingCap);
+    }
+
+    @Test
+    @Order(1)
+    void increaseLockingCap_whenNewValueIsGreaterThanCurrentLockingCap_shouldSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.add(Coin.COIN);
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap);
+
+        // Assert
+        assertTrue(isIncreased);
+        assertLockingCapValue(newLockingCap);
+    }
+
+    @Test
+    @Order(2)
+    void increaseLockingCap_whenPreviousValueExistsInStorageAndNewLockingCapIsLessThanPreviousValue_shouldNotSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.subtract(Coin.COIN);
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap);
+
+        // Assert
+        assertFalse(isIncreased);
+        assertLockingCapValue(currentLockingCap);
+    }
+
+    @Test
+    @Order(3)
+    void increaseLockingCap_whenPreviousValueExistsInStorageAndNewLockingCapIsGreaterThanPreviousValue_shouldSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.add(Coin.COIN);
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap);
+
+        // Assert
+        assertTrue(isIncreased);
+        assertLockingCapValue(newLockingCap);
+    }
+
+    @Test
+    @Order(4)
+    void increaseLockingCap_whenAnUnauthorizedCallerRequestToIncreaseLockingCapValue_shouldNotSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.add(Coin.COIN);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(
+            signatureCache,
+            LockingCapCaller.UNAUTHORIZED.getRskAddress()
+        );
+
+        // Act
+        boolean isIncreased = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(isIncreased);
+        assertLockingCapValue(currentLockingCap);
+    }
+
+    @Test
+    @Order(5)
+    void increaseLockingCap_whenSecondAuthorizedCallerRequestToIncreaseLockingCapValue_shouldSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.add(Coin.COIN);
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap, LockingCapCaller.SECOND_AUTHORIZED);
+
+        // Assert
+        assertTrue(isIncreased);
+        assertLockingCapValue(newLockingCap);
+    }
+
+    @Test
+    @Order(6)
+    void increaseLockingCap_whenThirdAuthorizedCallerRequestToIncreaseLockingCapValue_shouldSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.add(Coin.COIN);
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap, LockingCapCaller.THIRD_AUTHORIZED);
+
+        // Assert
+        assertTrue(isIncreased);
+        assertLockingCapValue(newLockingCap);
+    }
+
+    @Test
+    @Order(7)
+    void increaseLockingCap_whenNewLockingCapIsGreaterThanMaxLockingCap_shouldNotSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin maxLockingCapVoteValueAllowed = currentLockingCap.multiply(constants.getIncrementsMultiplier());
+        Coin newLockingCap = maxLockingCapVoteValueAllowed.add(Coin.SATOSHI);
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap);
+
+        // Assert
+        assertFalse(isIncreased);
+        assertLockingCapValue(currentLockingCap);
+    }
+
+    @Test
+    @Order(8)
+    void increaseLockingCap_whenNewLockingCapIsEqualToMaxLockingCap_shouldSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap.multiply(constants.getIncrementsMultiplier());
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap);
+
+        // Assert
+        assertTrue(isIncreased);
+        assertLockingCapValue(newLockingCap);
+    }
+
+    @Test
+    @Order(9)
+    void increaseLockingCap_whenNewLockingCapIsZero_shouldThrowLockingCapIllegalArgumentException() {
+        // Arrange
+        Coin newLockingCap = Coin.ZERO;
+
+        // Actual / Assert
+        assertThrows(
+            LockingCapIllegalArgumentException.class,
+            () -> voteToIncreaseLockingCap(newLockingCap)
+        );
+        assertLockingCapValue(currentLockingCap);
+    }
+
+    @Test
+    @Order(10)
+    void increaseLockingCap_whenNewLockingCapIsNegative_shouldThrowLockingCapIllegalArgumentException() {
+        // Arrange
+        Coin newLockingCap = Coin.NEGATIVE_SATOSHI;
+
+        // Actual / Assert
+        assertThrows(
+            LockingCapIllegalArgumentException.class,
+            () -> voteToIncreaseLockingCap(newLockingCap)
+        );
+        assertLockingCapValue(currentLockingCap);
+    }
+
+    @Test
+    @Order(11)
+    void increaseLockingCap_whenNewValueIsEqualToCurrentValue_shouldSaveNewLockingCapValue() throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = currentLockingCap;
+
+        // Act
+        boolean isIncreased = voteToIncreaseLockingCap(newLockingCap);
+
+        // Assert
+        assertTrue(isIncreased);
+        assertLockingCapValue(newLockingCap);
+    }
+
+    private boolean voteToIncreaseLockingCap(Coin valueToVote) throws LockingCapIllegalArgumentException {
+        return voteToIncreaseLockingCap(valueToVote, LockingCapCaller.FIRST_AUTHORIZED);
+    }
+
+    private boolean voteToIncreaseLockingCap(Coin valueToVote, LockingCapCaller caller) throws LockingCapIllegalArgumentException {
+        Transaction tx = TransactionUtils.getTransactionFromCaller(
+            signatureCache,
+            caller.getRskAddress()
+        );
+
+        boolean result = lockingCapSupport.increaseLockingCap(tx, valueToVote);
+        lockingCapSupport.save();
+
+        return result;
+    }
+
+    private void assertLockingCapValue(Coin expectedLockingCap) {
+        // Recreate LockingCapStorageProvider to clear cached value and make sure it is fetched from the storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapSupport.getLockingCap();
+
+        // Assert
+        assertTrue(actualLockingCap.isPresent());
+        assertEquals(expectedLockingCap, actualLockingCap.get());
+
+        // Save the current Locking Cap value to be used in the next test
+        currentLockingCap = actualLockingCap.get();
+    }
+}
diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java
new file mode 100644
index 00000000000..c761f624814
--- /dev/null
+++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java
@@ -0,0 +1,122 @@
+package co.rsk.peg.lockingcap;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
+import co.rsk.peg.storage.InMemoryStorage;
+import co.rsk.peg.storage.StorageAccessor;
+import java.util.Optional;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class LockingCapStorageProviderImplTest {
+
+    private final LockingCapConstants constants = LockingCapMainNetConstants.getInstance();
+    private LockingCapStorageProvider lockingCapStorageProvider;
+    private ActivationConfig.ForBlock activations = ActivationConfigsForTest.all().forBlock(0);
+    private StorageAccessor bridgeStorageAccessor;
+
+    @BeforeEach
+    void setUp() {
+        bridgeStorageAccessor = new InMemoryStorage();
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+    }
+
+    @Test
+    void getLockingCap_prePapyrus200_shouldReturnOptionalEmpty() {
+        // Arrange
+        activations = ActivationConfigsForTest.wasabi100().forBlock(0);
+
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+
+        // Assert
+        assertFalse(actualLockingCap.isPresent());
+    }
+
+    @Test
+    void getLockingCap_whenNoPreviousValueExists_shouldReturnOptionalEmpty() {
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+
+        // Assert
+        assertFalse(actualLockingCap.isPresent());
+    }
+
+    @Test
+    void getLockingCap_whenLockingCapIsSavedInStorage_shouldReturnSavedValue() {
+        // Arrange
+        Coin expectedLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(expectedLockingCap);
+        lockingCapStorageProvider.save(activations);
+        // Recreate LockingCapStorageProvider to clear cached value and make sure it was saved in the storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+
+        // Assert
+        assertEquals(Optional.of(expectedLockingCap), actualLockingCap);
+    }
+
+    @Test
+    void setLockingCap_whenNewLockingCapValueIsSet_shouldSetLockingCap() {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+
+        // Act
+        lockingCapStorageProvider.setLockingCap(newLockingCap);
+
+        // Assert
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+        assertEquals(Optional.of(newLockingCap), actualLockingCap);
+    }
+
+    @Test
+    void setLockingCap_whenIsSetNullValue_shouldReturnOptionalEmpty() {
+        // Act
+        lockingCapStorageProvider.setLockingCap(null);
+
+        // Assert
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+        assertFalse(actualLockingCap.isPresent());
+    }
+
+    @Test
+    void save_prePapyrus200_whenIsAttemptedSaveANewLockingCapValue_shouldNotSaveLockingCap() {
+        // Arrange
+        activations = ActivationConfigsForTest.wasabi100().forBlock(0);
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(newLockingCap);
+
+        // Act
+        lockingCapStorageProvider.save(activations);
+
+        // Assert
+        // Recreate LockingCapStorageProvider to clear cached value and make sure it was saved in the storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+        assertFalse(actualLockingCap.isPresent());
+    }
+
+    @Test
+    void save_whenIsSavedANewLockingCapValue_shouldSaveLockingCap() {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(newLockingCap);
+
+        // Act
+        lockingCapStorageProvider.save(activations);
+
+        // Assert
+        // Recreate LockingCapStorageProvider to clear cached value and make sure it was saved in the storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        Optional<Coin> actualLockingCap = lockingCapStorageProvider.getLockingCap(activations);
+        assertEquals(Optional.of(newLockingCap), actualLockingCap);
+    }
+}
diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java
new file mode 100644
index 00000000000..e9a180b9e26
--- /dev/null
+++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java
@@ -0,0 +1,308 @@
+package co.rsk.peg.lockingcap;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.net.utils.TransactionUtils;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
+import co.rsk.peg.storage.InMemoryStorage;
+import co.rsk.peg.storage.StorageAccessor;
+import java.util.Optional;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
+import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
+import org.ethereum.core.BlockTxSignatureCache;
+import org.ethereum.core.ReceivedTxSignatureCache;
+import org.ethereum.core.SignatureCache;
+import org.ethereum.core.Transaction;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class LockingCapSupportImplTest {
+    private final LockingCapConstants constants = LockingCapMainNetConstants.getInstance();
+    private LockingCapSupport lockingCapSupport;
+    private LockingCapStorageProvider lockingCapStorageProvider;
+    private ActivationConfig.ForBlock activations = ActivationConfigsForTest.all().forBlock(0);
+    private SignatureCache signatureCache;
+    private StorageAccessor bridgeStorageAccessor;
+
+    @BeforeEach
+    void setUp() {
+        bridgeStorageAccessor = new InMemoryStorage();
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        signatureCache = new BlockTxSignatureCache(new ReceivedTxSignatureCache());
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+    }
+
+    @Test
+    void getLockingCap_whenNoValueExistsInStorage_shouldReturnInitialValue() {
+        // Arrange
+        Optional<Coin> expectedLockingCap = Optional.of(constants.getInitialValue());
+
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapSupport.getLockingCap();
+
+        // Assert
+        assertEquals(expectedLockingCap, actualLockingCap);
+    }
+
+    @Test
+    void getLockingCap_whenLockingCapValueIsSavedInStorage_shouldReturnSavedValue() {
+        // Arrange
+        Coin expectedLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(expectedLockingCap);
+        lockingCapSupport.save();
+        // Recreate LockingCapSupport to load the previous value from storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapSupport.getLockingCap();
+
+        // Assert
+        assertEquals(Optional.of(expectedLockingCap), actualLockingCap);
+    }
+
+    @Test
+    void getLockingCap_prePapyrus200_whenLockingCapIsNotSet_shouldReturnEmpty() {
+        // Arrange
+        activations = ActivationConfigsForTest.wasabi100().forBlock(0);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+
+        // Act
+        Optional<Coin> actualLockingCap = lockingCapSupport.getLockingCap();
+
+        // Assert
+        assertEquals(Optional.empty(), actualLockingCap);
+    }
+
+    @Test
+    void increaseLockingCap_whenNewValueIsGreaterThanCurrentLockingCap_shouldReturnTrue()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertTrue(actualResult);
+        assertEquals(Optional.of(newLockingCap), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenNewValueIsLessThanInitialValue_shouldReturnFalse()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue().subtract(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(actualResult);
+        assertEquals(Optional.of(constants.getInitialValue()), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenPreviousValueExistsInStorageAndNewLockingCapIsGreaterThanPreviousValue_shouldReturnTrue()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin previousLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(previousLockingCap);
+        lockingCapSupport.save();
+        // Recreate LockingCapSupport to load the previous value from storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+
+        Coin newLockingCap = previousLockingCap.add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertTrue(actualResult);
+        assertEquals(Optional.of(newLockingCap), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenPreviousValueExistsInStorageAndNewLockingCapIsLessThanPreviousValue_shouldReturnFalse()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin expectedLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(expectedLockingCap);
+        lockingCapSupport.save();
+        // Recreate LockingCapSupport to load the previous value from storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+
+        Coin newLockingCap = expectedLockingCap.subtract(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(actualResult);
+        assertEquals(Optional.of(expectedLockingCap), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenAnUnauthorizedCallerRequestToIncreaseLockingCapValue_shouldReturnFalse()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.UNAUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(actualResult);
+        assertEquals(Optional.of(constants.getInitialValue()), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenNewLockingCapIsGreaterThanMaxLockingCap_shouldReturnFalse()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin expectedLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(expectedLockingCap);
+        lockingCapSupport.save();
+        // Recreate LockingCapSupport to load the previous value from storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+
+        Coin maxLockingCapVoteValueAllowed = expectedLockingCap.multiply(constants.getIncrementsMultiplier());
+        Coin newLockingCap = maxLockingCapVoteValueAllowed.add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(actualResult);
+        assertEquals(Optional.of(expectedLockingCap), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenNewLockingCapIsEqualToMaxLockingCap_shouldReturnTrue()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin previousLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        lockingCapStorageProvider.setLockingCap(previousLockingCap);
+        lockingCapSupport.save();
+        // Recreate LockingCapSupport to load the previous value from storage
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+
+        // The new locking cap is the maximum value that can be set
+        Coin newLockingCap = previousLockingCap.multiply(constants.getIncrementsMultiplier());
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertTrue(actualResult);
+        assertEquals(Optional.of(newLockingCap), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenNewValueIsEqualToCurrentValue_shouldReturnTrue()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue();
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertTrue(actualResult);
+        assertEquals(Optional.of(constants.getInitialValue()), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenNewLockingCapIsZero_shouldReturnFalse() {
+        // Arrange
+        Coin newLockingCap = Coin.ZERO;
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act / Assert
+        assertThrows(LockingCapIllegalArgumentException.class, () -> lockingCapSupport.increaseLockingCap(tx, newLockingCap));
+        assertEquals(Optional.of(constants.getInitialValue()), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_whenNewLockingCapIsNegative_shouldReturnFalse() {
+        // Arrange
+        Coin newLockingCap = Coin.NEGATIVE_SATOSHI;
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act / Assert
+        assertThrows(LockingCapIllegalArgumentException.class, () -> lockingCapSupport.increaseLockingCap(tx, newLockingCap));
+        assertEquals(Optional.of(constants.getInitialValue()), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void increaseLockingCap_prePapyrus200_whenLockingCapIsNotSet_shouldReturnFalse()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        activations = ActivationConfigsForTest.wasabi100().forBlock(0);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+
+        // Act
+        boolean actualResult = lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Assert
+        assertFalse(actualResult);
+        assertEquals(Optional.empty(), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void save_whenIsIncreasedLockingCapValue_shouldSaveLockingCap()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+        lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Act
+        lockingCapSupport.save();
+
+        // Assert
+        // Recreate LockingCapSupport to load the previous value from storage and make sure it was saved
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+        assertEquals(Optional.of(newLockingCap), lockingCapSupport.getLockingCap());
+    }
+
+    @Test
+    void save_prePapyrus200_whenIsAttemptedIncreaseLockingCapValue_shouldNotSaveLockingCap()
+        throws LockingCapIllegalArgumentException {
+        // Arrange
+        activations = ActivationConfigsForTest.wasabi100().forBlock(0);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+        Coin newLockingCap = constants.getInitialValue().add(Coin.SATOSHI);
+        Transaction tx = TransactionUtils.getTransactionFromCaller(signatureCache, LockingCapCaller.FIRST_AUTHORIZED.getRskAddress());
+        lockingCapSupport.increaseLockingCap(tx, newLockingCap);
+
+        // Act
+        lockingCapSupport.save();
+
+        // Assert
+        // Recreate LockingCapSupport to load the previous value from storage and make sure it was not saved
+        lockingCapStorageProvider = new LockingCapStorageProviderImpl(bridgeStorageAccessor);
+        lockingCapSupport = new LockingCapSupportImpl(lockingCapStorageProvider, activations, constants, signatureCache);
+        assertEquals(Optional.empty(), lockingCapSupport.getLockingCap());
+    }
+}
diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/constants/LockingCapConstantsTest.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/constants/LockingCapConstantsTest.java
new file mode 100644
index 00000000000..c9189aec619
--- /dev/null
+++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/constants/LockingCapConstantsTest.java
@@ -0,0 +1,120 @@
+package co.rsk.peg.lockingcap.constants;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.samePropertyValuesAs;
+import static org.junit.jupiter.api.Assertions.*;
+
+import co.rsk.bitcoinj.core.Coin;
+import co.rsk.peg.vote.AddressBasedAuthorizer;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.bouncycastle.util.encoders.Hex;
+import org.ethereum.crypto.ECKey;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class LockingCapConstantsTest {
+
+    @ParameterizedTest
+    @MethodSource("getIncreaseAuthorizerProvider")
+    void getIncreaseAuthorizer(LockingCapConstants lockingCapConstants, AddressBasedAuthorizer expectedIncreaseAuthorizer) {
+        AddressBasedAuthorizer actualIncreaseAuthorizer = lockingCapConstants.getIncreaseAuthorizer();
+        assertThat(actualIncreaseAuthorizer, samePropertyValuesAs(expectedIncreaseAuthorizer));
+    }
+
+    private static Stream<Arguments> getIncreaseAuthorizerProvider() {
+        // MainNet
+        List<ECKey> mainNetIncreaseAuthorizedKeys = Arrays.stream(new String[]{
+            "0448f51638348b034995b1fd934fe14c92afde783e69f120a46ee16eb6bdc2e4f6b5e37772094c68c0dea2b1be3d96ea9651a9eebda7304914c8047f4e3e251378",
+            "0484c66f75548baf93e322574adac4e4579b6a53f8d11fab640e14c90118e6983ef24b0de349a3e88f72e81e771ae1c897cef446fd7f4da71778c532aee3b6c41b",
+            "04bb6435dc1ea12da843ebe213893d136c1624acd681fff82551498ae00bf28e9323164b00daf925fa75177463b8254a2aae8a1713e4d851a84ea369c193e9ce51"
+        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
+
+        AddressBasedAuthorizer mainNetIncreaseAuthorizer = new AddressBasedAuthorizer(
+            mainNetIncreaseAuthorizedKeys,
+            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
+        );
+
+        // TestNet
+        List<ECKey> testNetIncreaseAuthorizedKeys = Arrays.stream(new String[]{
+            "04701d1d27f8c2ae97912d96fb1f82f10c2395fd320e7a869049268c6b53d2060dfb2e22e3248955332d88cd2ae29a398f8f3858e48dd6d8ffbc37dfd6d1aa4934",
+            "045ef89e4a5645dc68895dbc33b4c966c3a0a52bb837ecdd2ba448604c4f47266456d1191420e1d32bbe8741f8315fde4d1440908d400e5998dbed6549d499559b",
+            "0455db9b3867c14e84a6f58bd2165f13bfdba0703cb84ea85788373a6a109f3717e40483aa1f8ef947f435ccdf10e530dd8b3025aa2d4a7014f12180ee3a301d27"
+        }).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList());
+
+        AddressBasedAuthorizer testNetIncreaseAuthorizer = new AddressBasedAuthorizer(
+            testNetIncreaseAuthorizedKeys,
+            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
+        );
+
+        // RegTest
+        ECKey authorizerPublicKey = ECKey.fromPublicOnly(Hex.decode(
+            "04450bbaab83ec48b3cb8fbb077c950ee079733041c039a8c4f1539e5181ca1a27589eeaf0fbf430e49d2909f14c767bf6909ad6845831f683416ee12b832e36ed"
+        ));
+
+        List<ECKey> regTestIncreaseAuthorizedKeys = Collections.singletonList(authorizerPublicKey);
+
+        AddressBasedAuthorizer regTestIncreaseAuthorizer = new AddressBasedAuthorizer(
+            regTestIncreaseAuthorizedKeys,
+            AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
+        );
+
+        return Stream.of(
+            Arguments.of(LockingCapMainNetConstants.getInstance(), mainNetIncreaseAuthorizer),
+            Arguments.of(LockingCapTestNetConstants.getInstance(), testNetIncreaseAuthorizer),
+            Arguments.of(LockingCapRegTestConstants.getInstance(), regTestIncreaseAuthorizer)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("getInitialValueProvider")
+    void getInitialValue(LockingCapConstants lockingCapConstants, Coin expectedInitialValue) {
+        Coin actualInitialValue = lockingCapConstants.getInitialValue();
+        assertEquals(expectedInitialValue, actualInitialValue);
+    }
+
+    private static Stream<Arguments> getInitialValueProvider() {
+        // MainNet
+        Coin mainNetInitialValue = Coin.COIN.multiply(300L);
+
+        // TestNet
+        Coin testNetInitialValue = Coin.COIN.multiply(200L);
+
+        // RegTest
+        Coin regTestInitialValue = Coin.COIN.multiply(1_000L);
+
+        return Stream.of(
+            Arguments.of(LockingCapMainNetConstants.getInstance(), mainNetInitialValue),
+            Arguments.of(LockingCapTestNetConstants.getInstance(), testNetInitialValue),
+            Arguments.of(LockingCapRegTestConstants.getInstance(), regTestInitialValue)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("getIncrementsMultiplierProvider")
+    void getIncrementsMultiplier(LockingCapConstants lockingCapConstants, int expectedIncrementsMultiplier) {
+        int actualIncrementsMultiplier = lockingCapConstants.getIncrementsMultiplier();
+        assertEquals(expectedIncrementsMultiplier, actualIncrementsMultiplier);
+    }
+
+    private static Stream<Arguments> getIncrementsMultiplierProvider() {
+        // MainNet
+        int mainNetIncrementsMultiplier = 2;
+
+        // TestNet
+        int testNetIncrementsMultiplier = 2;
+
+        // RegTest
+        int regTestIncrementsMultiplier = 2;
+
+        return Stream.of(
+            Arguments.of(LockingCapMainNetConstants.getInstance(), mainNetIncrementsMultiplier),
+            Arguments.of(LockingCapTestNetConstants.getInstance(), testNetIncrementsMultiplier),
+            Arguments.of(LockingCapRegTestConstants.getInstance(), regTestIncrementsMultiplier)
+        );
+    }
+}
diff --git a/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java b/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java
index ade10e09daf..9a939841e12 100644
--- a/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java
@@ -2,20 +2,13 @@
 
 import co.rsk.bitcoinj.core.Sha256Hash;
 import co.rsk.bitcoinj.store.BtcBlockStore;
-import co.rsk.peg.Bridge;
-import co.rsk.peg.BridgeMethods;
-import co.rsk.peg.BridgeStorageProvider;
+import co.rsk.peg.*;
 import co.rsk.peg.bitcoin.CoinbaseInformation;
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.core.Repository;
 import org.ethereum.vm.exception.VMException;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
+import org.junit.jupiter.api.*;
 
 @Disabled
 class HasBtcBlockCoinbaseTransactionInformationTest extends BridgePerformanceTestCase {
@@ -42,28 +35,28 @@ private void hasBtcBlockCoinbaseTransactionInformation_success(int times, Execut
         );
 
         executeAndAverage("hasBtcBlockCoinbaseTransactionInformation-sucess",
-                times,
-                getABIEncoder(Sha256Hash.ZERO_HASH),
-                storageInitializer,
-                Helper.getZeroValueValueTxBuilderFromFedMember(),
-                Helper.getRandomHeightProvider(10),
-                stats,
-                (environment, callResult) -> Assertions.assertTrue((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
+            times,
+            getABIEncoder(Sha256Hash.ZERO_HASH),
+            storageInitializer,
+            Helper.getZeroValueValueTxBuilderFromFedMember(),
+            Helper.getRandomHeightProvider(10),
+            stats,
+            (environment, callResult) -> Assertions.assertTrue((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
     }
 
     private void hasBtcBlockCoinbaseTransactionInformation_unsuccess(int times, ExecutionStats stats) throws VMException {
         BridgeStorageProviderInitializer storageInitializer = generateInitializerForTest(
-                Sha256Hash.ZERO_HASH
+            Sha256Hash.ZERO_HASH
         );
 
         executeAndAverage("hasBtcBlockCoinbaseTransactionInformation-unsucess",
-                times,
-                getABIEncoder(Sha256Hash.of(new byte[]{1})),
-                storageInitializer,
-                Helper.getZeroValueValueTxBuilderFromFedMember(),
-                Helper.getRandomHeightProvider(10),
-                stats,
-                (environment, callResult) -> Assertions.assertFalse((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
+            times,
+            getABIEncoder(Sha256Hash.of(new byte[]{1})),
+            storageInitializer,
+            Helper.getZeroValueValueTxBuilderFromFedMember(),
+            Helper.getRandomHeightProvider(10),
+            stats,
+            (environment, callResult) -> Assertions.assertFalse((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
     }
 
     private ABIEncoder getABIEncoder(Sha256Hash blockHash) {
@@ -79,12 +72,7 @@ private BridgeStorageProviderInitializer generateInitializerForTest(Sha256Hash b
             witnessRoot = Sha256Hash.ZERO_HASH;
             CoinbaseInformation coinbaseInformation = new CoinbaseInformation(witnessRoot);
             provider.setCoinbaseInformation(blockHash, coinbaseInformation);
-
-            try{
-                provider.save();
-            } catch (IOException e) {
-                throw new RuntimeException();
-            }
+            provider.save();
         };
     }
 }
diff --git a/rskj-core/src/test/java/co/rsk/peg/performance/LockingCapTest.java b/rskj-core/src/test/java/co/rsk/peg/performance/LockingCapTest.java
index dc22b85acc1..71d2c378528 100644
--- a/rskj-core/src/test/java/co/rsk/peg/performance/LockingCapTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/performance/LockingCapTest.java
@@ -3,10 +3,11 @@
 import co.rsk.bitcoinj.core.*;
 import co.rsk.bitcoinj.store.BlockStoreException;
 import co.rsk.bitcoinj.store.BtcBlockStore;
-import co.rsk.peg.constants.BridgeRegTestConstants;
 import co.rsk.peg.Bridge;
 import co.rsk.peg.BridgeStorageProvider;
 import co.rsk.peg.RepositoryBtcBlockStoreWithCache;
+import co.rsk.peg.lockingcap.constants.LockingCapConstants;
+import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants;
 import org.bouncycastle.util.encoders.Hex;
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
@@ -26,14 +27,13 @@ class LockingCapTest extends BridgePerformanceTestCase {
 
     private static final ECKey authorizedLockingCapChanger = ECKey.fromPrivate(Hex.decode("da6a5451bfd74829307ec6d4a8c55174d4859169f162a8ed8fcba8f7636e77cc"));
     private static final ECKey unauthorizedLockingCapChanger = ECKey.fromPrivate(Hex.decode("f18ad1e830dd746ba350f4a43b3067e85634b5138a8515246441a453ec7460e9"));
-
-    private static final Coin INITIAL_LOCKING_CAP = (new BridgeRegTestConstants()).getInitialLockingCap();
+    private final LockingCapConstants lockingCapConstants = LockingCapMainNetConstants.getInstance();
 
     private ECKey sender;
 
     @BeforeAll
      static void setupA() {
-        constants = Constants.regtest();
+        constants = Constants.mainnet();
         activationConfig = ActivationConfigsForTest.all();
     }
 
@@ -46,7 +46,7 @@ void getLockingCap() throws VMException {
                 "getLockingCap",
                 2000,
                 stats,
-                (environment, callResult) -> Assertions.assertEquals(INITIAL_LOCKING_CAP, getCoinFromResult(callResult))
+                (environment, callResult) -> Assertions.assertEquals(lockingCapConstants.getInitialValue(), getCoinFromResult(callResult))
         );
         BridgePerformanceTest.addStats(stats);
     }
@@ -58,8 +58,8 @@ void increaseLockingCap() throws VMException {
         AtomicReference<Long> newValue = new AtomicReference<>();
         executeTestCase(
                 (int executionIndex) -> {
-                    newValue.set(Helper.randomCoin(INITIAL_LOCKING_CAP, 1, 2).getValue());
-                    return Bridge.INCREASE_LOCKING_CAP.encode(new Object[]{ newValue.get().longValue() });
+                    newValue.set(Helper.randomCoin(lockingCapConstants.getInitialValue(), 1, 2).getValue());
+                    return Bridge.INCREASE_LOCKING_CAP.encode(newValue.get());
                 },
                 "increaseLockingCap",
                 2000,
@@ -78,15 +78,15 @@ void increaseLockingCap_unauthorized() throws VMException {
         ExecutionStats stats = new ExecutionStats("increaseLockingCap_unauthorized");
         executeTestCase(
                 (int executionIndex) -> {
-                    long newValue = Helper.randomCoin(INITIAL_LOCKING_CAP, 1, 2).getValue();
-                    return Bridge.INCREASE_LOCKING_CAP.encode(new Object[]{ newValue });
+                    long newValue = Helper.randomCoin(lockingCapConstants.getInitialValue(), 1, 2).getValue();
+                    return Bridge.INCREASE_LOCKING_CAP.encode(newValue);
                 },
                 "increaseLockingCap",
                 2000,
                 stats,
                 (environment, callResult) -> {
                     Coin currentLockingCap = Coin.valueOf(((Bridge)environment.getContract()).getLockingCap(null));
-                    Assertions.assertEquals(INITIAL_LOCKING_CAP, currentLockingCap);
+                    Assertions.assertEquals(lockingCapConstants.getInitialValue(), currentLockingCap);
                 }
         );
         BridgePerformanceTest.addStats(stats);
diff --git a/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java b/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java
index d93d325e2d0..913d4ef13f5 100644
--- a/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java
+++ b/rskj-core/src/test/java/co/rsk/test/builders/BridgeSupportBuilder.java
@@ -10,6 +10,7 @@
 import co.rsk.peg.constants.BridgeConstants;
 import co.rsk.peg.federation.FederationSupport;
 import co.rsk.peg.feeperkb.FeePerKbSupport;
+import co.rsk.peg.lockingcap.LockingCapSupport;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.utils.BridgeEventLogger;
 import co.rsk.peg.whitelist.WhitelistSupport;
@@ -27,6 +28,7 @@ public class BridgeSupportBuilder {
     private FeePerKbSupport feePerKbSupport;
     private WhitelistSupport whitelistSupport;
     private FederationSupport federationSupport;
+    private LockingCapSupport lockingCapSupport;
     private Factory btcBlockStoreFactory;
     private ActivationConfig.ForBlock activations;
     private SignatureCache signatureCache;
@@ -42,6 +44,7 @@ public BridgeSupportBuilder() {
         this.feePerKbSupport = mock(FeePerKbSupport.class);
         this.whitelistSupport = mock(WhitelistSupport.class);
         this.federationSupport = mock(FederationSupport.class);
+        this.lockingCapSupport = mock(LockingCapSupport.class);
         this.btcBlockStoreFactory = mock(Factory.class);
         this.activations = mock(ActivationConfig.ForBlock.class);
         this.signatureCache = mock(BlockTxSignatureCache.class);
@@ -97,6 +100,11 @@ public BridgeSupportBuilder withFederationSupport(FederationSupport federationSu
         return this;
     }
 
+    public BridgeSupportBuilder withLockingCapSupport(LockingCapSupport lockingCapSupport) {
+        this.lockingCapSupport = lockingCapSupport;
+        return this;
+    }
+
     public BridgeSupportBuilder withBtcBlockStoreFactory(Factory btcBlockStoreFactory) {
         this.btcBlockStoreFactory = btcBlockStoreFactory;
         return this;
@@ -127,6 +135,7 @@ public BridgeSupport build() {
             feePerKbSupport,
             whitelistSupport,
             federationSupport,
+            lockingCapSupport,
             btcBlockStoreFactory,
             activations,
             signatureCache