@dynamic-labs/multi-wallet 0.15.21 → 0.15.22
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/CHANGELOG.md +2 -0
- package/package.json +3 -3
- package/src/utils/message.d.ts +2 -1
- package/src/utils/message.js +4 -1
- package/src/utils/message.js.map +1 -1
- package/src/wallets/ethereum/MagicConnector/MagicConnector.d.ts +1 -0
- package/src/wallets/ethereum/MagicConnector/MagicConnector.js +4 -0
- package/src/wallets/ethereum/MagicConnector/MagicConnector.js.map +1 -1
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dynamic-labs/multi-wallet",
|
|
3
|
-
"version": "0.15.
|
|
3
|
+
"version": "0.15.22",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/dynamic-labs/DynamicAuth.git",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"react-dom": "18.2.0",
|
|
26
26
|
"starknet": "3.19.0",
|
|
27
27
|
"tslib": "2.4.1",
|
|
28
|
-
"@dynamic-labs/logger": "0.15.
|
|
29
|
-
"@dynamic-labs/wallet-connector-core": "0.15.
|
|
28
|
+
"@dynamic-labs/logger": "0.15.22",
|
|
29
|
+
"@dynamic-labs/wallet-connector-core": "0.15.22"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@walletconnect/types": "^2.2.1"
|
package/src/utils/message.d.ts
CHANGED
|
@@ -7,8 +7,9 @@ export interface MessageParameters {
|
|
|
7
7
|
nonce: string;
|
|
8
8
|
publicKey: string;
|
|
9
9
|
requestId?: string;
|
|
10
|
+
resources?: string[];
|
|
10
11
|
statement?: string;
|
|
11
12
|
uri: string;
|
|
12
13
|
}
|
|
13
|
-
export declare const generateMessageToSign: ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt, statement, requestId, }: MessageParameters) => string;
|
|
14
|
+
export declare const generateMessageToSign: ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt, statement, requestId, resources, }: MessageParameters) => string;
|
|
14
15
|
export declare const getEip55Address: (publicKey: string, chainId?: number) => string;
|
package/src/utils/message.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.getEip55Address = exports.generateMessageToSign = void 0;
|
|
|
4
4
|
const utils_1 = require("ethers/lib/utils");
|
|
5
5
|
const logger_1 = require("./logger");
|
|
6
6
|
const getChainInfo_1 = require("./getChainInfo");
|
|
7
|
-
const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt = new Date().toISOString(), statement, requestId, }) => {
|
|
7
|
+
const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt = new Date().toISOString(), statement, requestId, resources, }) => {
|
|
8
8
|
var _a, _b;
|
|
9
9
|
if (blockchain === 'STARK') {
|
|
10
10
|
return nonce;
|
|
@@ -30,6 +30,9 @@ const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, public
|
|
|
30
30
|
if (requestId) {
|
|
31
31
|
suffixFields.push(`Request ID: ${requestId}`);
|
|
32
32
|
}
|
|
33
|
+
if (resources) {
|
|
34
|
+
suffixFields.push(`Resources:${resources.map((resource) => '\n- ' + resource).join()}`);
|
|
35
|
+
}
|
|
33
36
|
const suffix = suffixFields.join('\n');
|
|
34
37
|
return [prefixWithStatement, suffix].join('\n');
|
|
35
38
|
};
|
package/src/utils/message.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/utils/message.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAI9C,qCAAkC;AAClC,iDAA8C;
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/utils/message.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAI9C,qCAAkC;AAClC,iDAA8C;AAevC,MAAM,qBAAqB,GAAG,CAAC,EACpC,UAAU,EACV,MAAM,EACN,OAAO,EACP,KAAK,EACL,GAAG,EACH,SAAS,EACT,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EACnC,SAAS,EACT,SAAS,EACT,SAAS,GACS,EAAU,EAAE;;IAC9B,IAAI,UAAU,KAAK,OAAO,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IAED,MAAM,cAAc,GAAG,MAAA,MAAA,IAAA,2BAAY,EAAC,UAAU,CAAC,0CAAE,cAAc,mCAAI,UAAU,CAAC;IAE9E,iEAAiE;IACjE,yEAAyE;IACzE,qDAAqD;IACrD,oEAAoE;IACpE,MAAM,MAAM,GAAG,GAAG,MAAM,mCAAmC,cAAc,WAAW,CAAC;IACrF,mDAAmD;IACnD,MAAM,cAAc,GAAG,IAAA,uBAAe,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,mBAAmB,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAEpE,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,YAAY,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;IACjC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAChC,IAAI,OAAO,EAAE;QACX,YAAY,CAAC,IAAI,CAAC,aAAa,OAAO,EAAE,CAAC,CAAC;KAC3C;IAED,YAAY,CAAC,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;IACrC,YAAY,CAAC,IAAI,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC;IAE5C,IAAI,SAAS,EAAE;QACb,YAAY,CAAC,IAAI,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC;KAC/C;IAED,IAAI,SAAS,EAAE;QACb,YAAY,CAAC,IAAI,CACf,aAAa,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;KACH;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEvC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC;AAnDW,QAAA,qBAAqB,yBAmDhC;AAEF,4EAA4E;AAC5E,2EAA2E;AAC3E,6CAA6C;AACtC,MAAM,eAAe,GAAG,CAC7B,SAAiB,EACjB,OAAgB,EACR,EAAE;IACV,IAAI;QACF,IAAI,OAAO,EAAE;YACX,OAAO,IAAA,kBAAU,EAAC,SAAS,CAAC,CAAC;SAC9B;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC,6CAA6C,SAAS,EAAE,CAAC,CAAC;KACxE;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B"}
|
|
@@ -18,6 +18,7 @@ export declare class MagicConnector implements EmailWalletConnector {
|
|
|
18
18
|
canConnectViaEmail: boolean;
|
|
19
19
|
switchNetworkOnlyFromWallet?: boolean;
|
|
20
20
|
evmNetworks: EvmNetwork[];
|
|
21
|
+
providerResources?: string[];
|
|
21
22
|
_apiKey: string;
|
|
22
23
|
_email: string | undefined;
|
|
23
24
|
_magicSdk: MagicClient | undefined;
|
|
@@ -19,6 +19,7 @@ class MagicConnector {
|
|
|
19
19
|
this.name = 'Magic Link';
|
|
20
20
|
this.canConnectViaEmail = true;
|
|
21
21
|
this.evmNetworks = [];
|
|
22
|
+
this.providerResources = undefined;
|
|
22
23
|
this._magicSdk = undefined;
|
|
23
24
|
this._config = config;
|
|
24
25
|
this._apiKey = apiKey;
|
|
@@ -114,6 +115,9 @@ class MagicConnector {
|
|
|
114
115
|
if (!metadata || !metadata.publicAddress) {
|
|
115
116
|
throw new Error('No public address');
|
|
116
117
|
}
|
|
118
|
+
if (metadata.issuer) {
|
|
119
|
+
this.providerResources = [`magic-auth:issuer:${metadata.issuer}`];
|
|
120
|
+
}
|
|
117
121
|
return metadata.publicAddress;
|
|
118
122
|
}
|
|
119
123
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MagicConnector.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicConnector.ts"],"names":[],"mappings":";;;;AAAA,yCAKmB;AACnB,mCAAgC;AAQhC,4CAA+C;AAC/C,kDAA+C;AAE/C,0GAAuG;AACvG,0EAAuE;AAWvE,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"MagicConnector.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicConnector.ts"],"names":[],"mappings":"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"}
|