Skip to content

Commit

Permalink
feat: using package next
Browse files Browse the repository at this point in the history
  • Loading branch information
meomeocoj committed May 23, 2024
1 parent 63c1c69 commit 0aef2b1
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 70 deletions.
13 changes: 9 additions & 4 deletions App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import WebView from 'react-native-webview';
import html from './asset/interpolate.html';
import OraiServiceProvider from '@oraichain/service-provider-orai';
import { LOGIN_TYPE } from '@oraichain/customauth';

console.log(process.env.ANDROID_CLIENT_ID);
GoogleSignin.configure({
iosClientId: process.env.IOS_CLIENT_ID
iosClientId: process.env.IOS_CLIENT_ID,
webClientId: process.env.ANDROID_CLIENT_ID
});

const theme = createTheme({
Expand All @@ -40,6 +41,8 @@ const App = () => {

const onLogin = async ({ typeOfLogin, verifier, clientId, idToken }: { typeOfLogin: LOGIN_TYPE; verifier: string; clientId: string; idToken: string }) => {
try {
const start = Date.now();
console.log('triggerLoginMobile 1:', Date.now());
const [v1Data] = await Promise.all([
(onlySocialKey.serviceProvider as OraiServiceProvider).triggerLoginMobile({
typeOfLogin,
Expand All @@ -48,6 +51,7 @@ const App = () => {
idToken
})
]);
console.log('triggerLoginMobile 2:', Date.now());
console.log({ v1Data });

setLoginResponse(v1Data);
Expand All @@ -64,8 +68,8 @@ const App = () => {
if (userInfoData.idToken) {
await onLogin({
typeOfLogin: 'google',
verifier: 'ios-tkey',
clientId: '88022207528-b4i9ai34taasskcb9jokj8j6gigmta8k.apps.googleusercontent.com',
verifier: 'tkey-google-staging',
clientId: process.env.ANDROID_CLIENT_ID,
idToken: userInfoData.idToken
});
}
Expand Down Expand Up @@ -134,6 +138,7 @@ const App = () => {
setLoginResponse(null);
return console.log('🚀 ~ file: index.tsx:131 ~ error:', error);
}
console.log('triggerLoginMobile 3:', Date.now());
setInterpolateResult(result);
}}
/>
Expand Down
32 changes: 32 additions & 0 deletions android/app/src/main/assets/interpolate.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>

<head>
<script type="module">
import init, {interpolate, get_pk} from 'https://unpkg.com/@oraichain/[email protected]/blsdkg.js';
const fromHexString = (hexString) =>
Uint8Array.from(hexString.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));

const toHexString = (bytes) => bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), '');

init().then(() => {
try {
let shares = JSON.parse(window.shares);
shares = shares.map((share) => fromHexString(share));
let indexes = JSON.parse(window.indexes);
indexes = indexes.map((index) => fromHexString(index));
const privKey = interpolate(indexes, shares);
const pubKey = get_pk(privKey);
const result = {
privKey: toHexString(privKey),
pubKey: toHexString(pubKey)
};
window.ReactNativeWebView.postMessage(JSON.stringify({result}));
} catch (error) {
window.ReactNativeWebView.postMessage(JSON.stringify({error: error.message}));
}
});
</script>
</head>

</html>
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
"module-resolver",
{
alias: {
"bn.js": "react-native-bignumber",
// "bn.js": "react-native-bignumber",
},
},
],
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
},
"dependencies": {
"@invertase/react-native-apple-authentication": "^2.2.2",
"@oraichain/customauth": "^2.0.0",
"@oraichain/only-social-key": "^2.0.0",
"@oraichain/service-provider-orai": "^2.0.0",
"@oraichain/storage-layer-orai": "^2.0.0",
"@oraichain/multifactors.js": "^2.0.0",
"@oraichain/customauth": "next",
"@oraichain/only-social-key": "next",
"@oraichain/service-provider-orai": "next",
"@oraichain/storage-layer-orai": "next",
"@oraichain/multifactors.js": "next",
"@react-native-google-signin/google-signin": "^10.0.1",
"@rneui/base": "^4.0.0-rc.8",
"@rneui/themed": "^4.0.0-rc.8",
Expand All @@ -31,7 +31,6 @@
"os-browserify": "^0.3.0",
"react": "18.2.0",
"react-native": "0.72.5",
"react-native-bignumber": "^0.2.1",
"react-native-dotenv": "^3.4.9",
"react-native-randombytes": "^3.6.1",
"react-native-safe-area-context": "^4.7.2",
Expand Down
96 changes: 37 additions & 59 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1156,14 +1156,6 @@
resolved "https://registry.yarnpkg.com/@chaitanyapotti/register-service-worker/-/register-service-worker-1.7.3.tgz#0e670b8a4de1c319a147700d7ebb4f8a2b2e1b84"
integrity sha512-ywnUSfwvqdHchO3ELFWP6hlnhzc2UUETbk+TaBT/vicuMnJbnBLuDCcoy3aWvUE9bjmzg4QQpssRLSz1iZ7XRA==

"@craftzdog/react-native-buffer@^6.0.4":
version "6.0.5"
resolved "https://registry.yarnpkg.com/@craftzdog/react-native-buffer/-/react-native-buffer-6.0.5.tgz#0d4fbe0dd104186d2806655e3c0d25cebdae91d3"
integrity sha512-Av+YqfwA9e7jhgI9GFE/gTpwl/H+dRRLmZyJPOpKTy107j9Oj7oXlm3/YiMNz+C/CEGqcKAOqnXDLs4OL6AAFw==
dependencies:
ieee754 "^1.2.1"
react-native-quick-base64 "^2.0.5"

"@eslint-community/eslint-utils@^4.2.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
Expand Down Expand Up @@ -1568,26 +1560,26 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@oraichain/common-types@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/common-types/-/common-types-2.0.0.tgz#3f2b0cfc061ae33888718e17173b166d955563a1"
integrity sha512-opYhp8zJnvtM+rNhO/aXQiW9GNJRvCiSaoF0XI5jnTyANV5FvaktBsPEHT1+1zx14LVBNtnw0yb0yEhUMO8MNg==
"@oraichain/common-types@^2.0.4":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/common-types/-/common-types-2.0.4.tgz#067a2da80875f16424d2f47bb7cca65eb9a31f7d"
integrity sha512-UDLASFg3o79yfW/7QQSuND4BNTiBs0blDLGLWIUeWluSGvwAWGIF75NuR+ew7QGhFoLvNi+TPO9zpmO2hAaChw==
dependencies:
"@oraichain/customauth" "^2.0.0"
"@oraichain/customauth" "^2.0.4"
"@toruslabs/eccrypto" "^1.1.8"
bn.js "^5.2.1"
elliptic "^6.5.4"
serialize-error "^8.1.0"
ts-custom-error "^3.3.1"
web3-utils "^1.8.1"

"@oraichain/customauth@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/customauth/-/customauth-2.0.0.tgz#13e89d5af96b175bd4b7fbe78889565dac7014fb"
integrity sha512-uuoLwmHgBh/wd/vPmSO9IhhPGml0jnTFh58UKbQ0goSMJSe3m/ClCc6wQIwsNoQA45NUZ5l68h/yNQvOyDQwNQ==
"@oraichain/customauth@^2.0.4", "@oraichain/customauth@next":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/customauth/-/customauth-2.0.4.tgz#b3c7c0d76ee10945ce4600889aa93e75dce2a12e"
integrity sha512-z+o466yAYyStyr+aPYB01XTHXOS8NJqTIC9jNvKpcp6iFp5rjcT7xVQVRMRf1UaboEiKqJlWsjtvnpTUO3lWSQ==
dependencies:
"@chaitanyapotti/register-service-worker" "^1.7.3"
"@oraichain/multifactors.js" "^2.0.0"
"@oraichain/multifactors.js" "^2.0.4"
"@toruslabs/broadcast-channel" "^6.2.0"
"@toruslabs/eccrypto" "^2.0.0"
"@toruslabs/http-helpers" "^3.3.0"
Expand All @@ -1600,10 +1592,10 @@
serialize-error "^8.1.0"
web3-utils "^1.8.2"

"@oraichain/multifactors.js@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/multifactors.js/-/multifactors.js-2.0.0.tgz#cb3851e4f795db1e3530cfb102a8aa81e78f6bb5"
integrity sha512-fbNq3oiGhi8VJD25JvYX6o9sTymCwkVZYp/Gv49xeLzUrcok+PQjiNwqPdkTCncc5LPECz/FF4xzw3EoBR9/1A==
"@oraichain/multifactors.js@^2.0.4", "@oraichain/multifactors.js@next":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/multifactors.js/-/multifactors.js-2.0.4.tgz#48c591e6d601d7b5f95608fa335b4450fbc7f937"
integrity sha512-KC8NQpc572q7miwBxQtDKyyb8GFSqEgr0A8gNX4Jt4ggDfWh7Gks5S+0exTxR+YEF1xPaZZ92ylWW2xtXuZ2Vw==
dependencies:
"@toruslabs/eccrypto" "^2.0.0"
"@toruslabs/http-helpers" "^3.3.0"
Expand All @@ -1614,46 +1606,46 @@
loglevel "^1.8.1"
web3-utils "^1.8.2"

"@oraichain/only-social-key@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/only-social-key/-/only-social-key-2.0.0.tgz#3edf337f686583bfd356bde8a86a69f294669ca3"
integrity sha512-/bYt/VSiNwiyHDklDgceNwtitocvTeXPQBC1NGUcVPmZMkqselPPb2zw+vSMlraPNWnRVQRY2V6621WHohpzUg==
"@oraichain/only-social-key@next":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/only-social-key/-/only-social-key-2.0.4.tgz#c221be0259e33d972b1aaa98f149f3d85d10e5af"
integrity sha512-jFsjgcrU74hWF0LdDR2MqofpBYZ5Qm/8Bl8TZ3SgHp9vzUCfCgVpJGLKuEJ66V7nqwIIUntcP+E7Hht3woWwow==
dependencies:
"@oraichain/common-types" "^2.0.0"
"@oraichain/common-types" "^2.0.4"
"@toruslabs/eccrypto" "^1.1.8"
"@toruslabs/http-helpers" "^3.2.0"
bn.js "^5.2.1"
elliptic "^6.5.4"
json-stable-stringify "^1.0.2"
web3-utils "^1.8.1"

"@oraichain/service-provider-base@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/service-provider-base/-/service-provider-base-2.0.0.tgz#8300f583d6f8d33d7c397434443bbd547d4107f5"
integrity sha512-q69zwXDvL77YUsfjPeWbyYEOZFDlUekrZpjeuT9O5ZB6hcNZDqcurkZMun5xWTqec5sTisxKwCcNAHtMpeOVmg==
"@oraichain/service-provider-base@^2.0.4":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/service-provider-base/-/service-provider-base-2.0.4.tgz#cffb5a5eccbac8b18058adcbee56890dd571d66b"
integrity sha512-qhbrLD3qLE28d4TvLNSk/PoFVieapjsPQLZWGd6ymWENPga0nM0+rEBnNjXZ57Ekv747rTDc2wbu26hjCmqV3w==
dependencies:
"@oraichain/common-types" "^2.0.0"
"@oraichain/common-types" "^2.0.4"
bn.js "^5.2.1"
elliptic "^6.5.4"

"@oraichain/service-provider-orai@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/service-provider-orai/-/service-provider-orai-2.0.0.tgz#cc7f200b6b6b0d8ccbb375640967c5fd714822c8"
integrity sha512-0zuZ+WzbjYUmf3ObIep0kCDrwcv+zCqzti3Syr6vn8bGXzMRcSqgxgpXvh1E0dvil4Bwyz/VjQaoJf8pyMwE3g==
"@oraichain/service-provider-orai@next":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/service-provider-orai/-/service-provider-orai-2.0.4.tgz#31a53169b88027d8b98aa239ee7d9578eeda213d"
integrity sha512-OlV0nJWkW3rmtJ/dltYO/K4Am5Sbo8KsULx7OpD92XBohSp20OJDvPyHV8M6gFKjzM5lMYxi3oXQoDEaBJXOgA==
dependencies:
"@oraichain/common-types" "^2.0.0"
"@oraichain/customauth" "^2.0.0"
"@oraichain/service-provider-base" "^2.0.0"
"@oraichain/common-types" "^2.0.4"
"@oraichain/customauth" "^2.0.4"
"@oraichain/service-provider-base" "^2.0.4"
bn.js "^5.2.1"
elliptic "^6.5.4"
web3-utils "^1.8.2"

"@oraichain/storage-layer-orai@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@oraichain/storage-layer-orai/-/storage-layer-orai-2.0.0.tgz#1227c322b4feff0ac3f8db3ca66317882f42d095"
integrity sha512-Lq5NjF2JP4JgDxxFY4GD3a2xn91DGfy746fHqMGTsajH8ZNVJHlGOt+iGoIjiZoTXcYntIYfzEp7cXYNzk78WA==
"@oraichain/storage-layer-orai@next":
version "2.0.4"
resolved "https://registry.npmjs.org/@oraichain/storage-layer-orai/-/storage-layer-orai-2.0.4.tgz#764f51cf94c8c7cf0a7a9c04c3e00b43a451ffa3"
integrity sha512-vjNZRdObpxQzQG4S/luSWd9G/24DzOaY5RIfJaAcl88iiTYCjhC0yNY0SEIrhPzfTEz/dicFpHElpRAnzSVUIQ==
dependencies:
"@oraichain/common-types" "^2.0.0"
"@oraichain/common-types" "^2.0.4"
"@toruslabs/http-helpers" "^3.2.0"
bn.js "^5.2.1"
json-stable-stringify "^1.0.2"
Expand Down Expand Up @@ -2679,7 +2671,7 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==

base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1:
base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
Expand Down Expand Up @@ -6386,27 +6378,13 @@ react-is@^17.0.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==

react-native-bignumber@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/react-native-bignumber/-/react-native-bignumber-0.2.1.tgz#c2370d0e124419bda9043ecffd2fde321981d4b6"
integrity sha512-jEtfsYtU/WNR+XHilwtwJRKvoK9Cw0ZWV4ZOIOz5RBRfgxIdGIKS3d1bc1JaOPVGBqbDZ32zBQ/CTI0xyA/vvQ==
dependencies:
"@craftzdog/react-native-buffer" "^6.0.4"

react-native-dotenv@^3.4.9:
version "3.4.9"
resolved "https://registry.yarnpkg.com/react-native-dotenv/-/react-native-dotenv-3.4.9.tgz#621c5b0c1d0c5c7f569bfe5a1d804bec7885c010"
integrity sha512-dbyd+mcy7SUzxEgmt33TRf1FGcNe6swJhXmB0unKkI49F7+pidog9kPtjxMLTAfmKA8gcN2XHQSKltGfGbGCLQ==
dependencies:
dotenv "^16.3.1"

react-native-quick-base64@^2.0.5:
version "2.0.7"
resolved "https://registry.yarnpkg.com/react-native-quick-base64/-/react-native-quick-base64-2.0.7.tgz#70ec863fb5dba8cd858a262f6b901dbbfbfdd3df"
integrity sha512-QmOon3zXAWFi3KvQVCJjCC7N66rwfl1R4nLPuJ+OVs8nWysvKlaU8mKxe2BV4Ud1nB3nTDgyi2VCJFpjtjJxKw==
dependencies:
base64-js "^1.5.1"

react-native-randombytes@^3.6.1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/react-native-randombytes/-/react-native-randombytes-3.6.1.tgz#cac578093b5ca38e3e085becffdc6cbcf6f0d654"
Expand Down

0 comments on commit 0aef2b1

Please sign in to comment.