@taquito/beacon-wallet 17.2.0-beta-RC.0 → 17.2.0

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 (10) hide show
  1. package/dist/lib/taquito-beacon-wallet.js +23 -18
  2. package/dist/lib/taquito-beacon-wallet.js.map +1 -1
  3. package/dist/lib/version.js +2 -2
  4. package/dist/lib/version.js.map +1 -1
  5. package/dist/taquito-beacon-wallet.es6.js +26 -22
  6. package/dist/taquito-beacon-wallet.es6.js.map +1 -1
  7. package/dist/taquito-beacon-wallet.umd.js +24 -20
  8. package/dist/taquito-beacon-wallet.umd.js.map +1 -1
  9. package/dist/types/taquito-beacon-wallet.d.ts +3 -5
  10. package/package.json +4 -4
package/dist/lib/taquito-beacon-wallet.js CHANGED
@@ -19,6 +19,7 @@ const errors_1 = require("./errors");
19
19
  const typedarray_to_buffer_1 = require("typedarray-to-buffer");
20
20
  const taquito_1 = require("@taquito/taquito");
21
21
  const utils_1 = require("@taquito/utils");
22
+ const core_1 = require("@taquito/core");
22
23
  var version_1 = require("./version");
23
24
  Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
24
25
  var errors_2 = require("./errors");
@@ -167,26 +168,16 @@ class BeaconWallet {
167
168
  yield this.client.setActiveAccount();
168
169
  });
169
170
  }
