mobile: Update bundle miner methods to allocate/deallocate ctxs (#18)

* mobile: Update bundle miner methods to allocate/deallocate ctxs * mobile: Update demo apps * mobile: Deallocate ctxs before if statement
iotaledger · Mar 5, 2020 · 16e8cd9 · 16e8cd9
1 parent 143c7d3
commit 16e8cd9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/mobile/android/Interface.cpp b/mobile/android/Interface.cpp
@@ -242,12 +242,20 @@ JNIEXPORT jlong JNICALL Java_org_iota_mobile_Interface_bundle_1miner_1mine(
   byte_t const* bundleNormalizedMax = (byte_t*)env->GetByteArrayElements(jbundleNormalizedMax, 0);
   trit_t* essence = (trit_t*)env->GetByteArrayElements(jessence, 0);
 
-  ret = bundle_miner_mine(bundleNormalizedMax, jsecurity, essence, jessenceLength, jcount, jnprocs, jminingThreshold,
-                          jfullySecure, &index);
+  bundle_miner_ctx_t* ctxs = NULL;
+  size_t num_ctxs = 0;
+  bool found_optimal_index = false;
+
+  bundle_miner_allocate_ctxs(jnprocs, &ctxs, &num_ctxs);
+
+  ret = bundle_miner_mine(bundleNormalizedMax, jsecurity, essence, jessenceLength, jcount, jminingThreshold,
+                          jfullySecure, &index, ctxs, num_ctxs, &found_optimal_index);
 
   env->ReleaseByteArrayElements(jbundleNormalizedMax, (jbyte*)bundleNormalizedMax, 0);
   env->ReleaseByteArrayElements(jessence, (jbyte*)essence, 0);
 
+  bundle_miner_deallocate_ctxs(&ctxs);
+
   if (ret != RC_OK) {
     return -1;
   }

diff --git a/mobile/android/demo/DummyActivity.java b/mobile/android/demo/DummyActivity.java
@@ -3,10 +3,17 @@
 import android.os.*;
 import android.app.*;
 import android.util.Log;
+import java.util.Arrays;
 
 
 public class DummyActivity extends Activity{
     public final String TX_TRYTES = "XYIUIABLAEBBFCTMDCGPVNCQELHIEBVNRPWBSCABWRAVGVOVMFEHWJCUILYIXOPJNASEOHXPJBXFNHHSWEKEGEEFSAZDENWMOAXGJCQZQDGSTTMNQPYJBLRVY9T9HSQNXWYCSMLEXVWCASQ9MHPMBZ9PSSZEKCXYLDYKTOVAWQXOTGMWHUIACLUTAIKUIXZND9YMQKZBTIWOUIVQWTSBNVDCUWYP9HDMQPTXWEQYXVEOFXVGQSBHGHMKVFZZQIALVLMINZGNLEAOCQZFHPTQTQXGZQJLTBFPLWTESFYOJNJGJRYWHPEBSPSXEWCITXBJBMXDFCUDUKKGZMDOOPIBJLC9GPIBTLVQWPGTADEXNI9SWJNJXKXIJCPMICHBIFRXVWNJDP9BDELH9NOMJKGEBOCLWEXPEBFBWQLHFWQVCFIPVUXNREWXTCTFQHZYTMSUXQZTJQOWZZZCFIJ9NFXVSDFEXLODNJFREDOQ9WLLQAKRYKUCGUYEFICOLCKZHWFCLFGLKORFQFZXZXTEXWGRJPZ99KAJYFDWZNMBKQXOLRCAPDZWTZIMSUDSNDTKJLKJWFCTHZFYFW9EF9T9OGNFBNCRDDTRQUBIBSIWJNRAFXG9UDRGSXDQ9OKAREHQOCXSULYOA9IWJOYGWYOZGVQUDNBZXHZBCCBQ9PPKIKSWLNLPRSRRYLGCQIJKYNTAJBGPAOYWIUOIR9WOQYLSQYPWKUWBD9AUVZZT9KWUNQZYLOKTWRVJDVJSDBO9XYEGJIZWRMU9SRUVGMZUX9BXACUDYNXXRTYN9UVLJUIJGNAHVWSWRFHKIXTYINVHFHGXJVVJFLFTJR9LPZCJPHQOZQRXFJPYIHCVBXCIXZFPCC9RYLOYMBXDTRDEDWPZMZYIKGTXAQYJVEFDSF9QWROXAJS9ZPAWHLKIEKUPFKXOGLUYXCQNVVBYEJG9STYYRHKAOOID9UDPCMSBOVKWXCTSRSBKOZIIUDAABKXIBIDNTXZWLITYANTGVRYBEOZAOEWGPGLKGICMPADAEHHOCUSKXBKO9REVSI9FDFDCPMUGCLJVNHMHWHAIURTWDTSHMOPVVMGWLECCPXHAAQRCDCUWDVMBRLMQYTY9PLIFIUNXZUNY9UIVHBZKMNYOPRSIKBKWDDOYJQWCSPFBLODZVAPGWHJJKOBYETEUUPJDIFLWUCMYWEUSZLWANGHYSNUXJAPFZJADQWAZCOYXWJAQCYWFBRNXJRHMIUFEROW9Z9QJAPFDIRUUTD9RPZYFD9PRPU9YVGIQMHNEYVDLEIESZEO9QLOLNHSVNGNZFHODQXXX9K9NAUDG9UENCXFTS9FQXVXJYIVBL9OPHXTPCWKEDMXXJQLXHBNTNVWHGFNNXAEKGHSBGCQFFIIRKMSYRXBCDTUCJESVXJGZTHUJWGWDD9MDXBCXEPBMDZEVUGIXHVCGDFVOYY9QEJJYQALKJWFKMYSKZRXQNGI9MC9FLSIYER9BZGDXGZUAMBZFJLWNBKMWWOSUE9XGOUPDDSCJWN9PJD9LKUVVYHCRBBBABVKZJOXFGCRXXDEGLGYDXLFFPWFNCGCRPKGSEXQNONXKJWDGTFZWWOSK9TKUTHGHBNLQADQ9QS9XLNRVUMSRFVYVSEQEGGTOWHUMZUEVQEROFMYLXYXU9GUJSQFSMMVHQS9SVIH9X9RNORYZOLIIA9RWAUFWDKQXRAHPALEW9LDXZFSRDCPYVSSXGOEPSVZCVWXDXVJKDWUBGQEUGNAUD9GNEQEVXXLTNVBIWJLLBCTFZWODFLIIDSNUPDJRHNPH9NBOKOVXCGEEZA9ZWKRNBL9XOOPF9OCP9VORMMVSIASCEAUVVJHBLWLHDHWVJDDTEBFIKHOEVIIDJXA9MTLUSZVPJPHLRASOAGNNPQYIAZVKTROQXISIALDESIHLNREAAPXCFU9AZTORQGYCFWVFHFQMAJPUSYVAEERWGQSKYFZJPWMOAEWXTUEGIDOSSCLBFLMBIZHYIQWSCNPZUTTSKCZXDSELK9KSBHTDSUID9LMBMYXQFAWBBRHFKMMBPTFKDNLQSZAMHMYASZXXKHXKPH9TOHVZUOXDCFHBDNAQEVOQQUGKEW9YQBZWMSVTJGNVUN9TUVYJ9XECFMVIIFTNSNBCUA9TOHPHAYDSAWJTJANNPZELFSWMVLBRUKJDT9B9VWCXBMUDNLVDEEWQRITLOTFLVOUDQGEEXK9CO9DCMNDY9VZUGMLVFKLUBNSQOABRDMIWVYGMENSBHUOMGIJ9MNKLST999999999999999999999999999999999999999999999999UMJOPYD99A99999999C99999999WUIHHDPDFBHIQLKEFLUOKIOVFOCPFPWBKUCCGA9YUUEPTLUXRLZHVKEOLJQWHBOLSCWKVXCOBSVJHY9YXDMTFSSWIPNAYXJPQNQCZAIT9ADYOLDXZVBTEUWMVYOOODSCPKAWWHOFQTLZKRPURYBMCU9YHSIYQZ9999W9VELHQPPERYSG9ZLLAHQKDLJQBKYYZOSRQOESEELED9CZHBLAMALTJJZAFWNMWGAAUFJMNQDGKVA9999999999999999999999999999999HDU9RGVJE999999999MMMMMMMMMDC99999999OKGA9999999999999";
+
+    public final byte[] BUNDLE_NORMALIZED_MAX = new byte[] {13, 13, 13, 13, 13, 11, -7,  -3, 6, 4,  9,  11, 13, -7, 5,  5,  9, -9, 1,  5,  -4,
+                                        9,  0,  -8, -9, 6,  10, 13,  11, 8, 2,  7,  13, 1,  6,  -1, 6,  7, 6,  7,  11, 4,
+                                        -1, 4,  -3, 11, -8, 6,  -1,  1,  0, 1,  10, 8,  13, 13, 1,  2,  7, 7,  11, 9,  10,
+                                        1,  -5, 1,  12, 11, 13, -10, 12, 5, 12, 0,  -5, 2,  -8, 6,  11, 6, 5};
+
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
@@ -27,5 +34,16 @@ public void onCreate(Bundle savedInstanceState)
     String signature = Interface.iota_sign_signature_gen_trytes(SEED, 2, 2, SEED);
     Log.e("IOTA", "Seed: " + SEED);
     Log.e("IOTA", "Calculated signature: " + signature);
+
+    Log.e("IOTA", "Starting Bundle Miner");
+    byte[] essence = new byte[486 * 4];
+    Arrays.fill(essence, (byte) 0);
+    int essenceLength = 486 * 4;
+    // Basically UINT32_MAX
+    int miningThreshold = (int) 4294967295L;
+    long index = Interface.bundle_miner_mine(BUNDLE_NORMALIZED_MAX, 2, essence, essenceLength, 1000000, 0, miningThreshold, false);
+    Log.e("IOTA", "Calculated index: " + index);
+
+
   }
 }
diff --git a/mobile/ios/Demo/Demo/ViewController.m b/mobile/ios/Demo/Demo/ViewController.m
@@ -86,7 +86,9 @@ - (void)viewDidLoad {
                                                           essence:essence
                                                     essenceLength:essenceLength
                                                             count:@1000000
-                                                           nprocs:@0];
+                                                           nprocs:@0
+                                                  miningThreshold:@(UINT32_MAX)
+                                                      fullySecure:NO];
   NSLog(@"Calculated bundle index: %@ ", bundleIndex);
   NSDate* endBundleMiner = [NSDate date];
   NSTimeInterval durationBundleMiner = [endBundleMiner timeIntervalSinceDate:startBundleMiner] * 1000;

