Skip to content

Commit

Permalink
Makes bitcoind installation easier to select. Adds the logback files.…
Browse files Browse the repository at this point in the history 
… Added the regtest-x.js files. Aded environment variables for easy setup. Updated README.md
  • Loading branch information
@jeremy-then
jeremy-then committed Jun 18, 2024
1 parent d7061fc commit 6d0cfe0
Show file tree
Hide file tree
Showing 13 changed files with 954 additions and 176 deletions.
12 changes: 9 additions & 3 deletions .env-example
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
INCLUDE_CASES=00_00_01-sync.js,01_01_01-pre_orchid_2wp.js
RUN_EACH_TEST_FILE_THESE_TIMES=1
RUN_ALL_TESTS_THESE_TIMES=1
# INCLUDE_CASES=00_00_01-sync.js,01_01_01-pre_orchid_2wp.js
# RUN_EACH_TEST_FILE_THESE_TIMES=1
# RUN_ALL_TESTS_THESE_TIMES=1
HSM1_FEDHM_MOCKUP_PATH=PATH/TO/hsm/hsm/fedhm-mockup.py
HSM2_SIM_PATH=PATH/TO/hsm/hsm/v2/sim/0.1.3/sim
POWPEG_NODE_JAR_PATH=<path_to_powpeg_repo>/powpeg-node/build/libs/federate-node-SNAPSHOT-6.3.0.0-all.jar
CONFIG_FILE=regtest-all-keyfiles
BITCOIND_BIN_PATH=/<path_to_bitcoind>/bitcoind/bin/bitcoind
LOG_HOME=/<path_to_logs/directory>/logs
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
node_modules
.vscode/
.lock
config/*.js
**/*.secp256
**/*.bip39
logs
Expand Down
365 changes: 214 additions & 151 deletions README.md
View file

Large diffs are not rendered by default.

99 changes: 99 additions & 0 deletions config/logback/logback-fed-1.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>

<configuration INFO="false" scan="true" scanPeriod="3600 seconds">
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<Target>System.out</Target>
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
</appender>

<appender name="FILE-AUDIT"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/rsk-fed-1.log</file>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>
%date{yyyy-MM-dd-HH:mm:ss.SSS} %p [%c{1}] %m%n
</Pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>logs/rsk-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<maxFileSize>100MB</maxFileSize>
<maxHistory>7</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
</appender>

<logger name="ReleaseTransactionBuilder" level="INFO"/>
<logger name="execute" level="WARN"/>
<logger name="blockvalidator" level="WARN"/>
<logger name="blockexecutor" level="WARN"/>
<logger name="general" level="INFO"/>
<logger name="gaspricetracker" level="WARN"/>
<logger name="web3" level="TRACE"/>
<logger name="repository" level="WARN"/>
<logger name="VM" level="WARN"/>
<logger name="blockqueue" level="WARN"/>
<logger name="io.netty" level="WARN"/>
<logger name="block" level="WARN"/>
<logger name="minerserver" level="WARN"/>
<logger name="minerClient" level="WARN"/>
<logger name="txbuilderex" level="WARN"/>
<logger name="pendingstate" level="WARN"/>
<logger name="hsqldb.db" level="WARN"/>
<logger name="TCK-Test" level="WARN"/>
<logger name="db" level="WARN"/>
<logger name="net" level="ERROR"/>
<logger name="start" level="INFO"/>
<logger name="co.rsk.bitcoinj.core.CheckpointManager" level="WARN"/>
<logger name="co.rsk.bitcoinj.wallet.Wallet" level="WARN"/>
<logger name="co.rsk.net.discovery.UDPServer" level="WARN"/>
<logger name="co.rsk.bitcoinj.core.Context" level="WARN"/>
<logger name="co.rsk.bitcoinj.core.PeerGroup" level="WARN"/>
<logger name="co.rsk.bitcoinj.core.BtcAbstractBlockChain" level="WARN"/>
<logger name="co.rsk.federate.bitcoin.peerdetector.BitcoinPeerDetector" level="INFO"/>
<logger name="co.rsk.federate.bitcoin.peerdetector.Handshaker" level="INFO"/>
<logger name="co.rsk.federate.FederatorSupport" level="DEBUG"/>
<logger name="co.rsk.federate.FederateRunner" level="TRACE"/>
<logger name="co.rsk.federate.signing.hsm.HSMClientProtocol" level="TRACE"/>
<logger name="co.rsk.federate.BtcReleaseClient" level="TRACE"/>
<logger name="fullnoderunner" level="TRACE"/>
<logger name="FederationWatcher" level="WARN"/>
<logger name="cli" level="WARN"/>
<logger name="txs" level="WARN"/>
<logger name="gas" level="ERROR"/>
<logger name="main" level="INFO"/>
<logger name="trie" level="WARN"/>
<logger name="peermonitor" level="WARN"/>
<logger name="bridge" level="TRACE"/>
<logger name="org.springframework" level="WARN"/>
<logger name="rlp" level="WARN"/>
<logger name="messagehandler" level="WARN"/>
<logger name="sync" level="WARN"/>
<logger name="BtcReleaseClient" level="TRACE"/>
<logger name="BtcToRskClient" level="DEBUG"/>
<logger name="ui" level="WARN"/>
<logger name="java.nio" level="WARN"/>
<logger name="org.eclipse.jetty" level="WARN"/>
<logger name="wire" level="WARN"/>
<logger name="BridgeSupport" level="TRACE"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="ERROR"/>
<logger name="jsonrpc" level="TRACE"/>
<logger name="wallet" level="WARN"/>
<logger name="blockchain" level="WARN"/>
<logger name="blockprocessor" level="WARN"/>
<logger name="state" level="WARN"/>
<logger name="org.bitcoinj" 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"/>
<root level="INFO">
<appender-ref ref="stdout"/>
<appender-ref ref="FILE-AUDIT"/>
</root>
</configuration>
97 changes: 97 additions & 0 deletions config/logback/logback-fed-2.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>

<configuration INFO="false" scan="true" scanPeriod="3600 seconds">
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<Target>System.out</Target>
<encoder>
<pattern>%date{yyyy-MM-dd-HH:mm:ss.SSSS} %p [%c{1}] %m%n</pattern>
</encoder>
</appender>

<appender name="FILE-AUDIT"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/rsk-fed-2.log</file>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>
%date{yyyy-MM-dd-HH:mm:ss.SSS} %p [%c{1}] %m%n
</Pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>logs/rsk-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<maxFileSize>100MB</maxFileSize>
<maxHistory>7</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
</appender>

<logger name="ReleaseTransactionBuilder" level="OFF"/>
<logger name="execute" level="WARN"/>
<logger name="blockvalidator" level="WARN"/>
<logger name="blockexecutor" level="WARN"/>
<logger name="general" level="INFO"/>
<logger name="gaspricetracker" level="WARN"/>
<logger name="web3" level="TRACE"/>
<logger name="repository" level="WARN"/>
<logger name="VM" level="WARN"/>
<logger name="blockqueue" level="WARN"/>
<logger name="io.netty" level="WARN"/>
<logger name="block" level="WARN"/>
<logger name="minerserver" level="WARN"/>
<logger name="minerClient" level="WARN"/>
<logger name="txbuilderex" level="WARN"/>
<logger name="pendingstate" level="WARN"/>
<logger name="hsqldb.db" level="WARN"/>
<logger name="TCK-Test" level="WARN"/>
<logger name="db" level="WARN"/>
<logger name="net" level="ERROR"/>
<logger name="start" level="INFO"/>
<logger name="co.rsk.bitcoinj.core.CheckpointManager" level="WARN"/>
<logger name="co.rsk.bitcoinj.wallet.Wallet" level="WARN"/>
<logger name="co.rsk.net.discovery.UDPServer" level="WARN"/>
<logger name="co.rsk.bitcoinj.core.Context" level="WARN"/>
<logger name="co.rsk.bitcoinj.core.PeerGroup" level="WARN"/>
<logger name="co.rsk.bitcoinj.core.BtcAbstractBlockChain" level="WARN"/>
<logger name="co.rsk.federate.bitcoin.peerdetector.BitcoinPeerDetector" level="INFO"/>
<logger name="co.rsk.federate.bitcoin.peerdetector.Handshaker" level="INFO"/>
<logger name="co.rsk.federate.FederatorSupport" level="DEBUG"/>
<logger name="co.rsk.federate.FederateRunner" level="TRACE"/>
<logger name="co.rsk.federate.signing.hsm.HSMClientProtocol" level="TRACE"/>
<logger name="co.rsk.federate.BtcReleaseClient" level="TRACE"/>
<logger name="fullnoderunner" level="TRACE"/>
<logger name="FederationWatcher" level="WARN"/>
<logger name="cli" level="WARN"/>
<logger name="txs" level="WARN"/>
<logger name="gas" level="ERROR"/>
<logger name="main" level="INFO"/>
<logger name="trie" level="WARN"/>
<logger name="syncprocessor" level="WARN"/>
<logger name="peermonitor" level="WARN"/>
<logger name="bridge" level="TRACE"/>
<logger name="org.springframework" level="WARN"/>
<logger name="rlp" level="WARN"/>
<logger name="messagehandler" level="WARN"/>
<logger name="sync" level="WARN"/>
<logger name="BtcReleaseClient" level="DEBUG"/>
<logger name="BtcToRskClient" level="DEBUG"/>
<logger name="ui" level="WARN"/>
<logger name="java.nio" level="WARN"/>
<logger name="org.eclipse.jetty" level="WARN"/>
<logger name="wire" level="WARN"/>
<logger name="BridgeSupport" level="TRACE"/>
<logger name="co.rsk.peg.BridgeStorageProvider" level="ERROR"/>
<logger name="jsonrpc" level="TRACE"/>
<logger name="wallet" level="WARN"/>
<logger name="blockchain" level="WARN"/>
<logger name="blockprocessor" level="WARN"/>
<logger name="state" level="WARN"/>
<logger name="org.bitcoinj" level="WARN"/>
<logger name="metrics" level="WARN"/>
<logger name="messageProcess" level="WARN"/>
<logger name="co.rsk.federate.bitcoin.BitcoinWrapperImpl" level="DEBUG"/>
<!-- <logger name="co.rsk.pcc.NativeContract" level="TRACE"/> -->

<root level="INFO">
<appender-ref ref="stdout"/>
<appender-ref ref="FILE-AUDIT"/>
</root>
</configuration>
Loading

0 comments on commit 6d0cfe0

Please sign in to comment.