From 3530b0796bb1bea0a9377d01e9506f8f1356c19c Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Fri, 7 Mar 2025 12:21:16 +0300
Subject: [PATCH 01/10] Solana withdraw and call

---
 src/pages/developers/tutorials/solana.mdx | 69 +++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/pages/developers/tutorials/solana.mdx

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
new file mode 100644
index 000000000..8230c75c1
--- /dev/null
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -0,0 +1,69 @@
+```bash
+git clone https://github.com/zeta-chain/example-contracts
+cd example-contracts/examples/call
+yarn
+```
+
+```bash
+npx hardhat localnet
+```
+
+```bash
+npx hardhat compile --force
+npx hardhat deploy --name Universal --network localhost --gateway 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
+```
+
+```
+🚀 Successfully deployed "Universal" contract on localhost.
+📜 Contract address: 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7
+```
+
+## Deposit and Call from Solana
+
+```
+npx hardhat localnet:solana-deposit \
+  --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
+  --amount 0.1
+```
+
+```
+npx hardhat localnet:solana-deposit-and-call \
+  --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
+  --amount 0.1 \
+  --types '["string"]' hello
+```
+
+## Withdraw from ZetaChain to Solana
+
+```
+npx hardhat zetachain-withdraw
+  --gateway-zeta-chain 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 \
+  --receiver DrexsvCMH9WWjgnjVbx1iFf3YZcKadupFmxnZLfSyotd \
+  --network localhost \
+  --zrc20 0xd97B1de3619ed2c6BEb3860147E30cA8A7dC9891 \
+  --amount 0.1
+```
+
+## Withdraw and Call a Program on Solana
+
+```bash
+cd solana && anchor build && npx ts-node setup/main.ts && cd -
+```
+
+```
+Connected program deployment output: Program Id: 9BjVGjn28E58LgSi547JYEpqpgRoo1TErkbyXiRSNDQy
+```
+
+```
+ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "sol" "$USDC_SPL")
+```
+
+```
+npx hardhat zetachain-withdraw-and-call \
+  --receiver 9BjVGjn28E58LgSi547JYEpqpgRoo1TErkbyXiRSNDQy \
+  --gateway-zeta-chain 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 \
+  --zrc20 0x48f80608B672DC30DC7e3dbBd0343c5F02C738Eb \
+  --amount 0.01 \
+  --network localhost \
+  --types '["bytes"]' "$ENCODED_ACCOUNTS_AND_DATA"
+```

From c7315df15da22b6334370e779592a0de360ca541 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Fri, 7 Mar 2025 15:38:09 +0300
Subject: [PATCH 02/10] update solana doc

---
 src/pages/developers/tutorials/solana.mdx | 107 +++++++++++++++++++++-
 1 file changed, 104 insertions(+), 3 deletions(-)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index 8230c75c1..9220608b5 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -1,41 +1,89 @@
+# ZetaChain Example Contracts
+
+ZetaChain supports bridging tokens from Solana, including both SOL and SPL-20
+tokens. You can deposit tokens from Solana to ZetaChain, call universal
+contracts deployed on ZetaChain, and withdraw tokens back to Solana — even
+calling Solana programs as part of the withdraw process.
+
+Below are instructions to set up the local development environment and try out
+each of these workflows.
+
+## Clone Example and Install Dependencies
+
 ```bash
 git clone https://github.com/zeta-chain/example-contracts
 cd example-contracts/examples/call
 yarn
 ```
 
+## Run Localnet
+
+This command brings up the local development environment with ZetaChain and
+Solana:
+
 ```bash
 npx hardhat localnet
 ```
 
+Leave this running in one terminal window.
+
+## Compile and Deploy an Example Universal Contract
+
+Open a new terminal window, then compile and deploy the contract to your
+localnet:
+
 ```bash
 npx hardhat compile --force
 npx hardhat deploy --name Universal --network localhost --gateway 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
 ```
 
+You should see output similar to the following:
+
 ```
 🚀 Successfully deployed "Universal" contract on localhost.
 📜 Contract address: 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7
 ```
 
+Keep track of the contract address for later (in this example,
+`0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7`).
+
+---
+
 ## Deposit and Call from Solana
 
