refactor

diff --git a/java-sdk/src/main/java/io/bytom/api/AccessToken.java b/java-sdk/src/main/java/io/bytom/api/AccessToken.java
index 4541834..64235d8 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/AccessToken.java
+++ b/java-sdk/src/main/java/io/bytom/api/AccessToken.java
@@ -1,9 +1,9 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Account.java b/java-sdk/src/main/java/io/bytom/api/Account.java
index c84e526..1c8bef7 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Account.java
+++ b/java-sdk/src/main/java/io/bytom/api/Account.java
@@ -2,9 +2,9 @@ package io.bytom.api;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.*;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.*;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Asset.java b/java-sdk/src/main/java/io/bytom/api/Asset.java
index 9fdb375..1138b27 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Asset.java
+++ b/java-sdk/src/main/java/io/bytom/api/Asset.java
@@ -1,9 +1,9 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Balance.java b/java-sdk/src/main/java/io/bytom/api/Balance.java
index 9ad8bc9..861b1b8 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Balance.java
+++ b/java-sdk/src/main/java/io/bytom/api/Balance.java
@@ -1,9 +1,9 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Block.java b/java-sdk/src/main/java/io/bytom/api/Block.java
index ecda5b1..d6972b5 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Block.java
+++ b/java-sdk/src/main/java/io/bytom/api/Block.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/CoreConfig.java b/java-sdk/src/main/java/io/bytom/api/CoreConfig.java
index 3334773..33e6588 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/CoreConfig.java
+++ b/java-sdk/src/main/java/io/bytom/api/CoreConfig.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Key.java b/java-sdk/src/main/java/io/bytom/api/Key.java
index 558b6a7..e229833 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Key.java
+++ b/java-sdk/src/main/java/io/bytom/api/Key.java
@@ -1,9 +1,9 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.*;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.*;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Message.java b/java-sdk/src/main/java/io/bytom/api/Message.java
index 4ce1e70..c8b7a86 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Message.java
+++ b/java-sdk/src/main/java/io/bytom/api/Message.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/RawTransaction.java b/java-sdk/src/main/java/io/bytom/api/RawTransaction.java
index 519cf27..dafb4db 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/RawTransaction.java
+++ b/java-sdk/src/main/java/io/bytom/api/RawTransaction.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Receiver.java b/java-sdk/src/main/java/io/bytom/api/Receiver.java
index add4a6a..ea4974e 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Receiver.java
+++ b/java-sdk/src/main/java/io/bytom/api/Receiver.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.JSONException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.JSONException;
 
 /**
  * Receivers are used to facilitate payments between accounts on different

diff --git a/java-sdk/src/main/java/io/bytom/api/Transaction.java b/java-sdk/src/main/java/io/bytom/api/Transaction.java
index 42accee..018365c 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Transaction.java
+++ b/java-sdk/src/main/java/io/bytom/api/Transaction.java
@@ -1,9 +1,9 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/UnconfirmedTransaction.java b/java-sdk/src/main/java/io/bytom/api/UnconfirmedTransaction.java
index 67690a4..9ac521b 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/UnconfirmedTransaction.java
+++ b/java-sdk/src/main/java/io/bytom/api/UnconfirmedTransaction.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/UnspentOutput.java b/java-sdk/src/main/java/io/bytom/api/UnspentOutput.java
index 1447093..e7b3c68 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/UnspentOutput.java
+++ b/java-sdk/src/main/java/io/bytom/api/UnspentOutput.java
@@ -1,9 +1,9 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.ParameterizedTypeImpl;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.ParameterizedTypeImpl;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/api/Wallet.java b/java-sdk/src/main/java/io/bytom/api/Wallet.java
index 5145757..afe9782 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/api/Wallet.java
+++ b/java-sdk/src/main/java/io/bytom/api/Wallet.java
@@ -1,8 +1,8 @@
 package io.bytom.api;
 
 import com.google.gson.annotations.SerializedName;
-import io.bytom.common.Utils;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/main/java/io/bytom/http/BatchResponse.java b/java-sdk/src/main/java/io/bytom/http/BatchResponse.java
index da29b75..409a30b 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/http/BatchResponse.java
+++ b/java-sdk/src/main/java/io/bytom/http/BatchResponse.java
@@ -1,6 +1,6 @@
 package io.bytom.http;
 
-import io.bytom.exception.*;
+import io.bytom.offline.exception.*;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;

diff --git a/java-sdk/src/main/java/io/bytom/http/Client.java b/java-sdk/src/main/java/io/bytom/http/Client.java
index 958f9f6..354ab0d 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/http/Client.java
+++ b/java-sdk/src/main/java/io/bytom/http/Client.java
@@ -2,8 +2,8 @@ package io.bytom.http;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import io.bytom.common.*;
-import io.bytom.exception.*;
+import io.bytom.offline.common.*;
+import io.bytom.offline.exception.*;
 import com.google.gson.Gson;
 import com.squareup.okhttp.*;
 import org.apache.log4j.Logger;

diff --git a/java-sdk/src/main/java/io/bytom/common/Configuration.java b/java-sdk/src/main/java/io/bytom/offline/common/Configuration.java
similarity index 95%
rename from java-sdk/src/main/java/io/bytom/common/Configuration.java
rename to java-sdk/src/main/java/io/bytom/offline/common/Configuration.java
index 21dd949..740bc39 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/common/Configuration.java
+++ b/java-sdk/src/main/java/io/bytom/offline/common/Configuration.java
@@ -1,4 +1,4 @@
-package io.bytom.common;
+package io.bytom.offline.common;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

diff --git a/java-sdk/src/main/java/io/bytom/common/ParameterizedTypeImpl.java b/java-sdk/src/main/java/io/bytom/offline/common/ParameterizedTypeImpl.java
similarity index 94%
rename from java-sdk/src/main/java/io/bytom/common/ParameterizedTypeImpl.java
rename to java-sdk/src/main/java/io/bytom/offline/common/ParameterizedTypeImpl.java
index d66be8c..23d3648 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/common/ParameterizedTypeImpl.java
+++ b/java-sdk/src/main/java/io/bytom/offline/common/ParameterizedTypeImpl.java
@@ -1,4 +1,4 @@
-package io.bytom.common;
+package io.bytom.offline.common;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

diff --git a/java-sdk/src/main/java/io/bytom/common/Utils.java b/java-sdk/src/main/java/io/bytom/offline/common/Utils.java
similarity index 88%
rename from java-sdk/src/main/java/io/bytom/common/Utils.java
rename to java-sdk/src/main/java/io/bytom/offline/common/Utils.java
index 7a7f69e..0601e5a 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/common/Utils.java
+++ b/java-sdk/src/main/java/io/bytom/offline/common/Utils.java
@@ -1,4 +1,4 @@
-package io.bytom.common;
+package io.bytom.offline.common;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

diff --git a/java-sdk/src/main/java/io/bytom/exception/APIException.java b/java-sdk/src/main/java/io/bytom/offline/exception/APIException.java
similarity index 99%
rename from java-sdk/src/main/java/io/bytom/exception/APIException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/APIException.java
index 52ff64d..964c1ab 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/APIException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/APIException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/java-sdk/src/main/java/io/bytom/exception/BadURLException.java b/java-sdk/src/main/java/io/bytom/offline/exception/BadURLException.java
similarity index 88%
rename from java-sdk/src/main/java/io/bytom/exception/BadURLException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/BadURLException.java
index dd16377..4f62292 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/BadURLException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/BadURLException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 /**
  * BadURLException wraps errors due to malformed URLs.

diff --git a/java-sdk/src/main/java/io/bytom/exception/BuildException.java b/java-sdk/src/main/java/io/bytom/offline/exception/BuildException.java
similarity index 96%
rename from java-sdk/src/main/java/io/bytom/exception/BuildException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/BuildException.java
index 19a2f89..b2eae8a 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/BuildException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/BuildException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/java-sdk/src/main/java/io/bytom/exception/BytomException.java b/java-sdk/src/main/java/io/bytom/offline/exception/BytomException.java
similarity index 94%
rename from java-sdk/src/main/java/io/bytom/exception/BytomException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/BytomException.java
index 4043065..fb9db84 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/BytomException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/BytomException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 /**
  * Base exception class for the Chain Core SDK.

diff --git a/java-sdk/src/main/java/io/bytom/exception/ConfigurationException.java b/java-sdk/src/main/java/io/bytom/offline/exception/ConfigurationException.java
similarity index 93%
rename from java-sdk/src/main/java/io/bytom/exception/ConfigurationException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/ConfigurationException.java
index 695e873..5f851a5 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/ConfigurationException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/ConfigurationException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 /**
  * ConfigurationException wraps errors during client configuration.

diff --git a/java-sdk/src/main/java/io/bytom/exception/ConnectivityException.java b/java-sdk/src/main/java/io/bytom/offline/exception/ConnectivityException.java
similarity index 96%
rename from java-sdk/src/main/java/io/bytom/exception/ConnectivityException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/ConnectivityException.java
index 4f50197..173ba59 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/ConnectivityException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/ConnectivityException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 import com.squareup.okhttp.Response;
 

diff --git a/java-sdk/src/main/java/io/bytom/exception/HTTPException.java b/java-sdk/src/main/java/io/bytom/offline/exception/HTTPException.java
similarity index 93%
rename from java-sdk/src/main/java/io/bytom/exception/HTTPException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/HTTPException.java
index 04646bd..18ffe1b 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/HTTPException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/HTTPException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 /**
  * HTTPException wraps generic HTTP errors.

diff --git a/java-sdk/src/main/java/io/bytom/exception/JSONException.java b/java-sdk/src/main/java/io/bytom/offline/exception/JSONException.java
similarity index 96%
rename from java-sdk/src/main/java/io/bytom/exception/JSONException.java
rename to java-sdk/src/main/java/io/bytom/offline/exception/JSONException.java
index a81cef6..b93cc41 100644 (file)
--- a/java-sdk/src/main/java/io/bytom/exception/JSONException.java
+++ b/java-sdk/src/main/java/io/bytom/offline/exception/JSONException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 /**
  * JSONException wraps errors due to marshaling/unmarshaling json payloads.

diff --git a/java-sdk/src/test/java/io/bytom/TestUtils.java b/java-sdk/src/test/java/io/bytom/TestUtils.java
index 7d40cfc..196eebd 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/TestUtils.java
+++ b/java-sdk/src/test/java/io/bytom/TestUtils.java
@@ -1,7 +1,7 @@
 package io.bytom;
 
-import io.bytom.common.Configuration;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.common.Configuration;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 

diff --git a/java-sdk/src/test/java/io/bytom/integration/AccessTokenTest.java b/java-sdk/src/test/java/io/bytom/integration/AccessTokenTest.java
index 49930b9..4903c6f 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/AccessTokenTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/AccessTokenTest.java
@@ -2,7 +2,7 @@ package io.bytom.integration;
 
 import io.bytom.TestUtils;
 import io.bytom.api.AccessToken;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Test;
 

diff --git a/java-sdk/src/test/java/io/bytom/integration/BalanceTest.java b/java-sdk/src/test/java/io/bytom/integration/BalanceTest.java
index 8015f4c..5ffb762 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/BalanceTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/BalanceTest.java
@@ -3,7 +3,7 @@ package io.bytom.integration;
 import io.bytom.TestUtils;
 import io.bytom.api.Balance;
 import io.bytom.api.Wallet;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 import org.junit.Assert;

diff --git a/java-sdk/src/test/java/io/bytom/integration/BlockTest.java b/java-sdk/src/test/java/io/bytom/integration/BlockTest.java
index 71b8e3f..48a7249 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/BlockTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/BlockTest.java
@@ -4,7 +4,7 @@ import io.bytom.TestUtils;
 import io.bytom.api.Asset;
 import io.bytom.api.Block;
 import io.bytom.api.Wallet;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/java-sdk/src/test/java/io/bytom/integration/CoreConfigTest.java b/java-sdk/src/test/java/io/bytom/integration/CoreConfigTest.java
index d656da8..a4c5b87 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/CoreConfigTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/CoreConfigTest.java
@@ -2,7 +2,7 @@ package io.bytom.integration;
 
 import io.bytom.TestUtils;
 import io.bytom.api.CoreConfig;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/java-sdk/src/test/java/io/bytom/integration/KeyTest.java b/java-sdk/src/test/java/io/bytom/integration/KeyTest.java
index ec68a92..42f9ca7 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/KeyTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/KeyTest.java
@@ -2,7 +2,7 @@ package io.bytom.integration;
 
 import io.bytom.TestUtils;
 import io.bytom.api.Key;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Test;
 

diff --git a/java-sdk/src/test/java/io/bytom/integration/MessageTest.java b/java-sdk/src/test/java/io/bytom/integration/MessageTest.java
index bd7fc1f..1155cc1 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/MessageTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/MessageTest.java
@@ -2,7 +2,7 @@ package io.bytom.integration;
 
 import io.bytom.TestUtils;
 import io.bytom.api.Message;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/java-sdk/src/test/java/io/bytom/integration/RawTransactionTest.java b/java-sdk/src/test/java/io/bytom/integration/RawTransactionTest.java
index a4b3960..d0f28d3 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/RawTransactionTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/RawTransactionTest.java
@@ -3,7 +3,7 @@ package io.bytom.integration;
 import io.bytom.TestUtils;
 import io.bytom.api.RawTransaction;
 import io.bytom.api.Wallet;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/java-sdk/src/test/java/io/bytom/integration/TransactionTest.java b/java-sdk/src/test/java/io/bytom/integration/TransactionTest.java
index 180b12d..12c5099 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/TransactionTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/TransactionTest.java
@@ -2,7 +2,7 @@ package io.bytom.integration;
 
 import io.bytom.TestUtils;
 import io.bytom.api.*;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.apache.log4j.Logger;
 import org.junit.Assert;

diff --git a/java-sdk/src/test/java/io/bytom/integration/UTXOTest.java b/java-sdk/src/test/java/io/bytom/integration/UTXOTest.java
index aca21dc..5f1577a 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/UTXOTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/UTXOTest.java
@@ -2,7 +2,7 @@ package io.bytom.integration;
 
 import io.bytom.TestUtils;
 import io.bytom.api.UnspentOutput;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/java-sdk/src/test/java/io/bytom/integration/UnconfirmedTransactionTest.java b/java-sdk/src/test/java/io/bytom/integration/UnconfirmedTransactionTest.java
index f63ae7f..41d9830 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/UnconfirmedTransactionTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/UnconfirmedTransactionTest.java
@@ -3,7 +3,7 @@ package io.bytom.integration;
 import io.bytom.TestUtils;
 import io.bytom.api.UnconfirmedTransaction;
 import io.bytom.api.Wallet;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/java-sdk/src/test/java/io/bytom/integration/WalletTest.java b/java-sdk/src/test/java/io/bytom/integration/WalletTest.java
index 194fbb6..7c94e2a 100644 (file)
--- a/java-sdk/src/test/java/io/bytom/integration/WalletTest.java
+++ b/java-sdk/src/test/java/io/bytom/integration/WalletTest.java
@@ -3,7 +3,7 @@ package io.bytom.integration;
 import io.bytom.TestUtils;
 import io.bytom.api.Key;
 import io.bytom.api.Wallet;
-import io.bytom.exception.BytomException;
+import io.bytom.offline.exception.BytomException;
 import io.bytom.http.Client;
 import org.junit.Test;
 

diff --git a/tx-signer/src/main/java/.DS_Store b/tx-signer/src/main/java/.DS_Store
new file mode 100644 (file)
index 0000000..d869db9
Binary files /dev/null and b/tx-signer/src/main/java/.DS_Store differ

diff --git a/tx-signer/src/main/java/io/.DS_Store b/tx-signer/src/main/java/io/.DS_Store
new file mode 100644 (file)
index 0000000..e3f4e29
Binary files /dev/null and b/tx-signer/src/main/java/io/.DS_Store differ

diff --git a/tx-signer/src/main/java/io/bytom/.DS_Store b/tx-signer/src/main/java/io/bytom/.DS_Store
new file mode 100644 (file)
index 0000000..e1ad64a
Binary files /dev/null and b/tx-signer/src/main/java/io/bytom/.DS_Store differ

diff --git a/tx-signer/src/main/java/io/bytom/api/BIPProtocol.java b/tx-signer/src/main/java/io/bytom/offline/api/BIPProtocol.java
similarity index 62%
rename from tx-signer/src/main/java/io/bytom/api/BIPProtocol.java
rename to tx-signer/src/main/java/io/bytom/offline/api/BIPProtocol.java
index c66091d..1ff0b15 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/api/BIPProtocol.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/BIPProtocol.java
@@ -1,4 +1,4 @@
-package io.bytom.api;
+package io.bytom.offline.api;
 
 public enum BIPProtocol {
 

diff --git a/tx-signer/src/main/java/io/bytom/api/BaseInput.java b/tx-signer/src/main/java/io/bytom/offline/api/BaseInput.java
similarity index 97%
rename from tx-signer/src/main/java/io/bytom/api/BaseInput.java
rename to tx-signer/src/main/java/io/bytom/offline/api/BaseInput.java
index 0332177..4963549 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/api/BaseInput.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/BaseInput.java
@@ -1,7 +1,7 @@
-package io.bytom.api;
+package io.bytom.offline.api;
 
-import io.bytom.common.Utils;
-import io.bytom.types.*;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.types.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/tx-signer/src/main/java/io/bytom/api/IssuanceInput.java b/tx-signer/src/main/java/io/bytom/offline/api/IssuanceInput.java
similarity index 92%
rename from tx-signer/src/main/java/io/bytom/api/IssuanceInput.java
rename to tx-signer/src/main/java/io/bytom/offline/api/IssuanceInput.java
index 5d97da9..f2639b2 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/api/IssuanceInput.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/IssuanceInput.java
@@ -1,11 +1,11 @@
-package io.bytom.api;
-
-import io.bytom.common.DerivePrivateKey;
-import io.bytom.common.ExpandedPrivateKey;
-import io.bytom.common.Signer;
-import io.bytom.common.Utils;
-import io.bytom.types.*;
-import io.bytom.util.SHA3Util;
+package io.bytom.offline.api;
+
+import io.bytom.offline.common.DerivePrivateKey;
+import io.bytom.offline.common.ExpandedPrivateKey;
+import io.bytom.offline.common.Signer;
+import io.bytom.offline.common.Utils;
+import io.bytom.offline.types.*;
+import io.bytom.offline.util.SHA3Util;
 import org.bouncycastle.util.encoders.Hex;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/tx-signer/src/main/java/io/bytom/api/Output.java b/tx-signer/src/main/java/io/bytom/offline/api/Output.java
similarity index 97%
rename from tx-signer/src/main/java/io/bytom/api/Output.java
rename to tx-signer/src/main/java/io/bytom/offline/api/Output.java
index 47770b7..15db5dc 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/api/Output.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/Output.java
@@ -1,6 +1,6 @@
-package io.bytom.api;
+package io.bytom.offline.api;
 
-import io.bytom.common.Utils;
+import io.bytom.offline.common.Utils;
 import org.bouncycastle.util.encoders.Hex;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/tx-signer/src/main/java/io/bytom/api/SpendInput.java b/tx-signer/src/main/java/io/bytom/offline/api/SpendInput.java
similarity index 97%
rename from tx-signer/src/main/java/io/bytom/api/SpendInput.java
rename to tx-signer/src/main/java/io/bytom/offline/api/SpendInput.java
index 76afadf..f24d055 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/api/SpendInput.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/SpendInput.java
@@ -1,7 +1,7 @@
-package io.bytom.api;
+package io.bytom.offline.api;
 
-import io.bytom.common.*;
-import io.bytom.types.*;
+import io.bytom.offline.common.*;
+import io.bytom.offline.types.*;
 import org.bouncycastle.util.encoders.Hex;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/tx-signer/src/main/java/io/bytom/api/Transaction.java b/tx-signer/src/main/java/io/bytom/offline/api/Transaction.java
similarity index 92%
rename from tx-signer/src/main/java/io/bytom/api/Transaction.java
rename to tx-signer/src/main/java/io/bytom/offline/api/Transaction.java
index 5ec2d55..54a5997 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/api/Transaction.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/Transaction.java
@@ -1,10 +1,10 @@
-package io.bytom.api;\r
+package io.bytom.offline.api;\r
 \r
-import io.bytom.common.Utils;\r
-import io.bytom.exception.MapTransactionException;\r
-import io.bytom.exception.SerializeTransactionException;\r
-import io.bytom.exception.SignTransactionException;\r
-import io.bytom.types.*;\r
+import io.bytom.offline.common.Utils;\r
+import io.bytom.offline.exception.MapTransactionException;\r
+import io.bytom.offline.exception.SerializeTransactionException;\r
+import io.bytom.offline.exception.SignTransactionException;\r
+import io.bytom.offline.types.*;\r
 import org.bouncycastle.util.encoders.Hex;\r
 import java.io.ByteArrayOutputStream;\r
 import java.io.IOException;\r

diff --git a/tx-signer/src/main/java/io/bytom/api/WitnessComponent.java b/tx-signer/src/main/java/io/bytom/offline/api/WitnessComponent.java
similarity index 97%
rename from tx-signer/src/main/java/io/bytom/api/WitnessComponent.java
rename to tx-signer/src/main/java/io/bytom/offline/api/WitnessComponent.java
index 0862e39..40127b0 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/api/WitnessComponent.java
+++ b/tx-signer/src/main/java/io/bytom/offline/api/WitnessComponent.java
@@ -1,4 +1,4 @@
-package io.bytom.api;
+package io.bytom.offline.api;
 
 import org.bouncycastle.util.encoders.Hex;
 

diff --git a/tx-signer/src/main/java/io/bytom/common/DerivePrivateKey.java b/tx-signer/src/main/java/io/bytom/offline/common/DerivePrivateKey.java
similarity index 92%
rename from tx-signer/src/main/java/io/bytom/common/DerivePrivateKey.java
rename to tx-signer/src/main/java/io/bytom/offline/common/DerivePrivateKey.java
index f7adb6c..3f42cef 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/common/DerivePrivateKey.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/DerivePrivateKey.java
@@ -1,6 +1,6 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
-import io.bytom.util.PathUtil;\r
+import io.bytom.offline.util.PathUtil;\r
 import org.bouncycastle.util.encoders.Hex;\r
 \r
 import java.security.InvalidKeyException;\r

diff --git a/tx-signer/src/main/java/io/bytom/common/DeriveXpub.java b/tx-signer/src/main/java/io/bytom/offline/common/DeriveXpub.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/common/DeriveXpub.java
rename to tx-signer/src/main/java/io/bytom/offline/common/DeriveXpub.java
index 3546df4..cb0e39b 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/common/DeriveXpub.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/DeriveXpub.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import com.google.crypto.tink.subtle.Ed25519;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/common/ExpandedPrivateKey.java b/tx-signer/src/main/java/io/bytom/offline/common/ExpandedPrivateKey.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/common/ExpandedPrivateKey.java
rename to tx-signer/src/main/java/io/bytom/offline/common/ExpandedPrivateKey.java
index 9094929..873a0e8 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/common/ExpandedPrivateKey.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/ExpandedPrivateKey.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 import javax.crypto.Mac;\r

diff --git a/tx-signer/src/main/java/io/bytom/common/NonHardenedChild.java b/tx-signer/src/main/java/io/bytom/offline/common/NonHardenedChild.java
similarity index 95%
rename from tx-signer/src/main/java/io/bytom/common/NonHardenedChild.java
rename to tx-signer/src/main/java/io/bytom/offline/common/NonHardenedChild.java
index 1fdf13b..15091b3 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/common/NonHardenedChild.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/NonHardenedChild.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/common/Signer.java b/tx-signer/src/main/java/io/bytom/offline/common/Signer.java
similarity index 96%
rename from tx-signer/src/main/java/io/bytom/common/Signer.java
rename to tx-signer/src/main/java/io/bytom/offline/common/Signer.java
index 4cf1920..380726b 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/common/Signer.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/Signer.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import java.security.MessageDigest;\r
 import java.security.NoSuchAlgorithmException;\r

diff --git a/tx-signer/src/main/java/io/bytom/common/Utils.java b/tx-signer/src/main/java/io/bytom/offline/common/Utils.java
similarity index 95%
rename from tx-signer/src/main/java/io/bytom/common/Utils.java
rename to tx-signer/src/main/java/io/bytom/offline/common/Utils.java
index 49a3596..a1ae964 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/common/Utils.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/Utils.java
@@ -1,8 +1,8 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import com.google.gson.Gson;\r
 import com.google.gson.GsonBuilder;\r
-import io.bytom.types.ExpandedKeys;\r
+import io.bytom.offline.types.ExpandedKeys;\r
 import org.bouncycastle.jcajce.provider.digest.SHA3;\r
 import org.bouncycastle.util.encoders.Hex;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/common/VMUtil.java b/tx-signer/src/main/java/io/bytom/offline/common/VMUtil.java
similarity index 98%
rename from tx-signer/src/main/java/io/bytom/common/VMUtil.java
rename to tx-signer/src/main/java/io/bytom/offline/common/VMUtil.java
index 16be8e3..2c4845a 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/common/VMUtil.java
+++ b/tx-signer/src/main/java/io/bytom/offline/common/VMUtil.java
@@ -1,4 +1,4 @@
-package io.bytom.common;
+package io.bytom.offline.common;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/tx-signer/src/main/java/io/bytom/exception/APIException.java b/tx-signer/src/main/java/io/bytom/offline/exception/APIException.java
similarity index 96%
rename from tx-signer/src/main/java/io/bytom/exception/APIException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/APIException.java
index a02da0a..2910744 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/APIException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/APIException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 import com.google.gson.annotations.SerializedName;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/exception/BadURLException.java b/tx-signer/src/main/java/io/bytom/offline/exception/BadURLException.java
similarity index 85%
rename from tx-signer/src/main/java/io/bytom/exception/BadURLException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/BadURLException.java
index a007f56..b2afe7a 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/BadURLException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/BadURLException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 /**\r
  * BadURLException wraps errors due to malformed URLs.\r

diff --git a/tx-signer/src/main/java/io/bytom/exception/BuildException.java b/tx-signer/src/main/java/io/bytom/offline/exception/BuildException.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/exception/BuildException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/BuildException.java
index 407a8d4..885d3d6 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/BuildException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/BuildException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 import com.google.gson.annotations.SerializedName;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/exception/BytomException.java b/tx-signer/src/main/java/io/bytom/offline/exception/BytomException.java
similarity index 90%
rename from tx-signer/src/main/java/io/bytom/exception/BytomException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/BytomException.java
index aae30ef..40104ab 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/BytomException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/BytomException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 /**\r
  * Base exception class for the Chain Core SDK.\r

diff --git a/tx-signer/src/main/java/io/bytom/exception/ConfigurationException.java b/tx-signer/src/main/java/io/bytom/offline/exception/ConfigurationException.java
similarity index 90%
rename from tx-signer/src/main/java/io/bytom/exception/ConfigurationException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/ConfigurationException.java
index d69de34..ebb550b 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/ConfigurationException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/ConfigurationException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 /**\r
  * ConfigurationException wraps errors during client configuration.\r

diff --git a/tx-signer/src/main/java/io/bytom/exception/ConnectivityException.java b/tx-signer/src/main/java/io/bytom/offline/exception/ConnectivityException.java
similarity index 94%
rename from tx-signer/src/main/java/io/bytom/exception/ConnectivityException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/ConnectivityException.java
index 45df771..d188f07 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/ConnectivityException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/ConnectivityException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 import com.squareup.okhttp.Response;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/exception/HTTPException.java b/tx-signer/src/main/java/io/bytom/offline/exception/HTTPException.java
similarity index 90%
rename from tx-signer/src/main/java/io/bytom/exception/HTTPException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/HTTPException.java
index 394543c..43442e5 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/HTTPException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/HTTPException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 /**\r
  * HTTPException wraps generic HTTP errors.\r

diff --git a/tx-signer/src/main/java/io/bytom/exception/JSONException.java b/tx-signer/src/main/java/io/bytom/offline/exception/JSONException.java
similarity index 92%
rename from tx-signer/src/main/java/io/bytom/exception/JSONException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/JSONException.java
index 13889f9..95828e4 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/exception/JSONException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/JSONException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;\r
+package io.bytom.offline.exception;\r
 \r
 /**\r
  * JSONException wraps errors due to marshaling/unmarshaling json payloads.\r

diff --git a/tx-signer/src/main/java/io/bytom/exception/MapTransactionException.java b/tx-signer/src/main/java/io/bytom/offline/exception/MapTransactionException.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/exception/MapTransactionException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/MapTransactionException.java
index 06c7d40..00403a6 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/exception/MapTransactionException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/MapTransactionException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 public class MapTransactionException extends RuntimeException {
 

diff --git a/tx-signer/src/main/java/io/bytom/exception/SerializeTransactionException.java b/tx-signer/src/main/java/io/bytom/offline/exception/SerializeTransactionException.java
similarity index 92%
rename from tx-signer/src/main/java/io/bytom/exception/SerializeTransactionException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/SerializeTransactionException.java
index 86b1017..7735e11 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/exception/SerializeTransactionException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/SerializeTransactionException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 public class SerializeTransactionException extends RuntimeException {
 

diff --git a/tx-signer/src/main/java/io/bytom/exception/SignTransactionException.java b/tx-signer/src/main/java/io/bytom/offline/exception/SignTransactionException.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/exception/SignTransactionException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/SignTransactionException.java
index d9a7ac5..489a87e 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/exception/SignTransactionException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/SignTransactionException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 public class SignTransactionException extends RuntimeException {
 

diff --git a/tx-signer/src/main/java/io/bytom/exception/WriteForHashException.java b/tx-signer/src/main/java/io/bytom/offline/exception/WriteForHashException.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/exception/WriteForHashException.java
rename to tx-signer/src/main/java/io/bytom/offline/exception/WriteForHashException.java
index 36bc923..912bc1f 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/exception/WriteForHashException.java
+++ b/tx-signer/src/main/java/io/bytom/offline/exception/WriteForHashException.java
@@ -1,4 +1,4 @@
-package io.bytom.exception;
+package io.bytom.offline.exception;
 
 public class WriteForHashException extends RuntimeException {
 

diff --git a/tx-signer/src/main/java/io/bytom/types/AssetAmount.java b/tx-signer/src/main/java/io/bytom/offline/types/AssetAmount.java
similarity index 89%
rename from tx-signer/src/main/java/io/bytom/types/AssetAmount.java
rename to tx-signer/src/main/java/io/bytom/offline/types/AssetAmount.java
index c4ef691..a446e48 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/AssetAmount.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/AssetAmount.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 public class AssetAmount {\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/AssetDefinition.java b/tx-signer/src/main/java/io/bytom/offline/types/AssetDefinition.java
similarity index 92%
rename from tx-signer/src/main/java/io/bytom/types/AssetDefinition.java
rename to tx-signer/src/main/java/io/bytom/offline/types/AssetDefinition.java
index 9229ae2..074b872 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/AssetDefinition.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/AssetDefinition.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/AssetID.java b/tx-signer/src/main/java/io/bytom/offline/types/AssetID.java
similarity index 87%
rename from tx-signer/src/main/java/io/bytom/types/AssetID.java
rename to tx-signer/src/main/java/io/bytom/offline/types/AssetID.java
index 37105f7..649278a 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/AssetID.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/AssetID.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/Entry.java b/tx-signer/src/main/java/io/bytom/offline/types/Entry.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/types/Entry.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Entry.java
index 33abaf0..290ce4c 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Entry.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Entry.java
@@ -1,7 +1,7 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
-import io.bytom.exception.WriteForHashException;\r
-import io.bytom.util.OutputUtil;\r
+import io.bytom.offline.exception.WriteForHashException;\r
+import io.bytom.offline.util.OutputUtil;\r
 import org.bouncycastle.jcajce.provider.digest.SHA3;\r
 import java.beans.PropertyDescriptor;\r
 import java.io.ByteArrayOutputStream;\r

diff --git a/tx-signer/src/main/java/io/bytom/types/ExpandedKeys.java b/tx-signer/src/main/java/io/bytom/offline/types/ExpandedKeys.java
similarity index 88%
rename from tx-signer/src/main/java/io/bytom/types/ExpandedKeys.java
rename to tx-signer/src/main/java/io/bytom/offline/types/ExpandedKeys.java
index 146211d..7fc6a05 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/ExpandedKeys.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/ExpandedKeys.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 public class ExpandedKeys {\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/Hash.java b/tx-signer/src/main/java/io/bytom/offline/types/Hash.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/types/Hash.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Hash.java
index cdcfb61..8415220 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Hash.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Hash.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/InputEntry.java b/tx-signer/src/main/java/io/bytom/offline/types/InputEntry.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/types/InputEntry.java
rename to tx-signer/src/main/java/io/bytom/offline/types/InputEntry.java
index 72b0b23..92bb837 100644 (file)
--- a/tx-signer/src/main/java/io/bytom/types/InputEntry.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/InputEntry.java
@@ -1,4 +1,4 @@
-package io.bytom.types;
+package io.bytom.offline.types;
 
 import java.util.Map;
 

diff --git a/tx-signer/src/main/java/io/bytom/types/Issue.java b/tx-signer/src/main/java/io/bytom/offline/types/Issue.java
similarity index 94%
rename from tx-signer/src/main/java/io/bytom/types/Issue.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Issue.java
index 26b41db..c977c9b 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Issue.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Issue.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.util.Map;\r

diff --git a/tx-signer/src/main/java/io/bytom/types/Mux.java b/tx-signer/src/main/java/io/bytom/offline/types/Mux.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/types/Mux.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Mux.java
index d85491a..2fd99c3 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Mux.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Mux.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.util.ArrayList;\r

diff --git a/tx-signer/src/main/java/io/bytom/types/OutputEntry.java b/tx-signer/src/main/java/io/bytom/offline/types/OutputEntry.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/types/OutputEntry.java
rename to tx-signer/src/main/java/io/bytom/offline/types/OutputEntry.java
index 9a73edb..0d3a83f 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/OutputEntry.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/OutputEntry.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/Program.java b/tx-signer/src/main/java/io/bytom/offline/types/Program.java
similarity index 88%
rename from tx-signer/src/main/java/io/bytom/types/Program.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Program.java
index 04d5557..a25a092 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Program.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Program.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 \r
 public class Program {\r

diff --git a/tx-signer/src/main/java/io/bytom/types/Retirement.java b/tx-signer/src/main/java/io/bytom/offline/types/Retirement.java
similarity index 91%
rename from tx-signer/src/main/java/io/bytom/types/Retirement.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Retirement.java
index 81bfe27..5ee48bf 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Retirement.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Retirement.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/Spend.java b/tx-signer/src/main/java/io/bytom/offline/types/Spend.java
similarity index 94%
rename from tx-signer/src/main/java/io/bytom/types/Spend.java
rename to tx-signer/src/main/java/io/bytom/offline/types/Spend.java
index 4743d4c..c6d1846 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/Spend.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/Spend.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.util.Map;\r

diff --git a/tx-signer/src/main/java/io/bytom/types/TxHeader.java b/tx-signer/src/main/java/io/bytom/offline/types/TxHeader.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/types/TxHeader.java
rename to tx-signer/src/main/java/io/bytom/offline/types/TxHeader.java
index 623d78b..e60a769 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/TxHeader.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/TxHeader.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/ValueDestination.java b/tx-signer/src/main/java/io/bytom/offline/types/ValueDestination.java
similarity index 90%
rename from tx-signer/src/main/java/io/bytom/types/ValueDestination.java
rename to tx-signer/src/main/java/io/bytom/offline/types/ValueDestination.java
index 55d0b31..36c7d76 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/ValueDestination.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/ValueDestination.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 public class ValueDestination {\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/types/ValueSource.java b/tx-signer/src/main/java/io/bytom/offline/types/ValueSource.java
similarity index 90%
rename from tx-signer/src/main/java/io/bytom/types/ValueSource.java
rename to tx-signer/src/main/java/io/bytom/offline/types/ValueSource.java
index 1ddba5a..4ca1e9c 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/types/ValueSource.java
+++ b/tx-signer/src/main/java/io/bytom/offline/types/ValueSource.java
@@ -1,4 +1,4 @@
-package io.bytom.types;\r
+package io.bytom.offline.types;\r
 \r
 \r
 public class ValueSource {\r

diff --git a/tx-signer/src/main/java/io/bytom/util/OutputUtil.java b/tx-signer/src/main/java/io/bytom/offline/util/OutputUtil.java
similarity index 93%
rename from tx-signer/src/main/java/io/bytom/util/OutputUtil.java
rename to tx-signer/src/main/java/io/bytom/offline/util/OutputUtil.java
index 3c46008..cffef50 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/util/OutputUtil.java
+++ b/tx-signer/src/main/java/io/bytom/offline/util/OutputUtil.java
@@ -1,4 +1,4 @@
-package io.bytom.util;\r
+package io.bytom.offline.util;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r

diff --git a/tx-signer/src/main/java/io/bytom/util/PathUtil.java b/tx-signer/src/main/java/io/bytom/offline/util/PathUtil.java
similarity index 95%
rename from tx-signer/src/main/java/io/bytom/util/PathUtil.java
rename to tx-signer/src/main/java/io/bytom/offline/util/PathUtil.java
index 97cf6f7..ce25c72 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/util/PathUtil.java
+++ b/tx-signer/src/main/java/io/bytom/offline/util/PathUtil.java
@@ -1,4 +1,4 @@
-package io.bytom.util;\r
+package io.bytom.offline.util;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 \r

diff --git a/tx-signer/src/main/java/io/bytom/util/SHA3Util.java b/tx-signer/src/main/java/io/bytom/offline/util/SHA3Util.java
similarity index 90%
rename from tx-signer/src/main/java/io/bytom/util/SHA3Util.java
rename to tx-signer/src/main/java/io/bytom/offline/util/SHA3Util.java
index 1e8c1bc..f56b285 100755 (executable)
--- a/tx-signer/src/main/java/io/bytom/util/SHA3Util.java
+++ b/tx-signer/src/main/java/io/bytom/offline/util/SHA3Util.java
@@ -1,4 +1,4 @@
-package io.bytom.util;\r
+package io.bytom.offline.util;\r
 \r
 import org.bouncycastle.jcajce.provider.digest.SHA3;\r
 \r

diff --git a/tx-signer/src/test/java/io/bytom/AppTest.java b/tx-signer/src/test/java/io/bytom/AppTest.java
index 0569c76..9764830 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/AppTest.java
+++ b/tx-signer/src/test/java/io/bytom/AppTest.java
@@ -1,6 +1,6 @@
 package io.bytom;\r
 \r
-import io.bytom.api.*;\r
+import io.bytom.offline.api.*;\r
 import org.bouncycastle.util.encoders.Hex;\r
 import org.junit.Test;\r
 \r

diff --git a/tx-signer/src/test/java/io/bytom/api/SignTransactionTest.java b/tx-signer/src/test/java/io/bytom/api/SignTransactionTest.java
index 73a041b..54dad10 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/api/SignTransactionTest.java
+++ b/tx-signer/src/test/java/io/bytom/api/SignTransactionTest.java
@@ -1,7 +1,7 @@
 \r
 package io.bytom.api;\r
 \r
-import io.bytom.types.*;\r
+import io.bytom.offline.types.*;\r
 import org.bouncycastle.util.encoders.Hex;\r
 import org.junit.Test;\r
 \r

diff --git a/tx-signer/src/test/java/io/bytom/api/SignerTest.java b/tx-signer/src/test/java/io/bytom/api/SignerTest.java
index 21b64fb..18f4b66 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/api/SignerTest.java
+++ b/tx-signer/src/test/java/io/bytom/api/SignerTest.java
@@ -1,6 +1,6 @@
 package io.bytom.api;\r
 \r
-import io.bytom.common.Signer;\r
+import io.bytom.offline.common.Signer;\r
 import org.bouncycastle.util.encoders.Hex;\r
 import org.junit.Test;\r
 \r

diff --git a/tx-signer/src/test/java/io/bytom/common/DerivePrivateKeyTest.java b/tx-signer/src/test/java/io/bytom/offline/common/DerivePrivateKeyTest.java
similarity index 96%
rename from tx-signer/src/test/java/io/bytom/common/DerivePrivateKeyTest.java
rename to tx-signer/src/test/java/io/bytom/offline/common/DerivePrivateKeyTest.java
index dce5775..16a9e41 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/common/DerivePrivateKeyTest.java
+++ b/tx-signer/src/test/java/io/bytom/offline/common/DerivePrivateKeyTest.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 import org.junit.Test;\r

diff --git a/tx-signer/src/test/java/io/bytom/common/DeriveXpubTest.java b/tx-signer/src/test/java/io/bytom/offline/common/DeriveXpubTest.java
similarity index 93%
rename from tx-signer/src/test/java/io/bytom/common/DeriveXpubTest.java
rename to tx-signer/src/test/java/io/bytom/offline/common/DeriveXpubTest.java
index 4d6738d..d462c51 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/common/DeriveXpubTest.java
+++ b/tx-signer/src/test/java/io/bytom/offline/common/DeriveXpubTest.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 \r
 import org.bouncycastle.util.encoders.Hex;\r

diff --git a/tx-signer/src/test/java/io/bytom/common/ExpandedPrivateKeyTest.java b/tx-signer/src/test/java/io/bytom/offline/common/ExpandedPrivateKeyTest.java
similarity index 94%
rename from tx-signer/src/test/java/io/bytom/common/ExpandedPrivateKeyTest.java
rename to tx-signer/src/test/java/io/bytom/offline/common/ExpandedPrivateKeyTest.java
index 5e45da8..3949ce4 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/common/ExpandedPrivateKeyTest.java
+++ b/tx-signer/src/test/java/io/bytom/offline/common/ExpandedPrivateKeyTest.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 \r
 import org.bouncycastle.util.encoders.Hex;\r

diff --git a/tx-signer/src/test/java/io/bytom/common/NonHardenedChildTest.java b/tx-signer/src/test/java/io/bytom/offline/common/NonHardenedChildTest.java
similarity index 96%
rename from tx-signer/src/test/java/io/bytom/common/NonHardenedChildTest.java
rename to tx-signer/src/test/java/io/bytom/offline/common/NonHardenedChildTest.java
index 834287c..a243b4f 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/common/NonHardenedChildTest.java
+++ b/tx-signer/src/test/java/io/bytom/offline/common/NonHardenedChildTest.java
@@ -1,4 +1,4 @@
-package io.bytom.common;\r
+package io.bytom.offline.common;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 import org.junit.Test;\r

diff --git a/tx-signer/src/test/java/io/bytom/util/SHA3256Test.java b/tx-signer/src/test/java/io/bytom/offline/util/SHA3256Test.java
similarity index 92%
rename from tx-signer/src/test/java/io/bytom/util/SHA3256Test.java
rename to tx-signer/src/test/java/io/bytom/offline/util/SHA3256Test.java
index b712d16..bc6151e 100755 (executable)
--- a/tx-signer/src/test/java/io/bytom/util/SHA3256Test.java
+++ b/tx-signer/src/test/java/io/bytom/offline/util/SHA3256Test.java
@@ -1,4 +1,4 @@
-package io.bytom.util;\r
+package io.bytom.offline.util;\r
 \r
 import org.bouncycastle.util.encoders.Hex;\r
 import org.junit.Test;\r