Skip to content

add support for several transaction types #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2019
Merged

add support for several transaction types #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions src/main/java/com/binance/dex/api/client/impl/BinanceDexApiNodeClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.binance.dex.api.client.domain.jsonrpc.*;
import com.binance.dex.api.client.encoding.Crypto;
import com.binance.dex.api.client.encoding.message.MessageType;
import com.binance.dex.api.client.encoding.message.NewOrderMessage;
import com.binance.dex.api.client.encoding.message.TransactionRequestAssembler;
import com.binance.dex.api.proto.AppAccount;
import com.binance.dex.api.proto.Send;
Expand Down Expand Up @@ -220,6 +221,16 @@ protected Transaction convert(byte[] bytes) {
switch (messageType) {
case Send:
return convertTransfer(bytes);
case NewOrder:
return convertNewOrder(bytes);
case CancelOrder:
return convertCancelOrder(bytes);
case TokenFreeze:
return convertTokenFreeze(bytes);
case TokenUnfreeze:
return convertTokenUnfreeze(bytes);
case Vote:
return convertVote(bytes);
}
return null;
} catch (Exception e) {
Expand Down Expand Up @@ -247,6 +258,85 @@ protected Transaction convertTransfer(byte[] value) throws InvalidProtocolBuffer
return transaction;
}

protected Transaction convertNewOrder(byte[] value) throws InvalidProtocolBufferException {
byte[] array = new byte[value.length - 4];
System.arraycopy(value, 4, array, 0, array.length);
com.binance.dex.api.proto.NewOrder newOrderMessage = com.binance.dex.api.proto.NewOrder.parseFrom(array);
NewOrder newOrder = new NewOrder();
newOrder.setSymbol(newOrderMessage.getSymbol());
newOrder.setOrderType(OrderType.fromValue(newOrderMessage.getOrdertype()));
newOrder.setPrice("" + newOrderMessage.getPrice());
newOrder.setQuantity("" + newOrderMessage.getQuantity());
newOrder.setSide(OrderSide.fromValue(newOrderMessage.getSide()));
newOrder.setTimeInForce(TimeInForce.fromValue(newOrderMessage.getTimeinforce()));
Transaction transaction = new Transaction();
transaction.setTxType(TxType.NEW_ORDER);
transaction.setRealTx(newOrder);
return transaction;
}

protected Transaction convertCancelOrder(byte[] value) throws InvalidProtocolBufferException {
byte[] array = new byte[value.length - 4];
System.arraycopy(value, 4, array, 0, array.length);
com.binance.dex.api.proto.CancelOrder cancelOrderOrderMessage = com.binance.dex.api.proto.CancelOrder.parseFrom(array);

CancelOrder cancelOrder = new CancelOrder();
cancelOrder.setRefId(cancelOrderOrderMessage.getRefid());
cancelOrder.setSymbol(cancelOrderOrderMessage.getSymbol());

Transaction transaction = new Transaction();
transaction.setTxType(TxType.CANCEL_ORDER);
transaction.setRealTx(cancelOrder);
return transaction;
}

protected Transaction convertTokenFreeze(byte[] value) throws InvalidProtocolBufferException {
byte[] array = new byte[value.length - 4];
System.arraycopy(value, 4, array, 0, array.length);
com.binance.dex.api.proto.TokenFreeze tokenFreezeMessage = com.binance.dex.api.proto.TokenFreeze.parseFrom(array);

TokenFreeze tokenFreeze = new TokenFreeze();
tokenFreeze.setAmount("" + tokenFreezeMessage.getAmount());
tokenFreeze.setSymbol(tokenFreezeMessage.getSymbol());

Transaction transaction = new Transaction();
transaction.setTxType(TxType.FREEZE_TOKEN);
transaction.setRealTx(tokenFreeze);
return transaction;
}

protected Transaction convertTokenUnfreeze(byte[] value) throws InvalidProtocolBufferException {
byte[] array = new byte[value.length - 4];
System.arraycopy(value, 4, array, 0, array.length);
com.binance.dex.api.proto.TokenUnfreeze tokenUnfreezeMessage = com.binance.dex.api.proto.TokenUnfreeze.parseFrom(array);

TokenUnfreeze tokenUnfreeze = new TokenUnfreeze();
tokenUnfreeze.setSymbol(tokenUnfreezeMessage.getSymbol());
tokenUnfreeze.setAmount("" + tokenUnfreezeMessage.getAmount());

Transaction transaction = new Transaction();
transaction.setTxType(TxType.UNFREEZE_TOKEN);
transaction.setRealTx(tokenUnfreeze);
return transaction;
}

protected Transaction convertVote(byte[] value) throws InvalidProtocolBufferException {
byte[] array = new byte[value.length - 4];
System.arraycopy(value, 4, array, 0, array.length);
com.binance.dex.api.proto.Vote voteMessage = com.binance.dex.api.proto.Vote.parseFrom(array);

Vote vote = new Vote();

vote.setOption((int) voteMessage.getOption());
vote.setProposalId(voteMessage.getProposalId());

Transaction transaction = new Transaction();
transaction.setTxType(TxType.VOTE);
transaction.setRealTx(vote);
return transaction;
}


protected Account convert(AppAccount appAccount) {
Account account = new Account();
account.setAccountNumber(new Long(appAccount.getBase().getAccountNumber()).intValue());
Expand Down
38 changes: 38 additions & 0 deletions src/test/java/com/binance/dex/api/client/examples/NodeClientExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,48 @@ public void testAccount() {

@Test
public void testBlockTransactions() {

//Transfer
Long height = 7794210L;
List<Transaction> transactions = binanceDexNodeApi.getBlockTransactions(height);
Assert.assertNotNull(transactions);
Assert.assertTrue(transactions.size() == 1);
Assert.assertEquals(transactions.get(0).getTxType(), TxType.TRANSFER);

//New Order
height = 11397093L;
transactions = binanceDexNodeApi.getBlockTransactions(height);
Assert.assertNotNull(transactions);
Assert.assertTrue(transactions.size() == 1);
Assert.assertEquals(transactions.get(0).getTxType(), TxType.NEW_ORDER);

//Cancel Order
height = 11397088L;
transactions = binanceDexNodeApi.getBlockTransactions(height);
Assert.assertNotNull(transactions);
Assert.assertTrue(transactions.size() == 1);
Assert.assertEquals(transactions.get(0).getTxType(), TxType.CANCEL_ORDER);

//Token freeze
height = 11381267L;
transactions = binanceDexNodeApi.getBlockTransactions(height);
Assert.assertNotNull(transactions);
Assert.assertTrue(transactions.size() == 1);
Assert.assertEquals(transactions.get(0).getTxType(), TxType.FREEZE_TOKEN);

//Token unfreeze
height = 11381269L;
transactions = binanceDexNodeApi.getBlockTransactions(height);
Assert.assertNotNull(transactions);
Assert.assertTrue(transactions.size() == 1);
Assert.assertEquals(transactions.get(0).getTxType(), TxType.UNFREEZE_TOKEN);

//vote
height = 11393637L;
transactions = binanceDexNodeApi.getBlockTransactions(height);
Assert.assertNotNull(transactions);
Assert.assertTrue(transactions.size() == 1);
Assert.assertEquals(transactions.get(0).getTxType(), TxType.VOTE);
}

@Test
Expand Down