-```
+Solana tokens can be deposited to ZetaChain. Below are two ways to do that:
+
+- Deposit Only: Sends tokens from Solana to ZetaChain.
+- Deposit and Call: Sends tokens from Solana to ZetaChain and immediately calls
+  the deployed universal contract on ZetaChain.
+
+### Deposit
+
+```bash
 npx hardhat localnet:solana-deposit \
   --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
   --amount 0.1
 ```
 
-```
+- `--receiver`: The address of a universal contract on ZetaChain that will
+  receive the tokens.
+- `--amount`: The amount of SOL tokens to deposit.
+
+### Deposit and Call
+
+```bash
 npx hardhat localnet:solana-deposit-and-call \
   --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
   --amount 0.1 \
   --types '["string"]' hello
 ```
 
+This command deposits 0.1 tokens to the universal contract, then calls the
+contract function with arguments of type `string` and value `"hello"`.
+
 ## Withdraw from ZetaChain to Solana
 
-```
+```bash
 npx hardhat zetachain-withdraw
   --gateway-zeta-chain 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 \
   --receiver DrexsvCMH9WWjgnjVbx1iFf3YZcKadupFmxnZLfSyotd \
@@ -44,21 +92,69 @@ npx hardhat zetachain-withdraw
   --amount 0.1
 ```
 
+- `--gateway-zeta-chain`: Address of the ZetaChain gateway.
+- `--receiver`: A Solana wallet address to receive the withdrawn tokens.
+- `--zrc20`: The ZetaChain representation of the token you want to withdraw
+  (ZRC-20 address).
+- `--amount`: The amount to withdraw.
+
 ## Withdraw and Call a Program on Solana
 
+> **Note:** Currently, withdraw-and-call support is **only** available on
+> localnet. Support for testnet and mainnet is coming soon.
+
+### Build and Set Up the Example Solana Program
+
 ```bash
 cd solana && anchor build && npx ts-node setup/main.ts && cd -
 ```
 
+After running this, you should see output indicating that the program was
+successfully deployed, such as:
+
 ```
 Connected program deployment output: Program Id: 9BjVGjn28E58LgSi547JYEpqpgRoo1TErkbyXiRSNDQy
 ```
 
+### Withdraw SOL and Call the Solana Program
+
+Pass `sol` to encode your accounts/data to pass to your Solana program:
+
 ```
+USDC_SPL=FWoDc17eRYqQUYG6RwYgC7ZDBtKNaUvvNqwRYi1rD9US
 ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "sol" "$USDC_SPL")
 ```
 
+Use ZRC-20 SOL address as `--zrc20`:
+
+```bash
+npx hardhat zetachain-withdraw-and-call \
+  --receiver 9BjVGjn28E58LgSi547JYEpqpgRoo1TErkbyXiRSNDQy \
+  --gateway-zeta-chain 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 \
+  --zrc20 0xd97B1de3619ed2c6BEb3860147E30cA8A7dC9891 \
+  --amount 0.01 \
+  --network localhost \
+  --types '["bytes"]' "$ENCODED_ACCOUNTS_AND_DATA"
+```
+
+- `--receiver`: The Solana program ID you want to call.
+- `--types '["bytes"]'`: Specifies that the contract call argument is a bytes
+  array (the encoded Solana call data).
+- `"$ENCODED_ACCOUNTS_AND_DATA"`: The encoded Solana program call arguments we
+  generated in the previous step.
+
+### Withdraw SPL-20 and Call the Solana Program
+
+Pass `spl` to encode your accounts/data to pass to your Solana program:
+
+```
+USDC_SPL=FWoDc17eRYqQUYG6RwYgC7ZDBtKNaUvvNqwRYi1rD9US
+ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "spl" "$USDC_SPL")
 ```
+
+Use ZRC-20 USDC address as `--zrc20`:
+
+```bash
 npx hardhat zetachain-withdraw-and-call \
   --receiver 9BjVGjn28E58LgSi547JYEpqpgRoo1TErkbyXiRSNDQy \
   --gateway-zeta-chain 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 \
