Merge pull request #2 from cawfree/develop

0.1.1

Author: cawfree

.gitignore

@@ -1,6 +1,7 @@
 # OSX
 #
 .DS_Store
+android/src/main/java/io/github/cawfree/web3/javac*
 
 # node.js
 #

README.md

@@ -1,8 +1,8 @@
-<p align="center">
+<div align="center">
  <a href="https://github.com/cawfree/web3-react-native" alt="web3-react-native">
- <img src="./public/logo.png" width="640" height="452" />
+ <img src="./public/logo.png" width="320" height="226" />
  </a>
-</p>
+</div>
 
 # web3-react-native
 [**Web3**](https://web3js.readthedocs.io/en/v1.2.6/) Native Modules for [**React Native**](https://reactnative.dev/).
@@ -35,6 +35,14 @@ pod 'web3swift', '2.2.1', :modular_headers => true
 > ⚠️ This is an ugly workaround for existing definition constraints in the [Podspec](https://github.com/cawfree/web3-react-native/blob/63664f366c436aed73083b6b0a5cbf0b7374bfd3/web3-react-native.podspec#L26). ([View Issue](https://github.com/cawfree/web3-react-native/issues/1)).
 
 ### Android
+In your app's `AndroidManifest.xml`, [you need to](https://github.com/web3j/web3j/issues/915) enable [`android:largeHeap](https://developer.android.com/guide/topics/manifest/application-element)` under the `<application>` tag:
+
+```diff
+ <application
++ android:largeHeap="true"
+ />
+```
+
 Perform a rebuild of your compiled application by calling `react-native run-android`.
 
 For usage details, please see the [**documentation**](./docs).

android/src/main/java/io/github/cawfree/web3/BundleJSONConverter.java

@@ -0,0 +1,201 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+ * copy, modify, and distribute this software in source code or binary form for use
+ * in connection with the web services and APIs provided by Facebook.
+ *
+ * As with any software that integrates with the Facebook platform, your use of
+ * this software is subject to the Facebook Developer Principles and Policies
+ * [http://developers.facebook.com/policy/]. This copyright notice shall be
+ * included in all copies or substantial portions of the software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package io.github.cawfree.web3;
+
+import android.os.Bundle;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.*;
+
+/**
+ * com.facebook.internal is solely for the use of other packages within the Facebook SDK for
+ * Android. Use of any of the classes in this package is unsupported, and they may be modified or
+ * removed without warning at any time.
+ *
+ * A helper class that can round trip between JSON and Bundle objects that contains the types:
+ * Boolean, Integer, Long, Double, String
+ * If other types are found, an IllegalArgumentException is thrown.
+ */
+public class BundleJSONConverter {
+ private static final Map<Class<?>, Setter> SETTERS = new HashMap<Class<?>, Setter>();
+
+ static {
+ SETTERS.put(Boolean.class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ bundle.putBoolean(key, (Boolean) value);
+ }
+
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ json.put(key, value);
+ }
+ });
+ SETTERS.put(Integer.class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ bundle.putInt(key, (Integer) value);
+ }
+
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ json.put(key, value);
+ }
+ });
+ SETTERS.put(Long.class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ bundle.putLong(key, (Long) value);
+ }
+
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ json.put(key, value);
+ }
+ });
+ SETTERS.put(Double.class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ bundle.putDouble(key, (Double) value);
+ }
+
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ json.put(key, value);
+ }
+ });
+ SETTERS.put(String.class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ bundle.putString(key, (String) value);
+ }
+
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ json.put(key, value);
+ }
+ });
+ SETTERS.put(String[].class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ throw new IllegalArgumentException("Unexpected type from JSON");
+ }
+
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ JSONArray jsonArray = new JSONArray();
+ for (String stringValue : (String[])value) {
+ jsonArray.put(stringValue);
+ }
+ json.put(key, jsonArray);
+ }
+ });
+
+ SETTERS.put(JSONArray.class, new Setter() {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException {
+ JSONArray jsonArray = (JSONArray)value;
+ ArrayList<String> stringArrayList = new ArrayList<String>();
+ // Empty list, can't even figure out the type, assume an ArrayList<String>
+ if (jsonArray.length() == 0) {
+ bundle.putStringArrayList(key, stringArrayList);
+ return;
+ }
+
+ // Only strings are supported for now
+ for (int i = 0; i < jsonArray.length(); i++) {
+ Object current = jsonArray.get(i);
+ if (current instanceof String) {
+ stringArrayList.add((String)current);
+ } else {
+ throw new IllegalArgumentException("Unexpected type in an array: " + current.getClass());
+ }
+ }
+ bundle.putStringArrayList(key, stringArrayList);
+ }
+
+ @Override
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException {
+ throw new IllegalArgumentException("JSONArray's are not supported in bundles.");
+ }
+ });
+ }
+
+ public interface Setter {
+ public void setOnBundle(Bundle bundle, String key, Object value) throws JSONException;
+ public void setOnJSON(JSONObject json, String key, Object value) throws JSONException;
+ }
+
+ public static JSONObject convertToJSON(Bundle bundle) throws JSONException {
+ JSONObject json = new JSONObject();
+
+ for(String key : bundle.keySet()) {
+ Object value = bundle.get(key);
+ if (value == null) {
+ // Null is not supported.
+ continue;
+ }
+
+ // Special case List<String> as getClass would not work, since List is an interface
+ if (value instanceof List<?>) {
+ JSONArray jsonArray = new JSONArray();
+ @SuppressWarnings("unchecked")
+ List<String> listValue = (List<String>)value;
+ for (String stringValue : listValue) {
+ jsonArray.put(stringValue);
+ }
+ json.put(key, jsonArray);
+ continue;
+ }
+
+ // Special case Bundle as it's one way, on the return it will be JSONObject
+ if (value instanceof Bundle) {
+ json.put(key, convertToJSON((Bundle)value));
+ continue;
+ }
+
+ Setter setter = SETTERS.get(value.getClass());
+ if (setter == null) {
+ throw new IllegalArgumentException("Unsupported type: " + value.getClass());
+ }
+ setter.setOnJSON(json, key, value);
+ }
+
+ return json;
+ }
+
+ public static Bundle convertToBundle(JSONObject jsonObject) throws JSONException {
+ Bundle bundle = new Bundle();
+ @SuppressWarnings("unchecked")
+ Iterator<String> jsonIterator = jsonObject.keys();
+ while (jsonIterator.hasNext()) {
+ String key = jsonIterator.next();
+ Object value = jsonObject.get(key);
+ if (value == null || value == JSONObject.NULL) {
+ // Null is not supported.
+ continue;
+ }
+
+ // Special case JSONObject as it's one way, on the return it would be Bundle.
+ if (value instanceof JSONObject) {
+ bundle.putBundle(key, convertToBundle((JSONObject)value));
+ continue;
+ }
+
+ Setter setter = SETTERS.get(value.getClass());
+ if (setter == null) {
+ throw new IllegalArgumentException("Unsupported type: " + value.getClass());
+ }
+ setter.setOnBundle(bundle, key, value);
+ }
+
+ return bundle;
+ }
+}

