Merge branch 'axolotl_presage' into small-lint

Cargo.toml

@@ -14,11 +14,12 @@ tauri-build = { version = "2.0.0-alpha.8    ", features = [], optional = true}
 
 [dependencies]
 tauri = { version = "2.0.0-alpha.11", features = [], optional = true }
-presage = { git = "https://github.com/nanu-c/presage", rev = "ee86c3526b2cfd1b26a5374f0547bc5933234aa" }
-presage-store-sled = { git = "https://github.com/nanu-c/presage", rev = "ee86c3526b2cfd1b26a5374f0547bc5933234aa" }
+presage = { git = "https://github.com/nanu-c/presage", rev = "8ec684d9f878b5f60d84fd885c9ca664f9985222" }
+presage-store-sled = { git = "https://github.com/nanu-c/presage", rev = "8ec684d9f878b5f60d84fd885c9ca664f9985222" }
 # presage = {path = "../presage/presage"}
 # presage-store-sled = { path = "../presage/presage-store-sled" }
-libsignal-service = { git = "https://github.com/whisperfish/libsignal-service-rs", rev = "8789920" }
+libsignal-service = { git = "https://github.com/whisperfish/libsignal-service-rs", rev = "8305357" }
+zeroize = { version = "1.6.0", default-features = false }
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1.12"
 hex = "0.4"
@@ -39,7 +40,7 @@ data-url = "0.2.0"
 dbus = { version = "0.9", optional = true}
 
 [patch.crates-io]
-"curve25519-dalek" = { git = 'https://github.com/signalapp/curve25519-dalek', branch = 'lizard2' }
+"curve25519-dalek" = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.0.0' }
 
 
 [features]
@@ -51,6 +52,8 @@ default = ["dep:notify-rust"]
 custom-protocol = ["tauri/custom-protocol"]
 tauri = ["dep:tauri", "dep:notify-rust", "custom-protocol"]
 ut = ["dep:dbus"]
+# Use this feature to debug registration issues on test servers
+staging-servers = []
 
 
 [[example]]

axolotl-web/src/pages/Verification.vue

@@ -50,9 +50,12 @@ export default {
       this.code = code
     },
     sendCode() {
+      console.log("send code", this.code)
       if (this.code.length === 6) {
         this.$store.dispatch("sendCode", this.code);
         this.inProgress = true;
+      } else {
+        console.error("code not 6 digits")
       }
     },
     sendPin() {

axolotl-web/src/store/store.js

@@ -4,6 +4,7 @@ import { validateUUID } from "@/helpers/uuidCheck";
 import app from "../main";
 
 function socketSend(message) {
+  console.log("socketSend", message);
   app.config.globalProperties.$socket.send(JSON.stringify(message));
 }
 
@@ -808,12 +809,17 @@ export default createStore({
       }
     },
     sendCode(state, code) {
+      console.log("store: sendCode", code);
       if (this.state.socket.isConnected) {
         const message = {
           request: "sendCode",
           data: code,
         };
+        console.log("store: sendCode", message);
         socketSend(message);
+      } else {
+        console.error("socket not connected");
+        // reconnect socket
       }
     },
     setUsername(state, username) {

clickable.yaml

@@ -1,7 +1,7 @@
 clickable_minimum_required: 7.12.3
 
 builder: rust
-rust_channel: 1.66.1
+rust_channel: 1.71.1
 env_vars:
   CC: ""
   CXX: ""
@@ -11,8 +11,6 @@ dependencies_host:
 
 dependencies_target:
   - libdbus-1-dev
-env_vars:
-  PKG_CONFIG_ALLOW_CROSS: "1"
 
 build_args: --features ut 
 kill: axolotl
@@ -36,8 +34,11 @@ libraries:
   axolotlweb:
     image_setup:
       run:
-        - curl -fsSL https://deb.nodesource.com/setup_20.x  | bash -
-        - apt-get install -y nodejs
+        # Install instructions taken from https://github.com/nodesource/distributions#installation-instructions
+        - mkdir -p /etc/apt/keyrings
+        - curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+        - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+        - apt-get update && apt-get install -y nodejs
         - echo "NODE Version:" && node --version
         - echo "NPM Version:" && npm --version