@@ -67,3 +163,8 @@ npx hardhat zetachain-withdraw-and-call \
   --network localhost \
   --types '["bytes"]' "$ENCODED_ACCOUNTS_AND_DATA"
 ```
+
+In this tutorial you’ve learned how to deploy a universal contract on ZetaChain,
+deposit SOL and SPL-20 tokens from Solana, call contracts during deposits,
+withdraw assets back to Solana, and even trigger Solana programs upon
+withdrawal.

From 8fef22a139d8c3c2a7ed24f79c1719f84ed6e743 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Fri, 7 Mar 2025 15:40:57 +0300
Subject: [PATCH 03/10] preresquisite

---
 src/pages/developers/tutorials/solana.mdx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index 9220608b5..27e7cad66 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -8,6 +8,10 @@ calling Solana programs as part of the withdraw process.
 Below are instructions to set up the local development environment and try out
 each of these workflows.
 
+## Prerequisites
+
+- [`solana` CLI](https://solana.com/docs/intro/installation)
+
 ## Clone Example and Install Dependencies
 
 ```bash
@@ -84,7 +88,7 @@ contract function with arguments of type `string` and value `"hello"`.
 ## Withdraw from ZetaChain to Solana
 
 ```bash
-npx hardhat zetachain-withdraw
+npx hardhat zetachain-withdraw \
   --gateway-zeta-chain 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 \
   --receiver DrexsvCMH9WWjgnjVbx1iFf3YZcKadupFmxnZLfSyotd \
   --network localhost \

From 079d10213eb63612226b89e638c12d210da300ca Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Fri, 7 Mar 2025 15:54:10 +0300
Subject: [PATCH 04/10] add links

---
 src/pages/developers/chains/solana.mdx    |  3 +++
 src/pages/developers/tutorials/_meta.json | 10 +++++-----
 src/pages/developers/tutorials/solana.mdx |  5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/developers/chains/solana.mdx b/src/pages/developers/chains/solana.mdx
index 8475c573e..3cdfe0a19 100644
--- a/src/pages/developers/chains/solana.mdx
+++ b/src/pages/developers/chains/solana.mdx
@@ -133,3 +133,6 @@ The Solana Gateway provides a seamless way to interact with universal
 applications on ZetaChain from Solana. By using the Gateway instruction, you can
 deposit SOL and make cross-chain contract calls to universal applications on
 ZetaChain.
+
+To learn more about using the Solana Gateway in practice to deposit to and call
+universal apps, check out [the Solana tutorial](/developers/tutorials/solana).
diff --git a/src/pages/developers/tutorials/_meta.json b/src/pages/developers/tutorials/_meta.json
index 6d64d4828..5a0fea370 100644
--- a/src/pages/developers/tutorials/_meta.json
+++ b/src/pages/developers/tutorials/_meta.json
@@ -14,16 +14,16 @@
     "readTime": "30 min",
     "description": "Learn the fundamentals of message passing and cross-chain contract calls"
   },
+  "solana": {
+    "title": "Solana",
+    "readTime": "60 min",
+    "description": "Deposit assets and call universal apps from Solana, make outgoing calls to Solana"
+  },
   "swap": {
     "title": "Swap",
     "readTime": "30 min",
     "description": "Implement a universal swap app compatible with chains like Ethereum, Solana and Bitcoin"
   },
-  "nft": {
-    "title": "NFT",
-    "readTime": "60 min",
-    "description": "Mint a universal NFT, which can be transferred between connected chains"
-  },
   "localnet": {
     "title": "Localnet Setup",
     "readTime": "30 min",
diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index 27e7cad66..1ae576d11 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -1,4 +1,4 @@
-# ZetaChain Example Contracts
+# Universal Apps and Solana
 
 ZetaChain supports bridging tokens from Solana, including both SOL and SPL-20
 tokens. You can deposit tokens from Solana to ZetaChain, call universal
@@ -8,6 +8,9 @@ calling Solana programs as part of the withdraw process.
 Below are instructions to set up the local development environment and try out
 each of these workflows.
 
+Interactions with universal apps from Solana are handled by the Solana Gateway
+program, [learn more about it in the docs](/developers/chains/solana).
+
 ## Prerequisites
 
 - [`solana` CLI](https://solana.com/docs/intro/installation)

From 5040af56348decf156a5a39f53fda1a99d60cf80 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Fri, 7 Mar 2025 16:06:40 +0300
Subject: [PATCH 05/10] update

---
 src/pages/developers/tutorials/solana.mdx | 36 +++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index 1ae576d11..d5b7836e1 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -112,8 +112,15 @@ npx hardhat zetachain-withdraw \
 
 ### Build and Set Up the Example Solana Program
 
+Set the SPL-20 USDC address. You can find this address in a table in the output
+of `localnet`:
+
+```bash
+USDC_SPL=3Kx5SY7SwzdUZSorLVSpPgxBL8DZFiu8mg4FWduu2tQp
+```
+
 ```bash