170
- sign(signingRequest) {
171
+ sign(bytes, watermark) {
171
172
  return __awaiter(this, void 0, void 0, function* () {
172
- let bb = utils_1.hex2buf(signingRequest.payload);
173
- if (typeof signingRequest.watermark !== 'undefined') {
174
- bb = utils_1.mergebuf(signingRequest.watermark, bb);
173
+ let bb = utils_1.hex2buf(bytes);
174
+ if (typeof watermark !== 'undefined') {
175
+ bb = utils_1.mergebuf(watermark, bb);
175
176
  }
176
177
  const watermarkedBytes = utils_1.buf2hex(typedarray_to_buffer_1.default(bb));
177
- let signingType;
178
- switch (signingRequest.watermark) {
179
- case new Uint8Array([5]):
180
- signingType = beacon_dapp_1.SigningType.MICHELINE;
181
- break;
182
- case new Uint8Array([3]):
183
- signingType = beacon_dapp_1.SigningType.OPERATION;
184
- break;
185
- case undefined:
186
- signingType = beacon_dapp_1.SigningType.RAW;
187
- break;
188
- default:
189
- throw new Error(`Invalid watermark ${JSON.stringify(signingRequest.watermark)}`);
178
+ const signingType = this.getSigningType(watermark);
179
+ if (signingType !== beacon_dapp_1.SigningType.OPERATION) {
180
+ throw new core_1.UnsupportedActionError(`Taquito Beacon Wallet currently only supports signing operations, not ${signingType}`);
190
181
  }
191
182
  const { signature } = yield this.client.requestSignPayload({
192
183
  payload: watermarkedBytes,
@@ -195,7 +186,21 @@ class BeaconWallet {
195
186
  return signature;
196
187
  });
197
188
  }
198
- getPublicKey() {
189
+ getSigningType(watermark) {
190
+ if (!watermark || watermark.length === 0) {
191
+ return beacon_dapp_1.SigningType.RAW;
192
+ }
193
+ if (watermark.length === 1) {
194
+ if (watermark[0] === 5) {
195
+ return beacon_dapp_1.SigningType.MICHELINE;
196
+ }
197
+ if (watermark[0] === 3) {
198
+ return beacon_dapp_1.SigningType.OPERATION;
199
+ }
200
+ }
201
+ throw new Error(`Invalid watermark ${JSON.stringify(watermark)}`);
202
+ }
203
+ getPK() {
199
204
  return __awaiter(this, void 0, void 0, function* () {
200
205
  const account = yield this.client.getActiveAccount();
201
206
  if (!account) {
package/dist/lib/taquito-beacon-wallet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"taquito-beacon-wallet.js","sourceRoot":"","sources":["../../src/taquito-beacon-wallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"taquito-beacon-wallet.js","sourceRoot":"","sources":["../../src/taquito-beacon-wallet.ts"],"names":[],"mappings":"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"}
package/dist/lib/version.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.VERSION = void 0;
4
4
  // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
5
5
  exports.VERSION = {
6
- "commitHash": "96c9d60e1d08c7ac01d81e4d23ba5038c7779c92",
7
- "version": "17.2.0-beta-RC.0"
6
+ "commitHash": "b85fc404e34545a518215e449b3f1253f4520eec",
7
+ "version": "17.2.0"
8
8
  };
9
9
  //# sourceMappingURL=version.js.map
package/dist/lib/version.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AACA,2EAA2E;AAC9D,QAAA,OAAO,GAAG;IACnB,YAAY,EAAE,0CAA0C;IACxD,SAAS,EAAE,kBAAkB;CAChC,CAAC"}
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AACA,2EAA2E;AAC9D,QAAA,OAAO,GAAG;IACnB,YAAY,EAAE,0CAA0C;IACxD,SAAS,EAAE,QAAQ;CACtB,CAAC"}
package/dist/taquito-beacon-wallet.es6.js CHANGED
@@ -1,5 +1,5 @@
1
- import { getDAppClientInstance, PermissionScope, SigningType } from '@airgap/beacon-dapp';
2
- import { PermissionDeniedError } from '@taquito/core';
1
+ import { getDAppClientInstance, SigningType, PermissionScope } from '@airgap/beacon-dapp';
2
+ import { PermissionDeniedError, UnsupportedActionError } from '@taquito/core';
3
3
  import toBuffer from 'typedarray-to-buffer';
4
4
  import { createTransferOperation, createIncreasePaidStorageOperation, createOriginationOperation, createSetDelegateOperation } from '@taquito/taquito';
5
5
  import { hex2buf, mergebuf, buf2hex } from '@taquito/utils';
@@ -61,8 +61,8 @@ class MissingRequiredScopes extends PermissionDeniedError {
61
61
 
62
62
  // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
63
63
  const VERSION = {
64
- "commitHash": "96c9d60e1d08c7ac01d81e4d23ba5038c7779c92",
65
- "version": "17.2.0-beta-RC.0"
64
+ "commitHash": "b85fc404e34545a518215e449b3f1253f4520eec",
65
+ "version": "17.2.0"
66
66
  };
67
67
 
68
68
  /**
@@ -212,26 +212,16 @@ class BeaconWallet {
212
212
  yield this.client.setActiveAccount();
213
213
  });
214
214
  }
215
- sign(signingRequest) {
215
+ sign(bytes, watermark) {
216
216
  return __awaiter(this, void 0, void 0, function* () {
217
- let bb = hex2buf(signingRequest.payload);
218
- if (typeof signingRequest.watermark !== 'undefined') {
219
- bb = mergebuf(signingRequest.watermark, bb);
217
+ let bb = hex2buf(bytes);
218
+ if (typeof watermark !== 'undefined') {
219
+ bb = mergebuf(watermark, bb);
220
220
  }
221
221
  const watermarkedBytes = buf2hex(toBuffer(bb));
222
- let signingType;
223
- switch (signingRequest.watermark) {
224
- case new Uint8Array([5]):
225
- signingType = SigningType.MICHELINE;
226
- break;
227
- case new Uint8Array([3]):
228
- signingType = SigningType.OPERATION;
229
- break;
230
- case undefined:
231
- signingType = SigningType.RAW;
232
- break;
233
- default:
234
- throw new Error(`Invalid watermark ${JSON.stringify(signingRequest.watermark)}`);
222
+ const signingType = this.getSigningType(watermark);
223
+ if (signingType !== SigningType.OPERATION) {
224
+ throw new UnsupportedActionError(`Taquito Beacon Wallet currently only supports signing operations, not ${signingType}`);
235
225
  }
236
226
  const { signature } = yield this.client.requestSignPayload({
237
227
  payload: watermarkedBytes,
@@ -240,7 +230,21 @@ class BeaconWallet {
240
230
  return signature;
241
231
  });
242
232
  }
243
- getPublicKey() {
233
+ getSigningType(watermark) {
234
+ if (!watermark || watermark.length === 0) {
235
+ return SigningType.RAW;
236
+ }
237
+ if (watermark.length === 1) {
238
+ if (watermark[0] === 5) {
239
+ return SigningType.MICHELINE;
240
+ }
241
+ if (watermark[0] === 3) {
242
+ return SigningType.OPERATION;
243
+ }
244
+ }
245
+ throw new Error(`Invalid watermark ${JSON.stringify(watermark)}`);
246
+ }
247
+ getPK() {
244
248
  return __awaiter(this, void 0, void 0, function* () {
245
249
  const account = yield this.client.getActiveAccount();
246
250
  if (!account) {
package/dist/taquito-beacon-wallet.es6.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"taquito-beacon-wallet.es6.js","sources":["../src/errors.ts","../src/version.ts","../src/taquito-beacon-wallet.ts"],"sourcesContent":["import { PermissionScope } from '@airgap/beacon-dapp';\nimport { PermissionDeniedError } from '@taquito/core';\n\n/**\n * @category Error\n * @description Error that indicates the Beacon wallet not being initialized\n */\nexport class BeaconWalletNotInitialized extends PermissionDeniedError {\n constructor() {\n super();\n this.name = 'BeaconWalletNotInitialized';\n this.message =\n 'BeaconWallet needs to be initialized by calling `await BeaconWallet.requestPermissions({network: {type: \"chosen_network\"}})` first.';\n }\n}\n\n/**\n * @category Error\n * @description Error that indicates missing required persmission scopes\n */\nexport class MissingRequiredScopes extends PermissionDeniedError {\n constructor(public readonly requiredScopes: PermissionScope[]) {\n super();\n this.name = 'MissingRequiredScopes';\n this.message = `Required permissions scopes: ${requiredScopes.join(',')} were not granted.`;\n }\n}\n","\n// IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!\nexport const VERSION = {\n \"commitHash\": \"96c9d60e1d08c7ac01d81e4d23ba5038c7779c92\",\n \"version\": \"17.2.0-beta-RC.0\"\n};\n","/**\n * @packageDocumentation\n * @module @taquito/beacon-wallet\n */\n\nimport {\n DAppClient,\n DAppClientOptions,\n RequestPermissionInput,\n PermissionScope,\n getDAppClientInstance,\n SigningType,\n} from '@airgap/beacon-dapp';\nimport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\nimport toBuffer from 'typedarray-to-buffer';\nimport {\n createIncreasePaidStorageOperation,\n createOriginationOperation,\n createSetDelegateOperation,\n createTransferOperation,\n WalletDelegateParams,\n WalletIncreasePaidStorageParams,\n WalletOriginateParams,\n WalletProvider,\n WalletTransferParams,\n} from '@taquito/taquito';\nimport { buf2hex, hex2buf, mergebuf } from '@taquito/utils';\n\nexport { VERSION } from './version';\nexport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\n\nexport class BeaconWallet implements WalletProvider {\n public client: DAppClient;\n\n constructor(options: DAppClientOptions) {\n this.client = getDAppClientInstance(options);\n }\n\n private validateRequiredScopesOrFail(\n permissionScopes: PermissionScope[],\n requiredScopes: PermissionScope[]\n ) {\n const mandatoryScope = new Set(requiredScopes);\n\n for (const scope of permissionScopes) {\n if (mandatoryScope.has(scope)) {\n mandatoryScope.delete(scope);\n }\n }\n\n if (mandatoryScope.size > 0) {\n throw new MissingRequiredScopes(Array.from(mandatoryScope));\n }\n }\n\n async requestPermissions(request?: RequestPermissionInput) {\n await this.client.requestPermissions(request);\n }\n\n async getPKH() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account.address;\n }\n\n async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {\n let walletParams: WalletTransferParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createTransferOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapIncreasePaidStorageWalletParams(params: () => Promise<WalletIncreasePaidStorageParams>) {\n let walletParams: WalletIncreasePaidStorageParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createIncreasePaidStorageOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapOriginateParamsToWalletParams(params: () => Promise<WalletOriginateParams>) {\n let walletParams: WalletOriginateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createOriginationOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapDelegateParamsToWalletParams(params: () => Promise<WalletDelegateParams>) {\n let walletParams: WalletDelegateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createSetDelegateOperation(this.formatParameters(walletParams))\n );\n }\n\n formatParameters(params: any) {\n if (params.fee) {\n params.fee = params.fee.toString();\n }\n if (params.storageLimit) {\n params.storageLimit = params.storageLimit.toString();\n }\n if (params.gasLimit) {\n params.gasLimit = params.gasLimit.toString();\n }\n return params;\n }\n\n removeDefaultParams(\n params: WalletTransferParams | WalletOriginateParams | WalletDelegateParams,\n operatedParams: any\n ) {\n // If fee, storageLimit or gasLimit is undefined by user\n // in case of beacon wallet, dont override it by\n // defaults.\n if (!params.fee) {\n delete operatedParams.fee;\n }\n if (!params.storageLimit) {\n delete operatedParams.storage_limit;\n }\n if (!params.gasLimit) {\n delete operatedParams.gas_limit;\n }\n return operatedParams;\n }\n\n async sendOperations(params: any[]) {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n const permissions = account.scopes;\n this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);\n\n const { transactionHash } = await this.client.requestOperation({ operationDetails: params });\n return transactionHash;\n }\n\n /**\n *\n * @description Removes all beacon values from the storage. After using this method, this instance is no longer usable.\n * You will have to instantiate a new BeaconWallet.\n */\n async disconnect() {\n await this.client.destroy();\n }\n\n /**\n *\n * @description This method removes the active account from local storage by setting it to undefined.\n */\n async clearActiveAccount() {\n await this.client.setActiveAccount();\n }\n\n async sign(signingRequest: { payload: string; watermark?: Uint8Array }) {\n let bb = hex2buf(signingRequest.payload);\n if (typeof signingRequest.watermark !== 'undefined') {\n bb = mergebuf(signingRequest.watermark, bb);\n }\n const watermarkedBytes = buf2hex(toBuffer(bb));\n\n let signingType: SigningType;\n switch (signingRequest.watermark) {\n case new Uint8Array([5]):\n signingType = SigningType.MICHELINE;\n break;\n case new Uint8Array([3]):\n signingType = SigningType.OPERATION;\n break;\n case undefined:\n signingType = SigningType.RAW;\n break;\n default:\n throw new Error(`Invalid watermark ${JSON.stringify(signingRequest.watermark)}`);\n }\n const { signature } = await this.client.requestSignPayload({\n payload: watermarkedBytes,\n signingType,\n });\n return signature;\n }\n\n async getPublicKey() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account?.publicKey;\n }\n}\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"taquito-beacon-wallet.es6.js","sources":["../src/errors.ts","../src/version.ts","../src/taquito-beacon-wallet.ts"],"sourcesContent":["import { PermissionScope } from '@airgap/beacon-dapp';\nimport { PermissionDeniedError } from '@taquito/core';\n\n/**\n * @category Error\n * @description Error that indicates the Beacon wallet not being initialized\n */\nexport class BeaconWalletNotInitialized extends PermissionDeniedError {\n constructor() {\n super();\n this.name = 'BeaconWalletNotInitialized';\n this.message =\n 'BeaconWallet needs to be initialized by calling `await BeaconWallet.requestPermissions({network: {type: \"chosen_network\"}})` first.';\n }\n}\n\n/**\n * @category Error\n * @description Error that indicates missing required persmission scopes\n */\nexport class MissingRequiredScopes extends PermissionDeniedError {\n constructor(public readonly requiredScopes: PermissionScope[]) {\n super();\n this.name = 'MissingRequiredScopes';\n this.message = `Required permissions scopes: ${requiredScopes.join(',')} were not granted.`;\n }\n}\n","\n// IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!\nexport const VERSION = {\n \"commitHash\": \"b85fc404e34545a518215e449b3f1253f4520eec\",\n \"version\": \"17.2.0\"\n};\n","/**\n * @packageDocumentation\n * @module @taquito/beacon-wallet\n */\n\nimport {\n DAppClient,\n DAppClientOptions,\n RequestPermissionInput,\n PermissionScope,\n getDAppClientInstance,\n SigningType,\n} from '@airgap/beacon-dapp';\nimport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\nimport toBuffer from 'typedarray-to-buffer';\nimport {\n createIncreasePaidStorageOperation,\n createOriginationOperation,\n createSetDelegateOperation,\n createTransferOperation,\n WalletDelegateParams,\n WalletIncreasePaidStorageParams,\n WalletOriginateParams,\n WalletProvider,\n WalletTransferParams,\n} from '@taquito/taquito';\nimport { buf2hex, hex2buf, mergebuf } from '@taquito/utils';\nimport { UnsupportedActionError } from '@taquito/core';\n\nexport { VERSION } from './version';\nexport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\n\nexport class BeaconWallet implements WalletProvider {\n public client: DAppClient;\n\n constructor(options: DAppClientOptions) {\n this.client = getDAppClientInstance(options);\n }\n\n private validateRequiredScopesOrFail(\n permissionScopes: PermissionScope[],\n requiredScopes: PermissionScope[]\n ) {\n const mandatoryScope = new Set(requiredScopes);\n\n for (const scope of permissionScopes) {\n if (mandatoryScope.has(scope)) {\n mandatoryScope.delete(scope);\n }\n }\n\n if (mandatoryScope.size > 0) {\n throw new MissingRequiredScopes(Array.from(mandatoryScope));\n }\n }\n\n async requestPermissions(request?: RequestPermissionInput) {\n await this.client.requestPermissions(request);\n }\n\n async getPKH() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account.address;\n }\n\n async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {\n let walletParams: WalletTransferParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createTransferOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapIncreasePaidStorageWalletParams(params: () => Promise<WalletIncreasePaidStorageParams>) {\n let walletParams: WalletIncreasePaidStorageParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createIncreasePaidStorageOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapOriginateParamsToWalletParams(params: () => Promise<WalletOriginateParams>) {\n let walletParams: WalletOriginateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createOriginationOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapDelegateParamsToWalletParams(params: () => Promise<WalletDelegateParams>) {\n let walletParams: WalletDelegateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createSetDelegateOperation(this.formatParameters(walletParams))\n );\n }\n\n formatParameters(params: any) {\n if (params.fee) {\n params.fee = params.fee.toString();\n }\n if (params.storageLimit) {\n params.storageLimit = params.storageLimit.toString();\n }\n if (params.gasLimit) {\n params.gasLimit = params.gasLimit.toString();\n }\n return params;\n }\n\n removeDefaultParams(\n params: WalletTransferParams | WalletOriginateParams | WalletDelegateParams,\n operatedParams: any\n ) {\n // If fee, storageLimit or gasLimit is undefined by user\n // in case of beacon wallet, dont override it by\n // defaults.\n if (!params.fee) {\n delete operatedParams.fee;\n }\n if (!params.storageLimit) {\n delete operatedParams.storage_limit;\n }\n if (!params.gasLimit) {\n delete operatedParams.gas_limit;\n }\n return operatedParams;\n }\n\n async sendOperations(params: any[]) {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n const permissions = account.scopes;\n this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);\n\n const { transactionHash } = await this.client.requestOperation({ operationDetails: params });\n return transactionHash;\n }\n\n /**\n *\n * @description Removes all beacon values from the storage. After using this method, this instance is no longer usable.\n * You will have to instantiate a new BeaconWallet.\n */\n async disconnect() {\n await this.client.destroy();\n }\n\n /**\n *\n * @description This method removes the active account from local storage by setting it to undefined.\n */\n async clearActiveAccount() {\n await this.client.setActiveAccount();\n }\n\n async sign(bytes: string, watermark?: Uint8Array) {\n let bb = hex2buf(bytes);\n if (typeof watermark !== 'undefined') {\n bb = mergebuf(watermark, bb);\n }\n const watermarkedBytes = buf2hex(toBuffer(bb));\n const signingType = this.getSigningType(watermark);\n if (signingType !== SigningType.OPERATION) {\n throw new UnsupportedActionError(\n `Taquito Beacon Wallet currently only supports signing operations, not ${signingType}`\n );\n }\n const { signature } = await this.client.requestSignPayload({\n payload: watermarkedBytes,\n signingType,\n });\n return signature;\n }\n\n private getSigningType(watermark?: Uint8Array) {\n if (!watermark || watermark.length === 0) {\n return SigningType.RAW;\n }\n if (watermark.length === 1) {\n if (watermark[0] === 5) {\n return SigningType.MICHELINE;\n }\n if (watermark[0] === 3) {\n return SigningType.OPERATION;\n }\n }\n throw new Error(`Invalid watermark ${JSON.stringify(watermark)}`);\n }\n\n async getPK() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account?.publicKey;\n }\n}\n"],"names":[],"mappings":"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"}
package/dist/taquito-beacon-wallet.umd.js CHANGED
@@ -65,8 +65,8 @@
65
65
 
66
66
  // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
67
67
  const VERSION = {
68
- "commitHash": "96c9d60e1d08c7ac01d81e4d23ba5038c7779c92",
69
- "version": "17.2.0-beta-RC.0"
68
+ "commitHash": "b85fc404e34545a518215e449b3f1253f4520eec",
69
+ "version": "17.2.0"
70
70
  };
71
71
 
72
72
  /**
@@ -216,26 +216,16 @@
216
216
  yield this.client.setActiveAccount();
217
217
  });
218
218
  }
219
- sign(signingRequest) {
219
+ sign(bytes, watermark) {
220
220
  return __awaiter(this, void 0, void 0, function* () {
221
- let bb = utils.hex2buf(signingRequest.payload);
222
- if (typeof signingRequest.watermark !== 'undefined') {
223
- bb = utils.mergebuf(signingRequest.watermark, bb);
221
+ let bb = utils.hex2buf(bytes);
222
+ if (typeof watermark !== 'undefined') {
223
+ bb = utils.mergebuf(watermark, bb);
224
224
  }
225
225
  const watermarkedBytes = utils.buf2hex(toBuffer__default["default"](bb));
226
- let signingType;
227
- switch (signingRequest.watermark) {
228
- case new Uint8Array([5]):
229
- signingType = beaconDapp.SigningType.MICHELINE;
230
- break;
231
- case new Uint8Array([3]):
232
- signingType = beaconDapp.SigningType.OPERATION;
233
- break;
234
- case undefined:
235
- signingType = beaconDapp.SigningType.RAW;
236
- break;
237
- default:
238
- throw new Error(`Invalid watermark ${JSON.stringify(signingRequest.watermark)}`);
226
+ const signingType = this.getSigningType(watermark);
227
+ if (signingType !== beaconDapp.SigningType.OPERATION) {
228
+ throw new core.UnsupportedActionError(`Taquito Beacon Wallet currently only supports signing operations, not ${signingType}`);
239
229
  }
240
230
  const { signature } = yield this.client.requestSignPayload({
241
231
  payload: watermarkedBytes,
@@ -244,7 +234,21 @@
244
234
  return signature;
245
235
  });
246
236
  }
247
- getPublicKey() {
237
+ getSigningType(watermark) {
238
+ if (!watermark || watermark.length === 0) {
239
+ return beaconDapp.SigningType.RAW;
240
+ }
241
+ if (watermark.length === 1) {
242
+ if (watermark[0] === 5) {
243
+ return beaconDapp.SigningType.MICHELINE;
244
+ }
245
+ if (watermark[0] === 3) {
246
+ return beaconDapp.SigningType.OPERATION;
247
+ }
248
+ }
249
+ throw new Error(`Invalid watermark ${JSON.stringify(watermark)}`);
250
+ }
251
+ getPK() {
248
252
  return __awaiter(this, void 0, void 0, function* () {
249
253
  const account = yield this.client.getActiveAccount();
250
254
  if (!account) {
package/dist/taquito-beacon-wallet.umd.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"taquito-beacon-wallet.umd.js","sources":["../src/errors.ts","../src/version.ts","../src/taquito-beacon-wallet.ts"],"sourcesContent":["import { PermissionScope } from '@airgap/beacon-dapp';\nimport { PermissionDeniedError } from '@taquito/core';\n\n/**\n * @category Error\n * @description Error that indicates the Beacon wallet not being initialized\n */\nexport class BeaconWalletNotInitialized extends PermissionDeniedError {\n constructor() {\n super();\n this.name = 'BeaconWalletNotInitialized';\n this.message =\n 'BeaconWallet needs to be initialized by calling `await BeaconWallet.requestPermissions({network: {type: \"chosen_network\"}})` first.';\n }\n}\n\n/**\n * @category Error\n * @description Error that indicates missing required persmission scopes\n */\nexport class MissingRequiredScopes extends PermissionDeniedError {\n constructor(public readonly requiredScopes: PermissionScope[]) {\n super();\n this.name = 'MissingRequiredScopes';\n this.message = `Required permissions scopes: ${requiredScopes.join(',')} were not granted.`;\n }\n}\n","\n// IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!\nexport const VERSION = {\n \"commitHash\": \"96c9d60e1d08c7ac01d81e4d23ba5038c7779c92\",\n \"version\": \"17.2.0-beta-RC.0\"\n};\n","/**\n * @packageDocumentation\n * @module @taquito/beacon-wallet\n */\n\nimport {\n DAppClient,\n DAppClientOptions,\n RequestPermissionInput,\n PermissionScope,\n getDAppClientInstance,\n SigningType,\n} from '@airgap/beacon-dapp';\nimport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\nimport toBuffer from 'typedarray-to-buffer';\nimport {\n createIncreasePaidStorageOperation,\n createOriginationOperation,\n createSetDelegateOperation,\n createTransferOperation,\n WalletDelegateParams,\n WalletIncreasePaidStorageParams,\n WalletOriginateParams,\n WalletProvider,\n WalletTransferParams,\n} from '@taquito/taquito';\nimport { buf2hex, hex2buf, mergebuf } from '@taquito/utils';\n\nexport { VERSION } from './version';\nexport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\n\nexport class BeaconWallet implements WalletProvider {\n public client: DAppClient;\n\n constructor(options: DAppClientOptions) {\n this.client = getDAppClientInstance(options);\n }\n\n private validateRequiredScopesOrFail(\n permissionScopes: PermissionScope[],\n requiredScopes: PermissionScope[]\n ) {\n const mandatoryScope = new Set(requiredScopes);\n\n for (const scope of permissionScopes) {\n if (mandatoryScope.has(scope)) {\n mandatoryScope.delete(scope);\n }\n }\n\n if (mandatoryScope.size > 0) {\n throw new MissingRequiredScopes(Array.from(mandatoryScope));\n }\n }\n\n async requestPermissions(request?: RequestPermissionInput) {\n await this.client.requestPermissions(request);\n }\n\n async getPKH() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account.address;\n }\n\n async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {\n let walletParams: WalletTransferParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createTransferOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapIncreasePaidStorageWalletParams(params: () => Promise<WalletIncreasePaidStorageParams>) {\n let walletParams: WalletIncreasePaidStorageParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createIncreasePaidStorageOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapOriginateParamsToWalletParams(params: () => Promise<WalletOriginateParams>) {\n let walletParams: WalletOriginateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createOriginationOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapDelegateParamsToWalletParams(params: () => Promise<WalletDelegateParams>) {\n let walletParams: WalletDelegateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createSetDelegateOperation(this.formatParameters(walletParams))\n );\n }\n\n formatParameters(params: any) {\n if (params.fee) {\n params.fee = params.fee.toString();\n }\n if (params.storageLimit) {\n params.storageLimit = params.storageLimit.toString();\n }\n if (params.gasLimit) {\n params.gasLimit = params.gasLimit.toString();\n }\n return params;\n }\n\n removeDefaultParams(\n params: WalletTransferParams | WalletOriginateParams | WalletDelegateParams,\n operatedParams: any\n ) {\n // If fee, storageLimit or gasLimit is undefined by user\n // in case of beacon wallet, dont override it by\n // defaults.\n if (!params.fee) {\n delete operatedParams.fee;\n }\n if (!params.storageLimit) {\n delete operatedParams.storage_limit;\n }\n if (!params.gasLimit) {\n delete operatedParams.gas_limit;\n }\n return operatedParams;\n }\n\n async sendOperations(params: any[]) {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n const permissions = account.scopes;\n this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);\n\n const { transactionHash } = await this.client.requestOperation({ operationDetails: params });\n return transactionHash;\n }\n\n /**\n *\n * @description Removes all beacon values from the storage. After using this method, this instance is no longer usable.\n * You will have to instantiate a new BeaconWallet.\n */\n async disconnect() {\n await this.client.destroy();\n }\n\n /**\n *\n * @description This method removes the active account from local storage by setting it to undefined.\n */\n async clearActiveAccount() {\n await this.client.setActiveAccount();\n }\n\n async sign(signingRequest: { payload: string; watermark?: Uint8Array }) {\n let bb = hex2buf(signingRequest.payload);\n if (typeof signingRequest.watermark !== 'undefined') {\n bb = mergebuf(signingRequest.watermark, bb);\n }\n const watermarkedBytes = buf2hex(toBuffer(bb));\n\n let signingType: SigningType;\n switch (signingRequest.watermark) {\n case new Uint8Array([5]):\n signingType = SigningType.MICHELINE;\n break;\n case new Uint8Array([3]):\n signingType = SigningType.OPERATION;\n break;\n case undefined:\n signingType = SigningType.RAW;\n break;\n default:\n throw new Error(`Invalid watermark ${JSON.stringify(signingRequest.watermark)}`);\n }\n const { signature } = await this.client.requestSignPayload({\n payload: watermarkedBytes,\n signingType,\n });\n return signature;\n }\n\n async getPublicKey() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account?.publicKey;\n }\n}\n"],"names":["PermissionDeniedError","getDAppClientInstance","createTransferOperation","createIncreasePaidStorageOperation","createOriginationOperation","createSetDelegateOperation","PermissionScope","hex2buf","mergebuf","buf2hex","toBuffer","SigningType"],"mappings":"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"}
1
+ {"version":3,"file":"taquito-beacon-wallet.umd.js","sources":["../src/errors.ts","../src/version.ts","../src/taquito-beacon-wallet.ts"],"sourcesContent":["import { PermissionScope } from '@airgap/beacon-dapp';\nimport { PermissionDeniedError } from '@taquito/core';\n\n/**\n * @category Error\n * @description Error that indicates the Beacon wallet not being initialized\n */\nexport class BeaconWalletNotInitialized extends PermissionDeniedError {\n constructor() {\n super();\n this.name = 'BeaconWalletNotInitialized';\n this.message =\n 'BeaconWallet needs to be initialized by calling `await BeaconWallet.requestPermissions({network: {type: \"chosen_network\"}})` first.';\n }\n}\n\n/**\n * @category Error\n * @description Error that indicates missing required persmission scopes\n */\nexport class MissingRequiredScopes extends PermissionDeniedError {\n constructor(public readonly requiredScopes: PermissionScope[]) {\n super();\n this.name = 'MissingRequiredScopes';\n this.message = `Required permissions scopes: ${requiredScopes.join(',')} were not granted.`;\n }\n}\n","\n// IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!\nexport const VERSION = {\n \"commitHash\": \"b85fc404e34545a518215e449b3f1253f4520eec\",\n \"version\": \"17.2.0\"\n};\n","/**\n * @packageDocumentation\n * @module @taquito/beacon-wallet\n */\n\nimport {\n DAppClient,\n DAppClientOptions,\n RequestPermissionInput,\n PermissionScope,\n getDAppClientInstance,\n SigningType,\n} from '@airgap/beacon-dapp';\nimport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\nimport toBuffer from 'typedarray-to-buffer';\nimport {\n createIncreasePaidStorageOperation,\n createOriginationOperation,\n createSetDelegateOperation,\n createTransferOperation,\n WalletDelegateParams,\n WalletIncreasePaidStorageParams,\n WalletOriginateParams,\n WalletProvider,\n WalletTransferParams,\n} from '@taquito/taquito';\nimport { buf2hex, hex2buf, mergebuf } from '@taquito/utils';\nimport { UnsupportedActionError } from '@taquito/core';\n\nexport { VERSION } from './version';\nexport { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';\n\nexport class BeaconWallet implements WalletProvider {\n public client: DAppClient;\n\n constructor(options: DAppClientOptions) {\n this.client = getDAppClientInstance(options);\n }\n\n private validateRequiredScopesOrFail(\n permissionScopes: PermissionScope[],\n requiredScopes: PermissionScope[]\n ) {\n const mandatoryScope = new Set(requiredScopes);\n\n for (const scope of permissionScopes) {\n if (mandatoryScope.has(scope)) {\n mandatoryScope.delete(scope);\n }\n }\n\n if (mandatoryScope.size > 0) {\n throw new MissingRequiredScopes(Array.from(mandatoryScope));\n }\n }\n\n async requestPermissions(request?: RequestPermissionInput) {\n await this.client.requestPermissions(request);\n }\n\n async getPKH() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account.address;\n }\n\n async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {\n let walletParams: WalletTransferParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createTransferOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapIncreasePaidStorageWalletParams(params: () => Promise<WalletIncreasePaidStorageParams>) {\n let walletParams: WalletIncreasePaidStorageParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createIncreasePaidStorageOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapOriginateParamsToWalletParams(params: () => Promise<WalletOriginateParams>) {\n let walletParams: WalletOriginateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createOriginationOperation(this.formatParameters(walletParams))\n );\n }\n\n async mapDelegateParamsToWalletParams(params: () => Promise<WalletDelegateParams>) {\n let walletParams: WalletDelegateParams;\n await this.client.showPrepare();\n try {\n walletParams = await params();\n } catch (err) {\n await this.client.hideUI();\n throw err;\n }\n return this.removeDefaultParams(\n walletParams,\n await createSetDelegateOperation(this.formatParameters(walletParams))\n );\n }\n\n formatParameters(params: any) {\n if (params.fee) {\n params.fee = params.fee.toString();\n }\n if (params.storageLimit) {\n params.storageLimit = params.storageLimit.toString();\n }\n if (params.gasLimit) {\n params.gasLimit = params.gasLimit.toString();\n }\n return params;\n }\n\n removeDefaultParams(\n params: WalletTransferParams | WalletOriginateParams | WalletDelegateParams,\n operatedParams: any\n ) {\n // If fee, storageLimit or gasLimit is undefined by user\n // in case of beacon wallet, dont override it by\n // defaults.\n if (!params.fee) {\n delete operatedParams.fee;\n }\n if (!params.storageLimit) {\n delete operatedParams.storage_limit;\n }\n if (!params.gasLimit) {\n delete operatedParams.gas_limit;\n }\n return operatedParams;\n }\n\n async sendOperations(params: any[]) {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n const permissions = account.scopes;\n this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);\n\n const { transactionHash } = await this.client.requestOperation({ operationDetails: params });\n return transactionHash;\n }\n\n /**\n *\n * @description Removes all beacon values from the storage. After using this method, this instance is no longer usable.\n * You will have to instantiate a new BeaconWallet.\n */\n async disconnect() {\n await this.client.destroy();\n }\n\n /**\n *\n * @description This method removes the active account from local storage by setting it to undefined.\n */\n async clearActiveAccount() {\n await this.client.setActiveAccount();\n }\n\n async sign(bytes: string, watermark?: Uint8Array) {\n let bb = hex2buf(bytes);\n if (typeof watermark !== 'undefined') {\n bb = mergebuf(watermark, bb);\n }\n const watermarkedBytes = buf2hex(toBuffer(bb));\n const signingType = this.getSigningType(watermark);\n if (signingType !== SigningType.OPERATION) {\n throw new UnsupportedActionError(\n `Taquito Beacon Wallet currently only supports signing operations, not ${signingType}`\n );\n }\n const { signature } = await this.client.requestSignPayload({\n payload: watermarkedBytes,\n signingType,\n });\n return signature;\n }\n\n private getSigningType(watermark?: Uint8Array) {\n if (!watermark || watermark.length === 0) {\n return SigningType.RAW;\n }\n if (watermark.length === 1) {\n if (watermark[0] === 5) {\n return SigningType.MICHELINE;\n }\n if (watermark[0] === 3) {\n return SigningType.OPERATION;\n }\n }\n throw new Error(`Invalid watermark ${JSON.stringify(watermark)}`);\n }\n\n async getPK() {\n const account = await this.client.getActiveAccount();\n if (!account) {\n throw new BeaconWalletNotInitialized();\n }\n return account?.publicKey;\n }\n}\n"],"names":["PermissionDeniedError","getDAppClientInstance","createTransferOperation","createIncreasePaidStorageOperation","createOriginationOperation","createSetDelegateOperation","PermissionScope","hex2buf","mergebuf","buf2hex","toBuffer","SigningType","UnsupportedActionError"],"mappings":"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"}
package/dist/types/taquito-beacon-wallet.d.ts CHANGED
@@ -30,9 +30,7 @@ export declare class BeaconWallet implements WalletProvider {
30
30
  * @description This method removes the active account from local storage by setting it to undefined.
31
31
  */
32
32
  clearActiveAccount(): Promise<void>;
33
- sign(signingRequest: {
34
- payload: string;
35
- watermark?: Uint8Array;
36
- }): Promise<string>;
37
- getPublicKey(): Promise<string>;
33
+ sign(bytes: string, watermark?: Uint8Array): Promise<string>;
34
+ private getSigningType;
35
+ getPK(): Promise<string>;
38
36
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@taquito/beacon-wallet",
3
- "version": "17.2.0-beta-RC.0",
3
+ "version": "17.2.0",
4
4
  "description": "Beacon wallet provider",
5
5
  "keywords": [
6
6
  "tezos",
@@ -68,8 +68,8 @@
68
68
  },
69
69
  "dependencies": {
70
70
  "@airgap/beacon-dapp": "4.0.6",
71
- "@taquito/core": "^17.2.0-beta-RC.0",
72
- "@taquito/taquito": "^17.2.0-beta-RC.0"
71
+ "@taquito/core": "^17.2.0",
72
+ "@taquito/taquito": "^17.2.0"
73
73
  },
74
74
  "devDependencies": {
75
75
  "@types/bluebird": "^3.5.36",
@@ -101,5 +101,5 @@
101
101
  "ts-toolbelt": "^9.6.0",
102
102
  "typescript": "4.2.4"
103
103
  },
104
- "gitHead": "14abfbab9dc46c1370a6c2e4483c2585b0f76d88"
104
+ "gitHead": "8fe3376401f12f5a97556479620c0414a6e5c7c3"
105
105
  }