@toruslabs/ethereum-controllers 4.4.0 → 4.5.2
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/ethereumControllers.cjs.js +12 -7
- package/dist/ethereumControllers.cjs.js.map +1 -1
- package/dist/ethereumControllers.esm.js +12 -7
- package/dist/ethereumControllers.esm.js.map +1 -1
- package/dist/ethereumControllers.umd.min.js +1 -1
- package/dist/ethereumControllers.umd.min.js.map +1 -1
- package/dist/types/Network/createEthereumMiddleware.d.ts +4 -4
- package/dist/types/Preferences/PreferencesController.d.ts +2 -0
- package/package.json +3 -3
- package/src/Message/DecryptMessageController.ts +1 -1
- package/src/Message/EncryptionPublicKeyController.ts +1 -1
- package/src/Message/MessageController.ts +1 -1
- package/src/Message/TypedMessageController.ts +3 -6
- package/src/Network/createEthereumMiddleware.ts +7 -3
- package/src/Preferences/PreferencesController.ts +4 -2
|
@@ -2066,7 +2066,7 @@ class DecryptMessageController extends AbstractMessageController {
|
|
|
2066
2066
|
messageParams.origin = req.origin;
|
|
2067
2067
|
}
|
|
2068
2068
|
messageParams.data = normalizeMessageData(messageParams.data);
|
|
2069
|
-
const messageId = randomId();
|
|
2069
|
+
const messageId = messageParams.id || randomId();
|
|
2070
2070
|
const messageData = {
|
|
2071
2071
|
id: messageId,
|
|
2072
2072
|
messageParams,
|
|
@@ -2125,7 +2125,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
|
|
|
2125
2125
|
if (req) {
|
|
2126
2126
|
messageParams.origin = req.origin;
|
|
2127
2127
|
}
|
|
2128
|
-
const messageId = randomId();
|
|
2128
|
+
const messageId = messageParams.id || randomId();
|
|
2129
2129
|
const messageData = {
|
|
2130
2130
|
id: messageId,
|
|
2131
2131
|
messageParams,
|
|
@@ -2188,7 +2188,7 @@ class MessageController extends AbstractMessageController {
|
|
|
2188
2188
|
messageParams.origin = req.origin;
|
|
2189
2189
|
}
|
|
2190
2190
|
messageParams.data = normalizeMessageData(messageParams.data);
|
|
2191
|
-
const messageId = randomId();
|
|
2191
|
+
const messageId = messageParams.id || randomId();
|
|
2192
2192
|
const messageData = {
|
|
2193
2193
|
id: messageId,
|
|
2194
2194
|
messageParams,
|
|
@@ -2299,7 +2299,8 @@ class TypedMessageController extends AbstractMessageController {
|
|
|
2299
2299
|
try {
|
|
2300
2300
|
const msgObject = this.getMessage(messageId);
|
|
2301
2301
|
const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
|
|
2302
|
-
const
|
|
2302
|
+
const msgData = cleanMsgParams.version === SignTypedDataVersion.V1 ? cleanMsgParams.data : JSON.parse(cleanMsgParams.data);
|
|
2303
|
+
const rawSig = await this.signTypedData(msgData, cleanMsgParams.from, cleanMsgParams.version);
|
|
2303
2304
|
this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
|
|
2304
2305
|
rawSig
|
|
2305
2306
|
}));
|
|
@@ -2329,7 +2330,7 @@ class TypedMessageController extends AbstractMessageController {
|
|
|
2329
2330
|
messageParams.origin = req.origin;
|
|
2330
2331
|
}
|
|
2331
2332
|
messageParams.version = version;
|
|
2332
|
-
const messageId = randomId();
|
|
2333
|
+
const messageId = messageParams.id || randomId();
|
|
2333
2334
|
const messageData = {
|
|
2334
2335
|
id: messageId,
|
|
2335
2336
|
messageParams,
|
|
@@ -3281,11 +3282,15 @@ class PreferencesController extends BasePreferencesController {
|
|
|
3281
3282
|
userInfo,
|
|
3282
3283
|
rehydrate,
|
|
3283
3284
|
locale = "en-US",
|
|
3284
|
-
type
|
|
3285
|
+
type,
|
|
3286
|
+
signatures,
|
|
3287
|
+
network
|
|
3285
3288
|
} = params;
|
|
3286
3289
|
await super.init(address, userInfo, jwtToken, {
|
|
3287
3290
|
type,
|
|
3288
|
-
email: userInfo.email
|
|
3291
|
+
email: userInfo.email,
|
|
3292
|
+
signatures,
|
|
3293
|
+
network
|
|
3289
3294
|
});
|
|
3290
3295
|
const {
|
|
3291
3296
|
aggregateVerifier,
|