0.4.1

Author: andreypfau

bitstring/src/ByteBackedBitString.kt

@@ -45,7 +45,7 @@ public open class ByteBackedBitString protected constructor(
         if (augment && (size % 8 != 0)) {
             appendAugmentTag(bytes, size)
         } else {
-            bytes.copyOf()
+            bytes.copyOf((size + 7) ushr 3)
         }
 
     override fun toBooleanArray(): BooleanArray = toList().toBooleanArray()

block-tlb/src/Account.kt

@@ -1,20 +1,86 @@
-@file:Suppress("OPT_IN_USAGE")
-
 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
+import org.ton.cell.CellBuilder
+import org.ton.cell.CellSlice
+import org.ton.cell.invoke
+import org.ton.tlb.*
+import org.ton.tlb.TlbConstructor
+
+/**
+ * Existing account data.
+ */
+public data class Account(
+    /**
+     * Account address.
+     */
+    val address: MsgAddressInt,
+
+    /**
+     * Storage statistics.
+     */
+    val storageStat: StorageInfo,
+
+    /**
+     * Logical time after the last transaction execution.
+     */
+    val lastTransLt: Long,
+
+    /**
+     * Account balance for all currencies.
+     */
+    val balance: CurrencyCollection,
+
+    /**
+     * Account state.
+     */
+    val state: AccountState
+) {
+    public companion object : TlbCodec<Account?> by AccountInfoTlbConstructor.asNullable()
 
-@JsonClassDiscriminator("@type")
+    @Deprecated("Use fields lastTransLt, balance, state instead")
+    val storage: AccountStorage // storage : AccountStorage
+        get() = AccountStorage(lastTransLt.toULong(), balance, state)
 
-public sealed interface Account : TlbObject {
-    public companion object : TlbCombinatorProvider<Account> by AccountTlbCombinator
+    @Deprecated("Use address instead", ReplaceWith("address"))
+    val addr: MsgAddressInt
+        get() = address
+
+    val isActive: Boolean get() = storage.state is AccountActive
+    val isFrozen: Boolean get() = storage.state is AccountFrozen
+    val isUninit: Boolean get() = storage.state is AccountUninit
 }
 
-private object AccountTlbCombinator : TlbCombinator<Account>(
-    Account::class,
-    AccountNone::class to AccountNone,
-    AccountInfo::class to AccountInfo
-)
+public val Account?.balance: CurrencyCollection
+    get() = this?.balance ?: CurrencyCollection.ZERO
+
+public val Account?.accountLastTransLt: Long
+    get() = this?.lastTransLt ?: 0
+
+public val Account?.status: AccountStatus
+    get() = this?.state?.status ?: AccountStatus.NONEXIST
+
+private object AccountInfoTlbConstructor : TlbConstructor<Account>(
+    schema = "account\$1 addr:MsgAddressInt storage_stat:StorageInfo storage:AccountStorage = Account;"
+) {
+    override fun storeTlb(
+        cellBuilder: CellBuilder,
+        value: Account
+    ) = cellBuilder {
+        storeTlb(MsgAddressInt, value.addr)
+        storeTlb(StorageInfo, value.storageStat)
+        storeULong(value.lastTransLt.toULong())
+        storeTlb(CurrencyCollection, value.balance)
+        storeTlb(AccountState, value.state)
+    }
+
+    override fun loadTlb(
+        cellSlice: CellSlice
+    ): Account = cellSlice {
+        val addr = loadTlb(MsgAddressInt)
+        val storageStat = loadTlb(StorageInfo)
+        val lastTransLt = loadULong().toLong()
+        val balance = loadTlb(CurrencyCollection)
+        val state = loadTlb(AccountState)
+        Account(addr, storageStat, lastTransLt, balance, state)
+    }
+}

block-tlb/src/AccountActive.kt

@@ -19,6 +19,8 @@ public value class AccountActive(
     @get:JvmName("value")
     public val value: StateInit
 ) : AccountState {
+    override val status: AccountStatus get() = AccountStatus.ACTIVE
+
     override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter {
         return printer.type("account_active") {
             value.print(printer)

block-tlb/src/AccountFrozen.kt

@@ -21,6 +21,8 @@ public data class AccountFrozen(
         require(stateHash.size == 256) { "stateHash must be 256 bits long" }
     }
 
+    override val status: AccountStatus get() = AccountStatus.FROZEN
+
     override fun print(printer: TlbPrettyPrinter): TlbPrettyPrinter = printer.type("account_frozen") {
         printer.field("state_hash", stateHash)
     }

block-tlb/src/AccountInfo.kt

@@ -10,6 +10,11 @@ import org.ton.tlb.providers.TlbCombinatorProvider
 
 @JsonClassDiscriminator("@type")
 public sealed interface AccountState : TlbObject {
+    /**
+     * Account status.
+     */
+    public val status: AccountStatus
+
     public companion object : TlbCombinatorProvider<AccountState> by AccountStateTlbCombinator
 }
 

block-tlb/src/AccountNone.kt

@@ -11,6 +11,7 @@ import kotlin.jvm.JvmName
 
 @SerialName("account_storage")
 
+@Deprecated("Use fields from Account instead")
 public data class AccountStorage(
     @SerialName("last_trans_lt")
     @get:JvmName("lastTransLt")

block-tlb/src/AccountState.kt

@@ -10,6 +10,8 @@ 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")
     }

block-tlb/src/AccountStorage.kt

@@ -16,7 +16,7 @@ import org.ton.tlb.providers.TlbConstructorProvider
 
 @SerialName("tr_phase_action")
 
-public data class TrActionPhase(
+public data class ActionPhase(
     val success: Boolean,
     val valid: Boolean,
     @SerialName("no_funds") val noFunds: Boolean,
@@ -57,10 +57,10 @@ public data class TrActionPhase(
 
     override fun toString(): String = print().toString()
 
-    public companion object : TlbConstructorProvider<TrActionPhase> by TrActionPhaseTlbConstructor
+    public companion object : TlbConstructorProvider<ActionPhase> by TrActionPhaseTlbConstructor
 }
 
-private object TrActionPhaseTlbConstructor : TlbConstructor<TrActionPhase>(
+private object TrActionPhaseTlbConstructor : TlbConstructor<ActionPhase>(
     schema = "tr_phase_action\$_ success:Bool valid:Bool no_funds:Bool " +
             "status_change:AccStatusChange " +
             "total_fwd_fees:(Maybe Coins) total_action_fees:(Maybe Coins) " +
@@ -74,7 +74,7 @@ private object TrActionPhaseTlbConstructor : TlbConstructor<TrActionPhase>(
 
     override fun storeTlb(
         cellBuilder: CellBuilder,
-        value: TrActionPhase
+        value: ActionPhase
     ) = cellBuilder {
         storeBit(value.success)
         storeBit(value.valid)
@@ -94,7 +94,7 @@ private object TrActionPhaseTlbConstructor : TlbConstructor<TrActionPhase>(
 
     override fun loadTlb(
         cellSlice: CellSlice
-    ): TrActionPhase = cellSlice {
+    ): ActionPhase = cellSlice {
         val success = loadBit()
         val valid = loadBit()
         val noFunds = loadBit()
@@ -109,7 +109,7 @@ private object TrActionPhaseTlbConstructor : TlbConstructor<TrActionPhase>(
         val msgCreated = loadUInt(16).toInt()
         val actionListHash = loadBits(256)
         val totMsgSize = loadTlb(StorageUsedShort)
-        TrActionPhase(
+        ActionPhase(
             success,
             valid,
             noFunds,