Merge master -> rskip351+rskip144 #2251

Vovchyk · 2024-02-07T14:09:30Z

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
Tests for the changes have been added (for bug fixes / features)
Requires Activation Code (Hard Fork)

Other information:

Made bucketSize value configurable

…onfigsForTest helper - Got rid of sigHash parameter when testing null values - Got rid of no needed comments - Renamed BRIDGE_BTC_TX_SIG_HASH_KEY to BRIDGE_BTC_TX_SIG_HASH

…nstance variable so no need to be creating these variables for each test that needs it. - Fix some tests

…elated to activations

…Builder to its constructor. Remove LegacyErpFederation and P2shErpFederation. Add activations and network parameters logic to the NonStandard builders

…or each non-standard fed created with each non-standard builder

… to use activations logic. Rename defineErpRedeemScriptBuilder to defineNonStandardErpRedeemScriptBuilder.

…erFactory. Move validations methods from builders to a utils class. Rename standard to default in erp context. Split some classes, errors and methods to be clearer and more scalable. Remove regtest validation from NonStandard builder factory class

…Rename validateEmergencyKeys method. Make methods non-static when not needed. Rename ErpRedeemScriptBuilderCreationException to FederationCreationException. Fix typo. Move removeOpCheckMultisig method to builder utils. Delete unused Standardness file

…ining it again

…deemScriptBuilder

…tP2SHScript and getFederationDefaultRedeemScript methods to avoid repetition

…r methods to make them cleaner. Make fields private in Legacy and P2sh tests. Remove TODO comment

…Sig check for isSentToStandardMultiSig in builder utils.

…iptCreationException class to avoid circular dependency with peg package

…uilderUtilsTest. #Fix tests after rebase

…between redeem script and format version. Adapt to that change. Move Federation related files to new federation package

…to it. Move FederationMember to federation package to avoid circular dependency. Rename int i to int version to use meaningful names

…ge to avoid circular dependency with peg package

…file

…ss so it can be moved into federation package. Move PendingFederation class into federation package

…ctor

… to PendingFederation and FederationMember. Move respective tests from BridgeSerializationUtilsTest to PendingFederationTest and FederationMemberTest. Rename methods to be clearer.

…onstructor receives

…args and erp values. Use it whenever possible.

…e some variables to be clearer. Remove federationArgs field from Federation and so getArgs method.

…erationArgs and ErpFederationArgs classes

…fy tests using them

…r-integration Rebase federations new refactor integration

Used fixed buffer allocator for udp channel

…covery Retry connection to bootstrap nodes in discovery after failed attempt

rskj-core/src/test/java/co/rsk/peg/PegUtilsGetTransactionTypeTest.java

@@ -2116,7 +2119,7 @@

        FederationTestUtils.addSignatures(oldFederation, REGTEST_OLD_FEDERATION_PRIVATE_KEYS, migrationTx);

-        Assertions.assertTrue(PegUtilsLegacy.txIsFromOldFederation(migrationTx, oldFederation.address));
+        Assertions.assertTrue(PegUtilsLegacy.txIsFromOldFederation(migrationTx, oldFederation.getAddress()));


rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java

@@ -2003,8 +1935,8 @@
        assertFalse(isPegOutTx(pegOutTx1, activations, defaultFederation.getP2SHScript(), standardFederation.getP2SHScript()));
        assertFalse(isPegOutTx(pegOutTx1, activations, standardFederation.getP2SHScript()));

-        assertFalse(isPegOutTx(pegOutTx1, Collections.singletonList(erpFederation), activations));
-        assertFalse(isPegOutTx(pegOutTx1, activations, erpFederation.getStandardP2SHScript()));
+        assertFalse(isPegOutTx(pegOutTx1, Collections.singletonList(nonStandardErpFederation), activations));


rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java

-        assertFalse(isPegOutTx(pegOutTx1, Collections.singletonList(erpFederation), activations));
-        assertFalse(isPegOutTx(pegOutTx1, activations, erpFederation.getStandardP2SHScript()));
+        assertFalse(isPegOutTx(pegOutTx1, Collections.singletonList(nonStandardErpFederation), activations));
+        assertFalse(isPegOutTx(pegOutTx1, activations, nonStandardErpFederation.getDefaultP2SHScript()));


rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java

@@ -2017,8 +1949,8 @@
        assertTrue(isPegOutTx(pegOutTx1, activations, defaultFederation.getP2SHScript(), standardFederation.getP2SHScript()));
        assertFalse(isPegOutTx(pegOutTx1, activations, standardFederation.getP2SHScript()));

-        assertTrue(isPegOutTx(pegOutTx1, Collections.singletonList(erpFederation), activations));
-        assertTrue(isPegOutTx(pegOutTx1, activations, erpFederation.getStandardP2SHScript()));
+        assertTrue(isPegOutTx(pegOutTx1, Collections.singletonList(nonStandardErpFederation), activations));


rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java

-        assertTrue(isPegOutTx(pegOutTx1, Collections.singletonList(erpFederation), activations));
-        assertTrue(isPegOutTx(pegOutTx1, activations, erpFederation.getStandardP2SHScript()));
+        assertTrue(isPegOutTx(pegOutTx1, Collections.singletonList(nonStandardErpFederation), activations));
+        assertTrue(isPegOutTx(pegOutTx1, activations, nonStandardErpFederation.getDefaultP2SHScript()));


Vovchyk and others added 30 commits January 16, 2024 15:20

Made bucketSize value configurable

651a945

Merge branch 'master' into bucket-size-conf

6faed39

Merge pull request #2228 from rsksmart/bucket-size-conf

5395060

Made bucketSize value configurable

- Changed Activation mock to Activation obtained by using ActivationC…

5274b7a

