Contracts Deployment & Bridge Token From Mina to Ethereum & Refactor

.env

@@ -0,0 +1,2 @@
+# options: devnet,hoodi,sepolia,mainnet
+ETH_CHAIN=hoodi

.env.devnet

@@ -0,0 +1,29 @@
+MINA_RPC_URL=https://api.minascan.io/node/devnet/v1/graphql
+#MINA_RPC_URL=https://mina-node.devnet.nori.it.com/graphql
+STATE_SETTLEMENT_ETH_ADDR=0xf56AA3aCedDf88Ab12E494d0B96DA3C09a5d264e
+ACCOUNT_VALIDATION_ETH_ADDR=0xDFD787c807DEA8d7e53311b779BC0c6a4704D286
+NORI_TOKEN_BRIDGE_ETH_ADDRESS=0x4C073a92B1C8Fb55313102Ab412fb7F1704bcBdD
+SAVE_PROOF=true/false # also false if other than "true" or variable were to be not defined
+
+BATCHER_ADDR=ws://localhost:8080
+BATCHER_PAYEMENT_SERVICE_ADDRESS=0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650
+ETH_RPC_URL=http://localhost:8545
+PROOF_GENERATOR_ADDR=0x66f9664f97F2b50F62D13eA064982f936dE76657
+ALIGNED_SERVICE_MANAGER_ADDR=0x851356ae760d987E095750cCeb3bC6014560891C
+
+# 0: Default; 1: Instant; 2: Custom-(require BATCH_MAX_FEE's value)
+BATCHER_FEE_ESTM_TYPE=1
+BATCHER_MAX_FEE=691654288189150
+
+NORI_STORAGE_ZKAPP_ACCT_VK_HASH_KECCAK256=0x1234567890123456789012345678901234567890123456789012345678901234
+NORI_STORAGE_ZKAPP_TOKEN_ID=0x1234567890123456789012345678901234567890123456789012345678901234
+
+# if keystore instead of PRIVATE_KEY, then uncomment it
+# KEYSTORE_PATH=
+
+# optional: default, polling
+ALIGNED_SUBMISSION_MODE=polling
+# seconds
+ALIGNED_POLL_INTERVAL_SECS=10
+# seconds
+ALIGNED_POLL_TIMEOUT_SECS=600

.env.hoodi

@@ -0,0 +1,30 @@
+#MINA_RPC_URL=https://api.minascan.io/node/devnet/v1/graphql
+MINA_RPC_URL=https://mina-node.devnet.nori.it.com/graphql
+STATE_SETTLEMENT_ETH_ADDR=0xC38d0E13c69124Bb10944E6E3612D6cf5366410B
+ACCOUNT_VALIDATION_ETH_ADDR=0xEe6A1D89694e741564363224C084b38AB5e38Bd4
+NORI_TOKEN_BRIDGE_ETH_ADDRESS=0xcAF8ECC34fFF8a39899D0CA820c5f828B0441BE4
+
+SAVE_PROOF=true/false # also false if other than "true" or variable were to be not defined
+
+BATCHER_ADDR=wss://hoodi.batcher.alignedlayer.com
+BATCHER_PAYEMENT_SERVICE_ADDRESS=0x041af25Fce2413570aaa0029D36DeA1eFdeff083
+ETH_RPC_URL=https://ethereum-hoodi-rpc.publicnode.com
+PROOF_GENERATOR_ADDR=0x66f9664f97F2b50F62D13eA064982f936dE76657
+ALIGNED_SERVICE_MANAGER_ADDR=0x87CD431F160e88EC34fA48EC6F6cF7F2C0E8248c
+
+# 0: Default; 1: Instant; 2: Custom-(require BATCH_MAX_FEE's value)
+BATCHER_FEE_ESTM_TYPE=1
+BATCHER_MAX_FEE=691654288189150
+
+NORI_STORAGE_ZKAPP_ACCT_VK_HASH_KECCAK256=0x1234567890123456789012345678901234567890123456789012345678901234
+NORI_STORAGE_ZKAPP_TOKEN_ID=0x1234567890123456789012345678901234567890123456789012345678901234
+
+# if keystore instead of PRIVATE_KEY, then uncomment it
+# KEYSTORE_PATH=
+
+# optional: default, polling
+ALIGNED_SUBMISSION_MODE=default
+# seconds
+ALIGNED_POLL_INTERVAL_SECS=10
+# seconds
+ALIGNED_POLL_TIMEOUT_SECS=1000

.env.mainnet

