Merge main into dev

docs/about/communication.md

@@ -23,7 +23,7 @@ keywords: [gnosis, gnosis twitter, gnosis telegram, gnosis discord, governance f
 
 ## Support
 
-- [Discord](https://discord.gg/gnosischain)
+- [Discord](https://discord.gg/gnosis)
 - [Validator Resources & Feedback Form](https://tally.so/r/3y4V1W)
 - General Inquiries: [[email protected]](mailto:[email protected]) 
 

docs/about/networks/README.md

@@ -26,4 +26,4 @@ keywords:
 | CL Explorer        | https://gnosischa.in/            | https://beacon.chiadochain.net       |
 | Fork monitor       | https://forkmon.gnosischain.com  | https://forkmon.chiadochain.net      |
 | EthStats           | https://ethstats.gnosischain.com | https://ethstats.chiadochain.net     |
-| Faucet             | https://gnosisfaucet.com         | https://faucet.chiadochain.net/      |
+| Faucet             | https://faucet.gnosischain.com/  | https://faucet.chiadochain.net/      |

docs/about/specs/bug-bounty.md

@@ -80,7 +80,7 @@ More info -> [https://medium.com/immunefi/xdai-stake-hosts-2-000-000-bug-bounty-
 ## What’s next?
 
 - [Submit a bug](https://bugs.immunefi.com/)
-- Any questions about the program? Reach out to us in our [Discord](https://discord.gg/gnosischain) channel!
+- Any questions about the program? Reach out to us in our [Discord](https://discord.gg/gnosis) channel!
 
 ## FAQ
 

docs/bridges/About Token Bridges/hashi-integration.md

@@ -0,0 +1,116 @@
+---
+sidebar_position: 5
+title: Hashi Integration
+description: How do the bridges work after Hashi integration
+keywords: [amb bridge, arbitrary message bridge, omnibridge, xdai bridge, hashi]
+---
+
+# Hashi integration
+
+The proposal of Hashi integration on Gnosis Chain's bridges (AMB & Omnibridge, xDAI bridge) is [approved by Gnosis DAO members](https://forum.gnosis.io/t/gip-93-should-gnosisdao-support-the-integration-of-hashi-within-gnosis-chains-canonical-bridges/8245/5) on April 2nd, 2024. The integration introduces advanced security measures, mitigates systemic risks, and ensures the Gnosis Chain ecosystem remains resilient against the evolving landscape of security threats. With the efforts from Cross-Chain Alliance and Gnosis team, the integration is going toward production.
+
+## What’s new?
+
+1. Hashi Manager contract: New contract. Set reporters, adapters, and threshold parameters used by the bridge contract.
+2. New variables/function:
+   1. HASHI_ENABLED: New variable. When set to true, every message can be approved by Hashi, but the message need not to be approved by Hashi for it to get executed.
+   2. HASHI_MANDATORY: New variable. When set to true, every message has to be approved by Hashi before execution.
+   3. isApprovedByHashi(bytes32 msgId): New public function. Return whether a message w.r.t a message Id is approved by Hashi.
+   4. setHashiManager(address HashiManager): New function, onlyOwner. Set Hashi Manager contract on the bridge contract.
+3. Modified events:
+   1. xDAI Bridge: in xDAI bridge, a `bytes32 nonce` is added into `UserRequestForAffirmation` and `UserRequestForSignature` events.
+      1. `event UserRequestForAffirmation(address recipient, uint256 value)` is changed to `event UserRequestForAffirmation(address recipient, uint256 value, bytes32 nonce)`
+      2. `event UserRequestForSignature(address recipient, uint256 value)` is changed to `UserRequestForSignature(address recipient, uint256 value bytes32 nonce)`
+
+## AMB & Omnibridge
+
+![](../../../static/img/bridges/hashi/Hashi-Gnosis-AMB.png)
+
+For Omnibridge / AMB:
+
+**Ethereum → Gnosis Chain**
+
+1. User approves token for Foreign Omnibridge
+2. User calls ForeignOmnibridge.relayTokens(address token, address receiver, uint256 amount)
+   1. ForeignOmnibridge calls ForeignAMB.requireToPassMessage()
+   2. ForeignAMB check if HASHI_IS_ENABLED is true, and call Yaho.dispatchMessage
+   3. Off chain relayer detects MessageDispatched event from Yaho and call Yaho.relayMessagesToAdapters to relay message to each reporters.
+   4. Reporters relay the messageId and message hash to adapter contract on Gnosis Chain.
+   5. Light Client based oracle only stores hashes on Gnosis Chain.
+3. If Hashi is enabled & mandatory, off chain executor calls Gnosis Chain’s Yaru.executeMessages(), which check if the hash is agreed upon a threshold amount of adapters (set in Hashi Manager contract) adapters and set isApprovedByHashi(messageId) to true eventually.
+4. Bridge validators detects UserRequestForAffirmation event and call HomeAMB.executeAffirmation. If Hashi is enabled & mandatory, this step has to wait after step 3.
+
+**Gnosis Chain → Ethereum**
+
+1. User approves token for Home Omnibridge
+2. User calls HomeOmnibridge.relayTokens(address token, address receiver, uint256 amount)
+   1. HomeOmnibridge calls HomeAMB.requireToPassMessage()
+   2. HomeAMB check if HASHI_IS_ENABLED is true, and call Yaho.dispatchMessage
+   3. Off chain relayer detects MessageDispatched event from Yaho and call Yaho.relayMessagesToAdapters to relay message to each reporters.
+   4. Reporters relay the messageId and message hash to adapter contract on Ethereum.
+3. Bridge validators detects UserRequestForSignature event and call HomeAMB.submitSignatures.
+4. If Hashi is enabled & mandatory, off chain executor calls Ethereum’s Yaru.executeMessages(), which check if the hash is agreed upon adapters and set isApprovedByHashi(messageId) to true eventually.
+5. User claims token by calling Ethereum’s ForeignAMB.executeSignatures().
+
+## xDAI briddge
+
+![](../../../static/img/bridges/hashi/Hashi-Gnosis-AMB.png)
+
+**Ethereum → Gnosis Chain**
+
+1. User approves token for Foreign xDAI bridge.
+2. User calls ForeignXDAIBridge.relayTokens(address receiver, uint256 amount)
+   1. ForeignXDAIBridge check if HASHI_IS_ENABLED is true, and call Yaho.dispatchMessage
+   2. Off chain relayer detects MessageDispatched event from Yaho and call Yaho.relayMessagesToAdapters to relay message to each reporters.
+   3. Reporters relay the messageId and message hash to adapter contract on Gnosis Chain.
+   4. Light Client based oracle only stores hashes on Gnosis Chain.
+3. If Hashi is enabled & mandatory, off chain executor calls Gnosis Chain’s Yaru.executeMessages(), which check if the hash is agreed upon a threshold amount of adapters (set in Hashi Manager contract) and set isApprovedByHashi(messageId) to true eventually.
+4. Bridge validators detects UserRequestForAffirmation event and call HomexDAIBridge.executeAffirmation. If Hashi is enabled & mandatory, this step has to wait after step 3. Block Reward contract emits AddedReceiver event, which will mint equivalent amount of xDAI to receiver in the next block.
+
+**Gnosis Chain → Ethereum**
+
+1. User calls HomexDAIBridge.relayTokens(address receiver, uint256 amount) or transfer xDAI to HomexDAIBridge without msg.data.
+   1. HomexDAIBridge check if HASHI_IS_ENABLED is true, and call Yaho.dispatchMessage
+   2. Off chain relayer detects MessageDispatched event from Yaho and call Yaho.relayMessagesToAdapters to relay message to each reporters.
+   3. Reporters relay the messageId and message hash to adapter contract on Ethereum.
+2. Bridge validators detects UserRequestForSignature event and call HomexDAIBridge.submitSignatures.
+3. If Hashi is enabled & mandatory, off chain executor calls Ethereum’s Yaru.executeMessages(), which check if the hash is agreed upon adapters and set isApprovedByHashi(messageId) to true eventually.
+4. User claims token by calling Ethereum’s ForeignxDAIBridge.executeSignatures(). DAI is transfer to the receiver eventually.
+
+# Testnet environment
+
+For testing purpose, we've set up testnet environemnt. Users are welcome to experiment with the testnet environments:
+
+- Sepolia addresses
+  1. ForeignAMB: [0x2F62433e00168af10c70bc39e2fDbEe5DaCA257b](https://sepolia.etherscan.io/address/0x2F62433e00168af10c70bc39e2fDbEe5DaCA257b)
+  2. Hashi Manager: [0x6C5F4F8a719bF054D6b08E3cCc27a5f208Ec8766](https://sepolia.etherscan.io/address/0x6C5F4F8a719bF054D6b08E3cCc27a5f208Ec8766#writeProxyContract)
+- Chiado addresses
+  1. Home AMB: [0xAF18353BF369897Aab18ec225422F921be9F7eC6](https://gnosis-chiado.blockscout.com/address/0xAF18353BF369897Aab18ec225422F921be9F7eC6?tab=contract)
+  2. Hashi Manager: [0xe505cD6522E9A1c2309a915f83dDCA9addaC0895](https://gnosis-chiado.blockscout.com/address/0xe505cD6522E9A1c2309a915f83dDCA9addaC0895?tab=contract_code)
+  3. AMB BridgeHelper: [0x3fba3D7Ae204a684E4359A3fC211C18EA155cd78](https://gnosis-chiado.blockscout.com/address/0x3fba3D7Ae204a684E4359A3fC211C18EA155cd78)
+
+## Omnibridge
+
+- Sepolia address
+  1. Foreign Omnibridge: [0xc4e06E44B2d1e148beFAa3cB2012A985EFe7032a](https://sepolia.etherscan.io/address/0xc4e06E44B2d1e148beFAa3cB2012A985EFe7032a)
+  2. WETH Router: [0x65E64139f202F89cb6b4bFc140bf01Cda1886465](https://sepolia.etherscan.io/address/0x65E64139f202F89cb6b4bFc140bf01Cda1886465#code)
+- Chiado address
+  1. Home Omnibridge: [0xB866dC5321Ca41a22938A7afD5Bc3c5069975874](https://gnosis-chiado.blockscout.com/address/0xB866dC5321Ca41a22938A7afD5Bc3c5069975874?tab=write_proxy)
+
+## xDAI
+
+- Sepolia addresses
+  1. Foreign xDAI: [0x97589968FA7ef153af44C6F5d0Fb9AcaEA97AC94](https://sepolia.etherscan.io/address/0x97589968FA7ef153af44C6F5d0Fb9AcaEA97AC94)
+  2. Hashi Manager: [0x90d3c0c9BCb317E80A459B0126257665186E59fa](https://sepolia.etherscan.io/address/0x90d3c0c9bcb317e80a459b0126257665186e59fa#code)
+- Chiado addresses
+  1. Home xDAI: [0x867696eA1cfA243aB909797022D0A0C99BdACcF1](https://gnosis-chiado.blockscout.com/address/0x867696eA1cfA243aB909797022D0A0C99BdACcF1?tab=contract)
+  2. Hashi Manager: [0x5b745C021ef62f90862a812EB6763f5758e51eE2](https://gnosis-chiado.blockscout.com/address/0x5b745C021ef62f90862a812EB6763f5758e51eE2?tab=contract)
+  3. xDAI Bridge Helper: [0xA7bE47d1111baFDb2f0E9ce8D6431508aC2fd98e](https://gnosis-chiado.blockscout.com/address/0xA7bE47d1111baFDb2f0E9ce8D6431508aC2fd98e#code)
+
+## Reference
+
+1. AMB contracts: https://github.com/crosschain-alliance/tokenbridge-contracts/tree/feat/hashi-integration-amb
+2. xDAI bridge contracts: https://github.com/crosschain-alliance/tokenbridge-contracts/tree/feat/hashi-integration-xdai-bridge
+3. Test: https://github.com/crosschain-alliance/tokenbridge-contracts-migration-tests
+4. Audits: https://crosschain-alliance.gitbook.io/hashi/v0.2/audit-report#gnosis-bridge-hashi-integration
+5. Hashi: https://crosschain-alliance.gitbook.io/hashi/v0.2/introduction

docs/bridges/Legacy Bridges UI/using-xdai-bridge/troubleshooting.md

@@ -29,7 +29,7 @@ If you are using OmniBridge for other ERC20 tokens (not xDai to Dai) please see
 
 ## Bridge UI is Offline or in Maintenance Mode
 
-We are doing some periodic maintenance and optimization on the Bridge and are now putting the UI into maintenance mode during these times to avoid additional confusion and/or delayed transactions for users. If you started a transaction but it did not complete because of maintenance mode, be assured that funds are safe and will be available once maintenance is complete. If you have questions or concerns during maintenance, please contact us in [Discord channel](https://discord.gg/gnosischain) for up-to-date information.
+We are doing some periodic maintenance and optimization on the Bridge and are now putting the UI into maintenance mode during these times to avoid additional confusion and/or delayed transactions for users. If you started a transaction but it did not complete because of maintenance mode, be assured that funds are safe and will be available once maintenance is complete. If you have questions or concerns during maintenance, please contact us in [Discord channel](https://discord.gg/gnosis) for up-to-date information.
 
 ## I Only See Bridging in 1 Direction
 

docs/faq/Node FAQs/changingwc.md

@@ -3,7 +3,7 @@ title: Changing Withdrawal Credential
 ---
 
 :::info
-**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosischain) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
+**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosis) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
 :::
 
 :::info

docs/faq/Node FAQs/depositWithdrawalReward.md

@@ -3,7 +3,7 @@ title: Deposit, Withdrawals, and Rewards
 ---
 
 :::info
-**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosischain) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
+**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosis) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
 :::
 
 :::info

docs/faq/Node FAQs/monitoring.md

@@ -3,7 +3,7 @@ title: Monitoring and Alerts
 ---
 
 :::info
-**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosischain) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
+**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosis) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
 :::
 
 :::info

docs/faq/Node FAQs/offlineAndSyncIssue.md

@@ -3,7 +3,7 @@ title: Offline and Sync Issue
 ---
 
 :::info
-**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosischain) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
+**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosis) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
 :::
 
 :::info

docs/faq/Node FAQs/staking.md

@@ -3,7 +3,7 @@ title: Staking and Liquid Staking
 ---
 
 :::info
-**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosischain) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
+**Find this document incomplete? Visit our [Discord channel](https://discord.gg/gnosis) or contact us via [Validator Request form](https://tally.so/r/3y4V1W)!** 
 :::
 
 :::info

docs/node/Node Tools/eth-docker.md

@@ -1,18 +1,18 @@
 ---
-title: eth-docker
+title: Eth-docker
 ---
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# eth-docker
+# Eth-docker
 
-[eth-docker](https://eth-docker.net/) is a docker automation project for Ethereum consensus and execution clients. It aims to make running a Ethereum staking full node simpler than setting everything up manually, while allowing the user choice when it comes to the exact client mix they wish to run.
+[Eth-docker](https://eth-docker.net/) is a docker automation project for Ethereum consensus and execution clients. It aims to make running a Ethereum staking full node simpler than setting everything up manually, while allowing the user choice when it comes to the exact client mix they wish to run.
 
-eth-docker allows user to set up Gnosis clients by answering simple dialog-based questions on terminal.
+Eth-docker allows user to set up Gnosis clients by answering simple dialog-based questions on terminal.
 
 ## References
-1. eth-docker Docs: https://eth-docker.net/
+1. Eth-docker Docs: https://eth-docker.net/
 2. Github: https://github.com/eth-educators/eth-docker
 
 

docs/node/Node Tools/swarm/README.md

@@ -0,0 +1,8 @@
+---
+description: Swarm is a peer-to-peer network of Bee nodes that collectively provide censorship resistant decentralised storage and communication services.
+keywords: [storage, data storage, decentralized storage, swarm]
+---
+
+# Swarm
+
+Swarm is a peer-to-peer network of Bee nodes that collectively provide censorship resistant decentralised storage and communication services. Swarm's mission is to shape the future towards a self-sovereign global society and permissionless open markets by providing scalable base-layer data storage infrastructure for the decentralised internet. Its incentive system is enforced through smart contracts on the Gnosis Chain blockchain and powered by the xBZZ token, making it economically self-sustaining.