avoid NPE on disconnected cards

Fix race condition on connect/disconnect (Android)

.gitignore

@@ -1,4 +1,6 @@
+/example
 
+#
 # OSX
 #
 .DS_Store
@@ -8,7 +10,7 @@
 node_modules/
 npm-debug.log
 yarn-error.log
-  
+
 
 # Xcode
 #
@@ -29,7 +31,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-      
+
 
 # Android/IntelliJ
 #
@@ -43,4 +45,10 @@ local.properties
 buck-out/
 \.buckd/
 *.keystore
-      
+
+/lib
+
+# VSCode + Java
+android/.project
+android/.settings
+.vscode

README.md

@@ -14,7 +14,7 @@ React Native library to interact with [Keycard](https://keycard.status.im/) usin
 
 ### Manual installation
 
-Android is the only platform supported by now.
+Both iOS and Android are supported
 
 #### Android
 
@@ -38,7 +38,6 @@ Android is the only platform supported by now.
 
 Take a look into [docs](./docs/usage.md)
 
-For more usage examples, please refer to https://github.com/status-im/status-react (assuming you can read Clojure)
+For more usage examples, please refer to https://github.com/status-im/status-mobile (assuming you can read Clojure)
 
-For Keycard API documention, please look into https://status.im/keycard_api/
-  
+For Keycard API documention, please look into https://keycard.tech/docs/

android/build.gradle

@@ -46,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:3.0.1'
+    implementation 'com.github.status-im.status-keycard-java:android:3.1.2'
 }

android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactlibrary">
+          package="im.status.ethereum.keycard">
 
 </manifest>
-  
+  

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

@@ -1,83 +0,0 @@
-package im.status.ethereum.keycard;
-
-import android.content.res.AssetManager;
-import android.util.Log;
-
-import im.status.keycard.globalplatform.GlobalPlatformCommandSet;
-import im.status.keycard.globalplatform.LoadCallback;
-import im.status.keycard.io.APDUException;
-import im.status.keycard.io.CardChannel;
-import org.bouncycastle.util.encoders.Hex;
-
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-
-public class Installer {
-    private CardChannel plainChannel;
-    private AssetManager assets;
-    private String capPath;
-    private EventEmitter eventEmitter;
-
-    private GlobalPlatformCommandSet cmdSet;
-
-    private static final String TAG = "SmartCardInstaller";
-
-    public Installer(CardChannel channel, AssetManager assets, String capPath, EventEmitter eventEmitter) {
-        this.plainChannel = channel;
-        this.assets = assets;
-        this.capPath = capPath;
-        this.eventEmitter = eventEmitter;
-    }
-
-    public void start() throws IOException, APDUException, NoSuchAlgorithmException, InvalidKeySpecException {
-        Log.i(TAG, "installation started...");
-        long startTime = System.currentTimeMillis();
-
-        eventEmitter.emit("keycardInstallationProgress", 0.05);
-
-        Log.i(TAG, "select ISD...");
-        cmdSet = new GlobalPlatformCommandSet(this.plainChannel);
-        cmdSet.select().checkOK();
-
-
-        Log.i(TAG, "opening secure channel...");
-        cmdSet.openSecureChannel();
-
-
-        Log.i(TAG, "deleting old version (if present)...");
-        cmdSet.deleteKeycardInstancesAndPackage();
-
-        eventEmitter.emit("keycardInstallationProgress", 0.1);
-
-        Log.i(TAG, "loading package...");
-        cmdSet.loadKeycardPackage(this.assets.open(this.capPath), new LoadCallback() {
-            public void blockLoaded(int loadedBlock, int blockCount) {
-                Log.i(TAG, String.format("load %d/%d...", loadedBlock, blockCount));
-                eventEmitter.emit("keycardInstallationProgress", 0.1 + (0.6 * loadedBlock / blockCount));
-            }
-        });
-
-
-        Log.i(TAG, "installing NDEF applet...");
-        cmdSet.installNDEFApplet(Hex.decode("0024d40f12616e64726f69642e636f6d3a706b67696d2e7374617475732e657468657265756d")).checkOK();
-
-        eventEmitter.emit("keycardInstallationProgress", 0.72);
-
-        eventEmitter.emitWithDelay("keycardInstallationProgress", 0.77, 3100);
-
-        eventEmitter.emitWithDelay("keycardInstallationProgress", 0.82, 6200);
-
-        eventEmitter.emitWithDelay("keycardInstallationProgress", 0.85, 8500);
-
-        Log.i(TAG, "installing Keycard applet...");
-        cmdSet.installKeycardApplet().checkOK();
-
-        eventEmitter.removeCallbacksAndMessages();
-
-        eventEmitter.emit("keycardInstallationProgress", 0.88);
-
-        long duration = System.currentTimeMillis() - startTime;
-        Log.i(TAG, String.format("\n\ninstallation completed in %d seconds", duration / 1000));
-    }
-}

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

@@ -14,6 +14,8 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -23,7 +25,6 @@ import im.status.keycard.io.APDUException;
 
 public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
     private static final String TAG = "StatusKeycard";
-    private static final String CAP_FILENAME = "keycard_v2.2.1.cap";
     private SmartCard smartCard;
     private final ReactApplicationContext reactContext;
 
@@ -41,9 +42,10 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     @Override
     public void onHostResume() {
         if (this.smartCard == null) {
-            this.smartCard = new SmartCard(getCurrentActivity(), reactContext);
-            smartCard.start();
+            this.smartCard = new SmartCard(reactContext);
         }
+
+        smartCard.start(getCurrentActivity());
     }
 
     @Override
@@ -52,13 +54,23 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
 
     @Override
     public void onHostDestroy() {
+    }
+
+    // Required for rn built in EventEmitter Calls.
+    @ReactMethod
+    public void addListener(String eventName) {
 
     }
 
