IBC and Service Info Bump (#90)

Small changes to formatting and fixing some information for IBC and services info.
astriaorg · Oct 31, 2024 · edc230d · edc230d
1 parent 7a7b79d
commit edc230d
Show file tree

Hide file tree

Showing 37 changed files with 961 additions and 523 deletions.
diff --git a/docs/bridging/bridge-ui.md b/docs/bridging/bridge-ui.md
@@ -13,7 +13,7 @@ Astria is an IBC chain and is connected to Celestia, Noble, Osmosis, and Stride.
 > [!IMPORTANT]
 > The Astria Bridge UI is the recommended method for bridging to Astria.
 >
-> Visit the Astria Bridging UI <a :href="link" target="_blank"
+> Visit the Astria Bridging UI <a :href="bridge.mainnet.bridging.ui_link" target="_blank"
 > rel="noopenernoreferrer">here</a>.
 
 ## Navigate to the Bridge UI for your Desired Network
@@ -33,7 +33,8 @@ Astria is an IBC chain and is connected to Celestia, Noble, Osmosis, and Stride.
 Osmosis, and Stride as well as the Flame EVM.
 
 Any [EIP-6963](https://eips.ethereum.org/EIPS/eip-6963) compatible
-wallet should work with Flame, we have tested [Keplr](https://www.keplr.app/), [Metamask](https://metamask.io/) and [Coinbase
+wallet should work with Flame, we have tested [Keplr](https://www.keplr.app/),
+[Metamask](https:/metamask.io/) and [Coinbase
 Wallet](https://www.coinbase.com/wallet).
 
 ## Bridge to Flame

diff --git a/docs/bridging/cli-bridging-overview.md b/docs/bridging/cli-bridging-overview.md
@@ -20,7 +20,7 @@ Manual bridging via the command line is available for power users.
 
 ## IBC Connections
 
-### Mainnet
+### Mainnet - [`astria`](../networks/mainnet-alpha.md)
 
 | Connected Network | Channel | Astria Channel |
 |---|---|---|
@@ -29,7 +29,7 @@ Manual bridging via the command line is available for power users.
 | Osmosis | `channel-85486` | `channel-2` |
 | Stride | `channel-285` | `channel-3` |
 
-### Testnet (dawn-1)
+### Testnet - [`dawn-1`](../networks/testnet.md)
 
 | Connected Network | Channel | Astria Dawn Channel |
 |---|---|---|
@@ -38,7 +38,7 @@ Manual bridging via the command line is available for power users.
 | Stride | `channel-53` | `channel-2` |
 | Osmosis | `channel-9186` | `channel-3` |
 
-### Devnet (dusk-11)
+### Devnet - [`dusk-11`](../networks/devnet.md)
 
 | Connected Network | Channel | Astria Dusk Channel |
 |---|---|---|
@@ -74,14 +74,14 @@ Build the `nobled` cli from source:
 
 <!--@include: ../components/_install-nobled.md-->
 
-Build the `strided` cli from source:
-
-<!--@include: ../components/_install-strided.md-->
-
 Build the `osmosisd` cli from source:
 
 <!--@include: ../components/_install-osmosisd.md-->
 
+Build the `strided` cli from source:
+
+<!--@include: ../components/_install-strided.md-->
+
 ## Creating Accounts
 
 You will need an account for all networks you are interacting with.

diff --git a/docs/bridging/devnet/bridge-to-astria-devnet.md b/docs/bridging/devnet/bridge-to-astria-devnet.md
@@ -19,30 +19,22 @@ export NOBLE_ADDRESS="<your-noble-address>"
 
 ## Bridge to Astria
 
-### From Celestia
-
-```bash
-celestia-appd tx ibc-transfer transfer transfer channel-159 $ASTRIA_ADDRESS 1000000utia --fees=420utia --from $CELESTIA_KEY_NAME  --node=https://rpc-mocha.pops.one:443 --chain-id mocha-4
-```
-
-### From Noble
-
-```bash
-nobled tx ibc-transfer transfer transfer channel-231 $ASTRIA_ADDRESS 1000000uusdc --from $NOBLE_KEY_NAME --node https://noble-testnet-rpc.polkachu.com:443 --chain-id grand-1
-```
+<!--@include: ../../components/_bridge-to-astria-devnet.md-->
 
 ## Check Your Balances on Astria
 
 ```bash
 astria-cli sequencer balance get $ASTRIA_ADDRESS --sequencer-url https://rpc.sequencer.dusk-11.devnet.astria.org/
 ```
 
-### View Transactions on [Mintscan](https://www.mintscan.io/)
+## View Transactions on [Mintscan](https://www.mintscan.io/)
+
+You can view your transactions by visiting the following:
+
+- `https://www.mintscan.io/celestia-testnet/address/<your-celestia-address>`
+- `https://www.mintscan.io/noble-testnet/address/<your-noble-address>`
 
-You can view your transactions by visiting
-`https://www.mintscan.io/noble-testnet/address/<your-celestia-address>` or
-`https://www.mintscan.io/noble-testnet/address/<your-noble-address>`. You can
-also go directly to [Mintscan](https://www.mintscan.io/) and search for the
-`txhash` that is returned after sending your transaction, but it is recommended
-to view your address transaction history as this will show if an acknowledgement
-for your transfer was received.
+You can also go directly to [Mintscan](https://www.mintscan.io/) and search for
+the `txhash` that is returned after sending your transaction, but it is
+recommended to view your address transaction history as this will show if an
+acknowledgement for your transfer was received.
diff --git a/docs/bridging/devnet/bridge-to-flame-devnet.md b/docs/bridging/devnet/bridge-to-flame-devnet.md
@@ -2,7 +2,7 @@
 
 Bridging commands from Celestia and Noble testnets to the Astria `dusk` devnet.
 
-You will need the `astria-cli`, `celestia-appd`, and `nobled` installed. Follow
+You will need the `astria-cli` and `nobled` installed. Follow
 the install steps [here](./overview.md#bridging-dependencies).
 
 You can export the following to make the commands below easily copy and
@@ -11,82 +11,45 @@ pastable.
 ```bash
 export ASTRIA_ADDRESS="<your-astria-address>"
 export PRIV_KEY="<your-astria-address-private-key>"
-export CELESTIA_KEY_NAME="<name-of-your-celestia-key>"
-export CELESTIA_ADDRESS="<your-celestia-address>"
 export NOBLE_KEY_NAME="<name-of-your-noble-key>"
 export NOBLE_ADDRESS="<your-noble-address>"
 export FLAME_ADDRESS="<your-flame-address>"
 ```
 
 ## Bridge to Flame on `dusk` Devnet
 
-### From Celestia
-
 ::: tip
 There is no $TIA `BridgeLockAccount` configured for `dusk-11`.
 :::
 
-### From Noble
+### Via IBC
 
-```bash
-nobled tx ibc-transfer transfer \
-    transfer \
-    channel-231 \
-    astria12saluecm8dd7hkutk83eavkl2p70lf5w7txezg \
-    "100000uusdc" \
-    --memo="{\"rollupDepositAddress\":\"$FLAME_ADDRESS\"}" \
-    --chain-id="grand-1" \
-    --from="grand-test-1" \
-    --node=https://noble-testnet-rpc.polkachu.com:443
-    --packet-timeout-height 0-0
-```
+<!--@include: ../../components/_bridge-to-flame-via-ibc-devnet.md-->
 
-### nRIA from Astria
+### Direct from Astria
 
-```bash
-astria-cli sequencer bridge-lock astria1yqdjnnmrp7w5ygwj0dkldsgzjhv5vcakp7yeu9 \
-    --amount 10000 \
-    --destination-chain-address $FLAME_ADDRESS \
-    --private-key $PRIV_KEY \
-    --sequencer.chain-id astria-dusk-11 \
-    --sequencer-url https://rpc.sequencer.dusk-11.devnet.astria.org \
-    --fee-asset=nria --asset=nria
-```
-
-### USDC from Astria
-
-```bash
-astria-cli sequencer bridge-lock astria12saluecm8dd7hkutk83eavkl2p70lf5w7txezg \
-    --amount 10000 \
-    --destination-chain-address $FLAME_ADDRESS \
-    --private-key $PRIV_KEY \
-    --sequencer.chain-id astria-dusk-11 \
-    --sequencer-url https://rpc.sequencer.dusk-11.devnet.astria.org \
-    --fee-asset=nria --asset=transfer/channel-2/uusdc
-```
+<!--@include: ../../components/_bridge-to-flame-via-astria-devnet.md-->
 
 ## Check Your Balances on Flame
 
-### TIA
+<!--@include: ../../components/_check-flame-balances-devnet.md-->
 
-```bash
-cast balance $FLAME_ADDRESS --rpc-url https://rpc.flame.dusk-11.devnet.astria.org
-
-```
+## View Your Transactions on Flame
 
-### USDC
+Open the [Flame `dusk` Block Explorer](https://explorer.evm.dusk-11.devnet.astria.org)
+and search for your Flame address to see your transactions.
 
-<!-- TODO: verify correct address -->
-```bash
-cast balance $FLAME_ADDRESS --erc20 0x6e18cE6Ec3Fc7b8E3EcFca4fA35e25F3f6FA879a --rpc-url https://rpc.flame.dusk-11.devnet.astria.org
+On the account page you can view your TIA balance directly. To view your USDC
+balance, select the `Tokens` tab.
 
-```
+## View Transactions on [Mintscan](https://www.mintscan.io/)
 
-## View Your Transactions
+If you bridge from an IBC chain, you can view your transactions by visiting
+the following:
 
-Open the [Flame Block
-Explorer](https://explorer.flame.dusk-11.devnet.astria.org) and search for your
-Flame address to see your transactions.
+- `https://www.mintscan.io/noble-testnet/address/<your-noble-address>`
 
-On the account page you can view your TIA balance directly. To view your USDC
-balance, select the `Tokens` tab.
+You can also go directly to [Mintscan](https://www.mintscan.io/) and search for
+the `txhash` that is returned after sending your transaction, but it is
+recommended to view your address transaction history as this will show if an
+acknowledgement for your transfer was received.
diff --git a/docs/bridging/devnet/withdraw-from-astria-devnet.md b/docs/bridging/devnet/withdraw-from-astria-devnet.md
@@ -21,39 +21,27 @@ export NOBLE_ADDRESS="<your-noble-address>"
 
 ## Withdraw from Astria
 
-### Astria to Celestia
+<!--@include: ../../components/_withdraw-from-astria-devnet.md-->
 
-```bash
-astria-cli sequencer ics20-withdrawal --amount 1000 --destination-chain-address=$CELESTIA_ADDRESS --source-channel channel-0 --private-key=$PRIV_KEY --sequencer-url=https://rpc.sequencer.dusk-11.devnet.astria.org --sequencer.chain-id astria-dusk-11 --asset transfer/channel-0/utia --fee-asset nria
-```
-
-### Astria to Noble
-
-```bash
-astria-cli sequencer ics20-withdrawal --amount 1000 --destination-chain-address=$NOBLE_ADDRESS --source-channel channel-2 --private-key=$PRIV_KEY --sequencer-url=https://rpc.sequencer.dusk-11.devnet.astria.org --sequencer.chain-id astria-dusk-11 --asset transfer/channel-2/uusdc --fee-asset nria
-```
-
-### View Transactions on [Astrotrek](https://dusk.astrotrek.io/)
+## View Transactions on [Astrotrek](https://dusk.astrotrek.io/)
 
 Go to `https://dusk.astrotrek.io/account/<your-astria-account>?tab=transactions`
 to see the withdrawal transactions. You can also search the returned transaction
 hash directly in [Astrotrek](https://dusk.astrotrek.io/).
 
-You will also see the received transactions on
-[Mintscan](#view-transactions-on-mintscan).
+## View Transactions on [Mintscan](https://www.mintscan.io/)
 
-## Check your Balances on Celestia and Noble
+If you bridge out to an IBC chain, you can view your transactions by visiting
+the following:
 
-### Celestia Balance
+- `https://www.mintscan.io/celestia-testnet/address/<your-celestia-address>`
+- `https://www.mintscan.io/noble-testnet/address/<your-noble-address>`
 
-```bash
-celestia-appd query bank balances $CELESTIA_ADDRESS --node=https://rpc-mocha.pops.one:443 --chain-id mocha-4
-
-```
+You can also go directly to [Mintscan](https://www.mintscan.io/) and search for
+the `txhash` that is returned after sending your transaction, but it is
+recommended to view your address transaction history as this will show if an
+acknowledgement for your transfer was received.
 
-### Noble Balance
+## Check your Devnet Balances
 
-```bash
-nobled query bank balances $NOBLE_ADDRESS --node https://noble-testnet-rpc.polkachu.com:443
-
-```
+<!--@include: ../../components/_check-devnet-balances.md-->
diff --git a/docs/bridging/devnet/withdraw-from-flame-devnet.md b/docs/bridging/devnet/withdraw-from-flame-devnet.md
@@ -61,66 +61,36 @@ export RPC_URL="https://rpc.evm.dusk-11.devnet.astria.org/"
 
 ## To Astria
 
-### Withdraw TIA
-
 ::: info
 Make sure the `ORIGIN_DESTINATION_CHAIN_ADDRESS` in your `.env` file is updated
-to be your Celestia address.
+to be the address of the desired asset you are withdrawing:
+
+- Set to your **Noble** address to withdraw `USDC`
 :::
 
+Then run the following command:
+
 ```bash
 forge script script/AstriaWithdrawer.s.sol:AstriaWithdrawerScript \
    --rpc-url $RPC_URL --broadcast --sig "withdrawToSequencer()" -vvvv
 ```
 
-### Withdraw USDC
+## To IBC Chain
 
 ::: info
 Make sure the `ORIGIN_DESTINATION_CHAIN_ADDRESS` in your `.env` file is updated
-to be your Noble address.
-:::
-
-```bash
-forge script script/AstriaBridgeableERC20.s.sol:AstriaBridgeableERC20Script \
-   --rpc-url $RPC_URL --broadcast --sig "withdrawToSequencer()" -vvvv
-```
+to be the address of the desired asset you are withdrawing:
 
-## To Celestia
-
-::: info
-Make sure the `ORIGIN_DESTINATION_CHAIN_ADDRESS` in your `.env` file is updated
-to be your Celestia address.
+- Set to your **Noble** address to withdraw `USDC`
 :::
 
-```bash
-forge script script/AstriaWithdrawer.s.sol:AstriaWithdrawerScript \
-   --rpc-url $RPC_URL --broadcast --sig "withdrawToIbcChain()" -vvvv
-```
-
-## To Noble
-
-::: info
-Make sure the `ORIGIN_DESTINATION_CHAIN_ADDRESS` in your `.env` file is updated
-to be your Noble address.
-:::
+Then run the following command:
 
 ```bash
-forge script script/AstriaBridgeableERC20.s.sol:AstriaBridgeableERC20Script \
+forge script script/AstriaWithdrawer.s.sol:AstriaWithdrawerScript \
    --rpc-url $RPC_URL --broadcast --sig "withdrawToIbcChain()" -vvvv
 ```
 
-## Check your Balances on Celestia and Noble
+## Check your Testnet Balances
 
-### Celestia Balance
-
-```bash
-celestia-appd query bank balances $CELESTIA_ADDRESS --node=https://rpc-mocha.pops.one:443 --chain-id mocha-4
-
-```
-
-### Noble Balance
-
-```bash
-nobled query bank balances $NOBLE_ADDRESS --node https://noble-testnet-rpc.polkachu.com:443
-
-```
+<!--@include: ../../components/_check-devnet-balances.md-->
diff --git a/docs/bridging/mainnet-alpha/bridge-to-astria-mainnet-alpha.md b/docs/bridging/mainnet-alpha/bridge-to-astria-mainnet-alpha.md
@@ -1,9 +1,11 @@
 # Bridging to the Astria Mainnet Alpha
 
-Bridging commands from Celestia and Noble Mainnets to the Astria Mainnet.
+Bridging commands from Celestia, Noble, Osmosis, and Stride Mainnets to the
+Astria Mainnet Alpha.
 
-You will need the `astria-cli`, `celestia-appd`, and `nobled` installed. Follow
-the install steps [here](../overview.md#bridging-dependencies).
+You will need the `astria-cli`, `celestia-appd`, `nobled`, `osmosisd`, and
+`strided` installed. Follow the install steps
+[here](../overview.md#bridging-dependencies).
 
 You can export the following to make the commands below easily copy and
 pastable.
@@ -31,12 +33,13 @@ export STRIDE_ADDRESS="<your-stride-address>"
 astria-cli sequencer balance get $ASTRIA_ADDRESS --sequencer-url https://rpc.astria.org/
 ```
 
-### View Transactions on [Mintscan](https://www.mintscan.io/)
+## View Transactions on [Mintscan](https://www.mintscan.io/)
 
 You can view your transactions by visiting the following:
 
 - `https://www.mintscan.io/celestia/address/<your-celestia-address>`
 - `https://www.mintscan.io/noble/address/<your-noble-address>`
+- `https://www.mintscan.io/osmosis/address/<your-osmosis-address>`
 - `https://www.mintscan.io/stride/address/<your-stride-address>`
 
 You can also go directly to [Mintscan](https://www.mintscan.io/) and search for