@@ -0,0 +1,29 @@
+MINA_RPC_URL=https://api.minascan.io/node/devnet/v1/graphql
+#MINA_RPC_URL=https://mina-node.devnet.nori.it.com/graphql
+STATE_SETTLEMENT_ETH_ADDR=0xf56AA3aCedDf88Ab12E494d0B96DA3C09a5d264e
+ACCOUNT_VALIDATION_ETH_ADDR=0xDFD787c807DEA8d7e53311b779BC0c6a4704D286
+NORI_TOKEN_BRIDGE_ETH_ADDRESS=0x4C073a92B1C8Fb55313102Ab412fb7F1704bcBdD
+SAVE_PROOF=true/false # also false if other than "true" or variable were to be not defined
+
+BATCHER_ADDR=wss://mainnet.batcher.alignedlayer.com
+BATCHER_PAYEMENT_SERVICE_ADDRESS=0xb0567184A52cB40956df6333510d6eF35B89C8de
+ETH_RPC_URL=https://ethereum-rpc.publicnode.com
+PROOF_GENERATOR_ADDR=0x66f9664f97F2b50F62D13eA064982f936dE76657
+ALIGNED_SERVICE_MANAGER_ADDR=0xeF2A435e5EE44B2041100EF8cbC8ae035166606c
+
+# 0: Default; 1: Instant; 2: Custom-(require BATCH_MAX_FEE's value)
+BATCHER_FEE_ESTM_TYPE=1
+BATCHER_MAX_FEE=691654288189150
+
+NORI_STORAGE_ZKAPP_ACCT_VK_HASH_KECCAK256=0x1234567890123456789012345678901234567890123456789012345678901234
+NORI_STORAGE_ZKAPP_TOKEN_ID=0x1234567890123456789012345678901234567890123456789012345678901234
+
+# if keystore instead of PRIVATE_KEY, then uncomment it
+# KEYSTORE_PATH=
+
+# optional: default, polling
+ALIGNED_SUBMISSION_MODE=polling
+# seconds
+ALIGNED_POLL_INTERVAL_SECS=10
+# seconds
+ALIGNED_POLL_TIMEOUT_SECS=1000

.env.sepolia

@@ -0,0 +1,30 @@
+MINA_RPC_URL=https://api.minascan.io/node/devnet/v1/graphql
+#MINA_RPC_URL=https://mina-node.devnet.nori.it.com/graphql
+STATE_SETTLEMENT_ETH_ADDR=0x9BE7c134F06A638Ec1E06ae46bAA862f72Edf3E6
+ACCOUNT_VALIDATION_ETH_ADDR=0xf00D03ed0DA24bD83ED968E632546Fc4096837AA
+NORI_TOKEN_BRIDGE_ETH_ADDRESS=0xE185126CA39e2D0FE3943E74b22a7A0F569D2264
+
+SAVE_PROOF=true/false # also false if other than "true" or variable were to be not defined
+
+BATCHER_ADDR=wss://sepolia.batcher.alignedlayer.com
+BATCHER_PAYEMENT_SERVICE_ADDRESS=0x403dE630751e148bD71BFFcE762E5667C0825399
+ETH_RPC_URL=https://ethereum-sepolia-rpc.publicnode.com
+PROOF_GENERATOR_ADDR=0x66f9664f97F2b50F62D13eA064982f936dE76657
+ALIGNED_SERVICE_MANAGER_ADDR=0xFf731AB7b3653dc66878DC77E851D174f472d137
+
+# 0: Default; 1: Instant; 2: Custom-(require BATCH_MAX_FEE's value > 0)
+BATCHER_FEE_ESTM_TYPE=1
+BATCHER_MAX_FEE=691654288189150
+
+NORI_STORAGE_ZKAPP_ACCT_VK_HASH_KECCAK256=0x1234567890123456789012345678901234567890123456789012345678901234
+NORI_STORAGE_ZKAPP_TOKEN_ID=0x1234567890123456789012345678901234567890123456789012345678901234
+
+# if keystore instead of PRIVATE_KEY, then uncomment it
+# KEYSTORE_PATH=
+
+# optional: default, polling
+ALIGNED_SUBMISSION_MODE=polling
+# seconds
+ALIGNED_POLL_INTERVAL_SECS=10
+# seconds
+ALIGNED_POLL_TIMEOUT_SECS=1000

.gitignore

@@ -5,5 +5,5 @@ mina_state.proof
 mina_account.pub
 mina_account.proof
 aligned_verification_data
-.env
 nonce_*.bin
+.generated.contract.addresses.*

Makefile

