merge from main

.gitignore

@@ -12,7 +12,7 @@ ledger_db/
 state_merkle_db/
 .etc
 .movement
-.movement-*
+.movement*
 .idea
 .vscode
 .data

docker/compose/movement-full-node/docker-compose.follower.backup.yml

@@ -0,0 +1,121 @@
+services:
+  setup:
+    image: ghcr.io/movementlabsxyz/movement-full-node-setup:${CONTAINER_REV}
+    container_name: setup
+    environment:
+      DOT_MOVEMENT_PATH: /.movement
+      # needs to have a connection to the movement-celestia-da-light-node
+      MOVEMENT_DA_LIGHT_NODE_CONNECTION_PROTOCOL: ${MOVEMENT_DA_LIGHT_NODE_CONNECTION_PROTOCOL:?MOVEMENT_DA_LIGHT_NODE_CONNECTION_PROTOCOL is not set}
+      MOVEMENT_DA_LIGHT_NODE_CONNECTION_HOSTNAME: ${MOVEMENT_DA_LIGHT_NODE_CONNECTION_HOSTNAME:?MOVEMENT_DA_LIGHT_NODE_CONNECTION_HOSTNAME is not set}
+      MOVEMENT_DA_LIGHT_NODE_CONNECTION_PORT: ${MOVEMENT_DA_LIGHT_NODE_CONNECTION_PORT:?MOVEMENT_DA_LIGHT_NODE_CONNECTION_PORT is not set}
+      INDEXER_PROCESSOR_POSTGRES_CONNECTION_STRING: postgres://postgres:password@postgres:5432/postgres
+      AWS_REGION: ${AWS_REGION:?AWS_REGION is not set}
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      MOVEMENT_SYNC: ${MOVEMENT_SYNC} #:?MOVEMENT_SYNC is not set}
+      MAYBE_RUN_LOCAL: "false"
+      MOVEMENT_DA_LIGHT_NODE_HTTP1: ${MOVEMENT_DA_LIGHT_NODE_HTTP1}
+      RUST_LOG: info,aws_sdk_s3=debug
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement
+      # mount if exists
+      - ~/.aws/:/root/.aws:ro
+
+    healthcheck:
+      test: [ "CMD-SHELL", "echo 'health check'" ]
+      retries: 10
+      interval: 10s
+      timeout: 5s
+
+  # turn off underlying da light nodes
+  celestia-light-node:
+    image: busybox
+    container_name: celestia-light-node
+    command: sleep infinity
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+      - CELESTIA_RPC_ADDRESS=celestia-light-node:26657
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement
+    depends_on:
+      setup:
+        condition: service_healthy
+    healthcheck:
+      test: [ "CMD-SHELL", "echo 'health check'" ]
+      retries: 3
+      start_period: 3s
+    restart: on-failure:3
+
+  # turn off celestia-light-node-synced
+  celestia-light-node-synced:
+    image: busybox
+    container_name: celestia-light-node-synced
+    command: echo "No sync check when following."
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement
+    depends_on:
+      celestia-light-node:
+        condition: service_healthy
+
+  # turn off movement-celestia-da-light-node
+  movement-celestia-da-light-node:
+    image: busybox
+    container_name: movement-celestia-da-light-node
+    command: sleep infinity
+    healthcheck:
+      test: [ "CMD-SHELL", "echo 'health check'" ]
+      retries: 3
+      start_period: 3s
+
+  # turn off movement-faucet-service
+  movement-faucet-service:
+    image: busybox
+    container_name: movement-faucet-service
+    command: sleep infinity
+    healthcheck:
+      test: [ "CMD-SHELL", "echo 'health check'" ]
+      retries: 3
+      start_period: 3s
+
+  movement-snapshot-node:
+    image: ghcr.io/movementlabsxyz/movement-full-node:${CONTAINER_REV}
+    container_name: movement-snapshot-node
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+      - MOVEMENT_TIMING=info
+      - SUZUKA_TIMING_LOG=/.movement/movement-timing.log
+      - RUST_BACKTRACE=1
+      - SYNC_PATTERN=${SYNC_PATTERN}
+      - SYNC_BUCKET=${SYNC_BUCKET}
+      - SYNC_ARCHIVE=${SYNC_ARCHIVE}
+    entrypoint: /bin/sh
+    command: |
+      sh -c '
+        while true; do
+          timeout 60s movement-full-node run || echo "Node run timed out"
+          echo "Taking snapshot..."
+          movement-full-node backup save-and-push $SYNC_BUCKET $SYNC_PATTERN $SYNC_ARCHIVE || echo "Snapshot failed"
+        done
+      '
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement
+    depends_on:
+      - movement-celestia-da-light-node
+    ports:
+      - "30731:30731"
+      - "30734:30734"
+    healthcheck:
+      test: [ "CMD-SHELL", "nc -zv 0.0.0.0 39731" ]
+      retries: 10
+      interval: 10s
+      timeout: 5s
+    restart: on-failure:5
+
+  movement-full-node:
+    image: ghcr.io/movementlabsxyz/movement-full-node:${CONTAINER_REV}
+    container_name: movement-full-node
+    depends_on:
+      movement-snapshot-node:
+        condition: service_healthy

