CRYPTOAPIS-1999 implemented omni layer in java sdk

stanimir-barakov · stanimir-barakov · commit b7c9764a0fcf · 2019-10-25T17:05:25.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -190,7 +190,7 @@
     <properties>
         <java.version>1.8</java.version>
         <project.name>cryptoapis-java-client</project.name>
-        <project.version>1.2.1</project.version>
+        <project.version>1.2.2</project.version>
     </properties>
 
 </project>
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/Account.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/Account.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.models;
+package io.cryptoapis.blockchains.ethereum_based.models;
 
 import io.cryptoapis.common_models.Stringify;
 
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/Contract.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/Contract.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.models;
+package io.cryptoapis.blockchains.ethereum_based.models;
 
 import io.cryptoapis.common_models.Stringify;
 
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/Payment.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/Payment.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.models;
+package io.cryptoapis.blockchains.ethereum_based.models;
 
 import io.cryptoapis.common_models.Stringify;
 import io.cryptoapis.utils.enums.KeyType;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/RawTransaction.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/RawTransaction.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.models;
+package io.cryptoapis.blockchains.ethereum_based.models;
 
 import io.cryptoapis.common_models.Stringify;
 import io.cryptoapis.utils.enums.KeyType;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/TokenTransfer.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/models/TokenTransfer.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.models;
+package io.cryptoapis.blockchains.ethereum_based.models;
 
 import io.cryptoapis.common_models.Stringify;
 import io.cryptoapis.utils.enums.KeyType;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/AddressService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/AddressService.java
@@ -1,7 +1,7 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
-import io.cryptoapis.blockchains.ethereum.models.Account;
+import io.cryptoapis.blockchains.ethereum_based.models.Account;
 import io.cryptoapis.common_models.ApiError;
 import io.cryptoapis.common_models.ApiResponse;
 import io.cryptoapis.utils.Utils;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/BlockService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/BlockService.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
 import io.cryptoapis.common_models.ApiResponse;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/BlockchainService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/BlockchainService.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
 import io.cryptoapis.common_models.ApiResponse;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/ContractService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/ContractService.java
@@ -1,7 +1,7 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
-import io.cryptoapis.blockchains.ethereum.models.Contract;
+import io.cryptoapis.blockchains.ethereum_based.models.Contract;
 import io.cryptoapis.common_models.ApiResponse;
 import io.cryptoapis.utils.config.EndpointConfig;
 import io.cryptoapis.utils.enums.HttpsRequestsEnum;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/EthTokenService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/EthTokenService.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.common_models.ApiError;
 import io.cryptoapis.common_models.ApiResponse;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/PaymentService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/PaymentService.java
@@ -1,7 +1,7 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
-import io.cryptoapis.blockchains.ethereum.models.Payment;
+import io.cryptoapis.blockchains.ethereum_based.models.Payment;
 import io.cryptoapis.common_models.ApiResponse;
 import io.cryptoapis.utils.Utils;
 import io.cryptoapis.utils.config.EndpointConfig;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/TokenService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/TokenService.java
@@ -1,7 +1,7 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
-import io.cryptoapis.blockchains.ethereum.models.TokenTransfer;
+import io.cryptoapis.blockchains.ethereum_based.models.TokenTransfer;
 import io.cryptoapis.common_models.ApiResponse;
 import io.cryptoapis.utils.config.EndpointConfig;
 import io.cryptoapis.utils.enums.HttpsRequestsEnum;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/TokenServiceInterface.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/TokenServiceInterface.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.common_models.ApiResponse;
 
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/TransactionService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/TransactionService.java
@@ -1,8 +1,8 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractServicesConfig;
 import io.cryptoapis.blockchains.bitcoin_based.models.Hex;
-import io.cryptoapis.blockchains.ethereum.models.RawTransaction;
+import io.cryptoapis.blockchains.ethereum_based.models.RawTransaction;
 import io.cryptoapis.common_models.ApiError;
 import io.cryptoapis.common_models.ApiResponse;
 import io.cryptoapis.utils.Utils;
diff --git a/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/WebhookService.java b/src/main/java/io/cryptoapis/blockchains/ethereum_based/services/WebhookService.java
@@ -1,4 +1,4 @@
-package io.cryptoapis.blockchains.ethereum.services;
+package io.cryptoapis.blockchains.ethereum_based.services;
 
 import io.cryptoapis.abstractServices.AbstractWebhookService;
 import io.cryptoapis.common_models.ApiResponse;
