Merge branch 'develop' into 4665-add-a-script-to-enable-running-tests…

…-locally-in-the-exact-same-way-as-in-the-ci
iotaledger · Jan 31, 2025 · a5c2acd · a5c2acd
2 parents 514ed03 + 576e9d9
commit a5c2acd
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 10 deletions.
diff --git a/docs/content/operator/archives.mdx b/docs/content/operator/archives.mdx
@@ -55,9 +55,9 @@ To enable your node to fallback to an archive in case of lag, add this to your f
 state-archive-read-config:
   - object-store-config:
       object-store: "S3"
-      # Use iota-testnet-archives for testnet 
-      # Use iota-mainnet-archives for mainnet
-      bucket: "iota-<testnet|mainnet>-archives"
+      # Use iota-testnet-archive for testnet 
+      # Use iota-mainnet-archive for mainnet
+      bucket: "iota-<testnet|mainnet>-archive"
       # Use your AWS account access key id
       aws-access-key-id: "<AWS-ACCESS-KEY-ID>"
       # Use your AWS account secret access key
@@ -78,9 +78,9 @@ state-archive-read-config:
 state-archive-read-config:
   - object-store-config:
       object-store: "GCS"
-      # Use iota-mainnet-archives for mainnet
+      # Use iota-mainnet-archive for mainnet
       # Notice there is no archive bucket setup for testnet in GCS
-      bucket: "iota-<testnet|mainnet>-archives"
+      bucket: "iota-<testnet|mainnet>-archive"
       # Use your gcloud service account credentials
       google-service-account: "</path/to/service/account/credentials>"
       object-store-connection-limit: 20
@@ -107,8 +107,8 @@ Even though these buckets are publicly readable, you need to make sure to proper
             ],
             "Effect": "Allow",
             "Resource": [
-                "arn:aws:s3:::iota-mainnet-archives/*",
-                "arn:aws:s3:::iota-mainnet-archives"
+                "arn:aws:s3:::iota-mainnet-archive/*",
+                "arn:aws:s3:::iota-mainnet-archive"
             ]
         }
     ]

diff --git a/docs/content/operator/iota-full-node/source.mdx b/docs/content/operator/iota-full-node/source.mdx
@@ -117,7 +117,23 @@ cp crates/iota-config/data/fullnode-template.yaml fullnode.yaml
 
     </Tabs>
 
-5. (Optional, skip this step to accept the default paths to resources). Edit the `fullnode.yaml` file to use custom paths.
+5. Set Up Archival Fallback
+
+This allows nodes that fall behind to catch up by downloading archive data rather than relying on synchronization. For more details about archives, see [IOTA Archives](https://docs.iota.org/operator/archives).
+
+```yaml
+state-archive-read-config:
+  - object-store-config:
+      object-store: "S3"
+      aws-endpoint: "https://archive.<devnet|testnet|mainnet>.iota.cafe"
+      aws-virtual-hosted-style-request: true
+      object-store-connection-limit: 20
+      no-sign-request: true
+    concurrency: 5
+    use-for-pruning-watermark: false
+```
+
+6. (Optional, skip this step to accept the default paths to resources). Edit the `fullnode.yaml` file to use custom paths.
     1. Update the `db-path` field with the path to the full node database.
         ```yaml
         db-path: "/db-files/iota-fullnode"`
@@ -132,6 +148,8 @@ cp crates/iota-config/data/fullnode-template.yaml fullnode.yaml
         migration-tx-data-path: "/opt/iota/config/migration.blob"
         ```
 
+
+
 ## 3. Compile the Node
 
 Run the following command to compile the `iota-node`.

diff --git a/docs/site/static/img/about-iota/tokenomics/gas-fees-explorer.png b/docs/site/static/img/about-iota/tokenomics/gas-fees-explorer.png
diff --git a/...static/img/developer/cryptography/transaction-auth/iota_multisig_structures.png b/...static/img/developer/cryptography/transaction-auth/iota_multisig_structures.png
diff --git a/docs/site/static/img/iota-evm/evm/how-tos/get-funds/firefly/hit-send.png b/docs/site/static/img/iota-evm/evm/how-tos/get-funds/firefly/hit-send.png
diff --git a/docs/site/static/img/iota-evm/multichain.png b/docs/site/static/img/iota-evm/multichain.png
diff --git a/nre/config/validator.yaml b/nre/config/validator.yaml
@@ -5,6 +5,8 @@ protocol-key-pair:
   path: /opt/iota/key-pairs/protocol.key
 network-key-pair:
   path: /opt/iota/key-pairs/network.key
+account-key-pair:
+  path: /opt/iota/key-pairs/account.key
 db-path: /opt/iota/db/authorities_db
 network-address: /ip4/0.0.0.0/tcp/8080/http
 metrics-address: "0.0.0.0:9184"
@@ -35,5 +37,13 @@ db-checkpoint-config:
 indirect-objects-threshold: 18446744073709551615
 metrics:
   push-interval-seconds: 60
-  # push-url: https://metrics-proxy.testnet.iota.cafe:8443/publish/metrics
-  # push-url: https://metrics-proxy.mainnet.iota.cafe:8443/publish/metrics
+  push-url: https://metrics-proxy.<testnet|mainnet>.iota.cafe:8443/publish/metrics # UPDATE THIS
+state-archive-read-config:
+  - object-store-config:
+      object-store: "S3"
+      aws-endpoint: "https://archive.<testnet|mainnet>.iota.cafe" # UPDATE THIS
+      aws-virtual-hosted-style-request: true
+      object-store-connection-limit: 20
+      no-sign-request: true
+    concurrency: 5
+    use-for-pruning-watermark: false
diff --git a/setups/fullnode/docker/README.md b/setups/fullnode/docker/README.md
@@ -62,6 +62,22 @@ The genesis blob defines the IOTA network configuration. Before starting the Ful
 - [Devnet migration blob](https://dbfiles.devnet.iota.cafe/migration.blob):
   `curl -fLJO https://dbfiles.devnet.iota.cafe/migration.blob`
 
+### Set Up Archival Fallback
+
+This allows nodes that fall behind to catch up by downloading archive data rather than relying on synchronization. For more details about archives, see [IOTA Archives](https://docs.iota.org/operator/archives).
+
+```yaml
+state-archive-read-config:
+  - object-store-config:
+      object-store: "S3"
+      aws-endpoint: "https://archive.<devnet|testnet|mainnet>.iota.cafe"
+      aws-virtual-hosted-style-request: true
+      object-store-connection-limit: 20
+      no-sign-request: true
+    concurrency: 5
+    use-for-pruning-watermark: false
+```
+
 ## Start Your IOTA Full Node
 
 Run the following command to start the IOTA Full Node in Docker: