ArkEcosystem
diff --git a/‎.gitignore‎
Lines changed: 26 additions & 1 deletion b/‎.gitignore‎
Lines changed: 26 additions & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 8 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎build.gradle‎
Lines changed: 47 additions & 6 deletions b/‎build.gradle‎
Lines changed: 47 additions & 6 deletions
diff --git a/‎gradle/wrapper/gradle-wrapper.jar‎
1.17 KB b/‎gradle/wrapper/gradle-wrapper.jar‎
1.17 KB
diff --git a/‎gradlew‎
Lines changed: 19 additions & 3 deletions b/‎gradlew‎
Lines changed: 19 additions & 3 deletions
diff --git a/‎gradlew.bat‎
Lines changed: 17 additions & 1 deletion b/‎gradlew.bat‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎src/main/java/org/arkecosystem/crypto/configuration/Fee.java‎
Lines changed: 39 additions & 17 deletions b/‎src/main/java/org/arkecosystem/crypto/configuration/Fee.java‎
Lines changed: 39 additions & 17 deletions
diff --git a/‎src/main/java/org/arkecosystem/crypto/encoding/Base58.java‎
Lines changed: 7 additions & 0 deletions b/‎src/main/java/org/arkecosystem/crypto/encoding/Base58.java‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/main/java/org/arkecosystem/crypto/encoding/Hex.java‎
Lines changed: 0 additions & 1 deletion b/‎src/main/java/org/arkecosystem/crypto/encoding/Hex.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/java/org/arkecosystem/crypto/enums/Types.java‎ renamed to ‎src/main/java/org/arkecosystem/crypto/enums/CoreTransactionTypes.java‎
Lines changed: 7 additions & 5 deletions b/‎src/main/java/org/arkecosystem/crypto/enums/Types.java‎ renamed to ‎src/main/java/org/arkecosystem/crypto/enums/CoreTransactionTypes.java‎
Lines changed: 7 additions & 5 deletions
@@ -2,5 +2,30 @@
 .gradle
 .idea/
 .tags
-build
+.project
+/build/
 out/
+bin/
+.settings
+.classpath
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+gen/
+idea-gitignore.jar
+resources/templates.list
+resources/gitignore/*
+build/
+build.properties
+junit*.properties
+IgnoreLexer.java~
+.DS_Store
+
+/verification
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.0.0 - 2020-02-11
+
+### Changed
+- Upgrade Dependencies
+
+### Added
+- Add Support for new Core v2.6 Transaction Types
+
 ## 0.1.6 - 2019-10-15
 
 ### Changed
 
@@ -1,3 +1,9 @@
+buildscript {
+    dependencies {
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.27.1"
+    }
+}
+
 plugins {
     id 'java'
     id 'maven'
@@ -9,12 +15,26 @@ plugins {
 apply plugin:'java'
 apply plugin:'maven'
 apply plugin:'maven-publish'
+apply plugin: com.diffplug.gradle.spotless.SpotlessPlugin
 
 repositories {
     jcenter()
     mavenCentral()
 }
 
+task fatJar(type: Jar) {
+    manifest.from jar.manifest
+    classifier = 'standalone'
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    } {
+        exclude "META-INF/*.SF"
+        exclude "META-INF/*.DSA"
+        exclude "META-INF/*.RSA"
+    }
+    with jar
+}
+
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
     from javadoc
@@ -34,19 +54,19 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-             repository(url: "file://${buildDir}/repo") {}
+            repository(url: "file://${buildDir}/repo") {}
 
             //repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
-             // authentication(userName: '', password: '')
-        // }
+            // authentication(userName: '', password: '')
+            // }
 
             //   snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
             //      authentication(userName: ossrhUsername, password: ossrhPassword)
             //  }
 
             pom.project {
                 groupId = 'org.arkecosystem'
-                version = '0.1.6'
+                version = '1.0.0'
                 artifactId = 'crypto'
 
                 name = 'java-crypto'
@@ -80,12 +100,18 @@ uploadArchives {
                         organization = 'Ark Ecosystem'
                         organizationUrl = 'https://ark.io'
                     }
+                    developer {
+                        name = 'Zan Kovac'
+                        email = '[email protected]'
+                        organization = 'Ark Ecosystem'
+                        organizationUrl = 'https://ark.io'
+                    }
                 }
 
                 scm {
                     connection = 'scm:git:git://github.com/ArkEcosystem/java-crypto.git'
                     developerConnection = 'scm:git:ssh://github.com:ArkEcosystem/java-crypto.git'
-                    url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.6'
+                    url = 'https://github.com/ArkEcosystem/java-crypto/tree/1.0.0'
                 }
             }
         }
@@ -124,5 +150,20 @@ jacocoTestReport {
 }
 
 wrapper {
-    gradleVersion = '4.9'
+    gradleVersion = '5.6.2'
 }
+    spotless {
+        java {
+            target fileTree(projectDir) {
+                include 'src/main/**/*.java'
+                include 'src/test/**/*.java'
+                exclude '**/build/**'
+            }
+            googleJavaFormat('1.1').aosp()
+        }
+    }
+
+
+task formatCode(dependsOn: ['spotlessApply'])
+
+build.dependsOn 'spotlessApply'
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -1,31 +1,53 @@
 package org.arkecosystem.crypto.configuration;
 
