Support RPC 0.8.0

lib/src/main/kotlin/com/swmansion/starknet/account/Account.kt

@@ -188,18 +188,19 @@ interface Account {
      * @param calldata constructor calldata for the contract deployment
      * @param salt salt used to calculate address of the new contract
      * @param forFeeEstimate when set to `true`, it changes the version to `2^128+version` so the signed transaction can only be used for fee estimation
+     * @param resourceBounds L1 and L2 resource bounds for the transaction
      * @return signed deploy account payload
      */
     fun signDeployAccountV3(
         classHash: Felt,
         calldata: Calldata,
         salt: Felt,
-        l1ResourceBounds: ResourceBounds,
+        resourceBounds: ResourceBoundsMapping,
         forFeeEstimate: Boolean,
     ): DeployAccountTransactionV3 {
         val params = DeployAccountParamsV3(
             nonce = Felt.ZERO,
-            l1ResourceBounds = l1ResourceBounds,
+            resourceBounds = resourceBounds,
         )
         return signDeployAccountV3(classHash, calldata, salt, params, forFeeEstimate)
     }
@@ -212,17 +213,18 @@ interface Account {
      * @param classHash hash of the contract that will be deployed. Has to be declared first!
      * @param calldata constructor calldata for the contract deployment
      * @param salt salt used to calculate address of the new contract
+     * @param resourceBounds L1 and L2 resource bounds for the transaction
      * @return signed deploy account payload
      */
     fun signDeployAccountV3(
         classHash: Felt,
         calldata: Calldata,
         salt: Felt,
-        l1ResourceBounds: ResourceBounds,
+        resourceBounds: ResourceBoundsMapping,
     ): DeployAccountTransactionV3 {
         val params = DeployAccountParamsV3(
             nonce = Felt.ZERO,
-            l1ResourceBounds = l1ResourceBounds,
+            resourceBounds = resourceBounds,
         )
         return signDeployAccountV3(classHash, calldata, salt, params, false)
     }
@@ -333,10 +335,10 @@ interface Account {
      * Execute list of calls on Starknet.
      *
      * @param calls a list of calls to be executed.
-     * @param l1ResourceBounds L1 resource bounds for the transaction.
+     * @param resourceBounds L1 and L2 resource bounds for the transaction
      * @return Invoke function response, containing transaction hash.
      */
-    fun executeV3(calls: List<Call>, l1ResourceBounds: ResourceBounds): Request<InvokeFunctionResponse>
+    fun executeV3(calls: List<Call>, resourceBounds: ResourceBoundsMapping): Request<InvokeFunctionResponse>
 
     /**
      * Execute single call using version 1 invoke transaction.
@@ -355,10 +357,10 @@ interface Account {
      * Execute single call on Starknet.
      *
      * @param call a call to be executed.
-     * @param l1ResourceBounds L1 resource bounds for the transaction.
+     * @param resourceBounds L1 and L2 resource bounds for the transaction
      * @return Invoke function response, containing transaction hash.
      */
-    fun executeV3(call: Call, l1ResourceBounds: ResourceBounds): Request<InvokeFunctionResponse>
+    fun executeV3(call: Call, resourceBounds: ResourceBoundsMapping): Request<InvokeFunctionResponse>
 
     /**
      * Execute a list of calls using version 1 invoke transaction with automatically estimated fee

lib/src/main/kotlin/com/swmansion/starknet/account/StandardAccount.kt

@@ -314,11 +314,11 @@ class StandardAccount @JvmOverloads constructor(
         }
     }
 
-    override fun executeV3(calls: List<Call>, l1ResourceBounds: ResourceBounds): Request<InvokeFunctionResponse> {
+    override fun executeV3(calls: List<Call>, resourceBounds: ResourceBoundsMapping): Request<InvokeFunctionResponse> {
         return getNonce().compose { nonce ->
             val signParams = InvokeParamsV3(
                 nonce = nonce,
-                l1ResourceBounds = l1ResourceBounds,
+                resourceBounds = resourceBounds,
             )
             val payload = signV3(calls, signParams, false)
 
@@ -343,7 +343,7 @@ class StandardAccount @JvmOverloads constructor(
                 amountMultiplier = estimateAmountMultiplier,
                 unitPriceMultiplier = estimateUnitPriceMultiplier,
             )
-            executeV3(calls, resourceBounds.l1Gas)
+            executeV3(calls, resourceBounds)
         }
     }
 
@@ -363,16 +363,16 @@ class StandardAccount @JvmOverloads constructor(
     override fun executeV3(calls: List<Call>): Request<InvokeFunctionResponse> {
         return estimateFeeV3(calls).compose { estimateFee ->
             val resourceBounds = estimateFee.values.first().toResourceBounds()
-            executeV3(calls, resourceBounds.l1Gas)
+            executeV3(calls, resourceBounds)
         }
     }
 
     override fun executeV1(call: Call, maxFee: Felt): Request<InvokeFunctionResponse> {
         return executeV1(listOf(call), maxFee)
     }
 
-    override fun executeV3(call: Call, l1ResourceBounds: ResourceBounds): Request<InvokeFunctionResponse> {
-        return executeV3(listOf(call), l1ResourceBounds)
+    override fun executeV3(call: Call, resourceBounds: ResourceBoundsMapping): Request<InvokeFunctionResponse> {
+        return executeV3(listOf(call), resourceBounds)
     }
 
     override fun executeV1(call: Call, estimateFeeMultiplier: Double): Request<InvokeFunctionResponse> {
@@ -541,7 +541,7 @@ class StandardAccount @JvmOverloads constructor(
     private fun buildEstimateFeeV3Payload(calls: List<Call>, nonce: Felt): List<ExecutableTransaction> {
         val executionParams = InvokeParamsV3(
             nonce = nonce,
-            l1ResourceBounds = ResourceBounds.ZERO,
+            resourceBounds = ResourceBoundsMapping.ZERO,
         )
         val payload = signV3(calls, executionParams, true)
 

lib/src/main/kotlin/com/swmansion/starknet/data/serializers/MerkleNodePolymorphicSerializer.kt

@@ -0,0 +1,21 @@
+import com.swmansion.starknet.data.types.*
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.descriptors.elementNames
+import kotlinx.serialization.json.JsonContentPolymorphicSerializer
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.jsonObject
+
+internal object MerkleNodePolymorphicSerializer :
+    JsonContentPolymorphicSerializer<NodeHashToNodeMappingItem.MerkleNode>(NodeHashToNodeMappingItem.MerkleNode::class) {
+    override fun selectDeserializer(element: JsonElement): DeserializationStrategy<NodeHashToNodeMappingItem.MerkleNode> {
+        val jsonElement = element.jsonObject
+        val binaryNodeKeys = NodeHashToNodeMappingItem.BinaryNode.serializer().descriptor.elementNames.toSet()
+        val edgeNodeKeys = NodeHashToNodeMappingItem.EdgeNode.serializer().descriptor.elementNames.toSet()
+
+        return when (jsonElement.keys) {
+            binaryNodeKeys -> NodeHashToNodeMappingItem.BinaryNode.serializer()
+            edgeNodeKeys -> NodeHashToNodeMappingItem.EdgeNode.serializer()
+            else -> throw IllegalArgumentException("Invalid MerkleNode JSON object: $jsonElement")
+        }
+    }
+}

lib/src/main/kotlin/com/swmansion/starknet/data/serializers/MessageStatusListSerializer.kt

@@ -0,0 +1,27 @@
+package com.swmansion.starknet.data.serializers
+
+import com.swmansion.starknet.data.types.MessageStatus
+import com.swmansion.starknet.data.types.MessageStatusList
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+internal object MessageStatusListSerializer : KSerializer<MessageStatusList> {
+    private val listSerializer = ListSerializer(MessageStatus.serializer())
+
+    @OptIn(ExperimentalSerializationApi::class)
+    override val descriptor: SerialDescriptor = listSerialDescriptor<MessageStatus>()
+
+    override fun serialize(encoder: Encoder, value: MessageStatusList) {
+        encoder.encodeSerializableValue(listSerializer, value.values)
+    }
+
+    override fun deserialize(decoder: Decoder): MessageStatusList {
+        val list = decoder.decodeSerializableValue(listSerializer)
+        return MessageStatusList(list)
+    }
+}

lib/src/main/kotlin/com/swmansion/starknet/data/types/Block.kt

@@ -46,6 +46,7 @@ sealed interface Block : StarknetResponse {
     val sequencerAddress: Felt
     val parentHash: Felt
     val l1GasPrice: ResourcePrice
+    val l2GasPrice: ResourcePrice
     val l1DataGasPrice: ResourcePrice
     val l1DataAvailabilityMode: L1DAMode
     val starknetVersion: String
@@ -107,6 +108,9 @@ data class ProcessedBlockWithTransactions(
     @SerialName("l1_gas_price")
     override val l1GasPrice: ResourcePrice,
 
+    @SerialName("l2_gas_price")
+    override val l2GasPrice: ResourcePrice,
+
     @SerialName("l1_data_gas_price")
     override val l1DataGasPrice: ResourcePrice,
 
@@ -137,6 +141,9 @@ data class PendingBlockWithTransactions(
     @SerialName("l1_gas_price")
     override val l1GasPrice: ResourcePrice,
 
+    @SerialName("l2_gas_price")
+    override val l2GasPrice: ResourcePrice,
+
     @SerialName("l1_data_gas_price")
     override val l1DataGasPrice: ResourcePrice,
 
@@ -192,6 +199,9 @@ data class ProcessedBlockWithReceipts(
     @SerialName("l1_gas_price")
     override val l1GasPrice: ResourcePrice,
 
+    @SerialName("l2_gas_price")
+    override val l2GasPrice: ResourcePrice,
+
     @SerialName("l1_data_gas_price")
     override val l1DataGasPrice: ResourcePrice,
 
@@ -219,6 +229,9 @@ data class PendingBlockWithReceipts(
     @SerialName("l1_gas_price")
     override val l1GasPrice: ResourcePrice,
 
+    @SerialName("l2_gas_price")
+    override val l2GasPrice: ResourcePrice,
+
     @SerialName("l1_data_gas_price")
     override val l1DataGasPrice: ResourcePrice,
 
@@ -263,6 +276,9 @@ data class ProcessedBlockWithTransactionHashes(
     @SerialName("l1_gas_price")
     override val l1GasPrice: ResourcePrice,
 
+    @SerialName("l2_gas_price")
+    override val l2GasPrice: ResourcePrice,
+
     @SerialName("l1_data_gas_price")
     override val l1DataGasPrice: ResourcePrice,
 
@@ -290,6 +306,9 @@ data class PendingBlockWithTransactionHashes(
     @SerialName("l1_gas_price")
     override val l1GasPrice: ResourcePrice,
 
+    @SerialName("l2_gas_price")
+    override val l2GasPrice: ResourcePrice,
+
     @SerialName("l1_data_gas_price")
     override val l1DataGasPrice: ResourcePrice,
 

lib/src/main/kotlin/com/swmansion/starknet/data/types/ContractStorageKeys.kt

@@ -0,0 +1,13 @@
+package com.swmansion.starknet.data.types
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ContractStorageKeys(
+    @SerialName("contract_address")
+    val contractAddress: Felt,
+
+    @SerialName("storage_keys")
+    val storageKeys: List<Felt>,
+)

lib/src/main/kotlin/com/swmansion/starknet/data/types/MessageStatusList.kt

@@ -0,0 +1,7 @@
+package com.swmansion.starknet.data.types
+
+import com.swmansion.starknet.data.serializers.MessageStatusListSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable(with = MessageStatusListSerializer::class)
+data class MessageStatusList(val values: List<MessageStatus>) : StarknetResponse

lib/src/main/kotlin/com/swmansion/starknet/data/types/Params.kt

@@ -39,11 +39,9 @@ data class InvokeParamsV3 private constructor(
     override val nonceDataAvailabilityMode: DAMode,
     override val feeDataAvailabilityMode: DAMode,
 ) : ParamsV3() {
-    constructor(nonce: Felt, l1ResourceBounds: ResourceBounds) : this(
+    constructor(nonce: Felt, resourceBounds: ResourceBoundsMapping) : this(
         nonce = nonce,
-        resourceBounds = ResourceBoundsMapping(
-            l1Gas = l1ResourceBounds,
-        ),
+        resourceBounds = resourceBounds,
         tip = Uint64.ZERO,
         paymasterData = emptyList(),
         accountDeploymentData = emptyList(),
@@ -66,11 +64,9 @@ data class DeclareParamsV3 private constructor(
     override val nonceDataAvailabilityMode: DAMode,
     override val feeDataAvailabilityMode: DAMode,
 ) : ParamsV3() {
-    constructor(nonce: Felt, l1ResourceBounds: ResourceBounds) : this(
+    constructor(nonce: Felt, resourceBounds: ResourceBoundsMapping) : this(
         nonce = nonce,
-        resourceBounds = ResourceBoundsMapping(
-            l1Gas = l1ResourceBounds,
-        ),
+        resourceBounds = resourceBounds,
         tip = Uint64.ZERO,
         paymasterData = emptyList(),
         accountDeploymentData = emptyList(),
@@ -95,12 +91,10 @@ data class DeployAccountParamsV3 private constructor(
     @JvmOverloads
     constructor(
         nonce: Felt = Felt.ZERO,
-        l1ResourceBounds: ResourceBounds,
+        resourceBounds: ResourceBoundsMapping,
     ) : this(
         nonce = nonce,
-        resourceBounds = ResourceBoundsMapping(
-            l1Gas = l1ResourceBounds,
-        ),
+        resourceBounds = resourceBounds,
         tip = Uint64.ZERO,
         paymasterData = emptyList(),
         nonceDataAvailabilityMode = DAMode.L1,

lib/src/main/kotlin/com/swmansion/starknet/data/types/Payloads.kt

@@ -47,6 +47,12 @@ internal data class GetTransactionStatusPayload(
     val transactionHash: Felt,
 )
 
+@Serializable
+internal data class GetMessagesStatusPayload(
+    @SerialName("transaction_hash")
+    val transactionHash: NumAsHex,
+)
+
 @Serializable
 internal data class EstimateTransactionFeePayload(
     @SerialName("request")
@@ -83,6 +89,21 @@ internal data class GetNoncePayload(
     override val blockId: BlockId,
 ) : PayloadWithBlockId()
 
+@Serializable
+internal data class GetStorageProofPayload constructor(
+    @SerialName("block_id")
+    val blockId: BlockId,
+
+    @SerialName("class_hashes")
+    val classHashes: List<Felt>? = null,
+
+    @SerialName("contract_addresses")
+    val contractAddresses: List<Felt>? = null,
+
+    @SerialName("contracts_storage_keys")
+    val contractsStorageKeys: List<ContractStorageKeys>? = null,
+)
+
 @Serializable
 internal data class GetBlockWithTransactionsPayload(
     @SerialName("block_id")