Merge pull request #167 from seed-labs/arm-support

wonkr · web-flow · commit 146aa33acc30 · 2023-12-13T20:24:26.000-05:00
Arm support
diff --git a/docker_images/amd64/seedemu-base/Dockerfile b/docker_images/amd64/seedemu-base/Dockerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:20.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN echo 'exec zsh' > /root/.bashrc
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl dnsutils ipcalc iproute2 iputils-ping jq mtr-tiny nano netcat tcpdump termshark vim-nox zsh
+RUN curl -L https://grml.org/zsh/zshrc > /root/.zshrc
diff --git a/docker_images/amd64/seedemu-base/docker-compose.yml b/docker_images/amd64/seedemu-base/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-base
+
+
diff --git a/docker_images/amd64/seedemu-ethereum/Dockerfile b/docker_images/amd64/seedemu-ethereum/Dockerfile
@@ -0,0 +1,26 @@
+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 handsonsecurity/seedemu-base
+
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common python3 python3-pip
+RUN pip install web3
+
+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
diff --git a/docker_images/amd64/seedemu-ethereum/docker-compose.yml b/docker_images/amd64/seedemu-ethereum/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-ethereum
+
+
diff --git a/docker_images/amd64/seedemu-router/Dockerfile b/docker_images/amd64/seedemu-router/Dockerfile
@@ -0,0 +1,7 @@
+FROM handsonsecurity/seedemu-base
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN mkdir -p /usr/share/doc/bird2/examples/
+RUN touch /usr/share/doc/bird2/examples/bird.conf
+RUN apt-get update && apt-get install -y --no-install-recommends bird2
diff --git a/docker_images/amd64/seedemu-router/docker-compose.yml b/docker_images/amd64/seedemu-router/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-router
+
+
diff --git a/docker_images/arm64/seedemu-ethereum/Dockerfile b/docker_images/arm64/seedemu-ethereum/Dockerfile
@@ -0,0 +1,26 @@
+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 handsonsecurity/seedemu-multiarch-base
+
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common python3 python3-pip
+RUN pip install web3
+
+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
diff --git a/docker_images/arm64/seedemu-ethereum/docker-compose.yml b/docker_images/arm64/seedemu-ethereum/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-ethereum-arm64
+
+
diff --git a/docker_images/multiarch/seedemu-base/Dockerfile b/docker_images/multiarch/seedemu-base/Dockerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:20.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN echo 'exec zsh' > /root/.bashrc
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl dnsutils ipcalc iproute2 iputils-ping jq mtr-tiny nano netcat tcpdump termshark vim-nox zsh
+RUN curl -L https://grml.org/zsh/zshrc > /root/.zshrc
diff --git a/docker_images/multiarch/seedemu-base/docker-compose.yml b/docker_images/multiarch/seedemu-base/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-multiarch-base
+
+
diff --git a/docker_images/multiarch/seedemu-ethereum/Dockerfile b/docker_images/multiarch/seedemu-ethereum/Dockerfile
@@ -0,0 +1,26 @@
+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 handsonsecurity/seedemu-base
+
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common python3 python3-pip
+RUN pip install web3
+
+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
diff --git a/docker_images/multiarch/seedemu-ethereum/docker-compose.yml b/docker_images/multiarch/seedemu-ethereum/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-ethereum
+
+
diff --git a/docker_images/multiarch/seedemu-router/Dockerfile b/docker_images/multiarch/seedemu-router/Dockerfile
@@ -0,0 +1,7 @@
+FROM handsonsecurity/seedemu-multiarch-base:buildx-latest
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN mkdir -p /usr/share/doc/bird2/examples/
+RUN touch /usr/share/doc/bird2/examples/bird.conf
+RUN apt-get update && apt-get install -y --no-install-recommends bird2
diff --git a/docker_images/multiarch/seedemu-router/docker-compose.yml b/docker_images/multiarch/seedemu-router/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+    test:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        image: handsonsecurity/seedemu-multiarch-router
+
+
diff --git a/examples/B06-blockchain/README.md b/examples/B06-blockchain/README.md
@@ -8,6 +8,17 @@
 
 ---
 
+## Platform Support Information
+As of 12/12/2023, SEED Emulation Ethereum layer supports AMD platforms and partially supports ARM platforms.
+Please see details below.
+
+| Ethereum Consensus | AMD | ARM |
+| ------------------ | --- | --- |
+| PoW                |  O  |  X  |
+| PoA                |  O  |  O  |
+| PoS                |  O  |  O  |
+
+
 <a name="blockchain-component"></a>
 
 # Build a Blockchain Component