-cd solana && anchor build && npx ts-node setup/main.ts && cd -
+cd solana && anchor build && npx ts-node setup/main.ts "$USDC_SPL" && cd -
 ```
 
 After running this, you should see output indicating that the program was
@@ -125,14 +132,8 @@ Connected program deployment output: Program Id: 9BjVGjn28E58LgSi547JYEpqpgRoo1T
 
 ### Withdraw SOL and Call the Solana Program
 
-Pass `sol` to encode your accounts/data to pass to your Solana program:
-
-```
-USDC_SPL=FWoDc17eRYqQUYG6RwYgC7ZDBtKNaUvvNqwRYi1rD9US
-ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "sol" "$USDC_SPL")
-```
-
-Use ZRC-20 SOL address as `--zrc20`:
+Make a call to the ZetaChain Gateway to withdraw SOL and call a program on
+Solana:
 
 ```bash
 npx hardhat zetachain-withdraw-and-call \
@@ -141,7 +142,7 @@ npx hardhat zetachain-withdraw-and-call \
   --zrc20 0xd97B1de3619ed2c6BEb3860147E30cA8A7dC9891 \
   --amount 0.01 \
   --network localhost \
-  --types '["bytes"]' "$ENCODED_ACCOUNTS_AND_DATA"
+  --types '["bytes"]' $(npx ts-node solana/setup/encodeCallArgs.ts "sol" "$USDC_SPL")
 ```
 
 - `--receiver`: The Solana program ID you want to call.
@@ -149,17 +150,12 @@ npx hardhat zetachain-withdraw-and-call \
   array (the encoded Solana call data).
 - `"$ENCODED_ACCOUNTS_AND_DATA"`: The encoded Solana program call arguments we
   generated in the previous step.
+- `--zrc20`: ZRC-20 address of SOL on ZetaChain.
 
 ### Withdraw SPL-20 and Call the Solana Program
 
-Pass `spl` to encode your accounts/data to pass to your Solana program:
-
-```
-USDC_SPL=FWoDc17eRYqQUYG6RwYgC7ZDBtKNaUvvNqwRYi1rD9US
-ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "spl" "$USDC_SPL")
-```
-
-Use ZRC-20 USDC address as `--zrc20`:
+Make a call to the ZetaChain Gateway to withdraw ZRC-20 SPL-20 USDC and call a
+program on Solana:
 
 ```bash
 npx hardhat zetachain-withdraw-and-call \
@@ -168,9 +164,11 @@ npx hardhat zetachain-withdraw-and-call \
   --zrc20 0x48f80608B672DC30DC7e3dbBd0343c5F02C738Eb \
   --amount 0.01 \
   --network localhost \
