Skip to content

Commit 1b37bff

Browse files
mcsherrylabsmcsherrylabs
committed
format files for windows, merge client rename
2 parents dd4da5c + 090efd8 commit 1b37bff

File tree

21 files changed

+329
-328
lines changed

21 files changed

+329
-328
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
enablePlugins(JavaAppPackaging, SolidityPlugin)
22

33
val commonSettings = Seq(
4-
name := "etc-client",
4+
name := "mantis",
55
version := "0.1",
66
scalaVersion := "2.12.1"
77
)

‎src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
5252
override val updateNodesInterval: FiniteDuration = 20.seconds
5353
}
5454

55-
val actorSystem = ActorSystem("etc-client_system")
55+
val actorSystem = ActorSystem("mantis_system")
5656
trait PruningConfig extends PruningModeComponent {
5757
override val pruningMode: PruningMode = ArchivePruning
5858
}

‎src/main/resources/application.conf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
grothendieck {
1+
mantis {
22
# Identifier used when connecting to other clients
3-
client-id = "grothendieck"
3+
client-id = "mantis"
44

55
# Version string (reported by an RPC method)
6-
client-version = "grothendieck/v0.1"
6+
client-version = "mantis/v0.1"
77

88
# Base directory where all the data used by the node is stored, including blockchain data and private keys
9-
datadir = ${user.home}"/.grothendieck"
9+
datadir = ${user.home}"/.mantis"
1010

1111
# The unencrypted private key of this node
12-
node-key-file = ${grothendieck.datadir}"/nodeId.keys"
12+
node-key-file = ${mantis.datadir}"/nodeId.keys"
1313

1414
# Keystore directory: stores encrypted private keys of accounts managed by this node
15-
keystore-dir = ${grothendieck.datadir}"/keystore"
15+
keystore-dir = ${mantis.datadir}"/keystore"
1616

1717
# timeout for shutting down the ActorSystem
1818
shutdown-timeout = "15.seconds"
@@ -322,12 +322,12 @@ grothendieck {
322322
db {
323323
# IODB database is not currently used
324324
iodb {
325-
path = ${grothendieck.datadir}"/iodb/"
325+
path = ${mantis.datadir}"/iodb/"
326326
}
327327

328328
leveldb {
329329
# LevelDB data directory
330-
path = ${grothendieck.datadir}"/leveldb/"
330+
path = ${mantis.datadir}"/leveldb/"
331331

332332
# Create DB data directory if it's missing
333333
create-if-missing = true

‎src/main/resources/logback.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
</appender>
1111

1212
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
13-
<file>etc-client.log</file>
13+
<file>mantis.log</file>
1414
<append>true</append>
1515
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
16-
<fileNamePattern>etc-client.%i.log.zip</fileNamePattern>
16+
<fileNamePattern>mantis.%i.log.zip</fileNamePattern>
1717
<minIndex>1</minIndex>
1818
<maxIndex>10</maxIndex>
1919
</rollingPolicy>

‎src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ trait NodeKeyBuilder {
5656
}
5757

5858
trait ActorSystemBuilder {
59-
implicit lazy val actorSystem = ActorSystem("etc-client_system")
59+
implicit lazy val actorSystem = ActorSystem("mantis_system")
6060
}
6161

6262
trait PruningConfigBuilder extends PruningModeComponent {

‎src/main/scala/io/iohk/ethereum/utils/Config.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import scala.util.Try
1919

2020
object Config {
2121

22-
val config = ConfigFactory.load().getConfig("grothendieck")
22+
val config = ConfigFactory.load().getConfig("mantis")
2323

2424
val clientId: String = config.getString("client-id")
2525

‎src/test/resources/application.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
grothendieck {
2-
datadir = "/tmp/grothendieck-test/"
1+
mantis {
2+
datadir = "/tmp/mantis-test/"
33

44
secure-random-algo = "NativePRNGNonBlocking"
55

‎src/test/scala/io/iohk/ethereum/jsonrpc/JsonRpcControllerSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class JsonRpcControllerSpec extends FlatSpec with Matchers with PropertyChecks w
7373
response.jsonrpc shouldBe "2.0"
7474
response.id shouldBe JInt(1)
7575
response.error shouldBe None
76-
response.result shouldBe Some(JString("grothendieck/v0.1"))
76+
response.result shouldBe Some(JString("mantis/v0.1"))
7777
}
7878

7979
it should "Handle net_peerCount request" in new TestSetup {
@@ -159,7 +159,7 @@ class JsonRpcControllerSpec extends FlatSpec with Matchers with PropertyChecks w
159159
val web3Response = jsonRpcController.handleRequest(web3RpcRequest).futureValue
160160

161161
web3Response.error shouldBe None
162-
web3Response.result shouldBe Some(JString("grothendieck/v0.1"))
162+
web3Response.result shouldBe Some(JString("mantis/v0.1"))
163163
}
164164

165165
it should "handle eth_getBlockTransactionCountByHash request" in new TestSetup {

‎src/test/scala/io/iohk/ethereum/mining/BlockGeneratorSpec.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
3232
val result: Either[BlockPreparationError, PendingBlock] = blockGenerator.generateBlockForMining(1, Nil, Nil, Address(testAddress))
3333
result shouldBe a[Right[_, Block]]
3434

35-
//mined with etc-client + ethminer
35+
//mined with mantis + ethminer
3636
val minedNonce = ByteString(Hex.decode("ce1b500070aeec4f"))
3737
val minedMixHash = ByteString(Hex.decode("40d9bd2064406d7f22390766d6fe5eccd2a67aa89bf218e99df35b2dbb425fb1"))
3838
val miningTimestamp = 1494604913
@@ -47,7 +47,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
4747
val result: Either[BlockPreparationError, PendingBlock] = blockGenerator.generateBlockForMining(1, Seq(signedTransaction), Nil, Address(testAddress))
4848
result shouldBe a[Right[_, Block]]
4949

50-
//mined with etc-client + ethminer
50+
//mined with mantis + ethminer
5151
val minedNonce = ByteString(Hex.decode("5e8d5c12cea7e0c7"))
5252
val minedMixHash = ByteString(Hex.decode("9247b81258f97159f987a5f4f9e94df1d95e10eeabff2836020eafb27a8228b0"))
5353
val miningTimestamp = 1494604913
@@ -63,7 +63,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
6363
blockGenerator.generateBlockForMining(1, Seq(signedTransaction, duplicatedSignedTransaction), Nil, Address(testAddress))
6464
result shouldBe a[Right[_, Block]]
6565

66-
//mined with etc-client + ethminer
66+
//mined with mantis + ethminer
6767
val minedNonce = ByteString(Hex.decode("5e8d5c12cea7e0c7"))
6868
val minedMixHash = ByteString(Hex.decode("9247b81258f97159f987a5f4f9e94df1d95e10eeabff2836020eafb27a8228b0"))
6969
val miningTimestamp = 1494604913
@@ -86,7 +86,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
8686
blockGenerator.generateBlockForMining(1, Seq(txWitGasTooBigGasLimit, signedTransaction, duplicatedSignedTransaction), Nil, Address(testAddress))
8787
result shouldBe a[Right[_, Block]]
8888

89-
//mined with etc-client + ethminer
89+
//mined with mantis + ethminer
9090
val minedNonce = ByteString(Hex.decode("5e8d5c12cea7e0c7"))
9191
val minedMixHash = ByteString(Hex.decode("9247b81258f97159f987a5f4f9e94df1d95e10eeabff2836020eafb27a8228b0"))
9292
val miningTimestamp = 1494604913
@@ -124,7 +124,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
124124
blockGenerator.generateBlockForMining(1, Seq(generalTx, specificTx), Nil, Address(testAddress))
125125
result shouldBe a[Right[_, Block]]
126126

127-
//mined with etc-client + ethminer
127+
//mined with mantis + ethminer
128128
val minedNonce = ByteString(Hex.decode("48381cb0cd40936a"))
129129
val minedMixHash = ByteString(Hex.decode("dacd96cf5dbc662fa113c73319fcdc7d6e7053571432345b936fd221c1e18d42"))
130130
val miningTimestamp = 1499952002
@@ -143,7 +143,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
143143
blockGenerator.generateBlockForMining(1, Seq(generalTx, signedTransaction), Nil, Address(testAddress))
144144
result shouldBe a[Right[_, Block]]
145145

146-
//mined with etc-client + ethminer
146+
//mined with mantis + ethminer
147147
val minedNonce = ByteString(Hex.decode("39bd50fcbde30b18"))
148148
val minedMixHash = ByteString(Hex.decode("c77dae7cef6c685896ed6b8026466a2e6338b8bc5f182e2dd7a64cf7da9c7d1b"))
149149
val miningTimestamp = 1499951223
@@ -162,7 +162,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
162162
blockGenerator.generateBlockForMining(1, Seq(nextTransaction, signedTransaction), Nil, Address(testAddress))
163163
result shouldBe a[Right[_, Block]]
164164

165-
//mined with etc-client + ethminer
165+
//mined with mantis + ethminer
166166
val minedNonce = ByteString(Hex.decode("8f88ec20f1be482f"))
167167
val minedMixHash = ByteString(Hex.decode("247a206abc088487edc1697fcaceb33ad87b55666e438129b7048bb08c8ed88f"))
168168
val miningTimestamp = 1499721182
@@ -194,7 +194,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
194194
Nil, Address(testAddress))
195195
result shouldBe a[Right[_, Block]]
196196

197-
//mined with etc-client + ethminer
197+
//mined with mantis + ethminer
198198
val minedNonce = ByteString(Hex.decode("8f88ec20f1be482f"))
199199
val minedMixHash = ByteString(Hex.decode("247a206abc088487edc1697fcaceb33ad87b55666e438129b7048bb08c8ed88f"))
200200
val miningTimestamp = 1499721182
@@ -216,7 +216,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
216216
blockGenerator.generateBlockForMining(1, Seq(txWitSameNonceButLowerGasPrice, signedTransaction), Nil, Address(testAddress))
217217
result shouldBe a[Right[_, Block]]
218218

219-
//mined with etc-client + ethminer
219+
//mined with mantis + ethminer
220220
val minedNonce = ByteString(Hex.decode("5e8d5c12cea7e0c7"))
221221
val minedMixHash = ByteString(Hex.decode("9247b81258f97159f987a5f4f9e94df1d95e10eeabff2836020eafb27a8228b0"))
222222
val miningTimestamp = 1494604913

‎src/test/scala/io/iohk/ethereum/network/p2p/MessageSpec.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class MessageSpec extends FlatSpec with Matchers {
2626
Hex.decode("f858048a6574632d636c69656e74c6c5836574683f820d05b840a13f3f0555b5037827c743e40fce29139fcf8c3f2a8f12753872fe906a77ff70f6a7f517be995805ff39ab73af1d53dac1a6c9786eebc5935fc455ac8f41ba67")
2727
val hello = WireProtocol.Hello(
2828
p2pVersion = 4,
29+
/** TODO change the expected bytyes to reflect the name change from etc-cleint to mantis **/
2930
clientId = "etc-client",
3031
capabilities = Seq(WireProtocol.Capability("eth", Versions.PV63.toByte)),
3132
listenPort = 3333,

‎src/universal/conf/application.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-Dconfig.file=./conf/grothendieck.conf -Dlogback.configurationFile=./conf/logback.xml -J-Xss10M
1+
-Dconfig.file=./conf/mantis.conf -Dlogback.configurationFile=./conf/logback.xml -J-Xss10M

‎src/universal/conf/blockchain.conf

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
grothendieck {
2-
blockchain {
3-
# Frontier block number
4-
# frontier-block-number = "0"
5-
6-
# Homestead fork block number
7-
# Doc: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2.md
8-
# homestead-block-number = "1150000"
9-
10-
# EIP-150 fork block number
11-
# Doc: https://github.com/ethereum/EIPs/issues/150
12-
# eip150-block-number = "2500000"
13-
14-
# EIP-155 fork block number
15-
# Doc: https://github.com/ethereum/eips/issues/155
16-
# 3 000 000 following lead of existing clients implementation to maintain compatibility
17-
# https://github.com/paritytech/parity/blob/b50fb71dd1d29dfde2a6c7e1830447cf30896c31/ethcore/res/ethereum/classic.json#L15
18-
# eip155-block-number = "3000000"
19-
20-
# EIP-160 fork block number
21-
# Doc: https://github.com/ethereum/EIPs/issues/160
22-
# eip160-block-number = "3000000"
23-
24-
# Difficulty bomb pause block number
25-
# Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1010.md
26-
# difficulty-bomb-pause-block-number = "3000000"
27-
28-
# Difficulty bomb continuation block number
29-
# Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1010.md
30-
# difficulty-bomb-continue-block-number = "5000000"
31-
32-
# DAO fork block number (Ethereum HF/Classic split)
33-
# https://blog.ethereum.org/2016/07/20/hard-fork-completed/
34-
# dao-fork-block-number = "1920000"
35-
36-
# The hash of the accepted DAO fork block
37-
# dao-fork-block-hash = "94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f"
38-
39-
# Starting nonce a an empty account. Some networks (like Morden) use different values.
40-
# account-start-nonce = "0"
41-
42-
# The ID of the accepted chain
43-
# chain-id = "3d"
44-
45-
# Custom genesis JSON file
46-
# null value indicates using default genesis definition that matches the main network
47-
# custom-genesis-file = null
48-
49-
# Monetary policy parameters
50-
# Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md
51-
monetary-policy {
52-
# Block reward in the first era
53-
# first-era-block-reward = "5000000000000000000"
54-
55-
# Monetary policy era duration in number of blocks
56-
# era-duration = 5000000
57-
58-
# Rate at which rewards get reduced in successive eras.
59-
# Value in range [0.0, 1.0]
60-
# reward-reduction-rate = 0.2
61-
}
62-
}
63-
}
1+
mantis {
2+
blockchain {
3+
# Frontier block number
4+
# frontier-block-number = "0"
5+
6+
# Homestead fork block number
7+
# Doc: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2.md
8+
# homestead-block-number = "1150000"
9+
10+
# EIP-150 fork block number
11+
# Doc: https://github.com/ethereum/EIPs/issues/150
12+
# eip150-block-number = "2500000"
13+
14+
# EIP-155 fork block number
15+
# Doc: https://github.com/ethereum/eips/issues/155
16+
# 3 000 000 following lead of existing clients implementation to maintain compatibility
17+
# https://github.com/paritytech/parity/blob/b50fb71dd1d29dfde2a6c7e1830447cf30896c31/ethcore/res/ethereum/classic.json#L15
18+
# eip155-block-number = "3000000"
19+
20+
# EIP-160 fork block number
21+
# Doc: https://github.com/ethereum/EIPs/issues/160
22+
# eip160-block-number = "3000000"
23+
24+
# Difficulty bomb pause block number
25+
# Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1010.md
26+
# difficulty-bomb-pause-block-number = "3000000"
27+
28+
# Difficulty bomb continuation block number
29+
# Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1010.md
30+
# difficulty-bomb-continue-block-number = "5000000"
31+
32+
# DAO fork block number (Ethereum HF/Classic split)
33+
# https://blog.ethereum.org/2016/07/20/hard-fork-completed/
34+
# dao-fork-block-number = "1920000"
35+
36+
# The hash of the accepted DAO fork block
37+
# dao-fork-block-hash = "94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f"
38+
39+
# Starting nonce a an empty account. Some networks (like Morden) use different values.
40+
# account-start-nonce = "0"
41+
42+
# The ID of the accepted chain
43+
# chain-id = "3d"
44+
45+
# Custom genesis JSON file
46+
# null value indicates using default genesis definition that matches the main network
47+
# custom-genesis-file = null
48+
49+
# Monetary policy parameters
50+
# Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md
51+
monetary-policy {
52+
# Block reward in the first era
53+
# first-era-block-reward = "5000000000000000000"
54+
55+
# Monetary policy era duration in number of blocks
56+
# era-duration = 5000000
57+
58+
# Rate at which rewards get reduced in successive eras.
59+
# Value in range [0.0, 1.0]
60+
# reward-reduction-rate = 0.2
61+
}
62+
}
63+
}

0 commit comments

Comments
 (0)