Fix NetworkSnapshot field

Author: Tougee

library/src/main/kotlin/one/mixin/bot/api/call/SnapshotCallService.kt

@@ -54,7 +54,7 @@ interface SnapshotCallService {
     @GET("/network/snapshots/{id}")
     fun networkSnapshotCall(@Path("id") snapshotId: String): Call<MixinResponse<NetworkSnapshot>>
 
-    @GET("/network/snapshots/")
+    @GET("/network/snapshots")
     fun networkSnapshotsCall(
         @Query("asset") assetId: String,
         @Query("offset") offset: String? = null,

library/src/main/kotlin/one/mixin/bot/api/coroutine/SnapshotCoroutineService.kt

@@ -53,7 +53,7 @@ interface SnapshotCoroutineService {
     @GET("/network/snapshots/{id}")
     suspend fun networkSnapshot(@Path("id") snapshotId: String): MixinResponse<NetworkSnapshot>
 
-    @GET("/network/snapshots/")
+    @GET("/network/snapshots")
     suspend fun networkSnapshots(
         @Query("asset") assetId: String,
         @Query("offset") offset: String? = null,

library/src/main/kotlin/one/mixin/bot/vo/NetworkSnapshot.kt

@@ -8,7 +8,6 @@ data class NetworkSnapshot(
     val asset: Asset,
     @SerializedName("created_at")
     val createdAt: String,
-    val data: String,
     @SerializedName("snapshot_id")
     val snapshotId: String,
     @SerializedName("source")
@@ -20,4 +19,6 @@ data class NetworkSnapshot(
     val traceId: String?,
     @SerializedName("opponent_id")
     val opponentId: String?,
+    @SerializedName("data")
+    val memo: String?,
 )

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

@@ -92,7 +92,7 @@ public static void main(String[] args) {
             transactionsOpponentKey(client, "XINQTmRReDuPEUAVEyDyE2mBgxa1ojVRAvpYcKs5nSA7FDBBfAEeVRn8s9vAm3Cn1qzQ7JtjG62go4jSJU6yWyRUKHpamWAM", pinToken, pin);
 
             networkSnapshot(client, "c8e73a02-b543-4100-bd7a-879ed4accdfc");
-            networkSnapshots(client, CNB_assetId);
+            networkSnapshots(client, CNB_assetId, null, 10, null);
 
             readGhostKey(client);
         } catch (InterruptedException | IOException e) {
@@ -306,11 +306,15 @@ private static void networkSnapshot(HttpClient client, String snapshotId) throws
         }
     }
 
-    private static void networkSnapshots(HttpClient client, String assetId) throws IOException {
-        MixinResponse<List<NetworkSnapshot>> snapshotResponse = client.getSnapshotService().networkSnapshotsCall(assetId, null, 10, "ASC").execute().body();
+    private static void networkSnapshots(HttpClient client, String assetId, String offset, int limit, String order) throws IOException {
+        MixinResponse<List<NetworkSnapshot>> snapshotResponse = client.getSnapshotService().networkSnapshotsCall(assetId, offset, limit, order).execute().body();
         assert snapshotResponse != null;
         if (snapshotResponse.isSuccess()) {
+            List<NetworkSnapshot> data = snapshotResponse.getData();
             System.out.printf("Success: %d%n", Objects.requireNonNull(snapshotResponse.getData()).size());
+            for (NetworkSnapshot datum : data) {
+                System.out.println(datum.toString());
+            }
         } else {
             System.out.printf("failure: %s", Objects.requireNonNull(snapshotResponse.getError()).getDescription());
         }

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

@@ -301,8 +301,11 @@ internal suspend fun networkSnapshots(
     val snapshotResponse = client.snapshotService.networkSnapshots(assetId, offset, limit, order)
     var networkSnapshots: List<NetworkSnapshot>? = null
     if (snapshotResponse.isSuccess()) {
-        networkSnapshots = snapshotResponse.data
-        println("Network snapshots success: ${snapshotResponse.data?.size}")
+        networkSnapshots = snapshotResponse.data as List<NetworkSnapshot>
+        println("Network snapshots success")
+        for (s in networkSnapshots) {
+            println(s)
+        }
     } else {
         println("Network snapshot failure: ${snapshotResponse.error?.description}")
     }

samples/src/main/java/jvmMain/kotlin/UserTransferDemo.kt

@@ -27,6 +27,7 @@ fun main() = runBlocking {
     // create alice
     val alice = createUser(client, aliceSessionSecret)
     alice ?: return@runBlocking
+    println("alice: $alice")
     val aliceToken = SessionToken.EdDSA(
         alice.userId, alice.sessionId,
         (aliceSessionKey.private as EdDSAPrivateKey).seed.base64Encode()
@@ -48,6 +49,7 @@ fun main() = runBlocking {
     // create bob
     val bob = createUser(client, bobSessionSecret)
     bob ?: return@runBlocking
+    println("bob: $bob")
     val bobToken = SessionToken.EdDSA(
         bob.userId, bob.sessionId,
         (bobSessionKey.private as EdDSAPrivateKey).seed.base64Encode()
@@ -90,4 +92,14 @@ fun main() = runBlocking {
         assert(bobNetworkSnapshots?.find { it.snapshotId == snapshotAlice2Bob.snapshotId } != null)
     }
 
+
+    // use bot's token
+    client.setUserToken(null)
+    val botNetworkSnapshot = networkSnapshots(client, CNB_ID, limit = 10)
+    if (snapshotBot2Alice != null) {
+        assert(botNetworkSnapshot?.find { it.snapshotId == snapshotBot2Alice.snapshotId } != null)
+    }
+    if (snapshotAlice2Bob != null) {
+        assert(botNetworkSnapshot?.find { it.snapshotId == snapshotAlice2Bob.snapshotId } != null )
+    }
 }