From fda84e79798b0f1e6278275ba77bad4eef6186be Mon Sep 17 00:00:00 2001
From: Liam Monninger <l.mak.monninger@gmail.com>
Date: Sun, 12 Nov 2023 21:03:50 -0800
Subject: [PATCH] chore: lagging submodule.

---
 .devcontainer/ubuntu/Dockerfile | 28 +++++++++++++++++++++++++++-
 aptos-pre-core                  |  2 +-
 m1/scripts/start-subnet.sh      |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/ubuntu/Dockerfile b/.devcontainer/ubuntu/Dockerfile
index 94941b9c..ddd7b398 100644
--- a/.devcontainer/ubuntu/Dockerfile
+++ b/.devcontainer/ubuntu/Dockerfile
@@ -9,7 +9,10 @@ RUN apt-get update && apt-get install -y \
     curl \
     build-essential \
     pkg-config \
-    libssl-dev
+    libssl-dev \
+    golang
+
+RUN apt-get install -y libclang-dev
 
 # Install Rust using rustup
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -17,6 +20,29 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 # Add Rust to the PATH
 ENV PATH="/root/.cargo/bin:${PATH}"
 
+# Install postrgresql (for indexer service)
+RUN apt install -y postgresql libpq-dev
+
+# Install avalanchego
+
+# Install ANR
+
+
+# Install subnet-cli
+ENV VERSION=0.0.4
+RUN echo '#!/bin/bash\n\
+GOARCH=$(go env GOARCH)\n\
+DOWNLOAD_PATH=/tmp/subnet-cli.tar.gz\n\
+DOWNLOAD_URL=https://github.com/ava-labs/subnet-cli/releases/download/v'${VERSION}'/subnet-cli_'${VERSION}'_linux_'${GOARCH}'.tar.gz\n\
+curl -L ${DOWNLOAD_URL} -o ${DOWNLOAD_PATH}\n\
+tar xzvf ${DOWNLOAD_PATH} -C /tmp\n\
+mv /tmp/subnet-cli /usr/local/bin/subnet-cli\n\
+rm -f ${DOWNLOAD_PATH}\n\
+' > /root/download_subnet_cli.sh && chmod +x /root/download_subnet_cli.sh
+
+# Execute the script
+RUN /root/download_subnet_cli.sh
+
 # Set the working directory in the container
 WORKDIR /workspace
 
diff --git a/aptos-pre-core b/aptos-pre-core
index 76ec3947..6f36a4e2 160000
--- a/aptos-pre-core
+++ b/aptos-pre-core
@@ -1 +1 @@
-Subproject commit 76ec3947c16c89380a6405875d8f5bbd2e2f99d4
+Subproject commit 6f36a4e2eb768e9520a4a6213cacfb4fa7d132ce
diff --git a/m1/scripts/start-subnet.sh b/m1/scripts/start-subnet.sh
index 9b0c4b91..e17dafd8 100755
--- a/m1/scripts/start-subnet.sh
+++ b/m1/scripts/start-subnet.sh
@@ -8,7 +8,7 @@ avalanche-network-runner control start \
 --log-level debug \
 --endpoint="0.0.0.0:8080" \
 --avalanchego-path="${AVALANCHEGO_EXEC_PATH}"
-# --blockchain-specs '[{"vm_name":"subnet","genesis":"/tmp/subnet.genesis.json","blockchain_alias":"movement"}]' \
+--blockchain-specs '[{"vm_name":"subnet","genesis":"/tmp/subnet.genesis.json","blockchain_alias":"movement"}]' \
 
 # avalanche-network-runner control create-blockchains '[{"vm_name":"movement", "subnet_id": "srEXiWaHZNDcVtfHLb38cFiwKVLJ8xnhDF5qpWbYdowxEiyid"}]' \
 # --log-level debug \