Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add BIP32-Ed25519 implementation #174

Merged
merged 7 commits into from
Jul 2, 2019
+523 −291
Merged

Add BIP32-Ed25519 implementation #174

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3da083a
Crypto: add first implementation of the BIP32-ED25519
Jul 1, 2019
90e1f96
Crypto: re-use the keydata for both public and private keys
Jul 1, 2019
ee4f8a7
Trivial: rename variable
Jul 1, 2019
8fd77cc
Crypto: implement and test BIP32-ED25519
Jul 1, 2019
5e69872
Trivial: remove dependency on commons-lang3 in crypto
Jul 1, 2019
50bbd1b
Misc: fix regression issues
Jul 1, 2019
118e1e4
Trivial: replace systemm.out with logger
Jul 2, 2019
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
15 changes: 10 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand All @@ -624,7 +624,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.26</version>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -736,6 +736,11 @@
<artifactId>jackson-databind</artifactId>
<version>2.9.9</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
</dependency>

<!-- ED25519 -->
<dependency>
Expand Down Expand Up @@ -782,19 +787,19 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.1</version>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.1</version>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.2</version>
<version>3.11.1</version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intend to downgrade these versions?

Copy link
Contributor Author

@semuxgo semuxgo Jul 2, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are version conflicts between dependencies. check mvn dependency:tree -Dverbose

<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/semux/core/TransactionResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import java.util.ArrayList;
import java.util.List;

import org.bouncycastle.util.encoders.Hex;
import org.ethereum.vm.DataWord;
import org.ethereum.vm.LogInfo;
import org.ethereum.vm.OpCode;
import org.ethereum.vm.program.InternalTransaction;
import org.semux.Network;
import org.semux.crypto.Hex;
import org.semux.util.Bytes;
import org.semux.util.SimpleDecoder;
import org.semux.util.SimpleEncoder;
Expand Down Expand Up @@ -419,7 +419,7 @@ public byte[] toBytesForMerkle() {

@Override
public String toString() {
return "TransactionResult [code=" + code + ", returnData=" + Hex.toHexString(returnData) + ", # logs="
return "TransactionResult [code=" + code + ", returnData=" + Hex.encode(returnData) + ", # logs="
+ logs.size() + "]";
}
}
16 changes: 8 additions & 8 deletions src/main/java/org/semux/core/Wallet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,17 +689,17 @@ public Key addAccountWithNextHdKey() {
requireHdWalletInitialized();

synchronized (accounts) {
HdKeyPair rootAddress = BIP_44.getRootAddressFromSeed(hdSeed, KeyVersion.MAINNET, CoinType.SEMUX);
HdKeyPair address = BIP_44.getAddress(rootAddress, nextHdAccountIndex++);
Key newKey = Key.fromRawPrivateKey(address.getPrivateKey().getPrivateKey());
HdKeyPair rootKey = BIP_44.getRootKeyPairFromSeed(hdSeed, KeyVersion.MAINNET, CoinType.SEMUX_SLIP10);
HdKeyPair key = BIP_44.getChildKeyPair(rootKey, nextHdAccountIndex++);
Key newKey = Key.fromRawPrivateKey(key.getPrivateKey().getKeyData());
ByteArray to = ByteArray.of(newKey.toAddress());

// put the accounts into
accounts.put(to, newKey);

// set a default alias
if (!aliases.containsKey(to)) {
setAddressAlias(newKey.toAddress(), getAliasFromPath(address.getPath()));
setAddressAlias(newKey.toAddress(), getAliasFromPath(key.getPath()));
}

return newKey;
Expand All @@ -723,17 +723,17 @@ public int scanForHdKeys(AccountState accountState) {
found++;
}

HdKeyPair rootAddress = BIP_44.getRootAddressFromSeed(hdSeed, getKeyVersion(network), CoinType.SEMUX);
HdKeyPair rootAddress = BIP_44.getRootKeyPairFromSeed(hdSeed, getKeyVersion(network), CoinType.SEMUX_SLIP10);

nextHdAccountIndex = 0;

int start = nextHdAccountIndex;
int endIndex = start + MAX_HD_WALLET_SCAN_AHEAD;

for (int i = start; i < endIndex; i++) {
HdKeyPair address = BIP_44.getAddress(rootAddress, i);
HdKeyPair childKey = BIP_44.getChildKeyPair(rootAddress, i);

Key key = Key.fromRawPrivateKey(address.getPrivateKey().getPrivateKey());
Key key = Key.fromRawPrivateKey(childKey.getPrivateKey().getKeyData());
boolean isUsedAccount = isUsedAccount(accountState, key.toAddress());

ByteArray to = ByteArray.of(key.toAddress());
Expand All @@ -743,7 +743,7 @@ public int scanForHdKeys(AccountState accountState) {
endIndex += MAX_HD_WALLET_SCAN_AHEAD;
if (addAccount(key)) {
if (!aliases.containsKey(to)) {
aliases.put(to, address.getPath());
aliases.put(to, childKey.getPath());
}
found++;
}
Expand Down
14 changes: 2 additions & 12 deletions src/main/java/org/semux/crypto/Key.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import java.util.Arrays;
import java.util.Collection;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.semux.crypto.cache.PublicKeyCache;
import org.semux.util.Bytes;
import org.semux.util.SystemUtil;
Expand Down Expand Up @@ -346,20 +344,12 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass())
return false;

Signature signature = (Signature) o;

return new EqualsBuilder()
.append(s, signature.s)
.append(a, signature.a)
.isEquals();
return Arrays.equals(toBytes(), ((Signature) o).toBytes());
}

@Override
public int hashCode() {
return new HashCodeBuilder(17, 37)
.append(s)
.append(a)
.toHashCode();
return Arrays.hashCode(toBytes());
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/semux/crypto/bip32/CoinType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
public enum CoinType {
BITCOIN(Scheme.BIP32, 0, false),

SEMUX(Scheme.SLIP10_ED25519, 7562605, true);
SEMUX_SLIP10(Scheme.SLIP10_ED25519, 7562605, true),

SEMUX(Scheme.BIP32_ED25519, 7562605, false);

private final Scheme scheme;
private final long coinType;
Expand Down
Loading