_

avoid NVM writes (to improve login speed with Keycard)

android/build.gradle

@@ -23,6 +23,11 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 repositories {
@@ -41,5 +46,5 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
     implementation 'org.apache.commons:commons-lang3:3.9'
-    implementation 'com.github.status-im.status-keycard-java:android:2.2.1'
+    implementation 'com.github.status-im.status-keycard-java:android:3.0.1'
 }

android/src/main/java/im/status/ethereum/keycard/RNStatusKeycardModule.java

@@ -148,13 +148,17 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
 
     @ReactMethod
     public void saveMnemonic(final String mnemonic, final String pairing, final String pin, final Promise promise) {
-        try {
-            smartCard.saveMnemonic(mnemonic, pairing, pin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.saveMnemonic(mnemonic, pairing, pin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
@@ -173,25 +177,48 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
 
     @ReactMethod
     public void deriveKey(final String path, final String pairing, final String pin, final Promise promise) {
-        try {
-            smartCard.deriveKey(path, pairing, pin);
-            promise.resolve(path);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.deriveKey(path, pairing, pin);
+                    promise.resolve(path);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void exportKey(final String pairing, final String pin, final Promise promise) {
-        try {
-            promise.resolve(smartCard.exportKey(pairing, pin));
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.exportKey(pairing, pin));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
+    @ReactMethod
+    public void exportKeyWithPath(final String pairing, final String pin, final String path, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.exportKeyWithPath(pairing, pin, path));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+
     @ReactMethod
     public void getKeys(final String pairing, final String pin, final Promise promise) {
         new Thread(new Runnable() {
@@ -220,6 +247,34 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
+    @ReactMethod
+    public void signWithPath(final String pairing, final String pin, final String path, final String hash, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.signWithPath(pairing, pin, path, hash));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void signPinless(final String hash, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.signPinless(hash));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
     @ReactMethod
     public void installApplet(final Promise promise) {
         final ReactContext ctx = this.reactContext;
@@ -254,96 +309,127 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
                 }
-
             }
         }).start();
     }
 
     @ReactMethod
     public void verifyPin(final String pairing, final String pin, final Promise promise) {
-        try {
-            promise.resolve(smartCard.verifyPin(pairing, pin));
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.verifyPin(pairing, pin));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void changePin(final String pairing, final String currentPin, final String newPin, final Promise promise) {
-        try {
-            smartCard.changePin(pairing, currentPin, newPin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.changePin(pairing, currentPin, newPin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void unblockPin(final String pairing, final String puk, final String newPin, final Promise promise) {
-        try {
-            smartCard.unblockPin(pairing, puk, newPin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.unblockPin(pairing, puk, newPin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void unpair(final String pairing, final String pin, final Promise promise) {
-        try {
-            smartCard.unpair(pairing, pin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.unpair(pairing, pin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void delete(final Promise promise) {
-        try {
-            smartCard.delete();
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.delete();
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void removeKey(final String pairing, final String pin, final Promise promise) {
-        try {
-            smartCard.removeKey(pairing, pin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.removeKey(pairing, pin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void removeKeyWithUnpair(final String pairing, final String pin, final Promise promise) {
-        try {
-            smartCard.removeKeyWithUnpair(pairing, pin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.removeKeyWithUnpair(pairing, pin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
     @ReactMethod
     public void unpairAndDelete(final String pairing, final String pin, final Promise promise) {
-        try {
-            smartCard.unpairAndDelete(pairing, pin);
-            promise.resolve(true);
-        } catch (IOException | APDUException e) {
-            Log.d(TAG, e.getMessage());
-            promise.reject(e);
-        }
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.unpairAndDelete(pairing, pin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
     }
 
-}
+}

android/src/main/java/im/status/ethereum/keycard/SmartCard.java

@@ -31,6 +31,7 @@ import im.status.keycard.android.NFCCardManager;
 import im.status.keycard.applet.ApplicationStatus;
 import im.status.keycard.applet.BIP32KeyPair;
 import im.status.keycard.applet.Mnemonic;
+import im.status.keycard.applet.CashCommandSet;
 import im.status.keycard.applet.KeycardCommandSet;
 import im.status.keycard.applet.Pairing;
 import im.status.keycard.applet.ApplicationInfo;
@@ -48,6 +49,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
     private static final String TAG = "SmartCard";
     private Boolean started = false;
 
+    private static final String MASTER_PATH = "m";
+    private static final String ROOT_PATH = "m/44'/60'/0'/0";
     private static final String WALLET_PATH = "m/44'/60'/0'/0/0";
     private static final String WHISPER_PATH = "m/43'/60'/1581'/0'/0";
     private static final String ENCRYPTION_PATH = "m/43'/60'/1581'/1'/0";
@@ -107,9 +110,13 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         boolean on = false;
         switch (state) {
             case NfcAdapter.STATE_ON:
+                eventEmitter.emit("keyCardOnNFCEnabled", null);
                 log("NFC ON");
+                break;
             case NfcAdapter.STATE_OFF:
+                eventEmitter.emit("keyCardOnNFCDisabled", null);
                 log("NFC OFF");
+                break;
             default:
                 log("other");
         }
@@ -274,8 +281,10 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         KeyPath currentPath = new KeyPath(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_KEY_PATH).checkOK().getData());
         Log.i(TAG, "Current key path: " + currentPath);
 
-        cmdSet.deriveKey(path).checkOK();
-        Log.i(TAG, "Derived " + path);
+        if (!currentPath.toString().equals(path)) {
+            cmdSet.deriveKey(path).checkOK();
+            Log.i(TAG, "Derived " + path);
+        }
     }
 
     public String exportKey(final String pairingBase64, final String pin) throws IOException, APDUException {
@@ -296,6 +305,24 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return Hex.toHexString(key);
     }
 
+    public String exportKeyWithPath(final String pairingBase64, final String pin, final String path) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
+        cmdSet.select().checkOK();
+
+        Pairing pairing = new Pairing(pairingBase64);
+        cmdSet.setPairing(pairing);
+
+        cmdSet.autoOpenSecureChannel();
+        Log.i(TAG, "secure channel opened");
+
+        cmdSet.verifyPIN(pin).checkOK();
+        Log.i(TAG, "pin verified");
+
+        byte[] key = BIP32KeyPair.fromTLV(cmdSet.exportKey(path, false, true).checkOK().getData()).getPublicKey();
+
+        return Hex.toHexString(key);
+    }
+
     public WritableMap getKeys(final String pairingBase64, final String pin) throws IOException, APDUException {
         KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
         cmdSet.select().checkOK();
@@ -309,20 +336,36 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         cmdSet.verifyPIN(pin).checkOK();
         Log.i(TAG, "pin verified");
 
-        byte[] tlv = cmdSet.exportKey(WALLET_PATH, true, true).checkOK().getData();
-        BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlv);
+        byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
+        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
 
-        byte[] tlv2 = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
-        BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlv2);
+        byte[] tlvMaster = cmdSet.exportKey(MASTER_PATH, false, true).checkOK().getData();
+        BIP32KeyPair masterPair = BIP32KeyPair.fromTLV(tlvMaster);
 
-        byte[] tlv3 = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
-        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlv3);
+        byte[] tlvRoot = cmdSet.exportKey(ROOT_PATH, false, true).checkOK().getData();
+        BIP32KeyPair keyPair = BIP32KeyPair.fromTLV(tlvRoot);
+
+        byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
+        BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper);
+
+        byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, true, true).checkOK().getData();
+        BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlvWallet);
+
+        ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
 
         WritableMap data = Arguments.createMap();
+        data.putString("address", Hex.toHexString(masterPair.toEthereumAddress()));
+        data.putString("public-key", Hex.toHexString(masterPair.getPublicKey()));
+        data.putString("wallet-root-address", Hex.toHexString(keyPair.toEthereumAddress()));
+        data.putString("wallet-root-public-key", Hex.toHexString(keyPair.getPublicKey()));
         data.putString("wallet-address", Hex.toHexString(walletKeyPair.toEthereumAddress()));
+        data.putString("wallet-public-key", Hex.toHexString(walletKeyPair.getPublicKey()));
+        data.putString("whisper-address", Hex.toHexString(whisperKeyPair.toEthereumAddress()));
         data.putString("whisper-public-key", Hex.toHexString(whisperKeyPair.getPublicKey()));
         data.putString("whisper-private-key", Hex.toHexString(whisperKeyPair.getPrivateKey()));
         data.putString("encryption-public-key", Hex.toHexString(encryptionKeyPair.getPublicKey()));
+        data.putString("instance-uid", Hex.toHexString(info.getInstanceUID()));
+        data.putString("key-uid", Hex.toHexString(info.getKeyUID()));
 
         return data;
     }
@@ -343,31 +386,34 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
         BIP32KeyPair keyPair = BIP32KeyPair.fromBinarySeed(seed);
 
-        cmdSet.loadKey(keyPair);
+        cmdSet.loadKey(keyPair).checkOK();
         log("keypair loaded to card");
 
-        cmdSet.deriveKey(WALLET_PATH).checkOK();
-        Log.i(TAG, "Derived " + WALLET_PATH);
+        byte[] tlvRoot = cmdSet.exportKey(ROOT_PATH, false, true).checkOK().getData();
+        Log.i(TAG, "Derived " + ROOT_PATH);
+        BIP32KeyPair rootKeyPair = BIP32KeyPair.fromTLV(tlvRoot);
 
-        byte[] tlv = cmdSet.exportCurrentKey(true).checkOK().getData();
-        BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlv);
-
-        cmdSet.deriveKey(WHISPER_PATH).checkOK();
+        byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
         Log.i(TAG, "Derived " + WHISPER_PATH);
+        BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper);
 
-        byte[] tlv2 = cmdSet.exportCurrentKey(false).checkOK().getData();
-        BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlv2);
-
-        cmdSet.deriveKey(ENCRYPTION_PATH).checkOK();
+        byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
         Log.i(TAG, "Derived " + ENCRYPTION_PATH);
+        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
 
-        byte[] tlv3 = cmdSet.exportCurrentKey(false).checkOK().getData();
-        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlv3);
+        byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, true, true).checkOK().getData();
+        Log.i(TAG, "Derived " + WALLET_PATH);
+        BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlvWallet);
 
         ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
 
         WritableMap data = Arguments.createMap();
+        data.putString("address", Hex.toHexString(keyPair.toEthereumAddress()));
+        data.putString("public-key", Hex.toHexString(keyPair.getPublicKey()));
+        data.putString("wallet-root-address", Hex.toHexString(rootKeyPair.toEthereumAddress()));
+        data.putString("wallet-root-public-key", Hex.toHexString(rootKeyPair.getPublicKey()));
         data.putString("wallet-address", Hex.toHexString(walletKeyPair.toEthereumAddress()));
+        data.putString("wallet-public-key", Hex.toHexString(walletKeyPair.getPublicKey()));
         data.putString("whisper-address", Hex.toHexString(whisperKeyPair.toEthereumAddress()));
         data.putString("whisper-public-key", Hex.toHexString(whisperKeyPair.getPublicKey()));
         data.putString("whisper-private-key", Hex.toHexString(whisperKeyPair.getPrivateKey()));
@@ -527,4 +573,60 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return sig;
     }
 
+    public String signWithPath(final String pairingBase64, final String pin, final String path, final String message) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
+        cmdSet.select().checkOK();
+
+        Pairing pairing = new Pairing(pairingBase64);
+        cmdSet.setPairing(pairing);
+
+        cmdSet.autoOpenSecureChannel();
+        Log.i(TAG, "secure channel opened");
+
+        cmdSet.verifyPIN(pin).checkOK();
+        Log.i(TAG, "pin verified");
+
+        byte[] hash = Hex.decode(message);
+        RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.signWithPath(hash, path, false).checkOK().getData());
+
+        Log.i(TAG, "Signed hash: " + Hex.toHexString(hash));
+        Log.i(TAG, "Recovery ID: " + signature.getRecId());
+        Log.i(TAG, "R: " + Hex.toHexString(signature.getR()));
+        Log.i(TAG, "S: " + Hex.toHexString(signature.getS()));
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        out.write(signature.getR());
+        out.write(signature.getS());
+        out.write(signature.getRecId());
+
+        String sig = Hex.toHexString(out.toByteArray());
+        Log.i(TAG, "Signature: " + sig);
+
+        return sig;
+    }
+
+    public String signPinless(final String message) throws IOException, APDUException {
+        CashCommandSet cmdSet = new CashCommandSet(this.cardChannel);
+        cmdSet.select().checkOK();
+
+        byte[] hash = Hex.decode(message);
+        RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.sign(hash).checkOK().getData());
+
+        Log.i(TAG, "Signed hash: " + Hex.toHexString(hash));
+        Log.i(TAG, "Recovery ID: " + signature.getRecId());
+        Log.i(TAG, "R: " + Hex.toHexString(signature.getR()));
+        Log.i(TAG, "S: " + Hex.toHexString(signature.getS()));
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        out.write(signature.getR());
+        out.write(signature.getS());
+        out.write(signature.getRecId());
+
+        String sig = Hex.toHexString(out.toByteArray());
+        Log.i(TAG, "Signature: " + sig);
+
+        return sig;
+    }
 }

docs/usage.md

@@ -11,10 +11,12 @@ import Keycard from "react-native-status-keycard";
 ```javascript
 import { DeviceEventEmitter } from 'react-native';
 
-// Listen to connect/disconnect events
+// Listen to connect/disconnect and nfc events
 componentDidMount () {
   DeviceEventEmitter.addListener("keyCardOnConnected", () => console.log("keycard connected"));
   DeviceEventEmitter.addListener("keyCardOnDisconnected", () => console.log("keycard disconnected"));
+  DeviceEventEmitter.addListener("keyCardOnNFCEnabled", () => console.log("nfc enabled"));
+  DeviceEventEmitter.addListener("keyCardOnNFCDisabled", () => console.log("nfc disabled"));
 }
 ```
 
@@ -124,7 +126,12 @@ Keycard.generateAndLoadKey(mnemonic, pairing, pin).then(data => console.log(data
 
 `data` object returned:
 ```javascript
-{"wallet-address": "9726cbc67d170307dd80af6416ebe844e7b8eb1c",
+{"address": "a89a57f4d3241e6a123ea332241d6f03790075b4",
+"public-key": "04cccc3998d0e0b8d56b64fad4d1f025914b8cb72558810c74dd34454fcd6907f6f7429a0726dceec9b93c9060103ff8b2e7daa1cb9a4dd62b7ae1ba2232709555",
+"wallet-root-address": "b19a57f4d3241e6a123ea332241d6f03790075b4",
+"wallet-root-public-key": "0427cc3998d0e0b8d56b64fad4d1f025914b8cb72558810c74dd34454fcd6907f6f7429a0726dceec9b93c9060103ff8b2e7daa1cb9a4dd62b7ae1ba2232709555",
+"wallet-address": "9726cbc67d170307dd80af6416ebe844e7b8eb1c",
+"wallet-public-key": "04065670509d295cb8330e02a688eafe83dbbb317486062482725ba1036dba396d635e91afd9a9e7087c0dfeaccf30d2004d092ed250d62b5c75f8bb4c9326d409",
 "whisper-address": "438e576b638bff08b2872dd708cf0240811d79af",
 "whisper-public-key": "04add221cb97dde8afbf3be27b0bfb3b6842071cb1052abfc3c34d45eba944dc10dcba5d4823fe69148ae17b12ed459237124365c2f46c2b46be9537ce6efa93c8",
 "whisper-private-key": "073d77b952b3b92ba66947df53d03b23bc4cc8cf10cbba1060fe25a569c8ee6b",
@@ -133,6 +140,14 @@ Keycard.generateAndLoadKey(mnemonic, pairing, pin).then(data => console.log(data
 "key-uid":"a88d46499e5690c6ad637e243e83cf51be3e2c67e48324b2b2def3e6a0492576"}
 ```
 
+`address` is an address of master key `m`
+
+`public-key` is a public key of master key `m`
+
+`wallet-root-address` is an address of root key `m/44'/60'/0'/0`
+
+`wallet-root-public-key` is public key of root key `m/44'/60'/0'/0`
+
 `wallet-address` is ethereum address of key with derivation path `m/44'/60'/0'/0/0`
 
 `whisper-address` is ethereum address of key with derivation path `m/43'/60'/1581'/0'/0`
@@ -151,12 +166,23 @@ Keycard.getKeys(pairing, pin).then(data => console.log(data));
 
 `data` object contains:
 ```javascript
-{"encryption-public-key": "04d36d64bea374b917bc097646cb4e81061c7b0ab0872207480b886e66fb52d53774e303e2aa07a1107776f312b94663566765a8a75cf0a92b0851017b28b356a1",
+{"address": "a89a57f4d3241e6a123ea332241d6f03790075b4",
+"public-key": "04cccc3998d0e0b8d56b64fad4d1f025914b8cb72558810c74dd34454fcd6907f6f7429a0726dceec9b93c9060103ff8b2e7daa1cb9a4dd62b7ae1ba2232709555",
+"wallet-root-address": "b19a57f4d3241e6a123ea332241d6f03790075b4",
+"wallet-root-public-key": "0427cc3998d0e0b8d56b64fad4d1f025914b8cb72558810c74dd34454fcd6907f6f7429a0726dceec9b93c9060103ff8b2e7daa1cb9a4dd62b7ae1ba2232709555",
+"wallet-address": "9726cbc67d170307dd80af6416ebe844e7b8eb1c",
+"wallet-public-key": "04065670509d295cb8330e02a688eafe83dbbb317486062482725ba1036dba396d635e91afd9a9e7087c0dfeaccf30d2004d092ed250d62b5c75f8bb4c9326d409",
+"whisper-address": "438e576b638bff08b2872dd708cf0240811d79af",
 "whisper-public-key": "04add221cb97dde8afbf3be27b0bfb3b6842071cb1052abfc3c34d45eba944dc10dcba5d4823fe69148ae17b12ed459237124365c2f46c2b46be9537ce6efa93c8",
-"whisper-private-key":"073d77b952b3b92ba66947df53d03b23bc4cc8cf10cbba1060fe25a569c8ee6b",
-"wallet-address":"9726cbc67d170307dd80af6416ebe844e7b8eb1c"}
+"whisper-private-key": "073d77b952b3b92ba66947df53d03b23bc4cc8cf10cbba1060fe25a569c8ee6b",
+"encryption-public-key": "04d36d64bea374b917bc097646cb4e81061c7b0ab0872207480b886e66fb52d53774e303e2aa07a1107776f312b94663566765a8a75cf0a92b0851017b28b356a1",
+"instance-uid": "21c0ce19aa9a26efc02fd32078c08527",
+"key-uid":"a88d46499e5690c6ad637e243e83cf51be3e2c67e48324b2b2def3e6a0492576"}
 ```
 
+Response is identical to `generateAndLoadKey`.
+Please refer to `generateAndLoadKey` response for detailed description.
+
 ### Sign
 ```javascript
 const pairing = "AFFdkP01GywuaJRQkGDq+OyPHBE9nECEDDCfXhpfaxlo";
@@ -259,4 +285,4 @@ Keycard.installApplet().then(() => console.log("applet installed"));
 ```
 
 ### Keycard CLI
-You can also interact with keycard (installing and removing applet, getting card info, etc) using [keycard cli](https://github.com/status-im/keycard-cli). You'll need a USB reader for that.
+You can also interact with keycard (installing and removing applet, getting card info, etc) using [keycard cli](https://github.com/status-im/keycard-cli). You'll need a USB reader for that.

ios/RNStatusKeycard-Bridging-Header.h

@@ -1,5 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
-#import <React/RCTBridgeModule.h>

ios/RNStatusKeycard.podspec

@@ -1,24 +0,0 @@
-
-Pod::Spec.new do |s|
-  s.name         = "RNStatusKeycard"
-  s.version      = "1.0.0"
-  s.summary      = "RNStatusKeycard"
-  s.description  = <<-DESC
-                  RNStatusKeycard
-                   DESC
-  s.homepage     = ""
-  s.license      = "MIT"
-  # s.license      = { :type => "MIT", :file => "FILE_LICENSE" }
-  s.author             = { "author" => "author@domain.cn" }
-  s.platform     = :ios, "7.0"
-  s.source       = { :git => "https://github.com/author/RNStatusKeycard.git", :tag => "master" }
-  s.source_files  = "RNStatusKeycard/**/*.{h,m}"
-  s.requires_arc = true
-
-
-  s.dependency "React"
-  #s.dependency "others"
-
-end
-
-  

ios/RNStatusKeycard.swift

@@ -1,34 +0,0 @@
-import CoreNFC
-
-@objc(RNStatusKeycard)
-class RNStatusKeycard: NSObject {
-    @objc
-    static func requiresMainQueueSetup() -> Bool {
-        return false
-    }
-    
-    @objc
-    func nfcIsSupported(
-        _ resolve: RCTPromiseResolveBlock,
-        rejecter reject: RCTPromiseRejectBlock) -> Void {
-        if #available(iOS 13.0, *) {
-            resolve(true)
-        } else {
-            resolve(false)
-        }
-
-    }
-    
-    @objc
-    func nfcIsEnabled(
-        _ resolve: RCTPromiseResolveBlock,
-        rejecter reject: RCTPromiseRejectBlock) -> Void {
-        if NFCNDEFReaderSession.readingAvailable {
-            resolve(true)
-        } else {
-            resolve(false)
-        }
-
-    }
-    
-}

ios/RNStatusKeycardBridge.m

@@ -1,16 +0,0 @@
-#import <React/RCTBridgeModule.h>
-
-// - (dispatch_queue_t)methodQueue
-// {
-//     return dispatch_queue_create("im.status.KeycardQueue", DISPATCH_QUEUE_SERIAL);
-// }
-
-@interface RCT_EXTERN_MODULE(RNStatusKeycard, NSObject)
-
-RCT_EXTERN_METHOD(nfcIsEnabled: (RCTPromiseResolveBlock)resolve
-                  rejecter: (__unused RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(nfcIsSupported: (RCTPromiseResolveBlock)resolve
-                  rejecter: (__unused RCTPromiseRejectBlock)reject)
-
-@end

ios/StatusKeycard.h

@@ -0,0 +1,5 @@
+#import <React/RCTBridgeModule.h>
+
+@interface StatusKeycard : NSObject <RCTBridgeModule>
+
+@end

ios/StatusKeycard.m

@@ -0,0 +1,14 @@
+#import "StatusKeycard.h"
+
+
+@implementation StatusKeycard
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_METHOD(sampleMethod:(NSString *)stringArgument numberParameter:(nonnull NSNumber *)numberArgument callback:(RCTResponseSenderBlock)callback)
+{
+    // TODO: Implement some actually useful functionality
+    callback(@[[NSString stringWithFormat: @"numberArgument: %@ stringArgument: %@", numberArgument, stringArgument]]);
+}
+
+@end

ios/StatusKeycard.xcodeproj/project.pbxproj

@@ -7,8 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		98F44A5D22CE650F002B6C62 /* RNStatusKeycard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F44A5B22CE650F002B6C62 /* RNStatusKeycard.swift */; };
-		98F44A5E22CE650F002B6C62 /* RNStatusKeycardBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 98F44A5C22CE650F002B6C62 /* RNStatusKeycardBridge.m */; };
+		B3E7B58A1CC2AC0600A0062D /* StatusKeycard.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,10 +23,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libRNStatusKeycard.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNStatusKeycard.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		989CA44722CE63C900B1D921 /* RNStatusKeycard-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNStatusKeycard-Bridging-Header.h"; sourceTree = "<group>"; };
-		98F44A5B22CE650F002B6C62 /* RNStatusKeycard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNStatusKeycard.swift; sourceTree = "<group>"; };
-		98F44A5C22CE650F002B6C62 /* RNStatusKeycardBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNStatusKeycardBridge.m; sourceTree = "<group>"; };
+		134814201AA4EA6300B7C361 /* libStatusKeycard.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libStatusKeycard.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		B3E7B5881CC2AC0600A0062D /* StatusKeycard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatusKeycard.h; sourceTree = "<group>"; };
+		B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusKeycard.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -44,7 +42,7 @@
 		134814211AA4EA7D00B7C361 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				134814201AA4EA6300B7C361 /* libRNStatusKeycard.a */,
+				134814201AA4EA6300B7C361 /* libStatusKeycard.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -52,19 +50,18 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				98F44A5B22CE650F002B6C62 /* RNStatusKeycard.swift */,
-				98F44A5C22CE650F002B6C62 /* RNStatusKeycardBridge.m */,
+				B3E7B5881CC2AC0600A0062D /* StatusKeycard.h */,
+				B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
-				989CA44722CE63C900B1D921 /* RNStatusKeycard-Bridging-Header.h */,
 			);
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		58B511DA1A9E6C8500147676 /* RNStatusKeycard */ = {
+		58B511DA1A9E6C8500147676 /* StatusKeycard */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNStatusKeycard" */;
+			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "StatusKeycard" */;
 			buildPhases = (
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
@@ -74,9 +71,9 @@
 			);
 			dependencies = (
 			);
-			name = RNStatusKeycard;
+			name = StatusKeycard;
 			productName = RCTDataManager;
-			productReference = 134814201AA4EA6300B7C361 /* libRNStatusKeycard.a */;
+			productReference = 134814201AA4EA6300B7C361 /* libStatusKeycard.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -85,21 +82,19 @@
 		58B511D31A9E6C8500147676 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 1020;
 					};
 				};
 			};
-			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNStatusKeycard" */;
+			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "StatusKeycard" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
@@ -107,7 +102,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				58B511DA1A9E6C8500147676 /* RNStatusKeycard */,
+				58B511DA1A9E6C8500147676 /* StatusKeycard */,
 			);
 		};
 /* End PBXProject section */
@@ -117,8 +112,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				98F44A5E22CE650F002B6C62 /* RNStatusKeycardBridge.m in Sources */,
-				98F44A5D22CE650F002B6C62 /* RNStatusKeycard.swift in Sources */,
+				B3E7B58A1CC2AC0600A0062D /* StatusKeycard.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -133,14 +127,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -177,14 +177,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -209,48 +215,39 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
+				"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
 				);
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = RNStatusKeycard;
+				PRODUCT_NAME = StatusKeycard;
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "RNStatusKeycard-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
 				);
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = RNStatusKeycard;
+				PRODUCT_NAME = StatusKeycard;
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "RNStatusKeycard-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNStatusKeycard" */ = {
+		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "StatusKeycard" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511ED1A9E6C8500147676 /* Debug */,
@@ -259,7 +256,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNStatusKeycard" */ = {
+		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "StatusKeycard" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511F01A9E6C8500147676 /* Debug */,

ios/StatusKeycard.xcworkspace/contents.xcworkspacedata

@@ -1,9 +1,7 @@
-// !$*UTF8*$!
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:RNStatusKeycard.xcodeproj">
+      location = "group:StatusKeycard.xcodeproj">
    </FileRef>
 </Workspace>
-  

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-status-keycard",
   "homepage": "https://keycard.status.im/",
-  "version": "2.5.5",
+  "version": "2.5.17",
   "description": "React Native library to interact with Status Keycard using NFC connection (Android only)",
   "main": "index.js",
   "scripts": {

react-native-status-keycard.podspec

@@ -0,0 +1,19 @@
+require "json"
+
+pkg = JSON.parse(File.read("package.json"))
+
+Pod::Spec.new do |s|
+  s.name         = pkg["name"]
+  s.name         = "react-native-status-keycard"
+  s.version      = pkg["version"]
+  s.summary      = pkg["description"]
+  s.requires_arc = true
+  s.license      = pkg["license"]
+  s.homepage     = pkg["homepage"]
+  s.author       = pkg["author"]
+  s.source       = { :git => pkg["repository"]["url"],
+                     :tag => "v" + pkg["version"] }
+  s.source_files = 'ios/**/*.{h,m}'
+  s.platform     = :ios, "8.0"
+  s.dependency 'React/Core'
+end