Merge pull request #16 from bitmark-inc/fix_sdk

remove bitmark sdk

libauk/build.gradle

@@ -40,9 +40,6 @@ dependencies {
  implementation 'com.google.code.gson:gson:2.8.5'
  implementation 'androidx.security:security-crypto:1.1.0-alpha06'
  implementation 'io.camlcase:kotlintezos:2.0.2'
- implementation 'com.bitmark.sdk:android-sdk:2.2.0'
- implementation 'com.bitmark.sdk:api-service:2.2.0'
- implementation 'com.bitmark.sdk:cryptography:1.6.0'
  implementation 'at.favre.lib:hkdf:2.0.0'
  testImplementation 'junit:junit:4.13.1'
  testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'

libauk/src/main/java/com/bitmark/libauk/LibAuk.kt

@@ -1,15 +1,11 @@
 package com.bitmark.libauk
 
 import android.content.Context
-import com.bitmark.apiservice.configuration.GlobalConfiguration
-import com.bitmark.apiservice.configuration.Network
 import com.bitmark.libauk.storage.SecureFileStorageImpl
 import com.bitmark.libauk.storage.WalletStorage
 import com.bitmark.libauk.storage.WalletStorageImpl
 import org.web3j.crypto.Bip44WalletUtils
-import org.web3j.crypto.Keys
-import org.web3j.crypto.MnemonicUtils
-import java.util.*
+import java.util.UUID
 
 class LibAuk {
 
@@ -22,14 +18,6 @@ class LibAuk {
  INSTANCE ?: LibAuk().also { INSTANCE = it }
  }
 
- init {
- GlobalConfiguration.createInstance(
- GlobalConfiguration.builder()
- .withApiToken("bitmark")
- .withNetwork(Network.LIVE_NET)
- )
- }
-
  fun getStorage(uuid: UUID, context: Context): WalletStorage {
  val storage = SecureFileStorageImpl(context, uuid)
  return WalletStorageImpl(storage)

libauk/src/main/java/com/bitmark/libauk/storage/WalletStorage.kt

@@ -1,17 +1,8 @@
 package com.bitmark.libauk.storage
 
-import androidx.lifecycle.Transformations.map
 import at.favre.lib.hkdf.HKDF
-import com.bitmark.apiservice.configuration.GlobalConfiguration
-import com.bitmark.apiservice.utils.Address
-import com.bitmark.apiservice.utils.ArrayUtil
-import com.bitmark.cryptography.crypto.Sha256
-import com.bitmark.cryptography.crypto.Sha3256
-import com.bitmark.cryptography.crypto.encoder.Base58
-import com.bitmark.cryptography.crypto.key.PublicKey
 import com.bitmark.libauk.Const.ACCOUNT_DERIVATION_PATH
 import com.bitmark.libauk.Const.ENCRYPT_KEY_DERIVATION_PATH
-import com.bitmark.libauk.model.KeyInfo
 import com.bitmark.libauk.model.Seed
 import com.bitmark.libauk.model.SeedPublicData
 import com.bitmark.libauk.util.fromJson
@@ -25,8 +16,10 @@ import io.camlcase.kotlintezos.wallet.crypto.toHexString
 import io.camlcase.kotlintezos.wallet.crypto.watermarkAndHash
 import io.reactivex.Completable
 import io.reactivex.Single
+import org.bouncycastle.crypto.digests.SHA256Digest
 import org.web3j.crypto.*
 import org.web3j.utils.Numeric
+import wallet.core.jni.Base58
 import wallet.core.jni.Curve
 import wallet.core.jni.PrivateKey
 import java.io.File
@@ -245,7 +238,7 @@ internal class WalletStorageImpl(private val secureFileStorage: SecureFileStorag
  val bip44Keypair = Bip32ECKeyPair.deriveKeyPair(masterKeypair, ACCOUNT_DERIVATION_PATH)
  val prefix: ByteArray = listOf(231, 1).map { it.toByte() }.toByteArray()
  val compressedPubKey = compressPubKey(bip44Keypair.publicKey)
- return "did:key:z${Base58.BASE_58.encode(prefix + compressedPubKey.hexStringToByteArray())}"
+ return "did:key:z${Base58.encode(prefix + compressedPubKey.hexStringToByteArray())}"
  }
 
  override fun getAccountDID(): Single<String> = getSeedPublicData()
@@ -275,7 +268,7 @@ internal class WalletStorageImpl(private val secureFileStorage: SecureFileStorag
  val bip44Keypair = Bip32ECKeyPair.deriveKeyPair(masterKeypair, ACCOUNT_DERIVATION_PATH)
 
  val sigData = Sign.signMessage(
- Sha256.hash(message.toByteArray(Charsets.UTF_8)),
+ SHA256Digest(message.toByteArray(Charsets.UTF_8)).encodedState,
  bip44Keypair,
  false
  )
@@ -564,25 +557,6 @@ internal class WalletStorageImpl(private val secureFileStorage: SecureFileStorag
  return MnemonicUtils.generateMnemonic(initialEntropy)
  }
 
- private fun generateAccountNumber(key: PublicKey): String? {
- val address = Address.getDefault(key, GlobalConfiguration.network())
- val keyVariantVarInt = address.prefix
- val publicKeyBytes = key.toBytes()
- val preChecksum = ArrayUtil.concat(keyVariantVarInt, publicKeyBytes)
- val checksum = ArrayUtil.slice(
- Sha3256.hash(preChecksum),
- 0,
- Address.CHECKSUM_LENGTH
- )
- return Base58.BASE_58.encode(
- ArrayUtil.concat(
- keyVariantVarInt,
- publicKeyBytes,
- checksum
- )
- )
- }
-
  private fun compressPubKey(pubKey: BigInteger): String {
  val pubKeyYPrefix = if (pubKey.testBit(0)) "03" else "02"
  val pubKeyHex: String = Numeric.toBytesPadded(pubKey, 64).toHexString()