@@ -1,29 +1,23 @@
-.PHONY: submit_mainnet_state submit_devnet_state submit_account gen_contract_abi deploy_example_bridge_contracts
-
 submit_mainnet_state:
 	@cargo run --manifest-path core/Cargo.toml --release -- submit-state
 
 submit_devnet_state:
-	@cargo run --manifest-path core/Cargo.toml --release -- submit-state --devnet
+	@cargo run --manifest-path core/Cargo.toml -- submit-state --devnet
 
 submit_account:
-	@cargo run --manifest-path core/Cargo.toml --release -- submit-account $(PUBLIC_KEY) $(STATE_HASH)
+	@cargo run --manifest-path core/Cargo.toml --release -- submit-account $(PUBLIC_KEY) $(TOKEN_ID) $(STATE_HASH)
 
 gen_contract_abis:
 	forge build --root contract/
-	forge build --root example/eth_contract
 	cp contract/out/MinaStateSettlementExample.sol/MinaStateSettlementExample.json core/abi/MinaStateSettlementExample.json
 	cp contract/out/MinaAccountValidationExample.sol/MinaAccountValidationExample.json core/abi/MinaAccountValidationExample.json
-	cp example/eth_contract/out/SudokuValidity.sol/SudokuValidity.json example/app/abi/SudokuValidity.json
+	cp contract/out/NoriTokenBridge.sol/NoriTokenBridge.json core/abi/NoriTokenBridge.json
 
-deploy_example_bridge_contracts:
-	@cargo run --manifest-path contract_deployer/Cargo.toml --release
+deploy_all_bridge_contracts:
+	@cargo run --manifest-path contract_deployer/Cargo.toml --release -- deploy-all-contracts ${NORI_TOKEN_BRIDGE_INITIAL_BALANCE}
 
-deploy_example_app_contracts:
-	@cargo run --manifest-path example/app/Cargo.toml --release -- deploy-contract
+deploy_nori_token_bridge_contract:
+	@cargo run --manifest-path contract_deployer/Cargo.toml --release -- deploy-nori-bridge ${NORI_TOKEN_BRIDGE_INITIAL_BALANCE}
 
-execute_example:
-	cd example/mina_zkapp; \
-	npm run build; \
-	node build/src/run.js
-	cargo run --manifest-path example/app/Cargo.toml --release -- validate-solution
+unlock_nori_token:
+	@cargo run --manifest-path core/Cargo.toml --release -- unlock-nori-token --to-unlock-amount $(TO_UNLOCK_AMOUNT) $(PUBLIC_KEY) $(TOKEN_ID)

README.md

