chore: update dev with staging 09/06/25

.coderabbit.yaml

@@ -15,7 +15,7 @@ reviews:
   auto_review:
     enabled: true
     drafts: false
-    base_branches: ["main", "dev"]
+    base_branches: ["main", "dev", "staging"]
   tools:
     github-checks:
       timeout_ms: 300000

.github/workflows/circuits-build.yml

@@ -1,13 +1,9 @@
 name: Circuits Build
 on:
-  push:
-    branches:
-      - main
-    paths:
-      - "circuits/circuits/**"
-      - ".github/workflows/artifacts.yml"
   pull_request:
     branches:
+      - dev
+      - staging
       - main
     paths:
       - "circuits/circuits/**"

.github/workflows/circuits.yml

@@ -1,21 +1,12 @@
 name: Circuits CI
 on:
-  push:
-    branches:
-      - dev
-      - main
-      - openpassportv2
-    paths:
-      - "circuits/**"
-      - "common/**"
   pull_request:
     branches:
       - dev
+      - staging
       - main
-      - openpassportv2
     paths:
       - "circuits/**"
-      - "common/**"
 jobs:
   run_circuit_tests:
     if: github.event.pull_request.draft == false

.github/workflows/contracts.yml

@@ -1,15 +1,9 @@
 name: Contracts CI
 on:
-  push:
-    branches:
-      - dev
-      - main
-    paths:
-      - "contracts/**"
-      - "common/**"
   pull_request:
     branches:
       - dev
+      - staging
       - main
     paths:
       - "contracts/**"

.github/workflows/mobile-ci.yml

@@ -16,7 +16,11 @@ env:
   GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=4 -Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.caching=true
   CI: true
 on:
-  push:
+  pull_request:
+    branches:
+      - dev
+      - staging
+      - main
     paths:
       - "common/**"
       - "app/**"

.github/workflows/mobile-e2e.yml

@@ -17,12 +17,11 @@ env:
   MAESTRO_VERSION: 1.41.0
 
 on:
