_

.gitignore

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

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

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

@@ -41,10 +41,9 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
     @Override
     public void onHostResume() {
         if (this.smartCard == null) {
-            this.smartCard = new SmartCard(reactContext);
+            this.smartCard = new SmartCard(getCurrentActivity(), reactContext);
+            smartCard.start();
         }
-
-        smartCard.start(getCurrentActivity());
     }
 
     @Override
@@ -53,12 +52,13 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
 
     @Override
     public void onHostDestroy() {
+
     }
 
     @ReactMethod
     public void nfcIsSupported(final Promise promise) {
         if (smartCard != null) {
-            promise.resolve(smartCard.isNfcSupported(getCurrentActivity()));
+            promise.resolve(smartCard.isNfcSupported());
         } else {
             promise.resolve(false);
         }
@@ -218,6 +218,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
+
     @ReactMethod
     public void getKeys(final String pairing, final String pin, final Promise promise) {
         new Thread(new Runnable() {
@@ -232,20 +233,6 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
-    @ReactMethod
-    public void importKeys(final String pairing, final String pin, final Promise promise) {
-        new Thread(new Runnable() {
-            public void run() {
-                try {
-                    promise.resolve(smartCard.importKeys(pairing, pin));
-                } catch (IOException | APDUException e) {
-                    Log.d(TAG, e.getMessage());
-                    promise.reject(e);
-                }
-            }
-        }).start();
-    }
-
     @ReactMethod
     public void sign(final String pairing, final String pin, final String hash, final Promise promise) {
         new Thread(new Runnable() {
@@ -445,19 +432,4 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
-    // These three methods below are a nop on Android since NFC is always listening and we have a custom UI. They are needed in iOS to show the NFC dialog
-    @ReactMethod
-    public void startNFC(String prompt, final Promise promise) {
-        promise.resolve(true);
-    }
-
-    @ReactMethod
-    public void stopNFC(String error, final Promise promise) {
-        promise.resolve(true);
-    }
-
-    @ReactMethod
-    public void setNFCMessage(String message, final Promise promise) {
-        promise.resolve(true);
-    }
 }

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

@@ -41,6 +41,8 @@ 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;
@@ -54,9 +56,12 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
     private static final String ENCRYPTION_PATH = "m/43'/60'/1581'/1'/0";
     private static final int WORDS_LIST_SIZE = 2048;
 
-    public SmartCard(ReactContext reactContext) {
+    public SmartCard(Activity activity, 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);
     }
 
@@ -68,31 +73,23 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         Log.d(TAG, s);
     }
 
-    public boolean start(Activity activity) {
-        if(activity == null) {
-            return false;
-        }
-
+    public boolean start() {
         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;
+            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 {
-            log("not support in this device");
-            return false;
-        }
-    }
-
-    public void stop(Activity activity) {
-        if (activity != null && nfcAdapter != null) {
-            nfcAdapter.disableReaderMode(activity);
+            return true;
         }
     }
 
@@ -125,8 +122,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         }
     }
 
-    public boolean isNfcSupported(Activity activity) {
-        return activity != null && activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
+    public boolean isNfcSupported() {
+        return activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
     }
 
     public boolean isNfcEnabled() {
@@ -236,18 +233,14 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
             Boolean isPaired = false;
 
             if (pairingBase64.length() > 0) {
-                Pairing pairing = new Pairing(pairingBase64);
-                cmdSet.setPairing(pairing);
-
                 try {
+                    Pairing pairing = new Pairing(pairingBase64);
+                    cmdSet.setPairing(pairing);
+
                     cmdSet.autoOpenSecureChannel();
                     Log.i(TAG, "secure channel opened");
                     isPaired = true;
-                } catch(APDUException e) {
-                    Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
-                }
 
-                if (isPaired) {
                     ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());
 
                     Log.i(TAG, "PIN retry counter: " + status.getPINRetryCount());
@@ -255,6 +248,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
 
                     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());
                 }
             }
 
@@ -341,38 +336,6 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         cmdSet.verifyPIN(pin).checkOK();
         Log.i(TAG, "pin verified");
 
-        byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
-        BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper);
-
-        byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
-        BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
-
-        ApplicationInfo info = cmdSet.getApplicationInfo();
-
-        WritableMap data = Arguments.createMap();
-        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 importKeys(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);
 
@@ -385,10 +348,10 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
         BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper);
 
-        byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, false, true).checkOK().getData();
+        byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, true, true).checkOK().getData();
         BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlvWallet);
 
