From 1c88e6882139817dfef354d0b3fb4e872479ead9 Mon Sep 17 00:00:00 2001
From: Guillermo Orellana <guillermo@avianlabs.net>
Date: Thu, 21 Mar 2024 17:15:31 +0100
Subject: [PATCH] add getAccountInfo, getNonce RPCs and decoder for
 NonceAccountData

---
 .idea/gradle.xml                              |  2 +-
 solana-kotlin/build.gradle.kts                | 12 ++--
 .../avianlabs/solana/client/RpcKtorClient.kt  |  4 +-
 .../solana/domain/core/FeeCalculator.kt       | 15 +++++
 .../solana/domain/core/NonceAccountData.kt    | 29 ++++++++++
 .../avianlabs/solana/domain/core/PublicKey.kt |  8 +++
 .../solana/methods/getAccountInfo.kt          | 54 ++++++++++++++++++
 .../avianlabs/solana/methods/getBalance.kt    | 24 ++++----
 .../solana/methods/getFeeForMessage.kt        | 26 ++++-----
 .../getMinimumBalanceForRentExemption.kt      | 22 ++++----
 .../net/avianlabs/solana/methods/getNonce.kt  | 28 ++++++++++
 .../solana/methods/getRecentBlockhash.kt      | 29 ++++------
 .../solana/methods/getSignaturesForAddress.kt | 23 +++-----
 .../solana/methods/getTokenAccountBalance.kt  | 23 ++++----
 .../solana/methods/getTransaction.kt          | 21 +++----
 .../solana/methods/isBlockHashValid.kt        | 26 ++++-----
 .../solana/methods/requestAirdrop.kt          | 26 ++++-----
 .../solana/methods/sendTransaction.kt         | 42 ++++++++++++++
 .../domain/program/SystemProgramTest.kt       | 55 +++++++++++++++----
 19 files changed, 328 insertions(+), 141 deletions(-)
 create mode 100644 solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/FeeCalculator.kt
 create mode 100644 solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/NonceAccountData.kt
 create mode 100644 solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/PublicKey.kt
 create mode 100644 solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt
 create mode 100644 solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getNonce.kt
 create mode 100644 solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/sendTransaction.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5a40dfe..0d7501a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="gradleJvm" value="temurin-18" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/solana-kotlin/build.gradle.kts b/solana-kotlin/build.gradle.kts