@@ -6,7 +6,6 @@ Docs and utils for the Zero-knowledge state bridge from Mina to Ethereum
 
 - [About](#about)
 - [Usage](#usage)
-- [Example use case](#example-use-case)
 - [Table of Contents](#table-of-contents)
 - [Specification](#specification)
   - [core](#core)
@@ -132,73 +131,58 @@ git checkout staging
 
 1. Setup the `.env` file of the Bridge. A template is available in `.env.template`.
     1. Set `ETH_CHAIN` to `devnet`.
-    1. Set `MINA_RPC_URL` to the URL of the Mina node GraphQL API (See [Mina node section](#mina-node)).
+    2. Set `MINA_RPC_URL` to the URL of the Mina node GraphQL API (See [Mina node section](#mina-node)).
 
 2. In the root folder, deploy the example Bridge's contracts with:
 
     ```sh
-    make deploy_example_bridge_contracts
-    ```
-
-    In the `.env` file, set `STATE_SETTLEMENT_ETH_ADDR` and `ACCOUNT_VALIDATION_ETH_ADDR` to the corresponding deployed contract addresses.
-
-3. Submit a Mina state proof to verify:
-
-    - Run `make submit_devnet_state` if you are using Mina Devnet or `make submit_mainnet_state` if you are using Mina Mainnet.
-
-4. Submit an account to verify:
+    gen_contract_abis
 
-    ```sh
-    make submit_account PUBLIC_KEY=<string> STATE_HASH=<string>
+    make deploy_all_bridge_contracts NORI_TOKEN_BRIDGE_INITIAL_BALANCE=<string>
     ```
 
     Where:
-    - `PUBLIC_KEY` is the public key of the Mina account you want to verify
-    - `STATE_HASH` is the hash of a Mina state that was verified in Ethereum
+    - NORI_TOKEN_BRIDGE_INITIAL_BALANCE is expressed in **ether** (e.g., `1` means 1 $ETH, `1.123` means 1.123 $ETH).
 
-## Example use case
-
-The `example/` folder contains a project that uses the Sudoku zkApp example from Mina and bridges its state to a SudokuValidity Ethereum smart contract.
-
-For running the example you need to:
-
-1. [Setup Aligned Devnet locally](https://github.com/yetanotherco/aligned_layer/blob/staging/docs/3_guides/6_setup_aligned.md#booting-devnet-with-default-configs)
-
-2. Deploy the example bridge smart contracts by executing
+    In the `.env` file, set `STATE_SETTLEMENT_ETH_ADDR`, `ACCOUNT_VALIDATION_ETH_ADDR` and `NORI_TOKEN_BRIDGE_ETH_ADDRESS` to the corresponding deployed contract addresses.
 
+    If you expect to re-deploy NoriTokenBridge contract only, kindly re-exec 
+
     ```sh
-    make deploy_example_bridge_contracts
+    make deploy_nori_token_bridge_contract NORI_TOKEN_BRIDGE_INITIAL_BALANCE=<string>
     ```
+
+    and later update `NORI_TOKEN_BRIDGE_ETH_ADDRESS` in `.env`.
 
-3. Deploy the SudokuValidity smart contract by executing
+3. Submit a Mina state proof to verify:
 
-    ```sh
-    make deploy_example_app_contracts
-    ```
+    - Run `make submit_devnet_state` if you are using Mina Devnet or `make submit_mainnet_state` if you are using Mina Mainnet.
 
-4. Install `zkapp-cli`:
+4. Submit an account to verify:
 
     ```sh
-    npm install -g zkapp-cli
+    make submit_account PUBLIC_KEY=<string> TOKEN_ID=<string> STATE_HASH=<string>
     ```
 
-5. Inside the `example/mina_zkapp` directory, configure the zkApp and deploy the contract following [this guide](https://docs.minaprotocol.com/zkapps/writing-a-zkapp/introduction-to-zkapps/how-to-deploy-a-zkapp) on the Mina Protocol documentation
-
-6. After deployment, set the `zkappAddress` field on `example/mina_zkapp/config.json`
-
-7. Set the environment variables in a `.env` file accordingly. A template can be found in `.env.template`.
+    Where:
+    - `PUBLIC_KEY` is the public key of the Mina account you want to verify
+    - `TOKEN_ID` is the token id of the fungible token owned by `NoriBridgeController` Mina Contract.
+    - `STATE_HASH` is the hash of a Mina state that was verified in Ethereum
 
-8. Run the example by executing from the root folder:
+5. Unlock $ETH from NoriTokenBridge smart contract
 
-    ```sh
-    make execute_example
-    ```
+   You first need trigger `NoriBridgeController.alignedLock()` to burn $ETH fungible token on Mina side.
 
-    this will upload a new Sudoku, submit a solution to it and run the example Rust app that will bridge the new state of the zkApp and update the SudokuValidty smart contract on Ethereum.
+   and then:
 
-    The zkApp will wait until both Mina transactions are included in a block, so this may take a while. Below is a diagram explaining the execution flow:
+   ```sh
+   make unlock_nori_token PUBLIC_KEY=<string> TOKEN_ID=<string> TO_UNLOCK_AMOUNT=<string>
+   ```
 
-![Example diagram](/img/example_diagram.png)
+    Where:
+    - `PUBLIC_KEY` is the public key of the Mina account you want to verify
+    - `TOKEN_ID` is the token id of the fungible token owned by `NoriBridgeController` Mina Contract.
+    - `TO_UNLOCK_AMOUNT` is expressed in **ether** (e.g., `1` means 1 $ETH, `1.123` means 1.123 $ETH).
 
 ## Specification
 

contract/foundry.toml

@@ -3,4 +3,8 @@ src = "src"
 out = "out"
 libs = ["lib"]
 
+optimizer = true
+optimizer_runs = 200
+via_ir = true
+
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

contract/src/MinaStateSettlementExample.sol

@@ -60,10 +60,8 @@ contract MinaStateSettlementExample {
 
     /// @notice Returns true if this snarked ledger hash was bridged.
     function isLedgerVerified(bytes32 ledgerHash) external view returns (bool) {
-        for (uint256 i = 0; i < BRIDGE_TRANSITION_FRONTIER_LEN; i++) {
-            if (chainLedgerHashes[BRIDGE_TRANSITION_FRONTIER_LEN - 1 - i] == ledgerHash) {
-                return true;
-            }
+        if (chainLedgerHashes[0] == ledgerHash) {
+            return true;
         }
         return false;
     }