Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "encry-common"

version := "0.1.5"
version := "0.2.1"

scalaVersion := "2.12.6"

Expand All @@ -16,13 +16,11 @@ val circeVersion = "0.9.3"
val apiDependencies = Seq(
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion
)

libraryDependencies ++= Seq(
"com.google.guava" % "guava" % "21.+",
"org.scorexfoundation" %% "scrypto" % "2.1.+",
"org.encry" %% "prism" % "0.2.7",
"org.encry" %% "prism" % "0.3.0",
"org.scalatest" %% "scalatest" % "3.0.3" % "test"
) ++ apiDependencies

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/org/encryfoundation/common/Algos.scala
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package org.encryfoundation.common

import java.nio.charset.Charset
import org.encryfoundation.utils.encoding.Base16
import scorex.crypto.authds.LeafData
import scorex.crypto.authds.merkle.MerkleTree
import scorex.util.encode.Base16
import scorex.crypto.hash.{Blake2b256, Digest32}
import scala.util.Try

object Algos {

type HF = Blake2b256.type

def encode(bytes: Array[Byte]): String = encoder.encode(bytes)
def encode(bytes: Array[Byte]): String = Base16.encode(bytes)

def decode(str: String): Try[Array[Byte]] = encoder.decode(str)
def decode(str: String): Try[Array[Byte]] = Base16.decode(str)

val hash: HF = Blake2b256

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.encryfoundation.common.crypto
import com.google.common.primitives.Bytes
import org.encryfoundation.common.serialization.{BytesSerializable, Serializer}
import scorex.crypto.signatures.{Curve25519, PrivateKey, PublicKey}

import scala.util.Try

trait SecretWrapper extends BytesSerializable
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.encryfoundation.common.transaction

import org.encryfoundation.common.crypto.encoding.Base58Check
import org.encryfoundation.common.transaction.EncryAddress.Address
import org.encryfoundation.prismlang.compiler.CompiledContract.ContractHash
import org.encryfoundation.utils.encoding.Base58Check
import scorex.crypto.signatures.PublicKey

import scala.util.Try

sealed trait EncryAddress {
Expand Down
24 changes: 24 additions & 0 deletions src/main/scala/org/encryfoundation/common/utils/Mnemonic.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.encryfoundation.common.utils

import org.encryfoundation.common.Algos
import scodec.bits.BitVector
import scala.io.Source

object Mnemonic {

private def getWords(language: String = "english"): Array[String] = Source
.fromFile("src/main/resources/languages/" + language + "/words.txt").getLines.toArray

def seedFromMnemonic(mnemonicCode: String, passPhrase: String = ""): Array[Byte] =
Algos.hash(mnemonicCode + "mnemonic=" + passPhrase)

def entropyToMnemonicCode(entropy: Array[Byte]): String = {
val words: Array[String] = getWords()
val checkSum: BitVector = BitVector(Algos.hash(entropy))
val entropyWithCheckSum: BitVector = BitVector(entropy) ++ checkSum.take(4)

entropyWithCheckSum.grouped(11).map { i =>
words(i.toInt(signed = false))
}.mkString(" ")
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.encryfoundation.common.transaction

import org.encryfoundation.common.crypto.encoding.Base58Check
import org.encryfoundation.common.transaction.EncryAddress.Address
import org.encryfoundation.utils.encoding.Base58Check
import org.scalatest.{Matchers, PropSpec}
import scorex.util.encode.Base58
import scorex.crypto.signatures.{Curve25519, PublicKey}
Expand Down