0LNetworkCommunity · 0o-de-lally · Nov 27, 2023 · Oct 28, 2023 · Oct 28, 2023 · Oct 28, 2023
diff --git a/.github/workflows/release-aarch64.yaml b/.github/workflows/release-aarch64.yaml
@@ -0,0 +1,78 @@
+name: carpe-release-aarch64
+
+on:
+  push:
+    branches:
+      - '*aarch64*'
+
+env:
+  LDFLAGS: '/opt/homebrew/lib'
+  LD_LIBRARY_PATH: '/opt/homebrew/lib'
+jobs:
+  publish:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [  macos-latest-xlarge ]
+    name: build ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      ### DO NOT REMOVE: uncomment if you need to debug runner ###
+      - name: setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          detached: true
+
+      # Setup Rust
+      - uses: dtolnay/[email protected]
+        with:
+          components: rustfmt
+
+      # Setup Node.js
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      # checkout
+      - name: checkout source
+        uses: actions/checkout@v3
+
+
+########  MAC  ########
+      - name: osx deps
+        run: |
+          brew update
+          brew reinstall llvm
+          brew reinstall gmp
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+           workspaces: ./src-tauri
+           shared-key: ${{ matrix.os }}
+           cache-all-crates: true
+           cache-on-failure: true
+
+########  BUILD  ########
+
+      - name: yarn installation
+        run: yarn install
+
+
+      - name: pre-build rust
+        working-directory: ./src-tauri
+        run: export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix)/lib && cargo b --release
+
+      - name: Build Tauri
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_PRIVATE_KEY: ${{secrets.TAURI_PRIVATE_KEY}}
+          TAURI_KEY_PASSWORD: ${{secrets.TAURI_KEY_PASSWORD}}
+          LIBRARY_PATH: /opt/homebrew/lib
+        with:
+          args: ${{contains(github.ref, 'canary') && '--config src-tauri/tauri.conf.aarch64.json --features carpe-canary' || '--config src-tauri/tauri.conf.aarch64.json' }} #pass the rust feature flags for canary if the tag includes "canary"
+          tagName: ${{contains(github.ref, 'canary') && 'v__VERSION__-canary' ||  'v__VERSION__' }} # the action automatically replaces \_\_VERSION\_\_ with the app version
+          releaseName: ${{contains(github.ref, 'canary') && 'v__VERSION__-aarch64-canary' ||  'v__VERSION__-aarch64' }}
+          releaseBody: '[draft]'
+          releaseDraft: true
+          prerelease: false
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -8,14 +8,15 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+-canary.[0-9]+'
 
     branches:
-      - 'canary'
+      - 'canary*'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
       - 'ci'
 jobs:
   publish:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, macos-11]
+        os: [ macos-11, windows-latest ]
     name: build ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -24,6 +25,7 @@ jobs:
       #   uses: mxschmitt/action-tmate@v3
       #   with:
       #     detached: true
+
       # Setup Rust
       - uses: dtolnay/[email protected]
         with:
@@ -39,18 +41,19 @@ jobs:
         uses: actions/checkout@v3
 
 ########  UBUNTU  ########
