diff --git a/src/main/java/com/cobo/custody/api/client/CoboMPCApiRestClient.java b/src/main/java/com/cobo/custody/api/client/CoboMPCApiRestClient.java index b4242ed..133ccb2 100644 --- a/src/main/java/com/cobo/custody/api/client/CoboMPCApiRestClient.java +++ b/src/main/java/com/cobo/custody/api/client/CoboMPCApiRestClient.java @@ -18,7 +18,7 @@ public interface CoboMPCApiRestClient { ApiResponse getAddressList(String chainCode, int pageIndex, int pageLength, Integer sortFlag); ApiResponse getWalletAssetList(String address, String chainCode); ApiResponse createTransaction(String coin, String requestId, String fromAddr, String toAddr, BigInteger amount); - ApiResponse getTransaction(String requestId, String txId); + ApiResponse getTransaction(String requestId); ApiResponse listWalletTransactions(String address, String coin, String maxId, String minId, Integer limit); diff --git a/src/main/java/com/cobo/custody/api/client/domain/asset/MPCAssetCoinInfo.java b/src/main/java/com/cobo/custody/api/client/domain/asset/MPCAssetCoinInfo.java index 7907059..47f71b8 100644 --- a/src/main/java/com/cobo/custody/api/client/domain/asset/MPCAssetCoinInfo.java +++ b/src/main/java/com/cobo/custody/api/client/domain/asset/MPCAssetCoinInfo.java @@ -4,8 +4,8 @@ public class MPCAssetCoinInfo { private String coin; - @JsonProperty(value = "chain_coin") - private String chainCoin; + @JsonProperty(value = "chain_code") + private String chainCode; @JsonProperty(value = "display_code") private String displayCode; private String description; @@ -19,12 +19,12 @@ public void setCoin(String coin) { this.coin = coin; } - public String getChainCoin() { - return chainCoin; + public String getChainCode() { + return chainCode; } - public void setChainCoin(String chainCoin) { - this.chainCoin = chainCoin; + public void setChainCode(String chainCode) { + this.chainCode = chainCode; } public String getDisplayCode() { @@ -55,7 +55,7 @@ public void setAmount(Long amount) { public String toString() { return "{" + "coin='" + coin + '\'' + - ", chain_coin='" + chainCoin + '\'' + + ", chain_code='" + chainCode + '\'' + ", display_code='" + displayCode + '\'' + ", description='" + description + '\'' + ", amount='" + amount + '\'' + diff --git a/src/main/java/com/cobo/custody/api/client/domain/transaction/MPCTransaction.java b/src/main/java/com/cobo/custody/api/client/domain/transaction/MPCTransaction.java index a391cd0..8dc001c 100644 --- a/src/main/java/com/cobo/custody/api/client/domain/transaction/MPCTransaction.java +++ b/src/main/java/com/cobo/custody/api/client/domain/transaction/MPCTransaction.java @@ -6,9 +6,10 @@ public class MPCTransaction { private String id; - private Long time; + @JsonProperty(value = "create_time") + private Long createTime; private Integer status; - @JsonProperty(value = "chain_coin") + @JsonProperty(value = "chain_code") private String chainCode; private String coin; private List tokens; @@ -21,12 +22,12 @@ public void setId(String id) { this.id = id; } - public Long getTime() { - return time; + public Long getCreateTime() { + return createTime; } - public void setTime(Long time) { - this.time = time; + public void setCreateTime(Long createTime) { + this.createTime = createTime; } public Integer getStatus() { @@ -65,11 +66,11 @@ public void setTokens(List tokens) { public String toString() { return "{" + "id='" + id + '\'' + - "time='" + time + '\'' + - "status='" + status + '\'' + - "chain_code='" + chainCode + '\'' + - "coin='" + coin + '\'' + - "tokens='" + tokens + '\'' + + ", create_time='" + createTime + '\'' + + ", status='" + status + '\'' + + ", chain_code='" + chainCode + '\'' + + ", coin='" + coin + '\'' + + ", tokens='" + tokens + '\'' + '}'; } } diff --git a/src/main/java/com/cobo/custody/api/client/domain/transaction/Web3Token.java b/src/main/java/com/cobo/custody/api/client/domain/transaction/Web3Token.java index be8e256..e167dbe 100644 --- a/src/main/java/com/cobo/custody/api/client/domain/transaction/Web3Token.java +++ b/src/main/java/com/cobo/custody/api/client/domain/transaction/Web3Token.java @@ -24,7 +24,7 @@ public void setAmount(Double amount) { public String toString() { return "{" + "name='" + name + '\'' + - "amount='" + amount + '\'' + + ", amount='" + amount + '\'' + '}'; } } diff --git a/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImpl.java b/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImpl.java index 96221cf..6b2f2a6 100644 --- a/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImpl.java +++ b/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImpl.java @@ -54,8 +54,8 @@ public ApiResponse createTransaction(String coin, String requestId, String } @Override - public ApiResponse getTransaction(String requestId, String txId) { - return executeSync(coboMPCApiService.getTransaction(requestId, txId)); + public ApiResponse getTransaction(String requestId) { + return executeSync(coboMPCApiService.getTransaction(requestId)); } @Override diff --git a/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiService.java b/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiService.java index 45191ce..4c38efe 100644 --- a/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiService.java +++ b/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiService.java @@ -44,8 +44,7 @@ Call> createTransaction(@Field("coin") String coin, @Field("amount") BigInteger amount); @GET("/v1/custody/mpc/transaction_info/") - Call> getTransaction(@Query("request_id") String requestId, - @Query("tx_id") String txId); + Call> getTransaction(@Query("request_id") String requestId); @GET("/v1/custody/mpc/list_transactions/") Call> listWalletTransactions(@Query("address") String address, diff --git a/src/test/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImplTest.java b/src/test/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImplTest.java index 9738839..dc2326d 100644 --- a/src/test/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImplTest.java +++ b/src/test/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImplTest.java @@ -40,7 +40,7 @@ public void tearDown() { @Test public void testGetSupportedChains() { ApiResponse res = mpcClient.getSupportedChains(); - System.out.println(res); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } @@ -48,16 +48,16 @@ public void testGetSupportedChains() { public void testgetSupportedCoins() { String chainCode = "GETH"; ApiResponse res = mpcClient.getSupportedCoins(chainCode); - System.out.println(res); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } @Test public void testBatchNewAddress() { String chainCode = "GETH"; - int count = 10; + int count = 2; ApiResponse res = mpcClient.batchNewAddress(chainCode, count); - System.out.println(res); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } @@ -68,7 +68,7 @@ public void testGetAddressList() { int pageLength = 10; Integer sortFlag = 0; ApiResponse res = mpcClient.getAddressList(chainCode, pageIndex, pageLength, sortFlag); - System.out.println(res); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } @@ -77,7 +77,7 @@ public void testGetWalletAssetList() { String address = "0x4897e732734a7b4265cf48201b0ad2adb06657ba"; String chainCode = "GETH"; ApiResponse res = mpcClient.getWalletAssetList(address, chainCode); - System.out.println(res); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } @@ -89,14 +89,15 @@ public void testCreateTransaction() { String toAddr = "0xEEACb7a5e53600c144C0b9839A834bb4b39E540c"; BigInteger amount = new BigInteger("10"); ApiResponse res = mpcClient.createTransaction(coin, requestId, fromAddr, toAddr, amount); + System.out.println(requestId); assertTrue(res.isSuccess()); } @Test public void testGetTransaction() { - String requestId = "1668492939032"; - ApiResponse res = mpcClient.getTransaction(requestId, null); - System.out.println(res); + String requestId = "1668678820274"; + ApiResponse res = mpcClient.getTransaction(requestId); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } @@ -109,7 +110,7 @@ public void testListWalletTransactions() { int limit = 10; ApiResponse res = mpcClient.listWalletTransactions(address, coin, maxId, minId, limit); - System.out.println(res); + System.out.println(res.getResult()); assertTrue(res.isSuccess()); } }