Skip to content

Commit 03979b1

Browse files
committed
fixes
1 parent d8a5c53 commit 03979b1

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/setup-java@v3
3333
with:
3434
distribution: liberica
35-
java-version: 17
35+
java-version: 1.8
3636
- name: Build using gradle
3737
uses: gradle/gradle-build-action@v2
3838
with:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/setup-java@v3
1414
with:
1515
distribution: liberica
16-
java-version: 17
16+
java-version: 1.8
1717
- name: Build using gradle
1818
uses: gradle/gradle-build-action@v2
1919
with:

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ val isCI = System.getenv("CI") == "true"
2020

2121
allprojects {
2222
group = "org.ton"
23-
version = "0.2.16"
23+
version = "0.2.16-SNAPSHOT"
2424

2525
apply(plugin = "kotlin-multiplatform")
2626
apply(plugin = "kotlinx-serialization")

ton-kotlin-cell/src/commonMain/kotlin/org/ton/cell/Cell.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ public interface Cell {
8282
appendable.append(cell.type.toString())
8383
appendable.append(' ')
8484
}
85-
appendable.append("x{")
8685
appendable.append(cell.bits.toString())
87-
appendable.append("}")
8886
cell.refs.forEach { reference ->
8987
appendable.append('\n')
9088
toString(reference, appendable, "$indent ")

ton-kotlin-liteclient/src/commonMain/kotlin/org/ton/lite/client/CheckProofUtils.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.ton.lite.client
22

33
import org.ton.api.tonnode.TonNodeBlockIdExt
44
import org.ton.bitstring.BitString
5+
import org.ton.bitstring.toBitString
56
import org.ton.block.*
67
import org.ton.boc.BagOfCells
78
import org.ton.cell.Cell
@@ -17,7 +18,7 @@ internal object CheckProofUtils {
1718
storeStateHash: Boolean = false,
1819
): BlockHeaderResult {
1920
val virtualHash = root.hash()
20-
check(virtualHash == blockId.rootHash) {
21+
check(virtualHash == blockId.rootHash.toByteArray().toBitString()) {
2122
"Invalid hash for block: $blockId, expected: ${blockId.rootHash}, actual: $virtualHash"
2223
}
2324
val block = Block.loadTlb(root)

ton-kotlin-liteclient/src/commonMain/kotlin/org/ton/lite/client/internal/BlockHeaderResult.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.ton.lite.client.internal
22

3+
import kotlinx.serialization.SerialName
4+
import kotlinx.serialization.Serializable
35
import org.ton.api.tonnode.TonNodeBlockIdExt
46
import org.ton.bitstring.BitString
57
import org.ton.bitstring.toBitString
@@ -15,25 +17,29 @@ internal data class BlockHeaderResult(
1517
val stateHash: BitString?
1618
)
1719

18-
public class FullAccountState(
20+
@Serializable
21+
public data class FullAccountState(
22+
@SerialName("block_id")
1923
@get:JvmName("blockId")
2024
public val blockId: TonNodeBlockIdExt,
2125

2226
@get:JvmName("address")
2327
public val address: AddrStd,
2428

29+
@SerialName("last_transaction_id")
2530
@get:JvmName("lastTransactionId")
2631
public val lastTransactionId: TransactionId?,
2732

28-
@get:JvmName("accountInfo")
33+
@get:JvmName("account")
2934
public val account: CellRef<Account>
3035
)
3136

37+
@Serializable
3238
public data class TransactionId(
3339
@get:JvmName("hash")
3440
val hash: BitString,
3541

36-
@get:JvmName("id")
42+
@get:JvmName("lt")
3743
val lt: Long
3844
) {
3945
public constructor(hash: ByteArray, lt: Long) : this(hash.toBitString(), lt)
@@ -43,7 +49,9 @@ public data class TransactionId(
4349
}
4450
}
4551

52+
@Serializable
4653
public data class TransactionInfo(
54+
@SerialName("block_id")
4755
@get:JvmName("blockId")
4856
val blockId: TonNodeBlockIdExt,
4957

0 commit comments

Comments
 (0)