Skip to content

Commit

Permalink
add amplitude back
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xturboblitz
0xturboblitz committed Sep 19, 2024
1 parent 127f58b commit cb9722c
Show file tree
Hide file tree
Showing 6 changed files with 117 additions and 73 deletions.
2 changes: 1 addition & 1 deletion app/ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,6 @@ SPEC CHECKSUMS:
SwiftyTesseract: 1f3d96668ae92dc2208d9842c8a59bea9fad2cbb
Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce

PODFILE CHECKSUM: d3a7fe796373a959164d78cc6caacf51cb9dee87
PODFILE CHECKSUM: 9cb8f5a5b9cf92f86866e2c805998e51596330d5

COCOAPODS: 1.15.2
4 changes: 1 addition & 3 deletions app/src/stores/userStore.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
} from '@env';
import { PassportData, Proof } from '../../../common/src/utils/types';
import * as Keychain from 'react-native-keychain';
import * as amplitude from '@amplitude/analytics-react-native';
import { loadPassportData, loadSecret, loadSecretOrCreateIt, storePassportData } from '../utils/keychain';
import { generateDscSecret } from '../../../common/src/utils/csca';
import { genMockPassportData } from '../../../common/src/utils/genMockPassportData';
Expand Down Expand Up @@ -111,8 +110,7 @@ const useUserStore = create<UserState>((set, get) => ({
const alreadyStoredPassportData = await loadPassportData();

if (alreadyStoredPassportData) {
console.log("passportData is already stored, this should never happen in prod")
console.log("replacing it with the new one")
console.log("a passportData is already stored, replacing it with the new one")
}

await storePassportData(passportData)
Expand Down
3 changes: 3 additions & 0 deletions app/src/utils/cameraScanner.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const startCameraScan = async () => {
})
} catch (e) {
console.error(e);
amplitude.track('camera_scan_error', { error: e });
}
} else {
NativeModules.CameraActivityModule.startCameraActivity()
Expand All @@ -50,10 +51,12 @@ export const startCameraScan = async () => {
})
} catch (error: any) {
console.error('Invalid MRZ format:', error.message);
amplitude.track('invalid_mrz_format', { error: error.message });
}
})
.catch((error: any) => {
console.error('Camera Activity Error:', error);
amplitude.track('camera_scan_error', { error: error.message });
});
}
};
140 changes: 87 additions & 53 deletions app/src/utils/nfcScanner.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const scan = async (setModalProofStep: (modalProofStep: number) => void)
);