-import org.arkecosystem.crypto.enums.Fees;
-import org.arkecosystem.crypto.enums.Types;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.arkecosystem.crypto.enums.CoreTransactionTypes;
+import org.arkecosystem.crypto.enums.Fees;
+import org.arkecosystem.crypto.enums.TransactionTypeGroup;
 
 public class Fee {
-    private static Map<Types, Long> fees = new HashMap<>();
+    private static Map<Integer, Map<Integer, Long>> internalTransactionTypes = new HashMap<>();
 
     static {
-        fees.put(Types.TRANSFER, Fees.TRANSFER.getValue());
-        fees.put(Types.SECOND_SIGNATURE_REGISTRATION, Fees.SECOND_SIGNATURE_REGISTRATION.getValue());
-        fees.put(Types.DELEGATE_REGISTRATION, Fees.DELEGATE_REGISTRATION.getValue());
-        fees.put(Types.VOTE, Fees.VOTE.getValue());
-        fees.put(Types.MULTI_SIGNATURE_REGISTRATION, Fees.MULTI_SIGNATURE_REGISTRATION.getValue());
-        fees.put(Types.IPFS, Fees.IPFS.getValue());
-        fees.put(Types.TIMELOCK_TRANSFER, Fees.TIMELOCK_TRANSFER.getValue());
-        fees.put(Types.MULTI_PAYMENT, Fees.MULTI_PAYMENT.getValue());
-        fees.put(Types.DELEGATE_RESIGNATION, Fees.DELEGATE_RESIGNATION.getValue());
+        Map<Integer, Long> coreFees = new HashMap<>();
+
+        coreFees.put(CoreTransactionTypes.TRANSFER.getValue(), Fees.TRANSFER.getValue());
+        coreFees.put(
+                CoreTransactionTypes.SECOND_SIGNATURE_REGISTRATION.getValue(),
+                Fees.SECOND_SIGNATURE_REGISTRATION.getValue());
+        coreFees.put(
+                CoreTransactionTypes.DELEGATE_REGISTRATION.getValue(),
+                Fees.DELEGATE_REGISTRATION.getValue());
+        coreFees.put(CoreTransactionTypes.VOTE.getValue(), Fees.VOTE.getValue());
+        coreFees.put(
+                CoreTransactionTypes.MULTI_SIGNATURE_REGISTRATION.getValue(),
+                Fees.MULTI_SIGNATURE_REGISTRATION.getValue());
+        coreFees.put(CoreTransactionTypes.IPFS.getValue(), Fees.IPFS.getValue());
+        coreFees.put(CoreTransactionTypes.MULTI_PAYMENT.getValue(), Fees.MULTI_PAYMENT.getValue());
+        coreFees.put(
+                CoreTransactionTypes.DELEGATE_RESIGNATION.getValue(),
+                Fees.DELEGATE_RESIGNATION.getValue());
+        coreFees.put(CoreTransactionTypes.HTLC_LOCK.getValue(), Fees.HTLC_LOCK.getValue());
+        coreFees.put(CoreTransactionTypes.HTLC_CLAIM.getValue(), Fees.HTLC_CLAIM.getValue());
+        coreFees.put(CoreTransactionTypes.HTLC_REFUND.getValue(), Fees.HTLC_REFUND.getValue());
+
+        internalTransactionTypes.put(TransactionTypeGroup.CORE.getValue(), coreFees);
+    }
+
+    public static long getFee(int transactionTypeGroup, int type) {
+        return internalTransactionTypes.get(transactionTypeGroup).get(type);
     }
 
-    public static long get(Types type) {
-        return fees.get(type);
+    public static long getCoreFee(int type) {
+        return internalTransactionTypes.get(TransactionTypeGroup.CORE.getValue()).get(type);
     }
 
-    public static void set(Types type, long fee) {
-        fees.put(type, fee);
+    public static void set(int transactionTypeGroup, Map<Integer, Long> transactionTypes) {
+        if (transactionTypeGroup < TransactionTypeGroup.RESERVED.getValue()) {
+            throw new IllegalArgumentException(
+                    "Cannot add TransactionTypeGroup with value less then 1000");
+        }
+        internalTransactionTypes.put(transactionTypeGroup, transactionTypes);
     }
 }
@@ -14,4 +14,11 @@ public static byte[] decodeChecked(String value) {
         return org.bitcoinj.core.Base58.decodeChecked(value);
     }
 
+    public static byte[] decode(String value) {
+        return org.bitcoinj.core.Base58.decode(value);
+    }
+
+    public static String encode(byte[] value) {
+        return org.bitcoinj.core.Base58.encode(value);
+    }
 }
@@ -10,5 +10,4 @@ public static String encode(byte[] value) {
     public static byte[] decode(String value) {
         return BaseEncoding.base16().lowerCase().decode(value);
     }
-
 }
@@ -1,19 +1,21 @@
 package org.arkecosystem.crypto.enums;
 
-public enum Types {
+public enum CoreTransactionTypes {
     TRANSFER(0),
     SECOND_SIGNATURE_REGISTRATION(1),
     DELEGATE_REGISTRATION(2),
     VOTE(3),
     MULTI_SIGNATURE_REGISTRATION(4),
     IPFS(5),
-    TIMELOCK_TRANSFER(6),
-    MULTI_PAYMENT(7),
-    DELEGATE_RESIGNATION(8);
+    MULTI_PAYMENT(6),
+    DELEGATE_RESIGNATION(7),
+    HTLC_LOCK(8),
+    HTLC_CLAIM(9),
+    HTLC_REFUND(10);
 
     private final int value;
 
-    Types(int value) {
+    CoreTransactionTypes(int value) {
         this.value = value;
     }
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,11 @@ public static byte[] decodeChecked(String value) {`
`14`	`14`	`return org.bitcoinj.core.Base58.decodeChecked(value);`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ public static byte[] decode(String value) {`
	`18`	`+ return org.bitcoinj.core.Base58.decode(value);`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ public static String encode(byte[] value) {`
	`22`	`+ return org.bitcoinj.core.Base58.encode(value);`
	`23`	`+ }`
`17`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,4 @@ public static String encode(byte[] value) {`
`10`	`10`	`public static byte[] decode(String value) {`
`11`	`11`	`return BaseEncoding.base16().lowerCase().decode(value);`
`12`	`12`	`}`
`13`		`-`
`14`	`13`	`}`