-  --types '["bytes"]' "$ENCODED_ACCOUNTS_AND_DATA"
+  --types '["bytes"]' $(npx ts-node solana/setup/encodeCallArgs.ts "spl" "$USDC_SPL")
 ```
 
+- `--zrc20`: ZRC-20 address of SPL-20 USDC on ZetaChain.
+
 In this tutorial you’ve learned how to deploy a universal contract on ZetaChain,
 deposit SOL and SPL-20 tokens from Solana, call contracts during deposits,
 withdraw assets back to Solana, and even trigger Solana programs upon

From ff388ce5e73024d52c4a2ee4290880a7c1e1ab99 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Fri, 7 Mar 2025 17:34:35 +0300
Subject: [PATCH 06/10] intro

---
 src/pages/developers/tutorials/solana.mdx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index d5b7836e1..20399aea7 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -107,6 +107,20 @@ npx hardhat zetachain-withdraw \
 
 ## Withdraw and Call a Program on Solana
 
+Beyond simply withdrawing tokens from ZetaChain back to Solana, you can also
+execute a Solana program as part of the withdrawal process. This allows for more
+complex interactions, such as triggering on-chain logic immediately upon
+receiving funds. For example, you can withdraw SOL or SPL-20 tokens and call a
+Solana program in a single transaction, enabling use cases like automatic
+staking, swaps, or contract executions.
+
+The `solana` directory contains an example Solana program with an `on_call`
+function, which can be invoked by a universal app on ZetaChain during the
+withdrawal process.
+
+The following steps will guide you through setting up an example Solana program
+and using the ZetaChain Gateway to perform a "withdraw and call".
+
 > **Note:** Currently, withdraw-and-call support is **only** available on
 > localnet. Support for testnet and mainnet is coming soon.
 

From 208d2964d5a082b5c74d040a0cabf917d03071c6 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Tue, 11 Mar 2025 07:41:16 +0300
Subject: [PATCH 07/10] Update solana.mdx

---
 src/pages/developers/tutorials/solana.mdx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index 20399aea7..869ea43de 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -54,8 +54,6 @@ You should see output similar to the following:
 Keep track of the contract address for later (in this example,
 `0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7`).
 
----
-
 ## Deposit and Call from Solana
 
 Solana tokens can be deposited to ZetaChain. Below are two ways to do that:

From 2e02e7c56509e7a09ea8158c0f97e010ec1a2b62 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Tue, 11 Mar 2025 10:04:34 +0300
Subject: [PATCH 08/10] intro

---
 src/pages/developers/tutorials/solana.mdx | 63 ++++++++++++-----------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index 869ea43de..de7c92abd 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -1,21 +1,27 @@
-# Universal Apps and Solana
-
-ZetaChain supports bridging tokens from Solana, including both SOL and SPL-20
-tokens. You can deposit tokens from Solana to ZetaChain, call universal
-contracts deployed on ZetaChain, and withdraw tokens back to Solana — even
-calling Solana programs as part of the withdraw process.
-
-Below are instructions to set up the local development environment and try out
-each of these workflows.
+Building universal applications with ZetaChain and Solana is easy. You can
+deposit SOL and SPL-20 tokens directly from Solana into accounts or smart
+contracts on ZetaChain. Universal contracts on ZetaChain can handle these
+deposits and execute contract calls initiated from the Solana blockchain.
+
+- In this tutorial, you'll:
+- Set up a local development environment using localnet.
+- Deploy a universal contract on ZetaChain.
+- Deposit tokens (SOL and SPL-20) from Solana to ZetaChain.
+- Execute deposit-and-call transactions, depositing tokens and calling a
+  universal app simultaneously.
+- Withdraw tokens back to Solana, optionally calling Solana programs as part of
+  the withdrawal.
 
 Interactions with universal apps from Solana are handled by the Solana Gateway
 program, [learn more about it in the docs](/developers/chains/solana).
 
 ## Prerequisites
 
+Ensure you have installed and configured the following before starting:
+
 - [`solana` CLI](https://solana.com/docs/intro/installation)
 
-## Clone Example and Install Dependencies
+## Clone the Example Project
 
 ```bash
 git clone https://github.com/zeta-chain/example-contracts
@@ -23,7 +29,7 @@ cd example-contracts/examples/call
 yarn
 ```
 
-## Run Localnet
+## Launch Localnet
 
 This command brings up the local development environment with ZetaChain and
 Solana:
@@ -36,15 +42,14 @@ Leave this running in one terminal window.
 
 ## Compile and Deploy an Example Universal Contract
 
-Open a new terminal window, then compile and deploy the contract to your
-localnet:
+In a new terminal window, compile and deploy the universal contract:
 
 ```bash
 npx hardhat compile --force
 npx hardhat deploy --name Universal --network localhost --gateway 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
 ```
 
-You should see output similar to the following:
+You will see a confirmation with your contract address:
 
 ```
 🚀 Successfully deployed "Universal" contract on localhost.