index 866d920..4474ab3 100644
--- a/solana-kotlin/build.gradle.kts
+++ b/solana-kotlin/build.gradle.kts
@@ -30,13 +30,13 @@ kotlin {
   listOf(
     iosArm64(),
     iosSimulatorArm64(),
-    ).forEach { iosTarget ->
-      iosTarget.binaries.framework {
-        baseName = "SolanaKotlin"
-        export(project(":tweetnacl-multiplatform"))
-        isStatic = true
-      }
+  ).forEach { iosTarget ->
+    iosTarget.binaries.framework {
+      baseName = "SolanaKotlin"
+      export(project(":tweetnacl-multiplatform"))
+      isStatic = true
     }
+  }
 
   mingwX64()
 
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/client/RpcKtorClient.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/client/RpcKtorClient.kt
index e3db39b..8c3c8c0 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/client/RpcKtorClient.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/client/RpcKtorClient.kt
@@ -35,8 +35,8 @@ public class RpcKtorClient(
     install(ContentNegotiation) { json(json = json) }
     expectSuccess = true
     install(Logging) {
-      logger = Logger.DEFAULT
-      level = LogLevel.ALL
+      logger = Logger.SIMPLE
+      level = LogLevel.NONE
     }
   }
 
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/FeeCalculator.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/FeeCalculator.kt
new file mode 100644
index 0000000..9be0f06
--- /dev/null
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/FeeCalculator.kt
@@ -0,0 +1,15 @@
+package net.avianlabs.solana.domain.core
+
+import kotlinx.serialization.Serializable
+import okio.BufferedSource
+
+@Serializable
+public data class FeeCalculator(
+  val lamportsPerSignature: ULong,
+) {
+  public companion object {
+    public fun read(data: BufferedSource): FeeCalculator = FeeCalculator(
+      lamportsPerSignature = data.readLongLe().toULong(),
+    )
+  }
+}
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/NonceAccountData.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/NonceAccountData.kt
new file mode 100644
index 0000000..4da3d15
--- /dev/null
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/NonceAccountData.kt
@@ -0,0 +1,29 @@
+package net.avianlabs.solana.domain.core
+
+import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
+import okio.BufferedSource
+
+public data class NonceAccountData(
+  val version: UInt,
+  val state: UInt,
+  val authorizedPubkey: PublicKey,
+  val nonce: String,
+  val feeCalculator: FeeCalculator,
+) {
+  public companion object {
+    public fun read(data: BufferedSource): NonceAccountData {
+      val version = data.readIntLe().toUInt()
+      val state = data.readIntLe().toUInt()
+      val authorizedPubkey = PublicKey.read(data)
+      val nonce = PublicKey.read(data).toBase58()
+      val feeCalculator = FeeCalculator.read(data)
+      return NonceAccountData(
+        version = version,
+        state = state,
+        authorizedPubkey = authorizedPubkey,
+        nonce = nonce,
+        feeCalculator = feeCalculator,
+      )
+    }
+  }
+}
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/PublicKey.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/PublicKey.kt
new file mode 100644
index 0000000..6a497b3
--- /dev/null
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/domain/core/PublicKey.kt
@@ -0,0 +1,8 @@
+package net.avianlabs.solana.domain.core
+
+import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
+import okio.BufferedSource
+
+public fun PublicKey.Companion.read(data: BufferedSource): PublicKey = PublicKey(
+  bytes = data.readByteArray(32),
+)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt
new file mode 100644
index 0000000..9349ce2
--- /dev/null
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt
@@ -0,0 +1,54 @@
+package net.avianlabs.solana.methods
+
+import io.ktor.util.*
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
+import net.avianlabs.solana.SolanaClient
+import net.avianlabs.solana.client.RpcResponse
+import net.avianlabs.solana.domain.core.Commitment
+import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
+
+public suspend fun SolanaClient.getAccountInfo(
+  publicKey: PublicKey,
+  commitment: Commitment? = null,
+): AccountInfo? {
+  val result = invoke<RpcResponse.RPC<AccountInfo>>(
+    method = "getAccountInfo",
+    params = buildJsonArray {
+      add(publicKey.toBase58())
+      addJsonObject {
+        put("encoding", "base64")
+        commitment?.let {
+          put("commitment", it.value)
+        }
+      }
+    }
+  )
+  return result!!.value
+}
+
+/**
+ * Account information
+ * @param executable `true` if this account's data contains a loaded program (and is now read-only)
+ * @param owner The public key of the program that owns the account
+ * @param lamports The number of lamports assigned to the account
+ * @param data The data held in this account
+ * @param rentEpoch The epoch at which this account will next owe rent
+ */
+@Serializable
+public data class AccountInfo(
+  val executable: Boolean,
+  val owner: String,
+  val lamports: ULong,
+  val data: List<String>,
+  val rentEpoch: ULong,
+) {
+  public val ownerPublicKey: PublicKey
+    get() = PublicKey.fromBase58(owner)
+
+  public val dataBytes: ByteArray
+    get() = data.first().decodeBase64Bytes()
+}
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getBalance.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getBalance.kt
index cd3ea36..31e561a 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getBalance.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getBalance.kt
@@ -1,8 +1,9 @@
 package net.avianlabs.solana.methods
 
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.RpcResponse.RPC
 import net.avianlabs.solana.domain.core.Commitment
@@ -20,15 +21,14 @@ public suspend fun SolanaClient.getBalance(
 ): Long {
   val result = invoke<RPC<Long>>(
     method = "getBalance",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<PublicKey>(account))
-      commitment?.let { add(json.encodeToJsonElement(BalanceParams(it.value))) }
-    })
+    params = buildJsonArray {
+      add(account.toBase58())
+      commitment?.let {
+        addJsonObject {
+          put("commitment", it.value)
+        }
+      }
+    }
   )
   return result!!.value!!
 }
