Merge pull request #7 from Bitcoin-com/0.0.2-SNAPSHOT

AndreasLarssons · web-flow · commit 2e747dbdef17 · 2020-02-13T10:12:09.000+09:00
0.0.2 snapshot
diff --git a/slp-indexer-api-service/pom.xml b/slp-indexer-api-service/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bitcoin.indexer</groupId>
 	<artifactId>slp-indexer-api-service</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>API</name>
@@ -36,17 +36,17 @@
 			<dependency>
 				<groupId>com.bitcoin.indexer</groupId>
 				<artifactId>slp-indexer-api-service-domain</artifactId>
-				<version>0.0.1-SNAPSHOT</version>
+				<version>0.0.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>com.bitcoin.indexer</groupId>
 				<artifactId>slp-indexer-api-service-app</artifactId>
-				<version>0.0.1-SNAPSHOT</version>
+				<version>0.0.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>com.bitcoin.indexer</groupId>
 				<artifactId>slp-indexer-api-service-integration-test</artifactId>
-				<version>0.0.1-SNAPSHOT</version>
+				<version>0.0.2-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
diff --git a/slp-indexer-api-service/slp-indexer-api-service-app/pom.xml b/slp-indexer-api-service/slp-indexer-api-service-app/pom.xml
@@ -8,11 +8,11 @@
     <parent>
         <groupId>com.bitcoin.indexer</groupId>
         <artifactId>slp-indexer-api-service</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>slp-indexer-api-service-app</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.bitcoin.indexer</groupId>
             <artifactId>slp-indexer-service-domain</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/slp-indexer-api-service/slp-indexer-api-service-domain/pom.xml b/slp-indexer-api-service/slp-indexer-api-service-domain/pom.xml
@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>com.bitcoin.indexer</groupId>
 		<artifactId>slp-indexer-api-service</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>slp-indexer-api-service-domain</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
diff --git a/slp-indexer-api-service/slp-indexer-api-service-integration-test/pom.xml b/slp-indexer-api-service/slp-indexer-api-service-integration-test/pom.xml
@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>com.bitcoin.indexer</groupId>
 		<artifactId>slp-indexer-api-service</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>slp-indexer-api-service-integration-test</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
diff --git a/slp-indexer-service/pom.xml b/slp-indexer-service/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bitcoin.indexer</groupId>
 	<artifactId>slp-indexer-service</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>WRITER</name>
@@ -45,7 +45,6 @@
 		<spring-boot-admin.version>2.1.3</spring-boot-admin.version>
 		<spring.cloud.netflix.version>2.1.0.RELEASE</spring.cloud.netflix.version>
 		<spring.restdocs.version>2.0.3.RELEASE</spring.restdocs.version>
-		<router.lib.version>0.0.1-SNAPSHOT</router.lib.version>
 		<spring.auto.restdocs.version>2.0.4</spring.auto.restdocs.version>
 		<spring.data.cassandra.version>2.1.4.RELEASE</spring.data.cassandra.version>
 		<!-- TEST -->
diff --git a/slp-indexer-service/slp-indexer-service-app/pom.xml b/slp-indexer-service/slp-indexer-service-app/pom.xml
@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>com.bitcoin.indexer</groupId>
 		<artifactId>slp-indexer-service</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>slp-indexer-service-app</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
diff --git a/slp-indexer-service/slp-indexer-service-app/src/main/resources/application-prod.properties b/slp-indexer-service/slp-indexer-service-app/src/main/resources/application-prod.properties
@@ -6,6 +6,7 @@ svp.header.store=/var/blockchain/indexer/spvheaderstore
 #dns.discovery=DNS_TO_YOUR_NODES
 #spring.data.mongodb.uri=CONNECTIONSTRING
 #spring.data.mongodb.database=slpblockchain
+#bitcoinj.peers.bch=127.0.0.1:8333,127.0.0.2:8333
 
 
 spring.application.name=slp-indexer-service
diff --git a/slp-indexer-service/slp-indexer-service-domain/pom.xml b/slp-indexer-service/slp-indexer-service-domain/pom.xml
@@ -12,11 +12,11 @@
 	<parent>
 		<groupId>com.bitcoin.indexer</groupId>
 		<artifactId>slp-indexer-service</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>slp-indexer-service-domain</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 
 
 	<dependencies>
diff --git a/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/Script.kt b/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/Script.kt
@@ -1,5 +1,7 @@
 package com.bitcoin.indexer.blockchain.domain.slp
 
+import org.bitcoinj.script.ScriptOpCodes
+
 /**
  * @author akibabu
  */
