diff --git a/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/RawTransactionResult.scala b/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/RawTransactionResult.scala index b5540cac20..014274dc4f 100644 --- a/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/RawTransactionResult.scala +++ b/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/RawTransactionResult.scala @@ -87,6 +87,6 @@ case class SignRawTransactionError( txid: DoubleSha256Digest, vout: Int, scriptSig: ScriptPubKey, - sequence: Int, + sequence: UInt32, error: String ) extends RawTransactionResult diff --git a/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/WalletResult.scala b/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/WalletResult.scala index 0817526a52..be26332169 100644 --- a/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/WalletResult.scala +++ b/rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/WalletResult.scala @@ -24,7 +24,7 @@ case class BumpFeeResult( txid: DoubleSha256Digest, origfee: Bitcoins, fee: Bitcoins, // Should be BitcoinFeeUnit - warnings: String) + errors: Vector[String]) extends WalletResult case class GetTransactionResult( diff --git a/rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonWriters.scala b/rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonWriters.scala index 3abe377398..1371bf1795 100644 --- a/rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonWriters.scala +++ b/rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonWriters.scala @@ -6,6 +6,7 @@ import org.bitcoins.core.number.UInt32 import org.bitcoins.core.protocol.BitcoinAddress import org.bitcoins.core.protocol.script.ScriptPubKey import org.bitcoins.core.protocol.transaction.{Transaction, TransactionInput} +import org.bitcoins.core.util.BitcoinSUtil import play.api.libs.json._ object JsonWriters { @@ -22,7 +23,7 @@ object JsonWriters { } implicit object ScriptPubKeyWrites extends Writes[ScriptPubKey] { - override def writes(o: ScriptPubKey): JsValue = JsString(o.hex) + override def writes(o: ScriptPubKey): JsValue = JsString(BitcoinSUtil.encodeHex(o.asmBytes)) } implicit object TransactionInputWrites extends Writes[TransactionInput] {