@@ -54,27 +59,23 @@ You should see output similar to the following:
 Keep track of the contract address for later (in this example,
 `0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7`).
 
-## Deposit and Call from Solana
-
-Solana tokens can be deposited to ZetaChain. Below are two ways to do that:
-
-- Deposit Only: Sends tokens from Solana to ZetaChain.
-- Deposit and Call: Sends tokens from Solana to ZetaChain and immediately calls
-  the deployed universal contract on ZetaChain.
+## Deposit
 
-### Deposit
+Deposit SOL tokens from Solana to ZetaChain:
 
-```bash
+```
 npx hardhat localnet:solana-deposit \
   --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
   --amount 0.1
 ```
 
-- `--receiver`: The address of a universal contract on ZetaChain that will
-  receive the tokens.
-- `--amount`: The amount of SOL tokens to deposit.
+--receiver: Universal contract address on ZetaChain.
+
+--amount: Amount of SOL to deposit.
 
-### Deposit and Call
+## Deposit and Call
+
+Deposit tokens and simultaneously call the deployed universal contract:
 
 ```bash
 npx hardhat localnet:solana-deposit-and-call \
@@ -83,10 +84,12 @@ npx hardhat localnet:solana-deposit-and-call \
   --types '["string"]' hello
 ```
 
-This command deposits 0.1 tokens to the universal contract, then calls the
-contract function with arguments of type `string` and value `"hello"`.
+This command deposits tokens and triggers the universal contract function with
+the argument "hello".
+
+## Withdraw Tokens to Solana
 
-## Withdraw from ZetaChain to Solana
+Withdraw tokens from ZetaChain back to Solana:
 
 ```bash
 npx hardhat zetachain-withdraw \

From ad9f287ea509c5b4951f3f7f37b1aceab21a2fc3 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Wed, 12 Mar 2025 15:27:23 +0300
Subject: [PATCH 09/10] remove note

---
 src/pages/developers/tutorials/solana.mdx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/developers/tutorials/solana.mdx b/src/pages/developers/tutorials/solana.mdx
index de7c92abd..4104db48e 100644
--- a/src/pages/developers/tutorials/solana.mdx
+++ b/src/pages/developers/tutorials/solana.mdx
@@ -122,9 +122,6 @@ withdrawal process.
 The following steps will guide you through setting up an example Solana program
 and using the ZetaChain Gateway to perform a "withdraw and call".
 
-> **Note:** Currently, withdraw-and-call support is **only** available on
-> localnet. Support for testnet and mainnet is coming soon.
-
 ### Build and Set Up the Example Solana Program
 
 Set the SPL-20 USDC address. You can find this address in a table in the output

From af7c2c4f6b725cda32b5dc323d57a4ffeda22e50 Mon Sep 17 00:00:00 2001
From: Denis Fadeev <denis@fadeev.org>
Date: Thu, 13 Mar 2025 16:59:58 +0300
Subject: [PATCH 10/10] Deposit and call universal apps from Sui (#564)

---
 src/pages/developers/tutorials/_meta.json |   5 +
 src/pages/developers/tutorials/sui.mdx    | 210 ++++++++++++++++++++++
 2 files changed, 215 insertions(+)
 create mode 100644 src/pages/developers/tutorials/sui.mdx

diff --git a/src/pages/developers/tutorials/_meta.json b/src/pages/developers/tutorials/_meta.json
index 5a0fea370..7def65f30 100644
--- a/src/pages/developers/tutorials/_meta.json
+++ b/src/pages/developers/tutorials/_meta.json
@@ -19,6 +19,11 @@
     "readTime": "60 min",
     "description": "Deposit assets and call universal apps from Solana, make outgoing calls to Solana"
   },