-        ApplicationInfo info = cmdSet.getApplicationInfo();
+        ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
 
         WritableMap data = Arguments.createMap();
         data.putString("address", Hex.toHexString(masterPair.toEthereumAddress()));
@@ -438,7 +401,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         Log.i(TAG, "Derived " + ENCRYPTION_PATH);
         BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
 
-        byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, false, true).checkOK().getData();
+        byte[] tlvWallet = cmdSet.exportKey(WALLET_PATH, true, true).checkOK().getData();
         Log.i(TAG, "Derived " + WALLET_PATH);
         BIP32KeyPair walletKeyPair = BIP32KeyPair.fromTLV(tlvWallet);
 
@@ -624,18 +587,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         Log.i(TAG, "pin verified");
 
         byte[] hash = Hex.decode(message);
-
-        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());
-        }
+        RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.signWithPath(hash, path, false).checkOK().getData());
 
         Log.i(TAG, "Signed hash: " + Hex.toHexString(hash));
         Log.i(TAG, "Recovery ID: " + signature.getRecId());

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

@@ -3,6 +3,8 @@ 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,7 +33,7 @@ public class SmartCardSecrets {
 
     @NonNull
     public static SmartCardSecrets generate(final String userPin) throws NoSuchAlgorithmException, InvalidKeySpecException {
-        String pairingPassword = randomToken(5);
+        String pairingPassword = randomToken(16);
         long pinNumber = randomLong(PIN_BOUND);
         long pukNumber = randomLong(PUK_BOUND);
 
@@ -65,18 +67,9 @@ public class SmartCardSecrets {
     }
 
     public static String randomToken(int length) {
-        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();
+        char[] possibleCharacters = "23456789ABCDEFGHJKLMNPRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
+        String randomStr = RandomStringUtils.random(length, 0, possibleCharacters.length-1, false, false, possibleCharacters, new SecureRandom());
+        return randomStr;
     }
 
     public static byte[] randomBytes(int length) {

index.js

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

ios/SmartCard.swift

@@ -1,390 +0,0 @@
-import Foundation
-import Keycard
-import os.log
-
-enum SmartCardError: Error {
-    case invalidBase64
-}
-
-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 {
-    func initialize(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let puk = self.randomPUK()
-      let pairingPassword = self.randomPairingPassword();
-
-      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)
-
-      resolve(Data(cmdSet.pairing!.bytes).base64EncodedString())
-    }
-
-    func generateMnemonic(channel: CardChannel, pairingBase64: String, words: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try securedCommandSet(channel: channel, pairingBase64: pairingBase64)
-
-      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, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      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, publicOnly: true)
-      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 walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: false, publicOnly: true)
-
-      let info = try ApplicationInfo(cmdSet.select().checkOK().data)
-
-      resolve([
-        "address": bytesToHex(keyPair.toEthereumAddress()),
-        "public-key": bytesToHex(keyPair.publicKey),
-        "wallet-root-address": bytesToHex(rootKeyPair.toEthereumAddress()),
-        "wallet-root-public-key": bytesToHex(rootKeyPair.publicKey),
-        "wallet-address": bytesToHex(walletKeyPair.toEthereumAddress()),
-        "wallet-public-key": bytesToHex(walletKeyPair.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)
-      ])
-    }
-
-    func saveMnemonic(channel: CardChannel, mnemonic: String, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic)
-      try cmdSet.loadKey(seed: seed).checkOK()
-      os_log("seed loaded to card");
-      resolve(true)
-    }
-
-    func getApplicationInfo(channel: CardChannel, pairingBase64: String, 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)
-        var isPaired = false
-
-        if (!pairingBase64.isEmpty) {
-          do {
-            try openSecureChannel(cmdSet: cmdSet, pairingBase64: pairingBase64)
-            isPaired = 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));
-          }
-
-          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, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, 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, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      let key = try cmdSet.exportCurrentKey(publicOnly: true).checkOK().data
-      resolve(bytesToHex(key))
-    }
-
-    func exportKeyWithPath(channel: CardChannel, pairingBase64: String, pin: String, path: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, 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, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-
-      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, publicOnly: true)
-      let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
-      let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: false, publicOnly: true)
-
-      let info = cmdSet.info!
-
-      resolve([
-        "address": bytesToHex(masterPair.toEthereumAddress()),
-        "public-key": bytesToHex(masterPair.publicKey),
-        "wallet-root-address": bytesToHex(rootKeyPair.toEthereumAddress()),
-        "wallet-root-public-key": bytesToHex(rootKeyPair.publicKey),
-        "wallet-address": bytesToHex(walletKeyPair.toEthereumAddress()),
-        "wallet-public-key": bytesToHex(walletKeyPair.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)
-      ])
-    }
-
-    func getKeys(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, 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, pairingBase64: String, pin: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      let sig = try processSignature(message) { return try cmdSet.sign(hash: $0) }
-      resolve(sig)
-    }
-
-    func signWithPath(channel: CardChannel, pairingBase64: String, pin: String, path: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, 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, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      let status = try ApplicationStatus(cmdSet.getStatus(info: GetStatusP1.application.rawValue).checkOK().data);
-      resolve(status.pinRetryCount)
-    }
-
-    func changePin(channel: CardChannel, pairingBase64: String, currentPin: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: currentPin)
-      try cmdSet.changePIN(pin: newPin).checkOK()
-      os_log("pin changed")
-      resolve(true)
-    }
-
-    func unblockPin(channel: CardChannel, pairingBase64: String, puk: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try securedCommandSet(channel: channel, pairingBase64: pairingBase64)
-      try cmdSet.unblockPIN(puk: puk, newPIN: newPin).checkAuthOK()
-      os_log("pin unblocked")
-      resolve(true)
-    }
-
-    func unpair(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-
-      try cmdSet.autoUnpair()
-      os_log("card unpaired")
-
-      resolve(true)
-    }
-
-    func removeKey(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      try cmdSet.removeKey().checkOK()
-      os_log("key removed")
-
-      resolve(true)
-    }
-
-    func removeKeyWithUnpair(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin)
-      try cmdSet.removeKey().checkOK()
-      os_log("key removed")
-
-      try cmdSet.autoUnpair()
-      os_log("card unpaired")
-
-      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 tlvRoot = try cmdSet.exportKey(path: path.rawValue, makeCurrent: makeCurrent, publicOnly: publicOnly).checkOK().data
-      os_log("Derived %@", path.rawValue)
-      return try BIP32KeyPair(fromTLV: tlvRoot)
-    }
-
-    func authenticatedCommandSet(channel: CardChannel, pairingBase64: String, pin: String) throws -> KeycardCommandSet {
-      let cmdSet = try securedCommandSet(channel: channel, pairingBase64: pairingBase64)
-      try cmdSet.verifyPIN(pin: pin).checkAuthOK()
-      os_log("pin verified")
-
-      return cmdSet;
-    }
-
-    func securedCommandSet(channel: CardChannel, pairingBase64: String) throws -> KeycardCommandSet {
-      let cmdSet = KeycardCommandSet(cardChannel: channel)
-      try cmdSet.select().checkOK()
-      try openSecureChannel(cmdSet: cmdSet, pairingBase64: pairingBase64)
-
-      return cmdSet
-    }
-
-    func openSecureChannel(cmdSet: KeycardCommandSet, pairingBase64: String) throws -> Void {
-      cmdSet.pairing = try base64ToPairing(pairingBase64)
-
-      try cmdSet.autoOpenSecureChannel()
-      os_log("secure channel opened")
-    }
-
-    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

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

