Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 2.4.1 #641

Merged
merged 8 commits into from
Oct 18, 2024
Merged

Hotfix 2.4.1 #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3694e5
Use lightning-kmp 1.8.3-SNAPSHOT
dpad85 Oct 15, 2024
b2043d2
Fix legacy migration test
dpad85 Oct 15, 2024
6ead4c4
(android) Increment build code (94)
dpad85 Oct 16, 2024
92d23fd
(ios) Fix default parameter in auto liquidity setting
dpad85 Oct 16, 2024
6dd78de
(ios) Mark stale resources
dpad85 Oct 16, 2024
40c963d
(ios) Increment build code (83)
dpad85 Oct 16, 2024
141af58
Use lightning-kmp 1.8.3
dpad85 Oct 16, 2024
aa146da
Use lightning-kmp 1.8.4
dpad85 Oct 17, 2024
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
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Versions {
const val lightningKmp = "1.8.1"
const val lightningKmp = "1.8.4"
const val secp256k1 = "0.14.0"
const val torMobile = "0.2.0"

Expand Down
2 changes: 1 addition & 1 deletion phoenix-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
applicationId = "fr.acinq.phoenix.testnet"
minSdk = 26
targetSdk = 34
versionCode = 93
versionCode = 94
versionName = gitCommitHash()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
resourceConfigurations.addAll(listOf("en", "fr", "de", "es", "b+es+419", "cs", "pt-rBR", "sk", "vi", "sw"))
Expand Down
3 changes: 2 additions & 1 deletion ...nix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/receive/ReceiveViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import org.slf4j.LoggerFactory
import kotlin.time.Duration.Companion.seconds

sealed class LightningInvoiceState {
data object Init : LightningInvoiceState()
Expand Down Expand Up @@ -108,7 +109,7 @@ class ReceiveViewModel(
paymentPreimage = Lightning.randomBytes32(),
amount = amount,
description = Either.Left(description),
expirySeconds = expirySeconds
expiry = expirySeconds.seconds
)
lightningQRBitmap = BitmapHelper.generateBitmap(pr.write()).asImageBitmap()
log.debug("generated new invoice=${pr.write()}")
Expand Down
19 changes: 10 additions & 9 deletions phoenix-android/src/test/kotlin/fr/acinq/phoenix/utils/LegacyMigrationHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class LegacyMigrationHelperTest {
received = IncomingPayment.Received(
receivedWith = listOf(
IncomingPayment.ReceivedWith.NewChannel(
amount = 32_000_000.msat,
amountReceived = 32_000_000.msat,
serviceFee = 0.msat,
miningFee = 0.sat,
channelId = ByteVector32.Zeroes,
Expand All @@ -268,9 +268,10 @@ class LegacyMigrationHelperTest {
received = IncomingPayment.Received(
receivedWith = listOf(
IncomingPayment.ReceivedWith.LightningPayment(
amount = 55_000.msat,
amountReceived = 55_000.msat,
channelId = ByteVector32.Zeroes,
htlcId = 0
htlcId = 0,
fundingFee = null
)
),
receivedAt = 1656337800788
Expand All @@ -290,9 +291,10 @@ class LegacyMigrationHelperTest {
received = IncomingPayment.Received(
receivedWith = listOf(
IncomingPayment.ReceivedWith.LightningPayment(
amount = 350_000.msat,
amountReceived = 350_000.msat,
channelId = ByteVector32.Zeroes,
htlcId = 0
htlcId = 0,
fundingFee = null
)
),
receivedAt = 1656338085497
Expand All @@ -314,7 +316,7 @@ class LegacyMigrationHelperTest {
received = IncomingPayment.Received(
receivedWith = listOf(
IncomingPayment.ReceivedWith.NewChannel(
amount = 57_000_000.msat,
amountReceived = 57_000_000.msat,
channelId = ByteVector32.Zeroes,
serviceFee = 3_000_000.msat,
miningFee = 0.sat,
Expand All @@ -341,10 +343,9 @@ class LegacyMigrationHelperTest {
received = IncomingPayment.Received(
receivedWith = listOf(
IncomingPayment.ReceivedWith.NewChannel(
amount = 562_212_000.msat,
amountReceived = 562_212_000.msat,
channelId = ByteVector32.Zeroes,
txId = TxId(
ByteVector32.Zeroes),
txId = TxId(ByteVector32.Zeroes),
serviceFee = 5_678_000.msat,
miningFee = 0.sat,
confirmedAt = 1656403752448,
Expand Down
12 changes: 6 additions & 6 deletions phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Blue";
CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 82;
CURRENT_PROJECT_VERSION = 83;
DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
DEVELOPMENT_TEAM = XD77LN4376;
ENABLE_PREVIEWS = YES;
Expand All @@ -2377,7 +2377,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Blue";
CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 82;
CURRENT_PROJECT_VERSION = 83;
DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
DEVELOPMENT_TEAM = XD77LN4376;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2479,7 +2479,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 82;
CURRENT_PROJECT_VERSION = 83;
DEVELOPMENT_TEAM = XD77LN4376;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -2508,7 +2508,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 82;
CURRENT_PROJECT_VERSION = 83;
DEVELOPMENT_TEAM = XD77LN4376;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -2537,7 +2537,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 82;
CURRENT_PROJECT_VERSION = 83;
DEVELOPMENT_TEAM = XD77LN4376;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
Expand All @@ -2564,7 +2564,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 82;
CURRENT_PROJECT_VERSION = 83;
DEVELOPMENT_TEAM = XD77LN4376;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
Expand Down
Loading