-
-@Serializable
-internal data class BalanceParams(
-  val commitment: String? = null,
-)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt
index 04ab4aa..ddbcfba 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt
@@ -1,9 +1,10 @@
 package net.avianlabs.solana.methods
 
-import io.ktor.util.encodeBase64
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import io.ktor.util.*
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.RpcResponse.RPC
 import net.avianlabs.solana.domain.core.Commitment
@@ -21,15 +22,14 @@ public suspend fun SolanaClient.getFeeForMessage(
 ): Long {
   val result = invoke<RPC<Long>>(
     method = "getFeeForMessage",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<String>(message.encodeBase64()))
-      commitment?.let { add(json.encodeToJsonElement(FeeForMessageParams(it.value))) }
-    })
+    params = buildJsonArray {
+      add(message.encodeBase64())
+      commitment?.let {
+        addJsonObject {
+          put("commitment", it.value)
+        }
+      }
+    }
   )
   return result!!.value!!
 }
-
-@Serializable
-internal data class FeeForMessageParams(
-  val commitment: String? = null,
-)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getMinimumBalanceForRentExemption.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getMinimumBalanceForRentExemption.kt
index 53b507f..54dc923 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getMinimumBalanceForRentExemption.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getMinimumBalanceForRentExemption.kt
@@ -1,8 +1,9 @@
 package net.avianlabs.solana.methods
 
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.domain.core.Commitment
 
@@ -18,17 +19,14 @@ public suspend fun SolanaClient.getMinimumBalanceForRentExemption(
 ): Long {
   val result = invoke<Long>(
     method = "getMinimumBalanceForRentExemption",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement(dataLength))
+    params = buildJsonArray {
+      add(dataLength)
       commitment?.let {
-        add(json.encodeToJsonElement(GetMinimumBalanceForRentExemptionParams(it.value)))
+        addJsonObject {
+          put("commitment", it.value)
+        }
       }
-    })
+    }
   )
   return result!!
 }
-
-@Serializable
-internal data class GetMinimumBalanceForRentExemptionParams(
-  val commitment: String? = null,
-)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getNonce.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getNonce.kt
new file mode 100644
index 0000000..6893f9c
--- /dev/null
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getNonce.kt
@@ -0,0 +1,28 @@
+package net.avianlabs.solana.methods
+
+import net.avianlabs.solana.SolanaClient
+import net.avianlabs.solana.domain.core.Commitment
+import net.avianlabs.solana.domain.core.FeeCalculator
+import net.avianlabs.solana.domain.core.NonceAccountData
+import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
+import okio.Buffer
+
+public suspend fun SolanaClient.getNonce(
+  publicKey: PublicKey,
+  commitment: Commitment? = null
+): NonceAccount? = getAccountInfo(publicKey, commitment)
+  ?.dataBytes
+  ?.let { data ->
+    val decoded = NonceAccountData.read(Buffer().write(data))
+    NonceAccount(
+      authorizedPubkey = decoded.authorizedPubkey,
+      nonce = decoded.nonce,
+      feeCalculator = decoded.feeCalculator,
+    )
+  }
+
+public data class NonceAccount(
+  val authorizedPubkey: PublicKey,
+  val nonce: String,
+  val feeCalculator: FeeCalculator,
+)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getRecentBlockhash.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getRecentBlockhash.kt
index 2a43ad5..db56388 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getRecentBlockhash.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getRecentBlockhash.kt
@@ -1,11 +1,13 @@
 package net.avianlabs.solana.methods
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.RpcResponse
 import net.avianlabs.solana.domain.core.Commitment
