Update getutxo api

Author: SeniorZhai

library/build.gradle

@@ -3,7 +3,6 @@ plugins {
     id 'kotlin'
 }
 
-apply plugin: 'maven-publish'
 apply plugin: 'java'
 
 java {

library/src/main/kotlin/one/mixin/bot/HttpClient.kt

@@ -1,5 +1,6 @@
 package one.mixin.bot
 
+import com.google.gson.JsonObject
 import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import net.i2p.crypto.eddsa.EdDSAPrivateKey
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable
@@ -11,6 +12,7 @@ import one.mixin.bot.Constants.API.CN_URL
 import one.mixin.bot.Constants.API.URL
 import one.mixin.bot.api.AddressService
 import one.mixin.bot.api.AssetService
+import one.mixin.bot.api.ExternalService
 import one.mixin.bot.api.MessageService
 import one.mixin.bot.api.SnapshotService
 import one.mixin.bot.api.UserService
@@ -19,7 +21,9 @@ import one.mixin.bot.api.exception.ServerErrorException
 import one.mixin.bot.extension.base64Decode
 import one.mixin.bot.extension.base64Encode
 import one.mixin.bot.util.getRSAPrivateKeyFromString
+import one.mixin.bot.vo.RpcRequest
 import org.bouncycastle.jce.provider.BouncyCastleProvider
+import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.security.Security
@@ -134,6 +138,24 @@ class HttpClient private constructor(
         retrofit.create(MessageService::class.java)
     }
 
+    val externalService: ExternalService by lazy {
+        object : ExternalService {
+            override fun getutxoCall(hash: String, index: Int): Call<JsonObject> {
+                val list = mutableListOf<Any>()
+                list.add(hash)
+                list.add(index)
+                return userService.mixinRPCCall(RpcRequest("getutxo", list))
+            }
+
+            override suspend fun getutxo(hash: String, index: Int): JsonObject {
+                val list = mutableListOf<Any>()
+                list.add(hash)
+                list.add(index)
+                return userService.mixinRPC(RpcRequest("getutxo", list))
+            }
+        }
+    }
+
     class Builder {
         private lateinit var clientToken: SessionToken
         private var cnServer: Boolean = false

library/src/main/kotlin/one/mixin/bot/api/ExternalService.kt

@@ -0,0 +1,9 @@
+package one.mixin.bot.api
+
+import com.google.gson.JsonObject
+import retrofit2.Call
+
+interface ExternalService {
+    fun getutxoCall(hash: String, index: Int): Call<JsonObject>
+    suspend fun getutxo(hash: String, index: Int): JsonObject
+}

samples/src/main/java/jvmMain/java/Sample.java

@@ -32,7 +32,7 @@ public static void main(String[] args) {
         String pinToken = decryASEKey(pinTokenPem, key);
         HttpClient client = new HttpClient.Builder().configEdDSA(userId, sessionId, key).build();
         try {
-            rpc(client);
+            utxo(client);
 
             KeyPair sessionKey = generateEd25519KeyPair();
             EdDSAPublicKey publicKey = (EdDSAPublicKey) (sessionKey.getPublic());
@@ -98,11 +98,9 @@ public static void main(String[] args) {
         }
     }
 
-    private static void rpc(HttpClient client) throws IOException {
+    private static void utxo(HttpClient client) throws IOException {
         ArrayList<Object> list = new ArrayList<>();
-        list.add("b6afed179a8192513990e29953e3a6875eab53050b1e174d5c83ab76bbbd4b29");
-        list.add(0);
-        JsonObject response = client.getUserService().mixinRPCCall(new RpcRequest("getutxo", list)).execute().body();
+        JsonObject response = client.getExternalService().getutxoCall("b6afed179a8192513990e29953e3a6875eab53050b1e174d5c83ab76bbbd4b29",0).execute().body();
         assert response != null;
         System.out.printf("%s%n", response.toString());
     }