HashMap builders & kotlin-map conversions #41

andreypfau · andreypfau · commit 04a0ef9b06a4 · 2023-01-29T08:46:50.000+03:00
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 ```kotlin
 dependencies {
-    implementation("org.ton:ton-kotlin:0.2.7")
+    implementation("org.ton:ton-kotlin:0.2.8")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ val isCI = System.getenv("CI") == "true"
 
 allprojects {
     group = "org.ton"
-    version = "0.2.7"
+    version = "0.2.8"
 
     apply(plugin = "kotlin-multiplatform")
     apply(plugin = "kotlinx-serialization")
diff --git a/ton-kotlin-block/src/commonMain/kotlin/org/ton/block/AccountInfo.kt b/ton-kotlin-block/src/commonMain/kotlin/org/ton/block/AccountInfo.kt
@@ -20,10 +20,12 @@ public data class AccountInfo(
 ) : Account {
     public companion object : TlbConstructorProvider<AccountInfo> by AccountInfoTlbConstructor
 
-    override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter = printer.type("account") {
-        field("addr", addr)
-        field("storage_stat", storageStat)
-        field("storage", storage)
+    override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter = printer {
+        type("account") {
+            field("addr", addr)
+            field("storage_stat", storageStat)
+            field("storage", storage)
+        }
     }
 
     override fun toString(): String = print().toString()
diff --git a/ton-kotlin-boc/jvm/test/test.kt b/ton-kotlin-boc/jvm/test/test.kt
@@ -0,0 +1,15 @@
+import io.ktor.util.*
+import org.ton.boc.BagOfCells
+import org.ton.crypto.base64
+import org.ton.crypto.encodeHex
+
+fun main() {
+    val bocBase64 =
+        "te6ccuEBAQEASwCWAJIAAAAAQXVjdGlvbiBwcm9jZWVkcyBmb3IgdXNkdHh4eC50Lm1lIG1pbnVzIGNvbnZlcnNpb24gZmVlIGFuZCByb3lhbHRpZXMunEsqdg=="
+    val boc = BagOfCells(base64(bocBase64))
+    val cell = boc.first()
+    println("cell: $cell")
+    val newBoc = BagOfCells(cell)
+    println("old boc: ${bocBase64.decodeBase64Bytes().encodeHex()}")
+    println("new boc: ${newBoc.toByteArray().encodeHex()}")
+}
diff --git a/ton-kotlin-boc/src/commonMain/kotlin/org/ton/boc/BagOfCells.kt b/ton-kotlin-boc/src/commonMain/kotlin/org/ton/boc/BagOfCells.kt
@@ -49,6 +49,6 @@ public interface BagOfCells : Iterable<Cell> {
         }
 
         @JvmStatic
-        public fun read(input: Input): BagOfCells = input.readBagOfCell()
+        public fun read(input: Input): BagOfCells = ByteReadPacket(input.readBytes()).readBagOfCell()
     }
 }
diff --git a/ton-kotlin-boc/src/commonMain/kotlin/org/ton/boc/BagOfCellsUtils.kt b/ton-kotlin-boc/src/commonMain/kotlin/org/ton/boc/BagOfCellsUtils.kt
@@ -5,10 +5,11 @@ import org.ton.bitstring.BitString
 import org.ton.cell.Cell
 import org.ton.cell.LevelMask
 import org.ton.crypto.crc32c
+import org.ton.crypto.encodeHex
 import kotlin.experimental.and
 
 @OptIn(ExperimentalUnsignedTypes::class)
-internal fun Input.readBagOfCell(): BagOfCells {
+internal fun ByteReadPacket.readBagOfCell(): BagOfCells {
     val prefix = readInt()
     val hasIdx: Boolean
     val hashCrc32: Boolean
diff --git a/ton-kotlin-contract/src/commonMain/kotlin/org/ton/contract/wallet/GetPublicKeyContract.kt b/ton-kotlin-contract/src/commonMain/kotlin/org/ton/contract/wallet/GetPublicKeyContract.kt
@@ -11,7 +11,7 @@ interface GetPublicKeyContract : Contract {
 
     suspend fun getPublicKey(blockIdExt: TonNodeBlockIdExt): PublicKeyEd25519 {
         val address = address()
-        val liteServerAccountId = LiteServerAccountId(address.workchainId, address.address.toByteArray())
+        val liteServerAccountId = LiteServerAccountId(address.workchainId, address.address)
         val result = liteClient.runSmcMethod(
             address = liteServerAccountId,
             methodName = "get_public_key",
diff --git a/ton-kotlin-contract/src/commonMain/kotlin/org/ton/contract/wallet/SeqnoContract.kt b/ton-kotlin-contract/src/commonMain/kotlin/org/ton/contract/wallet/SeqnoContract.kt
@@ -10,7 +10,7 @@ interface SeqnoContract : Contract {
 
     public suspend fun seqno(blockIdExt: TonNodeBlockIdExt): Int {
         val address = address()
-        val liteServerAccountId = LiteServerAccountId(address.workchainId, address.address.toByteArray())
+        val liteServerAccountId = LiteServerAccountId(address.workchainId, address.address)
         val result = liteClient.runSmcMethod(
             address = liteServerAccountId,
             methodName = "get_seqno",
diff --git a/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/LiteApi.kt b/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/LiteApi.kt
@@ -4,8 +4,16 @@ import org.ton.lite.api.liteserver.*
 import org.ton.lite.api.liteserver.functions.*
 
 public interface LiteApi {
-    public suspend operator fun invoke(function: LiteServerGetMasterchainInfo): LiteServerMasterchainInfo
-    public suspend operator fun invoke(function: LiteServerGetMasterchainInfoExt): LiteServerMasterchainInfoExt
+    public suspend operator fun invoke(
+        function: LiteServerGetMasterchainInfo,
+        waitMasterchainSeqno: Int = -1
+    ): LiteServerMasterchainInfo
+
+    public suspend operator fun invoke(
+        function: LiteServerGetMasterchainInfoExt,
+        waitMasterchainSeqno: Int = -1
+    ): LiteServerMasterchainInfoExt
+
     public suspend operator fun invoke(function: LiteServerGetTime): LiteServerCurrentTime
     public suspend operator fun invoke(function: LiteServerGetVersion): LiteServerVersion
     public suspend operator fun invoke(function: LiteServerGetBlock): LiteServerBlockData
@@ -18,7 +26,11 @@ public interface LiteApi {
     public suspend operator fun invoke(function: LiteServerGetOneTransaction): LiteServerTransactionInfo
     public suspend operator fun invoke(function: LiteServerGetAllShardsInfo): LiteServerAllShardsInfo
     public suspend operator fun invoke(function: LiteServerGetTransactions): LiteServerTransactionList
-    public suspend operator fun invoke(function: LiteServerLookupBlock): LiteServerBlockHeader
+    public suspend operator fun invoke(
+        function: LiteServerLookupBlock,
+        waitMasterchainSeqno: Int = -1
+    ): LiteServerBlockHeader
+
     public suspend operator fun invoke(function: LiteServerListBlockTransactions): LiteServerBlockTransactions
     public suspend operator fun invoke(function: LiteServerGetBlockProof): LiteServerPartialBlockProof
     public suspend operator fun invoke(function: LiteServerGetConfigAll): LiteServerConfigInfo
diff --git a/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/LiteApiClient.kt b/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/LiteApiClient.kt
@@ -11,12 +11,12 @@ public interface LiteApiClient : LiteApi {
         queryCodec: TlCodec<Q>,
         answerCodec: TlCodec<A>,
         query: Q,
-        seqno: Int = -1
+        waitMasterchainSeqno: Int = -1
     ): A {
         val rawQuery = buildPacket {
 //            println("send query to lite server: $query")
-            if (seqno >= 0) {
-                val wait = LiteServerWaitMasterchainSeqno(seqno, 5000)
+            if (waitMasterchainSeqno > 0) {
+                val wait = LiteServerWaitMasterchainSeqno(waitMasterchainSeqno, 30000)
 //                println("with prefix: $wait")
                 LiteServerWaitMasterchainSeqno.encodeBoxed(this, wait)
             }
@@ -40,11 +40,17 @@ public interface LiteApiClient : LiteApi {
 
     public suspend fun sendRawQuery(query: ByteReadPacket): ByteReadPacket
 
-    override suspend fun invoke(function: LiteServerGetMasterchainInfo): LiteServerMasterchainInfo =
-        sendQuery(LiteServerGetMasterchainInfo, LiteServerMasterchainInfo, function)
+    override suspend fun invoke(
+        function: LiteServerGetMasterchainInfo,
+        waitMasterchainSeqno: Int
+    ): LiteServerMasterchainInfo =
+        sendQuery(LiteServerGetMasterchainInfo, LiteServerMasterchainInfo, function, waitMasterchainSeqno)
 
-    override suspend fun invoke(function: LiteServerGetMasterchainInfoExt): LiteServerMasterchainInfoExt =
-        sendQuery(LiteServerGetMasterchainInfoExt, LiteServerMasterchainInfoExt, function)
+    override suspend fun invoke(
+        function: LiteServerGetMasterchainInfoExt,
+        waitMasterchainSeqno: Int
+    ): LiteServerMasterchainInfoExt =
+        sendQuery(LiteServerGetMasterchainInfoExt, LiteServerMasterchainInfoExt, function, waitMasterchainSeqno)
 
     override suspend fun invoke(function: LiteServerGetTime): LiteServerCurrentTime =
         sendQuery(LiteServerGetTime, LiteServerCurrentTime, function)
@@ -82,8 +88,8 @@ public interface LiteApiClient : LiteApi {
     override suspend fun invoke(function: LiteServerGetTransactions): LiteServerTransactionList =
         sendQuery(LiteServerGetTransactions, LiteServerTransactionList, function)
 
-    override suspend fun invoke(function: LiteServerLookupBlock): LiteServerBlockHeader =
-        sendQuery(LiteServerLookupBlock, LiteServerBlockHeader, function)
+    override suspend fun invoke(function: LiteServerLookupBlock, waitMasterchainSeqno: Int): LiteServerBlockHeader =
+        sendQuery(LiteServerLookupBlock, LiteServerBlockHeader, function, waitMasterchainSeqno)
 
     override suspend fun invoke(function: LiteServerListBlockTransactions): LiteServerBlockTransactions =
         sendQuery(LiteServerListBlockTransactions, LiteServerBlockTransactions, function)
diff --git a/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/liteserver/LiteServerAccountId.kt b/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/liteserver/LiteServerAccountId.kt
@@ -2,10 +2,10 @@
 
 package org.ton.lite.api.liteserver
 
-import io.ktor.utils.io.core.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
+import org.ton.bitstring.Bits256
 import org.ton.crypto.HexByteArraySerializer
 import org.ton.tl.TlConstructor
 import org.ton.tl.TlReader
@@ -15,40 +15,20 @@ import org.ton.tl.TlWriter
 @SerialName("liteServer.accountId")
 public data class LiteServerAccountId(
     val workchain: Int,
-    val id: ByteArray
+    val id: Bits256
 ) {
-    init {
-        require(id.size == 32) { "id must be 32 bytes long" }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is LiteServerAccountId) return false
-
-        if (workchain != other.workchain) return false
-        if (!id.contentEquals(other.id)) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = workchain
-        result = 31 * result + id.contentHashCode()
-        return result
-    }
-
     public companion object : TlConstructor<LiteServerAccountId>(
         schema = "liteServer.accountId workchain:int id:int256 = liteServer.AccountId"
     ) {
         override fun decode(reader: TlReader): LiteServerAccountId {
             val workchain = reader.readInt()
-            val id = reader.readRaw(32)
+            val id = reader.readBits256()
             return LiteServerAccountId(workchain, id)
         }
 
         override fun encode(writer: TlWriter, value: LiteServerAccountId) {
             writer.writeInt(value.workchain)
-            writer.writeRaw(value.id)
+            writer.writeBits256(value.id)
         }
     }
 }
diff --git a/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/liteserver/LiteServerAccountState.kt b/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/liteserver/LiteServerAccountState.kt
@@ -2,8 +2,6 @@
 
 package org.ton.lite.api.liteserver
 
-import io.ktor.util.*
-import io.ktor.utils.io.core.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
diff --git a/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/liteserver/functions/LiteServerRunSmcMethod.kt b/ton-kotlin-liteapi/src/commonMain/kotlin/org/ton/lite/api/liteserver/functions/LiteServerRunSmcMethod.kt
@@ -42,7 +42,9 @@ public data class LiteServerRunSmcMethod(
         return result
     }
 
-    public companion object : TlCodec<LiteServerRunSmcMethod> by LiteServerRunSmcMethodTlConstructor
+    public companion object : TlCodec<LiteServerRunSmcMethod> by LiteServerRunSmcMethodTlConstructor {
+
+    }
 }
 
 private object LiteServerRunSmcMethodTlConstructor : TlConstructor<LiteServerRunSmcMethod>(
diff --git a/ton-kotlin-liteclient/src/commonMain/kotlin/org/ton/lite/client/LiteClient.kt b/ton-kotlin-liteclient/src/commonMain/kotlin/org/ton/lite/client/LiteClient.kt
@@ -485,7 +485,7 @@ public class LiteClient(
         "dnsroot" -> TODO()
         else -> {
             val addrStd = AddrStd(string)
-            LiteServerAccountId(addrStd.workchainId, addrStd.address.toByteArray())
+            LiteServerAccountId(addrStd.workchainId, addrStd.address)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	```kotlin
`13`	`13`	`dependencies {`
`14`		`- implementation("org.ton:ton-kotlin:0.2.7")`
	`14`	`+ implementation("org.ton:ton-kotlin:0.2.8")`
`15`	`15`	`}`
`16`	`16`	```
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ public interface BagOfCells : Iterable<Cell> {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@JvmStatic`
`52`		`- public fun read(input: Input): BagOfCells = input.readBagOfCell()`
	`52`	`+ public fun read(input: Input): BagOfCells = ByteReadPacket(input.readBytes()).readBagOfCell()`
`53`	`53`	`}`
`54`	`54`	`}`