Skip to content

Commit 3e27d92

Browse files
jakubuidjakubuid
authored
Merge pull request #163 from reown-com/develop
BOM_1.4.7
2 parents d2e24fe + 3dbf897 commit 3e27d92

File tree

13 files changed

+34
-38
lines changed

13 files changed

+34
-38
lines changed

‎.github/workflows/ci_e2e_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Build sample - Internal
5656
env:
5757
CI: "true"
58-
YTTRIUM_CI_VERSION: "0.0.19-ci" # Specify the yttrium version for CI builds
58+
YTTRIUM_CI_VERSION: "0.0.20-ci" # Specify the yttrium version for CI builds
5959
WC_CLOUD_PROJECT_ID: ${{ secrets.WC_CLOUD_PROJECT_ID }}
6060
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
6161
NOTIFY_INTEGRATION_TESTS_PROJECT_ID: ${{ secrets.NOTIFY_INTEGRATION_TESTS_PROJECT_ID }}

‎buildSrc/src/main/kotlin/Versions.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
55
const val KEY_SDK_NAME = "SDK_NAME"
66

77
//Latest versions
8-
const val BOM_VERSION = "1.4.6"
9-
const val FOUNDATION_VERSION = "1.4.6"
10-
const val CORE_VERSION = "1.4.6"
11-
const val SIGN_VERSION = "1.4.6"
12-
const val NOTIFY_VERSION = "1.4.6"
13-
const val WALLETKIT_VERSION = "1.4.6"
14-
const val APPKIT_VERSION = "1.4.6"
15-
const val MODAL_CORE_VERSION = "1.4.6"
8+
const val BOM_VERSION = "1.4.7"
9+
const val FOUNDATION_VERSION = "1.4.7"
10+
const val CORE_VERSION = "1.4.7"
11+
const val SIGN_VERSION = "1.4.7"
12+
const val NOTIFY_VERSION = "1.4.7"
13+
const val WALLETKIT_VERSION = "1.4.7"
14+
const val APPKIT_VERSION = "1.4.7"
15+
const val MODAL_CORE_VERSION = "1.4.7"
1616

1717
//Artifact ids
1818
const val ANDROID_BOM = "android-bom"
@@ -26,7 +26,7 @@ const val MODAL_CORE = "modal-core"
2626

2727
val jvmVersion = JavaVersion.VERSION_11
2828
const val MIN_SDK: Int = 23
29-
const val TARGET_SDK: Int = 34
29+
const val TARGET_SDK: Int = 35
3030
const val COMPILE_SDK: Int = TARGET_SDK
3131
val SAMPLE_VERSION_CODE = BOM_VERSION.replace(".", "").toInt()
3232
const val SAMPLE_VERSION_NAME = BOM_VERSION

