Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial version from github actions workflow #45

Merged
merged 19 commits into from
Aug 13, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Applying some other suggestions from review
fmacleal committed Aug 13, 2024
commit 1fb3717352cd94cc46b8096162083ab01e86b1d9
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ config/*.js
logs
.env
.DS_Store
.idea/
.idea/
fmacleal marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 5 additions & 4 deletions container-action/README.md
Original file line number Diff line number Diff line change
@@ -14,8 +14,9 @@ That way, we will add steps on each repository to run the integration tests with
No matter if it's a tag, a branch or a specific commit.

## Inputs
By default, all the inputs are pointed to the `master/main` branch of the repositories. But, ideally, we will adapt
the action to receive the branches received to be the one in a branch or tag that we want to test.
By default, all the inputs are pointed to the `master/main` branch of the repositories. But, ideally, the action step
should receive the branches, commit or tag that should be tested by the pipeline execution. If we want to test
a specific tag from `powpeg-node`, the input parameter `powpeg-node-branch` should be the tag number `6.4.0.0-rc` for example.

### `rskj-branch`

@@ -27,8 +28,8 @@ The powpeg-node branch to checkout. If no branch or tag passed, it will be used

### `rit-branch`

**Optional** The rootstock-integration-tests branch to checkout. This one it's optional, because it will be
very unlikely that we need to use a different branch for the rootstock-integration-test. It's offered the possibility
**Optional** The rootstock-integration-tests branch to checkout. This one it's optional, if it's needed
to use a different branch for the rootstock-integration-test. It's offered the possibility
to use a different one, but the default and most frequently used, should be `main`.

### `rit-log-level`
Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
<!-- <filter class="ch.qos.rit-local-configs.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter> -->
</appender>

<appender name="FILE-AUDIT"
@@ -104,7 +101,6 @@
<logger name="co.rsk.peg.BridgeBtcWallet" level="DEBUG"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="DEBUG"/>
<logger name="co.rsk.peg.ReleaseTransactionSet" level="TRACE"/>
<!-- <logger name="co.rsk.pcc.NativeContract" level="TRACE"/> -->

<root level="INFO">
<appender-ref ref="stdout"/>
Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
<!-- <filter class="ch.qos.rit-local-configs.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter> -->
</appender>

<appender name="FILE-AUDIT"
@@ -104,7 +101,6 @@
<logger name="co.rsk.peg.BridgeBtcWallet" level="DEBUG"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="DEBUG"/>
<logger name="co.rsk.peg.ReleaseTransactionSet" level="TRACE"/>
<!-- <logger name="co.rsk.pcc.NativeContract" level="TRACE"/> -->

<root level="INFO">
<appender-ref ref="stdout"/>
Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
<!-- <filter class="ch.qos.rit-local-configs.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter> -->
</appender>

<appender name="FILE-AUDIT"
@@ -104,7 +101,6 @@
<logger name="co.rsk.peg.BridgeBtcWallet" level="DEBUG"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="DEBUG"/>
<logger name="co.rsk.peg.ReleaseTransactionSet" level="TRACE"/>
<!-- <logger name="co.rsk.pcc.NativeContract" level="TRACE"/> -->

<root level="INFO">
<appender-ref ref="stdout"/>
Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
<!-- <filter class="ch.qos.rit-local-configs.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter> -->
</appender>

<appender name="FILE-AUDIT"
@@ -104,7 +101,6 @@
<logger name="co.rsk.peg.BridgeBtcWallet" level="DEBUG"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="DEBUG"/>
<logger name="co.rsk.peg.ReleaseTransactionSet" level="TRACE"/>
<!-- <logger name="co.rsk.pcc.NativeContract" level="TRACE"/> -->

<root level="INFO">
<appender-ref ref="stdout"/>
Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
<!-- <filter class="ch.qos.rit-local-configs.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter> -->
</appender>

<appender name="FILE-AUDIT"
@@ -96,15 +93,14 @@
<logger name="blockprocessor" level="WARN"/>
<logger name="state" level="WARN"/>
<logger name="org.bitcoinj" level="WARN"/>
<logger name="metrics" level="WARN"/>
<logger name="metrics" level="WARN"/>\
<logger name="messageProcess" level="WARN"/>
<logger name="co.rsk.federate.bitcoin.BitcoinWrapperImpl" level="DEBUG"/>
<logger name="org.ethereum.db.ReceiptStoreImpl" level="DEBUG"/>
<logger name="co.rsk.peg.FastBridgeCompatibleBtcWallet" level="DEBUG"/>
<logger name="co.rsk.peg.BridgeBtcWallet" level="DEBUG"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="DEBUG"/>
<logger name="co.rsk.peg.ReleaseTransactionSet" level="TRACE"/>
<!-- <logger name="co.rsk.pcc.NativeContract" level="TRACE"/> -->

<root level="INFO">
<appender-ref ref="stdout"/>
2 changes: 1 addition & 1 deletion lib/rsk-utils-legacy.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ const btcClientProvider = require('./btc-client-provider');
const { sequentialPromise, wait, interval } = require('./utils');
const { getBridgeAbi, getLatestActiveForkName } = require('./precompiled-abi-forks-util');
const waitForBlockAttemptTimeMillis = process.env.WAIT_FOR_BLOCK_ATTEMPT_TIME_MILLIS || 200;
const waitForBlockMaxAttempts = process.env. WAIT_FOR_BLOCK_MAX_ATTEMPTS || 160;
const waitForBlockMaxAttempts = process.env. WAIT_FOR_BLOCK_MAX_ATTEMPTS || 600;

let getMaxBlockNumber = (rskClients) => {
var maxBlockNumber;