+import net.avianlabs.solana.domain.core.FeeCalculator
 
 /**
  * Returns the latest blockhash
@@ -17,26 +19,19 @@ public suspend fun SolanaClient.getRecentBlockhash(
 ): RecentBlockHash {
   val result = invoke<RpcResponse.RPC<RecentBlockHash>>(
     method = "getRecentBlockhash",
-    params = JsonArray(buildList {
-      commitment?.let { add(json.encodeToJsonElement(RecentBlockHashParams(it.value))) }
-    })
+    params = buildJsonArray {
+      commitment?.let {
+        addJsonObject {
+          put("commitment", it.value)
+        }
+      }
+    }
   )
   return result!!.value!!
 }
 
-@Serializable
-public data class RecentBlockHashParams(
-  val commitment: String? = null,
-)
-
 @Serializable
 public data class RecentBlockHash(
   val blockhash: String,
   val feeCalculator: FeeCalculator,
-) {
-
-  @Serializable
-  public data class FeeCalculator(
-    val lamportsPerSignature: Long = 0,
-  )
-}
+)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getSignaturesForAddress.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getSignaturesForAddress.kt
index a34d825..5277fea 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getSignaturesForAddress.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getSignaturesForAddress.kt
@@ -1,9 +1,7 @@
 package net.avianlabs.solana.methods
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.*
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.domain.core.Commitment
 import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
@@ -23,25 +21,18 @@ public suspend fun SolanaClient.getSignaturesForAddress(
 ): List<SignatureInformation> {
   val result = invoke<List<SignatureInformation>>(
     method = "getSignaturesForAddress",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<PublicKey>(account))
+    params = buildJsonArray {
+      add(account.toBase58())
       commitment?.let {
-        add(json.encodeToJsonElement(SignaturesForAddressParams(commitment = it.value)))
+        addJsonObject {
+          put("commitment", it.value)
+        }
       }
-    })
+    }
   )
   return result!!
 }
 
-@Serializable
-internal data class SignaturesForAddressParams(
-  val limit: Long? = null,
-  val before: String? = null,
-  val until: String? = null,
-  val commitment: String? = null,
-  val minContextSlot: Long? = null,
-)
-
 @Serializable
 public data class SignatureInformation(
   var err: JsonElement?, // TODO
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt
index 1fa45ce..e98635f 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt
@@ -1,8 +1,10 @@
 package net.avianlabs.solana.methods
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.RpcResponse.RPC
 import net.avianlabs.solana.domain.core.Commitment
@@ -21,19 +23,18 @@ public suspend fun SolanaClient.getTokenAccountBalance(
 ): TokenAmountInfo {
   val result = invoke<RPC<TokenAmountInfo>>(
     method = "getTokenAccountBalance",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<PublicKey>(tokenAccount))
-      commitment?.let { add(json.encodeToJsonElement(TokenAccountBalanceParams(it.value))) }
-    })
+    params = buildJsonArray {
+      add(tokenAccount.toBase58())
+      commitment?.let {
+        addJsonObject {
+          put("commitment", it.value)
+        }
+      }
+    }
   )
   return result!!.value!!
 }
 
-@Serializable
-internal data class TokenAccountBalanceParams(
-  val commitment: String? = null
-)
-
 @Serializable
 public data class TokenAmountInfo(
   val amount: String?,
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTransaction.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTransaction.kt
index 4d9f583..f0f4a3c 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTransaction.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTransaction.kt
@@ -1,9 +1,7 @@
 package net.avianlabs.solana.methods
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.*
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.domain.core.Commitment
 
@@ -20,18 +18,17 @@ public suspend fun SolanaClient.getTransaction(
 ): TransactionResponse? {
   return invoke<TransactionResponse?>(
     method = "getTransaction",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<String>(signature))
-      commitment?.let { add(json.encodeToJsonElement(GetTransactionParams(it.value))) }
-    })
+    params = buildJsonArray {
+      add(signature)
+      commitment?.let {
+        addJsonObject {
+          put("commitment", it.value)
+        }
+      }
+    }
   )
 }
 
-@Serializable
-internal data class GetTransactionParams(
-  val commitment: String? = null,
-)
-
 @Serializable
 public data class TransactionResponse(
   val meta: Meta?,
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/isBlockHashValid.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/isBlockHashValid.kt
index 71a2ad6..15b6e3a 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/isBlockHashValid.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/isBlockHashValid.kt
@@ -1,8 +1,9 @@
 package net.avianlabs.solana.methods
 
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.RpcResponse.RPC
 import net.avianlabs.solana.domain.core.Commitment
@@ -22,18 +23,15 @@ public suspend fun SolanaClient.isBlockHashValid(
 ): Boolean {
   val result = invoke<RPC<Boolean>>(
     method = "isBlockhashValid",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<String>(blockHash))
-      if (commitment != null || minContextSlot != null) {
-        add(json.encodeToJsonElement(IsBlockHashValidParams(commitment?.value, minContextSlot)))
+    params = buildJsonArray {
+      add(blockHash)
+      if (listOfNotNull(commitment, minContextSlot).isNotEmpty()) {
+        addJsonObject {
+          commitment?.let { put("commitment", it.value) }
+          minContextSlot?.let { put("minContextSlot", it) }
+        }
       }
-    })
+    }
   )
   return result!!.value!!
 }
-
-@Serializable
-internal data class IsBlockHashValidParams(
-  val commitment: String? = null,
-  val minContextSlot: Long? = null,
-)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/requestAirdrop.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/requestAirdrop.kt
index 7059e9c..5df5c69 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/requestAirdrop.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/requestAirdrop.kt
@@ -1,8 +1,9 @@
 package net.avianlabs.solana.methods
 
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.domain.core.Commitment
 import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
@@ -21,16 +22,15 @@ public suspend fun SolanaClient.requestAirdrop(
 ): String {
   val result = invoke<String>(
     method = "requestAirdrop",
-    params = JsonArray(buildList {
-      add(json.encodeToJsonElement<PublicKey>(publicKey))
-      add(json.encodeToJsonElement<Long>(lamports))
-      commitment?.let { add(json.encodeToJsonElement(RequestAirdropParams(it.value))) }
-    })
+    params = buildJsonArray {
+      add(publicKey.toBase58())
+      add(lamports)
+      commitment?.let {
+        addJsonObject {
+          put("commitment", it.value)
+        }
+      }
+    }
   )
   return result!!
 }
-
-@Serializable
-internal data class RequestAirdropParams(
-  val commitment: String? = null,
-)
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/sendTransaction.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/sendTransaction.kt
new file mode 100644
index 0000000..bfe1747
--- /dev/null
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/sendTransaction.kt
@@ -0,0 +1,42 @@
+package net.avianlabs.solana.methods
+
+import io.ktor.util.*
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import net.avianlabs.solana.SolanaClient
+import net.avianlabs.solana.domain.core.Commitment
+import net.avianlabs.solana.domain.core.Transaction
+
+/**
+ * Send a signed transaction to the cluster
+ * @param transaction The signed transaction to send
+ * @param skipPreflight If true, skip the preflight check
+ * @param preflightCommitment The commitment level to use for the preflight check
+ * @param maxRetries The maximum number of retries to send the transaction
+ * @param minContextSlot The minimum slot to send the transaction
+ * @return The transaction signature
+ */
+public suspend fun SolanaClient.sendTransaction(
+  transaction: Transaction,
+  skipPreflight: Boolean = false,
+  preflightCommitment: Commitment = Commitment.Finalized,
+  maxRetries: Int? = null,
+  minContextSlot: Long? = null,
+): String {
+  val result = invoke<String>(
+    method = "sendTransaction",
+    params = buildJsonArray {
+      add(transaction.serialize().encodeBase64())
+      add(buildJsonObject {
+        put("encoding", "base64")
+        put("skipPreflight", skipPreflight)
+        put("preflightCommitment", preflightCommitment.value)
+        maxRetries?.let { put("maxRetries", it) }
+        minContextSlot?.let { put("minContextSlot", it) }
+      })
+    }
+  )
+  return result!!
+}
diff --git a/solana-kotlin/src/commonTest/kotlin/net/avianlabs/solana/domain/program/SystemProgramTest.kt b/solana-kotlin/src/commonTest/kotlin/net/avianlabs/solana/domain/program/SystemProgramTest.kt
index 48a157b..0d4335e 100644
--- a/solana-kotlin/src/commonTest/kotlin/net/avianlabs/solana/domain/program/SystemProgramTest.kt
+++ b/solana-kotlin/src/commonTest/kotlin/net/avianlabs/solana/domain/program/SystemProgramTest.kt
@@ -1,32 +1,41 @@
 package net.avianlabs.solana.domain.program
 
