blocks struct refactoring

Signed-off-by: andreypfau <[email protected]>

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4

bitstring/src/BitString.kt

@@ -49,6 +49,7 @@ public interface BitString : Iterable<Boolean>, Comparable<BitString> {
     public fun plus(bytes: ByteArray, bits: Int): BitString
 
     public fun toByteArray(augment: Boolean = false): ByteArray
+    public fun toByteString(): ByteString = ByteString(*toByteArray())
     public fun toBooleanArray(): BooleanArray
     public fun toMutableBitString(): MutableBitString
     public fun toBitString(): BitString = this

bitstring/src/ByteBackedBitString.kt

@@ -1,5 +1,6 @@
 package org.ton.bitstring
 
+import kotlinx.io.bytestring.ByteString
 import org.ton.bitstring.exception.BitStringUnderflowException
 import kotlin.experimental.and
 import kotlin.experimental.or
@@ -48,12 +49,16 @@ public open class ByteBackedBitString protected constructor(
             bytes.copyOf((size + 7) ushr 3)
         }
 
+    override fun toByteString(): ByteString {
+        return ByteString(*toByteArray())
+    }
+
     override fun toBooleanArray(): BooleanArray = toList().toBooleanArray()
 
     override fun toMutableBitString(): MutableBitString =
         ByteBackedMutableBitString.of(bytes.copyOf((size + 7) ushr 3), size)
 
-    override fun toBitString(): BitString = ByteBackedBitString(size, bytes.copyOf((size + 7) ushr 3))
+    override fun toBitString(): ByteBackedBitString = ByteBackedBitString(size, bytes.copyOf((size + 7) ushr 3))
 
     override fun iterator(): Iterator<Boolean> = BitStringIterator(this)
 

bitstring/src/EmptyBitString.kt

@@ -46,6 +46,8 @@ internal object EmptyBitString : BitString {
 
     override fun toHexString(): String = ""
 
+    override fun isEmpty(): Boolean = true
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null) return false

block-tlb/src/AccountActive.kt

@@ -3,12 +3,10 @@ package org.ton.block
 import kotlinx.serialization.SerialName
 import org.ton.cell.CellBuilder
 import org.ton.cell.CellSlice
-import org.ton.cell.invoke
+import org.ton.kotlin.account.StateInit
+import org.ton.kotlin.cell.CellContext
 import org.ton.tlb.TlbConstructor
-import org.ton.tlb.TlbPrettyPrinter
-import org.ton.tlb.loadTlb
 import org.ton.tlb.providers.TlbConstructorProvider
-import org.ton.tlb.storeTlb
 import kotlin.jvm.JvmInline
 import kotlin.jvm.JvmName
 
@@ -21,31 +19,24 @@ public value class AccountActive(
 ) : AccountState {
     override val status: AccountStatus get() = AccountStatus.ACTIVE
 
-    override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter {
-        return printer.type("account_active") {
-            value.print(printer)
-        }
-    }
-
-    override fun toString(): String = print().toString()
-
     public companion object : TlbConstructorProvider<AccountActive> by AccountActiveTlbConstructor
 }
 
 private object AccountActiveTlbConstructor : TlbConstructor<AccountActive>(
     schema = "account_active\$1 _:StateInit = AccountState;"
 ) {
     override fun storeTlb(
-        cellBuilder: CellBuilder,
-        value: AccountActive
-    ) = cellBuilder {
-        storeTlb(StateInit, value.value)
+        builder: CellBuilder,
+        value: AccountActive,
+        context: CellContext
+    ) {
+        StateInit.storeTlb(builder, value.value, context)
     }
 
     override fun loadTlb(
-        cellSlice: CellSlice
-    ): AccountActive = cellSlice {
-        val init = loadTlb(StateInit)
-        AccountActive(init)
+        slice: CellSlice, context: CellContext
+    ): AccountActive {
+        val init = StateInit.loadTlb(slice, context)
+        return AccountActive(init)
     }
 }

block-tlb/src/AccountFrozen.kt

@@ -6,7 +6,6 @@ import org.ton.cell.CellBuilder
 import org.ton.cell.CellSlice
 import org.ton.cell.invoke
 import org.ton.tlb.TlbConstructor
-import org.ton.tlb.TlbPrettyPrinter
 import org.ton.tlb.providers.TlbConstructorProvider
 import kotlin.jvm.JvmName
 
@@ -23,12 +22,6 @@ public data class AccountFrozen(
 
     override val status: AccountStatus get() = AccountStatus.FROZEN
 
-    override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter = printer.type("account_frozen") {
-        printer.field("state_hash", stateHash)
-    }
-
-    override fun toString(): String = print().toString()
-
     public companion object : TlbConstructorProvider<AccountFrozen> by AccountFrozenTlbConstructor
 }
 

block-tlb/src/AccountState.kt

@@ -4,12 +4,11 @@ package org.ton.block
 
 import kotlinx.serialization.json.JsonClassDiscriminator
 import org.ton.tlb.TlbCombinator
-import org.ton.tlb.TlbObject
 import org.ton.tlb.providers.TlbCombinatorProvider
 
 
 @JsonClassDiscriminator("@type")
-public sealed interface AccountState : TlbObject {
+public sealed interface AccountState {
     /**
      * Account status.
      */

block-tlb/src/AccountUninit.kt

@@ -4,19 +4,12 @@ import kotlinx.serialization.SerialName
 import org.ton.cell.CellBuilder
 import org.ton.cell.CellSlice
 import org.ton.tlb.TlbConstructor
-import org.ton.tlb.TlbPrettyPrinter
 import org.ton.tlb.providers.TlbConstructorProvider
 
 
 @SerialName("account_uninit")
 public object AccountUninit : AccountState, TlbConstructorProvider<AccountUninit> by AccountUninitTlbConstructor {
     override val status: AccountStatus get() = AccountStatus.UNINIT
-
-    override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter {
-        return printer.type("account_uninit")
-    }
-
-    override fun toString(): String = print().toString()
 }
 
 private object AccountUninitTlbConstructor : TlbConstructor<AccountUninit>(

block-tlb/src/AddrNone.kt

@@ -1,24 +1,12 @@
 package org.ton.block
 
-import kotlinx.serialization.SerialName
 import org.ton.cell.CellBuilder
 import org.ton.cell.CellSlice
-import org.ton.kotlin.cell.CellSize
 import org.ton.tlb.TlbConstructor
-import org.ton.tlb.TlbPrettyPrinter
 import org.ton.tlb.providers.TlbConstructorProvider
 
-@SerialName("addr_none")
-
-public object AddrNone : MsgAddressExt, TlbConstructorProvider<AddrNone> by AddrNoneTlbConstructor {
-    override val cellSize: CellSize = CellSize(2, 0)
-
-    override fun toString(): String = print().toString()
-
-    override fun print(tlbPrettyPrinter: TlbPrettyPrinter): TlbPrettyPrinter = tlbPrettyPrinter {
-        type("addr_none")
-    }
-}
+@Deprecated("Use ExtAddr? instead", ReplaceWith("AddrInternal?"))
+public object AddrNone : TlbConstructorProvider<AddrNone> by AddrNoneTlbConstructor
 
 private object AddrNoneTlbConstructor : TlbConstructor<AddrNone>(
     schema = "addr_none\$00 = MsgAddressExt;"