@@ -11,10 +13,21 @@ internal class Script {
     constructor(bytes: ByteArray) : this(org.bitcoinj.script.Script(bytes))
 
     constructor(script: org.bitcoinj.script.Script) {
+        validateScript(script)
         this.script = script
         this.bytes = script.program
     }
 
+    private fun validateScript(script: org.bitcoinj.script.Script) {
+        script.chunks.forEach{
+            if (it.opcode == ScriptOpCodes.OP_0) {
+                throw RuntimeException("Invalid script")
+            }
+        }
+
+
+    }
+
     val isOpReturn: Boolean
         get() = script.isOpReturn
     val chunks: List<ByteArray?>
diff --git a/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpOpReturnGenesis.kt b/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpOpReturnGenesis.kt
@@ -25,16 +25,54 @@ data class SlpOpReturnGenesis(
     companion object {
 
         fun create(tokenType: SlpTokenType, tokenId: SlpTokenId, chunks: List<ByteArray?>): SlpOpReturnGenesis? {
-            val ticker = chunks[4]?.let { String(it) } ?: ""
-            val name = chunks[5]?.let { String(it) } ?: ""
-            val decimals = chunks[8]?.let { ByteUtils.toInt(it) } ?: return null
-            val batonByte: Byte? = chunks[9]?.let { it.getOrNull(0) }
+            validateChunkSize(chunks)
+            val ticker = chunks[4]?.let { String(it).replace(Char.MIN_VALUE, ' ') } ?: ""
+            val name = chunks[5]?.let { String(it).replace(Char.MIN_VALUE, ' ') } ?: ""
+            val decimals = chunks[8]?.let { ByteUtils.toInt(validateDecimals(it)) } ?: return null
+            val batonByte: Byte? = validateBatonVout(chunks[9]?.getOrNull(0))
             val mintedAmount = chunks[10]?.let { it }.let { UnsignedBigInteger.parseUnsigned(BigInteger(it)) } ?: return null
-            val documentUri = chunks[6]?.let { String(it) } ?: ""
+            val documentUri = chunks[6]?.let { String(it).replace(Char.MIN_VALUE, '0') } ?: ""
+            val documentHash = chunks[7]?.let { String(validateDocumentHash(it)).replace(Char.MIN_VALUE, '0') } ?: ""
             return SlpOpReturnGenesis(tokenType, tokenId, ticker, name, decimals, batonByte?.toInt(), mintedAmount, documentUri);
         }
+
+        private fun validateDecimals(chunk: ByteArray): ByteArray {
+            if (chunk.isEmpty() || chunk.size > 1) {
+                throw RuntimeException("Invalid decimals")
+            }
+            if (ByteUtils.toInt(chunk) > 9) {
+                throw RuntimeException("Invalid decimals")
+            }
+
+            return chunk;
+        }
+
+        private fun validateBatonVout(batonByte: Byte?): Byte? {
+            if (batonByte != null) {
+                if (batonByte.toInt() == 0 || batonByte.toInt() == 1) {
+                    throw RuntimeException("Invalid baton")
+                }
+            }
+            return batonByte
+        }
+
+        private fun validateDocumentHash(chunk: ByteArray): ByteArray {
+            if (chunk.size == 32 || chunk.isEmpty()) {
+                return chunk
+            }
+            throw RuntimeException("Invalid documentHash")
+        }
+
+        private fun validateChunkSize(chunks: List<ByteArray?>) {
+            if (chunks.size > 11) {
+                throw RuntimeException("Invalid chunk size")
+            }
+        }
     }
 
+
+
+
     override fun toString(): String {
         return "SlpOpReturnGenesis(tokenType=$tokenType, tokenId=$tokenId, ticker='$ticker', name='$name', decimals=$decimals, batonVout=$batonVout, mintedAmount=$mintedAmount, documentUri='$documentUri')"
     }
diff --git a/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpOpReturnMint.kt b/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpOpReturnMint.kt
@@ -16,8 +16,9 @@ class SlpOpReturnMint(
     companion object {
 
         fun create(tokenType: SlpTokenType, tokenId: SlpTokenId, chunks: List<ByteArray?>): SlpOpReturnMint? {
+            validateChunkSize(chunks)
             if (chunks[5] != null && chunks[5]?.isEmpty() == false) {
-                val batonByte: Byte? = chunks[5]?.let { it[0] } ?: return null
+                val batonByte: Byte? = chunks[5]?.let { validateBatonByte(it[0]) } ?: return null
                 val mintedAmount = chunks[6]?.let { it }.let { UnsignedBigInteger.parseUnsigned(BigInteger(it)) }
                         ?: return null
                 return SlpOpReturnMint(tokenType, tokenId, batonByte?.toInt(), mintedAmount)
@@ -27,6 +28,21 @@ class SlpOpReturnMint(
             return SlpOpReturnMint(tokenType, tokenId, null, mintedAmount)
 
         }
+
+        private fun validateBatonByte(batonByte: Byte?): Byte? {
+            if (batonByte != null) {
+                if (batonByte.toInt() == 0 || batonByte.toInt() == 1) {
+                    throw RuntimeException("Invalid baton")
+                }
+            }
+            return batonByte
+        }
+
+        private fun validateChunkSize(chunks: List<ByteArray?>) {
+            if (chunks.size > 7) {
+                throw RuntimeException("Invalid chunk size")
+            }
+        }
     }
 
     override fun toString(): String {
diff --git a/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpOpReturnSend.kt b/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpOpReturnSend.kt
@@ -25,8 +25,10 @@ class SlpOpReturnSend(tokenType: SlpTokenType, tokenId: SlpTokenId, val quantiti
             if (chunks.size > MAX_CHUNKS_SEND) {
                 return null
             }
+            validateChunks(chunks)
             val quantities = chunks
                     .filter { chunk -> chunk?.size == 8 }
+                    //.filterIndexed {index, chunk -> filterInvalidBytes(chunk, index)}
                     .map { UnsignedBigInteger.parseUnsigned(BigInteger(it!!)) }
                     .map { it }
 
@@ -36,6 +38,14 @@ class SlpOpReturnSend(tokenType: SlpTokenType, tokenId: SlpTokenId, val quantiti
                 null
             }
         }
+
+        private fun validateChunks(chunks: List<ByteArray?>) {
+            chunks.drop(5).forEach {
+                if (it?.size != 8) {
+                    throw RuntimeException("ERROR")
+                }
+            }
+        }
     }
 
     fun createScript(): org.bitcoinj.script.Script {
diff --git a/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpTokenType.java b/slp-indexer-service/slp-indexer-service-domain/src/main/java/com/bitcoin/indexer/blockchain/domain/slp/SlpTokenType.java
@@ -30,7 +30,7 @@ public static Optional<SlpTokenType> tryParse(byte[] bytes) {
 
 		int key = ByteUtils.INSTANCE.toInt(bytes);
 		if (!currentKnownTokens.containsKey(key)) {
-			return Optional.of(new SlpTokenType("UNKNOWN", bytes));
+			throw new RuntimeException("Invalid token type");
 		}
 		return Optional.of(new SlpTokenType(currentKnownTokens.get(key), bytes));
 	}
diff --git a/slp-indexer-service/slp-indexer-service-integration-test/pom.xml b/slp-indexer-service/slp-indexer-service-integration-test/pom.xml
@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>com.bitcoin.indexer</groupId>
 		<artifactId>slp-indexer-service</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>slp-indexer-service-integration-test</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
diff --git a/slp-indexer-service/slp-indexer-service-integration-test/src/test/java/com/bitcoin/indexer/facade/SLPDBScriptsParserTest.java b/slp-indexer-service/slp-indexer-service-integration-test/src/test/java/com/bitcoin/indexer/facade/SLPDBScriptsParserTest.java
@@ -34,6 +34,8 @@ public void parameterized_validation() {
 		SlpOpReturn slpOpReturn = SlpOpReturn.Companion.tryParse("6448381f9649ecacd8c30189cfbfee71a91b6b9738ea494fe33f8b8b51cbfca0", script);
 		if (code == null) {
 			assertThat(slpOpReturn, Matchers.notNullValue());
+		} else {
+			assertThat(slpOpReturn, Matchers.nullValue());
 		}
 
 	}
diff --git a/slp-indexer-service/slp-indexer-service-integration-test/src/test/java/com/bitcoin/indexer/facade/SLPDBTestVectorTest.java b/slp-indexer-service/slp-indexer-service-integration-test/src/test/java/com/bitcoin/indexer/facade/SLPDBTestVectorTest.java
@@ -114,7 +114,7 @@ public void parameterized_validation() {
 		if (shouldValid) {
 			assertThat(description, tx.getSlpValid().get().getValid(), Matchers.is(SlpValid.Valid.VALID));
 		} else {
-			assertThat(description, tx.getSlpValid().get().getValid(), Matchers.is(SlpValid.Valid.INVALID));
+			assertThat(description, tx.getSlpValid().get().getValid(), Matchers.anyOf(Matchers.is(SlpValid.Valid.INVALID), Matchers.is(SlpValid.Valid.UNKNOWN)));
 		}
 	}
 