-      - name: install dependencies (ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: build-essential lld pkg-config libclang-dev libwebkit2gtk-4.0-dev libglib2.0-* libssl-dev libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev libvips-dev libgmp-dev
-          version: 1.0
+      # - name: install dependencies (ubuntu only)
+      #   if: matrix.os == 'ubuntu-latest'
+      #   uses: awalsh128/cache-apt-pkgs-action@latest
+      #   with:
+      #     packages: build-essential lld pkg-config libclang-dev libwebkit2gtk-4.0-dev libglib2.0-* libssl-dev libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev libvips-dev libgmp-dev
+      #     version: 1.0
 
 ########  MAC  ########
 
-      - name: set the Mac compile target
+      - name: install gmp
         if: matrix.os == 'macos-11'
-        run: export CARGO_BUILD_TARGET='universal-apple-darwin'
+        run: |
+          brew reinstall gmp
 
 ########  WIN  ########
 
@@ -65,7 +68,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
 
-
       # Package the windows dependencies
       - name: copy gmp.dll for build
         if: matrix.os == 'windows-latest'
@@ -97,8 +99,10 @@ jobs:
           TAURI_PRIVATE_KEY: ${{secrets.TAURI_PRIVATE_KEY}}
           TAURI_KEY_PASSWORD: ${{secrets.TAURI_KEY_PASSWORD}}
         with:
-          args: ${{contains(github.ref, 'canary') && '--config src-tauri/tauri.conf.canary.json --features carpe-canary' || '' }} #pass the rust feature flags for canary if the tag includes "canary"
-          tagName: ${{contains(github.ref, 'canary') && 'v__VERSION__-canary' ||  'v__VERSION__' }} # the action automatically replaces \_\_VERSION\_\_ with the app version
+          args: ${{contains(github.ref, 'canary') && '--config src-tauri/tauri.conf.canary.json --features carpe-canary' || '' }}
+          # pass the rust feature flags for canary if the tag includes "canary"
+          tagName: ${{contains(github.ref, 'canary') && 'v__VERSION__-canary' ||  'v__VERSION__' }}
+          # the action automatically replaces \_\_VERSION\_\_ with the app version
           releaseName: ${{contains(github.ref, 'canary') && 'v__VERSION__-canary' ||  'v__VERSION__' }}
           releaseBody: '[draft]'
           releaseDraft: true

diff --git a/bun.lockb b/bun.lockb
diff --git a/carpe.code-workspace b/carpe.code-workspace
@@ -0,0 +1,7 @@
+{
+  "folders": [
+    {
+      "path": "."
+    }
+  ]
+}
diff --git a/dist/assets/index-0968cf85.css b/dist/assets/index-0968cf85.css
diff --git a/dist/assets/index-48a2a9b5.js b/dist/assets/index-48a2a9b5.js
diff --git a/dist/assets/index-48a2a9b5.js.map b/dist/assets/index-48a2a9b5.js.map
diff --git a/dist/assets/index-699678fd.css b/dist/assets/index-699678fd.css
diff --git a/dist/assets/index-cf00d38c.js b/dist/assets/index-cf00d38c.js
diff --git a/dist/assets/index-cf00d38c.js.map b/dist/assets/index-cf00d38c.js.map
diff --git a/dist/index.html b/dist/index.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <script type="module" crossorigin src="/assets/index-cf00d38c.js"></script>
-    <link rel="stylesheet" href="/assets/index-699678fd.css">
+    <script type="module" crossorigin src="/assets/index-48a2a9b5.js"></script>
+    <link rel="stylesheet" href="/assets/index-0968cf85.css">
   </head>
   <body>
 

diff --git a/package.json b/package.json
@@ -7,6 +7,8 @@
     "dev:canary": "tauri dev --config src-tauri/tauri.conf.canary.json --features carpe-canary",
     "dev:web": "vite",
     "build": "tauri build",
+    "build:universal": "tauri build --target universal-apple-darwin",
+    "build:aarch64": "RUSTFLAGS='--cfg tokio_unstable' tauri build --target aarch64-apple-darwin",
     "build:canary": "tauri build --config src-tauri/tauri.conf.canary.json --features carpe-canary",
     "build:web": "vite build",
     "lint": "svelte-check --tsconfig ./tsconfig.json && eslint src && prettier --check src",

diff --git a/src-tauri/.cargo/config.toml b/src-tauri/.cargo/config.toml
@@ -37,15 +37,9 @@ rustflags = [
   "target-feature=+sse4.2",
 ]
 
-# # 64 bit MSVC
-# [target.x86_64-pc-windows-msvc]
-# rustflags = [
-#     "--cfg",
-#     "tokio_unstable",
-#     "-C",
-#     "force-frame-pointers=yes",
-#     "-C",
-#     "force-unwind-tables=yes",
-#     "-C",
-#     "link-arg=/STACK:8000000" # Set stack to 8 MB
-# ]
+# apple
+[target.aarch64-apple-darwin]
+rustflags = [
+    "--cfg",
+    "tokio_unstable"
+]
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -13,11 +13,11 @@ tauri-build = { version = "^1.5.0", features = [] }
 built = { version = "0.5.1", features = ["git2"] }
 
 [dependencies]
-libra-query = { git = "https://github.com/0LNetworkCommunity/libra-framework.git", branch = "main" }
-libra-tower = { git = "https://github.com/0LNetworkCommunity/libra-framework", branch = "main" }
-libra-types = { git = "https://github.com/0LNetworkCommunity/libra-framework", branch = "main" }
-libra-txs = { git = "https://github.com/0LNetworkCommunity/libra-framework", branch = "main" }
-libra-wallet = { git = "https://github.com/0LNetworkCommunity/libra-framework", branch = "main" }
+libra-query = { git = "https://github.com/0LNetworkCommunity/libra-framework.git", rev = "cc2ce46" }
+libra-tower = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "cc2ce46" }
+libra-types = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "cc2ce46" }
+libra-txs = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "cc2ce46" }
+libra-wallet = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "cc2ce46" }
 
 # shared with libra-framework and diem
 anyhow = "1.0.62"

