fix: merge.

.devcontainer/default/Dockerfile

@@ -0,0 +1 @@
+FROM ubuntu:latest

.devcontainer/default/devcontainer.json

@@ -0,0 +1,5 @@
+{
+    "name" : "default",
+    "dockerfile" : "Dockerfile",
+    "context" : "."
+}

.devcontainer/ubuntu/Dockerfile

@@ -1,16 +1,30 @@
-# Use the official Ubuntu image as a base
+# Stage 1: Use a Debian image with Golang pre-installed
+FROM golang:1.21-bullseye as golang-base
+
+# Stage 2: Use the official Ubuntu image as your final base
 FROM ubuntu:latest
 
 # Set environment variables to non-interactive (this prevents some prompts)
 ENV DEBIAN_FRONTEND=non-interactive
 
+# Copy Golang from the golang-base image
+COPY --from=golang-base /usr/local/go /usr/local/go
+
+# Add Golang to the PATH
+ENV PATH="/usr/local/go/bin:${PATH}"
+
+# Set environment variables to non-interactive (this prevents some prompts)
+ENV DEBIAN_FRONTEND=non-interactive
+
 # Install necessary tools and libraries
 RUN apt-get update && apt-get install -y \
     curl \
     build-essential \
+    binutils \
     pkg-config \
     libssl-dev \
-    golang
+    sudo \       
+    git          
 
 RUN apt-get install -y libclang-dev
 
@@ -20,29 +34,9 @@ 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)
+# Install PostgreSQL (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
 

.github/actions/setup-linux-aarch64/action.yml

@@ -9,6 +9,9 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get install -y build-essential lld libpq-dev unzip
+        sudo apt install -y pkg-config libusb-1.0-0-dev libftdi1-dev
+        sudo apt-get install libudev-dev
+
       shell: bash
 
     - name: Install Protoc
@@ -20,4 +23,4 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70.0
+        toolchain: 1.73

.github/actions/setup-linux-x86_64/action.yml

@@ -9,6 +9,9 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get install -y build-essential lld libpq-dev unzip
+        sudo apt install -y pkg-config libusb-1.0-0-dev libftdi1-dev
+        sudo apt-get install libudev-dev
+
       shell: bash
 
     - name: Install Protoc
@@ -20,5 +23,4 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
-
+        toolchain: 1.73

.github/actions/setup-macos-aarch64/action.yml

@@ -24,7 +24,7 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
 
     - name: Export LLVM path
       run: echo "LLVM_SYS_130_PREFIX=$(brew --prefix llvm)" >> $GITHUB_ENV

.github/actions/setup-macos-x86_64/action.yml

@@ -24,7 +24,7 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
 
     - name: Export LLVM path
       run: echo "LLVM_SYS_130_PREFIX=$(brew --prefix llvm)" >> $GITHUB_ENV

.github/actions/setup-windows-x86_64/action.yml

@@ -23,4 +23,4 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73

.github/workflows/release.yml

@@ -81,6 +81,36 @@ jobs:
           asset_name: m1-with-submodules.tar.gz
           asset_content_type: application/gzip
 
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./networks/testnet/testnet-id
+          asset_name: testnet-id
+          asset_content_type: text/plain
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./networks/testnet/testnet-vmid
+          asset_name: testnet-vmid
+          asset_content_type: text/plain
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./networks/testnet/testnet-vmid
+          asset_name: testnet-cid
+          asset_content_type: text/plain
+
 
   pre-release-x86_64-linux:
     needs: prepare-release
@@ -110,7 +140,11 @@ jobs:
       - name: Build Mac binaries
         run: |
           cd "$GITHUB_WORKSPACE/movement-sdk"
+<<<<<<< HEAD
           cargo build -p movement --release
+=======
+          cargo build --release -p movement --features "aptos,sui"
+>>>>>>> stage
 
       - name: Upload subnet
         uses: actions/upload-release-asset@v1
@@ -156,7 +190,11 @@ jobs:
       - name: Build Mac binaries
         run: |
           cd "$GITHUB_WORKSPACE/movement-sdk"
+<<<<<<< HEAD
           cargo build -p movement --release
+=======
+          cargo build --release -p movement --features "aptos,sui"
+>>>>>>> stage
 
       - name: Upload subnet
         uses: actions/upload-release-asset@v1
@@ -202,7 +240,7 @@ jobs:
       - name: Build Mac binaries
         run: |
           cd "$GITHUB_WORKSPACE/movement-sdk"
-          cargo build -p movement --release
+          cargo build --release -p movement --features "aptos,sui"
           
       - name: Upload subnet
         uses: actions/upload-release-asset@v1
@@ -265,10 +303,10 @@ jobs:
           cd "$GITHUB_WORKSPACE/m1"
           cargo build --release --target x86_64-pc-windows-gnu
 
-      - name: Build Mac binaries
+      - name: Build Windows binaries
         run: |
           cd "$GITHUB_WORKSPACE/movement-sdk"
