thirdweb 5.30.0-nightly-7be7b6ff84b83ee587d369f4e8da5a2d9f80b8c2-20240626221701 → 5.30.0-nightly-d9088515049f9d07f25a922eba2b895621b00273-20240627043803
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/extensions/ens/resolve-name.js +9 -1
- package/dist/cjs/extensions/ens/resolve-name.js.map +1 -1
- package/dist/cjs/react/web/wallets/shared/WalletConnectConnection.js +19 -14
- package/dist/cjs/react/web/wallets/shared/WalletConnectConnection.js.map +1 -1
- package/dist/cjs/utils/web/openWindow.js +22 -16
- package/dist/cjs/utils/web/openWindow.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/in-app/web/lib/in-app-account.js +3 -3
- package/dist/cjs/wallets/in-app/web/lib/in-app-account.js.map +1 -1
- package/dist/esm/extensions/ens/resolve-name.js +9 -1
- package/dist/esm/extensions/ens/resolve-name.js.map +1 -1
- package/dist/esm/react/web/wallets/shared/WalletConnectConnection.js +19 -14
- package/dist/esm/react/web/wallets/shared/WalletConnectConnection.js.map +1 -1
- package/dist/esm/utils/web/openWindow.js +22 -16
- package/dist/esm/utils/web/openWindow.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/in-app/web/lib/in-app-account.js +3 -3
- package/dist/esm/wallets/in-app/web/lib/in-app-account.js.map +1 -1
- package/dist/types/extensions/ens/resolve-name.d.ts.map +1 -1
- package/dist/types/react/web/wallets/shared/WalletConnectConnection.d.ts.map +1 -1
- package/dist/types/utils/web/openWindow.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/in-app/web/lib/in-app-account.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/extensions/ens/resolve-name.test.ts +10 -2
- package/src/extensions/ens/resolve-name.ts +9 -1
- package/src/react/web/wallets/shared/WalletConnectConnection.tsx +25 -22
- package/src/utils/web/openWindow.ts +22 -17
- package/src/version.ts +1 -1
- package/src/wallets/in-app/web/lib/in-app-account.ts +3 -3
|
@@ -31,7 +31,15 @@ async function resolveName(options) {
|
|
|
31
31
|
address: resolverAddress || constants_js_1.UNIVERSAL_RESOLVER_ADDRESS,
|
|
32
32
|
});
|
|
33
33
|
const reverseName = (0, hex_js_1.toHex)((0, packetToBytes_js_1.packetToBytes)(`${address.toLowerCase().substring(2)}.addr.reverse`));
|
|
34
|
-
const [name, resolvedAddress] = await (0, reverse_js_1.reverse)({
|
|
34
|
+
const [name, resolvedAddress] = await (0, reverse_js_1.reverse)({
|
|
35
|
+
contract,
|
|
36
|
+
reverseName,
|
|
37
|
+
}).catch((e) => {
|
|
38
|
+
if ("data" in e && e.data === "0x7199966d") {
|
|
39
|
+
return [null, address];
|
|
40
|
+
}
|
|
41
|
+
throw e;
|
|
42
|
+
});
|
|
35
43
|
if (address.toLowerCase() !== resolvedAddress.toLowerCase()) {
|
|
36
44
|
return null;
|
|
37
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-name.js","sourceRoot":"","sources":["../../../../src/extensions/ens/resolve-name.ts"],"names":[],"mappings":";;AAgCA,
|
|
1
|
+
{"version":3,"file":"resolve-name.js","sourceRoot":"","sources":["../../../../src/extensions/ens/resolve-name.ts"],"names":[],"mappings":";;AAgCA,kCAqCC;AApED,4EAAsE;AAGtE,4DAAyD;AACzD,wDAAoD;AACpD,uEAAiE;AACjE,mEAA6D;AAC7D,kFAA4E;AAC5E,iDAA4D;AAS5D;;;;;;;;;;;;;GAaG;AACI,KAAK,UAAU,WAAW,CAAC,OAA2B;IAC3D,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEpE,OAAO,IAAA,wBAAS,EACd,KAAK,IAAI,EAAE;QACT,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC;YAC3B,MAAM;YACN,KAAK,EAAE,aAAa,IAAI,sBAAQ;YAChC,OAAO,EAAE,eAAe,IAAI,yCAA0B;SACvD,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,cAAK,EACvB,IAAA,gCAAa,EAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CACpE,CAAC;QAEF,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,GAAG,MAAM,IAAA,oBAAO,EAAC;YAC5C,QAAQ;YACR,WAAW;SACZ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,EAAE,OAAO,CAAU,CAAC;YAClC,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,eAAe,CAAC,WAAW,EAAE,EAAE,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EACD;QACE,QAAQ,EAAE,YAAY,OAAO,EAAE;QAC/B,aAAa;QACb,SAAS,EAAE,EAAE,GAAG,IAAI;KACrB,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -29,26 +29,31 @@ const WalletConnectConnection = (props) => {
|
|
|
29
29
|
showQrModal: false,
|
|
30
30
|
onDisplayUri(uri) {
|
|
31
31
|
const preferNative = walletInfo.mobile.native || walletInfo.mobile.universal;
|
|
32
|
-
|
|
33
|
-
if ((0, isMobile_js_1.
|
|
34
|
-
if (
|
|
35
|
-
|
|
32
|
+
try {
|
|
33
|
+
if ((0, isMobile_js_1.isMobile)()) {
|
|
34
|
+
if ((0, isMobile_js_1.isAndroid)()) {
|
|
35
|
+
if (preferNative) {
|
|
36
|
+
(0, openWindow_js_1.openWindow)((0, url_js_1.formatWalletConnectUrl)(preferNative, uri).redirect);
|
|
37
|
+
}
|
|
36
38
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
else if ((0, isMobile_js_1.isIOS)()) {
|
|
40
|
+
if (preferNative) {
|
|
41
|
+
(0, openWindow_js_1.openWindow)((0, url_js_1.formatWalletConnectUrl)(preferNative, uri).redirect);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
const preferUniversal = walletInfo.mobile.universal || walletInfo.mobile.native;
|
|
46
|
+
if (preferUniversal) {
|
|
47
|
+
(0, openWindow_js_1.openWindow)((0, url_js_1.formatWalletConnectUrl)(preferUniversal, uri).redirect);
|
|
48
|
+
}
|
|
41
49
|
}
|
|
42
50
|
}
|
|
43
51
|
else {
|
|
44
|
-
|
|
45
|
-
if (preferUniversal) {
|
|
46
|
-
(0, openWindow_js_1.openWindow)((0, url_js_1.formatWalletConnectUrl)(preferUniversal, uri).redirect);
|
|
47
|
-
}
|
|
52
|
+
setQrCodeUri(uri);
|
|
48
53
|
}
|
|
49
54
|
}
|
|
50
|
-
|
|
51
|
-
|
|
55
|
+
catch {
|
|
56
|
+
setErrorConnecting(true);
|
|
52
57
|
}
|
|
53
58
|
},
|
|
54
59
|
optionalChains: props.chains,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletConnectConnection.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/WalletConnectConnection.tsx"],"names":[],"mappings":";;;;AAAA,iCAAiE;AAGjE,+DAAyD;AACzD,qDAAkE;AAClE,mEAA+E;AAC/E,uEAAiE;AAKjE,+DAAyD;AACzD,mDAA6C;AAE7C;;;;GAIG;AACI,MAAM,uBAAuB,GAgB/B,CAAC,KAAK,EAAE,EAAE;IACb,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACzE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,GAAsB,CAAC;IACjE,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAC/B,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE1B,MAAM;aACH,OAAO,CAAC;YACP,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,aAAa,EAAE;gBACb,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS;gBACzC,WAAW,EAAE,KAAK;gBAClB,YAAY,CAAC,GAAG;oBACd,MAAM,YAAY,GAChB,UAAU,CAAC,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"WalletConnectConnection.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/WalletConnectConnection.tsx"],"names":[],"mappings":";;;;AAAA,iCAAiE;AAGjE,+DAAyD;AACzD,qDAAkE;AAClE,mEAA+E;AAC/E,uEAAiE;AAKjE,+DAAyD;AACzD,mDAA6C;AAE7C;;;;GAIG;AACI,MAAM,uBAAuB,GAgB/B,CAAC,KAAK,EAAE,EAAE;IACb,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACzE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,GAAsB,CAAC;IACjE,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAC/B,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE1B,MAAM;aACH,OAAO,CAAC;YACP,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,aAAa,EAAE;gBACb,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS;gBACzC,WAAW,EAAE,KAAK;gBAClB,YAAY,CAAC,GAAG;oBACd,MAAM,YAAY,GAChB,UAAU,CAAC,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;oBAC1D,IAAI,CAAC;wBACH,IAAI,IAAA,sBAAQ,GAAE,EAAE,CAAC;4BACf,IAAI,IAAA,uBAAS,GAAE,EAAE,CAAC;gCAChB,IAAI,YAAY,EAAE,CAAC;oCACjB,IAAA,0BAAU,EACR,IAAA,+BAAsB,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC,QAAQ,CACnD,CAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,IAAI,IAAA,mBAAK,GAAE,EAAE,CAAC;gCACnB,IAAI,YAAY,EAAE,CAAC;oCACjB,IAAA,0BAAU,EACR,IAAA,+BAAsB,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC,QAAQ,CACnD,CAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,MAAM,eAAe,GACnB,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;gCAC1D,IAAI,eAAe,EAAE,CAAC;oCACpB,IAAA,0BAAU,EACR,IAAA,+BAAsB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC,QAAQ,CACtD,CAAC;gCACJ,CAAC;4BACH,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,YAAY,CAAC,GAAG,CAAC,CAAC;wBACpB,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,kBAAkB,CAAC,IAAI,CAAC,CAAC;oBAC3B,CAAC;gBACH,CAAC;gBACD,cAAc,EAAE,KAAK,CAAC,MAAM;aAC7B;SACF,CAAC;aACD,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC,EAAE;QACD,KAAK,CAAC,aAAa;QACnB,UAAU,CAAC,MAAM,CAAC,MAAM;QACxB,UAAU,CAAC,MAAM,CAAC,SAAS;QAC3B,MAAM;QACN,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,MAAM;QACZ,KAAK,CAAC,MAAM;QACZ,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAClC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,IAAI,IAAA,sBAAQ,GAAE,EAAE,CAAC;QACf,OAAO,CACL,uBAAC,sCAAgB,IACf,MAAM,EAAE;gBACN,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,WAAW;gBAChD,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK;gBACvC,UAAU,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU;gBAC9C,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM;aACvC,EACD,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,CAAC,IAAI,EAC3B,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,KAAK,CAAC,IAAI,GAChB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,uBAAC,0BAAU,IACT,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,EAChD,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,CAAC,IAAI,EAC3B,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,cAAc,EAAE,MAAM,CAAC,cAAc,EACrC,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,gBAAgB,EAAE,KAAK,CAAC,IAAI,GAC5B,CACH,CAAC;AACJ,CAAC,CAAC;AAnIW,QAAA,uBAAuB,2BAmIlC;AAEF;;;;GAIG;AACI,MAAM,iCAAiC,GAgBzC,CAAC,KAAK,EAAE,EAAE;IACb,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,GACpE,KAAK,CAAC;IACR,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,GAAsB,CAAC;IACjE,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAC/B,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,IAAA,sBAAQ,GAAE,EAAE,CAAC;YACf,IAAI,aAAa,GAAG,KAAK,CAAC;YAE1B,sEAAsE;YACtE,IAAA,cAAI,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnB,4CAA4C;gBAC5C,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,MAAM;iBACH,OAAO,CAAC;gBACP,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS;gBACzC,WAAW,EAAE,IAAI;gBACjB,cAAc,EAAE,KAAK,CAAC,MAAM;aAC7B,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACT,aAAa,GAAG,IAAI,CAAC;gBACrB,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACzB,IAAI,EAAE,CAAC;YACT,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,aAAa,GAAG,IAAI,CAAC;gBACrB,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACzB,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACN,MAAM;iBACH,OAAO,CAAC;gBACP,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS;gBACzC,WAAW,EAAE,KAAK;gBAClB,YAAY,CAAC,GAAG;oBACd,MAAM,YAAY,GAAG;wBACnB,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE;wBACnC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE;wBAC1C,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE;qBACzC,CAAC;oBAEF,YAAY,CAAC,GAAG,CAAC,CAAC;oBAClB,IAAI,IAAA,sBAAQ,GAAE,EAAE,CAAC;wBACf,IAAI,IAAA,uBAAS,GAAE,EAAE,CAAC;4BAChB,IAAA,0BAAU,EACR,GAAG,YAAY,CAAC,OAAO,UAAU,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAC3D,CAAC;wBACJ,CAAC;6BAAM,IAAI,IAAA,mBAAK,GAAE,EAAE,CAAC;4BACnB,IAAA,0BAAU,EACR,GAAG,YAAY,CAAC,GAAG,UAAU,kBAAkB,CAAC,GAAG,CAAC,EAAE,CACvD,CAAC;wBACJ,CAAC;6BAAM,CAAC;4BACN,IAAA,0BAAU,EACR,GAAG,YAAY,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAG,CAAC,EAAE,CACzD,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,cAAc,EAAE,KAAK,CAAC,MAAM;aAC7B,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACT,IAAI,EAAE,CAAC;YACT,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC,EAAE;QACD,KAAK,CAAC,aAAa;QACnB,UAAU,CAAC,MAAM,CAAC,MAAM;QACxB,UAAU,CAAC,MAAM,CAAC,SAAS;QAC3B,MAAM;QACN,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,MAAM;QACZ,KAAK,CAAC,MAAM;QACZ,IAAI;QACJ,kBAAkB;KACnB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAClC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,IAAI,IAAA,sBAAQ,GAAE,EAAE,CAAC;QACf,OAAO,CACL,uBAAC,sCAAgB,IACf,MAAM,EAAE;gBACN,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,WAAW;gBAChD,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK;gBACvC,UAAU,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU;gBAC9C,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM;aACvC,EACD,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,CAAC,IAAI,EAC3B,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,KAAK,CAAC,IAAI,GAChB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,uBAAC,0BAAU,IACT,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,EAChD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,CAAC,IAAI,EAC3B,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,cAAc,EAAE,MAAM,CAAC,cAAc,EACrC,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,gBAAgB,EAAE,KAAK,CAAC,IAAI,GAC5B,CACH,CAAC;AACJ,CAAC,CAAC;AAxJW,QAAA,iCAAiC,qCAwJ5C"}
|
|
@@ -5,24 +5,30 @@ exports.openWindow = openWindow;
|
|
|
5
5
|
* @internal
|
|
6
6
|
*/
|
|
7
7
|
function openWindow(uri) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
// WebViews where a blank tab is left behind after connecting.
|
|
12
|
-
// This is especially bad in some WebView scenarios (e.g. following a
|
|
13
|
-
// link from Twitter) where the user doesn't have any mechanism for
|
|
14
|
-
// closing the blank tab.
|
|
15
|
-
// For whatever reason, links with a target of "_blank" don't suffer
|
|
16
|
-
// from this problem, and programmatically clicking a detached link
|
|
17
|
-
// element with the same attributes also avoids the issue.
|
|
18
|
-
const link = document.createElement("a");
|
|
19
|
-
link.href = uri;
|
|
20
|
-
link.target = "_blank";
|
|
21
|
-
link.rel = "noreferrer noopener";
|
|
22
|
-
link.click();
|
|
8
|
+
const isInsideIframe = window !== window.top;
|
|
9
|
+
if (isInsideIframe) {
|
|
10
|
+
window.open(uri);
|
|
23
11
|
}
|
|
24
12
|
else {
|
|
25
|
-
|
|
13
|
+
if (uri.startsWith("http")) {
|
|
14
|
+
// taken from for https://github.com/rainbow-me/rainbowkit/
|
|
15
|
+
// Using 'window.open' causes issues on iOS in non-Safari browsers and
|
|
16
|
+
// WebViews where a blank tab is left behind after connecting.
|
|
17
|
+
// This is especially bad in some WebView scenarios (e.g. following a
|
|
18
|
+
// link from Twitter) where the user doesn't have any mechanism for
|
|
19
|
+
// closing the blank tab.
|
|
20
|
+
// For whatever reason, links with a target of "_blank" don't suffer
|
|
21
|
+
// from this problem, and programmatically clicking a detached link
|
|
22
|
+
// element with the same attributes also avoids the issue.
|
|
23
|
+
const link = document.createElement("a");
|
|
24
|
+
link.href = uri;
|
|
25
|
+
link.target = "_blank";
|
|
26
|
+
link.rel = "noreferrer noopener";
|
|
27
|
+
link.click();
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
window.location.href = uri;
|
|
31
|
+
}
|
|
26
32
|
}
|
|
27
33
|
}
|
|
28
34
|
//# sourceMappingURL=openWindow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openWindow.js","sourceRoot":"","sources":["../../../../src/utils/web/openWindow.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"openWindow.js","sourceRoot":"","sources":["../../../../src/utils/web/openWindow.ts"],"names":[],"mappings":";;AAGA,gCA0BC;AA7BD;;GAEG;AACH,SAAgB,UAAU,CAAC,GAAW;IACpC,MAAM,cAAc,GAAG,MAAM,KAAK,MAAM,CAAC,GAAG,CAAC;IAC7C,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,2DAA2D;YAE3D,sEAAsE;YACtE,8DAA8D;YAC9D,qEAAqE;YACrE,mEAAmE;YACnE,yBAAyB;YACzB,oEAAoE;YACpE,mEAAmE;YACnE,0DAA0D;YAE1D,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;YACvB,IAAI,CAAC,GAAG,GAAG,qBAAqB,CAAC;YACjC,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.30.0-nightly-
|
|
4
|
+
exports.version = "5.30.0-nightly-d9088515049f9d07f25a922eba2b895621b00273-20240627043803";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -6,7 +6,6 @@ const eth_sendRawTransaction_js_1 = require("../../../../rpc/actions/eth_sendRaw
|
|
|
6
6
|
const rpc_js_1 = require("../../../../rpc/rpc.js");
|
|
7
7
|
const hex_js_1 = require("../../../../utils/encoding/hex.js");
|
|
8
8
|
const parseTypedData_js_1 = require("../../../../utils/signatures/helpers/parseTypedData.js");
|
|
9
|
-
const uint8_array_js_1 = require("../../../../utils/uint8-array.js");
|
|
10
9
|
const get_ecosystem_partner_permissions_js_1 = require("../../../ecosystem/get-ecosystem-partner-permissions.js");
|
|
11
10
|
const type_js_1 = require("../../core/authentication/type.js");
|
|
12
11
|
const LocalStorage_js_1 = require("../utils/Storage/LocalStorage.js");
|
|
@@ -208,14 +207,15 @@ class IFrameWallet {
|
|
|
208
207
|
return message;
|
|
209
208
|
}
|
|
210
209
|
if (message.raw instanceof Uint8Array) {
|
|
211
|
-
return
|
|
210
|
+
return message.raw;
|
|
212
211
|
}
|
|
213
212
|
return (0, hex_js_1.hexToString)(message.raw);
|
|
214
213
|
})();
|
|
215
214
|
const { signedMessage } = await querier.call({
|
|
216
215
|
procedureName: "signMessage",
|
|
217
216
|
params: {
|
|
218
|
-
|
|
217
|
+
// biome-ignore lint/suspicious/noExplicitAny: ethers tx transformation
|
|
218
|
+
message: messageDecoded, // needs bytes or string
|
|
219
219
|
partnerId,
|
|
220
220
|
chainId: 1, // TODO check if we need this
|
|
221
221
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-account.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/in-app-account.ts"],"names":[],"mappings":";;;AAEA,0DAA6D;AAE7D,iGAA2F;AAC3F,mDAAsD;AACtD,8DAA0E;AAC1E,8FAAwF;AAExF,
|
|
1
|
+
{"version":3,"file":"in-app-account.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/in-app-account.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,15 @@ export async function resolveName(options) {
|
|
|
28
28
|
address: resolverAddress || UNIVERSAL_RESOLVER_ADDRESS,
|
|
29
29
|
});
|
|
30
30
|
const reverseName = toHex(packetToBytes(`${address.toLowerCase().substring(2)}.addr.reverse`));
|
|
31
|
-
const [name, resolvedAddress] = await reverse({
|
|
31
|
+
const [name, resolvedAddress] = await reverse({
|
|
32
|
+
contract,
|
|
33
|
+
reverseName,
|
|
34
|
+
}).catch((e) => {
|
|
35
|
+
if ("data" in e && e.data === "0x7199966d") {
|
|
36
|
+
return [null, address];
|
|
37
|
+
}
|
|
38
|
+
throw e;
|
|
39
|
+
});
|
|
32
40
|
if (address.toLowerCase() !== resolvedAddress.toLowerCase()) {
|
|
33
41
|
return null;
|
|
34
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-name.js","sourceRoot":"","sources":["../../../../src/extensions/ens/resolve-name.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,mDAAmD,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAS5D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAA2B;IAC3D,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEpE,OAAO,SAAS,CACd,KAAK,IAAI,EAAE;QACT,MAAM,QAAQ,GAAG,WAAW,CAAC;YAC3B,MAAM;YACN,KAAK,EAAE,aAAa,IAAI,QAAQ;YAChC,OAAO,EAAE,eAAe,IAAI,0BAA0B;SACvD,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,KAAK,CACvB,aAAa,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CACpE,CAAC;QAEF,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"resolve-name.js","sourceRoot":"","sources":["../../../../src/extensions/ens/resolve-name.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,mDAAmD,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAS5D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAA2B;IAC3D,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEpE,OAAO,SAAS,CACd,KAAK,IAAI,EAAE;QACT,MAAM,QAAQ,GAAG,WAAW,CAAC;YAC3B,MAAM;YACN,KAAK,EAAE,aAAa,IAAI,QAAQ;YAChC,OAAO,EAAE,eAAe,IAAI,0BAA0B;SACvD,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,KAAK,CACvB,aAAa,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CACpE,CAAC;QAEF,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC;YAC5C,QAAQ;YACR,WAAW;SACZ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,EAAE,OAAO,CAAU,CAAC;YAClC,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,eAAe,CAAC,WAAW,EAAE,EAAE,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EACD;QACE,QAAQ,EAAE,YAAY,OAAO,EAAE;QAC/B,aAAa;QACb,SAAS,EAAE,EAAE,GAAG,IAAI;KACrB,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -26,26 +26,31 @@ export const WalletConnectConnection = (props) => {
|
|
|
26
26
|
showQrModal: false,
|
|
27
27
|
onDisplayUri(uri) {
|
|
28
28
|
const preferNative = walletInfo.mobile.native || walletInfo.mobile.universal;
|
|
29
|
-
|
|
30
|
-
if (
|
|
31
|
-
if (
|
|
32
|
-
|
|
29
|
+
try {
|
|
30
|
+
if (isMobile()) {
|
|
31
|
+
if (isAndroid()) {
|
|
32
|
+
if (preferNative) {
|
|
33
|
+
openWindow(formatWalletConnectUrl(preferNative, uri).redirect);
|
|
34
|
+
}
|
|
33
35
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
else if (isIOS()) {
|
|
37
|
+
if (preferNative) {
|
|
38
|
+
openWindow(formatWalletConnectUrl(preferNative, uri).redirect);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
const preferUniversal = walletInfo.mobile.universal || walletInfo.mobile.native;
|
|
43
|
+
if (preferUniversal) {
|
|
44
|
+
openWindow(formatWalletConnectUrl(preferUniversal, uri).redirect);
|
|
45
|
+
}
|
|
38
46
|
}
|
|
39
47
|
}
|
|
40
48
|
else {
|
|
41
|
-
|
|
42
|
-
if (preferUniversal) {
|
|
43
|
-
openWindow(formatWalletConnectUrl(preferUniversal, uri).redirect);
|
|
44
|
-
}
|
|
49
|
+
setQrCodeUri(uri);
|
|
45
50
|
}
|
|
46
51
|
}
|
|
47
|
-
|
|
48
|
-
|
|
52
|
+
catch {
|
|
53
|
+
setErrorConnecting(true);
|
|
49
54
|
}
|
|
50
55
|
},
|
|
51
56
|
optionalChains: props.chains,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletConnectConnection.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/WalletConnectConnection.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjE,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAKjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAgB/B,CAAC,KAAK,EAAE,EAAE;IACb,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACzE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAsB,CAAC;IACjE,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE1B,MAAM;aACH,OAAO,CAAC;YACP,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,aAAa,EAAE;gBACb,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS;gBACzC,WAAW,EAAE,KAAK;gBAClB,YAAY,CAAC,GAAG;oBACd,MAAM,YAAY,GAChB,UAAU,CAAC,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"WalletConnectConnection.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/WalletConnectConnection.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,24 +2,30 @@
|
|
|
2
2
|
* @internal
|
|
3
3
|
*/
|
|
4
4
|
export function openWindow(uri) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
// WebViews where a blank tab is left behind after connecting.
|
|
9
|
-
// This is especially bad in some WebView scenarios (e.g. following a
|
|
10
|
-
// link from Twitter) where the user doesn't have any mechanism for
|
|
11
|
-
// closing the blank tab.
|
|
12
|
-
// For whatever reason, links with a target of "_blank" don't suffer
|
|
13
|
-
// from this problem, and programmatically clicking a detached link
|
|
14
|
-
// element with the same attributes also avoids the issue.
|
|
15
|
-
const link = document.createElement("a");
|
|
16
|
-
link.href = uri;
|
|
17
|
-
link.target = "_blank";
|
|
18
|
-
link.rel = "noreferrer noopener";
|
|
19
|
-
link.click();
|
|
5
|
+
const isInsideIframe = window !== window.top;
|
|
6
|
+
if (isInsideIframe) {
|
|
7
|
+
window.open(uri);
|
|
20
8
|
}
|
|
21
9
|
else {
|
|
22
|
-
|
|
10
|
+
if (uri.startsWith("http")) {
|
|
11
|
+
// taken from for https://github.com/rainbow-me/rainbowkit/
|
|
12
|
+
// Using 'window.open' causes issues on iOS in non-Safari browsers and
|
|
13
|
+
// WebViews where a blank tab is left behind after connecting.
|
|
14
|
+
// This is especially bad in some WebView scenarios (e.g. following a
|
|
15
|
+
// link from Twitter) where the user doesn't have any mechanism for
|
|
16
|
+
// closing the blank tab.
|
|
17
|
+
// For whatever reason, links with a target of "_blank" don't suffer
|
|
18
|
+
// from this problem, and programmatically clicking a detached link
|
|
19
|
+
// element with the same attributes also avoids the issue.
|
|
20
|
+
const link = document.createElement("a");
|
|
21
|
+
link.href = uri;
|
|
22
|
+
link.target = "_blank";
|
|
23
|
+
link.rel = "noreferrer noopener";
|
|
24
|
+
link.click();
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
window.location.href = uri;
|
|
28
|
+
}
|
|
23
29
|
}
|
|
24
30
|
}
|
|
25
31
|
//# sourceMappingURL=openWindow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openWindow.js","sourceRoot":"","sources":["../../../../src/utils/web/openWindow.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"openWindow.js","sourceRoot":"","sources":["../../../../src/utils/web/openWindow.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,MAAM,cAAc,GAAG,MAAM,KAAK,MAAM,CAAC,GAAG,CAAC;IAC7C,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,2DAA2D;YAE3D,sEAAsE;YACtE,8DAA8D;YAC9D,qEAAqE;YACrE,mEAAmE;YACnE,yBAAyB;YACzB,oEAAoE;YACpE,mEAAmE;YACnE,0DAA0D;YAE1D,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;YACvB,IAAI,CAAC,GAAG,GAAG,qBAAqB,CAAC;YACjC,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.30.0-nightly-
|
|
1
|
+
export const version = "5.30.0-nightly-d9088515049f9d07f25a922eba2b895621b00273-20240627043803";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -3,7 +3,6 @@ import { eth_sendRawTransaction } from "../../../../rpc/actions/eth_sendRawTrans
|
|
|
3
3
|
import { getRpcClient } from "../../../../rpc/rpc.js";
|
|
4
4
|
import { hexToString } from "../../../../utils/encoding/hex.js";
|
|
5
5
|
import { parseTypedData } from "../../../../utils/signatures/helpers/parseTypedData.js";
|
|
6
|
-
import { uint8ArrayToString } from "../../../../utils/uint8-array.js";
|
|
7
6
|
import { getEcosystemPartnerPermissions } from "../../../ecosystem/get-ecosystem-partner-permissions.js";
|
|
8
7
|
import { UserWalletStatus, } from "../../core/authentication/type.js";
|
|
9
8
|
import { LocalStorage } from "../utils/Storage/LocalStorage.js";
|
|
@@ -205,14 +204,15 @@ export class IFrameWallet {
|
|
|
205
204
|
return message;
|
|
206
205
|
}
|
|
207
206
|
if (message.raw instanceof Uint8Array) {
|
|
208
|
-
return
|
|
207
|
+
return message.raw;
|
|
209
208
|
}
|
|
210
209
|
return hexToString(message.raw);
|
|
211
210
|
})();
|
|
212
211
|
const { signedMessage } = await querier.call({
|
|
213
212
|
procedureName: "signMessage",
|
|
214
213
|
params: {
|
|
215
|
-
|
|
214
|
+
// biome-ignore lint/suspicious/noExplicitAny: ethers tx transformation
|
|
215
|
+
message: messageDecoded, // needs bytes or string
|
|
216
216
|
partnerId,
|
|
217
217
|
chainId: 1, // TODO check if we need this
|
|
218
218
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-account.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/in-app-account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAY,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAExF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"in-app-account.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/in-app-account.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-name.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ens/resolve-name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAQ7D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,KAAK,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"resolve-name.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ens/resolve-name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAQ7D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,KAAK,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,0BAqC5D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletConnectConnection.d.ts","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/WalletConnectConnection.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAIxE;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC7C,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EACT;QACE,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GACD,SAAS,CAAC;IACd,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B,
|
|
1
|
+
{"version":3,"file":"WalletConnectConnection.d.ts","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/WalletConnectConnection.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAIxE;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC7C,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EACT;QACE,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GACD,SAAS,CAAC;IACd,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B,CAmHA,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,EAAE,KAAK,CAAC,EAAE,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,kBAAkB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EACT;QACE,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GACD,SAAS,CAAC;IACd,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B,CAwIA,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openWindow.d.ts","sourceRoot":"","sources":["../../../../src/utils/web/openWindow.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"openWindow.d.ts","sourceRoot":"","sources":["../../../../src/utils/web/openWindow.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,QA0BrC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.30.0-nightly-
|
|
1
|
+
export declare const version = "5.30.0-nightly-d9088515049f9d07f25a922eba2b895621b00273-20240627043803";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-account.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/in-app-account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,mCAAmC,CAAC;AAE1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"in-app-account.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/in-app-account.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.30.0-nightly-
|
|
3
|
+
"version": "5.30.0-nightly-d9088515049f9d07f25a922eba2b895621b00273-20240627043803",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -6,11 +6,19 @@ import { resolveName } from "./resolve-name.js";
|
|
|
6
6
|
// TODO: remove reliance on secret key during unit tests entirely
|
|
7
7
|
describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-name", () => {
|
|
8
8
|
it("should resolve ENS", async () => {
|
|
9
|
-
const
|
|
9
|
+
const ens = await resolveName({
|
|
10
10
|
client: TEST_CLIENT,
|
|
11
11
|
// vitalik.eth
|
|
12
12
|
address: "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
|
|
13
13
|
});
|
|
14
|
-
expect(
|
|
14
|
+
expect(ens).toBe("vitalik.eth");
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
it("should return null if no ENS exists for the address", async () => {
|
|
18
|
+
const ens = await resolveName({
|
|
19
|
+
client: TEST_CLIENT,
|
|
20
|
+
address: "0xc6248746A9CA5935ae722E2061347A5897548c03",
|
|
21
|
+
});
|
|
22
|
+
expect(ens).toBeNull();
|
|
15
23
|
});
|
|
16
24
|
});
|
|
@@ -45,7 +45,15 @@ export async function resolveName(options: ResolveNameOptions) {
|
|
|
45
45
|
packetToBytes(`${address.toLowerCase().substring(2)}.addr.reverse`),
|
|
46
46
|
);
|
|
47
47
|
|
|
48
|
-
const [name, resolvedAddress] = await reverse({
|
|
48
|
+
const [name, resolvedAddress] = await reverse({
|
|
49
|
+
contract,
|
|
50
|
+
reverseName,
|
|
51
|
+
}).catch((e) => {
|
|
52
|
+
if ("data" in e && e.data === "0x7199966d") {
|
|
53
|
+
return [null, address] as const;
|
|
54
|
+
}
|
|
55
|
+
throw e;
|
|
56
|
+
});
|
|
49
57
|
|
|
50
58
|
if (address.toLowerCase() !== resolvedAddress.toLowerCase()) {
|
|
51
59
|
return null;
|
|
@@ -51,31 +51,34 @@ export const WalletConnectConnection: React.FC<{
|
|
|
51
51
|
onDisplayUri(uri) {
|
|
52
52
|
const preferNative =
|
|
53
53
|
walletInfo.mobile.native || walletInfo.mobile.universal;
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
54
|
+
try {
|
|
55
|
+
if (isMobile()) {
|
|
56
|
+
if (isAndroid()) {
|
|
57
|
+
if (preferNative) {
|
|
58
|
+
openWindow(
|
|
59
|
+
formatWalletConnectUrl(preferNative, uri).redirect,
|
|
60
|
+
);
|
|
61
|
+
}
|
|
62
|
+
} else if (isIOS()) {
|
|
63
|
+
if (preferNative) {
|
|
64
|
+
openWindow(
|
|
65
|
+
formatWalletConnectUrl(preferNative, uri).redirect,
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
} else {
|
|
69
|
+
const preferUniversal =
|
|
70
|
+
walletInfo.mobile.universal || walletInfo.mobile.native;
|
|
71
|
+
if (preferUniversal) {
|
|
72
|
+
openWindow(
|
|
73
|
+
formatWalletConnectUrl(preferUniversal, uri).redirect,
|
|
74
|
+
);
|
|
75
|
+
}
|
|
67
76
|
}
|
|
68
77
|
} else {
|
|
69
|
-
|
|
70
|
-
walletInfo.mobile.universal || walletInfo.mobile.native;
|
|
71
|
-
if (preferUniversal) {
|
|
72
|
-
openWindow(
|
|
73
|
-
formatWalletConnectUrl(preferUniversal, uri).redirect,
|
|
74
|
-
);
|
|
75
|
-
}
|
|
78
|
+
setQrCodeUri(uri);
|
|
76
79
|
}
|
|
77
|
-
}
|
|
78
|
-
|
|
80
|
+
} catch {
|
|
81
|
+
setErrorConnecting(true);
|
|
79
82
|
}
|
|
80
83
|
},
|
|
81
84
|
optionalChains: props.chains,
|
|
@@ -2,24 +2,29 @@
|
|
|
2
2
|
* @internal
|
|
3
3
|
*/
|
|
4
4
|
export function openWindow(uri: string) {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
const isInsideIframe = window !== window.top;
|
|
6
|
+
if (isInsideIframe) {
|
|
7
|
+
window.open(uri);
|
|
8
|
+
} else {
|
|
9
|
+
if (uri.startsWith("http")) {
|
|
10
|
+
// taken from for https://github.com/rainbow-me/rainbowkit/
|
|
7
11
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
// Using 'window.open' causes issues on iOS in non-Safari browsers and
|
|
13
|
+
// WebViews where a blank tab is left behind after connecting.
|
|
14
|
+
// This is especially bad in some WebView scenarios (e.g. following a
|
|
15
|
+
// link from Twitter) where the user doesn't have any mechanism for
|
|
16
|
+
// closing the blank tab.
|
|
17
|
+
// For whatever reason, links with a target of "_blank" don't suffer
|
|
18
|
+
// from this problem, and programmatically clicking a detached link
|
|
19
|
+
// element with the same attributes also avoids the issue.
|
|
16
20
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
const link = document.createElement("a");
|
|
22
|
+
link.href = uri;
|
|
23
|
+
link.target = "_blank";
|
|
24
|
+
link.rel = "noreferrer noopener";
|
|
25
|
+
link.click();
|
|
26
|
+
} else {
|
|
27
|
+
window.location.href = uri;
|
|
28
|
+
}
|
|
24
29
|
}
|
|
25
30
|
}
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.30.0-nightly-
|
|
1
|
+
export const version = "5.30.0-nightly-d9088515049f9d07f25a922eba2b895621b00273-20240627043803";
|
|
@@ -7,7 +7,6 @@ import { getRpcClient } from "../../../../rpc/rpc.js";
|
|
|
7
7
|
import { type Hex, hexToString } from "../../../../utils/encoding/hex.js";
|
|
8
8
|
import { parseTypedData } from "../../../../utils/signatures/helpers/parseTypedData.js";
|
|
9
9
|
import type { Prettify } from "../../../../utils/type-utils.js";
|
|
10
|
-
import { uint8ArrayToString } from "../../../../utils/uint8-array.js";
|
|
11
10
|
import { getEcosystemPartnerPermissions } from "../../../ecosystem/get-ecosystem-partner-permissions.js";
|
|
12
11
|
import type {
|
|
13
12
|
Account,
|
|
@@ -279,7 +278,7 @@ export class IFrameWallet {
|
|
|
279
278
|
return message;
|
|
280
279
|
}
|
|
281
280
|
if (message.raw instanceof Uint8Array) {
|
|
282
|
-
return
|
|
281
|
+
return message.raw;
|
|
283
282
|
}
|
|
284
283
|
return hexToString(message.raw);
|
|
285
284
|
})();
|
|
@@ -287,7 +286,8 @@ export class IFrameWallet {
|
|
|
287
286
|
const { signedMessage } = await querier.call<SignMessageReturnType>({
|
|
288
287
|
procedureName: "signMessage",
|
|
289
288
|
params: {
|
|
290
|
-
|
|
289
|
+
// biome-ignore lint/suspicious/noExplicitAny: ethers tx transformation
|
|
290
|
+
message: messageDecoded as any, // needs bytes or string
|
|
291
291
|
partnerId,
|
|
292
292
|
chainId: 1, // TODO check if we need this
|
|
293
293
|
},
|