From a974ade7690b1af017ff73aeefd1f1dacb0b1387 Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Wed, 10 Apr 2024 21:56:14 -0600 Subject: [PATCH 1/3] fix: fix issue of crosschain package handling --- pom.xml | 3 +- .../api/client/crosschain/ContentEnum.java | 3 ++ .../crosschain/content/StakeMigrationSyn.java | 30 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java diff --git a/pom.xml b/pom.xml index 5e81d35..5c48385 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.binance.dex.api binance-dex-api-client - 1.1.6 + 1.1.8 @@ -78,7 +78,6 @@ junit junit 4.13.1 - test org.usb4java diff --git a/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java b/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java index c2ce6f6..f36c192 100644 --- a/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java +++ b/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java @@ -26,6 +26,9 @@ public enum ContentEnum { CrossStakeSynPack(16, 0, CrossStakeSyn.class), CrossStakeRefundPack(16, 1, CrossStakeRefund.class), CrossStakeFailAckPack(16, 2, CrossStakeFailAck.class), + StakeMigrationSynPack(17, 0, StakeMigrationSyn.class), + StakeMigrationAckPack(17, 1, StakeMigrationSyn.class), + StakeMigrationFailAckPack(17, 2, StakeMigrationSyn.class), ; private Integer channelId; diff --git a/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java b/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java new file mode 100644 index 0000000..eda53c2 --- /dev/null +++ b/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java @@ -0,0 +1,30 @@ +package com.binance.dex.api.client.crosschain.content; + +import com.binance.dex.api.client.crosschain.*; +import com.binance.dex.api.client.crosschain.content.crossStakeSynParamsBytes.DelegateSynParamsBytes; +import com.binance.dex.api.client.crosschain.content.crossStakeSynParamsBytes.RedelegateSynParamsBytes; +import com.binance.dex.api.client.crosschain.content.crossStakeSynParamsBytes.UndelegateSynParamsBytes; +import com.binance.dex.api.client.encoding.ByteUtil; +import com.binance.dex.api.client.encoding.message.common.Bech32AddressValue; +import com.binance.dex.api.client.encoding.message.common.EthAddressValue; +import com.binance.dex.api.client.rlp.Decoder; +import com.binance.dex.api.client.rlp.RlpDecodable; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + + +@Getter +@Setter +public class StakeMigrationSyn extends Content { + + private EthAddressValue operatorAddress; + private EthAddressValue delegatorAddress; + private UnsignedNumber amount; + private Bech32AddressValue refundAddress; + @Override + protected void setHrp(String hrp) { + refundAddress.setHrp(hrp); + } +} From 823c5235dd34c7879e5c9f11d5b6dd42f6297b4a Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Thu, 11 Apr 2024 09:06:48 +0800 Subject: [PATCH 2/3] refine codes --- pom.xml | 1 + .../binance/dex/api/client/crosschain/ContentEnum.java | 6 +++--- .../{StakeMigrationSyn.java => StakeMigration.java} | 10 +--------- 3 files changed, 5 insertions(+), 12 deletions(-) rename src/main/java/com/binance/dex/api/client/crosschain/content/{StakeMigrationSyn.java => StakeMigration.java} (52%) diff --git a/pom.xml b/pom.xml index 5c48385..11d56d7 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,7 @@ junit junit 4.13.1 + test org.usb4java diff --git a/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java b/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java index f36c192..0f44f9f 100644 --- a/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java +++ b/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java @@ -26,9 +26,9 @@ public enum ContentEnum { CrossStakeSynPack(16, 0, CrossStakeSyn.class), CrossStakeRefundPack(16, 1, CrossStakeRefund.class), CrossStakeFailAckPack(16, 2, CrossStakeFailAck.class), - StakeMigrationSynPack(17, 0, StakeMigrationSyn.class), - StakeMigrationAckPack(17, 1, StakeMigrationSyn.class), - StakeMigrationFailAckPack(17, 2, StakeMigrationSyn.class), + StakeMigrationSynPack(17, 0, StakeMigration.class), + StakeMigrationAckPack(17, 1, StakeMigration.class), + StakeMigrationFailAckPack(17, 2, StakeMigration.class), ; private Integer channelId; diff --git a/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java b/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigration.java similarity index 52% rename from src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java rename to src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigration.java index eda53c2..c09add5 100644 --- a/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationSyn.java +++ b/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigration.java @@ -1,23 +1,15 @@ package com.binance.dex.api.client.crosschain.content; import com.binance.dex.api.client.crosschain.*; -import com.binance.dex.api.client.crosschain.content.crossStakeSynParamsBytes.DelegateSynParamsBytes; -import com.binance.dex.api.client.crosschain.content.crossStakeSynParamsBytes.RedelegateSynParamsBytes; -import com.binance.dex.api.client.crosschain.content.crossStakeSynParamsBytes.UndelegateSynParamsBytes; -import com.binance.dex.api.client.encoding.ByteUtil; import com.binance.dex.api.client.encoding.message.common.Bech32AddressValue; import com.binance.dex.api.client.encoding.message.common.EthAddressValue; -import com.binance.dex.api.client.rlp.Decoder; -import com.binance.dex.api.client.rlp.RlpDecodable; import lombok.Getter; import lombok.Setter; -import java.util.List; - @Getter @Setter -public class StakeMigrationSyn extends Content { +public class StakeMigration extends Content { private EthAddressValue operatorAddress; private EthAddressValue delegatorAddress; From e46fbe11b2b8d18ea90541994a462301a208ddda Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Thu, 11 Apr 2024 10:10:12 -0600 Subject: [PATCH 3/3] fix field order issue --- .../com/binance/dex/api/client/crosschain/ContentEnum.java | 6 +++--- .../{StakeMigration.java => StakeMigrationRefund.java} | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) rename src/main/java/com/binance/dex/api/client/crosschain/content/{StakeMigration.java => StakeMigrationRefund.java} (85%) diff --git a/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java b/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java index 0f44f9f..5aa1951 100644 --- a/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java +++ b/src/main/java/com/binance/dex/api/client/crosschain/ContentEnum.java @@ -26,9 +26,9 @@ public enum ContentEnum { CrossStakeSynPack(16, 0, CrossStakeSyn.class), CrossStakeRefundPack(16, 1, CrossStakeRefund.class), CrossStakeFailAckPack(16, 2, CrossStakeFailAck.class), - StakeMigrationSynPack(17, 0, StakeMigration.class), - StakeMigrationAckPack(17, 1, StakeMigration.class), - StakeMigrationFailAckPack(17, 2, StakeMigration.class), + StakeMigrationSynPack(17, 0, StakeMigrationRefund.class), + StakeMigrationAckPack(17, 1, StakeMigrationRefund.class), + StakeMigrationFailAckPack(17, 2, StakeMigrationRefund.class), ; private Integer channelId; diff --git a/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigration.java b/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationRefund.java similarity index 85% rename from src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigration.java rename to src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationRefund.java index c09add5..6bb2a91 100644 --- a/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigration.java +++ b/src/main/java/com/binance/dex/api/client/crosschain/content/StakeMigrationRefund.java @@ -9,14 +9,15 @@ @Getter @Setter -public class StakeMigration extends Content { +public class StakeMigrationRefund extends Content { private EthAddressValue operatorAddress; private EthAddressValue delegatorAddress; - private UnsignedNumber amount; private Bech32AddressValue refundAddress; + private UnsignedNumber amount; + @Override protected void setHrp(String hrp) { - refundAddress.setHrp(hrp); + this.refundAddress.setHrp(hrp); } }