Merge pull request #39 from ManfredKarrer/mk_master

Refactoring TxParser
bisq-network · Aug 27, 2018 · d70a81f · d70a81f
2 parents eee4597 + 75c7b65
commit d70a81f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/bisq/common/app/Version.java b/src/main/java/bisq/common/app/Version.java
@@ -118,6 +118,7 @@ public static void printVersion() {
                 '}');
     }
 
+    //TODO move to consensus area
     public static final byte COMPENSATION_REQUEST = (byte) 0x01;
     public static final byte PROPOSAL = (byte) 0x01;
     public static final byte BLIND_VOTE = (byte) 0x01;

diff --git a/src/main/proto/pb.proto b/src/main/proto/pb.proto
@@ -1335,8 +1335,7 @@ message Tx {
     repeated BaseTxOutput tx_outputs = 1;
     TxType txType = 2;
     int64 burnt_fee = 3;
-    int32 lock_time = 4;
-    int32 unlock_block_height = 5;
+    int32 unlock_block_height = 4;
 }
 
 enum TxType {
@@ -1380,6 +1379,7 @@ message RawTxOutput {
 
 message TxOutput {
     TxOutputType tx_output_type = 1;
+    int32 lock_time = 2;
 }
 
 enum TxOutputType {