-import io.ktor.util.*
-import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.RpcKtorClient
-import net.avianlabs.solana.tweetnacl.ed25519.Ed25519Keypair
+import net.avianlabs.solana.domain.core.Commitment
 import net.avianlabs.solana.domain.core.Transaction
-import net.avianlabs.solana.methods.getMinimumBalanceForRentExemption
-import net.avianlabs.solana.methods.getRecentBlockhash
+import net.avianlabs.solana.domain.core.TransactionBuilder
+import net.avianlabs.solana.methods.*
+import net.avianlabs.solana.tweetnacl.TweetNaCl
+import kotlin.random.Random
 import kotlin.test.Ignore
 import kotlin.test.Test
+import kotlin.time.Duration.Companion.seconds
 
 class SystemProgramTest {
 
   @Test
   @Ignore
-  fun testCreateDurableNonceAccount() = runTest {
-    val client = SolanaClient(client = RpcKtorClient("https://api.devnet.solana.com"))
+  fun testCreateDurableNonceAccount() = runBlocking {
+    val client = SolanaClient(client = RpcKtorClient("http://localhost:8899"))
 
-    val keypair = Ed25519Keypair.fromBase58("")
+    val keypair = TweetNaCl.Signature.generateKey(Random.nextBytes(32))
+    println("Keypair: ${keypair.publicKey}")
+    val nonceAccount = TweetNaCl.Signature.generateKey(Random.nextBytes(32))
+    println("Nonce account: ${nonceAccount.publicKey}")
 
-    val nonceAccount = Ed25519Keypair.fromBase58("")
+    client.requestAirdrop(keypair.publicKey, 2_000_000_000)
+    delay(15.seconds)
+    val balance = client.getBalance(keypair.publicKey)
+    println("Balance: $balance")
 
     val rentExempt = client.getMinimumBalanceForRentExemption(SystemProgram.NONCE_ACCOUNT_LENGTH)
 
     val blockhash = client.getRecentBlockhash()
 
-    val transaction = Transaction()
+    val initTransaction = Transaction()
       .addInstruction(
         SystemProgram.createAccount(
           fromPublicKey = keypair.publicKey,
@@ -44,8 +53,30 @@ class SystemProgramTest {
       .setRecentBlockHash(blockhash.blockhash)
       .sign(listOf(keypair, nonceAccount))
 
-    val serialized = transaction.serialize().encodeBase64()
 
-    println(serialized)
+    val initSignature = client.sendTransaction(initTransaction)
+
+    println("Initialized nonce account: $initSignature")
+    delay(15.seconds)
+
+    val lamportsPerSignature = client.getFeeForMessage(initTransaction.message.serialize())
+    println("Lamports per signature: $lamportsPerSignature")
+
+    val nonce = client.getNonce(nonceAccount.publicKey, Commitment.Processed)
+    println("Nonce account info: $nonce")
+
+    val testTransaction = TransactionBuilder()
+      .addInstruction(
+        SystemProgram.nonceAdvance(
+          nonceAccount = nonceAccount.publicKey,
+          authorized = keypair.publicKey,
+        )
+      )
+      .setRecentBlockHash(nonce!!.nonce)
+      .build()
+      .sign(keypair)
+
+    val testSignature = client.sendTransaction(testTransaction)
+    println("Advanced nonce account: $testSignature")
   }
 }