android/src/main/java/io/github/cawfree/web3/Web3Module.java

@@ -22,13 +22,20 @@
 
 import org.json.JSONObject;
 
+import java.security.Security;
+import java.security.Provider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.FileWriter;
+import java.io.FileReader;
+import java.io.BufferedReader;
 import java.util.UUID;
 import java.util.Map;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.lang.StringBuilder;
 
 // TODO: Remove this!
 import android.util.Log;
@@ -49,6 +56,16 @@ private static final void debug(final String pString) {
  /* Member Variables. */
  private final Map<String, Credentials> mWallets;
 
+ // https://github.com/web3j/web3j/issues/915#issuecomment-483145928
+ private static final void setupBouncyCastle() {
+ final Provider p = Security.getProvider(BouncyCastleProvider.PROVIDER_NAME);
+ if (p == null || p.getClass().equals(BouncyCastleProvider.class)) {
+ return;
+ }
+ Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+ Security.insertProviderAt(new BouncyCastleProvider(), 1);
+ }
+
  /** Constructor */
  public Web3Module(final ReactApplicationContext pReactApplicationContext) {
  super(pReactApplicationContext);
@@ -59,6 +76,29 @@ public Web3Module(final ReactApplicationContext pReactApplicationContext) {
  /** Module name when imported via NativeModules. **/
  @Override public String getName() { return "Web3"; }
 
+ @ReactMethod
+ public final void createKeystore(final String pPassword, final Promise pPromise) {
+ try {
+ // Setup Bouncy Castle.
+ Web3Module.setupBouncyCastle();
+ // Fetch the cache directory.
+ final File dir = this.getReactApplicationContext().getCacheDir();
+ // Generate the new Wallet.
+ final String name = WalletUtils.generateNewWalletFile(pPassword, dir);
+ final File f = new File(dir.getAbsolutePath() + File.separator + name);
+ // Parse the Keystore into a JSONObject.
+ final JSONObject ks = new JSONObject(Web3Module.readFile(f));
+ // Delete the temporary file.
+ f.delete();
+ // Propagate the keystore back to the caller.
+ pPromise.resolve(Arguments.fromBundle(new BundleJSONConverter().convertToBundle(ks)));
+ }
+ catch (final Exception pException) {
+ pPromise.reject(pException);
+ }
+ return;
+ }
+
  @ReactMethod
  public final void loadWallet(final ReadableMap pKeystore, final String pPassword, final Promise pPromise) {
  try {
@@ -109,25 +149,39 @@ public final void sendFunds(final ReadableMap pWallet, final String pUrl, final
  return;
  }
 
+ /** Reads the string contents of a File. **/
+ private static final String readFile(final File pFile) throws IOException {
+ final StringBuilder sb = new StringBuilder();
+ final BufferedReader br = new BufferedReader(new FileReader(pFile)); 
+ String s;
+ while ((s = br.readLine()) != null) {
+ sb.append(s);
+ sb.append('\n');
+ }
+ br.close();
+ return sb.toString();
+ }
+
  /** Writes string contents to a designated File. **/
- private void writeFile(final File pFile, final String pContent) throws IOException {
+ private static final void writeFile(final File pFile, final String pContent) throws IOException {
  final FileWriter fw = new FileWriter(pFile, true);
  fw.write(pContent);
  // XXX: Ensure all of the bytes are written.
  fw.flush();
  fw.close();
  }
 
+ /** Creates a temporary file reference. **/
+ private final File createTempFile() throws IOException {
+ return File.createTempFile(UUID.randomUUID().toString(), "json", this.getReactApplicationContext().getCacheDir());
+ }
+
  /** Adds a Wallet to the in-memory map. */
  private final String addWallet(final ReadableMap pKeystore, final String pPassword) throws IOException, CipherException {
- final File f = File.createTempFile(
- UUID.randomUUID().toString(),
- "json",
- this.getReactApplicationContext().getCacheDir()
- );
+ final File f = this.createTempFile(); 
  // XXX: Write the supplied data to a temporary file.
  // TODO: Use loadJsonCredentials.
- this.writeFile(f, new JSONObject(pKeystore.toHashMap()).toString());
+ Web3Module.writeFile(f, new JSONObject(pKeystore.toHashMap()).toString());
 
  // Load the Credentials.
  final Credentials c = WalletUtils.loadCredentials(pPassword, f.getAbsolutePath());