diff --git a/examples/B06-blockchain/blockchain.py b/examples/B06-blockchain/blockchain.py
@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 from seedemu import *
+import sys
 
 CustomGenesisFileContent = '''\
 {
@@ -131,8 +132,17 @@
 
 emu.render()
 
-docker = Docker(etherViewEnabled=True)
+if len(sys.argv) == 1:
+    platform = "amd"
+else:
+    platform = sys.argv[1]
+
+platform_mapping = {
+    "amd": Platform.AMD64,
+    "arm": Platform.ARM64
+}
+docker = Docker(etherViewEnabled=True, platform=platform_mapping[platform])
 
 # 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', override=True)
diff --git a/seedemu/compiler/Docker.py b/seedemu/compiler/Docker.py
@@ -12,8 +12,9 @@
 from shutil import copyfile
 import json
 
-SEEDEMU_INTERNET_MAP_IMAGE='handsonsecurity/seedemu-map'
-SEEDEMU_ETHER_VIEW_IMAGE='handsonsecurity/seedemu-etherview'
+
+SEEDEMU_INTERNET_MAP_IMAGE='handsonsecurity/seedemu-multiarch-map:buildx-latest'
+SEEDEMU_ETHER_VIEW_IMAGE='handsonsecurity/seedemu-multiarch-etherview:buildx-latest'
 
 DockerCompilerFileTemplates: Dict[str, str] = {}
 
@@ -110,6 +111,12 @@
             context: .
             dockerfile: dummies/{imageDigest}
         image: {imageDigest}
+{dependsOn}
+"""
+
+DockerCompilerFileTemplates['depends_on'] = """\
+        depends_on:
+            - {dependsOn}
 """
 
 DockerCompilerFileTemplates['compose_service'] = """\
@@ -313,8 +320,11 @@ class Docker(Compiler):
     __image_per_node_list: Dict[Tuple[str, str], DockerImage]
     _used_images: Set[str]
 
+    __basesystem_dockerimage_mapping: dict
+
     def __init__(
         self,
+        platform:Platform = Platform.AMD64,
         namingScheme: str = "as{asn}{role}-{displayName}-{primaryIp}",
         selfManagedNetwork: bool = False,
         dummyNetworksPool: str = '10.128.0.0/9',
@@ -328,6 +338,7 @@ def __init__(
         """!
         @brief Docker compiler constructor.
 
+        @param platform (optional) node cpu architecture Default to Platform.AMD64
         @param namingScheme (optional) node naming scheme. Available variables
         are: {asn}, {role} (r - router, h - host, rs - route server), {name},
         {primaryIp} and {displayName}. {displayName} will automatically fall
@@ -377,11 +388,16 @@ def __init__(
         self._used_images = set()
         self.__image_per_node_list = {}
 
-        for name, image in BASESYSTEM_DOCKERIMAGE_MAPPING.items():
+        self.__platform = platform
+
+        self.__basesystem_dockerimage_mapping = BASESYSTEM_DOCKERIMAGE_MAPPING_PER_PLATFORM[self.__platform]
+        
+        for name, image in self.__basesystem_dockerimage_mapping.items():
             priority = 0
             if name == BaseSystem.DEFAULT:
                 priority = 1
             self.addImage(image, priority=priority)
+        
 
     def getName(self) -> str:
         return "Docker"
@@ -561,7 +577,7 @@ def _selectImageFor(self, node: Node) -> Tuple[DockerImage, Set[str]]:
             return (image, nodeSoft - image.getSoftware())
             
         #Maintain a table : Virtual Image Name - Actual Image Name 
-        image = BASESYSTEM_DOCKERIMAGE_MAPPING[node.getBaseSystem()]
+        image = self.__basesystem_dockerimage_mapping[node.getBaseSystem()]
 
         return (image, nodeSoft - image.getSoftware())
         
@@ -994,10 +1010,19 @@ def _makeDummies(self) -> str:
             self._log('adding dummy service for image {}...'.format(image))
 
             imageDigest = md5(image.encode('utf-8')).hexdigest()
-
-            dummies += DockerCompilerFileTemplates['compose_dummy'].format(
-                imageDigest = imageDigest
-            )
+            dockerImage, _ = self.__images[image]
+            if dockerImage.isLocal():
+                dummies += DockerCompilerFileTemplates['compose_dummy'].format(
+                    imageDigest = imageDigest,
+                    dependsOn= DockerCompilerFileTemplates['depends_on'].format(
+                        dependsOn = image
+                    )
+                )
+            else:
+                dummies += DockerCompilerFileTemplates['compose_dummy'].format(
+                    imageDigest = imageDigest,
+                    dependsOn= ""
+                )
 
             dockerfile = 'FROM {}\n'.format(image)
             print(dockerfile, file=open(imageDigest, 'w'))
diff --git a/seedemu/compiler/DockerImage.py b/seedemu/compiler/DockerImage.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 from typing import List, Set
-from seedemu.core import BaseSystem
-from enum import Enum
 
 class DockerImage(object):
     """!
diff --git a/seedemu/compiler/DockerImageConstant.py b/seedemu/compiler/DockerImageConstant.py
diff --git a/test/ethereum/POA/emulator-code/test-emulator.py b/test/ethereum/POA/emulator-code/test-emulator.py
diff --git a/test/ethereum/POS/emulator-code/test-emulator.py b/test/ethereum/POS/emulator-code/test-emulator.py
diff --git a/test/ethereum/POW/EthereumPOWTestCase.py b/test/ethereum/POW/EthereumPOWTestCase.py
diff --git a/test/ethereum/POW/emulator-code/test-emulator.py b/test/ethereum/POW/emulator-code/test-emulator.py
diff --git a/test/multi-platform-test/multi-platform-test.py b/test/multi-platform-test/multi-platform-test.py
diff --git a/test/run-tests.py b/test/run-tests.py
diff --git a/tools/Blockchain/EtherView/Dockerfile b/tools/Blockchain/EtherView/Dockerfile