…onfigsForTest helper - Got rid of sigHash parameter when testing null values - Got rid of no needed comments - Renamed BRIDGE_BTC_TX_SIG_HASH_KEY to BRIDGE_BTC_TX_SIG_HASH

- Declare minimumPeginTxValue and belowMinimumPeginTxValue as class i…

f372b2e

…nstance variable so no need to be creating these variables for each test that needs it. - Fix some tests

Create ErpRedeemScriptBuilders

90878b7

Split old LegacyErpRedeemScriptBuilder into NonStandardErp builders r…

8a2e6ba

…elated to activations

Make ErpFederation a non-abstract class again. Inject ErpRedeemScript…

85bd468

…Builder to its constructor. Remove LegacyErpFederation and P2shErpFederation. Add activations and network parameters logic to the NonStandard builders

Add activations argument to getOldFederation tests. Create one test f…

5d5a6d7

…or each non-standard fed created with each non-standard builder

Refactor bridge storage logic. Make tests related to non-standard fed…

9bf0956

… to use activations logic. Rename defineErpRedeemScriptBuilder to defineNonStandardErpRedeemScriptBuilder.

Make saveNewFederation logic order the same as saveOldFederation

a54010b

Create getRedeemScriptParser method in ErpFederation

4b21c2d

Create CSV_BYTES_NEEDED_LENGTH constant

11d2de9

Make MAX_CSV_VALUE field public and use it when needed instead of def…

91b0b9a

…ining it again

Rename defineNonStandardErpRedeemScriptBuilder to getNonStandardErpRe…

e27f68d

…deemScriptBuilder

Add builders check to PowpegMigrationTest. Create getFederationDefaul…

398cdf6

…tP2SHScript and getFederationDefaultRedeemScript methods to avoid repetition

Modify getRedeemScriptParser method to not receive arguments. Refacto…

d1f5918

…r methods to make them cleaner. Make fields private in Legacy and P2sh tests. Remove TODO comment

Add tests for erp redeem script builder utils. Replace isSentToMulti…

4555c9a

…Sig check for isSentToStandardMultiSig in builder utils.

Move builders related classes to bitcoin package and create RedeemScr…

cd71f1b

…iptCreationException class to avoid circular dependency with peg package

Add NonStandardErpRedeemScriptBuilderFactoryTest and ErpRedeemScriptB…

dc3eb8d

…uilderUtilsTest. #Fix tests after rebase

Create FederationFactory to create federations without inconsistency …

e2d410e

…between redeem script and format version. Adapt to that change. Move Federation related files to new federation package

Create federation package in tests and move federation related tests …

d61b240

…to it. Move FederationMember to federation package to avoid circular dependency. Rename int i to int version to use meaningful names

Move FederationSupport and PendingFederation outside federation packa…

cadc0f1

…ge to avoid circular dependency with peg package

Refactor activation of consensus rules to use ActivationConfigsForTest

7a68d0b

Move BTC_RSK_MST_PUBKEYS_COMPARATOR from FederationMember to its own …

3148231

…file

Move pending federation serializer behaviour to PendingFederation cla…

6d6711a

…ss so it can be moved into federation package. Move PendingFederation class into federation package

Modify getHash test in PendingFederationTest

6c0c5d6

Add activations to serialization logic. Adapt to that change and refa…

fbe1965

…ctor

julia-zack and others added 19 commits January 31, 2024 11:08

Move respective deserialization methods from BridgeSerializationUtils…

8f9d894

… to PendingFederation and FederationMember. Move respective tests from BridgeSerializationUtilsTest to PendingFederationTest and FederationMemberTest. Rename methods to be clearer.

Create FederationArgs to reduce the amount of fields the Federation c…

fd13e7b

…onstructor receives

Create a method to build an ErpFederationArgs object from federation …

01b4242

…args and erp values. Use it whenever possible.

Rename legacy / legacy erp / erp to non standard erp due to refactors

eae2dd9

Make FederationArgs fields private and create accessors. Adapt. Renam…

f6eeb46

…e some variables to be clearer. Remove federationArgs field from Federation and so getArgs method.

Create getErpArgs method for ErpFederation. Create tests for both Fed…

1bce5c3

…erationArgs and ErpFederationArgs classes

Create equals methods in FederationArgs and ErpFederationArgs. Simpli…

ebdfe7f

…fy tests using them

Save erpPubKeys as compressed in ErpFederation

376b627

Merge pull request #2231 from rsksmart/rebase-federations-new-refacto…

471dc02

…r-integration Rebase federations new refactor integration

Used fixed buffer allocator for udp channel

2cfd231

Merge pull request #2236 from rsksmart/fixed-buf-allocator

0f986f2

Used fixed buffer allocator for udp channel

add retry connection logic

d421333

load initial boot nodes and check for closest nodes

2303001

load max bootstrap retry limit from config

6cbf414

fix unit tests PeerExplorer constructor

1a42843

remove unused field

5410fe8

add unit tests

b84e091

improve formatting and comments

5d5d665

Merge pull request #2213 from rsksmart/retry-connection-bootstrap-dis…

5844266

…covery Retry connection to bootstrap nodes in discovery after failed attempt

Vovchyk requested a review from a team as a code owner February 7, 2024 14:09

github-advanced-security bot found potential problems Feb 7, 2024

View reviewed changes

Vovchyk merged commit 964eb45 into rskip351+rskip144 Feb 7, 2024
11 of 12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master -> rskip351+rskip144 #2251

Merge master -> rskip351+rskip144 #2251

Vovchyk commented Feb 7, 2024

Merge master -> rskip351+rskip144 #2251

Merge master -> rskip351+rskip144 #2251

Conversation

Vovchyk commented Feb 7, 2024

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist: