Skip to content

Commit

Permalink
updates to references and configs
Browse files Browse the repository at this point in the history
  • Loading branch information
qoire committed Apr 12, 2018
1 parent 4cc422f commit 36507d2
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 11 deletions.
30 changes: 30 additions & 0 deletions modAionImpl/test/org/aion/zero/impl/BlockchainIntegrationTest.java

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions modBoot/resource/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!--boolean, enable/disable cross origin requests (browser enforced)-->
<cors-enabled>false</cors-enabled>
<!--comma-separated list, APIs available: web3,net,debug,personal,eth,stratum-->
<apis-enabled>web3,eth,personal</apis-enabled>
<apis-enabled>web3,eth,personal,stratum</apis-enabled>
<!--size of thread pool allocated for rpc requests-->
<threads>1</threads>
<!--enable web3 filters. some web3 clients depend on this and wont work as expected if turned off-->
Expand All @@ -26,11 +26,11 @@
<net>
<id>2</id>
<nodes>
<node>p2p://c33d12c6-fdf2-4029-8137-03d0dbe9c14f@13.95.218.95:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://c33d1066-8c7e-496c-9c4e-c89318280274@13.92.155.115:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://[email protected]:30303</node>
<node>p2p://[email protected]:30303</node>
</nodes>
<p2p>
<ip>0.0.0.0</ip>
Expand Down Expand Up @@ -83,5 +83,6 @@
<SYNC>INFO</SYNC>
<CONS>INFO</CONS>
<DB>ERROR</DB>
<API>INFO</API>

This comment has been minimized.

Copy link
@AionJayT

AionJayT Apr 12, 2018

Collaborator

How about open tx and txpool with error level as a default settings

</log>
</aion>
2 changes: 1 addition & 1 deletion modMcf/src/org/aion/mcf/config/CfgApiRpc.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public final class CfgApiRpc {
this.active = true;
this.ip = "127.0.0.1";
this.port = 8545;
this.enabled = new ArrayList<>(Arrays.asList("web3", "eth", "personal"));
this.enabled = new ArrayList<>(Arrays.asList("web3", "eth", "personal", "stratum"));
this.corsEnabled = false;
this.maxthread = 1;
this.filtersEnabled = true;
Expand Down
1 change: 1 addition & 0 deletions modMcf/src/org/aion/mcf/config/CfgLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public CfgLog() {
modules.put(LogEnum.VM.name(), LogLevels.ERROR.name());
modules.put(LogEnum.DB.name(), LogLevels.ERROR.name());
modules.put(LogEnum.SYNC.name(), LogLevels.INFO.name());
modules.put(LogEnum.API.name(), LogLevels.INFO.name());

This comment has been minimized.

Copy link
@AionJayT

AionJayT Apr 12, 2018

Collaborator

How about open tx and txpool with error level as a default settings

}

public void fromXML(final XMLStreamReader sr) throws XMLStreamException {
Expand Down
2 changes: 1 addition & 1 deletion modMcf/src/org/aion/mcf/config/CfgNetP2p.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public final class CfgNetP2p {
this.maxTempNodes = 128;
this.maxActiveNodes = 128;
this.errorTolerance = 50;
this.txBroadcastbuffer = false;
this.txBroadcastbuffer = true;
}

private String ip;
Expand Down
4 changes: 2 additions & 2 deletions modMcf/src/org/aion/mcf/config/CfgTx.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class CfgTx {

public CfgTx() {
this.cacheMax = 256; // by 0.1M;
this.buffer = false;
this.poolDump =false;
this.buffer = true;
this.poolDump = false;
}

private int cacheMax;
Expand Down

0 comments on commit 36507d2

Please sign in to comment.