Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0ab777b
updated changelogs and renamed 'start' back to birthday now below sap…
Oscar-Pepper Feb 25, 2026
3539dfa
updated zingo-status to version 0.2.0
Oscar-Pepper Feb 25, 2026
84446c0
Merge pull request #2205 from Oscar-Pepper/zingolib_v3_release_checks
Oscar-Pepper Feb 25, 2026
1f09ef2
Merge branch 'stable' into zingo_status_v0.2.0
Oscar-Pepper Feb 25, 2026
fc2c8f0
Merge pull request #2206 from Oscar-Pepper/zingo_status_v0.2.0
Oscar-Pepper Feb 25, 2026
8b812a7
update pepper-sync to v0.2.0
Oscar-Pepper Feb 25, 2026
7120369
update changelogs
Oscar-Pepper Feb 26, 2026
0060934
Merge pull request #2208 from Oscar-Pepper/pepper-sync_v0.2.0
Oscar-Pepper Feb 26, 2026
eb2bc6d
update changelog and cargo.toml for zingolib v3 release
Oscar-Pepper Feb 26, 2026
de1c419
update lock
Oscar-Pepper Feb 26, 2026
78eb762
add date to changelog
Oscar-Pepper Feb 26, 2026
48db52f
Merge pull request #2210 from Oscar-Pepper/zingolib_v3.0.0-rc.1
Oscar-Pepper Feb 26, 2026
9a13f68
added check to ensure birthday is not below sapling at wallet creatio…
Oscar-Pepper Feb 27, 2026
0493379
fix mock wallet birthday value
Oscar-Pepper Feb 27, 2026
fb7ced3
fix more tests with birthday below sapling
Oscar-Pepper Feb 27, 2026
9fbdaad
fix birthday of last failing test
Oscar-Pepper Feb 27, 2026
4e70b9c
Merge pull request #2213 from Oscar-Pepper/check_birthday_on_wallet_c…
Oscar-Pepper Feb 27, 2026
21cede9
improve new wallet birthday logic
Oscar-Pepper Feb 27, 2026
a6c2a27
Merge pull request #2215 from Oscar-Pepper/new_wallet_birthday_logic
juanky201271 Feb 27, 2026
7433481
fix zingo common dep
Oscar-Pepper Feb 28, 2026
17e1bcc
fix whitespace
Oscar-Pepper Feb 28, 2026
3f6a3d2
Merge pull request #2216 from Oscar-Pepper/zingo_common_components_fi…
Oscar-Pepper Feb 28, 2026
f44229e
use zcash_local_net tag with stable zingo_common_components version
Oscar-Pepper Feb 28, 2026
78b7b30
remove zingo common test features from zingolib
Oscar-Pepper Feb 28, 2026
adf1fcd
remove unnecessary version field in toml
Oscar-Pepper Feb 28, 2026
2cd0304
Merge pull request #2217 from Oscar-Pepper/stabilize_zcash_local_net_…
Oscar-Pepper Feb 28, 2026
b65f83f
backport from stable tag zingolib v3 rc5
Oscar-Pepper Feb 28, 2026
f1e3c4d
Merge pull request #2218 from zingolabs/stable_backport_zingolib_v3_rc5
Oscar-Pepper Feb 28, 2026
c138433
add apt update to doc test github workflow
Oscar-Pepper Mar 1, 2026
2a0c9fb
update cargo.toml and changelog for v3 rc6
Oscar-Pepper Mar 1, 2026
1273328
Merge pull request #2224 from Oscar-Pepper/fix_doc_test_ci
Oscar-Pepper Mar 1, 2026
0d39e26
resolve merge conflicts backporting from stable tag zingolib v3 rc6
Oscar-Pepper Mar 1, 2026
a697d94
solve conflict in Cargo.toml
Oscar-Pepper Mar 1, 2026
0d3b060
Merge pull request #2225 from Oscar-Pepper/stable_backport_zingolib_v…
juanky201271 Mar 1, 2026
c37b004
chore: initial kitchen sink app
dorianvp Mar 5, 2026
f86f87f
remove and ignore IDE generated files
zancas Mar 6, 2026
62d9292
Merge remote-tracking branch 'zingolabs/dev' into ffi-kitchen-sync
zancas Mar 6, 2026
e087bf1
remove and ignore .idea
zancas Mar 6, 2026
fc5e486
Merge pull request #2230 from zingolabs/ffi-kitchen-sync_01
dorianvp Mar 6, 2026
146a275
chore: sample app arrangements
dorianvp Mar 6, 2026
7985236
chore: sample app header padding
dorianvp Mar 6, 2026
8666378
chore: more kotlin tests
dorianvp Mar 6, 2026
4645777
chore: add kotlin task
dorianvp Mar 6, 2026
7784a45
chore(`kotlin`): add ufvk-import test
dorianvp Mar 6, 2026
5d8f3ee
chore: wallet persistence
dorianvp Mar 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
- name: Install protoc
run: |
if ! command -v protoc; then
sudo apt-get update
sudo apt-get install -y protobuf-compiler
fi

Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@ test_binaries/bins/*
libtonode-tests/tests/chain_generics.proptest-regressions
libtonode-tests/store_all_checkpoints_test

# FFI-specific
ffi/android/ZingolibFfi/.idea/*
ffi/android/ZingolibFfi/.idea
*.so

.DS_Store
*.dat
58 changes: 35 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 7 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ zebra-chain = "5.0.0"

# Zingo-common
zingo-netutils = "2.0.1"
zingo_common_components = { git = "https://github.com/zingolabs/zingo-common.git", version = "0.2" }
zingo_common_components = "0.2.0"

# Parallel processing
crossbeam-channel = "0.5"
Expand Down Expand Up @@ -117,18 +117,14 @@ webpki-roots = "1.0.6"
# zingo-memo = { path = "zingo-memo" } # NOTE: for development between releases
zingo-memo = "0.1.0"
zingo-price = { path = "zingo-price" }
zingo-status = { path = "zingo-status" } # NOTE: for development between releases
# zingo-status = "0.1.0"
pepper-sync = { path = "pepper-sync" }
# zingo-status = { path = "zingo-status" } # NOTE: for development between releases
zingo-status = "0.2.0"
pepper-sync = { path = "pepper-sync" } # NOTE: for development between releases
# pepper-sync = "0.2.0"
zingolib = { path = "zingolib" }
zcash_local_net = { git = "https://github.com/zingolabs/infrastructure.git", rev = "e4714fd" }
zingo_test_vectors = { git = "https://github.com/zingolabs/infrastructure.git", rev = "e4714fd" }
zcash_local_net = { git = "https://github.com/zingolabs/infrastructure.git", tag = "for_zingolib_v3_release" }
zingo_test_vectors = { git = "https://github.com/zingolabs/infrastructure.git", rev = "for_zingolib_v3_release" }
ffi = { path = "ffi/rust" }

[patch.crates-io]
# Necessary to cross-compile for armv7a. Hopefully this merges upstream soon.
# zcash_script = { git = "https://github.com/dorianvp/zcash_script", rev = "a86c8a81f76e9dc6b3dc27c508f4c34fa77a6da3" }
# libzcash_script = { git = "https://github.com/dorianvp/zcash_script", rev = "a86c8a81f76e9dc6b3dc27c508f4c34fa77a6da3" }

[profile.test]
opt-level = 3
15 changes: 15 additions & 0 deletions ffi/android/ZingolibFfi/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
1 change: 1 addition & 0 deletions ffi/android/ZingolibFfi/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
60 changes: 60 additions & 0 deletions ffi/android/ZingolibFfi/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
}

android {
namespace = "com.example.zingolibffi"
compileSdk {
version = release(36)
}

defaultConfig {
applicationId = "com.example.zingolibffi"
minSdk = 28
targetSdk = 36
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
compose = true
}
}

dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)
}
21 changes: 21 additions & 0 deletions ffi/android/ZingolibFfi/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.example.zingolibffi

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.example.zingolibffi", appContext.packageName)
}
}
27 changes: 27 additions & 0 deletions ffi/android/ZingolibFfi/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.ZingolibFfi">
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.ZingolibFfi">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Loading
Loading