chore: rename package 'ln.v2' -> 'sdk' (#6)

* chore: rename package 'ln.v2' -> 'sdk' * chore: update submodule for finschia
Finschia · Apr 19, 2023 · c0331b3 · c0331b3
1 parent 9868374
commit c0331b3
Show file tree

Hide file tree

Showing 73 changed files with 160 additions and 161 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "lbm-sdk"]
-	path = protobuf/repositories/lbm-sdk
-	url = https://github.com/line/lbm-sdk.git
-[submodule "wasmd"]
-	path = protobuf/repositories/wasmd
-	url = https://github.com/line/wasmd.git
-[submodule "ibc-go"]
+[submodule "protobuf/repositories/finschia-sdk"]
+	path = protobuf/repositories/finschia-sdk
+	url = https://github.com/Finschia/finschia-sdk
+[submodule "protobuf/repositories/ibc-go"]
 	path = protobuf/repositories/ibc-go
-	url = https://github.com/line/ibc-go.git
+	url = https://github.com/Finschia/ibc-go
+[submodule "protobuf/repositories/wasmd"]
+	path = protobuf/repositories/wasmd
+	url = https://github.com/Finschia/wasmd
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Added
 
 ### Changed
+* [\#6](https://github.com/Finschia/finschia-kt/pull/6) Rename package 'ln.v2' -> 'sdk'
 
 ### Deprecated
 
@@ -52,9 +53,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Build, CI
 
-* (build) [\#4](https://github.com/line/finschia-kt/pull/4) Add gradle `updateSubmodule` task and `checkoutSubModule` task to run `git submodule update --init --remote` with specific version before `build task` 
+* (build) [\#4](https://github.com/Finschia/finschia-kt/pull/4) Add gradle `updateSubmodule` task and `checkoutSubModule` task to run `git submodule update --init --remote` with specific version before `build task` 
 
 ### Document Updates
 
 <!-- Release links -->
-[Unreleased]: https://github.com/line/finschia-kt/compare/8aa2005...HEAD
+[Unreleased]: https://github.com/Finschia/finschia-kt/compare/8aa2005...HEAD
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # finschia-kt
 
-gRPC client library in kotlin for finschia (https://github.com/line/finschia).
+gRPC client library in kotlin for finschia (https://github.com/Finschia/finschia).
 
-Requires [lbm-sdk v0.47.0-alpha1](https://github.com/line/lbm-sdk/tree/v0.47.0-alpha1)
+Requires [finschia-sdk v0.47.0-alpha1](https://github.com/Finschia/finschia-sdk/tree/v0.47.0-alpha1)
 
-Current lbm-sdk version applied to finschia-kt/protobuf is [lbm-sdk v0.47.0-alpha1](https://github.com/line/lbm-sdk/tree/v0.47.0-alpha1)
+Current finschia-sdk version applied to finschia-kt/protobuf is [finschia-sdk v0.47.0-alpha1](https://github.com/Finschia/finschia-sdk/tree/v0.47.0-alpha1)
 
 ## Build
 
@@ -15,20 +15,20 @@ $ git submodule update --init
 $ ./gradlew build
 ```
 
-Note that any version of finschia-kt is only compatible with a certain lbm-sdk version. The corresponding lbm-sdk
-version that the current repository supports can be found in the tag or commit hash of `proto/repositories/lbm-sdk`
+Note that any version of finschia-kt is only compatible with a certain finschia-sdk version. The corresponding finschia-sdk
+version that the current repository supports can be found in the tag or commit hash of `proto/repositories/finschia-sdk`
 submodule, using the following command.
 
 ```shell
-$ cd protobuf/repositories/lbm-sdk && git describe --always && cd -
+$ cd protobuf/repositories/finschia-sdk && git describe --always && cd -
 ```
 
-If you are a finschia-kt developer or contributor and trying to use another version of lbm-sdk, `git checkout`
-the appropriate version in the lbm-sdk submodule before building this repository. The following command is an example
-of using lbm-sdk `v0.47.0-alpha1`.
+If you are a finschia-kt developer or contributor and trying to use another version of finschia-sdk, `git checkout`
+the appropriate version in the finschia-sdk submodule before building this repository. The following command is an example
+of using finschia-sdk `v0.47.0-alpha1`.
 
 ```shell
-$ cd protobuf/repositories/lbm-sdk && git checkout v0.47.0-alpha1 && cd -
+$ cd protobuf/repositories/finschia-sdk && git checkout v0.47.0-alpha1 && cd -
 ```
 
 ## How to use
@@ -88,9 +88,9 @@ The former is using the tx wrapper, while the latter does not use the wrapper.
 
 ## How to run `without-tx-wrapper-example`
 
-### 1. Run lbm-sdk simapp
+### 1. Run finschia-sdk simapp
 
-Build with reference to [Quick Start build](https://github.com/line/lbm-sdk/tree/v0.47.0-alpha1#quick-start).
+Build with reference to [Quick Start build](https://github.com/Finschia/finschia-sdk/tree/v0.47.0-alpha1#quick-start).
 
 Initialize and configure simapp.
 
@@ -114,7 +114,7 @@ $ simd start --home ~/simapp
 ### 2. Replace hard-coded arguments
 
 To confirm it's possible to send transactions to the chain created above using finschia-kt, replace the following
-three parts of the [without-tx-wrapper-example/src/main/kotlin/network/link/ln/v2/example/Client.kt](https://github.com/line/finschia-kt/blob/main/examples/without-tx-wrapper-example/src/main/kotlin/network/link/ln/v2/example/Client.kt).
+three parts of the [without-tx-wrapper-example/src/main/kotlin/network/link/sdk/example/Client.kt](https://github.com/Finschia/finschia-kt/blob/main/examples/without-tx-wrapper-example/src/main/kotlin/network/link/sdk/example/Client.kt).
 
 1. **Chain ID**: constant of the name `CHAIN_ID` in `ConcreteScenarios`
    ```go

diff --git a/...kotlin-application-conventions.gradle.kts → ...kotlin-application-conventions.gradle.kts b/...kotlin-application-conventions.gradle.kts → ...kotlin-application-conventions.gradle.kts
@@ -4,7 +4,7 @@
 
 plugins {
     // Apply the common convention plugin for shared build configuration between library and application projects.
-    id("network.finschia.ln.v2.kotlin-common-conventions")
+    id("network.finschia.sdk.kotlin-common-conventions")
 
     // Apply the application plugin to add support for building a CLI application in Java.
     application

diff --git a/...n.v2.kotlin-common-conventions.gradle.kts → ....sdk.kotlin-common-conventions.gradle.kts b/...n.v2.kotlin-common-conventions.gradle.kts → ....sdk.kotlin-common-conventions.gradle.kts
diff --git a/....v2.kotlin-library-conventions.gradle.kts → ...sdk.kotlin-library-conventions.gradle.kts b/....v2.kotlin-library-conventions.gradle.kts → ...sdk.kotlin-library-conventions.gradle.kts
@@ -4,7 +4,7 @@
 
 plugins {
     // Apply the common convention plugin for shared build configuration between library and application projects.
-    id("network.finschia.ln.v2.kotlin-common-conventions")
+    id("network.finschia.sdk.kotlin-common-conventions")
 
     // Apply the java-library plugin for API and implementation separation.
     `java-library`

diff --git a/crypto/build.gradle.kts b/crypto/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("network.finschia.ln.v2.kotlin-library-conventions")
+    id("network.finschia.sdk.kotlin-library-conventions")
 }
 
 val guavaVersion = "28.1-jre"

diff --git a/.../network/finschia/ln/v2/crypto/Amino.java → ...va/network/finschia/sdk/crypto/Amino.java b/.../network/finschia/ln/v2/crypto/Amino.java → ...va/network/finschia/sdk/crypto/Amino.java
@@ -1,4 +1,4 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
 import java.util.Arrays;
 

diff --git a/...rk/finschia/ln/v2/crypto/Bech32Utils.java → ...work/finschia/sdk/crypto/Bech32Utils.java b/...rk/finschia/ln/v2/crypto/Bech32Utils.java → ...work/finschia/sdk/crypto/Bech32Utils.java
@@ -1,4 +1,4 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
 import java.io.ByteArrayOutputStream;
 

diff --git a/...nschia/ln/v2/crypto/Bip44WalletUtils.java → ...finschia/sdk/crypto/Bip44WalletUtils.java b/...nschia/ln/v2/crypto/Bip44WalletUtils.java → ...finschia/sdk/crypto/Bip44WalletUtils.java
@@ -1,7 +1,5 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
-import static network.finschia.ln.v2.crypto.LinkKeys.PRIVATE_KEY_SIZE;
-import static network.finschia.ln.v2.crypto.SecureRandomUtils.secureRandom;
 import static org.web3j.crypto.Bip32ECKeyPair.HARDENED_BIT;
 
 import org.bouncycastle.util.BigIntegers;
@@ -19,15 +17,15 @@ private Bip44WalletUtils() {}
 
     public static String generateMnemonic() {
         final byte[] initialEntropy = new byte[16];
-        secureRandom().nextBytes(initialEntropy);
+        SecureRandomUtils.secureRandom().nextBytes(initialEntropy);
         return MnemonicUtils.generateMnemonic(initialEntropy);
     }
 
     public static byte[] generatePrivateKey(String mnemonic, int accountNumber, int index) {
         final byte[] seed = MnemonicUtils.generateSeed(mnemonic, null);
         final Bip32ECKeyPair masterKeypair = Bip32ECKeyPair.generateKeyPair(seed);
         final Bip32ECKeyPair bip44Keypair = generateBip44KeyPair(masterKeypair, accountNumber, index);
-        return BigIntegers.asUnsignedByteArray(PRIVATE_KEY_SIZE, bip44Keypair.getPrivateKey());
+        return BigIntegers.asUnsignedByteArray(LinkKeys.PRIVATE_KEY_SIZE, bip44Keypair.getPrivateKey());
     }
 
     static Bip32ECKeyPair generateBip44KeyPair(Bip32ECKeyPair master, int accountNumber, int index) {

diff --git a/...finschia/ln/v2/crypto/ECDSASignature.java → ...k/finschia/sdk/crypto/ECDSASignature.java b/...finschia/ln/v2/crypto/ECDSASignature.java → ...k/finschia/sdk/crypto/ECDSASignature.java
@@ -1,4 +1,4 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;

diff --git a/...twork/finschia/ln/v2/crypto/KeyStore.java → ...network/finschia/sdk/crypto/KeyStore.java b/...twork/finschia/ln/v2/crypto/KeyStore.java → ...network/finschia/sdk/crypto/KeyStore.java
@@ -1,8 +1,8 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
-import static network.finschia.ln.v2.crypto.Amino.addAminoPrefix;
-import static network.finschia.ln.v2.crypto.Amino.removeAminoPrefix;
-import static network.finschia.ln.v2.crypto.SecureRandomUtils.secureRandom;
+import static network.finschia.sdk.crypto.Amino.addAminoPrefix;
+import static network.finschia.sdk.crypto.Amino.removeAminoPrefix;
+import static network.finschia.sdk.crypto.SecureRandomUtils.secureRandom;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...twork/finschia/ln/v2/crypto/LinkKeys.java → ...network/finschia/sdk/crypto/LinkKeys.java b/...twork/finschia/ln/v2/crypto/LinkKeys.java → ...network/finschia/sdk/crypto/LinkKeys.java
@@ -1,6 +1,6 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
-import static network.finschia.ln.v2.crypto.SecureRandomUtils.secureRandom;
+import static network.finschia.sdk.crypto.SecureRandomUtils.secureRandom;
 
 import java.math.BigInteger;
 import java.security.InvalidAlgorithmParameterException;

diff --git a/...schia/ln/v2/crypto/SecureRandomUtils.java → ...inschia/sdk/crypto/SecureRandomUtils.java b/...schia/ln/v2/crypto/SecureRandomUtils.java → ...inschia/sdk/crypto/SecureRandomUtils.java
@@ -10,7 +10,7 @@
  * 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.
  */
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
 import java.security.SecureRandom;
 

diff --git a/...crypto/TendermintArmoredOutputStream.java → ...crypto/TendermintArmoredOutputStream.java b/...crypto/TendermintArmoredOutputStream.java → ...crypto/TendermintArmoredOutputStream.java
@@ -1,4 +1,4 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...schia/ln/v2/crypto/Xsalsa20Symmetric.java → ...inschia/sdk/crypto/Xsalsa20Symmetric.java b/...schia/ln/v2/crypto/Xsalsa20Symmetric.java → ...inschia/sdk/crypto/Xsalsa20Symmetric.java
@@ -1,4 +1,4 @@
-package network.finschia.ln.v2.crypto;
+package network.finschia.sdk.crypto;
 
 import java.util.Arrays;
 import java.util.Optional;

diff --git a/...network/finschia/ln/v2/account/Account.kt → ...n/network/finschia/sdk/account/Account.kt b/...network/finschia/ln/v2/account/Account.kt → ...n/network/finschia/sdk/account/Account.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
 /**
  * Account interface represents the account information such as address, account number, sequence number

diff --git a/...network/finschia/ln/v2/account/Address.kt → ...n/network/finschia/sdk/account/Address.kt b/...network/finschia/ln/v2/account/Address.kt → ...n/network/finschia/sdk/account/Address.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
-import network.finschia.ln.v2.account.Type.ACCOUNT
-import network.finschia.ln.v2.account.Type.Companion.DEFAULT_BECH32_HRP_PREFIX
-import network.finschia.ln.v2.account.Type.Companion.toHrpPrefix
-import network.finschia.ln.v2.crypto.Bech32Utils
+import network.finschia.sdk.account.Type.ACCOUNT
+import network.finschia.sdk.account.Type.Companion.DEFAULT_BECH32_HRP_PREFIX
+import network.finschia.sdk.account.Type.Companion.toHrpPrefix
+import network.finschia.sdk.crypto.Bech32Utils
 import org.bitcoinj.core.Bech32
 import org.bouncycastle.jcajce.provider.digest.RIPEMD160
 import org.bouncycastle.jcajce.provider.digest.SHA256
@@ -118,7 +118,8 @@ class Address private constructor(val type: Type, val body: ByteArray) {
          */
         @JvmStatic
         @JvmName("of")
-        operator fun invoke(body: ByteArray): Address = invoke(ACCOUNT, body)
+        operator fun invoke(body: ByteArray): Address =
+            invoke(ACCOUNT, body)
 
         /**
          * initiates an address from [bech32Address]

diff --git a/...in/network/finschia/ln/v2/account/Coin.kt → ...tlin/network/finschia/sdk/account/Coin.kt b/...in/network/finschia/ln/v2/account/Coin.kt → ...tlin/network/finschia/sdk/account/Coin.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
 import java.math.BigInteger
 

diff --git a/...etwork/finschia/ln/v2/account/HDWallet.kt → .../network/finschia/sdk/account/HDWallet.kt b/...etwork/finschia/ln/v2/account/HDWallet.kt → .../network/finschia/sdk/account/HDWallet.kt
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
-import network.finschia.ln.v2.crypto.Bip44WalletUtils.generateMnemonic
-import network.finschia.ln.v2.crypto.Bip44WalletUtils.generatePrivateKey
+import network.finschia.sdk.crypto.Bip44WalletUtils.generateMnemonic
+import network.finschia.sdk.crypto.Bip44WalletUtils.generatePrivateKey
 import java.security.InvalidAlgorithmParameterException
 import java.security.NoSuchAlgorithmException
 import java.security.NoSuchProviderException

diff --git a/...twork/finschia/ln/v2/account/KeyWallet.kt → ...network/finschia/sdk/account/KeyWallet.kt b/...twork/finschia/ln/v2/account/KeyWallet.kt → ...network/finschia/sdk/account/KeyWallet.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
-import network.finschia.ln.v2.account.PubKey.Companion.createFromPrivateKey
-import network.finschia.ln.v2.crypto.ECDSASignature
-import network.finschia.ln.v2.crypto.KeyStore
-import network.finschia.ln.v2.crypto.LinkKeys
+import network.finschia.sdk.account.PubKey.Companion.createFromPrivateKey
+import network.finschia.sdk.crypto.ECDSASignature
+import network.finschia.sdk.crypto.KeyStore
+import network.finschia.sdk.crypto.LinkKeys
 import java.io.InputStream
 import java.io.OutputStream
 import java.io.Reader

diff --git a/.../network/finschia/ln/v2/account/PubKey.kt → ...in/network/finschia/sdk/account/PubKey.kt b/.../network/finschia/ln/v2/account/PubKey.kt → ...in/network/finschia/sdk/account/PubKey.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.account
-
-import network.finschia.ln.v2.account.Type.Companion.DEFAULT_BECH32_HRP_PREFIX
-import network.finschia.ln.v2.account.Type.Companion.toHrpPrefix
-import network.finschia.ln.v2.common.TypedValue
-import network.finschia.ln.v2.crypto.Amino
-import network.finschia.ln.v2.crypto.Bech32Utils
-import network.finschia.ln.v2.crypto.LinkKeys
+package network.finschia.sdk.account
+
+import network.finschia.sdk.account.Type.Companion.DEFAULT_BECH32_HRP_PREFIX
+import network.finschia.sdk.account.Type.Companion.toHrpPrefix
+import network.finschia.sdk.common.TypedValue
+import network.finschia.sdk.crypto.Amino
+import network.finschia.sdk.crypto.Bech32Utils
+import network.finschia.sdk.crypto.LinkKeys
 import org.bitcoinj.core.Bech32
 import org.bouncycastle.util.encoders.Hex
 

diff --git a/...in/network/finschia/ln/v2/account/Type.kt → ...tlin/network/finschia/sdk/account/Type.kt b/...in/network/finschia/ln/v2/account/Type.kt → ...tlin/network/finschia/sdk/account/Type.kt
@@ -1,4 +1,4 @@
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
 /**
  * Defines the types of Addresses and PubKeys

diff --git a/.../network/finschia/ln/v2/account/Wallet.kt → ...in/network/finschia/sdk/account/Wallet.kt b/.../network/finschia/ln/v2/account/Wallet.kt → ...in/network/finschia/sdk/account/Wallet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.account
+package network.finschia.sdk.account
 
 /**
  * Wallet class signs the message using own keys

diff --git a/...nschia/ln/v2/common/CommonMapperModule.kt → ...finschia/sdk/common/CommonMapperModule.kt b/...nschia/ln/v2/common/CommonMapperModule.kt → ...finschia/sdk/common/CommonMapperModule.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.common
+package network.finschia.sdk.common
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.PropertyNamingStrategy
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import network.finschia.ln.v2.account.Type
+import network.finschia.sdk.account.Type
 
 /**
  * Predefined basic JSON serializing and deserializing rules for Jackson-databind

diff --git a/...etwork/finschia/ln/v2/common/Converter.kt → .../network/finschia/sdk/common/Converter.kt b/...etwork/finschia/ln/v2/common/Converter.kt → .../network/finschia/sdk/common/Converter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package network.finschia.ln.v2.common
+package network.finschia.sdk.common
 
 /**
  * An interface of converter

diff --git a/...lin/network/finschia/ln/v2/common/Hash.kt → ...otlin/network/finschia/sdk/common/Hash.kt b/...lin/network/finschia/ln/v2/common/Hash.kt → ...otlin/network/finschia/sdk/common/Hash.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.finschia.ln.v2.common
+package network.finschia.sdk.common
 
 import org.bouncycastle.util.encoders.Hex
 

diff --git a/...network/finschia/ln/v2/common/KeyValue.kt → ...n/network/finschia/sdk/common/KeyValue.kt b/...network/finschia/ln/v2/common/KeyValue.kt → ...n/network/finschia/sdk/common/KeyValue.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package network.finschia.ln.v2.common
+package network.finschia.sdk.common
 
 /**
  * Container to ease passing around a key and value pair

diff --git a/...nschia/ln/v2/common/ToStringConverters.kt → ...finschia/sdk/common/ToStringConverters.kt b/...nschia/ln/v2/common/ToStringConverters.kt → ...finschia/sdk/common/ToStringConverters.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package network.finschia.ln.v2.common
+package network.finschia.sdk.common
 
-import network.finschia.ln.v2.account.Address
-import network.finschia.ln.v2.account.PubKey
-import network.finschia.ln.v2.account.Type.Companion.DEFAULT_BECH32_HRP_PREFIX
+import network.finschia.sdk.account.Address
+import network.finschia.sdk.account.PubKey
+import network.finschia.sdk.account.Type.Companion.DEFAULT_BECH32_HRP_PREFIX
 import java.lang.reflect.Type
 import java.math.BigInteger
 

diff --git a/...twork/finschia/ln/v2/common/TypedValue.kt → ...network/finschia/sdk/common/TypedValue.kt b/...twork/finschia/ln/v2/common/TypedValue.kt → ...network/finschia/sdk/common/TypedValue.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package network.finschia.ln.v2.common
+package network.finschia.sdk.common
 
 /**
  * Wraps an object with type to recognize struct to unmarshal.