Skip to content

Commit fe6f147

Browse files
rtkaczykrtkaczyk
committed
Merge remote-tracking branch 'origin/phase/iele_testnet' into feature/eckeygen
2 parents 3178386 + f3c7f08 commit fe6f147

25 files changed

+584
-18
lines changed

‎build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ val dep = {
4646
"commons-io" % "commons-io" % "2.5",
4747
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
4848
"org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0",
49+
"com.twitter" %% "util-collection" % "18.4.0",
4950

5051
// Pluggable Consensus: AtomixRaft
5152
"io.atomix" % "atomix" % "2.1.0-beta1",

‎docker/Dockerfile

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
2+
FROM mantis-dev:latest as CURRENTBUILD
3+
4+
ARG MANTIS_TAG
5+
ENV MANTIS_TAG ${MANTIS_TAG:-phase/iele_testnet}
6+
7+
# The command `sbt dist` generates a zip file in the `target/universal` directory.
8+
# The value of `MANTIS_DIST_ZIP_NAME` must be the name of the generated zip,
9+
# excluding the extension.
10+
# So, for example, currently (commit `35e06611`) the `sbt dist` command
11+
# produces `target/universal/mantis-1.0-daedalus-rc1.zip`, so we can set
12+
# `MANTIS_DIST_ZIP_NAME` to be `mantis-1.0-daedalus-rc1`.
13+
# A glob like `mantis-*` also works and is more convenient, since it is invariant
14+
# with respect to the other part, which dependens on the software version.
15+
ARG MANTIS_DIST_ZIP_NAME
16+
ENV MANTIS_DIST_ZIP_NAME ${MANTIS_DIST_ZIP_NAME:-mantis-*}
17+
18+
# Grab latest mantis, build the distribution and install it
19+
RUN ~/install-mantis.sh $MANTIS_TAG $MANTIS_DIST_ZIP_NAME
20+
# Now mantis is in /home/mantis/mantis-dist/app
21+
# or just /app
22+
23+
# Start over and keep what is needed.
24+
# Now the size optimization comes from `mantis-base`:
25+
# smaller `mantis-base` means smaller `mantis` image (this image).
26+
FROM mantis-base:latest
27+
28+
USER root
29+
COPY --from=CURRENTBUILD /home/mantis/mantis-dist /home/mantis/mantis-dist
30+
RUN chown -R mantis:mantis /home/mantis/mantis-dist
31+
32+
USER mantis
33+
WORKDIR /app
34+
VOLUME /app/conf

‎docker/Dockerfile-base

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM ubuntu:xenial
2+
3+
# This "base" image contains the base OS along with some extra programs.
4+
5+
# See the accompanying `build-base.sh` script for tagging details.
6+
7+
ENV DEBIAN_FRONTEND noninteractive
8+
9+
ADD scripts/install-base-system.sh /root/
10+
RUN /root/install-base-system.sh
11+
12+
ADD scripts/install-nix-common.sh /home/mantis/
13+
ADD scripts/install-nix-apps-base.sh /home/mantis/
14+
RUN chown mantis:mantis /home/mantis/install-*.sh
15+
16+
USER mantis
17+
WORKDIR /home/mantis
18+
ENV USER mantis
19+
20+
RUN ~/install-nix-apps-base.sh

‎docker/Dockerfile-dev

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM mantis-base:latest
2+
3+
# This "dev" image creates enough of a Mantis build environment,
4+
# so that the actual Mantis images can be built in less time.
5+
# We are particularly interested in caching the dependencies needed
6+
# during the build process. This means that whenever those change,
7+
# the "dev" image must be recreated.
8+
9+
# See the `Dockerfile-base` for the parent image details.
10+
# See the accompanying `build-dev.sh` script for tagging details.
11+
12+
ARG SBT_VERIFY_TAG
13+
ENV SBT_VERIFY_TAG ${SBT_VERIFY_TAG:-v0.4.1}
14+
15+
ARG MANTIS_TAG
16+
ENV MANTIS_TAG ${MANTIS_TAG:-phase/iele_testnet}
17+
18+
USER root
19+
20+
ADD scripts/install-nix-apps-dev.sh /home/mantis/
21+
ADD scripts/install-mantis-dev.sh /home/mantis/
22+
ADD scripts/install-mantis.sh /home/mantis/
23+
24+
RUN chown mantis:mantis /home/mantis/install-*.sh
25+
26+
USER mantis
27+
WORKDIR /home/mantis
28+
ENV USER mantis
29+
30+
RUN ~/install-nix-apps-dev.sh
31+
RUN ~/install-mantis-dev.sh $SBT_VERIFY_TAG $MANTIS_TAG

‎docker/build-base.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
set -eux
4+
5+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
6+
7+
exec $HERE/buildhelper.sh mantis-base Dockerfile-base latest

‎docker/build-dev.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
set -eux
4+
5+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
6+
7+
exec $HERE/buildhelper.sh mantis-dev Dockerfile-dev latest

‎docker/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
set -eux
4+
5+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
6+
7+
$HERE/buildhelper.sh mantis Dockerfile

‎docker/buildhelper.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env bash
2+
3+
set -eux
4+
5+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
6+
7+
IMAGE_NAME=$1
8+
DOCKERFILE=$2
9+
10+
# If IMAGE_TAG is not given in the command line, then compute one in the format
11+
#
12+
# YYYY-MM-DD '.' SHORT_HASH
13+
#
14+
# where the variable parts refer to the latest commit
15+
IMAGE_TAG=${3:-$(git log -1 --format=%cd.%h --date=short)}
16+
17+
# This is the commit that the image will be based on
18+
GIT_HASH=$(git log -1 --format=%H)
19+
20+
docker build --build-arg MANTIS_TAG=$GIT_HASH -t $IMAGE_NAME:$IMAGE_TAG -f $HERE/$DOCKERFILE $HERE

‎docker/scripts/install-base-system.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env bash
2+
3+
set -euxo pipefail
4+
5+
apt-get update
6+
apt-get dist-upgrade -y
7+
apt-get install -y curl bzip2 locales
8+
locale-gen en_US.UTF-8
9+
update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
10+
11+
adduser --disabled-password --gecos '' mantis
12+
13+
mkdir /nix
14+
chown mantis:mantis /nix
15+
su mantis -c 'curl https://nixos.org/nix/install | sh \
16+
&& tail -n 1 ~/.profile >> ~/.bashrc'
17+
ln -s /home/mantis/mantis-dist/app /app
18+
19+
apt-get purge -y curl bzip2
20+
apt-get clean -y
21+
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/*

‎docker/scripts/install-mantis-dev.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/usr/bin/env bash
2+
3+
set -euxo pipefail
4+
5+
SBT_VERIFY_TAG=$1
6+
MANTIS_TAG=$2
7+
8+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
9+
. $HERE/install-nix-common.sh
10+
11+
mkdir ~/repos
12+
13+
cd ~/repos
14+
git clone https://github.com/input-output-hk/sbt-verify.git
15+
cd sbt-verify
16+
git checkout $SBT_VERIFY_TAG
17+
# This is needed, since the library is not published in binary form.
18+
sbt publishLocal
19+
20+
cd ~/repos
21+
git clone https://github.com/input-output-hk/mantis.git
22+
cd mantis
23+
git checkout $MANTIS_TAG
24+
git submodule update --init
25+
26+
# Trigger compilation, so that we get some dependencies from the internetz.
27+
sbt 'set test in Test := {}' compile

‎docker/scripts/install-mantis.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env bash
2+
3+
set -euxo pipefail
4+
5+
MANTIS_TAG=$1
6+
MANTIS_DIST_ZIP_NAME=$2
7+
8+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
9+
. $HERE/install-nix-common.sh
10+
11+
cd ~/repos/mantis
12+
13+
git checkout $MANTIS_TAG
14+
git submodule update --init
15+
16+
sbt 'set test in Test := {}' dist
17+
mkdir -p ~/mantis-dist/app
18+
unzip -d ~/mantis-dist/app target/universal/${MANTIS_DIST_ZIP_NAME}.zip
19+
mv ~/mantis-dist/app/*/* ~/mantis-dist/app
20+
rmdir ~/mantis-dist/app/$MANTIS_DIST_ZIP_NAME
21+
rm -rf ~/repos ~/.ivy2 ~/.sbt

‎docker/scripts/install-nix-apps-base.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
set -euxo pipefail
4+
5+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
6+
. $HERE/install-nix-common.sh
7+
8+
nix-install openjdk
9+
nix-collect-garbage -d

‎docker/scripts/install-nix-apps-dev.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
set -euxo pipefail
4+
5+
HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
6+
. $HERE/install-nix-common.sh
7+
8+
nix-install sbt gitMinimal unzip
9+
nix-collect-garbage -d

‎docker/scripts/install-nix-common.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
3+
set -euxo pipefail
4+
5+
NIX_PROFILE=~/.nix-profile/etc/profile.d/nix.sh
6+
7+
export MANPATH=
8+
. $NIX_PROFILE
9+
10+
export NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-18.03.tar.gz
11+
12+
function nix-install() {
13+
nix-env -f '<nixpkgs>' -iA "$@"
14+
}

‎src/main/resources/application.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ mantis {
547547
port = 8888
548548
}
549549
}
550-
551550
}
552551