‎core/android/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ dependencies {
100100

101101
// Use specific yttrium version for CI builds, default version for local builds
102102
val yttriumVersion = if (System.getenv("CI") == "true") {
103-
System.getenv("YTTRIUM_CI_VERSION") ?: "0.0.19-ci"
103+
System.getenv("YTTRIUM_CI_VERSION") ?: "0.0.20-ci"
104104
} else {
105-
"0.9.43"
105+
"0.9.55"
106106
}
107107
api("com.github.reown-com:yttrium:$yttriumVersion") //unspecified
108108
implementation("net.java.dev.jna:jna:5.15.0@aar")

‎core/android/src/main/kotlin/com/reown/android/internal/common/JsonRpcResponse.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sealed class JsonRpcResponse : SerializableJsonRpc {
1010
data class JsonRpcResult(
1111
override val id: Long,
1212
val jsonrpc: String = "2.0",
13-
val result: Any,
13+
val result: Any?,
1414
) : JsonRpcResponse()
1515

1616
@JsonClass(generateAdapter = true)

‎core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,6 @@ internal class PairingEngine(
135135
logger.log("Creating Pairing")
136136
pairingRepository.insertPairing(this)
137137
metadataRepository.upsertPeerMetadata(this.topic, selfMetaData, AppMetaDataType.SELF)
138-
jsonRpcInteractor.subscribe(
139-
topic = this.topic,
140-
onSuccess = { logger.log("Pairing - subscribed on pairing topic: $pairingTopic") },
141-
onFailure = { error -> logger.error("Pairing - subscribed failure on pairing topic: $pairingTopic, error: $error") }
142-
)
143-
144138
this.toCore()
145139
}.onFailure { throwable ->
146140
try {

‎product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ object Modal {
183183

184184
data class JsonRpcResult(
185185
override val id: Long,
186-
val result: String,
186+
val result: String?,
187187
) : JsonRpcResponse()
188188

189189
data class JsonRpcError(

‎product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ internal class AppKitEngine(
323323
val siweResponse = Modal.Model.SIWEAuthenticateResponse.Result(
324324
id = response.result.id,
325325
message = siweRequestIdWithMessage!!.second,
326-
signature = (response.result as Sign.Model.JsonRpcResponse.JsonRpcResult).result
326+
signature = (response.result as Sign.Model.JsonRpcResponse.JsonRpcResult).result ?: ""
327327
)
328328
siweRequestIdWithMessage = null
329329
val account = getAccount() ?: throw IllegalStateException("Account is null")

‎product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import com.reown.sign.client.Sign
55
import com.squareup.moshi.Moshi
66
//import uniffi.uniffi_yttrium.Eip1559Estimation
77
//import uniffi.yttrium.Amount
8-
import uniffi.yttrium.Call
9-
import uniffi.yttrium.DoSendTransactionParams
8+
//import uniffi.yttrium.Call
9+
//import uniffi.yttrium.DoSendTransactionParams
1010
//import uniffi.yttrium.ExecuteDetails
1111
//import uniffi.yttrium.FeeEstimatedTransaction
1212
//import uniffi.yttrium.FundingMetadata
1313
//import uniffi.yttrium.InitialTransactionMetadata
14-
import uniffi.yttrium.OwnerSignature
14+
//import uniffi.yttrium.OwnerSignature
1515
//import uniffi.yttrium.PrepareResponseAvailable
16-
import uniffi.yttrium.PreparedSendTransaction
16+
//import uniffi.yttrium.PreparedSendTransaction
1717
//import uniffi.yttrium.Route
1818
//import uniffi.yttrium.RouteSig
1919
////import uniffi.yttrium.SolanaTransaction
@@ -312,17 +312,17 @@ internal fun Sign.Model.ConnectionState.Reason.toWallet(): Wallet.Model.Connecti
312312
is Sign.Model.ConnectionState.Reason.ConnectionFailed -> Wallet.Model.ConnectionState.Reason.ConnectionFailed(this.throwable)
313313
}
314314

315-
@JvmSynthetic
316-
internal fun PreparedSendTransaction.toWallet(moshi: Moshi): Wallet.Params.PrepareSendTransactionsResult {
317-
val jsonParams = moshi.adapter(DoSendTransactionParams::class.java).toJson(doSendTransactionParams)
318-
return Wallet.Params.PrepareSendTransactionsResult(hash = hash, doSendTransactionParams = jsonParams, eip712Domain = domain)
319-
}
315+
//@JvmSynthetic
316+
//internal fun PreparedSendTransaction.toWallet(moshi: Moshi): Wallet.Params.PrepareSendTransactionsResult {
317+
// val jsonParams = moshi.adapter(DoSendTransactionParams::class.java).toJson(doSendTransactionParams)
318+
// return Wallet.Params.PrepareSendTransactionsResult(hash = hash, doSendTransactionParams = jsonParams, eip712Domain = domain)
319+
//}
320320

321-
@JvmSynthetic
322-
internal fun Call.toWallet(): Wallet.Model.Call = Wallet.Model.Call(to = to, value = value, input = input)
321+
//@JvmSynthetic
322+
//internal fun Call.toWallet(): Wallet.Model.Call = Wallet.Model.Call(to = to, value = value, input = input)
323323

324-
@JvmSynthetic
325-
internal fun Wallet.Params.OwnerSignature.toYttrium(): OwnerSignature = OwnerSignature(owner = address, signature = signature)
324+
//@JvmSynthetic
325+
//internal fun Wallet.Params.OwnerSignature.toYttrium(): OwnerSignature = OwnerSignature(owner = address, signature = signature)
326326

327327
//@JvmSynthetic
328328
//internal fun ExecuteDetails.toWallet(): Wallet.Model.ExecuteSuccess = Wallet.Model.ExecuteSuccess(

‎product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ object Wallet {
321321

322322
data class JsonRpcResult(
323323
override val id: Long,
324-
val result: String,
324+
val result: String?,
325325
) : JsonRpcResponse()
326326

327327
data class JsonRpcError(

‎protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SignClientInstrumentedAndroidTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ class SignClientInstrumentedAndroidTest {
352352
is Sign.Model.JsonRpcResponse.JsonRpcError -> fail("Expected result response not error: ${(response.result as Sign.Model.JsonRpcResponse.JsonRpcError).message}")
353353
is Sign.Model.JsonRpcResponse.JsonRpcResult -> {
354354
assert(response.method == "wallet_getAssets")
355-
assert((response.result as Sign.Model.JsonRpcResponse.JsonRpcResult).result.contains("balance"))
355+
assert(response.result.result != null)
356+
assert(response.result.result!!.contains("balance"))
356357
scenarioExtension.closeAsSuccess()
357358
.also { Timber.d("receive session request response: finish: ${(response.result as Sign.Model.JsonRpcResponse.JsonRpcResult).result}") }
358359
}

0 commit comments

Comments
 (0)