ios/StatusKeycard.h

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

ios/StatusKeycard.m

@@ -1,37 +1,14 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
+#import "StatusKeycard.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 *)pairing words:(NSString *)words resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(generateAndLoadKey:(NSString *)mnemonic pairing: (NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(saveMnemonic:(NSString *)mnemonic pairing: (NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(getApplicationInfo:(NSString *)pairingBase64 resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(deriveKey:(NSString *)path pairing: (NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(exportKey:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(exportKeyWithPath:(NSString *)pairing pin:(NSString *)pin path:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(importKeys:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(getKeys:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(sign:(NSString *)pairing pin:(NSString *)pin hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(signWithPath:(NSString *)pairing pin:(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 *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(changePin:(NSString *)pairing currentPin:(NSString *)currentPin newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(unblockPin:(NSString *)pairing puk:(NSString *)puk newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(unpair:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(delete:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(removeKey:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(removeKeyWithUnpair:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(unpairAndDelete:(NSString *)pairing pin:(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)
+@implementation StatusKeycard
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_METHOD(sampleMethod:(NSString *)stringArgument numberParameter:(nonnull NSNumber *)numberArgument callback:(RCTResponseSenderBlock)callback)
+{
+    // TODO: Implement some actually useful functionality
+    callback(@[[NSString stringWithFormat: @"numberArgument: %@ stringArgument: %@", numberArgument, stringArgument]]);
+}
 
 @end