diff --git a/src/main/java/io/cryptoapis/connections/Bitcoin.java b/src/main/java/io/cryptoapis/connections/Bitcoin.java
@@ -6,6 +6,7 @@
 public class Bitcoin extends Bitcoin_Based {
 
     private BtcTransactionService btcTransactionService;
+    private Omni_Layer omniLayer;
 
     @Override
     public BtcTransactionService getTransactionService(){
@@ -16,10 +17,16 @@ public Bitcoin(EndpointConfig endpointConfig) {
         super(endpointConfig);
     }
 
+    public Omni_Layer getOmniLayer() {
+        return omniLayer;
+    }
+
     @Override
     protected void initServices(EndpointConfig endpointConfig) {
+        super.initServices(endpointConfig);
         try {
             this.btcTransactionService = getConstructor(BtcTransactionService.class).newInstance(endpointConfig);
+            this.omniLayer = getConstructor(Omni_Layer.class).newInstance(endpointConfig);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/io/cryptoapis/connections/Ethereum.java b/src/main/java/io/cryptoapis/connections/Ethereum.java
@@ -1,7 +1,6 @@
 package io.cryptoapis.connections;
 
-import io.cryptoapis.blockchains.ethereum.services.EthTokenService;
-import io.cryptoapis.blockchains.ethereum.services.TokenService;
+import io.cryptoapis.blockchains.ethereum_based.services.EthTokenService;
 import io.cryptoapis.utils.config.EndpointConfig;
 
 public class Ethereum extends Ethereum_Based {
@@ -18,6 +17,7 @@ public Ethereum(EndpointConfig endpointConfig) {
 
     @Override
     protected void initServices(EndpointConfig endpointConfig) {
+        super.initServices(endpointConfig);
         try {
             this.ethTokenService = getConstructor(EthTokenService.class).newInstance(endpointConfig);
         } catch (Exception e) {
diff --git a/src/main/java/io/cryptoapis/connections/Ethereum_Based.java b/src/main/java/io/cryptoapis/connections/Ethereum_Based.java
@@ -1,6 +1,6 @@
 package io.cryptoapis.connections;
 
-import io.cryptoapis.blockchains.ethereum.services.*;
+import io.cryptoapis.blockchains.ethereum_based.services.*;
 import io.cryptoapis.utils.config.EndpointConfig;
 
 abstract class Ethereum_Based extends ConnectionConstructor {
diff --git a/src/main/java/io/cryptoapis/connections/Omni_Layer.java b/src/main/java/io/cryptoapis/connections/Omni_Layer.java
@@ -0,0 +1,39 @@
+package io.cryptoapis.connections;
+
+import io.cryptoapis.layers.omni_layer.services.AddressService;
+import io.cryptoapis.layers.omni_layer.services.NodeInfoService;
+import io.cryptoapis.layers.omni_layer.services.TransactionService;
+import io.cryptoapis.utils.config.EndpointConfig;
+
+public class Omni_Layer extends ConnectionConstructor {
+
+    private AddressService addressService;
+    private NodeInfoService nodeInfoService;
+    private TransactionService transactionService;
+
+    public AddressService getAddressService() {
+        return addressService;
+    }
+
+    public NodeInfoService getNodeInfoService() {
+        return nodeInfoService;
+    }
+
+    public TransactionService getTransactionService() {
+        return transactionService;
+    }
+
+    public Omni_Layer(EndpointConfig endpointConfig) {
+        initServices(endpointConfig);
+    }
+
+    protected void initServices(EndpointConfig endpointConfig) {
+        try {
+            this.addressService = getConstructor(AddressService.class).newInstance(endpointConfig);
+            this.nodeInfoService = getConstructor(NodeInfoService.class).newInstance(endpointConfig);
+            this.transactionService = getConstructor(TransactionService.class).newInstance(endpointConfig);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/models/CompleteTransaction.java b/src/main/java/io/cryptoapis/layers/omni_layer/models/CompleteTransaction.java
@@ -0,0 +1,27 @@
+package io.cryptoapis.layers.omni_layer.models;
+
+import java.math.BigDecimal;
+
+//create, sign and send
+public class CompleteTransaction extends CreateTransaction {
+
+    private String wif;
+
+    private CompleteTransaction(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String data, String wif, Integer locktime) {
+        super(from, to, value,fee,propertyID,data,locktime);
+        this.wif = wif;
+    }
+
+    private CompleteTransaction(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String wif) {
+        super(from, to, value,fee,propertyID);
+        this.wif = wif;
+    }
+
+    public static CompleteTransaction createSignAndSend(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String wif, String data, Integer locktime) {
+        return new CompleteTransaction(from, to, value,fee,propertyID, wif, data,locktime);
+    }
+
+    public static CompleteTransaction createSignAndSend(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String wif) {
+        return new CompleteTransaction(from, to, value,fee,propertyID, wif);
+    }
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/models/CreateHDWalletTransaction.java b/src/main/java/io/cryptoapis/layers/omni_layer/models/CreateHDWalletTransaction.java
@@ -0,0 +1,31 @@
+package io.cryptoapis.layers.omni_layer.models;
+
+import java.math.BigDecimal;
+
+public class CreateHDWalletTransaction extends CreateTransaction {
+
+    private String walletName;
+    private String password;
+
+    protected CreateHDWalletTransaction(String walletName, String password, String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID) {
+        super(from, to, value, fee, propertyID);
+        this.walletName = walletName;
+        this.password = password;
+    }
+
+    //constructor with optional fields
+    protected CreateHDWalletTransaction(String walletName, String password, String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String data, Integer locktime) {
+        super(from, to, value, fee, propertyID, data, locktime);
+        this.walletName = walletName;
+        this.password = password;
+    }
+    //method with optional fields
+    public static CreateHDWalletTransaction createHDWalletTransaction(String walletName, String password, String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String data, Integer locktime) {
+        return new CreateHDWalletTransaction(walletName, password, from, to, value, fee, propertyID, data, locktime);
+    }
+
+    public static CreateHDWalletTransaction createHDWalletTransaction(String walletName, String password, String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID) {
+        return new CreateHDWalletTransaction(walletName, password, from, to, value, fee, propertyID);
+    }
+
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/models/CreateTransaction.java b/src/main/java/io/cryptoapis/layers/omni_layer/models/CreateTransaction.java
@@ -0,0 +1,40 @@
+package io.cryptoapis.layers.omni_layer.models;
+
+import io.cryptoapis.common_models.Stringify;
+
+import java.math.BigDecimal;
+
+public class CreateTransaction extends Stringify {
+
+    private String from;
+    private String to;
+    private BigDecimal value;
+    private BigDecimal fee;
+    private Integer propertyID;
+
+    //optional fields
+    private String data;
+    private Integer locktime;
+
+    protected CreateTransaction(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID) {
+        this.from = from;
+        this.to = to;
+        this.value = value;
+        this.fee = fee;
+        this.propertyID = propertyID;
+    }
+
+    protected CreateTransaction(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String data, Integer locktime) {
+        this(from, to, value, fee, propertyID);
+        this.data = data;
+        this.locktime = locktime != null ? locktime : 0;
+    }
+
+    public static CreateTransaction createTransaction(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID, String data, Integer locktime) {
+        return new CreateTransaction(from, to, value,fee, propertyID, data, locktime);
+    }
+
+    public static CreateTransaction createTransaction(String from, String to, BigDecimal value, BigDecimal fee, Integer propertyID) {
+        return new CreateTransaction(from, to, value, fee, propertyID);
+    }
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/models/SendTransaction.java b/src/main/java/io/cryptoapis/layers/omni_layer/models/SendTransaction.java
@@ -0,0 +1,16 @@
+package io.cryptoapis.layers.omni_layer.models;
+
+import io.cryptoapis.common_models.Stringify;
+
+public class SendTransaction extends Stringify {
+
+    String hex;
+
+    private SendTransaction(String hex) {
+        this.hex = hex;
+    }
+
+    public static SendTransaction sendTransaction(String hex) {
+        return new SendTransaction(hex);
+    }
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/models/SignTransaction.java b/src/main/java/io/cryptoapis/layers/omni_layer/models/SignTransaction.java
@@ -0,0 +1,18 @@
+package io.cryptoapis.layers.omni_layer.models;
+
+import io.cryptoapis.common_models.Stringify;
+
+public class SignTransaction extends Stringify {
+
+    private String hex;
+    private String wif;
+
+    private SignTransaction(String hex, String wif) {
+        this.hex = hex;
+        this.wif = wif;
+    }
+
+    public static SignTransaction signTransaction(String hex, String wif) {
+        return new SignTransaction(hex, wif);
+    }
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/services/AddressService.java b/src/main/java/io/cryptoapis/layers/omni_layer/services/AddressService.java
@@ -0,0 +1,34 @@
+package io.cryptoapis.layers.omni_layer.services;
+
+import io.cryptoapis.abstractServices.AbstractServicesConfig;
+import io.cryptoapis.common_models.ApiResponse;
+import io.cryptoapis.utils.config.EndpointConfig;
+import io.cryptoapis.utils.enums.HttpsRequestsEnum;
+import io.cryptoapis.utils.rest.WebServices;
+
+public class AddressService extends AbstractServicesConfig {
+
+    private static final String PATH = "/{0}/bc/{1}/omni/{2}{3}";
+
+    protected AddressService(EndpointConfig endpointConfig) {
+        super(endpointConfig);
+    }
+
+    @Override
+    protected String getPath() {
+        return PATH;
+    }
+
+    public ApiResponse getAddress(String data){
+        String endpoint = String.format("/address/%s", data);
+
+        return WebServices.httpsRequest(WebServices.formatUrl(url, endpointConfig, endpoint), HttpsRequestsEnum.GET.name(), endpointConfig, null);
+    }
+
+    public ApiResponse getAddressTransactions(String data){
+        String endpoint = String.format("%s/transactions", data);
+
+        return getAddress(endpoint);
+    }
+
+}
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/services/NodeInfoService.java b/src/main/java/io/cryptoapis/layers/omni_layer/services/NodeInfoService.java
diff --git a/src/main/java/io/cryptoapis/layers/omni_layer/services/TransactionService.java b/src/main/java/io/cryptoapis/layers/omni_layer/services/TransactionService.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.cryptoapis.blockchains.ethereum.models;`
	`1`	`+package io.cryptoapis.blockchains.ethereum_based.models;`
`2`	`2`
`3`	`3`	`import io.cryptoapis.common_models.Stringify;`
`4`	`4`