553552
akka {

‎src/main/scala/io/iohk/ethereum/App.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package io.iohk.ethereum
22

33
import io.iohk.ethereum.crypto.EcKeyGen
44
import io.iohk.ethereum.extvm.VmServerApp
5+
import io.iohk.ethereum.faucet.Faucet
56
import io.iohk.ethereum.mallet.main.Mallet
67
import io.iohk.ethereum.utils.{Config, Logger}
78

@@ -15,6 +16,7 @@ object App extends Logger {
1516
val downloadBootstrap = "bootstrap"
1617
val vmServer = "vm-server"
1718
val mallet = "mallet"
19+
val faucet = "faucet"
1820
val ecKeyGen = "eckeygen"
1921

2022
args.headOption match {
@@ -24,12 +26,12 @@ object App extends Logger {
2426
case Some(`downloadBootstrap`) => BootstrapDownload.main(args.tail :+ Config.Db.LevelDb.path)
2527
case Some(`vmServer`) => VmServerApp.main(args.tail)
2628
case Some(`mallet`) => Mallet.main(args.tail)
29+
case Some(`faucet`) => Faucet.main(args.tail)
2730
case Some(`ecKeyGen`) => EcKeyGen.main(args.tail)
2831
case Some(unknown) =>
2932
log.error(s"Unrecognised launcher option, " +
30-
s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, $vmServer, $mallet" +
31-
s" or $ecKeyGen"
32-
)
33+
s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, " +
34+
s"$mallet, $faucet, $vmServer or $ecKeyGen")
3335
}
3436

3537

‎src/main/scala/io/iohk/ethereum/faucet/Faucet.scala

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package io.iohk.ethereum.faucet
2+
3+
import java.security.SecureRandom
4+
5+
import akka.actor.ActorSystem
6+
import akka.http.scaladsl.Http
7+
import akka.stream.ActorMaterializer
8+
import com.typesafe.config.ConfigFactory
9+
import io.iohk.ethereum.keystore.KeyStoreImpl
10+
import io.iohk.ethereum.mallet.service.RpcClient
11+
import io.iohk.ethereum.utils.Logger
12+
13+
import scala.concurrent.ExecutionContext.Implicits.global
14+
import scala.util.{Failure, Success}
15+
16+
object Faucet extends Logger {
17+
18+
def main(args: Array[String]): Unit = {
19+
val config = FaucetConfig(ConfigFactory.load())
20+
21+
implicit val system = ActorSystem("Faucet-system")
22+
implicit val materializer = ActorMaterializer()
23+
24+
val keyStore = new KeyStoreImpl(config.keyStoreDir, new SecureRandom())
25+
val rpcClient = new RpcClient(config.rpcAddress)
26+
val api = new FaucetApi(rpcClient, keyStore, config)
27+
28+
val bindingResultF = Http().bindAndHandle(api.route, config.listenInterface, config.listenPort)
29+
30+
bindingResultF onComplete {
31+
case Success(serverBinding) => log.info(s"Faucet HTTP server listening on ${serverBinding.localAddress}")
32+
case Failure(ex) => log.error("Cannot start faucet HTTP server", ex)
33+
}
34+
}
35+
36+
}

0 commit comments

Comments
 (0)