@snapshot-labs/snapshot.js 0.11.13 → 0.11.15

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.
Files changed (6) hide show
  1. package/dist/sign/index.d.ts +1 -0
  2. package/dist/snapshot.cjs.js +20 -8
  3. package/dist/snapshot.esm.js +20 -8
  4. package/dist/snapshot.min.js +1 -1
  5. package/package.json +1 -1
  6. package/src/sign/index.ts +18 -4
package/dist/sign/index.d.ts CHANGED
@@ -4,6 +4,7 @@ import { Space, Proposal, UpdateProposal, FlagProposal, CancelProposal, Vote, Fo
4
4
  export declare const domain: {
5
5
  name: string;
6
6
  version: string;
7
+ chainId?: number;
7
8
  };
8
9
  export default class Client {
9
10
  readonly address: string;
package/dist/snapshot.cjs.js CHANGED
@@ -352,22 +352,31 @@ var Client = /** @class */ (function () {
352
352
  this.options = options;
353
353
  }
354
354
  Client.prototype.sign = function (web3, address$1, message, types) {
355
+ var _a;
355
356
  return __awaiter(this, void 0, void 0, function () {
356
- var signer, checksumAddress, data, sig;
357
- return __generator(this, function (_a) {
358
- switch (_a.label) {
357
+ var signer, checksumAddress, domainData, _b, data, sig;
358
+ return __generator(this, function (_c) {
359
+ switch (_c.label) {
359
360
  case 0:
360
361
  signer = (web3 === null || web3 === void 0 ? void 0 : web3.getSigner) ? web3.getSigner() : web3;
361
362
  checksumAddress = address.getAddress(address$1);
362
363
  message.from = message.from ? address.getAddress(message.from) : checksumAddress;
363
364
  if (!message.timestamp)
364
365
  message.timestamp = parseInt((Date.now() / 1e3).toFixed());
365
- data = { domain: domain, types: types, message: message };
366
- return [4 /*yield*/, signer._signTypedData(domain, data.types, message)];
366
+ domainData = __assign({}, domain);
367
+ if (!((_a = window === null || window === void 0 ? void 0 : window.ethereum) === null || _a === void 0 ? void 0 : _a.isTrust)) return [3 /*break*/, 2];
368
+ _b = domainData;
369
+ return [4 /*yield*/, signer.provider.getNetwork()];
367
370
  case 1:
368
- sig = _a.sent();
371
+ _b.chainId = (_c.sent()).chainId;
372
+ _c.label = 2;
373
+ case 2:
374
+ data = { domain: domainData, types: types, message: message };
375
+ return [4 /*yield*/, signer._signTypedData(domainData, data.types, message)];
376
+ case 3:
377
+ sig = _c.sent();
369
378
  return [4 /*yield*/, this.send({ address: checksumAddress, sig: sig, data: data })];
370
- case 2: return [2 /*return*/, _a.sent()];
379
+ case 4: return [2 /*return*/, _c.sent()];
371
380
  }
372
381
  });
373
382
  });
@@ -390,11 +399,14 @@ var Client = /** @class */ (function () {
390
399
  return [2 /*return*/, new Promise(function (resolve, reject) {
391
400
  fetch__default['default'](address, init)
392
401
  .then(function (res) {
402
+ var _a;
393
403
  if (res.ok)
394
404
  return resolve(res.json());
405
+ if ((_a = res.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('application/json'))
406
+ return res.json().then(reject).catch(reject);
395
407
  throw res;
396
408
  })
397
- .catch(function (e) { return reject(e); });
409
+ .catch(reject);
398
410
  })];
399
411
  });
400
412
  });
package/dist/snapshot.esm.js CHANGED
@@ -342,22 +342,31 @@ var Client = /** @class */ (function () {
342
342
  this.options = options;
343
343
  }
344
344
  Client.prototype.sign = function (web3, address, message, types) {
345
+ var _a;
345
346
  return __awaiter(this, void 0, void 0, function () {
346
- var signer, checksumAddress, data, sig;
347
- return __generator(this, function (_a) {
348
- switch (_a.label) {
347
+ var signer, checksumAddress, domainData, _b, data, sig;
348
+ return __generator(this, function (_c) {
349
+ switch (_c.label) {
349
350
  case 0:
350
351
  signer = (web3 === null || web3 === void 0 ? void 0 : web3.getSigner) ? web3.getSigner() : web3;
351
352
  checksumAddress = getAddress(address);
352
353
  message.from = message.from ? getAddress(message.from) : checksumAddress;
353
354
  if (!message.timestamp)
354
355
  message.timestamp = parseInt((Date.now() / 1e3).toFixed());
355
- data = { domain: domain, types: types, message: message };
356
- return [4 /*yield*/, signer._signTypedData(domain, data.types, message)];
356
+ domainData = __assign({}, domain);
357
+ if (!((_a = window === null || window === void 0 ? void 0 : window.ethereum) === null || _a === void 0 ? void 0 : _a.isTrust)) return [3 /*break*/, 2];
358
+ _b = domainData;
359
+ return [4 /*yield*/, signer.provider.getNetwork()];
357
360
  case 1:
358
- sig = _a.sent();
361
+ _b.chainId = (_c.sent()).chainId;
362
+ _c.label = 2;
363
+ case 2:
364
+ data = { domain: domainData, types: types, message: message };
365
+ return [4 /*yield*/, signer._signTypedData(domainData, data.types, message)];
366
+ case 3:
367
+ sig = _c.sent();
359
368
  return [4 /*yield*/, this.send({ address: checksumAddress, sig: sig, data: data })];
360
- case 2: return [2 /*return*/, _a.sent()];
369
+ case 4: return [2 /*return*/, _c.sent()];
361
370
  }
362
371
  });
363
372
  });
@@ -380,11 +389,14 @@ var Client = /** @class */ (function () {
380
389
  return [2 /*return*/, new Promise(function (resolve, reject) {
381
390
  fetch(address, init)
382
391
  .then(function (res) {
392
+ var _a;
383
393
  if (res.ok)
384
394
  return resolve(res.json());
395
+ if ((_a = res.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('application/json'))
396
+ return res.json().then(reject).catch(reject);
385
397
  throw res;
386
398
  })
387
- .catch(function (e) { return reject(e); });
399
+ .catch(reject);
388
400
  })];
389
401
  });
390
402
  });