ios/StatusKeycard.swift

@@ -1,263 +0,0 @@
-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."
-
-    @available(iOS 13.0, *)
-    private(set) lazy var keycardController: KeycardController? = nil
-
-    @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(_ pairing: String, words: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateMnemonic(channel: channel, pairingBase64: pairing, words: words, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func generateAndLoadKey(_ mnemonic: String, pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateAndLoadKey(channel: channel, mnemonic: mnemonic, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func saveMnemonic(_ mnemonic: String, pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.saveMnemonic(channel: channel, mnemonic: mnemonic, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func getApplicationInfo(_ pairingBase64: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getApplicationInfo(channel: channel, pairingBase64: pairingBase64, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func deriveKey(_ path: String, pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.deriveKey(channel: channel, path: path, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func exportKey(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKey(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func exportKeyWithPath(_ pairing: String, pin: String, path: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKeyWithPath(channel: channel, pairingBase64: pairing, pin: pin, path: path, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func importKeys(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.importKeys(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func getKeys(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getKeys(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func sign(_ pairing: String, pin: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.sign(channel: channel, pairingBase64: pairing, pin: pin, message: hash, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func signWithPath(_ pairing: String, 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, pairingBase64: pairing, 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(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyPin(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func changePin(_ pairing: String, currentPin: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePin(channel: channel, pairingBase64: pairing, currentPin: currentPin, newPin: newPin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func unblockPin(_ pairing: String, puk: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unblockPin(channel: channel, pairingBase64: pairing, puk: puk, newPin: newPin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func unpair(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unpair(channel: channel, pairingBase64: pairing, 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(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKey(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func removeKeyWithUnpair(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKeyWithUnpair(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func unpairAndDelete(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      reject("E_KEYCARD", "Not implemented (unused)", nil)
-    }
-
-    @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.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.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

@@ -3,13 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 46;
 	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 */; };
+		B3E7B58A1CC2AC0600A0062D /* StatusKeycard.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,10 +24,8 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libStatusKeycard.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libStatusKeycard.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		B3E7B5881CC2AC0600A0062D /* StatusKeycard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatusKeycard.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusKeycard.m; sourceTree = "<group>"; };
-		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 */
@@ -37,7 +33,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				65B8C633256D352A00C6A3EE /* Keycard in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -55,10 +50,8 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				F74884352577A87A00D908D2 /* SmartCard.swift */,
-				F4FF95D6245B92E800C19C63 /* StatusKeycard.swift */,
+				B3E7B5881CC2AC0600A0062D /* StatusKeycard.h */,
 				B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */,
-				F4FF95D5245B92E700C19C63 /* StatusKeycard-Bridging-Header.h */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -79,9 +72,6 @@
 			dependencies = (
 			);
 			name = StatusKeycard;
-			packageProductDependencies = (
-				65B8C632256D352A00C6A3EE /* Keycard */,
-			);
 			productName = RCTDataManager;
 			productReference = 134814201AA4EA6300B7C361 /* libStatusKeycard.a */;
 			productType = "com.apple.product-type.library.static";
@@ -105,13 +95,9 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
-			packageReferences = (
-				65B8C631256D352A00C6A3EE /* XCRemoteSwiftPackageReference "Keycard" */,
-			);
 			productRefGroup = 58B511D21A9E6C8500147676;
 			projectDirPath = "";
 			projectRoot = "";
@@ -126,8 +112,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F4FF95D7245B92E800C19C63 /* StatusKeycard.swift in Sources */,
-				F74884362577A87A00D908D2 /* SmartCard.swift in Sources */,
+				B3E7B58A1CC2AC0600A0062D /* StatusKeycard.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -231,7 +216,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
+				"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
@@ -240,9 +225,6 @@
 				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;
 		};
@@ -259,8 +241,6 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = StatusKeycard;
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "StatusKeycard-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -286,25 +266,6 @@
 			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 */;
 }

ios/StatusKeycard.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:StatusKeycard.xcodeproj">
+   </FileRef>
+</Workspace>

package.json

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

react-native-status-keycard.podspec

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