Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(rndemos): update metro config to support eciesjs crypto imports #1147

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(rndemos): update metro config to support eciesjs crypto imports #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44485dd
feat: update metro.config.js with custom resolvers
abretonc7s Nov 26, 2024
90b2016
chore: update rn initialization setup to match latest eciesjs
abretonc7s Nov 26, 2024
7ff51b1
docs: deprecate base64icon
abretonc7s Nov 26, 2024
0f5fcca
Merge remote-tracking branch 'origin/main' into fix/rndemos
abretonc7s Nov 27, 2024
fa10eac
fix: react native demo example
abretonc7s Nov 27, 2024
c2b7963
Merge branch 'main' into fix/rndemos
christopherferreira9 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/devreactnative/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const WithSDKConfig = ({children}: {children: React.ReactNode}) => {
},
dappMetadata: {
name: 'devreactnative',
url: 'https://demornativesdk.metamask.io',
},
i18nOptions: {
enabled: true,
Expand Down
20 changes: 20 additions & 0 deletions packages/devreactnative/metro.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const config = {
extraNodeModules: {
...extraNodeModules,
...require('node-libs-react-native'),
'node:crypto': require.resolve('react-native-crypto'),
// crypto: require.resolve('react-native-quick-crypto'),
// url: require.resolve('whatwg-url'),
},
Expand Down Expand Up @@ -128,6 +129,25 @@ const config = {
filePath: monorepoRootPath + '/packages/sdk-ui/src/index.ts',
type: 'sourceFile',
};
}
else if (moduleName === '@ecies/ciphers/aes') {
console.debug(`CUSTOM RESOLVER ${moduleName}`);
// Logic to resolve the module name to a file path...
// NOTE: Throw an error if there is no resolution.
return {
filePath:
sdkPath + '/node_modules/@ecies/ciphers/dist/aes/node.js',
type: 'sourceFile',
};
} else if (moduleName === '@ecies/ciphers/chacha') {
console.debug(`CUSTOM RESOLVER ${moduleName}`);
// Logic to resolve the module name to a file path...
// NOTE: Throw an error if there is no resolution.
return {
filePath:
sdkPath + '/node_modules/@ecies/ciphers/dist/chacha/node.js',
type: 'sourceFile',
};
}
// // Optionally, chain to the standard Metro resolver.
return context.resolveRequest(context, moduleName, platform);
Expand Down
2 changes: 1 addition & 1 deletion packages/devreactnative/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@react-navigation/bottom-tabs": "^6.5.11",
"@react-navigation/native": "^6.1.9",
"@react-navigation/native-stack": "^6.9.17",
"eciesjs": "^0.4.4",
"eciesjs": "^0.4.12",
"ethers": "5.7.2",
"intl-pluralrules": "^2.0.1",
"node-libs-react-native": "^1.2.1",
Expand Down
1 change: 1 addition & 0 deletions packages/examples/reactNativeDemo/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const WithSDKConfig = ({children}: {children: React.ReactNode}) => {
},
dappMetadata: {
name: 'devreactnative',
url: 'https://demornativesdk.metamask.io',
},
i18nOptions: {
enabled: true,
Expand Down
1 change: 1 addition & 0 deletions packages/examples/reactNativeDemo/metro.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const config = {
resolver: {
extraNodeModules: {
...require('node-libs-react-native'),
'node:crypto': require.resolve('react-native-crypto'),
},
sourceExts: ['jsx', 'js', 'ts', 'tsx', 'cjs', 'json'], //add here
},
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/reactNativeDemo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"allow-scripts": ""
},
"dependencies": {
"@metamask/sdk": "^0.30.0",
"@metamask/sdk": "^0.31.0",
"@metamask/sdk-react": "^0.30.0",
"@react-native-async-storage/async-storage": "^2.0.0",
"@react-navigation/bottom-tabs": "^6.5.11",
Expand Down
133 changes: 131 additions & 2 deletions packages/examples/reactNativeDemo/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2538,6 +2538,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.26.0":
version: 7.26.0
resolution: "@babel/runtime@npm:7.26.0"
dependencies:
regenerator-runtime: ^0.14.0
checksum: c8e2c0504ab271b3467a261a8f119bf2603eb857a0d71e37791f4e3fae00f681365073cc79f141ddaa90c6077c60ba56448004ad5429d07ac73532be9f7cf28a
languageName: node
linkType: hard

"@babel/template@npm:^7.0.0, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
version: 7.22.5
resolution: "@babel/template@npm:7.22.5"
Expand Down Expand Up @@ -2670,6 +2679,15 @@ __metadata:
languageName: node
linkType: hard

"@ecies/ciphers@npm:^0.2.1":
version: 0.2.1
resolution: "@ecies/ciphers@npm:0.2.1"
peerDependencies:
"@noble/ciphers": ^1.0.0
checksum: 4a2012358f79ef842c6a9fdcf3d4e1f7d3d59ad3d025cca52b3e7135f62d5c35d394882cbfe8ad5aa17f707663921bf466707d20712b5027a0af5813a6ad7b08
languageName: node
linkType: hard

"@egjs/hammerjs@npm:^2.0.17":
version: 2.0.17
resolution: "@egjs/hammerjs@npm:2.0.17"
Expand Down Expand Up @@ -3697,6 +3715,25 @@ __metadata:
languageName: node
linkType: hard

"@metamask/sdk-communication-layer@npm:0.31.0":
version: 0.31.0
resolution: "@metamask/sdk-communication-layer@npm:0.31.0"
dependencies:
bufferutil: ^4.0.8
date-fns: ^2.29.3
debug: ^4.3.4
utf-8-validate: ^5.0.2
uuid: ^8.3.2
peerDependencies:
cross-fetch: ^4.0.0
eciesjs: "*"
eventemitter2: ^6.4.9
readable-stream: ^3.6.2
socket.io-client: ^4.5.1
checksum: 3f9283d828d736f331154bfa0e1368b7c7c18e00eff66ccd20e97fb86618433cef3c60ed4168e2565bda825303562eb00bb9ca101d1abdcdc3f3848f807e614e
languageName: node
linkType: hard

"@metamask/sdk-install-modal-web@npm:0.30.0":
version: 0.30.0
resolution: "@metamask/sdk-install-modal-web@npm:0.30.0"
Expand All @@ -3718,6 +3755,15 @@ __metadata:
languageName: node
linkType: hard

"@metamask/sdk-install-modal-web@npm:0.31.0":
version: 0.31.0
resolution: "@metamask/sdk-install-modal-web@npm:0.31.0"
dependencies:
"@paulmillr/qr": ^0.2.1
checksum: 4ef7bf111d058ea3e3900ae9d913a3fd0d3b2b30ac3fb293dda52a386822d2a1bec2e2edd7e6b4679d9fedaeb456d3141435abd11fe4eb593222582280787dcc
languageName: node
linkType: hard

"@metamask/sdk-react@npm:^0.30.0":
version: 0.30.0
resolution: "@metamask/sdk-react@npm:0.30.0"
Expand Down Expand Up @@ -3784,6 +3830,33 @@ __metadata:
languageName: node
linkType: hard

"@metamask/sdk@npm:^0.31.0":
version: 0.31.0
resolution: "@metamask/sdk@npm:0.31.0"
dependencies:
"@babel/runtime": ^7.26.0
"@metamask/onboarding": ^1.0.1
"@metamask/providers": 16.1.0
"@metamask/sdk-communication-layer": 0.31.0
"@metamask/sdk-install-modal-web": 0.31.0
"@paulmillr/qr": ^0.2.1
bowser: ^2.9.0
cross-fetch: ^4.0.0
debug: ^4.3.4
eciesjs: ^0.4.11
eth-rpc-errors: ^4.0.3
eventemitter2: ^6.4.9
obj-multiplex: ^1.0.0
pump: ^3.0.0
readable-stream: ^3.6.2
socket.io-client: ^4.5.1
tslib: ^2.6.0
util: ^0.12.4
uuid: ^8.3.2
checksum: 5c79480ed2bc7db708b5c3b9bd23f53e5d5e0673baa43ef8d1f20599e66efa6a4527948a3c9260510854e6fc5b213edc17005519ae8aa2c36a4074b5806ba7be
languageName: node
linkType: hard

"@metamask/utils@npm:^8.3.0":
version: 8.3.0
resolution: "@metamask/utils@npm:8.3.0"
Expand Down Expand Up @@ -3816,6 +3889,13 @@ __metadata:
languageName: node
linkType: hard

"@noble/ciphers@npm:^1.0.0":
version: 1.1.1
resolution: "@noble/ciphers@npm:1.1.1"
checksum: 1264234506c6d87cdef060bb5cbdfb098ee2b853c34dc377ce51aa34790013d00cc4fc44fc921c52002e4a4f92310b56f3d6965d3f0a4c2d1ec912a20494b981
languageName: node
linkType: hard

"@noble/curves@npm:1.1.0, @noble/curves@npm:~1.1.0":
version: 1.1.0
resolution: "@noble/curves@npm:1.1.0"
Expand All @@ -3834,6 +3914,15 @@ __metadata:
languageName: node
linkType: hard

"@noble/curves@npm:^1.6.0":
version: 1.7.0
resolution: "@noble/curves@npm:1.7.0"
dependencies:
"@noble/hashes": 1.6.0
checksum: e220b704f1e516f326fff985e794e840a267f5542e1388737142b08177672ebc41b460b5a5bf636d7622c68e8ae719bc042ccd8aed16dc14311450a94b5f2a05
languageName: node
linkType: hard

"@noble/hashes@npm:1.3.1":
version: 1.3.1
resolution: "@noble/hashes@npm:1.3.1"
Expand All @@ -3848,13 +3937,27 @@ __metadata:
languageName: node
linkType: hard

"@noble/hashes@npm:1.6.0":
version: 1.6.0
resolution: "@noble/hashes@npm:1.6.0"
checksum: 07729b80108d2a9b862eb4e070d4f78ca7ee86b9a9c13a4f7c338ba47a15d4386dd283235da71f21ad515fa9f0b9429fc3da39d2f2b4a50e2442212d14cfd4a9
languageName: node
linkType: hard

"@noble/hashes@npm:^1.3.1":
version: 1.4.0
resolution: "@noble/hashes@npm:1.4.0"
checksum: 8ba816ae26c90764b8c42493eea383716396096c5f7ba6bea559993194f49d80a73c081f315f4c367e51bd2d5891700bcdfa816b421d24ab45b41cb03e4f3342
languageName: node
linkType: hard

"@noble/hashes@npm:^1.5.0":
version: 1.6.1
resolution: "@noble/hashes@npm:1.6.1"
checksum: 57c62f65ee217c0293b4321b547792aa6d79812bfe70a7d62dc83e0f936cc677b14ed981b4e88cf8fdad37cd6d3a0cbd3bd0908b0728adc9daf066e678be8901
languageName: node
linkType: hard

"@nodelib/fs.scandir@npm:2.1.5":
version: 2.1.5
resolution: "@nodelib/fs.scandir@npm:2.1.5"
Expand Down Expand Up @@ -3891,6 +3994,13 @@ __metadata:
languageName: node
linkType: hard

"@paulmillr/qr@npm:^0.2.1":
version: 0.2.1
resolution: "@paulmillr/qr@npm:0.2.1"
checksum: 8a7b882f74f472759b0e5911c9c902a29c5232609373af4c5775625d9aad4ebda635d84c25be27e694144ba73d8e4204e72c3b9b59e9a375ec1d19f034a2d2ad
languageName: node
linkType: hard

"@pkgjs/parseargs@npm:^0.11.0":
version: 0.11.0
resolution: "@pkgjs/parseargs@npm:0.11.0"
Expand Down Expand Up @@ -7008,6 +7118,18 @@ __metadata:
languageName: node
linkType: hard

"eciesjs@npm:^0.4.11":
version: 0.4.12
resolution: "eciesjs@npm:0.4.12"
dependencies:
"@ecies/ciphers": ^0.2.1
"@noble/ciphers": ^1.0.0
"@noble/curves": ^1.6.0
"@noble/hashes": ^1.5.0
checksum: ef98528b8af23b013dd432b43cc1a378d58621f887a7db234ebc997006e16ab9ffa0ea973bf2195aa63dbfa996afa9e3a8f8410b6e3d5c3808365a3d02b1141a
languageName: node
linkType: hard

"eciesjs@npm:^0.4.4":
version: 0.4.5
resolution: "eciesjs@npm:0.4.5"
Expand Down Expand Up @@ -7709,7 +7831,7 @@ __metadata:
languageName: node
linkType: hard

"eventemitter2@npm:^6.4.7":
"eventemitter2@npm:^6.4.7, eventemitter2@npm:^6.4.9":
version: 6.4.9
resolution: "eventemitter2@npm:6.4.9"
checksum: be59577c1e1c35509c7ba0e2624335c35bbcfd9485b8a977384c6cc6759341ea1a98d3cb9dbaa5cea4fff9b687e504504e3f9c2cc1674cf3bd8a43a7c74ea3eb
Expand Down Expand Up @@ -12191,7 +12313,7 @@ __metadata:
"@babel/core": ^7.23.6
"@babel/preset-env": ^7.23.6
"@babel/runtime": ^7.23.6
"@metamask/sdk": ^0.30.0
"@metamask/sdk": ^0.31.0
"@metamask/sdk-react": ^0.30.0
"@react-native-async-storage/async-storage": ^2.0.0
"@react-native-community/eslint-config": ^3.2.0
Expand Down Expand Up @@ -13506,6 +13628,13 @@ __metadata:
languageName: node
linkType: hard

"tslib@npm:^2.6.0":
version: 2.8.1
resolution: "tslib@npm:2.8.1"
checksum: e4aba30e632b8c8902b47587fd13345e2827fa639e7c3121074d5ee0880723282411a8838f830b55100cbe4517672f84a2472667d355b81e8af165a55dc6203a
languageName: node
linkType: hard

"tsutils@npm:^3.21.0":
version: 3.21.0
resolution: "tsutils@npm:3.21.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-communication-layer/src/types/DappMetadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export interface DappMetadata {
name?: string;
iconUrl?: string;
scheme?: string;
base64Icon?: string;
base64Icon?: string; // @deprecated use iconUrl instead - backwards compatibility
connector?: string;
}

Expand Down
24 changes: 9 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12436,13 +12436,6 @@ __metadata:
languageName: node
linkType: hard

"@noble/ciphers@npm:^0.5.3":
version: 0.5.3
resolution: "@noble/ciphers@npm:0.5.3"
checksum: c5ed5d7d43b054c2051b3e0e220353cc9d31fa8d17b82cfb753d87f922e4e1e69b73ca5273a9cc457023f83d96d1d9a51678d2f6d4e58ca039d1111a62856d19
languageName: node
linkType: hard

"@noble/ciphers@npm:^1.0.0":
version: 1.0.0
resolution: "@noble/ciphers@npm:1.0.0"
Expand Down Expand Up @@ -27753,7 +27746,7 @@ __metadata:
"@typescript-eslint/eslint-plugin": ^6.10.0
"@typescript-eslint/parser": ^6.10.0
babel-jest: ^29.2.1
eciesjs: ^0.4.4
eciesjs: ^0.4.12
eslint: ^8.53.0
eslint-config-prettier: ^9.0.0
ethers: 5.7.2
Expand Down Expand Up @@ -28293,14 +28286,15 @@ __metadata:
languageName: node
linkType: hard

"eciesjs@npm:^0.4.4":
version: 0.4.7
resolution: "eciesjs@npm:0.4.7"
"eciesjs@npm:^0.4.12":
version: 0.4.12
resolution: "eciesjs@npm:0.4.12"
dependencies:
"@noble/ciphers": ^0.5.3
"@noble/curves": ^1.4.0
"@noble/hashes": ^1.4.0
checksum: 222505d6135fe75e7f9c4bd76d4ce184cdd112f9047ace2b345763a343255c67bb304c60067a867c911b9feb078d2809f11d1786216fb3ff1ea0215a94becd0f
"@ecies/ciphers": ^0.2.1
"@noble/ciphers": ^1.0.0
"@noble/curves": ^1.6.0
"@noble/hashes": ^1.5.0
checksum: ef98528b8af23b013dd432b43cc1a378d58621f887a7db234ebc997006e16ab9ffa0ea973bf2195aa63dbfa996afa9e3a8f8410b6e3d5c3808365a3d02b1141a
languageName: node
linkType: hard

Expand Down
Loading