-  push:
-    branches: [main, release/**]
-    paths:
-      - "app/**"
-      - ".github/workflows/mobile-e2e.yml"
   pull_request:
+    branches:
+      - dev
+      - staging
+      - main
     paths:
       - "app/**"
       - ".github/workflows/mobile-e2e.yml"

.github/workflows/qrcode-sdk-ci.yml

@@ -10,16 +10,15 @@ env:
 
 on:
   pull_request:
+    branches:
+      - dev
+      - staging
+      - main
     paths:
       - "sdk/qrcode/**"
       - "common/**"
       - ".github/workflows/qrcode-sdk-ci.yml"
       - ".github/actions/**"
-  push:
-    branches: [main, develop]
-    paths:
-      - "sdk/qrcode/**"
-      - "common/**"
 
 jobs:
   # Build dependencies once and cache for other jobs

.github/workflows/web.yml

@@ -1,7 +1,11 @@
 name: Web CI
 
 on:
-  push:
+  pull_request:
+    branches:
+      - dev
+      - staging
+      - main
     paths:
       - "app/**"
       - ".github/workflows/web.yml"

README.md

@@ -86,6 +86,8 @@ These guides provide comprehensive context for AI-assisted development with Chat
 
 We are actively looking for contributors. Please check the [open issues](https://github.com/selfxyz/self/issues) if you don't know were to start! We offer bounties for significant contributions.
 
+> **Important:** Please open your pull request from the `staging` branch. Pull requests from other branches will be automatically closed.
+
 ## Contact us
 
 [Contact us](https://t.me/selfprotocolbuilder) on telegram for feedback or questions.

app/android/app/build.gradle

@@ -121,7 +121,7 @@ android {
         applicationId "com.proofofpassportapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 85
+        versionCode 90
         versionName "2.6.4"
         manifestPlaceholders = [appAuthRedirectScheme: 'com.proofofpassportapp']
         externalNativeBuild {

app/android/react-native-passport-reader/android/src/main/java/io/tradle/nfc/APDULogger.kt

@@ -0,0 +1,114 @@
+package io.tradle.nfc
+
+import net.sf.scuba.smartcards.APDUEvent
+import net.sf.scuba.smartcards.APDUListener
+import net.sf.scuba.smartcards.CommandAPDU
+import net.sf.scuba.smartcards.ResponseAPDU
+import org.jmrtd.WrappedAPDUEvent
+import android.util.Log
+
+class APDULogger : APDUListener {
+
+    private var moduleReference: RNPassportReaderModule? = null
+
+    private val sessionContext = mutableMapOf<String, Any>()
+
+    fun setModuleReference(module: RNPassportReaderModule) {
+        moduleReference = module
+    }
+
+    fun setContext(key: String, value: Any) {
+        sessionContext[key] = value
+    }
+
+    fun clearContext() {
+        sessionContext.clear()
+    }
+
+    override fun exchangedAPDU(event: APDUEvent) {
+        try {
+            val entry = createLogEntry(event)
+
+            logToAnalytics(entry)
+
+        } catch (e: Exception) {
+            Log.e("APDULogger", "Error exchanging APDU", e)
+        }
+    }
+
+    private fun createLogEntry(event: APDUEvent): APDULogEntry {
+        val command = event.commandAPDU
+        val response = event.responseAPDU
+        val timestamp = System.currentTimeMillis()
+
+        val entry = APDULogEntry(
+            timestamp = timestamp,
+            commandHex = command.bytes.toHexString(),
+            responseHex = response.bytes.toHexString(),
+            statusWord = response.sw,
+            statusWordHex = "0x${response.sw.toString(16).uppercase().padStart(4, '0')}",
+            commandLength = command.bytes.size,
+            responseLength = response.bytes.size,
+            dataLength = response.data.size,
+            isWrapped = event is WrappedAPDUEvent,
+            plainCommandHex = if (event is WrappedAPDUEvent) event.plainTextCommandAPDU.bytes.toHexString() else null,
+            plainResponseHex = if (event is WrappedAPDUEvent) event.plainTextResponseAPDU.bytes.toHexString() else null,
+            plainCommandLength = if (event is WrappedAPDUEvent) event.plainTextCommandAPDU.bytes.size else null,
+            plainResponseLength = if (event is WrappedAPDUEvent) event.plainTextResponseAPDU.bytes.size else null,
+            plainDataLength = if (event is WrappedAPDUEvent) event.plainTextResponseAPDU.data.size else null,
+            context = sessionContext.toMap()
+        )
+
+        return entry
+    }
+
+    private fun ByteArray.toHexString(): String {
+        return joinToString("") { "%02X".format(it) }
+    }
+
+    private fun logToAnalytics(entry: APDULogEntry) {
+        try {
+            val params = mutableMapOf<String, Any>().apply {
+                put("timestamp", entry.timestamp)
+                put("command_hex", entry.commandHex)
+                put("response_hex", entry.responseHex)
+                put("status_word", entry.statusWord)
+                put("status_word_hex", entry.statusWordHex)
+                put("command_length", entry.commandLength)
+                put("response_length", entry.responseLength)
+                put("data_length", entry.dataLength)
+                put("is_wrapped", entry.isWrapped)
+                put("context", entry.context)
+
+                entry.plainCommandHex?.let { put("plain_command_hex", it) }
+                entry.plainResponseHex?.let { put("plain_response_hex", it) }
+                entry.plainCommandLength?.let { put("plain_command_length", it) }
+                entry.plainResponseLength?.let { put("plain_response_length", it) }
+                entry.plainDataLength?.let { put("plain_data_length", it) }
+            }
+
+            moduleReference?.logAnalyticsEvent("nfc_apdu_exchange", params)
+
+        } catch (e: Exception) {
+            Log.e("APDULogger", "Error logging to analytics", e)
+        }
+    }
+}
+
+data class APDULogEntry(
+    val timestamp: Long,
+    val commandHex: String,
+    val responseHex: String,
+    val statusWord: Int,
+    val statusWordHex: String,
+    val commandLength: Int,
+    val responseLength: Int,
+    val dataLength: Int,
+    val isWrapped: Boolean,
+    val plainCommandHex: String?,
+    val plainResponseHex: String?,
+    val plainCommandLength: Int?,
+    val plainResponseLength: Int?,
+    val plainDataLength: Int?,
+    val context: Map<String, Any>
+)