+    @ReactMethod
+    public void removeListeners(Integer count) {
+
+    }    
+
     @ReactMethod
     public void nfcIsSupported(final Promise promise) {
         if (smartCard != null) {
-            promise.resolve(smartCard.isNfcSupported());
+            promise.resolve(smartCard.isNfcSupported(getCurrentActivity()));
         } else {
             promise.resolve(false);
         }
@@ -119,11 +131,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void generateMnemonic(final String pairing, final String words, final Promise promise) {
+    public void generateMnemonic(final String words, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.generateMnemonic(pairing, words));
+                    promise.resolve(smartCard.generateMnemonic(words));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -133,11 +145,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void generateAndLoadKey(final String mnemonic, final String pairing, final String pin, final Promise promise) {
+    public void generateAndLoadKey(final String mnemonic, final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.generateAndLoadKey(mnemonic, pairing, pin));
+                    promise.resolve(smartCard.generateAndLoadKey(mnemonic, pin));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -147,11 +159,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void saveMnemonic(final String mnemonic, final String pairing, final String pin, final Promise promise) {
+    public void saveMnemonic(final String mnemonic, final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.saveMnemonic(mnemonic, pairing, pin);
+                    smartCard.saveMnemonic(mnemonic, pin);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -162,11 +174,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void getApplicationInfo(final String pairingBase64, final Promise promise) {
+    public void getApplicationInfo(final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.getApplicationInfo(pairingBase64));
+                    promise.resolve(smartCard.getApplicationInfo());
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -176,11 +188,25 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void deriveKey(final String path, final String pairing, final String pin, final Promise promise) {
+    public void factoryReset(final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.deriveKey(path, pairing, pin);
+                    promise.resolve(smartCard.factoryReset());
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void deriveKey(final String path, final String pin, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.deriveKey(path, pin);
                     promise.resolve(path);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -191,11 +217,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void exportKey(final String pairing, final String pin, final Promise promise) {
+    public void exportKey(final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.exportKey(pairing, pin));
+                    promise.resolve(smartCard.exportKey(pin));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -205,26 +231,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void exportKeyWithPath(final String pairing, final String pin, final String path, final Promise promise) {
+    public void exportKeyWithPath(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() {
-            public void run() {
-                try {
-                    promise.resolve(smartCard.getKeys(pairing, pin));
+                    promise.resolve(smartCard.exportKeyWithPath(pin, path));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -234,11 +245,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void sign(final String pairing, final String pin, final String hash, final Promise promise) {
+    public void getKeys(final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.sign(pairing, pin, hash));
+                    promise.resolve(smartCard.getKeys(pin));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -248,11 +259,39 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void signWithPath(final String pairing, final String pin, final String path, final String hash, final Promise promise) {
+    public void importKeys(final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.signWithPath(pairing, pin, path, hash));
+                    promise.resolve(smartCard.importKeys(pin));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void sign(final String pin, final String hash, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.sign(pin, hash));
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void signWithPath(final String pin, final String path, final String hash, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    promise.resolve(smartCard.signWithPath(pin, path, hash));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -277,48 +316,20 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
 
     @ReactMethod
     public void installApplet(final Promise promise) {
-        final ReactContext ctx = this.reactContext;
-        new Thread(new Runnable() {
-            public void run() {
-                try {
-                    smartCard.installApplet(ctx.getAssets(), CAP_FILENAME);
-                    promise.resolve(true);
-                } catch (IOException | APDUException | NoSuchAlgorithmException | InvalidKeySpecException e) {
-                    Log.d(TAG, e.getMessage());
-                    promise.reject(e);
-                }
-            }
-        }).start();
+        promise.reject("E_KEYCARD", "Not implemented (unused)");
     }
 
     @ReactMethod
     public void installAppletAndInitCard(final String pin, final Promise promise) {
-        final ReactContext ctx = this.reactContext;
-        new Thread(new Runnable() {
-            public void run() {
-                try {
-                    SmartCardSecrets s = smartCard.installAppletAndInitCard(pin, ctx.getAssets(), CAP_FILENAME);
-
-                    WritableMap params = Arguments.createMap();
-                    params.putString("pin", s.getPin());
-                    params.putString("puk", s.getPuk());
-                    params.putString("password", s.getPairingPassword());
-
-                    promise.resolve(params);
-                } catch (IOException | APDUException | NoSuchAlgorithmException | InvalidKeySpecException e) {
-                    Log.d(TAG, e.getMessage());
-                    promise.reject(e);
-                }
-            }
-        }).start();
+        promise.reject("E_KEYCARD", "Not implemented (unused)");
     }
 
     @ReactMethod
-    public void verifyPin(final String pairing, final String pin, final Promise promise) {
+    public void verifyPin(final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    promise.resolve(smartCard.verifyPin(pairing, pin));
+                    promise.resolve(smartCard.verifyPin(pin));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -328,11 +339,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void changePin(final String pairing, final String currentPin, final String newPin, final Promise promise) {
+    public void changePairingPassword(final String pin, final String pairingPassword, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.changePin(pairing, currentPin, newPin);
+                    smartCard.changePairingPassword(pin, pairingPassword);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -343,11 +354,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void unblockPin(final String pairing, final String puk, final String newPin, final Promise promise) {
+    public void changePUK(final String pin, final String puk, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.unblockPin(pairing, puk, newPin);
+                    smartCard.changePUK(pin, puk);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -358,11 +369,41 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void unpair(final String pairing, final String pin, final Promise promise) {
+    public void changePin(final String currentPin, final String newPin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.unpair(pairing, pin);
+                    smartCard.changePin(currentPin, newPin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void unblockPin(final String puk, final String newPin, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.unblockPin(puk, newPin);
+                    promise.resolve(true);
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void unpair(final String pin, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.unpair(pin);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -374,10 +415,15 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
 
     @ReactMethod
     public void delete(final Promise promise) {
+        promise.reject("E_KEYCARD", "Not implemented (unused)");
+    }
+
+    @ReactMethod
+    public void removeKey(final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.delete();
+                    smartCard.removeKey(pin);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -388,11 +434,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void removeKey(final String pairing, final String pin, final Promise promise) {
+    public void removeKeyWithUnpair(final String pin, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.removeKey(pairing, pin);
+                    smartCard.removeKeyWithUnpair(pin);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -403,11 +449,25 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void removeKeyWithUnpair(final String pairing, final String pin, final Promise promise) {
+    public void getCardName(final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.removeKeyWithUnpair(pairing, pin);
+                    promise.resolve(smartCard.getCardName());
+                } catch (IOException | APDUException e) {
+                    Log.d(TAG, e.getMessage());
+                    promise.reject(e);
+                }
+            }
+        }).start();
+    }
+
+    @ReactMethod
+    public void setCardName(final String pin, final String name, final Promise promise) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    smartCard.setCardName(pin, name);
                     promise.resolve(true);
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
@@ -418,12 +478,16 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     }
 
     @ReactMethod
-    public void unpairAndDelete(final String pairing, final String pin, final Promise promise) {
+    public void unpairAndDelete(final String pin, final Promise promise) {
+        promise.reject("E_KEYCARD", "Not implemented (unused)");
+    }
+
+    @ReactMethod
+    public void verifyCard(final String challenge, final Promise promise) {
         new Thread(new Runnable() {
             public void run() {
                 try {
-                    smartCard.unpairAndDelete(pairing, pin);
-                    promise.resolve(true);
+                    promise.resolve(smartCard.verifyCard(challenge));
                 } catch (IOException | APDUException e) {
                     Log.d(TAG, e.getMessage());
                     promise.reject(e);
@@ -432,4 +496,39 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
+    @ReactMethod
+    public void startNFC(String prompt, final Promise promise) {
+        smartCard.startNFC();
+        promise.resolve(true);
+    }
+
+    @ReactMethod
+    public void stopNFC(String error, final Promise promise) {
+        smartCard.stopNFC();
+        promise.resolve(true);
+    }
+
+    // Only used on iOS
+    @ReactMethod
+    public void setNFCMessage(String message, final Promise promise) {
+        promise.resolve(true);
+    }
+
+    @ReactMethod
+    public void setPairings(ReadableMap pairings, final Promise promise) {
+        smartCard.setPairings(pairings);
+        promise.resolve(true);
+    }
+
+    @ReactMethod
+    public void setCertificationAuthorities(ReadableArray caPubKeys, final Promise promise) {
+        smartCard.setCertificationAuthorities(caPubKeys);
+        promise.resolve(true);
+    }
+
+    @ReactMethod
+    public void setOneTimeVerificationSkip(String instanceUID, final Promise promise) {
+        smartCard.setOneTimeVerificationSkip(instanceUID);
+        promise.resolve(true);
+    }
 }

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

@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
-import android.support.annotation.Nullable;
 import android.util.EventLog;
 import android.util.Log;
 
@@ -21,16 +20,22 @@ import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;
 import java.util.Scanner;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
 
 import im.status.keycard.applet.RecoverableSignature;
+import im.status.keycard.applet.Certificate;
 import im.status.keycard.globalplatform.GlobalPlatformCommandSet;
 import im.status.keycard.io.APDUException;
+import im.status.keycard.io.APDUResponse;
 import im.status.keycard.io.CardChannel;
 import im.status.keycard.io.CardListener;
 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.Metadata;
 import im.status.keycard.applet.CashCommandSet;
 import im.status.keycard.applet.KeycardCommandSet;
 import im.status.keycard.applet.Pairing;
@@ -41,28 +46,32 @@ import org.bouncycastle.util.encoders.Hex;
 
 public class SmartCard extends BroadcastReceiver implements CardListener {
     private NFCCardManager cardManager;
-    private Activity activity;
-    private ReactContext reactContext;
     private NfcAdapter nfcAdapter;
     private CardChannel cardChannel;
     private EventEmitter eventEmitter;
     private static final String TAG = "SmartCard";
-    private Boolean started = false;
+    private boolean started = false;
+    private volatile boolean listening = false;
+    private HashMap<String, String> pairings;
+    private String[] caPubKeys;
+    private String skipVerificationUID;
+    private final Object lock = new Object();
 
     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";
+    private static final String TAG_LOST = "Tag was lost.";
     private static final int WORDS_LIST_SIZE = 2048;
 
-    public SmartCard(Activity activity, ReactContext reactContext) {
+    public SmartCard(ReactContext reactContext) {
         this.cardManager = new NFCCardManager();
         this.cardManager.setCardListener(this);
-        this.activity = activity;
-        this.reactContext = reactContext;
-        this.nfcAdapter = NfcAdapter.getDefaultAdapter(activity.getBaseContext());
         this.eventEmitter = new EventEmitter(reactContext);
+        this.pairings = new HashMap<>();
+        this.caPubKeys = new String[0];
+        this.skipVerificationUID = "";
     }
 
     public String getName() {
@@ -73,35 +82,69 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         Log.d(TAG, s);
     }
 
-    public boolean start() {
-        if (!started) {
+    public boolean start(Activity activity) {
+        if(activity == null) {
+            return false;
+        }
 
+        if (!started) {
+            this.nfcAdapter = NfcAdapter.getDefaultAdapter(activity.getBaseContext());
             this.cardManager.start();
             started = true;
+        }
 
-            if (this.nfcAdapter != null) {
-                IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
-                activity.registerReceiver(this, filter);
-                nfcAdapter.enableReaderMode(activity, this.cardManager, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null);
-                return true;
-            } else {
-                log("not support in this device");
-                return false;
-            }
-        } else {
+        if (this.nfcAdapter != null) {
+            IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
+            activity.registerReceiver(this, filter);
+            nfcAdapter.enableReaderMode(activity, this.cardManager, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null);
             return true;
+        } else {
+            log("not support in this device");
+            return false;
+        }
+    }
+
+    public void stop(Activity activity) {
+        if (activity != null && nfcAdapter != null) {
+            nfcAdapter.disableReaderMode(activity);
+        }
+    }
+
+    public void startNFC() {
+        synchronized(lock) {
+            this.listening = true;
+            if (this.cardChannel != null) {
+                eventEmitter.emit("keyCardOnConnected", null);
+            }
+        }
+    }
+
+    public void stopNFC() {
+        synchronized(lock) {
+            this.listening = false;
         }
     }
 
     @Override
     public void onConnected(final CardChannel channel) {
-        this.cardChannel = channel;
-        eventEmitter.emit("keyCardOnConnected", null);
+        synchronized(lock) {
+            this.cardChannel = channel;
+
+            if (this.listening) {
+                eventEmitter.emit("keyCardOnConnected", null);
+            }
+        }
     }
 
     @Override
     public void onDisconnected() {
-        eventEmitter.emit("keyCardOnDisconnected", null);
+        synchronized(lock) {
+            this.cardChannel = null;
+            
+            if (this.listening) {
+                eventEmitter.emit("keyCardOnDisconnected", null);
+            }
+        }
     }
 
     @Override
@@ -122,8 +165,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         }
     }
 
-    public boolean isNfcSupported() {
-        return activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
+    public boolean isNfcSupported(Activity activity) {
+        return activity != null && activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
     }
 
     public boolean isNfcEnabled() {
@@ -135,29 +178,22 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
     }
 
     public SmartCardSecrets init(final String userPin) throws IOException, APDUException, NoSuchAlgorithmException, InvalidKeySpecException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
+        KeycardCommandSet cmdSet = commandSet();
         cmdSet.select().checkOK();
 
-        eventEmitter.emit("keycardInstallationProgress", 0.90);
-
         SmartCardSecrets s = SmartCardSecrets.generate(userPin);
-
-        eventEmitter.emit("keycardInstallationProgress", 0.93);
-
         cmdSet.init(s.getPin(), s.getPuk(), s.getPairingPassword()).checkOK();
-
-        eventEmitter.emit("keycardInstallationProgress", 1.0);
-
         return s;
     }
 
     public String pair(String pairingPassword) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
+        KeycardCommandSet cmdSet = commandSet();
         Log.i(TAG, "Applet selection successful");
 
         // First thing to do is selecting the applet on the card.
         ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
-        Log.i(TAG, "Instance UID: " + Hex.toHexString(info.getInstanceUID()));
+        String instanceUID = Hex.toHexString(info.getInstanceUID());
+        Log.i(TAG, "Instance UID: " + instanceUID);
         Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID()));
         Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey()));
         Log.i(TAG, "Application version: " + info.getAppVersionString());
@@ -166,19 +202,12 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         cmdSet.autoPair(pairingPassword);
 
         Pairing pairing = cmdSet.getPairing();
-
+        pairings.put(instanceUID, pairing.toBase64());
         return pairing.toBase64();
     }
 
-    public String generateMnemonic(String pairingBase64, String words) 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");
+    public String generateMnemonic(String words) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = securedCommandSet();
 
         Mnemonic mnemonic = new Mnemonic(cmdSet.generateMnemonic(KeycardCommandSet.GENERATE_MNEMONIC_12_WORDS).checkOK().getData());
 
@@ -195,18 +224,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return mnemonic.toMnemonicPhrase();
     }
 
-    public void saveMnemonic(String mnemonic, String pairingBase64, String pin) 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");
+    public void saveMnemonic(String mnemonic, String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
         cmdSet.loadKey(seed);
@@ -214,8 +233,57 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         log("seed loaded to card");
     }
 
-    public WritableMap getApplicationInfo(final String pairingBase64) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
+    public boolean tryDefaultPairing(KeycardCommandSet cmdSet, String instanceUID, WritableMap cardInfo) throws IOException {
+        try {
+            cmdSet.autoPair("KeycardDefaultPairing");
+
+            Pairing pairing = cmdSet.getPairing();
+            String base64Pairing = pairing.toBase64();
+            pairings.put(instanceUID, base64Pairing);
+            cardInfo.putString("new-pairing", base64Pairing);
+            WritableMap eventBody = Arguments.createMap();
+            eventBody.putString("pairing", base64Pairing);
+            eventBody.putString("instanceUID", instanceUID);
+            eventEmitter.emit("keyCardNewPairing", eventBody);
+
+            openSecureChannel(cmdSet);
+            return true;
+        } catch(APDUException e) {
+            Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean verifyAuthenticity(KeycardCommandSet cmdSet, String instanceUID) throws IOException {
+        if ((this.caPubKeys.length == 0) || instanceUID.equals(this.skipVerificationUID)) {
+            this.skipVerificationUID = "";
+            return true;
+        }
+
+        try {
+            byte[] rawChallenge = SmartCardSecrets.randomBytes(32);
+            byte[] data = cmdSet.identifyCard(rawChallenge).checkOK().getData();
+            byte[] caPubKey = Certificate.verifyIdentity(rawChallenge, data);
+
+            if (caPubKey == null) {
+                return false;
+            }
+
+            String caStr = Hex.toHexString(caPubKey);
+            for (int i = 0; i < this.caPubKeys.length; i++) {
+                if (caStr.equals(this.caPubKeys[i])) {
+                    return true;
+                }
+            }
+        } catch(APDUException e) {
+            Log.i(TAG, "verification failed: " + e.getMessage());
+        }
+
+        return false;
+    }
+
+    public WritableMap getApplicationInfo() throws IOException, APDUException {
+        KeycardCommandSet cmdSet = commandSet();
         ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
 
         Log.i(TAG, "Card initialized? " + info.isInitializedCard());
@@ -224,33 +292,48 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         cardInfo.putBoolean("initialized?", info.isInitializedCard());
 
         if (info.isInitializedCard()) {
-            Log.i(TAG, "Instance UID: " + Hex.toHexString(info.getInstanceUID()));
+            String instanceUID = Hex.toHexString(info.getInstanceUID());
+            String cardName = getCardNameOrDefault(cmdSet);
+            cardInfo.putString("card-name", cardName);
+
+            Log.i(TAG, "Instance UID: " + instanceUID);
+            Log.i(TAG, "Card name: " + cardName);
             Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID()));
             Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey()));
             Log.i(TAG, "Application version: " + info.getAppVersionString());
             Log.i(TAG, "Free pairing slots: " + info.getFreePairingSlots());
 
             Boolean isPaired = false;
+            Boolean isAuthentic = false;
 
-            if (pairingBase64.length() > 0) {
-                try {
-                    Pairing pairing = new Pairing(pairingBase64);
-                    cmdSet.setPairing(pairing);
-
-                    cmdSet.autoOpenSecureChannel();
-                    Log.i(TAG, "secure channel opened");
-                    isPaired = true;
-
-                    ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());
-
-                    Log.i(TAG, "PIN retry counter: " + status.getPINRetryCount());
-                    Log.i(TAG, "PUK retry counter: " + status.getPUKRetryCount());
-
-                    cardInfo.putInt("pin-retry-counter", status.getPINRetryCount());
-                    cardInfo.putInt("puk-retry-counter", status.getPUKRetryCount());
-                } catch (IOException | IllegalArgumentException e) {
-                    Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
+            if (!pairings.containsKey(instanceUID)) {
+                isAuthentic = verifyAuthenticity(cmdSet, instanceUID);
+                if (isAuthentic) {
+                    isPaired = tryDefaultPairing(cmdSet, instanceUID, cardInfo);
                 }
+            } else {
+                try {
+                    openSecureChannel(cmdSet);
+                    isPaired = true;
+                    isAuthentic = true;
+                } catch(APDUException e) {
+                    isAuthentic = verifyAuthenticity(cmdSet, instanceUID);
+                    if (isAuthentic) {
+                        isPaired = tryDefaultPairing(cmdSet, instanceUID, cardInfo);
+                    }
+                }
+            }
+
+            cardInfo.putBoolean("authentic?", isAuthentic);
+
+            if (isPaired) {
+                ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());
+
+                Log.i(TAG, "PIN retry counter: " + status.getPINRetryCount());
+                Log.i(TAG, "PUK retry counter: " + status.getPUKRetryCount());
+
+                cardInfo.putInt("pin-retry-counter", status.getPINRetryCount());
+                cardInfo.putInt("puk-retry-counter", status.getPUKRetryCount());
             }
 
             cardInfo.putBoolean("has-master-key?", info.hasMasterKey());
@@ -265,18 +348,56 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return cardInfo;
     }
 
-    public void deriveKey(final String path, final String pairingBase64, final String pin) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
+    public WritableMap factoryResetPost() throws IOException, APDUException {
+        ApplicationInfo info = new ApplicationInfo(commandSet().select().checkOK().getData());
+        Log.i(TAG, "Selecting the factory reset Keycard applet succeeded");
+
+        WritableMap cardInfo = Arguments.createMap();
+        cardInfo.putBoolean("initialized?", info.isInitializedCard());
+
+        return cardInfo; 
+    }
+
+    public WritableMap factoryResetFallback() throws IOException, APDUException {
+        GlobalPlatformCommandSet cmdSet = gpCommandSet();
         cmdSet.select().checkOK();
+        Log.i(TAG, "ISD selected");
 
-        Pairing pairing = new Pairing(pairingBase64);
-        cmdSet.setPairing(pairing);
+        cmdSet.openSecureChannel();
+        Log.i(TAG, "SecureChannel opened");
 
-        cmdSet.autoOpenSecureChannel();
-        Log.i(TAG, "secure channel opened");
+        cmdSet.deleteKeycardInstance().checkSW(APDUResponse.SW_OK, APDUResponse.SW_REFERENCED_DATA_NOT_FOUND);
+        Log.i(TAG, "Keycard applet instance deleted");
 
-        cmdSet.verifyPIN(pin).checkOK();
-        Log.i(TAG, "pin verified");
+        cmdSet.installKeycardApplet().checkOK();
+        Log.i(TAG, "Keycard applet instance re-installed");  
+
+        return factoryResetPost();     
+    }
+
+    public WritableMap factoryReset() throws IOException, APDUException {
+        KeycardCommandSet cmdSet = commandSet();
+        APDUResponse resp = cmdSet.select();
+
+        if (!resp.isOK()) {
+            return factoryResetFallback();
+        }
+
+        ApplicationInfo info = new ApplicationInfo(resp.getData());
+        
+        if (!info.hasFactoryResetCapability()) {
+            return factoryResetFallback();
+        }
+
+        if (!cmdSet.factoryReset().isOK()) {
+            return factoryResetFallback();
+        }
+
+        return factoryResetPost();
+    }
+
+    public void deriveKey(final String path, final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         KeyPath currentPath = new KeyPath(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_KEY_PATH).checkOK().getData());
         Log.i(TAG, "Current key path: " + currentPath);
@@ -287,79 +408,34 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         }
     }
 
-    public String exportKey(final String pairingBase64, final String pin) 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");
+    public String exportKey(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         byte[] key = cmdSet.exportCurrentKey(true).checkOK().getData();
 
         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");
+    public String exportKeyWithPath(final String pin, final String path) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         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();
-
-        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[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
-        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
-
-        byte[] tlvMaster = cmdSet.exportKey(MASTER_PATH, false, true).checkOK().getData();
-        BIP32KeyPair masterPair = BIP32KeyPair.fromTLV(tlvMaster);
-
-        byte[] tlvRoot = cmdSet.exportKey(ROOT_PATH, false, true).checkOK().getData();
-        BIP32KeyPair keyPair = BIP32KeyPair.fromTLV(tlvRoot);
+    public WritableMap getKeys(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         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);
+        byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
+        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
 
-        ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
+        ApplicationInfo info = cmdSet.getApplicationInfo();
 
         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()));
@@ -370,18 +446,52 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return data;
     }
 
-    public WritableMap generateAndLoadKey(final String mnemonic, final String pairingBase64, final String pin) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
-        cmdSet.select().checkOK();
+    public WritableMap importKeys(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
+        ApplicationInfo info = cmdSet.getApplicationInfo();
 
-        Pairing pairing = new Pairing(pairingBase64);
-        cmdSet.setPairing(pairing);
+        byte p2 = (info.getAppVersion() < 0x0310) ? KeycardCommandSet.EXPORT_KEY_P2_PUBLIC_ONLY : KeycardCommandSet.EXPORT_KEY_P2_EXTENDED_PUBLIC;
 
-        cmdSet.autoOpenSecureChannel();
-        Log.i(TAG, "secure channel opened");
+        byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
+        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
 
-        cmdSet.verifyPIN(pin).checkOK();
-        Log.i(TAG, "pin verified");
+        byte[] tlvMaster = cmdSet.exportKey(MASTER_PATH, false, true).checkOK().getData();
+        BIP32KeyPair masterPair = BIP32KeyPair.fromTLV(tlvMaster);
+
+        byte[] tlvRoot = cmdSet.exportKey(ROOT_PATH, false, p2).checkOK().getData();
+        BIP32KeyPair rootKeyPair = BIP32KeyPair.fromTLV(tlvRoot);
+
+        byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
+        BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper);
+
+        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(rootKeyPair.toEthereumAddress()));
+        data.putString("wallet-root-public-key", Hex.toHexString(rootKeyPair.getPublicKey()));
+        
+        if (rootKeyPair.isExtended()) {
+            data.putString("wallet-root-chain-code", Hex.toHexString(rootKeyPair.getChainCode()));
+        } //else { (for now we return both keys, because xpub support is not yet available)
+            byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, false, true).checkOK().getData();
+            BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlvWallet);
+            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;
+    }
+
+    public WritableMap generateAndLoadKey(final String mnemonic, final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
+        byte p2 = (cmdSet.getApplicationInfo().getAppVersion() < 0x0310) ? KeycardCommandSet.EXPORT_KEY_P2_PUBLIC_ONLY : KeycardCommandSet.EXPORT_KEY_P2_EXTENDED_PUBLIC;
 
         byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
         BIP32KeyPair keyPair = BIP32KeyPair.fromBinarySeed(seed);
@@ -389,7 +499,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         cmdSet.loadKey(keyPair).checkOK();
         log("keypair loaded to card");
 
-        byte[] tlvRoot = cmdSet.exportKey(ROOT_PATH, false, true).checkOK().getData();
+        byte[] tlvRoot = cmdSet.exportKey(ROOT_PATH, false, p2).checkOK().getData();
         Log.i(TAG, "Derived " + ROOT_PATH);
         BIP32KeyPair rootKeyPair = BIP32KeyPair.fromTLV(tlvRoot);
 
@@ -401,157 +511,101 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         Log.i(TAG, "Derived " + ENCRYPTION_PATH);
         BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
 
-        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()));
+
+        if (rootKeyPair.isExtended()) {
+            data.putString("wallet-root-chain-code", Hex.toHexString(rootKeyPair.getChainCode()));
+        } //else { (see note above)
+            byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, false, true).checkOK().getData();
+            BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlvWallet);
+            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()));
+
+        ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
+
         data.putString("instance-uid", Hex.toHexString(info.getInstanceUID()));
         data.putString("key-uid", Hex.toHexString(info.getKeyUID()));
 
         return data;
     }
 
-    public void installApplet(AssetManager assets, String capPath) throws IOException, APDUException, NoSuchAlgorithmException, InvalidKeySpecException {
-        Installer installer = new Installer(this.cardChannel, assets, capPath, eventEmitter);
-        installer.start();
+    public int verifyPin(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
+        return 3;
     }
 
-    public SmartCardSecrets installAppletAndInitCard(final String userPin, AssetManager assets, String capPath) throws IOException, APDUException, NoSuchAlgorithmException, InvalidKeySpecException {
-        Installer installer = new Installer(this.cardChannel, assets, capPath, eventEmitter);
-        installer.start();
+    public void changePairingPassword(final String pin, final String pairingPassword) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
-        return init(userPin);
+        cmdSet.changePairingPassword(pairingPassword);
+        Log.i(TAG, "pairing password changed");
     }
 
-    public int verifyPin(final String pairingBase64, final String pin) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
-        cmdSet.select().checkOK();
+    public void changePUK(final String pin, final String puk) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
-        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");
-
-        ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());
-
-        return status.getPINRetryCount();
+        cmdSet.changePUK(puk);
+        Log.i(TAG, "puk changed");
     }
 
-    public void changePin(final String pairingBase64, final String currentPin, final String newPin) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
-        cmdSet.select().checkOK();
+    public void changePin(final String currentPin, final String newPin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(currentPin);
 
-        Pairing pairing = new Pairing(pairingBase64);
-        cmdSet.setPairing(pairing);
-
-        cmdSet.autoOpenSecureChannel();
-        Log.i(TAG, "secure channel opened");
-
-        cmdSet.verifyPIN(currentPin).checkOK();
-        Log.i(TAG, "pin verified");
-
-        cmdSet.changePIN(0, newPin);
+        cmdSet.changePIN(newPin);
         Log.i(TAG, "pin changed");
     }
 
-    public void unblockPin(final String pairingBase64, final String puk, final String newPin) 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");
+    public void unblockPin(final String puk, final String newPin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = securedCommandSet();
 
         cmdSet.unblockPIN(puk, newPin).checkOK();
         Log.i(TAG, "pin unblocked");
     }
 
-    public void unpair(final String pairingBase64, final String pin) 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");
+    public void unpair(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         cmdSet.autoUnpair();
         Log.i(TAG, "card unpaired");
+        String instanceUID = Hex.toHexString(cmdSet.getApplicationInfo().getInstanceUID());
+        pairings.remove(instanceUID);
     }
 
-    public void delete() throws IOException, APDUException {
-        GlobalPlatformCommandSet cmdSet = new GlobalPlatformCommandSet(this.cardChannel);
-        cmdSet.select().checkOK();
-
-        cmdSet.openSecureChannel();
-        Log.i(TAG, "secure channel opened");
-
-        cmdSet.deleteKeycardInstancesAndPackage();
-        Log.i(TAG, "instance and package deleted");
-    }
-
-    public void removeKey(final String pairingBase64, final String pin) 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");
+    public void removeKey(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         cmdSet.removeKey();
         Log.i(TAG, "key removed");
     }
 
-    public void removeKeyWithUnpair(final String pairingBase64, final String pin) throws IOException, APDUException {
-        removeKey(pairingBase64, pin);
-        unpair(pairingBase64, pin);
+    public void removeKeyWithUnpair(final String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
+
+        cmdSet.removeKey();
+        Log.i(TAG, "key removed");
+
+        cmdSet.unpairOthers();
+        Log.i(TAG, "unpaired others");
+
+        cmdSet.autoUnpair();
+        Log.i(TAG, "card unpaired");
+
+        String instanceUID = Hex.toHexString(cmdSet.getApplicationInfo().getInstanceUID());
+        pairings.remove(instanceUID);
     }
 
-    public void unpairAndDelete(final String pairingBase64, final String pin) throws IOException, APDUException {
-        unpair(pairingBase64, pin);
-        delete();
-    }
-
-    public String sign(final String pairingBase64, final String pin, 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");
+    public String sign(final String pin, final String message) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         byte[] hash = Hex.decode(message);
         RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.sign(hash).checkOK().getData());
@@ -573,21 +627,22 @@ 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");
+    public String signWithPath(final String pin, final String path, final String message) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
         byte[] hash = Hex.decode(message);
-        RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.signWithPath(hash, path, false).checkOK().getData());
+
+        RecoverableSignature signature;
+
+        if (cmdSet.getApplicationInfo().getAppVersion() < 0x0202) {
+            String actualPath = new KeyPath(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_KEY_PATH).checkOK().getData()).toString();
+            if (!actualPath.equals(path)) {
+                cmdSet.deriveKey(path).checkOK();
+            }
+            signature = new RecoverableSignature(hash, cmdSet.sign(hash).checkOK().getData());
+        } else {
+            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());
@@ -607,7 +662,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
     }
 
     public String signPinless(final String message) throws IOException, APDUException {
-        CashCommandSet cmdSet = new CashCommandSet(this.cardChannel);
+        CashCommandSet cmdSet = cashCommandSet();
         cmdSet.select().checkOK();
 
         byte[] hash = Hex.decode(message);
@@ -629,4 +684,126 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
 
         return sig;
     }
+
+    public String getCardName() throws IOException, APDUException {
+        KeycardCommandSet cmdSet = commandSet();
+        cmdSet.select().checkOK();
+        return getCardNameOrDefault(cmdSet);
+    } 
+
+    public void setCardName(final String pin, final String name) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
+
+        Metadata m = new Metadata(name);
+        cmdSet.storeData(m.toByteArray(), KeycardCommandSet.STORE_DATA_P1_PUBLIC).checkOK();
+    }    
+
+    public WritableMap verifyCard(final String challenge) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = commandSet();
+        cmdSet.select().checkOK();
+        byte[] rawChallenge = Hex.decode(challenge);
+        byte[] data = cmdSet.identifyCard(rawChallenge).checkOK().getData();
+        byte[] caPubKey = Certificate.verifyIdentity(rawChallenge, data);
+
+        WritableMap out = Arguments.createMap();
+        out.putString("ca-public-key", Hex.toHexString(caPubKey));
+        out.putString("tlv-data", Hex.toHexString(data));
+
+        return out;
+    }
+
+    public void setPairings(ReadableMap newPairings) {
+        pairings.clear();
+        Iterator<Map.Entry<String,Object>> i = newPairings.getEntryIterator();
+        while (i.hasNext()) {
+            Map.Entry<String, Object> entry = i.next();
+            String value = ((ReadableMap) entry.getValue()).getString("pairing");
+            pairings.put(entry.getKey(), value);
+        }
+    }
+
+    public void setCertificationAuthorities(ReadableArray newCAPubKeys) {
+        this.caPubKeys = new String[newCAPubKeys.size()];
+
+        for (int i = 0; i < newCAPubKeys.size(); i++) {
+            this.caPubKeys[i] = newCAPubKeys.getString(i);
+        }        
+    }
+
+    public void setOneTimeVerificationSkip(String instanceUID) {
+        this.skipVerificationUID = instanceUID;    
+    }
+
+    private KeycardCommandSet authenticatedCommandSet(String pin) throws IOException, APDUException {
+        KeycardCommandSet cmdSet = securedCommandSet();
+        cmdSet.verifyPIN(pin).checkOK();
+        Log.i(TAG, "pin verified");
+
+        return cmdSet;
+    }
+
+    private KeycardCommandSet securedCommandSet() throws IOException, APDUException {
+        KeycardCommandSet cmdSet = commandSet();
+        cmdSet.select().checkOK();
+        openSecureChannel(cmdSet);
+
+        return cmdSet;
+    }
+
+    private KeycardCommandSet commandSet() throws IOException {
+        synchronized(lock) {
+            if (this.cardChannel != null) {
+                return new KeycardCommandSet(this.cardChannel);
+            }
+        }
+
+        throw new IOException(TAG_LOST);
+    }
+
+    private CashCommandSet cashCommandSet() throws IOException {
+        synchronized(lock) {
+            if (this.cardChannel != null) {
+                return new CashCommandSet(this.cardChannel);
+            }
+        }
+
+        throw new IOException(TAG_LOST);
+    }
+
+    private GlobalPlatformCommandSet gpCommandSet() throws IOException {
+        synchronized(lock) {
+            if (this.cardChannel != null) {
+                return new GlobalPlatformCommandSet(this.cardChannel);
+            }
+        }
+
+        throw new IOException(TAG_LOST);
+    }
+
+    private String getCardNameOrDefault(KeycardCommandSet cmdSet) throws IOException, APDUException {
+        byte[] data = cmdSet.getData(KeycardCommandSet.STORE_DATA_P1_PUBLIC).checkOK().getData();
+
+        try {
+            Metadata m = Metadata.fromData(data);
+            return m.getCardName();
+        } catch(Exception e) {
+            return "";
+        }
+    }
+
+    private void openSecureChannel(KeycardCommandSet cmdSet) throws IOException, APDUException {
+        String instanceUID = Hex.toHexString(cmdSet.getApplicationInfo().getInstanceUID());
+        String pairingBase64 = pairings.get(instanceUID);
+
+        if (pairingBase64 == null) {
+            throw new APDUException("No pairing found");
+        }
+
+        Pairing pairing = new Pairing(pairingBase64);
+        cmdSet.setPairing(pairing);
+
+        cmdSet.autoOpenSecureChannel();
+        Log.i(TAG, "secure channel opened");
+    }
+
 }

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

@@ -1,10 +1,7 @@
 package im.status.ethereum.keycard;
 
-import android.support.annotation.NonNull;
 import android.util.Base64;
 
-import org.apache.commons.lang3.RandomStringUtils;
-
 import static android.util.Base64.NO_PADDING;
 import static android.util.Base64.NO_WRAP;
 
@@ -31,9 +28,8 @@ public class SmartCardSecrets {
         this.pairingPassword = pairingPassword;
     }
 
-    @NonNull
     public static SmartCardSecrets generate(final String userPin) throws NoSuchAlgorithmException, InvalidKeySpecException {
-        String pairingPassword = randomToken(16);
+        String pairingPassword = "KeycardDefaultPairing";
         long pinNumber = randomLong(PIN_BOUND);
         long pukNumber = randomLong(PUK_BOUND);
 
@@ -67,9 +63,18 @@ public class SmartCardSecrets {
     }
 
     public static String randomToken(int length) {
-        char[] possibleCharacters = "23456789ABCDEFGHJKLMNPRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
-        String randomStr = RandomStringUtils.random(length, 0, possibleCharacters.length-1, false, false, possibleCharacters, new SecureRandom());
-        return randomStr;
+        SecureRandom random = new SecureRandom();
+        char[] possibleCharacters = "abcdefghijkmnpqrstuvwxyz".toCharArray();
+        char[] possibleDigits = "23456789".toCharArray();
+        StringBuffer buffer = new StringBuffer(length);
+
+        for (int i = 0; i < length; i++) {
+            char[] src = (i % 2) == 0 ? possibleCharacters : possibleDigits;
+            int idx = random.nextInt(src.length);
+            buffer.append(src[idx]);
+        }
+
+        return buffer.toString();
     }
 
     public static byte[] randomBytes(int length) {

docs/usage.md

@@ -100,7 +100,7 @@ Keycard.pair(password).then(pairing => console.log(pairing));
 ```
 
 `pairing` object contains pairing key as base64 string. 
-You will need pairing key to open secure channel for most keycard operations. More info on pairing https://status.im/keycard_api/sdk_securechannel.html
+You will need pairing key to open secure channel for most keycard operations. More info on pairing https://keycard.tech/docs/sdk/securechannel.html
 
 ### Generate mnemonic phrase
 ```javascript
@@ -154,7 +154,7 @@ Keycard.generateAndLoadKey(mnemonic, pairing, pin).then(data => console.log(data
 
 `encryption-public-key` is public key with derivation path `m/43'/60'/1581'/1'/0`
 
-More info about key derivation: https://status.im/keycard_api/sdk_derivation_sign.html
+More info about key derivation: https://keycard.tech/docs/sdk/derivation_sign.html
 
 ### Get keys from keycard
 ```javascript
@@ -205,18 +205,7 @@ Recovery ID: `0`
 
 Would produce signature: `d684afb4ec9ce59f2d112a9c9400bd04f5a5b2518b251dba4ad135448f2e75367c2ea6412893d8001ed9c9efeb7c7d37bc11f7dfcf27c4818cf0861da199de1900`
 
-More info about signing: https://status.im/keycard_api/sdk_derivation_sign.html
-
-### Derive key
-Changes derivation path:
-```javascript
-const path = "m/44'/60'/0'/0/0"
-const pairing = "AFFdkP01GywuaJRQkGDq+OyPHBE9nECEDDCfXhpfaxlo";
-const pin = "123456";
-
-Keycard.deriveKey(path, pairing, pin).then(path => console.log("path changed to " + path));
-```
-More information on key derivation: https://status.im/keycard_api/sdk_derivation_sign.html
+More info about signing: https://keycard.tech/docs/sdk/derivation_sign.html
 
 ### Remove key
 Removes master key from keycard:
@@ -278,11 +267,5 @@ const newPin = "111111";
 Keycard.removeKey(pairing, puk, newPin).then(() => console.log("pin unblocked"));
 ```
 
-### Install applet
-Keycard usually comes with installed applet. But if you have empty keycard without the applet, you can install applet with:
-```javascript
-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.

index.js

@@ -1,6 +1,5 @@
-
 import { NativeModules } from 'react-native';
 
 const { RNStatusKeycard } = NativeModules;
 
-export default RNStatusKeycard;
+export default RNStatusKeycard;

ios/SmartCard.swift

@@ -0,0 +1,608 @@
+import Foundation
+import Keycard
+import os.log
+
+enum SmartCardError: Error {
+    case invalidBase64
+    case noPairing
+}
+
+enum DerivationPath: String {
+  case masterPath = "m"
+  case rootPath = "m/44'/60'/0'/0"
+  case walletPath = "m/44'/60'/0'/0/0"
+  case whisperPath = "m/43'/60'/1581'/0'/0"
+  case encryptionPath = "m/43'/60'/1581'/1'/0"
+}
+
+class SmartCard {
+    var pairings: [String: String] = [:]
+    var caPubKeys: [String] = []
+    var skipVerificationUID: String = ""
+
+    func initialize(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let puk = self.randomPUK()
+      let pairingPassword = "KeycardDefaultPairing"
+
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      try cmdSet.select().checkOK()
+      try cmdSet.initialize(pin: pin, puk: puk, pairingPassword: pairingPassword).checkOK()
+
+      resolve(["pin": pin, "puk": puk, "password": pairingPassword])
+    }
+
+    func pair(channel: CardChannel, pairingPassword: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      let info = try ApplicationInfo(cmdSet.select().checkOK().data)
+
+      logAppInfo(info)
+
+      try cmdSet.autoPair(password: pairingPassword)
+      let pairing = Data(cmdSet.pairing!.bytes).base64EncodedString()
+      self.pairings[bytesToHex(info.instanceUID)] = pairing
+      resolve(pairing)
+    }
+
+    func generateMnemonic(channel: CardChannel, words: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try securedCommandSet(channel: channel)
+
+      let mnemonic = try Mnemonic(rawData: cmdSet.generateMnemonic(length: GenerateMnemonicP1.length12Words).checkOK().data)
+      mnemonic.wordList = words.components(separatedBy: .newlines)
+
+      resolve(mnemonic.toMnemonicPhrase())
+    }
+
+    func generateAndLoadKey(channel: CardChannel, mnemonic: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let exportOption = cmdSet.info!.appVersion < 0x0310 ? KeycardCommandSet.ExportOption.publicOnly : .extendedPublic
+        
+      let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic)
+      let keyPair = BIP32KeyPair(fromSeed: seed)
+
+      try cmdSet.loadKey(keyPair: keyPair).checkOK()
+      os_log("keypair loaded to card")
+
+      let rootKeyPair = try exportKey(cmdSet: cmdSet, path: .rootPath, makeCurrent: false, exportOption: exportOption)
+      let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
+      let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false)
+
+      var keys = [
+        "address": bytesToHex(keyPair.toEthereumAddress()),
+        "public-key": bytesToHex(keyPair.publicKey),
+        "wallet-root-address": bytesToHex(rootKeyPair.toEthereumAddress()),
+        "wallet-root-public-key": bytesToHex(rootKeyPair.publicKey),
+        "whisper-address": bytesToHex(whisperKeyPair.toEthereumAddress()),
+        "whisper-public-key": bytesToHex(whisperKeyPair.publicKey),
+        "whisper-private-key": bytesToHex(whisperKeyPair.privateKey!),
+        "encryption-public-key": bytesToHex(encryptionKeyPair.publicKey)
+      ]
+        
+      if rootKeyPair.isExtended {
+        keys["wallet-root-chain-code"] = bytesToHex(rootKeyPair.chainCode!)
+      } //else { (for now we return both keys, because xpub support is not yet available)
+        let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: false, publicOnly: true)
+        keys["wallet-address"] = bytesToHex(walletKeyPair.toEthereumAddress())
+        keys["wallet-public-key"] = bytesToHex(walletKeyPair.publicKey)
+      //}
+        
+      let info = try ApplicationInfo(cmdSet.select().checkOK().data)
+      keys["instance-uid"] = bytesToHex(info.instanceUID)
+      keys["key-uid"] = bytesToHex(info.keyUID)
+    
+      resolve(keys)
+    }
+
+    func saveMnemonic(channel: CardChannel, mnemonic: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic)
+      try cmdSet.loadKey(seed: seed).checkOK()
+      os_log("seed loaded to card")
+      resolve(true)
+    }
+
+    func factoryResetPost(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let info = try ApplicationInfo(KeycardCommandSet(cardChannel: channel).select().checkOK().data)
+      os_log("Selecting the factory reset Keycard applet succeeded")
+
+      var cardInfo = [String: Any]()
+      cardInfo["initialized?"] = info.initializedCard
+
+      resolve(cardInfo)
+    }
+
+    func factoryResetFallback(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet: GlobalPlatformCommandSet = GlobalPlatformCommandSet(cardChannel: channel)
+      try cmdSet.select().checkOK()
+      os_log("ISD selected")
+
+      try cmdSet.openSecureChannel()
+      os_log("SecureChannel opened")
+
+      try cmdSet.deleteKeycardInstance().checkSW(StatusWord.ok, StatusWord.referencedDataNotFound)
+      os_log("Keycard applet instance deleted")
+
+      try cmdSet.installKeycardInstance().checkOK()
+      os_log("Keycard applet instance re-installed")
+
+      try factoryResetPost(channel: channel, resolve: resolve, reject: reject)
+    }
+
+    func factoryReset(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      var resp = try cmdSet.select()
+      
+      if (resp.sw != 0x9000) {
+        try factoryResetFallback(channel: channel, resolve: resolve, reject: reject)
+        return
+      }
+
+      let info = try ApplicationInfo(resp.data)
+      if (!info.hasFactoryResetCapability) {
+        try factoryResetFallback(channel: channel, resolve: resolve, reject: reject)
+        return
+      }
+
+      resp = try cmdSet.factoryReset()
+
+      if (resp.sw != 0x9000) {
+        try factoryResetFallback(channel: channel, resolve: resolve, reject: reject)
+        return
+      }
+
+      try factoryResetPost(channel: channel, resolve: resolve, reject: reject)
+    }
+    
+    func verifyCard(channel: CardChannel, challenge: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws {
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      try cmdSet.select().checkOK()
+      let rawChallenge = hexToBytes(challenge)
+      let data = try cmdSet.identifyCard(challenge: rawChallenge).checkOK().data
+      let caPubKey = try Certificate.verifyIdentity(hash: rawChallenge, tlvData: data)
+
+      resolve([
+        "ca-public-key": bytesToHex(caPubKey ?? []),
+        "tlv-data": bytesToHex(data)
+      ])
+    }
+
+    private func verifyAuthenticity(cmdSet: KeycardCommandSet, instanceUID: String) throws -> Bool {
+      if (self.caPubKeys.count == 0 || self.skipVerificationUID == instanceUID) {
+        self.skipVerificationUID = ""
+        return true
+      }
+
+      let rawChallenge = (0..<32).map({ _ in UInt8.random(in: 0...UInt8.max) })
+      
+      do {
+        let data = try cmdSet.identifyCard(challenge: rawChallenge).checkOK().data
+        let caPubKey = try Certificate.verifyIdentity(hash: rawChallenge, tlvData: data)
+
+        if let caPubKeyBytes = caPubKey {
+          return self.caPubKeys.contains(bytesToHex(caPubKeyBytes))
+        }
+      } catch _ as StatusWord {}
+
+      return false
+    }
+
+    func getApplicationInfo(channel: CardChannel, eventEmitter: RCTEventEmitter, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      let info = try ApplicationInfo(cmdSet.select().checkOK().data)
+
+      os_log("Card initialized? %@", String(info.initializedCard))
+      var cardInfo = [String: Any]()
+      cardInfo["initialized?"] = info.initializedCard
+
+      if (info.initializedCard) {
+        logAppInfo(info)
+        let cardName = try cardNameOrDefault(cmdSet: cmdSet)
+        cardInfo["card-name"] = cardName
+        
+        var isPaired = false
+        var isAuthentic = false
+        let instanceUID = bytesToHex(info.instanceUID)
+
+        if let _ = self.pairings[instanceUID] {
+          do {
+            try openSecureChannel(cmdSet: cmdSet)
+            isPaired = true
+            isAuthentic = true
+          } catch _ as CardError {
+            isPaired = false
+          } catch _ as StatusWord {
+            isPaired = false
+          }
+        } 
+        
+        if (!isPaired) {
+          isAuthentic = try verifyAuthenticity(cmdSet: cmdSet, instanceUID: instanceUID)
+
+          if (isAuthentic) {
+            isPaired = try tryDefaultPairing(cmdSet: cmdSet, eventEmitter: eventEmitter, cardInfo: &cardInfo)
+          }
+        }
+
+        cardInfo["authentic?"] = isAuthentic
+
+        if (isPaired) {
+          let status = try ApplicationStatus(cmdSet.getStatus(info: GetStatusP1.application.rawValue).checkOK().data)
+          os_log("PIN retry counter: %d", status.pinRetryCount)
+          os_log("PUK retry counter: %d", status.pukRetryCount)
+
+          cardInfo["pin-retry-counter"] = status.pinRetryCount
+          cardInfo["puk-retry-counter"] = status.pukRetryCount
+        }
+
+        cardInfo["paired?"] = isPaired
+      }
+
+      cardInfo["has-master-key?"] = info.hasMasterKey
+      cardInfo["instance-uid"] = bytesToHex(info.instanceUID)
+      cardInfo["key-uid"] = bytesToHex(info.keyUID)
+      cardInfo["secure-channel-pub-key"] = bytesToHex(info.secureChannelPubKey)
+      cardInfo["app-version"] = info.appVersionString
+      cardInfo["free-pairing-slots"] = info.freePairingSlots
+
+      resolve(cardInfo)
+    }
+
+    func deriveKey(channel: CardChannel, path: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let currentPath = try KeyPath(data: cmdSet.getStatus(info: GetStatusP1.keyPath.rawValue).checkOK().data)
+      os_log("Current key path: %@", currentPath.description)
+
+      if (currentPath.description != path) {
+        try cmdSet.deriveKey(path: path).checkOK()
+        os_log("Derived %@", path)
+      }
+
+      resolve(true)
+    }
+
+    func exportKey(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let key = try cmdSet.exportCurrentKey(publicOnly: true).checkOK().data
+      resolve(bytesToHex(key))
+    }
+
+    func exportKeyWithPath(channel: CardChannel, pin: String, path: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let key = try BIP32KeyPair(fromTLV: cmdSet.exportKey(path: path, makeCurrent: false, publicOnly: true).checkOK().data).publicKey
+
+      resolve(bytesToHex(key))
+    }
+
+    func importKeys(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let info = cmdSet.info!
+      let exportOption = info.appVersion < 0x0310 ? KeycardCommandSet.ExportOption.publicOnly : .extendedPublic
+
+      let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false)
+      let masterPair = try exportKey(cmdSet: cmdSet, path: .masterPath, makeCurrent: false, publicOnly: true)
+      let rootKeyPair = try exportKey(cmdSet: cmdSet, path: .rootPath, makeCurrent: false, exportOption: exportOption)
+      let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
+
+      var keys = [
+        "address": bytesToHex(masterPair.toEthereumAddress()),
+        "public-key": bytesToHex(masterPair.publicKey),
+        "wallet-root-address": bytesToHex(rootKeyPair.toEthereumAddress()),
+        "wallet-root-public-key": bytesToHex(rootKeyPair.publicKey),
+        "whisper-address": bytesToHex(whisperKeyPair.toEthereumAddress()),
+        "whisper-public-key": bytesToHex(whisperKeyPair.publicKey),
+        "whisper-private-key": bytesToHex(whisperKeyPair.privateKey!),
+        "encryption-public-key": bytesToHex(encryptionKeyPair.publicKey),
+        "instance-uid": bytesToHex(info.instanceUID),
+        "key-uid": bytesToHex(info.keyUID)
+      ]
+        
+      if rootKeyPair.isExtended {
+        keys["wallet-root-chain-code"] = bytesToHex(rootKeyPair.chainCode!)
+      } //else { (see note above)
+        let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: false, publicOnly: true)
+        keys["wallet-address"] = bytesToHex(walletKeyPair.toEthereumAddress())
+        keys["wallet-public-key"] = bytesToHex(walletKeyPair.publicKey)
+      //}
+        
+      resolve(keys)
+    }
+
+    func getKeys(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+
+      let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
+      let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false)
+
+      let info = cmdSet.info!
+
+      resolve([
+        "whisper-address": bytesToHex(whisperKeyPair.toEthereumAddress()),
+        "whisper-public-key": bytesToHex(whisperKeyPair.publicKey),
+        "whisper-private-key": bytesToHex(whisperKeyPair.privateKey!),
+        "encryption-public-key": bytesToHex(encryptionKeyPair.publicKey),
+        "instance-uid": bytesToHex(info.instanceUID),
+        "key-uid": bytesToHex(info.keyUID)
+      ])
+    }
+
+    func sign(channel: CardChannel, pin: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let sig = try processSignature(message) { return try cmdSet.sign(hash: $0) }
+      resolve(sig)
+    }
+
+    func signWithPath(channel: CardChannel, pin: String, path: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let sig = try processSignature(message) {
+        if (cmdSet.info!.appVersion < 0x0202) {
+          let currentPath = try KeyPath(data: cmdSet.getStatus(info: GetStatusP1.keyPath.rawValue).checkOK().data)
+
+          if (currentPath.description != path) {
+            try cmdSet.deriveKey(path: path).checkOK()
+          }
+
+          return try cmdSet.sign(hash: $0)
+        } else {
+          return try cmdSet.sign(hash: $0, path: path, makeCurrent: false)
+        }
+      }
+
+      resolve(sig)
+    }
+
+    func signPinless(channel: CardChannel, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = CashCommandSet(cardChannel: channel)
+      try cmdSet.select().checkOK()
+
+      let sig = try processSignature(message) { return try cmdSet.sign(data: $0) }
+      resolve(sig)
+    }
+
+    func verifyPin(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let _ = try authenticatedCommandSet(channel: channel, pin: pin)
+      resolve(3)
+    }
+
+    func changePairingPassword(channel: CardChannel, pin: String, pairingPassword: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      try cmdSet.changePairingPassword(pairingPassword: pairingPassword).checkOK()
+      os_log("pairing password changed")
+      resolve(true)
+    }
+
+    func changePUK(channel: CardChannel, pin: String, puk: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      try cmdSet.changePUK(puk: puk).checkOK()
+      os_log("puk changed")
+      resolve(true)
+    }
+
+    func changePin(channel: CardChannel, currentPin: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: currentPin)
+      try cmdSet.changePIN(pin: newPin).checkOK()
+      os_log("pin changed")
+      resolve(true)
+    }
+
+    func unblockPin(channel: CardChannel, puk: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try securedCommandSet(channel: channel)
+      try cmdSet.unblockPIN(puk: puk, newPIN: newPin).checkAuthOK()
+      os_log("pin unblocked")
+      resolve(true)
+    }
+
+    func unpair(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+
+      try cmdSet.autoUnpair()
+      os_log("card unpaired")
+
+      self.pairings[bytesToHex(cmdSet.info!.instanceUID)] = nil
+      resolve(true)
+    }
+
+    func removeKey(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      try cmdSet.removeKey().checkOK()
+      os_log("key removed")
+
+      resolve(true)
+    }
+
+    func removeKeyWithUnpair(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      try cmdSet.removeKey().checkOK()
+      os_log("key removed")
+
+      try cmdSet.unpairOthers()
+      os_log("unpaired others")
+
+      try cmdSet.autoUnpair()
+      os_log("card unpaired")
+
+      self.pairings[bytesToHex(cmdSet.info!.instanceUID)] = nil
+
+      resolve(true)
+    }
+    
+    func getCardName(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      try cmdSet.select().checkOK()
+      resolve(try cardNameOrDefault(cmdSet: cmdSet))
+    }
+    
+    func setCardName(channel: CardChannel, pin: String, name: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
+      let m = Metadata(name)
+      try cmdSet.storeData(data: m.serialize(), type: Keycard.StoreDataP1.publicData.rawValue).checkOK()
+      resolve(true)
+    }
+
+    func randomPUK() -> String {
+      return String(format: "%012ld", Int64.random(in: 0..<999999999999))
+    }
+
+    func randomPairingPassword() -> String {
+      let digits = "23456789"
+      let letters = "abcdefghijkmnopqrstuvwxyz"
+      return String((0..<5).map{ i in ((i % 2) == 0) ? letters.randomElement()! : digits.randomElement()! })
+    }
+
+    func exportKey(cmdSet: KeycardCommandSet, path: DerivationPath, makeCurrent: Bool, publicOnly: Bool) throws -> BIP32KeyPair {
+      let option = publicOnly ? KeycardCommandSet.ExportOption.publicOnly : KeycardCommandSet.ExportOption.privateAndPublic
+      return try exportKey(cmdSet: cmdSet, path: path, makeCurrent: makeCurrent, exportOption: option)
+    }
+    
+    func exportKey(cmdSet: KeycardCommandSet, path: DerivationPath, makeCurrent: Bool, exportOption: KeycardCommandSet.ExportOption) throws -> BIP32KeyPair {
+      let tlvRoot = try cmdSet.exportKey(path: path.rawValue, makeCurrent: makeCurrent, exportOption: exportOption).checkOK().data
+      os_log("Derived %@", path.rawValue)
+      return try BIP32KeyPair(fromTLV: tlvRoot)
+    }
+    
+    func cardNameOrDefault(cmdSet: KeycardCommandSet) throws -> String {
+      let data = try cmdSet.getData(type: Keycard.StoreDataP1.publicData.rawValue).checkOK().data
+      
+      if data.count > 0 {
+        do {
+          return try Metadata.fromData(data).cardName
+        } catch _ {}
+      }
+      
+      return ""
+    }
+
+    func setPairings(newPairings: NSDictionary, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      self.pairings.removeAll()
+      for case let (instanceUID as String, v as NSDictionary) in newPairings {
+        self.pairings[instanceUID] = v["pairing"] as? String
+      }
+
+      resolve(true)
+    }
+
+    func setCertificationAuthorities(newCAPubKeys: NSArray, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      self.caPubKeys.removeAll()
+      for caPubKey in (newCAPubKeys as! [String]) {
+        self.caPubKeys.append(caPubKey)
+      }
+
+      resolve(true)
+    }
+
+    func setOneTimeVerificationSkip(instanceUID: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      self.skipVerificationUID = instanceUID
+      resolve(true)
+    }
+
+    func authenticatedCommandSet(channel: CardChannel, pin: String) throws -> KeycardCommandSet {
+      let cmdSet = try securedCommandSet(channel: channel)
+      try cmdSet.verifyPIN(pin: pin).checkAuthOK()
+      os_log("pin verified")
+
+      return cmdSet
+    }
+
+    func securedCommandSet(channel: CardChannel) throws -> KeycardCommandSet {
+      let cmdSet = KeycardCommandSet(cardChannel: channel)
+      try cmdSet.select().checkOK()
+      try openSecureChannel(cmdSet: cmdSet)
+
+      return cmdSet
+    }
+
+    func tryDefaultPairing(cmdSet: KeycardCommandSet, eventEmitter: RCTEventEmitter, cardInfo: inout [String: Any]) throws -> Bool {
+      do {
+        try cmdSet.autoPair(password: "KeycardDefaultPairing")
+        let pairing = Data(cmdSet.pairing!.bytes).base64EncodedString()
+        let instanceUID = bytesToHex(cmdSet.info!.instanceUID)
+        self.pairings[instanceUID] = pairing
+        cardInfo["new-pairing"] = pairing
+        eventEmitter.sendEvent(withName: "keyCardNewPairing", body: ["pairing": pairing, "instanceUID": instanceUID])
+        try openSecureChannel(cmdSet: cmdSet)
+        return true
+      } catch let error as CardError {
+        os_log("autoOpenSecureChannel failed: %@", String(describing: error))
+      } catch let error as StatusWord {
+        os_log("autoOpenSecureChannel failed: %@", String(describing: error))
+      }
+
+      return false
+    }
+
+    func openSecureChannel(cmdSet: KeycardCommandSet) throws -> Void {
+      if let pairingBase64 = self.pairings[bytesToHex(cmdSet.info!.instanceUID)] {
+        cmdSet.pairing = try base64ToPairing(pairingBase64)
+
+        try cmdSet.autoOpenSecureChannel()
+        os_log("secure channel opened")
+      } else {
+        throw SmartCardError.noPairing
+      }
+    }
+
+    func processSignature(_ message: String, sign: ([UInt8]) throws -> APDUResponse) throws -> String {
+      let hash = hexToBytes(message)
+      let signature = try RecoverableSignature(hash: hash, data: sign(hash).checkOK().data)
+      logSignature(hash, signature)
+      return formatSignature(signature)
+    }
+
+    func base64ToPairing(_ base64: String) throws -> Pairing {
+      if let data = Data(base64Encoded: base64) {
+        return Pairing(pairingData: [UInt8](data))
+      } else {
+        throw SmartCardError.invalidBase64
+      }
+    }
+
+    func logAppInfo(_ info: ApplicationInfo) -> Void {
+      os_log("Instance UID: %@", bytesToHex(info.instanceUID))
+      os_log("Key UID: %@", bytesToHex(info.keyUID))
+      os_log("Secure channel public key: %@", bytesToHex(info.secureChannelPubKey))
+      os_log("Application version: %@", info.appVersionString)
+      os_log("Free pairing slots: %d", info.freePairingSlots)
+    }
+
+    func logSignature(_ hash: [UInt8], _ signature: RecoverableSignature) -> Void {
+      os_log("Signed hash: %@", bytesToHex(hash))
+      os_log("Recovery ID: %d", signature.recId)
+      os_log("R: %@", bytesToHex(signature.r))
+      os_log("S: %@", bytesToHex(signature.s))
+    }
+
+    func formatSignature(_ signature: RecoverableSignature) -> String {
+      var out = Data(signature.r)
+      out.append(contentsOf: signature.s)
+      out.append(contentsOf: [signature.recId])
+      let sig = dataToHex(out)
+
+      os_log("Signature: %@", sig)
+      return sig
+    }
+
+    func dataToHex(_ data: Data) -> String {
+      return data.map { String(format: "%02hhx", $0) }.joined()
+    }
+
+    func bytesToHex(_ bytes: [UInt8]) -> String {
+      return bytes.map { String(format: "%02hhx", $0) }.joined()
+    }
+
+    func hexToBytes(_ hex: String) -> [UInt8] {
+      let h = hex.starts(with: "0x") ? String(hex.dropFirst(2)) : hex
+
+      var last = h.first
+        return h.dropFirst().compactMap {
+          guard
+            let lastHexDigitValue = last?.hexDigitValue,
+            let hexDigitValue = $0.hexDigitValue
+          else {
+            last = $0
+            return nil
+          }
+      defer {
+        last = nil
+      }
+        return UInt8(lastHexDigitValue * 16 + hexDigitValue)
+      }
+    }
+}

ios/StatusKeycard-Bridging-Header.h

@@ -0,0 +1,2 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>

ios/StatusKeycard.m

@@ -0,0 +1,46 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNStatusKeycard, StatusKeycard, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(nfcIsSupported:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(nfcIsEnabled:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(openNfcSettings:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(init:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(pair:(NSString *)pairingPassword resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(generateMnemonic:(NSString *)words resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(generateAndLoadKey:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(saveMnemonic:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getApplicationInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(factoryReset:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(verifyCard:(NSString *)challenge resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(deriveKey:(NSString *)path pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(exportKey:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(exportKeyWithPath:(NSString *)pin path:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(importKeys:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getKeys:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(sign:(NSString *)pin hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(signWithPath:(NSString *)pin path:(NSString *)path hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(signPinless:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(installApplet:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(installAppletAndInitCard:(String *)pin resolve: (RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(verifyPin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(changePairingPassword:(NSString *)pin pairingPassword:(NSString *)pairingPassword resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(changePUK:(NSString *)pin puk:(NSString *)puk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(changePin:(NSString *)currentPin newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(unblockPin:(NSString *)puk newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(unpair:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(delete:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(removeKey:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(removeKeyWithUnpair:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getCardName:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setCardName:(NSString *)pin name:(NSString *)name resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(unpairAndDelete:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(startNFC:(NSString *)prompt resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(stopNFC:(NSString *)err resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setNFCMessage:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setPairings:(NSDictionary *)pairings resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setCertificationAuthorities:(NSArray *)caPubKeys resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setOneTimeVerificationSkip:(NSString *)instanceUID resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
+
+@end

ios/StatusKeycard.swift

@@ -0,0 +1,318 @@
+import Foundation
+import Keycard
+import UIKit
+import os.log
+
+@objc(StatusKeycard)
+class StatusKeycard: RCTEventEmitter {
+    let smartCard = SmartCard()
+    var cardChannel: CardChannel? = nil
+    var nfcStartPrompt: String = "Hold your iPhone near a Status Keycard."
+
+    private var _keycardController: Any? = nil
+    
+    @available(iOS 13.0, *)
+    private var keycardController: KeycardController? {
+      get {
+        return _keycardController as? KeycardController
+      }
+
+      set(kc) {
+        _keycardController = kc
+      }
+    }
+
+    @objc
+    func nfcIsSupported(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      if #available(iOS 13.0, *) {
+        resolve(KeycardController.isAvailable)
+      } else {
+        resolve(false)
+      }
+    }
+
+    @objc
+    func nfcIsEnabled(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      // On iOS NFC is always enabled (if available)
+      nfcIsSupported(resolve, reject: reject)
+    }
+
+    @objc
+    func openNfcSettings(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      // NFC cannot be enabled/disabled
+      reject("E_KEYCARD", "Unsupported on iOS", nil)
+    }
+
+    @objc
+    func `init`(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.initialize(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func pair(_ pairingPassword: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.pair(channel: channel, pairingPassword: pairingPassword, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func generateMnemonic(_ words: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateMnemonic(channel: channel, words: words, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func generateAndLoadKey(_ mnemonic: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateAndLoadKey(channel: channel, mnemonic: mnemonic, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func saveMnemonic(_ mnemonic: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.saveMnemonic(channel: channel, mnemonic: mnemonic, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func factoryReset(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.factoryReset(channel: channel, resolve: resolve, reject: reject) }
+    }
+    
+    @objc
+    func verifyCard(_ challenge: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyCard(channel: channel, challenge: challenge, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func getApplicationInfo(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getApplicationInfo(channel: channel, eventEmitter: self, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func deriveKey(_ path: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.deriveKey(channel: channel, path: path, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func exportKey(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKey(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func exportKeyWithPath(_ pin: String, path: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKeyWithPath(channel: channel, pin: pin, path: path, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func importKeys(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.importKeys(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func getKeys(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getKeys(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func sign(_ pin: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.sign(channel: channel, pin: pin, message: hash, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func signWithPath(_ pin: String, path: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.signWithPath(channel: channel, pin: pin, path: path, message: hash, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func signPinless(_ hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.signPinless(channel: channel, message: hash, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func installApplet(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      reject("E_KEYCARD", "Not implemented (unused)", nil)
+    }
+
+    @objc
+    func installAppletAndInitCard(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      reject("E_KEYCARD", "Not implemented (unused)", nil)
+    }
+
+    @objc
+    func verifyPin(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyPin(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func changePairingPassword(_ pin: String, pairingPassword: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePairingPassword(channel: channel, pin: pin, pairingPassword: pairingPassword, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func changePUK(_ pin: String, puk: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePUK(channel: channel, pin: pin, puk: puk, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func changePin(_ currentPin: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePin(channel: channel, currentPin: currentPin, newPin: newPin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func unblockPin(_ puk: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unblockPin(channel: channel, puk: puk, newPin: newPin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func unpair(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unpair(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func delete(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      reject("E_KEYCARD", "Not implemented (unused)", nil)
+    }
+
+    @objc
+    func removeKey(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKey(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func removeKeyWithUnpair(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKeyWithUnpair(channel: channel, pin: pin, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func getCardName(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getCardName(channel: channel, resolve: resolve, reject: reject) }
+    }
+    
+    @objc
+    func setCardName(_ pin: String, name: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.setCardName(channel: channel, pin: pin, name: name, resolve: resolve, reject: reject) }
+    }
+
+    @objc
+    func unpairAndDelete(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      reject("E_KEYCARD", "Not implemented (unused)", nil)
+    }
+
+    @objc
+    func setPairings(_ pairings: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      self.smartCard.setPairings(newPairings: pairings, resolve: resolve, reject: reject)
+    }
+
+    @objc
+    func setCertificationAuthorities(_ caPubKeys: NSArray, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      self.smartCard.setCertificationAuthorities(newCAPubKeys: caPubKeys, resolve: resolve, reject: reject)
+    }
+
+    @objc
+    func setOneTimeVerificationSkip(_ instanceUID: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      self.smartCard.setOneTimeVerificationSkip(instanceUID: instanceUID, resolve: resolve, reject: reject)
+    }
+
+    @objc
+    func startNFC(_ prompt: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      if #available(iOS 13.0, *) {
+        if (keycardController == nil) {
+          self.keycardController = KeycardController(onConnect: { [unowned self] channel in
+            self.cardChannel = channel
+
+            let feedbackGenerator = UINotificationFeedbackGenerator()
+            feedbackGenerator.prepare()
+
+            DispatchQueue.main.async {
+              feedbackGenerator.notificationOccurred(.success)
+            }
+            self.sendEvent(withName: "keyCardOnConnected", body: nil)
+            self.keycardController?.setAlert("Connected. Don't move your card.")
+            os_log("[react-native-status-keycard] card connected")
+          }, onFailure: { [unowned self] error in
+            self.cardChannel = nil
+            self.keycardController = nil
+
+            os_log("[react-native-status-keycard] NFCError: %@", String(describing: error))
+
+            if type(of: error) is NSError.Type {
+              let nsError = error as NSError
+              if nsError.code == 200 && nsError.domain == "NFCError" {
+                self.sendEvent(withName: "keyCardOnNFCUserCancelled", body: nil)
+              } else if (nsError.code == 201 || nsError.code == 203) && (nsError.domain == "NFCError") {
+                self.sendEvent(withName: "keyCardOnNFCTimeout", body: nil)
+              }
+            }
+          })
+
+          self.nfcStartPrompt = prompt.isEmpty ? "Hold your iPhone near a Status Keycard." : prompt
+          keycardController?.start(alertMessage: self.nfcStartPrompt)
+          resolve(true)
+        } else {
+          reject("E_KEYCARD", "already started", nil)
+        }
+      } else {
+        reject("E_KEYCARD", "unavailable", nil)
+      }
+    }
+
+    @objc
+    func stopNFC(_ err: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      if #available(iOS 13.0, *) {
+        if (err.isEmpty) {
+          self.keycardController?.stop(alertMessage: "Success")
+        } else {
+          self.keycardController?.stop(errorMessage: err)
+        }
+        self.cardChannel = nil
+        self.keycardController = nil
+        resolve(true)
+      } else {
+        reject("E_KEYCARD", "unavailable", nil)
+      }
+    }
+
+    @objc
+    func setNFCMessage(_ message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      if #available(iOS 13.0, *) {
+        self.keycardController?.setAlert(message)
+        resolve(true)
+      } else {
+        reject("E_KEYCARD", "unavailable", nil)
+      }
+    }
+
+    override static func requiresMainQueueSetup() -> Bool {
+      return true
+    }
+
+    override func supportedEvents() -> [String]! {
+      return ["keyCardOnConnected", "keyCardOnDisconnected", "keyCardOnNFCEnabled", "keyCardOnNFCDisabled", "keyCardOnNFCTimeout", "keyCardOnNFCUserCancelled"]
+    }
+
+    func keycardInvokation(_ reject: @escaping RCTPromiseRejectBlock, body: @escaping (CardChannel) throws -> Void) {
+      if #available(iOS 13.0, *) {
+        if self.cardChannel != nil {
+          DispatchQueue.global().async { [unowned self] in
+            do {
+              try body(self.cardChannel!)
+            } catch {
+              var errMsg = ""
+
+              if type(of: error) is NSError.Type {
+                let nsError = error as NSError
+                errMsg = "\(nsError.domain):\(nsError.code)"
+                if (nsError.code == 100 || nsError.code == 102) && nsError.domain == "NFCError" {
+                  self.sendEvent(withName: "keyCardOnDisconnected", body: nil)
+                  self.keycardController?.restartPolling()
+                  self.keycardController?.setAlert(self.nfcStartPrompt)
+                }
+              } else {
+                errMsg = "\(error)"
+              }
+              reject("E_KEYCARD", errMsg, error)
+            }
+          }
+        } else {
+          reject("E_KEYCARD", "not connected", nil)
+        }
+      } else {
+        reject("E_KEYCARD", "unavailable", nil)
+      }
+    }
+}

ios/StatusKeycard.xcodeproj/project.pbxproj

@@ -0,0 +1,310 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 52;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		65B8C633256D352A00C6A3EE /* Keycard in Frameworks */ = {isa = PBXBuildFile; productRef = 65B8C632256D352A00C6A3EE /* Keycard */; };
+		F4FF95D7245B92E800C19C63 /* StatusKeycard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /* StatusKeycard.swift */; };
+		F74884362577A87A00D908D2 /* SmartCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74884352577A87A00D908D2 /* SmartCard.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		58B511D91A9E6C8500147676 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		134814201AA4EA6300B7C361 /* libStatusKeycard.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libStatusKeycard.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusKeycard.m; sourceTree = "<group>"; };
+		F4FF95D5245B92E700C19C63 /* StatusKeycard-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusKeycard-Bridging-Header.h"; sourceTree = "<group>"; };
+		F4FF95D6245B92E800C19C63 /* StatusKeycard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusKeycard.swift; sourceTree = "<group>"; };
+		F74884352577A87A00D908D2 /* SmartCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartCard.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		58B511D81A9E6C8500147676 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				65B8C633256D352A00C6A3EE /* Keycard in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		134814211AA4EA7D00B7C361 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				134814201AA4EA6300B7C361 /* libStatusKeycard.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		58B511D21A9E6C8500147676 = {
+			isa = PBXGroup;
+			children = (
+				F74884352577A87A00D908D2 /* SmartCard.swift */,
+				F4FF95D6245B92E800C19C63 /* StatusKeycard.swift */,
+				B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */,
+				F4FF95D5245B92E700C19C63 /* StatusKeycard-Bridging-Header.h */,
+				134814211AA4EA7D00B7C361 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		58B511DA1A9E6C8500147676 /* StatusKeycard */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "StatusKeycard" */;
+			buildPhases = (
+				58B511D71A9E6C8500147676 /* Sources */,
+				58B511D81A9E6C8500147676 /* Frameworks */,
+				58B511D91A9E6C8500147676 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = StatusKeycard;
+			packageProductDependencies = (
+				65B8C632256D352A00C6A3EE /* Keycard */,
+			);
+			productName = RCTDataManager;
+			productReference = 134814201AA4EA6300B7C361 /* libStatusKeycard.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		58B511D31A9E6C8500147676 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0920;
+				ORGANIZATIONNAME = Facebook;
+				TargetAttributes = {
+					58B511DA1A9E6C8500147676 = {
+						CreatedOnToolsVersion = 6.1.1;
+					};
+				};
+			};
+			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "StatusKeycard" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				English,
+				en,
+			);
+			mainGroup = 58B511D21A9E6C8500147676;
+			packageReferences = (
+				65B8C631256D352A00C6A3EE /* XCRemoteSwiftPackageReference "Keycard" */,
+			);
+			productRefGroup = 58B511D21A9E6C8500147676;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				58B511DA1A9E6C8500147676 /* StatusKeycard */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		58B511D71A9E6C8500147676 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F4FF95D7245B92E800C19C63 /* StatusKeycard.swift in Sources */,
+				F74884362577A87A00D908D2 /* SmartCard.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		58B511ED1A9E6C8500147676 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				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;
+				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		58B511EE1A9E6C8500147676 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				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;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		58B511F01A9E6C8500147676 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../../React/**",
+					"$(SRCROOT)/../../react-native/React/**",
+				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = StatusKeycard;
+				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "StatusKeycard-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+			};
+			name = Debug;
+		};
+		58B511F11A9E6C8500147676 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../../React/**",
+					"$(SRCROOT)/../../react-native/React/**",
+				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = StatusKeycard;
+				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "StatusKeycard-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "StatusKeycard" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				58B511ED1A9E6C8500147676 /* Debug */,
+				58B511EE1A9E6C8500147676 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "StatusKeycard" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				58B511F01A9E6C8500147676 /* Debug */,
+				58B511F11A9E6C8500147676 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		65B8C631256D352A00C6A3EE /* XCRemoteSwiftPackageReference "Keycard" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/status-im/Keycard.swift";
+			requirement = {
+				branch = master;
+				kind = branch;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		65B8C632256D352A00C6A3EE /* Keycard */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 65B8C631256D352A00C6A3EE /* XCRemoteSwiftPackageReference "Keycard" */;
+			productName = Keycard;
+		};
+/* End XCSwiftPackageProductDependency section */
+	};
+	rootObject = 58B511D31A9E6C8500147676 /* Project object */;
+}

package.json

@@ -1,12 +1,12 @@
 {
   "name": "react-native-status-keycard",
-  "homepage": "https://keycard.status.im/",
-  "version": "2.5.17",
-  "description": "React Native library to interact with Status Keycard using NFC connection (Android only)",
+  "homepage": "https://keycard.tech/",
+  "version": "2.6.2",
+  "description": "React Native library to interact with Status Keycard using NFC connection",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "Dmitry Novotochinov",
+  "author": "Michele Balistreri",
   "license": "MPL 2.0"
 }

react-native-status-keycard.podspec

@@ -0,0 +1,22 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "react-native-status-keycard"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "10.0" }
+  s.source       = { :git => "https://github.com/status-im/react-native-status-keycard.git", :tag => "#{s.version}" }
+
+
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
+
+
+  s.dependency "React"
+  s.dependency "Keycard"
+end