if (!check.success) {
amplitude.track('inputs_invalid', { error: check.message });
toast.show("Unvailable", {
message: check.message,
customData: {
Expand Down Expand Up @@ -54,7 +55,6 @@ const scanAndroid = async (setModalProofStep: (modalProofStep: number) => void)
const { toast, setNfcSheetIsOpen } = useNavigationStore.getState();
setNfcSheetIsOpen(true);


try {
const response = await PassportReader.scan({
documentNumber: passportNumber,
Expand All @@ -63,19 +63,18 @@ const scanAndroid = async (setModalProofStep: (modalProofStep: number) => void)
});
console.log('scanned');
setNfcSheetIsOpen(false);
//amplitude.track('NFC scan successful');
amplitude.track('nfc_scan_successful');
handleResponseAndroid(response, setModalProofStep);
} catch (e: any) {
console.log('error during scan:', e);
setNfcSheetIsOpen(false);
//amplitude.track('NFC scan unsuccessful', { error: JSON.stringify(e) });
amplitude.track('nfc_scan_unsuccessful', { error: e.message });
toast.show('Error', {
message: e.message,
customData: {
type: "error",
},
})

}
};

Expand All @@ -87,6 +86,10 @@ const scanIOS = async (setModalProofStep: (modalProofStep: number) => void) => {
} = useUserStore.getState()
const { toast } = useNavigationStore.getState();

console.log('passportNumber', passportNumber);
console.log('dateOfBirth', dateOfBirth);
console.log('dateOfExpiry', dateOfExpiry);

try {
const response = await NativeModules.PassportReader.scanPassport(
passportNumber,
Expand All @@ -95,10 +98,10 @@ const scanIOS = async (setModalProofStep: (modalProofStep: number) => void) => {
);
console.log('scanned');
handleResponseIOS(response, setModalProofStep);
//amplitude.track('NFC scan successful');
amplitude.track('nfc_scan_successful');
} catch (e: any) {
console.log('error during scan:', e);
//amplitude.track(`NFC scan unsuccessful, error ${e.message}`);
amplitude.track('nfc_scan_unsuccessful', { error: e.message });
if (!e.message.includes("UserCanceled")) {
toast.show('Failed to read passport', {
message: e.message,
Expand All @@ -118,51 +121,62 @@ const handleResponseIOS = async (

const parsed = JSON.parse(response);

const eContentBase64 = parsed.eContentBase64; // this is what we call concatenatedDataHashes in android world
const signedAttributes = parsed.signedAttributes; // this is what we call eContent in android world
const mrz = parsed.passportMRZ;
const signatureBase64 = parsed.signatureBase64;
console.log('dataGroupsPresent', parsed.dataGroupsPresent)
console.log('placeOfBirth', parsed.placeOfBirth)
console.log('activeAuthenticationPassed', parsed.activeAuthenticationPassed)
console.log('isPACESupported', parsed.isPACESupported)
console.log('isChipAuthenticationSupported', parsed.isChipAuthenticationSupported)
console.log('residenceAddress', parsed.residenceAddress)
console.log('passportPhoto', parsed.passportPhoto.substring(0, 100) + '...')
console.log('encapsulatedContentDigestAlgorithm', parsed.encapsulatedContentDigestAlgorithm)
console.log('parsed.documentSigningCertificate', parsed.documentSigningCertificate)
const pem = JSON.parse(parsed.documentSigningCertificate).PEM.replace(/\n/g, '');
const eContentBase64 = parsed?.eContentBase64; // this is what we call concatenatedDataHashes in android world
const signedAttributes = parsed?.signedAttributes; // this is what we call eContent in android world
const mrz = parsed?.passportMRZ;
const signatureBase64 = parsed?.signatureBase64;
console.log('dataGroupsPresent', parsed?.dataGroupsPresent)
console.log('placeOfBirth', parsed?.placeOfBirth)
console.log('activeAuthenticationPassed', parsed?.activeAuthenticationPassed)
console.log('isPACESupported', parsed?.isPACESupported)
console.log('isChipAuthenticationSupported', parsed?.isChipAuthenticationSupported)
console.log('residenceAddress', parsed?.residenceAddress)
console.log('passportPhoto', parsed?.passportPhoto.substring(0, 100) + '...')
console.log('encapsulatedContentDigestAlgorithm', parsed?.encapsulatedContentDigestAlgorithm)
console.log('documentSigningCertificate', parsed?.documentSigningCertificate)
const pem = JSON.parse(parsed?.documentSigningCertificate).PEM.replace(/\n/g, '');
console.log('pem', pem)

const eContentArray = Array.from(Buffer.from(signedAttributes, 'base64'));
const signedEContentArray = eContentArray.map(byte => byte > 127 ? byte - 256 : byte);

const concatenatedDataHashesArray = Array.from(Buffer.from(eContentBase64, 'base64'));
const concatenatedDataHashesArraySigned = concatenatedDataHashesArray.map(byte => byte > 127 ? byte - 256 : byte);

const encryptedDigestArray = Array.from(Buffer.from(signatureBase64, 'base64')).map(byte => byte > 127 ? byte - 256 : byte);

amplitude.track('nfc_response_parsed', {
dataGroupsPresent: parsed?.dataGroupsPresent,
eContentLength: signedEContentArray?.length,
encryptedDigestLength: encryptedDigestArray?.length,
activeAuthenticationPassed: parsed?.activeAuthenticationPassed,
isPACESupported: parsed?.isPACESupported,
isChipAuthenticationSupported: parsed?.isChipAuthenticationSupported,
encapsulatedContentDigestAlgorithm: parsed?.encapsulatedContentDigestAlgorithm,
dsc: pem,
});

const passportData = {
mrz,
dsc: pem,
dataGroupHashes: concatenatedDataHashesArraySigned,
eContent: signedEContentArray,
encryptedDigest: encryptedDigestArray,
photoBase64: "data:image/jpeg;base64," + parsed.passportPhoto,
mockUser: false
};

try {
const eContentArray = Array.from(Buffer.from(signedAttributes, 'base64'));
const signedEContentArray = eContentArray.map(byte => byte > 127 ? byte - 256 : byte);

const concatenatedDataHashesArray = Array.from(Buffer.from(eContentBase64, 'base64'));
const concatenatedDataHashesArraySigned = concatenatedDataHashesArray.map(byte => byte > 127 ? byte - 256 : byte);

const encryptedDigestArray = Array.from(Buffer.from(signatureBase64, 'base64')).map(byte => byte > 127 ? byte - 256 : byte);

//amplitude.track('Sig alg before conversion: ' + signatureAlgorithm);
const passportData = {
mrz,
dsc: pem,
dataGroupHashes: concatenatedDataHashesArraySigned,
eContent: signedEContentArray,
encryptedDigest: encryptedDigestArray,
photoBase64: "data:image/jpeg;base64," + parsed.passportPhoto,
mockUser: false
};
useUserStore.getState().registerPassportData(passportData)
const { signatureAlgorithm, hashFunction } = parseDSC(pem);
const circuitName = getCircuitName("prove", signatureAlgorithm, hashFunction);
downloadZkey(circuitName as any);
useNavigationStore.getState().setSelectedTab("next");
} catch (e: any) {
console.log('error during parsing:', e);
//amplitude.track('Signature algorithm unsupported (ecdsa not parsed)', { error: JSON.stringify(e) });
amplitude.track('error_parsing_nfc_response', { error: e.message });
toast.show('Error', {
message: "Your signature algorithm is not supported at that time. Please try again later.",
message: e.message,
customData: {
type: "error",
},
Expand All @@ -174,6 +188,8 @@ const handleResponseAndroid = async (
response: any,
setModalProofStep: (modalProofStep: number) => void
) => {
const { toast } = useNavigationStore.getState();

const {
mrz,
eContent,
Expand All @@ -188,8 +204,6 @@ const handleResponseAndroid = async (
documentSigningCertificate
} = response;

//amplitude.track('Sig alg before conversion: ' + signatureAlgorithm);

const pem = "-----BEGIN CERTIFICATE-----" + documentSigningCertificate + "-----END CERTIFICATE-----"
const passportData: PassportData = {
mrz: mrz.replace(/\n/g, ''),
Expand All @@ -200,29 +214,49 @@ const handleResponseAndroid = async (
photoBase64: photo.base64,
mockUser: false
};
//amplitude.track('Sig alg after conversion: ' + passportData.signatureAlgorithm);

console.log('passportData', JSON.stringify({
...passportData,
photoBase64: passportData.photoBase64.substring(0, 100) + '...'
}, null, 2));

console.log('mrz', passportData.mrz);
console.log('dataGroupHashes', passportData.dataGroupHashes);
console.log('eContent', passportData.eContent);
console.log('encryptedDigest', passportData.encryptedDigest);
console.log("photoBase64", passportData.photoBase64.substring(0, 100) + '...')
console.log('mrz', passportData?.mrz);
console.log('dataGroupHashes', passportData?.dataGroupHashes);
console.log('eContent', passportData?.eContent);
console.log('encryptedDigest', passportData?.encryptedDigest);
console.log("photoBase64", passportData?.photoBase64.substring(0, 100) + '...')
console.log("digestAlgorithm", digestAlgorithm)
console.log("signerInfoDigestAlgorithm", signerInfoDigestAlgorithm)
console.log("digestEncryptionAlgorithm", digestEncryptionAlgorithm)
console.log("LDSVersion", LDSVersion)
console.log("unicodeVersion", unicodeVersion)
console.log("encapContent", encapContent)
console.log("documentSigningCertificate", documentSigningCertificate)
useUserStore.getState().registerPassportData(passportData)

const { signatureAlgorithm, hashFunction } = parseDSC(pem);
const circuitName = getCircuitName("prove", signatureAlgorithm, hashFunction);
downloadZkey(circuitName as any);
useNavigationStore.getState().setSelectedTab("next");
amplitude.track('nfc_response_parsed', {
dataGroupHashesLength: passportData?.dataGroupHashes?.length,
eContentLength: passportData?.eContent?.length,
encryptedDigestLength: passportData?.encryptedDigest?.length,
digestAlgorithm: digestAlgorithm,
signerInfoDigestAlgorithm: signerInfoDigestAlgorithm,
digestEncryptionAlgorithm: digestEncryptionAlgorithm,
dsc: pem,
});

try {
useUserStore.getState().registerPassportData(passportData)
const { signatureAlgorithm, hashFunction } = parseDSC(pem);
const circuitName = getCircuitName("prove", signatureAlgorithm, hashFunction);
downloadZkey(circuitName as any);
useNavigationStore.getState().setSelectedTab("next");
} catch (e: any) {
console.log('error during parsing:', e);
amplitude.track('error_parsing_nfc_response', { error: e.message });
toast.show('Error', {
message: e.message,
customData: {
type: "error",
},
})
}
};
37 changes: 23 additions & 14 deletions app/src/utils/prover.ts
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
import { NativeModules, Platform } from 'react-native';
import { parseProofAndroid } from './utils';
import RNFS from 'react-native-fs';
import * as amplitude from '@amplitude/analytics-react-native';

export const generateProof = async (
circuit: string,
inputs: any,
) => {
try {
console.log('launching generateProof function');
console.log('inputs in prover.ts', inputs);
console.log('circuit', circuit);
console.log('launching generateProof function');
console.log('inputs in prover.ts', inputs);
console.log('circuit', circuit);

const zkey_path = `${RNFS.DocumentDirectoryPath}/${circuit}.zkey`
// Example: "/data/user/0/com.proofofpassportapp/files/register_sha256WithRSAEncryption_65537.zkey" on android
const dat_path = `${RNFS.DocumentDirectoryPath}/${circuit}.dat`
const zkey_path = `${RNFS.DocumentDirectoryPath}/${circuit}.zkey`
// Example: "/data/user/0/com.proofofpassportapp/files/register_sha256WithRSAEncryption_65537.zkey" on android
const dat_path = `${RNFS.DocumentDirectoryPath}/${circuit}.dat`

const witness_calculator = circuit;
const witness_calculator = circuit;

if (!zkey_path || !witness_calculator || !dat_path) {
throw new Error('Required parameters are missing');
}
console.log('zkey_path', zkey_path);
console.log('witness_calculator', witness_calculator);
console.log('dat_path', dat_path);
if (!zkey_path || !witness_calculator || !dat_path) {
throw new Error('Required parameters are missing');
}
console.log('zkey_path', zkey_path);
console.log('witness_calculator', witness_calculator);
console.log('dat_path', dat_path);

try {
const response = await NativeModules.Prover.runProveAction(
zkey_path,
witness_calculator,
Expand All @@ -47,6 +49,13 @@ export const generateProof = async (
}
} catch (err: any) {
console.log('err', err);
amplitude.track('error_generating_proof', {
error: err.message,
circuit: circuit,
zkey_path: zkey_path,
witness_calculator: witness_calculator,
dat_path: dat_path,
});
throw new Error(err);
}
};
Expand Down
4 changes: 2 additions & 2 deletions app/src/utils/zkeyDownload.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export async function downloadZkey(
const downloadRequired = await isDownloadRequired(circuit, isZkeyDownloading);
if (!downloadRequired) {
console.log(`zkey and dat for ${circuit} already downloaded`)
//amplitude.track(`zkey for ${circuit} already downloaded`);
amplitude.track('zkey_already_downloaded', { circuit: circuit });
return;
}

Expand Down Expand Up @@ -117,7 +117,7 @@ export async function fetchZkeyAndDat(
circuit: CircuitName,
) {
console.log(`fetching zkey and dat for ${circuit} ...`)
//amplitude.track(`fetching zkey and dat for ${circuit} ...`);
amplitude.track('fetching_zkey_and_dat', { circuit: circuit });

const {
isZkeyDownloading,
Expand Down

0 comments on commit cb9722c

Please sign in to comment.