diff --git a/src-tauri/libgmp.10.dylib b/src-tauri/libgmp.10.dylib
diff --git a/src-tauri/libgmp.a b/src-tauri/libgmp.a
diff --git a/src-tauri/libgmp.dylib b/src-tauri/libgmp.dylib
diff --git a/src-tauri/libgmpxx.4.dylib b/src-tauri/libgmpxx.4.dylib
diff --git a/src-tauri/libgmpxx.a b/src-tauri/libgmpxx.a
diff --git a/src-tauri/libgmpxx.dylib b/src-tauri/libgmpxx.dylib
diff --git a/src-tauri/src/commands/preferences.rs b/src-tauri/src/commands/preferences.rs
@@ -1,6 +1,7 @@
 use crate::configs::{default_config_path, legacy_config_path};
 use crate::migrate::{self, backup_legacy_dir, read_accounts};
 use crate::{carpe_error::CarpeError, configs::get_cfg};
+use anyhow::Context;
 use libra_types::legacy_types::mode_ol::MODE_0L;
 use log::{error, info, warn};
 use std::env;
@@ -34,8 +35,24 @@ pub async fn refresh_upstream_peer_stats() -> Result<Vec<Url>, CarpeError> {
   let mut app_cfg = get_cfg()?;
   app_cfg.refresh_network_profile_and_save(None).await?; // uses app_cfg.chain_info_chain_id
   let np = app_cfg.get_network_profile(None)?;
+  // dbg!(&np);
   app_cfg.save_file()?;
-  Ok(np.the_good_ones()?) // uses app_cfg.chain_info_chain_id
+
+  let peers = match np.the_good_ones() {
+    Ok(r) => r,
+    _ => {
+      let first_url = np
+        .nodes
+        .first()
+        .context("no hosts in network playlist")?
+        .url
+        .to_owned();
+
+      vec![first_url]
+    }
+  };
+  dbg!(&peers);
+  Ok(peers) // uses app_cfg.chain_info_chain_id
 }
 
 #[tauri::command(async)]

diff --git a/src-tauri/src/commands/wallets.rs b/src-tauri/src/commands/wallets.rs
@@ -144,13 +144,12 @@ async fn map_get_originating_address(list: &mut [Profile]) -> Result<(), CarpeEr
 
 async fn map_get_balance(list: &mut [Profile]) -> anyhow::Result<(), CarpeError> {
   futures::future::join_all(list.iter_mut().map(|e| async {
+    // if query::get_seq_num(e.account).await.is_ok() {
+    //   // e.on_chain = true;
+    // }
     if let Ok(b) = query::get_balance(e.account).await {
       e.balance = b;
-      e.on_chain = true;
-    }
-
-    if query::get_seq_num(e.account).await.is_ok() {
-      e.on_chain = true;
+      // e.on_chain = true;
     }
   }))
   .await;