+  "sui": {
+    "title": "Sui",
+    "readTime": "60 min",
+    "description": "Deposit assets and call universal apps from Sui"
+  },
   "swap": {
     "title": "Swap",
     "readTime": "30 min",
diff --git a/src/pages/developers/tutorials/sui.mdx b/src/pages/developers/tutorials/sui.mdx
new file mode 100644
index 000000000..bb6054d77
--- /dev/null
+++ b/src/pages/developers/tutorials/sui.mdx
@@ -0,0 +1,210 @@
+Interacting with ZetaChain universal apps directly from the Sui blockchain is
+straightforward and intuitive. You can deposit SUI tokens to ZetaChain
+addresses—both externally owned accounts (EOAs) and smart contracts. Universal
+apps deployed on ZetaChain can accept these token deposits and handle contract
+calls originating from Sui.
+
+In this tutorial, you'll:
+
+- Set up a local development environment using
+  [localnet](/developers/tutorials/localnet).
+- Deploy a universal contract on ZetaChain.
+- Deposit SUI tokens from Sui to ZetaChain.
+- Execute deposit-and-call to deposit SUI tokens and call a universal app in a
+  single transaction.
+
+By the end, you'll clearly understand how Sui-based applications and contracts
+can integrate seamlessly with the ZetaChain ecosystem.
+
+## Prerequisites
+
+Ensure you have installed and configured the following tools before starting:
+
+- [Sui CLI](https://docs.sui.io/references/cli): Required for starting a local
+  Sui node and interacting with it.
+- [Foundry](https://getfoundry.sh/): Needed for encoding payload data using ABI.
+
+## Clone the Example Project
+
+Begin by cloning the example contracts repository and installing its
+dependencies:
+
+```bash
+git clone https://github.com/zeta-chain/example-contracts
+cd example-contracts/examples/call
+yarn
+```
+
+## Launch Localnet
+
+Start your local development environment, which sets up instances of ZetaChain
+and Sui:
+
+```bash
+npx hardhat localnet
+```
+
+Keep this terminal window open. You should see a table displaying the deployment
+details, including Gateway module and object IDs:
+
+```
+SUI
+┌─────────────────┬────────────────────────────────────────────────────────────────────────────────┐
+│ (index)         │ Values                                                                         │
+├─────────────────┼────────────────────────────────────────────────────────────────────────────────┤
+│ gatewayModuleID │ '0xc478ce1cbbeb090889a0e728af4fd25d80993a653b5f03090dbf77e5a9476bcd'           │
+│ gatewayObjectId │ '0x332483152b600f388b64adb4d98509ded379167df6047c49a564a4ed62f8bb71'           │
+│ userMnemonic    │ 'grape subway rack mean march bubble carry avoid muffin consider thing street' │
+│ userAddress     │ '0x2fec3fafe08d2928a6b8d9a6a77590856c458d984ae090ccbd4177ac13729e65'           │
+└─────────────────┴────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## Deploying a Universal Contract
+
+Open a new terminal window to compile and deploy your Universal Contract:
+
+```bash
+npx hardhat compile --force
+npx hardhat deploy --name Universal --network localhost --gateway 0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
+```
+
+A successful deployment will output:
+
+```
+🚀 Successfully deployed "Universal" contract on localhost.
+📜 Contract address: 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7
+```
+
+## Deposit to ZetaChain
+
+To deposit tokens from your local Sui Gateway contract to ZetaChain, use:
+
+```
+npx hardhat localnet:sui-deposit \
+  --mnemonic "grape subway rack mean march bubble carry avoid muffin consider thing street" \
+  --gateway 0x332483152b600f388b64adb4d98509ded379167df6047c49a564a4ed62f8bb71 \
+  --module 0xc478ce1cbbeb090889a0e728af4fd25d80993a653b5f03090dbf77e5a9476bcd \
+  --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
+  --amount 100000000
+```
+
+In this example, a client makes a call on the Sui blockchain to the local
+Gateway contract. The local development environment (Localnet) observes this
+transaction similarly to how ZetaChain would in a live scenario, and as a
+result, deposits ZRC-20 SUI tokens to the specified receiver address on
+ZetaChain.
+
+## Deposit and Call
+
+Execute a deposit and simultaneously make a function call to a universal
+contract on ZetaChain:
+
+```
+npx hardhat localnet:sui-deposit-and-call \
+  --mnemonic "grape subway rack mean march bubble carry avoid muffin consider thing street" \
+  --gateway 0x332483152b600f388b64adb4d98509ded379167df6047c49a564a4ed62f8bb71 \
+  --module 0xc478ce1cbbeb090889a0e728af4fd25d80993a653b5f03090dbf77e5a9476bcd \
+  --receiver 0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
+  --amount 1000000 \
+  --types '["string"]' alice
+```
+
+In this example, a call is made from a client on the Sui blockchain to the local
+Gateway contract. The local development environment (Localnet) observes this
+call, deposits ZRC-20 SUI tokens to the specified receiver address on ZetaChain,
+and then triggers the receiver contract on ZetaChain with the provided payload
+(alice).
+
+## Build and Deploy a Sui Contract
+
+```
+cd sui
+```
+
+The example is already configured to import the Gateway from a local directory,
+from which it's published on localnet. On testnet and mainnet the Gateway will
+be imported from a public repo, instead.
+
+```toml filename="sui/Move.toml"
+[dependencies]
+gateway = { local = "/usr/local/share/localnet/protocol-contracts-sui"}
+```
+
+Build:
+
+```
+sui move build --force
+```
+
+Deploy:
+
+```
+sui client publish \
+  --skip-dependency-verification \
+  --json 2>/dev/null | jq -r '.objectChanges[] | select(.type == "published") | .packageId'
+```
+
+```
+0xdefdceb18b96981b3635688ec93838845eb3534991d312b7562e2c1c6e4367a0
+```
+
+We're using `jq` to get the published module ID, but you can skip this to see
+the whole output.
+
+## Get Coins
+
+Get a list of coins for the currently active address:
+
+```
+sui client objects \
+  $(sui client active-address) \
+  --json | jq -r '.[] | select(.data.type == "0x2::coin::Coin<0x2::sui::SUI>") | .data.objectId'
+```
+
+```
+0x561e2c0f84601d7a97bf57ed3b4258bbd60741a3ebecb5865e6dd92833e33c58
+0x7589bdfab5ccd5bc9ce40eefeb883c9fd817fbe74c89613e4d48fbcd90b12cf6
+0x7b18cbdb427965e851e6a128e43744f3452898c82605d5c7a4db681c9a7ffb91
+0xbd5270f4b2f90786cf9ab56b03baff734dad7e10a1288e9d0f4e188e37ed5209
+0xe0736dace410531fe970f03e45bb2797be0bcce083091f6b774c2ccc3132921c
+```
+
+## Deposit from a Sui Contract
+
+```
+sui client call \
+  --package 0xdefdceb18b96981b3635688ec93838845eb3534991d312b7562e2c1c6e4367a0 \
+  --module connected \
+  --function deposit \
+  --type-args 0x2::sui::SUI \
+  --args 0x332483152b600f388b64adb4d98509ded379167df6047c49a564a4ed62f8bb71 \
+    0x561e2c0f84601d7a97bf57ed3b4258bbd60741a3ebecb5865e6dd92833e33c58 \
+    0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7
+```
+
+- `--package`: package ID of the Sui contract deployed in the previous step
+- `--args`:
+  - Gateway Object ID from the table in the output of localnet
+  - One of the coins owned by the current address
+  - Recipient address on ZetaChain
+
+## Deposit and Call a Universal Contract from Sui Contract
+
+```
+sui client call \
+  --package 0xdefdceb18b96981b3635688ec93838845eb3534991d312b7562e2c1c6e4367a0 \
+  --module connected \
+  --function deposit_and_call \
+  --type-args 0x2::sui::SUI \
+  --args 0x332483152b600f388b64adb4d98509ded379167df6047c49a564a4ed62f8bb71 \
+         0x7589bdfab5ccd5bc9ce40eefeb883c9fd817fbe74c89613e4d48fbcd90b12cf6\
+         0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7 \
+         $(cast abi-encode "function(string)" "alice")
+```
+
+Note that in this example we're calling the `deposit_and_call` function and
+passing one more argument: the payload. ZetaChain does not impose any specific
+encoding on the payload, but since you're calling an EVM universal contract on
+ZetaChain, it's easier to use [ABI
+encoding](https://docs.soliditylang.org/en/develop/abi-spec.html). Call
+Foundry's `cast` (or any other tool) to encode a string.