Merge pull request #99 from metaplex-foundation/martini/base64-nowrap

Fix Base64 newline/wrapping
metaplex-foundation · Feb 6, 2023 · 3b92537 · 3b92537
2 parents 3deab25 + 7702976
commit 3b92537
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/src/main/java/com/metaplex/lib/drivers/solana/Connection.kt b/lib/src/main/java/com/metaplex/lib/drivers/solana/Connection.kt
@@ -58,7 +58,7 @@ suspend fun Connection.sendTransaction(serializedTransaction: String): Result<St
     get(SendTransactionRequest(serializedTransaction, transactionOptions), String.serializer())
 
 suspend fun Connection.sendTransaction(transaction: Transaction): Result<String> =
-    sendTransaction(Base64.encodeToString(transaction.serialize(), Base64.DEFAULT))
+    sendTransaction(Base64.encodeToString(transaction.serialize(), Base64.NO_WRAP))
 //endregion
 
 // Inlines let us hide the serialization complexity while still providing full control

diff --git a/lib/src/main/java/com/metaplex/lib/extensions/Transaction+Extensions.kt b/lib/src/main/java/com/metaplex/lib/extensions/Transaction+Extensions.kt
@@ -58,7 +58,7 @@ suspend fun Transaction.signAndSend(connection: Connection, payer: IdentityDrive
         return Result.failure(it)
     }
 
-    val serializedTxn = Base64.encodeToString(signedTxn.serialize(), Base64.DEFAULT)
+    val serializedTxn = Base64.encodeToString(signedTxn.serialize(), Base64.NO_WRAP)
 
     // sign and send transaction
     return connection.get(
@@ -78,7 +78,7 @@ suspend fun Transaction.signAndSend(connection: Connection, signers: List<Accoun
     sign(signers)
 
     // send transaction
-    return connection.sendTransaction(Base64.encodeToString(serialize(), Base64.DEFAULT))
+    return connection.sendTransaction(Base64.encodeToString(serialize(), Base64.NO_WRAP))
 }
 
 suspend fun Transaction.signSendAndConfirm(

diff --git a/lib/src/main/java/com/metaplex/lib/serialization/serializers/base64/Base64JsonSerializers.kt b/lib/src/main/java/com/metaplex/lib/serialization/serializers/base64/Base64JsonSerializers.kt
@@ -33,13 +33,13 @@ object ByteArrayAsBase64JsonArraySerializer: KSerializer<ByteArray> {
 
     override fun serialize(encoder: Encoder, value: ByteArray) =
         encoder.encodeSerializableValue(delegateSerializer, listOf(
-            Base64.encodeToString(value, Base64.DEFAULT), "base64"
+            Base64.encodeToString(value, Base64.NO_WRAP), "base64"
         ))
 
     override fun deserialize(decoder: Decoder): ByteArray {
         decoder.decodeSerializableValue(delegateSerializer).apply {
             if (contains("base64")) first { it != "base64" }.apply {
-                return Base64.decode(this, Base64.DEFAULT)
+                return Base64.decode(this, Base64.NO_WRAP)
             }
             else throw(SerializationException("Not Base64"))
         }