Initial segwit test setup and debugging.

Author: jeremy-then

lib/tests/activate-fork.js

@@ -6,12 +6,13 @@ const { getRskTransactionHelpers } = require('../rsk-tx-helper-provider');
 const execute = (fork) => {
 
   // Unskip when there is a new fork to be tested pre and post.
-  describe.skip(`Activate ${fork.name} fork`, () => {
+  describe(`Activate ${fork.name} fork`, () => {
 
       it(`should mine blocks until reach ${fork.activationHeight}th block in order to activate the fork`, async () => {
         try {
           const rskTransactionHelpers = getRskTransactionHelpers();
           const currentBlockNumber = await rskTransactionHelpers[0].getBlockNumber();
+          console.log(`Current block number: ${currentBlockNumber}`);
           expect(currentBlockNumber).to.be.below(fork.activationHeight);
 
           // Mine until activation block plus one

lib/tests/change-federation.js

@@ -174,12 +174,31 @@ const execute = (description, newFederationConfig) => {
 
             newFederationBtcPublicKeys = newFederationPublicKeys.map(federator => federator[KEY_TYPE_BTC]);
 
+            const tbd800IsActive = await Runners.common.forks.tbd800.isAlreadyActive();
+
+            console.log(`tbd800IsActive: ${tbd800IsActive}`);
+
             const expectedNewFederationErpRedeemScriptBuffer = redeemScriptParser.getP2shErpRedeemScript(newFederationBtcPublicKeys.map(key => removePrefix0x(key)), ERP_PUBKEYS, ERP_CSV_VALUE);
             expectedNewFederationErpRedeemScript = expectedNewFederationErpRedeemScriptBuffer.toString('hex');
-            expectedNewFederationAddress = redeemScriptParser.getAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer);
+            console.log(`Expected new federation ERP redeem script: ${expectedNewFederationErpRedeemScript}`);
+            
+            expectedNewFederationAddress = tbd800IsActive ?
+                redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer)
+                    :
+                redeemScriptParser.getAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer);
+
+            // const expectedNewSegwitFederationAddress = redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer);
+
+            console.log(`expectedNewFederationAddress: ${expectedNewFederationAddress}`);
 
             const flyoverNewFederationRedeemScript = redeemScriptParser.getFlyoverRedeemScript(expectedNewFederationErpRedeemScriptBuffer, FLYOVER_DERIVATION_HASH);
-            expectedFlyoverAddress = redeemScriptParser.getAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript);
+
+            expectedFlyoverAddress =  tbd800IsActive ? 
+                redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript)
+                    :
+                redeemScriptParser.getAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript);
+
+            console.log(`Expected flyover address: ${expectedFlyoverAddress}`);
 
             initialActiveFederationInfo = await getActiveFederationInfo(bridge);
 
@@ -250,6 +269,7 @@ const execute = (description, newFederationConfig) => {
             const commitFederationEvent = await rskUtils.findEventInBlock(rskTxHelper, FEDERATION_EVENTS.COMMIT_FEDERATION_FAILED.name, latestBlockNumber);
 
             const proposedFederationRedeemScript = removePrefix0x(commitFederationEvent.arguments.proposedFederationRedeemScript);
+            console.log(`Proposed federation redeem script: ${proposedFederationRedeemScript}`);
             expect(proposedFederationRedeemScript).to.be.equal(expectedNewFederationErpRedeemScript, 'The failed proposed federation redeem script should be the same as the expected one.');
 
             const blockNumber = Number(commitFederationEvent.arguments.blockNumber);
@@ -451,6 +471,7 @@ const execute = (description, newFederationConfig) => {
             // Assert
 
             // The SVP fund transaction should be created and put in waiting for confirmations.
+            console.log('finalBridgeState.pegoutsWaitingForConfirmations: ', finalBridgeState.pegoutsWaitingForConfirmations);
             expect(finalBridgeState.pegoutsWaitingForConfirmations.length).to.be.equal(1, 'There should be one pegout waiting for confirmations.');
             expect(finalBridgeState.pegoutsWaitingForSignatures.length).to.be.equal(0, 'No pegout should be waiting for signatures.');
 
@@ -462,8 +483,12 @@ const execute = (description, newFederationConfig) => {
             expect(pegoutCreationBlockNumber).to.be.equal(expectedPegoutCreationBlockNumber, 'The svp fund tx pegout creation block number should be the block that contains the first updateCollections call right after the commitFederation call.');
 
             const rawSvpFundTransaction = svpFundTxWaitingForConfirmations.btcRawTx;
+
+            console.log('rawSvpFundTransaction: ', rawSvpFundTransaction);
 
             const svpFundTransaction = bitcoinJsLib.Transaction.fromHex(rawSvpFundTransaction);
+
+            console.log('svpFundTransaction: ', svpFundTransaction);
 
             expect(svpFundTransaction.outs.length).to.be.equal(3, 'The SVP fund transaction should have 3 outputs.');
 
@@ -490,6 +515,8 @@ const execute = (description, newFederationConfig) => {
             const expectedFlyoverOutputValue = MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS * 2;
             expect(proposedFederationFlyoverOutput.value).to.be.equal(expectedFlyoverOutputValue, 'The flyover output value should be double the minimum pegout value.');
 
+            console.log('svpFundTransaction.getId(): ', svpFundTransaction.getId());
+
             // Only the svp fund tx hash unsigned value should be in storage
             await assertOnlySvpFundTxHashUnsignedIsInStorage(rskTxHelper, svpFundTransaction.getId());
 
@@ -511,6 +538,9 @@ const execute = (description, newFederationConfig) => {
 
         it('should release and register the svp fund transaction and create the svp spend transaction', async function () {
 
+            const latestBlockNumber1 = await rskTxHelper.getBlockNumber();
+            console.log(`Latest block number before svp spend tx creation: ${latestBlockNumber1}`);
+
             // Mining to have enough confirmations for the SVP fund transaction and updating the bridge.
             await rskUtils.mineAndSync(rskTxHelpers, 3);
             await rskUtils.waitAndUpdateBridge(rskTxHelper);
@@ -540,16 +570,23 @@ const execute = (description, newFederationConfig) => {
 
         it('should register the SVP Spend transaction and finish the SVP process', async function () {
 
+            const latestBlockNumber2 = await rskTxHelper.getBlockNumber();
+            console.log(`Latest block number before SVP Spend tx registration: ${latestBlockNumber2}`);
+
             const blockNumberBeforeUpdateCollections = await rskTxHelper.getBlockNumber() - 3;
             const expectedCountOfSignatures = Math.floor(newFederationPublicKeys.length / 2) + 1;
 
+            // It's failing here because it's not finding the add_signature events.
             await waitForExpectedCountOfAddSignatureEventsToBeEmitted(rskTxHelpers, blockNumberBeforeUpdateCollections, expectedCountOfSignatures);
 
             // Finding the SVP Spend transaction release_btc event
             const blockNumberAfterRelease = await rskTxHelper.getBlockNumber();
             const releaseBtcEvent = await rskUtils.findEventInBlock(rskTxHelper, PEGOUT_EVENTS.RELEASE_BTC.name, blockNumberBeforeUpdateCollections, blockNumberAfterRelease);
             svpSpendBtcTransaction = bitcoinJsLib.Transaction.fromHex(removePrefix0x(releaseBtcEvent.arguments.btcRawTransaction));
 
+            console.log(`SVP Spend transaction: `, svpSpendBtcTransaction);
+            console.log(`SVP Spend transaction.toHex(): `, svpSpendBtcTransaction.toHex());
+
             // Mining the SVP Spend transaction in bitcoin to register it in the Bridge
             await waitForBitcoinTxToBeInMempool(btcTxHelper, svpSpendBtcTransaction.getId());
             await btcTxHelper.mine(BTC_TO_RSK_MINIMUM_CONFIRMATIONS);
@@ -929,6 +966,7 @@ const execute = (description, newFederationConfig) => {
         const bridgeTransaction = await bridgeTxParser.getBridgeTransactionByTxHash(commitFederationTransactionReceipt.transactionHash);
 
         commitFederationEvent = bridgeTransaction.events.find(event => event.name === 'commit_federation');
+        console.log('commit_federation event:', commitFederationEvent);
         expect(commitFederationEvent, 'The commit federation event should be emitted.').to.not.be.null;
 
         const expectedActivationHeight = bridgeTransaction.blockNumber + FEDERATION_ACTIVATION_AGE;
@@ -1013,6 +1051,7 @@ const assertOnlySvpFundTxHashUnsignedIsInStorage = async (rskTxHelper, pegoutBtc
 
     const svpFundTxHashUnsignedRlpEncoded = await rskTxHelper.getClient().rsk.getStorageBytesAt(BRIDGE_ADDRESS, svpFundTxHashUnsignedStorageIndex);
     const svpFundTxHashUnsigned = getBridgeStorageValueDecodedHexString(svpFundTxHashUnsignedRlpEncoded, false);
+    console.log('svpFundTxHashUnsigned: ', svpFundTxHashUnsigned);
     expect(svpFundTxHashUnsigned).to.be.equal(pegoutBtcTxHash, 'The SVP fund tx hash unsigned storage value should be the tx id of the SVP fund tx.');
 
     const svpFundTxSigned = await rskTxHelper.getClient().rsk.getStorageBytesAt(BRIDGE_ADDRESS, svpFundTxSignedStorageIndex);
@@ -1060,11 +1099,14 @@ const assertOnlySvpSpendTxValuesAreInStorage = async (rskTxHelper) => {
     const svpSpendTxHashUnsigned = await rskTxHelper.getClient().rsk.getStorageBytesAt(BRIDGE_ADDRESS, svpSpendTxHashUnsignedStorageIndex);
     expect(svpSpendTxHashUnsigned).to.not.be.equal('0x0', 'The SVP spend tx hash unsigned storage value should not be empty.');
     const svpSpendTxHashUnsignedDecoded = decodeRlp(svpSpendTxHashUnsigned).toString('hex');
+    console.log('svpSpendTxHashUnsignedDecoded: ', svpSpendTxHashUnsignedDecoded);
 
     const svpSpendTxWaitingForSignatures = await rskTxHelper.getClient().rsk.getStorageBytesAt(BRIDGE_ADDRESS, svpSpendTxWaitingForSignaturesStorageIndex);
     expect(svpSpendTxWaitingForSignatures).to.not.be.equal('0x0', 'The SVP spend tx waiting for signatures storage value should not be empty.');
 
     const decodedSvpSpendTxWaitingForSignatures = parseRLPToPegoutWaitingSignatures(svpSpendTxWaitingForSignatures)[0];
+    console.log('decodedSvpSpendTxWaitingForSignatures: ', decodedSvpSpendTxWaitingForSignatures);
+    console.log('decodedSvpSpendTxWaitingForSignatures.btcRawTx: ', decodedSvpSpendTxWaitingForSignatures.btcRawTxvpSpendTxWaitingForSignatures);
     const svpSpendBtcTx = bitcoinJsLib.Transaction.fromHex(removePrefix0x(decodedSvpSpendTxWaitingForSignatures.btcRawTx));
     expect(svpSpendTxHashUnsignedDecoded).to.be.equal(svpSpendBtcTx.getId(), 'The SVP spend tx hash unsigned storage value should be the tx id of the SVP spend tx.');
 

package-lock.json

@@ -19,7 +19,7 @@
     "@rsksmart/btc-eth-unit-converter": "^1.0.0",
     "@rsksmart/btc-rsk-derivation": "^0.0.2",
     "@rsksmart/pmt-builder": "^3.0.0",
-    "@rsksmart/powpeg-redeemscript-parser": "^1.0.1",
+    "@rsksmart/powpeg-redeemscript-parser": "github:rsksmart/powpeg-redeemscript-parser#fbe3b981b3f768396833f5f832526a9751098089",
     "@rsksmart/rsk-precompiled-abis": "^6.0.0-ARROWHEAD",
     "@rsksmart/rsk-precompiled-abis-lovell": "git+https://github.com/rsksmart/precompiled-abis#7.0.0-LOVELL",
     "bn.js": "^4.11.8",

package.json

@@ -95,6 +95,7 @@ global.Runners = {
       arrowhead600: createForkObject('arrowhead600', 1),
       arrowhead631: createForkObject('arrowhead631', 1),
       lovell700: createForkObject('lovell700', 1),
+      tbd800: createForkObject('lovell700', 1200),
     },
     additionalFederationAddresses: []
   }

test.js

@@ -0,0 +1,6 @@
+const activateForkTest = require('../lib/tests/activate-fork');
+
+// Skipped activate-fork.js. When there is a new fork to be tested pre and post, unskip it in the activate-fork.js file
+activateForkTest.execute(
+    Runners.common.forks.tbd800
+);

tests/01_01_00-activate-tbd800.js

@@ -0,0 +1,3 @@
+const federationChangeTests = require('../lib/tests/change-federation');
+
+federationChangeTests.execute('Initial Federation change', Runners.config.federations.thirdFederation);