From f3a9613267ba698ccab1e015b71fe851c14e7a81 Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Mon, 18 Nov 2024 12:09:55 +0100
Subject: [PATCH 1/8] Revert "Fix: Docker builds (#2289)"

This reverts commit b9e01fe02bc56406cc62843a2696ba0456544554.
---
 docker/iota-bridge-indexer/Dockerfile | 19 +------------------
 docker/iota-bridge-indexer/build.sh   |  3 +--
 docker/iota-graphql-rpc/build.sh      |  3 +--
 docker/iota-indexer-tidb/build.sh     |  3 +--
 docker/iota-indexer/build.sh          |  3 +--
 docker/iota-node/build.sh             |  3 +--
 docker/iota-source-service/Dockerfile | 21 ++-------------------
 docker/iota-source-service/build.sh   |  3 +--
 docker/iota-tools/build.sh            |  3 +--
 docker/iota/Dockerfile                | 19 +------------------
 docker/pg-services-local/README.md    | 15 ---------------
 11 files changed, 11 insertions(+), 84 deletions(-)

diff --git a/docker/iota-bridge-indexer/Dockerfile b/docker/iota-bridge-indexer/Dockerfile
index cfef887f5a6..6c74d925bee 100644
--- a/docker/iota-bridge-indexer/Dockerfile
+++ b/docker/iota-bridge-indexer/Dockerfile
@@ -13,22 +13,6 @@ RUN apt-get update && apt-get install -y cmake clang
 # bridge-indexer needs postgres libpq5 and ca-certificates
 RUN apt update && apt install -y libpq5 ca-certificates libpq-dev postgresql
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -36,8 +20,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} --bin bridge-indexer
+RUN cargo build --profile ${PROFILE} --bin bridge-indexer
 
 # Copy the built binary to the working directory depending on the profile, so we can copy it to the runtime image
 RUN mv target/$(if [ $PROFILE = "dev" ]; then echo "debug"; else echo "release";fi)/bridge-indexer ./
diff --git a/docker/iota-bridge-indexer/build.sh b/docker/iota-bridge-indexer/build.sh
index fb528586bb7..182f6351352 100755
--- a/docker/iota-bridge-indexer/build.sh
+++ b/docker/iota-bridge-indexer/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	"$@"
diff --git a/docker/iota-graphql-rpc/build.sh b/docker/iota-graphql-rpc/build.sh
index cb4fcc0ccb7..8c87780e6ae 100755
--- a/docker/iota-graphql-rpc/build.sh
+++ b/docker/iota-graphql-rpc/build.sh
@@ -29,8 +29,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	--build-arg PROFILE="$PROFILE" \
diff --git a/docker/iota-indexer-tidb/build.sh b/docker/iota-indexer-tidb/build.sh
index 36769f9e1a4..fc599bfe6bf 100755
--- a/docker/iota-indexer-tidb/build.sh
+++ b/docker/iota-indexer-tidb/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	"$@"
diff --git a/docker/iota-indexer/build.sh b/docker/iota-indexer/build.sh
index d4db6819d44..a34a1f3f36e 100755
--- a/docker/iota-indexer/build.sh
+++ b/docker/iota-indexer/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	"$@"
diff --git a/docker/iota-node/build.sh b/docker/iota-node/build.sh
index b3a2a94b180..2ec1541ab25 100755
--- a/docker/iota-node/build.sh
+++ b/docker/iota-node/build.sh
@@ -29,8 +29,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	--build-arg PROFILE="$PROFILE" \
diff --git a/docker/iota-source-service/Dockerfile b/docker/iota-source-service/Dockerfile
index f36c18b6672..bc1d9625da7 100644
--- a/docker/iota-source-service/Dockerfile
+++ b/docker/iota-source-service/Dockerfile
@@ -5,23 +5,7 @@ ENV GIT_REVISION=$GIT_REVISION
 
 RUN apt-get update && apt-get install -y cmake clang
 
-FROM chef AS builder
-
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
+FROM chef AS builder 
 
 # Build application
 COPY Cargo.toml Cargo.lock ./
@@ -31,8 +15,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --release \
+RUN cargo build --release \
     --bin iota-source-validation-service
 
 # Production Image
diff --git a/docker/iota-source-service/build.sh b/docker/iota-source-service/build.sh
index ae62485b252..eff4c315369 100755
--- a/docker/iota-source-service/build.sh
+++ b/docker/iota-source-service/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	"$@"
diff --git a/docker/iota-tools/build.sh b/docker/iota-tools/build.sh
index 77842f9bf19..fde1f0942f8 100755
--- a/docker/iota-tools/build.sh
+++ b/docker/iota-tools/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	--target runtime \
diff --git a/docker/iota/Dockerfile b/docker/iota/Dockerfile
index 0d474f96404..2eb9be64f0d 100644
--- a/docker/iota/Dockerfile
+++ b/docker/iota/Dockerfile
@@ -11,22 +11,6 @@ WORKDIR "/iota"
 
 RUN apt-get update && apt-get install -y cmake clang libpq5 libpq-dev
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -34,8 +18,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} --bin iota --features ${CARGO_BUILD_FEATURES:=default}
+RUN cargo build --profile ${PROFILE} --bin iota --features ${CARGO_BUILD_FEATURES:=default}
 RUN mv target/$(if [ $PROFILE = "dev" ]; then echo "debug"; else echo "release";fi)/iota ./
 
 # Production Image
