Skip to content

Dg 357 #1

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

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Dg 357 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ebaca
Clean up
chrismcgregor Apr 19, 2018
c55e08f
UPdated for JNI and Number package
gregmcgregor Apr 30, 2018
e2622db
Updated for JNI, removed C++ extensions and comments
gregmcgregor Apr 30, 2018
b13ba2e
Updated for JNI to compile
gregmcgregor Apr 30, 2018
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
205 changes: 93 additions & 112 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dispatch-labs-java-sdk.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:24.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
Expand All @@ -23,6 +22,7 @@
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
<orderEntry type="library" name="Maven: com.madgag.spongycastle:core:1.58.0.0" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" level="project" />
Expand Down
15 changes: 7 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,6 @@

<dependencies>

<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.59</version>
</dependency>

<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
Expand All @@ -133,13 +126,19 @@
<version>24.1-jre</version>
</dependency>


<dependency>
<groupId>com.madgag.spongycastle</groupId>
<artifactId>core</artifactId>
<version>1.58.0.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.59</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions secp256k1/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ AC_ARG_ENABLE(ecmult_static_precomputation,
AC_ARG_ENABLE(module_ecdh,
AS_HELP_STRING([--enable-module-ecdh],[enable ECDH shared secret computation (experimental)]),
[enable_module_ecdh=$enableval],
[enable_module_ecdh=no])
[enable_module_ecdh=yes])

AC_ARG_ENABLE(module_recovery,
AS_HELP_STRING([--enable-module-recovery],[enable ECDSA pubkey recovery module (default is no)]),
Expand All @@ -137,7 +137,7 @@ AC_ARG_ENABLE(module_recovery,
AC_ARG_ENABLE(jni,
AS_HELP_STRING([--enable-jni],[enable libsecp256k1_jni (default is no)]),
[use_jni=$enableval],
[use_jni=no])
[use_jni=yes])

AC_ARG_WITH([field], [AS_HELP_STRING([--with-field=64bit|32bit|auto],
[Specify Field Implementation. Default is auto])],[req_field=$withval], [req_field=auto])
Expand Down
4 changes: 1 addition & 3 deletions secp256k1/src/java/org_bitcoin_NativeSecp256k1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ JNIEXPORT jbyteArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1sign_1a
const unsigned char* privateKey = (unsigned char*) buffer;
const unsigned char* hash = (unsigned char*) (buffer + 32);

// Create signature.
secp256k1_ecdsa_recoverable_signature sigstruct;
int ret = secp256k1_ecdsa_sign_recoverable(context, &sigstruct, hash, privateKey, NULL, NULL);
if (ret != 1) {
return NULL;
}

// Serialize and compact signature.
unsigned char signature[65];
int recid;
ret = secp256k1_ecdsa_recoverable_signature_serialize_compact(context, &signature[0], &recid, &sigstruct);
Expand All @@ -40,4 +38,4 @@ JNIEXPORT jbyteArray JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1sign_1a
jbyteArray jByteArray = (*env)->NewByteArray(env, 65);
(*env)->SetByteArrayRegion(env, jByteArray, 0, 65, (jbyte*)signature);
return jByteArray;
}
}
6 changes: 3 additions & 3 deletions src/main/java/dispatchlabs/Sdk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ private Map<String, String> getHeaders() throws Exception {
public static void main(String args[]) {
System.out.println("Dispatch Labs SDK Example");
try {
Sdk sdk = new Sdk("10.0.1.2");
Sdk sdk = new Sdk("127.0.0.1");
List<Contact> contacts = sdk.getDelegates();
Account fromAccount = sdk.createAccount();
Account genesisAccount = sdk.createAccount();
Account toAccount = sdk.createAccount();
Receipt receipt = sdk.transferTokens(contacts.get(0), fromAccount, toAccount, 45);
Receipt receipt = sdk.transferTokens(contacts.get(0), genesisAccount, toAccount, 45);
System.out.println(receipt.getStatus());

// Pending?
Expand Down