diff --git a/mobile/ios/Interface.mm b/mobile/ios/Interface.mm
@@ -109,10 +109,18 @@ + (NSNumber*)bundle_miner_mine:(int8_t*)bundleNormalizedMax
 
   byte_t const* cbundleNormalizedMax = (byte_t*)bundleNormalizedMax;
 
+  bundle_miner_ctx_t* ctxs = NULL;
+  size_t num_ctxs = 0;
+  bool found_optimal_index = false;
+
+  bundle_miner_allocate_ctxs((uint8_t)[nprocs unsignedCharValue], &ctxs, &num_ctxs);
+
   retcode_t rc = bundle_miner_mine(cbundleNormalizedMax, (uint8_t)[security unsignedCharValue], (trit_t*)essence,
                                    (size_t)[essenceLength unsignedLongValue], (uint32_t)[count unsignedIntValue],
-                                   (uint8_t)[nprocs unsignedCharValue], (uint32_t)[miningThreshold unsignedIntValue],
-                                   fullySecure, &cindex);
+                                   (uint32_t)[miningThreshold unsignedIntValue], fullySecure, &cindex, ctxs, num_ctxs,
+                                   &found_optimal_index);
+
+  bundle_miner_deallocate_ctxs(&ctxs);
 
   if (rc != RC_OK) {
     return @(-1);