diff --git a/docker/pg-services-local/README.md b/docker/pg-services-local/README.md
index 23327c23566..75c7c40b09a 100644
--- a/docker/pg-services-local/README.md
+++ b/docker/pg-services-local/README.md
@@ -15,21 +15,6 @@ configuration.
 
 ## Start the services
 
-In current images when cargo is compiling it relies on `iota-sim` which is a private repository, it can be cloned only through ssh.
-As a temporary workaround [until this issue will be closed](https://github.com/iotaledger/iota/issues/2149), before starting services
-we need to build them first, even though `docker compose up -d` does automatically build the images in this case it will fail because an explicit ssh mount is needed.
-
-Before proceeding make sure to follow these steps [here](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#adding-your-ssh-key-to-the-ssh-agent)
-
-> [!NOTE]
-> If you're on MacOS and using Docker Desktop make sure to choose file sharing implementation for your containers from `VirtioFS` to `gRPC FUSE`
-> as dedcribed in this [issue](https://github.com/docker/for-mac/issues/7204#issuecomment-1969109233)
-
-```
-$ docker compose build --ssh default
-$ docker compose up -d
-```
-
 ### `iota-indexer` rpc worker
 
 ```

From a9fde9fe9a7e34458d9460d8f05ada4344a37a45 Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Mon, 18 Nov 2024 12:14:07 +0100
Subject: [PATCH 2/8] Revert "chore(CI): Use SSH for docker builds (#2246)"

This reverts commit bb019d4cf5c359faf2dd83965a23e80e2e692b19.
---
 .github/workflows/release_docker.yml | 36 ----------------------------
 docker/iota-graphql-rpc/Dockerfile   | 19 +--------------
 docker/iota-indexer/Dockerfile       | 19 +--------------
 docker/iota-node/Dockerfile          | 19 +--------------
 docker/iota-tools/Dockerfile         | 19 +--------------
 5 files changed, 4 insertions(+), 108 deletions(-)

diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml
index a05bdd30746..4540420f6cc 100644
--- a/.github/workflows/release_docker.yml
+++ b/.github/workflows/release_docker.yml
@@ -67,14 +67,6 @@ jobs:
           password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
           registry: ${{ secrets.DOCKER_REGISTRY_URL }}
 
-      # TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-      - name: Set up SSH
-        uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # pin@v3
-        with:
-          host: github.com
-          private-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          private-key-name: github-ppk
-
       - name: Get git revision and build date
         id: git-info
         run: |
@@ -84,7 +76,6 @@ jobs:
       - name: Build and push Docker image for iota-node
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # pin@v6
         with:
-          ssh: default
           context: .
           file: docker/iota-node/Dockerfile
           platforms: linux/amd64
@@ -135,14 +126,6 @@ jobs:
           password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
           registry: ${{ secrets.DOCKER_REGISTRY_URL }}
 
-      # TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-      - name: Set up SSH
-        uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # pin@v3
-        with:
-          host: github.com
-          private-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          private-key-name: github-ppk
-
       - name: Get git revision and build date
         id: git-info
         run: |
@@ -152,7 +135,6 @@ jobs:
       - name: Build and push Docker image for iota-indexer
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # pin@v6
         with:
-          ssh: default
           context: .
           file: docker/iota-indexer/Dockerfile
           platforms: linux/amd64
@@ -203,14 +185,6 @@ jobs:
           password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
           registry: ${{ secrets.DOCKER_REGISTRY_URL }}
 
-      # TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-      - name: Set up SSH
-        uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # pin@v3
-        with:
-          host: github.com
-          private-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          private-key-name: github-ppk
-
       - name: Get git revision and build date
         id: git-info
         run: |
@@ -220,7 +194,6 @@ jobs:
       - name: Build and push Docker image for iota-tools
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # pin@v6
         with:
-          ssh: default
           context: .
           file: docker/iota-tools/Dockerfile
           platforms: linux/amd64
@@ -271,14 +244,6 @@ jobs:
           password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
           registry: ${{ secrets.DOCKER_REGISTRY_URL }}
 
-      # TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-      - name: Set up SSH
-        uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # pin@v3
-        with:
-          host: github.com
-          private-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          private-key-name: github-ppk
-
       - name: Get git revision and build date
         id: git-info
         run: |
@@ -288,7 +253,6 @@ jobs:
       - name: Build and push Docker image for iota-graphql-rpc
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # pin@v6
         with:
-          ssh: default
           context: .
           file: docker/iota-graphql-rpc/Dockerfile
           platforms: linux/amd64
diff --git a/docker/iota-graphql-rpc/Dockerfile b/docker/iota-graphql-rpc/Dockerfile
index ef3f3f71f32..35328801595 100644
--- a/docker/iota-graphql-rpc/Dockerfile
+++ b/docker/iota-graphql-rpc/Dockerfile
@@ -10,22 +10,6 @@ ENV GIT_REVISION=$GIT_REVISION
 WORKDIR "$WORKDIR/iota"
 RUN apt-get update && apt-get install -y cmake clang libpq-dev
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -33,8 +17,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} --bin iota-graphql-rpc
+RUN cargo build --profile ${PROFILE} --bin iota-graphql-rpc
 
 # Copy the built binary to the working directory depending on the profile, so we can copy it to the runtime image
 RUN mv target/$(if [ $PROFILE = "dev" ]; then echo "debug"; else echo "release";fi)/iota-graphql-rpc ./
diff --git a/docker/iota-indexer/Dockerfile b/docker/iota-indexer/Dockerfile
index 6f2f35f61fd..5f7dbb450f6 100644
--- a/docker/iota-indexer/Dockerfile
+++ b/docker/iota-indexer/Dockerfile
@@ -13,22 +13,6 @@ RUN apt-get update && apt-get install -y cmake clang
 # iota-indexer needs postgres libpq5 and ca-certificates
 RUN apt update && apt install -y libpq5 ca-certificates libpq-dev postgresql
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -36,8 +20,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} --bin iota-indexer
+RUN cargo build --profile ${PROFILE} --bin iota-indexer
 
 # Copy the built binary to the working directory depending on the profile, so we can copy it to the runtime image
 RUN mv target/$(if [ $PROFILE = "dev" ]; then echo "debug"; else echo "release";fi)/iota-indexer ./
diff --git a/docker/iota-node/Dockerfile b/docker/iota-node/Dockerfile
index 5b39641cb2c..9e6f8589172 100644
--- a/docker/iota-node/Dockerfile
+++ b/docker/iota-node/Dockerfile
@@ -10,22 +10,6 @@ WORKDIR "$WORKDIR/iota"
 
 RUN apt-get update && apt-get install -y cmake clang
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -33,8 +17,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} --bin iota-node
+RUN cargo build --profile ${PROFILE} --bin iota-node
 
 # Copy the built binary to the working directory depending on the profile, so we can copy it to the runtime image
 RUN mv target/$(if [ $PROFILE = "dev" ]; then echo "debug"; else echo "release";fi)/iota-node ./
diff --git a/docker/iota-tools/Dockerfile b/docker/iota-tools/Dockerfile
index 85a4d15a2a1..0e949e467e0 100644
--- a/docker/iota-tools/Dockerfile
+++ b/docker/iota-tools/Dockerfile
@@ -10,22 +10,6 @@ WORKDIR "$WORKDIR/iota"
 
 RUN apt-get update && apt-get install -y cmake clang libpq5 libpq-dev
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -33,8 +17,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} \
+RUN cargo build --profile ${PROFILE} \
     --bin iota-node \
     --bin stress \
     --bin iota-bridge \

From 2a6d752c86088e0f11e8e98a83efc8483544ac81 Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Mon, 18 Nov 2024 12:18:26 +0100
Subject: [PATCH 3/8] feat(docker): remove private repository ssh workaround

---
 .github/workflows/nightly.yml                 |  9 --------
 .github/workflows/release.yml                 |  9 --------
 .../docker/iota-rosetta-devnet/Dockerfile     | 19 +---------------
 .../docker/iota-rosetta-devnet/build.sh       |  3 +--
 .../docker/iota-rosetta-local/Dockerfile      | 19 +---------------
 .../docker/iota-rosetta-local/build.sh        |  3 +--
 docker/deterministic-canary/Dockerfile        | 22 ++-----------------
 docker/deterministic-canary/build.sh          |  3 +--
 docker/iota-indexer-tidb/Dockerfile           | 19 +---------------
 docker/iota-node-deterministic/Dockerfile     | 22 ++-----------------
 docker/iota-node-deterministic/build.sh       |  3 +--
 docker/iota-services/Dockerfile               | 16 --------------
 docker/iota-services/build.sh                 |  3 +--
 docker/iota-source-service/Dockerfile         |  2 +-
 docker/iota/build.sh                          |  3 +--
 15 files changed, 14 insertions(+), 141 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f2b54ab7aac..60f3267e804 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -40,15 +40,6 @@ jobs:
           macos-latest, # macos-arm64
         ]
     steps:
-      # TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-      - name: Set up SSH (MacOs only)
-        if: ${{ matrix.os == 'macos-latest' }}
-        uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # pin@v3
-        with:
-          host: github.com
-          private-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          private-key-name: github-ppk
-
       - name: Install postgres (MacOS arm64)
         if: ${{ matrix.os == 'macos-latest' }}
         shell: bash
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9c797deae24..d63f45ebb51 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -146,15 +146,6 @@ jobs:
           sudo rm -rf ~/Library/Developer/Xcode/iOS\ DeviceSupport/*
           df -h /
 
-      # TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-      - name: Set up SSH (MacOs only)
-        if: ${{ matrix.os == 'macos-latest' }}
-        uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # pin@v3
-        with:
-          host: github.com
-          private-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          private-key-name: github-ppk
-
       - name: Cargo build for ${{ matrix.os }} platform
         shell: bash
         # Currently building in release mode, but we could also have debug builds for testing
diff --git a/crates/iota-rosetta/docker/iota-rosetta-devnet/Dockerfile b/crates/iota-rosetta/docker/iota-rosetta-devnet/Dockerfile
index 4de5b06e11b..9f5c85f10ab 100644
--- a/crates/iota-rosetta/docker/iota-rosetta-devnet/Dockerfile
+++ b/crates/iota-rosetta/docker/iota-rosetta-devnet/Dockerfile
@@ -8,30 +8,13 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 
 FROM chef AS builder
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 RUN git clone https://github.com/iotaledger/iota .
 RUN git checkout devnet
 
 RUN curl -sSfL https://raw.githubusercontent.com/coinbase/rosetta-cli/master/scripts/install.sh | sh -s
 RUN curl -fLJO https://github.com/iotaledger/iota-genesis/raw/main/devnet/genesis.blob
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --release --bin iota --bin iota-rosetta --bin iota-node
+RUN cargo build --release --bin iota --bin iota-rosetta --bin iota-node
 
 # Production Image
 FROM ubuntu:latest AS runtime
diff --git a/crates/iota-rosetta/docker/iota-rosetta-devnet/build.sh b/crates/iota-rosetta/docker/iota-rosetta-devnet/build.sh
index 21181db9560..5c618a0b863 100755
--- a/crates/iota-rosetta/docker/iota-rosetta-devnet/build.sh
+++ b/crates/iota-rosetta/docker/iota-rosetta-devnet/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	-t iotaledger/iota-rosetta-devnet \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
diff --git a/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile b/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile
index ce58d2510c8..9a30acfef66 100644
--- a/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile
+++ b/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile
@@ -9,22 +9,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 # Build application
 FROM chef AS builder
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 RUN curl -sSfL https://raw.githubusercontent.com/coinbase/rosetta-cli/master/scripts/install.sh | sh -s
 
 COPY Cargo.toml Cargo.lock ./
@@ -34,8 +18,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --release --bin iota --bin iota-rosetta
+RUN cargo build --release --bin iota --bin iota-rosetta
 
 # Production Image
 FROM ubuntu:latest AS runtime
diff --git a/crates/iota-rosetta/docker/iota-rosetta-local/build.sh b/crates/iota-rosetta/docker/iota-rosetta-local/build.sh
index 4c0da7fe03d..5fd6e8c8645 100755
--- a/crates/iota-rosetta/docker/iota-rosetta-local/build.sh
+++ b/crates/iota-rosetta/docker/iota-rosetta-local/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	-t iotaledger/iota-rosetta-local \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
diff --git a/docker/deterministic-canary/Dockerfile b/docker/deterministic-canary/Dockerfile
index 0c2d6541e40..d11fe698ef6 100644
--- a/docker/deterministic-canary/Dockerfile
+++ b/docker/deterministic-canary/Dockerfile
@@ -39,24 +39,7 @@ RUN cargo new canary
 
 WORKDIR canary
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo fetch
+RUN cargo fetch
 
 FROM fetch AS build
 
@@ -81,8 +64,7 @@ ENV RUSTFLAGS='-C target-feature=+crt-static -C codegen-units=1'
 ENV GIT_REVISION=${GIT_REVISION}
 ENV PROFILE=${PROFILE}
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh --network=none cargo build --target x86_64-unknown-linux-musl --frozen --profile ${PROFILE}
+RUN --network=none cargo build --target x86_64-unknown-linux-musl --frozen --profile ${PROFILE}
 
 FROM scratch AS install
 
diff --git a/docker/deterministic-canary/build.sh b/docker/deterministic-canary/build.sh
index dd7381e42f2..3cb530a660d 100755
--- a/docker/deterministic-canary/build.sh
+++ b/docker/deterministic-canary/build.sh
@@ -27,8 +27,7 @@ echo
 export DOCKER_BUILDKIT=1
 export SOURCE_DATE_EPOCH=1
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg PROFILE="$PROFILE" \
 	--platform "$PLATFORM" \
 	--output type=oci,rewrite-timestamp=true,force-compression=true,tar=false,dest=$OCI_OUTPUT/canary,name=canary \
diff --git a/docker/iota-indexer-tidb/Dockerfile b/docker/iota-indexer-tidb/Dockerfile
index 3b959e6aeb3..8816caee5ac 100644
--- a/docker/iota-indexer-tidb/Dockerfile
+++ b/docker/iota-indexer-tidb/Dockerfile
@@ -13,22 +13,6 @@ RUN apt-get update && apt-get install -y cmake clang
 # iota-indexer needs postgres libpq5 and ca-certificates
 RUN apt update && apt install -y libpq5 ca-certificates libpq-dev postgresql
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
@@ -36,8 +20,7 @@ COPY iota-execution iota-execution
 COPY external-crates external-crates
 COPY docs docs
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo build --profile ${PROFILE} --bin iota-indexer --features mysql-feature --no-default-features
+RUN cargo build --profile ${PROFILE} --bin iota-indexer --features mysql-feature --no-default-features
 
 # Copy the built binary to the working directory depending on the profile, so we can copy it to the runtime image
 RUN mv target/$(if [ $PROFILE = "dev" ]; then echo "debug"; else echo "release";fi)/iota-indexer ./
diff --git a/docker/iota-node-deterministic/Dockerfile b/docker/iota-node-deterministic/Dockerfile
index bf892c36a3b..69220003dd5 100644
--- a/docker/iota-node-deterministic/Dockerfile
+++ b/docker/iota-node-deterministic/Dockerfile
@@ -39,24 +39,7 @@ COPY . /iota
 
 WORKDIR iota
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh cargo fetch
+RUN cargo fetch
 
 FROM fetch AS build
 
@@ -81,8 +64,7 @@ ENV RUSTFLAGS='-C target-feature=+crt-static -C codegen-units=1'
 ENV GIT_REVISION=${GIT_REVISION}
 ENV PROFILE=${PROFILE}
 
-# TODO: Remove "--mount=type=ssh" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN --mount=type=ssh --network=none cargo build --target x86_64-unknown-linux-musl --frozen --profile ${PROFILE} --bin iota-node
+RUN --network=none cargo build --target x86_64-unknown-linux-musl --frozen --profile ${PROFILE} --bin iota-node
 
 FROM scratch AS install
 
diff --git a/docker/iota-node-deterministic/build.sh b/docker/iota-node-deterministic/build.sh
index 327c9b498c5..b2c73690b0a 100755
--- a/docker/iota-node-deterministic/build.sh
+++ b/docker/iota-node-deterministic/build.sh
@@ -35,8 +35,7 @@ echo
 export DOCKER_BUILDKIT=1
 export SOURCE_DATE_EPOCH=1
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	--build-arg PROFILE="$PROFILE" \
diff --git a/docker/iota-services/Dockerfile b/docker/iota-services/Dockerfile
index 21708c1861d..70a4f1a5214 100644
--- a/docker/iota-services/Dockerfile
+++ b/docker/iota-services/Dockerfile
@@ -8,22 +8,6 @@ RUN apt-get update && apt-get install -y cmake clang libpq5 ca-certificates libp
 # Build application
 FROM chef AS builder 
 
-# TODO: Remove when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh <<EOT
-  set -e
-  echo "Setting Git SSH protocol"
-  (
-    set +e
-    ssh -T git@github.com
-    if [ ! "$?" = "1" ]; then
-      echo "No GitHub SSH key loaded, exiting..."
-      exit 1
-    fi
-  )
-EOT
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-
 COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
diff --git a/docker/iota-services/build.sh b/docker/iota-services/build.sh
index 27bb4e39f5b..031ebcede71 100755
--- a/docker/iota-services/build.sh
+++ b/docker/iota-services/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	"$@"
diff --git a/docker/iota-source-service/Dockerfile b/docker/iota-source-service/Dockerfile
index bc1d9625da7..f1a93befca0 100644
--- a/docker/iota-source-service/Dockerfile
+++ b/docker/iota-source-service/Dockerfile
@@ -5,7 +5,7 @@ ENV GIT_REVISION=$GIT_REVISION
 
 RUN apt-get update && apt-get install -y cmake clang
 
-FROM chef AS builder 
+FROM chef AS builder
 
 # Build application
 COPY Cargo.toml Cargo.lock ./
diff --git a/docker/iota/build.sh b/docker/iota/build.sh
index 8c06e23a0b4..1aac6f69769 100755
--- a/docker/iota/build.sh
+++ b/docker/iota/build.sh
@@ -20,8 +20,7 @@ echo "build date: \t$BUILD_DATE"
 echo "git revision: \t$GIT_REVISION"
 echo
 
-# TODO: Remove "--ssh default" when iota-sim is public https://github.com/iotaledger/iota/issues/2149
-docker build --ssh default -f "$DOCKERFILE" "$REPO_ROOT" \
+docker build -f "$DOCKERFILE" "$REPO_ROOT" \
 	--build-arg GIT_REVISION="$GIT_REVISION" \
 	--build-arg BUILD_DATE="$BUILD_DATE" \
 	--build-arg CARGO_BUILD_FEATURES="$CARGO_BUILD_FEATURES" \

From 72d2b6b38d356ff070fc2f13523b73c087908211 Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Mon, 18 Nov 2024 12:24:37 +0100
Subject: [PATCH 4/8] feat(git): change git references of private repos to
 https

---
 Cargo.lock                         | 14 +++++++-------
 Cargo.toml                         |  4 ++--
 crates/iota-proc-macros/Cargo.toml |  2 +-
 deny.toml                          |  2 +-
 scripts/simtest/cargo-simtest      |  4 ++--
 scripts/simtest/config-patch       |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc237bfa1d8..d8d0b4f3c53 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7590,7 +7590,7 @@ dependencies = [
 [[package]]
 name = "iota-rust-sdk"
 version = "0.0.0"
-source = "git+ssh://git@github.com/iotaledger/iota-rust-sdk.git?rev=d605da95029e74376f0f39a95526bb1a5c0ebd7a#d605da95029e74376f0f39a95526bb1a5c0ebd7a"
+source = "git+https://github.com/iotaledger/iota-rust-sdk.git?rev=d605da95029e74376f0f39a95526bb1a5c0ebd7a#d605da95029e74376f0f39a95526bb1a5c0ebd7a"
 dependencies = [
  "base64ct",
  "bcs",
@@ -9940,7 +9940,7 @@ dependencies = [
 [[package]]
 name = "msim"
 version = "0.1.0"
-source = "git+ssh://git@github.com/iotaledger/iota-sim.git?rev=8fe1939f4bf1e54d0638756c82aaa6c29212e2bb#8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"
+source = "git+https://github.com/iotaledger/iota-sim.git?rev=8fe1939f4bf1e54d0638756c82aaa6c29212e2bb#8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"
 dependencies = [
  "ahash 0.8.11",
  "async-task",
@@ -9968,7 +9968,7 @@ dependencies = [
 [[package]]
 name = "msim-macros"
 version = "0.1.0"
-source = "git+ssh://git@github.com/iotaledger/iota-sim.git?rev=8fe1939f4bf1e54d0638756c82aaa6c29212e2bb#8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"
+source = "git+https://github.com/iotaledger/iota-sim.git?rev=8fe1939f4bf1e54d0638756c82aaa6c29212e2bb#8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"
 dependencies = [
  "darling 0.14.4",
  "proc-macro2 1.0.86",
@@ -12196,7 +12196,7 @@ dependencies = [
 [[package]]
 name = "real_tokio"
 version = "1.39.2"
-source = "git+ssh://git@github.com/iotaledger/tokio-madsim-fork.git?branch=main#e34a35287024b341db16139a402508aaea8ec955"
+source = "git+https://github.com/iotaledger/tokio-madsim-fork.git?branch=main#e34a35287024b341db16139a402508aaea8ec955"
 dependencies = [
  "backtrace",
  "bytes",
@@ -12206,7 +12206,7 @@ dependencies = [
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
- "tokio-macros 2.4.0 (git+ssh://git@github.com/iotaledger/tokio-madsim-fork.git?branch=main)",
+ "tokio-macros 2.4.0 (git+https://github.com/iotaledger/tokio-madsim-fork.git?branch=main)",
  "windows-sys 0.52.0",
 ]
 
@@ -14747,7 +14747,7 @@ dependencies = [
 [[package]]
 name = "tokio-macros"
 version = "2.4.0"
-source = "git+ssh://git@github.com/iotaledger/tokio-madsim-fork.git?branch=main#e34a35287024b341db16139a402508aaea8ec955"
+source = "git+https://github.com/iotaledger/tokio-madsim-fork.git?branch=main#e34a35287024b341db16139a402508aaea8ec955"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -14817,7 +14817,7 @@ dependencies = [
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
-source = "git+ssh://git@github.com/iotaledger/tokio-madsim-fork.git?branch=main#e34a35287024b341db16139a402508aaea8ec955"
+source = "git+https://github.com/iotaledger/tokio-madsim-fork.git?branch=main#e34a35287024b341db16139a402508aaea8ec955"
 dependencies = [
  "bytes",
  "futures-core",
diff --git a/Cargo.toml b/Cargo.toml
index f531d7a4b54..4539f8d0726 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -274,7 +274,7 @@ leb128 = "0.2.5"
 lru = "0.12"
 mockall = "0.11.4"
 more-asserts = "0.3.1"
-msim = { git = "ssh://git@github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb", package = "msim" }
+msim = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb", package = "msim" }
 nonempty = "0.9.0"
 notify = "6.1.1"
 num-bigint = "0.4.4"
@@ -409,7 +409,7 @@ iota-rosetta = { path = "crates/iota-rosetta" }
 iota-rpc-loadgen = { path = "crates/iota-rpc-loadgen" }
 iota-sdk = { path = "crates/iota-sdk" }
 # core-types with json format for REST API
-iota-sdk2 = { package = "iota-rust-sdk", git = "ssh://git@github.com/iotaledger/iota-rust-sdk.git", rev = "d605da95029e74376f0f39a95526bb1a5c0ebd7a", features = ["hash", "serde", "schemars"] }
+iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "d605da95029e74376f0f39a95526bb1a5c0ebd7a", features = ["hash", "serde", "schemars"] }
 iota-simulator = { path = "crates/iota-simulator" }
 iota-snapshot = { path = "crates/iota-snapshot" }
 iota-source-validation = { path = "crates/iota-source-validation" }
diff --git a/crates/iota-proc-macros/Cargo.toml b/crates/iota-proc-macros/Cargo.toml
index 635d828d407..3dd9b7d2bdd 100644
--- a/crates/iota-proc-macros/Cargo.toml
+++ b/crates/iota-proc-macros/Cargo.toml
@@ -18,4 +18,4 @@ quote.workspace = true
 syn = { version = "2.0", features = ["full", "fold", "extra-traits"] }
 
 [target.'cfg(msim)'.dependencies]
-msim-macros = { git = "ssh://git@github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb", package = "msim-macros" }
+msim-macros = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb", package = "msim-macros" }
diff --git a/deny.toml b/deny.toml
index d572a2fd3cf..1dd363f8ca1 100644
--- a/deny.toml
+++ b/deny.toml
@@ -231,7 +231,7 @@ allow-git = [
   "https://github.com/iotaledger/tokio-madsim-fork.git",
   "https://github.com/nextest-rs/datatest-stable.git",
   "https://github.com/zhiburt/tabled.git",
-  "ssh://git@github.com/iotaledger/iota-rust-sdk.git",
+  "https://github.com/iotaledger/iota-rust-sdk.git",
   "https://github.com/bmwill/openapiv3.git",
   "https://github.com/bmwill/axum-server.git",
 ]
diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest
index 2a134757e30..981ffd99858 100755
--- a/scripts/simtest/cargo-simtest
+++ b/scripts/simtest/cargo-simtest
@@ -54,9 +54,9 @@ if [ -n "$LOCAL_MSIM_PATH" ]; then
   )
 else
   cargo_patch_args=(
-    --config 'patch.crates-io.tokio.git = "ssh://git@github.com/iotaledger/iota-sim.git"'
+    --config 'patch.crates-io.tokio.git = "https://github.com/iotaledger/iota-sim.git"'
     --config 'patch.crates-io.tokio.rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"'
-    --config 'patch.crates-io.futures-timer.git = "ssh://git@github.com/iotaledger/iota-sim.git"'
+    --config 'patch.crates-io.futures-timer.git = "https://github.com/iotaledger/iota-sim.git"'
     --config 'patch.crates-io.futures-timer.rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"'
   )
 fi
diff --git a/scripts/simtest/config-patch b/scripts/simtest/config-patch
index e8d748d4e47..a940d9a3188 100644
--- a/scripts/simtest/config-patch
+++ b/scripts/simtest/config-patch
@@ -18,5 +18,5 @@ index c0829bc1b6..4007f97d66 100644
  include_dir = "0.7.3"
 +
 +[patch.crates-io]
-+tokio = { git = "ssh://git@github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb" }
-+futures-timer = { git = "ssh://git@github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb" }
++tokio = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb" }
++futures-timer = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb" }

From 302f05b5f1dfae9fe8ed2604f7b8f9b0e3ccedb6 Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Mon, 18 Nov 2024 12:38:39 +0100
Subject: [PATCH 5/8] feat(move-tests): reenable nested deps git local test

---
 .../nested_deps_git_local/{Move.toml.ignore => Move.toml}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/{Move.toml.ignore => Move.toml} (100%)

diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml.ignore b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml
similarity index 100%
rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml.ignore
rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml

From 9558137e38f2e6e3a5cdde7c77d50982f7e00a4a Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Mon, 18 Nov 2024 12:44:37 +0100
Subject: [PATCH 6/8] feat(docker): replace private docker registry

---
 .github/workflows/release_docker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml
index 4540420f6cc..0a729c2e815 100644
--- a/.github/workflows/release_docker.yml
+++ b/.github/workflows/release_docker.yml
@@ -45,7 +45,7 @@ jobs:
         id: meta-node
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
-          images: docker-registry.iota.org/iota-node
+          images: iotaledger/iota-node
           # mapping semver tags to networks
           # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
           # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
@@ -104,7 +104,7 @@ jobs:
         id: meta-indexer
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
-          images: docker-registry.iota.org/iota-indexer
+          images: iotaledger/iota-indexer
           # mapping semver tags to networks
           # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
           # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
@@ -163,7 +163,7 @@ jobs:
         id: meta-tools
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
-          images: docker-registry.iota.org/iota-tools
+          images: iotaledger/iota-tools
           # mapping semver tags to networks
           # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
           # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
@@ -222,7 +222,7 @@ jobs:
         id: meta-tools
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
-          images: docker-registry.iota.org/iota-graphql-rpc
+          images: iotaledger/iota-graphql-rpc
           # mapping semver tags to networks
           # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
           # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet

From 6aa123634b09c9cae2fd51fea45f25bf67f56d9c Mon Sep 17 00:00:00 2001
From: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:40:59 +0100
Subject: [PATCH 7/8] feat(iota): reenable test_move_new (#4122)

---
 crates/iota/tests/cli_tests.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/iota/tests/cli_tests.rs b/crates/iota/tests/cli_tests.rs
index f9fe7dac8e1..3f75f606082 100644
--- a/crates/iota/tests/cli_tests.rs
+++ b/crates/iota/tests/cli_tests.rs
@@ -4183,7 +4183,6 @@ async fn test_faucet() -> Result<(), anyhow::Error> {
     Ok(())
 }
 
-#[ignore = "until the repo is public https://github.com/iotaledger/iota/issues/3741"]
 #[tokio::test]
 async fn test_move_new() -> Result<(), anyhow::Error> {
     let current_dir = std::env::current_dir()?;

From c85437d3864508465758dfa65ba5af892faa16f9 Mon Sep 17 00:00:00 2001
From: muXxer <git@muxxer.de>
Date: Tue, 19 Nov 2024 15:58:19 +0100
Subject: [PATCH 8/8] chore: update iota-sim commit hash

---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/iota-proc-macros/Cargo.toml | 2 +-
 scripts/simtest/cargo-simtest      | 4 ++--
 scripts/simtest/config-patch       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d8d0b4f3c53..c2931195e0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9940,7 +9940,7 @@ dependencies = [
 [[package]]
 name = "msim"
 version = "0.1.0"
-source = "git+https://github.com/iotaledger/iota-sim.git?rev=8fe1939f4bf1e54d0638756c82aaa6c29212e2bb#8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"
+source = "git+https://github.com/iotaledger/iota-sim.git?rev=f16ef50ba7d874fe1f0960f248f6c651a634d6a5#f16ef50ba7d874fe1f0960f248f6c651a634d6a5"
 dependencies = [
  "ahash 0.8.11",
  "async-task",
@@ -9968,7 +9968,7 @@ dependencies = [
 [[package]]
 name = "msim-macros"
 version = "0.1.0"
-source = "git+https://github.com/iotaledger/iota-sim.git?rev=8fe1939f4bf1e54d0638756c82aaa6c29212e2bb#8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"
+source = "git+https://github.com/iotaledger/iota-sim.git?rev=f16ef50ba7d874fe1f0960f248f6c651a634d6a5#f16ef50ba7d874fe1f0960f248f6c651a634d6a5"
 dependencies = [
  "darling 0.14.4",
  "proc-macro2 1.0.86",
diff --git a/Cargo.toml b/Cargo.toml
index 4539f8d0726..48661065dcb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -274,7 +274,7 @@ leb128 = "0.2.5"
 lru = "0.12"
 mockall = "0.11.4"
 more-asserts = "0.3.1"
-msim = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb", package = "msim" }
+msim = { git = "https://github.com/iotaledger/iota-sim.git", rev = "f16ef50ba7d874fe1f0960f248f6c651a634d6a5", package = "msim" }
 nonempty = "0.9.0"
 notify = "6.1.1"
 num-bigint = "0.4.4"
diff --git a/crates/iota-proc-macros/Cargo.toml b/crates/iota-proc-macros/Cargo.toml
index 3dd9b7d2bdd..27231b1f515 100644
--- a/crates/iota-proc-macros/Cargo.toml
+++ b/crates/iota-proc-macros/Cargo.toml
@@ -18,4 +18,4 @@ quote.workspace = true
 syn = { version = "2.0", features = ["full", "fold", "extra-traits"] }
 
 [target.'cfg(msim)'.dependencies]
-msim-macros = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb", package = "msim-macros" }
+msim-macros = { git = "https://github.com/iotaledger/iota-sim.git", rev = "f16ef50ba7d874fe1f0960f248f6c651a634d6a5", package = "msim-macros" }
diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest
index 981ffd99858..632915dd6f7 100755
--- a/scripts/simtest/cargo-simtest
+++ b/scripts/simtest/cargo-simtest
@@ -55,9 +55,9 @@ if [ -n "$LOCAL_MSIM_PATH" ]; then
 else
   cargo_patch_args=(
     --config 'patch.crates-io.tokio.git = "https://github.com/iotaledger/iota-sim.git"'
-    --config 'patch.crates-io.tokio.rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"'
+    --config 'patch.crates-io.tokio.rev = "f16ef50ba7d874fe1f0960f248f6c651a634d6a5"'
     --config 'patch.crates-io.futures-timer.git = "https://github.com/iotaledger/iota-sim.git"'
-    --config 'patch.crates-io.futures-timer.rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb"'
+    --config 'patch.crates-io.futures-timer.rev = "f16ef50ba7d874fe1f0960f248f6c651a634d6a5"'
   )
 fi
 
diff --git a/scripts/simtest/config-patch b/scripts/simtest/config-patch
index a940d9a3188..fb90ecb83fd 100644
--- a/scripts/simtest/config-patch
+++ b/scripts/simtest/config-patch
@@ -18,5 +18,5 @@ index c0829bc1b6..4007f97d66 100644
  include_dir = "0.7.3"
 +
 +[patch.crates-io]
-+tokio = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb" }
-+futures-timer = { git = "https://github.com/iotaledger/iota-sim.git", rev = "8fe1939f4bf1e54d0638756c82aaa6c29212e2bb" }
++tokio = { git = "https://github.com/iotaledger/iota-sim.git", rev = "f16ef50ba7d874fe1f0960f248f6c651a634d6a5" }
++futures-timer = { git = "https://github.com/iotaledger/iota-sim.git", rev = "f16ef50ba7d874fe1f0960f248f6c651a634d6a5" }