-          cargo build --release --target x86_64-pc-windows-gnu
+          cargo build --release -p movement --features "aptos,sui"
 
       - name: Upload subnet
         uses: actions/upload-release-asset@v1
@@ -333,6 +371,14 @@ jobs:
       run: |
         docker buildx create --use
         docker buildx build --build-arg VERSION=${{ needs.prepare-release.outputs.release_tag }} -f ./docker/dev.dockerfile --platform linux/amd64,linux/arm64 -t $DOCKER_HUB_REPOSITORY:$IMAGE_TAG $(if [ "${{ github.ref }}" = "refs/heads/main" ]; then echo "-t $DOCKER_HUB_REPOSITORY:latest"; fi) . --push
+
+    - name: Testnet container # for now this is just the dev container
+      env:
+        DOCKER_HUB_REPOSITORY: mvlbs/m1-testnet # Change to your Docker Hub repository name
+        IMAGE_TAG: ${{ needs.prepare-release.outputs.release_tag }}
+      run: |
+        docker buildx create --use
+        docker buildx build --build-arg VERSION=${{ needs.prepare-release.outputs.release_tag }} -f ./docker/testnet.dockerfile --platform linux/amd64,linux/arm64 -t $DOCKER_HUB_REPOSITORY:$IMAGE_TAG $(if [ "${{ github.ref }}" = "refs/heads/main" ]; then echo "-t $DOCKER_HUB_REPOSITORY:latest"; fi) . --push
       
   run-tests:
     needs:

.gitmodules

@@ -1,27 +1,18 @@
 [submodule "aptos-core"]
 	path = vendors/aptos-core
 	url = https://github.com/movemntdev/aptos-core
-	branch = m1
+	branch = canonical
 [submodule "x25519-dalek"]
 	path = vendors/x25519-dalek
 	url = https://github.com/movemntdev/x25519-dalek
 [submodule "ed25519-dalek"]
 	path = vendors/ed25519-dalek
 	url = https://github.com/movemntdev/ed25519-dalek
-[submodule "ecosystem/evm-runtime"]
-	path = ecosystem/evm-runtime
-	url = https://github.com/movemntdev/move-evm-swap-backend
-[submodule "m1/subnet-request-proxy"]
-	path = m1/subnet-request-proxy
-	url = https://github.com/movemntdev/subnet-request-proxy
-[submodule "aptos-pre-core-v2"]
-	path = vendors/aptos-core-1.7
-	url = https://github.com/movemntdev/aptos-core
-	branch = testnet
 [submodule "aptos-core-v2"]
 	path = vendors/aptos-core-v2
 	url = https://github.com/movemntdev/aptos-core
 	branch = v2
-[submodule "m1/vendors/sui"]
+[submodule "vendors/sui"]
 	path = vendors/sui
 	url = https://github.com/movemntdev/sui
+	branch = canonical

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <img src="./rsc/movement_logo.png" alt="Project Logo" width="200" height="200">
+    <img src="https://movementlabs.xyz/wp-content/themes/movement-labs/assets/images/logo.svg" alt="Project Logo" width="200" height="200">
 
 # M1
 

docker/testnet.dockerfile

@@ -0,0 +1,58 @@
+# Stage 1: Use a Debian image with Golang pre-installed
+FROM golang:1.21-bullseye as golang-base
+
+# Stage 2: Use the official Ubuntu image as your final base
+FROM ubuntu:latest
+
+# Set environment variables to non-interactive (this prevents some prompts)
+ENV DEBIAN_FRONTEND=non-interactive
+
+# Copy Golang from the golang-base image
+COPY --from=golang-base /usr/local/go /usr/local/go
+
+# Add Golang to the PATH
+ENV PATH="/usr/local/go/bin:${PATH}"
+
+ARG VERSION=0.0.0
+
+# Set environment variables to non-interactive (this prevents some prompts)
+ENV DEBIAN_FRONTEND=non-interactive
+
+# Install necessary tools and libraries
+RUN apt-get update && apt-get install -y \
+    curl \
+    build-essential \
+    binutils \
+    pkg-config \
+    libssl-dev \
+    sudo \       
+    git          
+
+RUN apt-get install -y libclang-dev
+
+# Update package list and install curl
+RUN apt-get update && apt-get install -y curl wget git libpq-dev
+
+# Install curl and other dependencies required for Node.js installation
+RUN apt-get update && apt-get install -y curl && apt-get clean
+
+# Install Node.js and npm
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+    && apt-get install -y nodejs
+
+# Verify installation
+RUN node --version
+RUN npm --version
+
+# Download the script
+RUN curl -fSsL -o install.sh https://raw.githubusercontent.com/movemntdev/M1/main/scripts/install.sh
+
+# Make the script executable
+RUN chmod +x install.sh
+
+# Execute the script with the desired arguments
+RUN ./install.sh --version ${VERSION}
+
+RUN movement manage install m1 testnet --version ${VERSION}
+
+CMD ["/bin/bash"]

m1/.gitignore

@@ -1,4 +1,3 @@
 target
-Cargo.lock
 avalanchego
 plugins