Merge pull request #139 from seed-labs/development

Development

.gitignore

@@ -1,7 +1,8 @@
 **/output/*
 **/eth-states*/*
-**/test_log/*
+**/test_log*/*
 **/__pycache__/*
+*.bak
 *.out
 *.o
 *.so
@@ -24,3 +25,4 @@ client/backend/node_modules
 client/backend/bin
 *.bin
 output
+project-words.txt

docker_images/seedemu-ethereum/Dockerfile

@@ -0,0 +1,22 @@
+FROM golang:1.18 AS builder1
+ARG DEBIAN_FRONTEND=noninteractive
+WORKDIR /
+RUN git clone https://github.com/ethereum/go-ethereum
+RUN cd go-ethereum && git checkout v1.10.26 && make all
+
+FROM rust:1.63 AS builder2
+ARG DEBIAN_FRONTEND=noninteractive
+WORKDIR /
+RUN apt-get update && apt-get -y --no-install-recommends install software-properties-common build-essential curl git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang protobuf-compiler
+RUN git clone https://github.com/wonkr/lighthouse.git
+WORKDIR lighthouse
+RUN git checkout stable
+RUN make install
+RUN make install-lcli
+WORKDIR /
+
+FROM ubuntu:20.04
+COPY --from=builder1 /go-ethereum/build/bin/geth	/usr/bin
+COPY --from=builder1 /go-ethereum/build/bin/bootnode /usr/bin
+COPY --from=builder2 /usr/local/cargo/bin/lcli /usr/bin
+COPY --from=builder2 /usr/local/cargo/bin/lighthouse /usr/bin

docker_images/seedemu-ethereum/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-ethereum
+
+

examples/B06-blockchain/blockchain.py

@@ -130,6 +130,9 @@
 emu.dump('component-blockchain.bin')
 
 emu.render()
+
+docker = Docker(etherViewEnabled=True)
+
 # If output directory exists and override is set to false, we call exit(1)
 # updateOutputdirectory will not be called
-emu.compile(Docker(), './output')
+emu.compile(docker, './output')

examples/C04-ethereum-pos/blockchain-pos.py

@@ -86,31 +86,4 @@
 # Enable etherView
 docker = Docker(internetMapEnabled=True, etherViewEnabled=True)
 
-# Add the 'rafaelawon/seedemu-lighthouse-base' custom image from dockerhub.
-# This image contains custom lighthouse software.
-docker.addImage(DockerImage('rafaelawon/seedemu-lighthouse-base', [], local=False), priority=-1)
-
-# Add the 'rafaelawon/seedemu-lighthouse-base' custom image from dockerhub.
-# This image contains custom lcli software.
-docker.addImage(DockerImage('rafaelawon/seedemu-lcli-base', [], local=False), priority=-2)
-
-base = emu.getLayer('Base')
-
-# Get the physical nodes of all hosts from Base layer.
-# The name of physical nodes generated from Makers.makeEmulatorBaseWith10StubASAndHosts() is 'host_{}'
-# Base::getNodesByName('host') returns the physical nodes whose name starts with 'host'.
-hosts = base.getNodesByName('host')
-
-# Set all host nodes to use the custom 'seedemu-lighthouse-base' image.
-for host in hosts:
-   docker.setImageOverride(host, 'rafaelawon/seedemu-lighthouse-base')
-
-# Get the physical node of beacon setup node. 
-# The host in asn 150 with id 0 (ip : 10.150.0.71) is set as BeaconSetupNode.
-# Base::getNodeByAsnAndName(150, 'host_0') returns the physical node whose name is 'host_0' in AS 150.
-beacon_setup = base.getNodeByAsnAndName(150, 'host_0')
-
-# Set the node to use the custom 'seedemu-lcli-base' image.
-docker.setImageOverride(beacon_setup, 'rafaelawon/seedemu-lcli-base')
-
 emu.compile(docker, './output', override = True)

misc/openvpn-remote-access/ovpn-client.ovpn

@@ -6,76 +6,76 @@ float
 
 <key>
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDTXPWh2M+CC3m6
-2x25O0ici7TDjgIeaDxxZYSNin9ZzD0K3jd3Uxkvb62QpPMQG4YYfwWbyLPX/HRE
-yO+ZSMz1cIL4M4HTOmmhHe4oYrkjAaRVmzByruGSHNwGnbl94YFW2OUOAOhGqLRb
-gqZKbrH7jJ9aL3R7xo/AkNNSUV5RgOVB6B2ip233f+0+OjoV6viggA5u/PGRBXsY
-MaGxBGLBdSX8BNn/S/YbV7CPwZPbCBpXk/yFsq+CsTuIqaP1ZDUkLzuLNqYaa8hN
-vAOhs6s1VwXsPJa2vzcj1BfRkWjrjJVZ1uqFhVugYC4Ps1sF5adZUt5Ixf+O6kGY
-It3M1RpBAgMBAAECggEAeGcLEgBk7OrGlFf/zaXkzjCTb5a0xEeSrvIqmUqdEzVS
-TJ+bryCqRyhyEeS1Bab4M3ogYsbpFA+e2BQy0Pn0r5hBM0x8Fyy+QWbAZUcfub5U
-s+NsrNfMbaR8/lPY98l/GU8C5IBF0QKHg12ghuQaBXbsy74et+e7ufGGP+1UMk6W
-tqgxKmqBvc9HbgLEw2XTr5MJsQLVFadtsG/TSO3QNWiZJkfi0F6vknK9lnZ4iFsL
-6N2D//L6m0buLQJuzE55Bmo7Jx86OGRoY3flKB8gAzWCosPJt/Q8CM59FiMhvFzT
-li5vDPJ6BlIMiBGBEINlNkRk+xF8LeGsqnSHJFRywQKBgQDtiZUKZoQmCqNl5/43
-ds666b7obw3al3uUDQK07oSFZUcOCpiPfSSYff+05uiN4bhUWQKOw6xiK36ma0tH
-oauO8ukdJKTvYLzz7S44kXGfMWPbp0im8Yw6XqnVDqgZQ31RRFATtIouGx4q4naR
-JT2tPpcz8YN4lVl8fs3THXrZyQKBgQDjypJ6YjfWeHsXzy4wCuGFsrQqeic1XNBS
-2oOiQEYM99cEVRCWyUQzXA+a4ef42bIopIs1zooGcvcwasaAmLk1jos4xWNUTLQ1
-B8IMNPLvOEDGqOMJgdWV4mhP9sxf55g5qTzT5j+j7N6lSz6MyyDUiT8YgWouRkAo
-5BWtVPv4uQKBgQCVhyEqHeScKeA4GzUdZw21/cSufpIjA27IgPQuP2NusZVsEmF9
-GhL6Z36bOywzfF7TwgBpLGYMmkKssif+XJgpcWIrdVDaW3Q2vRx2gaAbzTSGJiUG
-6lESwVp5gzNwS9rMWItsDB9b7Lgt2Mc4kU/lCdyW1zaipqlhRFV+yzT1eQKBgGFy
-U19PjRuOxvnUg6nBveB4JmLVhthpMCWBnTZX0J/TloQf78zRpP9jrrlPUvE+D90b
-JwKJrLo9jEmGJAz3SKQEqsJKjseNWLom63hVXme/5NYXgaibhkdsZ7ttlNiiNpjU
-MVVk9myl9Ek5+zQ34X+KhxdwpX/ORbw4dp2D8ZbhAoGBAJGEbmzQ9NJHDTODiXLY
-JsRBXUsAmLlO0pgG/wrp+rzFhjIPhCfdITLuAEI97y6Qpzoymvx6+C85nRa1g6rG
-RQmPB5AM9ejC8XJ1tvsnM0Q/xneFov17qXYDfaxPdchfjkfgZjx+2t96nuQ6OHzk
-/oRlaX1LPH0Gqg0gYkBGhoeV
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDz6CcOlfLadadF
+6Ou/xIMhpuEAOs6H1NuG6N2uBIYtiVy11EqH4fHpwhnRnVEYcbieufgavT+TM3gH
+9IXVXHOmAm5zgEuKMsZtPJOzPDIL8OhYXBkdIIV45NEdgjf+WOjqpNFWex7rTPk7
++0dBgcPdDvtSwsMAlT5tRMTsZaG0JAFWenZFflzlOS9f3G90hvyAjnWXyRB5iToc
+ce8zdXMwdbtu97NCPo46274UrA3U//uLxydkkm3/KrJVzDEFuA6OM5rNGTgYvPxg
+BDV0eTmJt1hlsZPvDnN2JNR1NRGEGGbtXm41iXY7FGSE5UUBu+W/0Xfufl3un2IM
+bv4x5exRAgMBAAECggEABpk4PUfHOyvFq7mCbzy0w3tNSQFORxR2H+862BNdQewe
+avjkT0rIjadnpWkZIY0qDnk/ghGun5/b1nNCD6ShqFMWg99rq8B158ykvkuZmwMY
+dhN/xm7zzXJ7Sc4VD7d+DaMJ2soX6wu5Dmtc4SPOlbNrDzEfr2taNgCPR0n0lvf4
+4A9DYCAkMrS9bolGzJV0toIO6dwatU6qATfRJSrh1LRN+CPIoO+NPin8Z3HjGIUI
+tBHOFwwH16Z/swfjc0Fmntf3iYRkqeU5lHHZhueVidB6D77w6BiA9DtokzPEsBPx
+SZsAom1oHTtm36pR4qZW/27qS8omv/Fd68sfrB/CAQKBgQD6GLVCYKPonzVlLVPZ
+PybBzrvmsZ9X606QX8O2ONYSkp/i/w7SijD8Bj4Y7/uu+TFYFHJH98+rOLiJ2XDw
+eMWGW/WRKwzFk4+7sbnigF2+b4atKEhRfXtQEcaq4fTHMCTkwVs4q7oHS8urvVch
+BNJiQHwIcqWbmbY9u++o+ZL88QKBgQD5qgqXLULxxMvkSrA+usDtKdeNCKtMo2aD
+DtzzrMsgkWX96fQHdJkGMK8trBU4P4+CPe+iOcY9+/bx1KMWg0t+MrwthAalTZp8
+XFw7dCnbEBSs8L2h4PurArWLhsjAv5LcMOE+SK9yBN4l7VthgGrKtqWcJG1mobVT
+gZU2bfllYQKBgQDtHyoUkj42G2Vr1YsvaoHbtaBQPU6/9DlcB4AvMDpAB8cSWRP7
+qMyC14Re7oJpxpjzUwd7lsjOJYxKHuDHDyrwlhYBmpiUZ7Eam4qL53t6SJGfcZcH
+tHqLUx9S+8Oya8I/JdjQpXlO251y6qVGiCTUxSEUfWbpXdb9N0gmpOKpcQKBgDid
+9RTfcMT/CfXVci5nj4S47mbPRnl0vLSP1E92KgJStrxkJ7DhIiqjM7a5xX4h+9tf
+TE6Pp4M69n9U5z8duyr9Omtf+1nVRWlaUJgy+aLx/J5TYc2qBah8Tss7X59GUnmY
+pBvJw++pZu9W6lgsFQuva9MC98REe6haRIo5WktBAoGASWYm12Mj4specUmULl6T
+BV2BtjGlMGjD6xN0W6/geaDCqas4Ig4wvquQcpOZ0QPBwE8EwN/fVqgVEAMWCJyZ
+OHHi6F9XhONgVIboYAbFE5VNSzOoxQsFrUTihR1MMkXU29T+dqAGrj/rSrsGcFBX
+OsRX84Pzj6TdYXekeMYuFQk=
 -----END PRIVATE KEY-----
 </key>
 <cert>
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 </cert>
 <ca>
 -----BEGIN CERTIFICATE-----
-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
+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
+vgv5PvXzjCVY71b1ZrjHo0SUDGRC
 -----END CERTIFICATE-----
 </ca>
 key-direction 1

seedemu/compiler/DistributedDocker.py

@@ -1,3 +1,5 @@
+# Distributed Docker Compiler is not maintained 
+
 from .Docker import Docker, DockerCompilerFileTemplates
 from seedemu.core import Emulator, ScopedRegistry, Node, Network
 from seedemu.core.enums import NodeRole
@@ -42,7 +44,7 @@ def __init__(self, namingScheme: str = "as{asn}{role}-{name}-{primaryIp}"):
         """!
         @brief DistributedDocker compiler constructor.
 
-        @param namingScheme (optional) node naming scheme. Avaliable variables
+        @param namingScheme (optional) node naming scheme. Available variables
         are: {asn}, {role} (r - router, h - host, rs - route server), {name},
         {primaryIp}
         """