docker/compose/movement-full-node/docker-compose.follower.yml

@@ -12,7 +12,7 @@ services:
       AWS_REGION: ${AWS_REGION:?AWS_REGION is not set}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-      MOVEMENT_SYNC: ${MOVEMENT_SYNC:?MOVEMENT_SYNC is not set}
+      MOVEMENT_SYNC: ${MOVEMENT_SYNC}
       MAYBE_RUN_LOCAL: "false"
       RUST_LOG: info,aws_sdk_s3=debug
     volumes:

docker/compose/movement-full-node/docker-compose.leader.yml

@@ -1,7 +1,7 @@
 services:
   setup:
     environment:
-      MOVEMENT_SYNC: ${MOVEMENT_SYNC:?MOVEMENT_SYNC is not set}
+      MOVEMENT_SYNC: ${MOVEMENT_SYNC}
       AWS_REGION: ${AWS_REGION:?AWS_REGION is not set}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}

docker/compose/movement-full-node/snapshot/docker-compose.push.yml

@@ -0,0 +1,20 @@
+version: "3.8"
+
+services:
+
+  movement-backup-db:
+    image: ghcr.io/movementlabsxyz/movement-full-node:${CONTAINER_REV}
+    container_name: movement-backup-db
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+      - MOVEMENT_TIMING=info
+      - SUZUKA_TIMING_LOG=/.movement/movement-timing.log
+      - RUST_BACKTRACE=1
+      - AWS_REGION=us-west-1
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - SYNC_BUCKET=${SYNC_BUCKET}
+      - SYNC_ARCHIVE=${SYNC_BUCKET}
+    command: backup push $SYNC_BUCKET $SYNC_ARCHIVE
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement

docker/compose/movement-full-node/snapshot/docker-compose.restore.yml

@@ -0,0 +1,20 @@
+version: "3.8"
+
+services:
+
+  movement-restore-db:
+    image: ghcr.io/movementlabsxyz/movement-full-node:${CONTAINER_REV}
+    container_name: movement-restore-db
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+      - MOVEMENT_TIMING=info
+      - SUZUKA_TIMING_LOG=/.movement/movement-timing.log
+      - RUST_BACKTRACE=1
+      - AWS_REGION=us-west-1
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - SYNC_BUCKET=${SYNC_BUCKET}
+      - SYNC_PATTERN=${SYNC_PATTERN}
+    command: backup restore $SYNC_BUCKET $SYNC_PATTERN
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement

docker/compose/movement-full-node/snapshot/docker-compose.save_and_push.yml

@@ -0,0 +1,21 @@
+version: "3.8"
+
+services:
+
+  movement-backup-db:
+    image: ghcr.io/movementlabsxyz/movement-full-node:${CONTAINER_REV}
+    container_name: movement-backup-db
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+      - MOVEMENT_TIMING=info
+      - SUZUKA_TIMING_LOG=/.movement/movement-timing.log
+      - RUST_BACKTRACE=1
+      - AWS_REGION=us-west-1
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - SYNC_PATTERN=${SYNC_PATTERN}
+      - SYNC_BUCKET=${SYNC_BUCKET}
+      - SYNC_ARCHIVE=${SYNC_BUCKET}
+    command: backup save-and-push $SYNC_BUCKET $SYNC_PATTERN $SYNC_ARCHIVE 
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement

docker/compose/movement-full-node/snapshot/docker-compose.save_db.yml

@@ -0,0 +1,20 @@
+version: "3.8"
+
+services:
+
+  movement-backup-db:
+    image: ghcr.io/movementlabsxyz/movement-full-node:${CONTAINER_REV}
+    container_name: movement-backup-db
+    environment:
+      - DOT_MOVEMENT_PATH=/.movement
+      - MOVEMENT_TIMING=info
+      - SUZUKA_TIMING_LOG=/.movement/movement-timing.log
+      - RUST_BACKTRACE=1
+      - AWS_REGION=us-west-1
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - MOVEMENT_SYNC=${MOVEMENT_SYNC}
+      - SYNC_PATTERN=${SYNC_PATTERN}
+    command: backup save $SYNC_PATTERN
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement

networks/movement/movement-full-node/Cargo.toml

@@ -45,6 +45,8 @@ movement-da-light-node-client = { workspace = true}
 aptos-framework-elsa-to-biarritz-rc1-migration = { workspace = true }
 movement-signer = { workspace = true }
 movement-signer-loader = { workspace = true }
+syncador = { workspace = true }
+syncup = { workspace = true }
 
 [features]
 default = []