feat : code update as per zaun (#18)

* feat : code update as per zaun * feat : updated workflows * feat : updated workflows * feat : updated workflows * feat : updated workflows * feat : updated workflows * feat : updated workflows * zaun deps update * Remove artifacts from git tracking * dep update * update * feat : updated and refactored the code * fix : deps and lint * feat : config fix * feat : updated upgrade code for tests * feat : updated braavos code and added upgrade functionality * ci debug * feat : added debug logs * feat : updated madara spwan process in tests * feat : updated build process for madara and spawn process * feat : updated build process * resolved comments 1 * fix : test and bridge * feat : refactor * feat : resolved comments 2
madara-alliance · Dec 23, 2024 · 3e60c2b · 3e60c2b
1 parent f717bf1
commit 3e60c2b
Show file tree

Hide file tree

Showing 49 changed files with 1,293 additions and 385,337 deletions.
diff --git a/.github/workflows/linters-cargo.yml b/.github/workflows/linters-cargo.yml
@@ -15,9 +15,49 @@ jobs:
       # before the plugin, as the cache uses the current rustc version as its cache key
       - run: rustup show
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+
+      - name: Install Ganache
+        run: |
+          npm install -g [email protected]
+          ganache --version
+
+      - name: Install Solc
+        run: |
+          pip install solc-select
+          solc-select install 0.8.19
+          solc-select use 0.8.19
+          solc --version
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      # ---------------------------------------------------
+      # workaround : https://github.com/asdf-vm/actions/issues/562
+      # asdf installation
+      - name: Detect ASDF .tool-versions file in repo
+        shell: bash
+        id: detect_tool_versions_file
+        run: |
+          if [ -s .tool-versions ]; then
+          echo "exists=1" >> $GITHUB_OUTPUT
+          fi
+
+      - name: ASDF install tools
+        if: ${{ steps.detect_tool_versions_file.outputs.exists == '1' }}
+        uses: asdf-vm/actions/install@6a442392015fbbdd8b48696d41e0051b2698b2e4
+      # ---------------------------------------------------
+
       - uses: Swatinem/rust-cache@v2
       - name: Format and clippy
         run: |
+          git submodule update --init --recursive
+          make artifacts-linux
           cargo fmt -- --check
           cargo clippy --no-deps -- -D warnings
           cargo clippy --tests --no-deps -- -D warnings
diff --git a/.github/workflows/rust-build.yml b/.github/workflows/rust-build.yml
@@ -17,6 +17,46 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+
+      - name: Install Ganache
+        run: |
+          npm install -g [email protected]
+          ganache --version
+
+      - name: Install Solc
+        run: |
+          pip install solc-select
+          solc-select install 0.8.19
+          solc-select use 0.8.19
+          solc --version
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      # ---------------------------------------------------
+      # workaround : https://github.com/asdf-vm/actions/issues/562
+      # asdf installation
+      - name: Detect ASDF .tool-versions file in repo
+        shell: bash
+        id: detect_tool_versions_file
+        run: |
+          if [ -s .tool-versions ]; then
+          echo "exists=1" >> $GITHUB_OUTPUT
+          fi
+
+      - name: ASDF install tools
+        if: ${{ steps.detect_tool_versions_file.outputs.exists == '1' }}
+        uses: asdf-vm/actions/install@6a442392015fbbdd8b48696d41e0051b2698b2e4
+      # ---------------------------------------------------
+
       - name: Build the project
         run: |
+          git submodule update --init --recursive
+          make artifacts-linux
           cargo build --release --workspace
diff --git a/.github/workflows/test-bridge.yml b/.github/workflows/test-bridge.yml
@@ -25,6 +25,22 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
+      # ---------------------------------------------------
+      # workaround : https://github.com/asdf-vm/actions/issues/562
+      # asdf installation
+      - name: Detect ASDF .tool-versions file in repo
+        shell: bash
+        id: detect_tool_versions_file
+        run: |
+          if [ -s .tool-versions ]; then
+          echo "exists=1" >> $GITHUB_OUTPUT
+          fi
+
+      - name: ASDF install tools
+        if: ${{ steps.detect_tool_versions_file.outputs.exists == '1' }}
+        uses: asdf-vm/actions/install@6a442392015fbbdd8b48696d41e0051b2698b2e4
+      # ---------------------------------------------------
+
       - name: Setup build deps
         run: |
           sudo apt-get update
@@ -37,26 +53,30 @@ jobs:
         with:
           version: nightly
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+
+      - name: Install Ganache
+        run: |
+          npm install -g [email protected]
+          ganache --version
+
+      - name: Install Solc
+        run: |
+          pip install solc-select
+          solc-select install 0.8.19
+          solc-select use 0.8.19
+          solc --version
+
       - name: Checkout Madara
         uses: actions/checkout@v4
         with:
           repository: madara-alliance/madara
           ref: "d188aa91efa78bcc54f92aa1035295fd50e068d2"
           path: madara
 
-      - name: Move Madara Devnet config
-        working-directory: madara
-        run: |
-          ls
-          mv configs/presets/devnet.yaml ../bin/devnet.yaml
-
-      - name: Build Madara
-        working-directory: madara
-        run: |
-          cargo build
-          mv target/debug/madara ../bin/madara
-          cd ..
-
       - name: Run anvil
         run: |
           anvil &
@@ -70,6 +90,8 @@ jobs:
 
       - name: Run llvm-cov
         run: |
+          git submodule update --init --recursive
+          make artifacts-linux
           cargo llvm-cov nextest --release --lcov --output-path lcov.info
 
       - name: Coveralls

diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,8 @@
 .env
 addresses.json
 /bin/madara
-/bin/devnet.yaml
+/bin/devnet.yaml
+.cairo
+/artifacts
+madara-dbs
+madara/
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,16 @@
-[submodule "starkgate contracts 2.0.1"]
-    path = starkgate-contracts-2-0-1
-    url = https://github.com/starknet-io/starkgate-contracts
-    branch = cairo-1
-[submodule "starkgate contracts 0.9.0"]
-    path = starkgate-contracts
-    url = https://github.com/starknet-io/starkgate-contracts
-    branch = update-cairo-0.9.0
+[submodule "lib/argent-contracts-starknet"]
+	path = lib/argent-contracts-starknet
+	url = https://github.com/argentlabs/argent-contracts-starknet
+[submodule "lib/braavos-account-cairo"]
+	path = lib/braavos-account-cairo
+	url = https://github.com/myBraavos/braavos-account-cairo
+[submodule "lib/starkgate-contracts-old"]
+	path = lib/starkgate-contracts-old
+	url = https://github.com/starknet-io/starkgate-contracts
+	branch = update-cairo-0.9.0
+[submodule "lib/starkgate-contracts-latest"]
+	path = lib/starkgate-contracts-latest
+	url = https://github.com/starknet-io/starkgate-contracts
+[submodule "lib/starkgate-contracts-82e651f"]
+	path = lib/starkgate-contracts-82e651f
+	url = https://github.com/starknet-io/starkgate-contracts.git
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+scarb 2.8.2
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,15 +16,15 @@ serde_with = { version = "2.3.3", default-features = false }
 url = "2.4.1"
 
 # Zaun Deps
-ethereum-instance = { git = "https://github.com/karnotxyz/zaun", package = "ethereum-instance", rev = "782967e5" }
-starkgate-manager-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-manager-client", rev = "782967e5" }
-starkgate-registry-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-registry-client", rev = "782967e5" }
-starknet-core-contract-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-core-contract-client", rev = "782967e5" }
-starknet-erc20-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-erc20-client", rev = "782967e5" }
-starknet-eth-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-eth-bridge-client", rev = "782967e5" }
-starknet-proxy-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-proxy-client", rev = "782967e5" }
-starknet-token-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-token-bridge-client", rev = "782967e5" }
-zaun-utils = { git = "https://github.com/karnotxyz/zaun", package = "utils", rev = "782967e5" }
+ethereum-instance = { git = "https://github.com/karnotxyz/zaun", package = "ethereum-instance", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starkgate-manager-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-manager-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starkgate-registry-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-registry-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starknet-core-contract-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-core-contract-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starknet-erc20-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-erc20-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starknet-eth-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-eth-bridge-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starknet-proxy-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-proxy-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+starknet-token-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-token-bridge-client", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
+zaun-utils = { git = "https://github.com/karnotxyz/zaun", package = "utils", rev = "34bda2ccb69fb26be9cdfe091c11f27480850c96" }
 
 # Starknet Deps
 starknet = "0.11.0"