@human-protocol/sdk 3.0.6 → 3.0.8

package/src/constants.ts

@@ -1,39 +1,18 @@
 import { ChainId } from './enums';
 import { NetworkData } from './types';
 
-/**
- * @constant Default public bucket name
- */
 export const DEFAULT_PUBLIC_BUCKET = 'escrow-public-results';
 
-/**
- * @constant Default storage endpoint
- */
 export const DEFAULT_ENDPOINT = 'localhost';
 
-/**
- * @constant Default storage region
- */
 export const DEFAULT_REGION = 'eu';
 
-/**
- * @constant Default storage port
- */
 export const DEFAULT_PORT = 9000;
 
-/**
- * @constant Default storage port
- */
 export const DEFAULT_USE_SSL = false;
 
-/**
- * @constant Default tx Id
- */
 export const DEFAULT_TX_ID = 1;
 
-/**
- * @constant Default Enum for escrow statuses.
- */
 export enum HttpStatus {
   OK = 200,
   CREATED = 201,
@@ -45,9 +24,6 @@ export enum HttpStatus {
   INTERNAL_SERVER_ERROR = 500,
 }
 
-/**
- * @constant Default network parameters
- */
 export const NETWORKS: {
   [chainId in ChainId]?: NetworkData;
 } = {
@@ -57,13 +33,12 @@ export const NETWORKS: {
     scanUrl: 'https://etherscan.io',
     factoryAddress: '0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a',
     hmtAddress: '0xd1ba9BAC957322D6e8c07a160a3A8dA11A0d2867',
-    stakingAddress: '0x05398211bA2046E296fBc9a9D3EB49e3F15C3123',
-    rewardPoolAddress: '0x4A5963Dd6792692e9147EdC7659936b96251917a',
+    stakingAddress: '0xEf6Da3aB52c33925Be3F84038193a7e1331F51E6',
     kvstoreAddress: '0xB6d36B1CDaD50302BCB3DB43bAb0D349458e1b8D',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/ethereum/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmaTcYR8NCzZuxwY7tBkMJAo1Q64BMqNNSzqjxd7FH9s2p',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNTdYHpQLW4sbrCxihXNdQwhxa2zdyu1yPkCUuTbqESba',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -74,7 +49,6 @@ export const NETWORKS: {
     factoryAddress: '0x925B24444511c86F4d4E63141D8Be0A025E2dca4',
     hmtAddress: '0x4dCf5ac4509888714dd43A5cCc46d7ab389D9c23',
     stakingAddress: '',
-    rewardPoolAddress: '',
     kvstoreAddress: '',
     subgraphUrl: '',
     subgraphUrlApiKey: '',
@@ -88,7 +62,6 @@ export const NETWORKS: {
     factoryAddress: '0x87469B4f2Fcf37cBd34E54244c0BD4Fa0603664c',
     hmtAddress: '0xd3A31D57FDD790725d0F6B78095F62E8CD4ab317',
     stakingAddress: '0xf46B45Df3d956369726d8Bd93Ba33963Ab692920',
-    rewardPoolAddress: '0x0376D26246Eb35FF4F9924cF13E6C05fd0bD7Fb4',
     kvstoreAddress: '0x19Fc3e859C1813ac9427a7a78BeB9ae102CE96d3',
     subgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/goerli-v2',
@@ -101,15 +74,14 @@ export const NETWORKS: {
     chainId: ChainId.SEPOLIA,
     title: 'Ethereum Sepolia',
     scanUrl: 'https://sepolia.etherscan.io/',
-    factoryAddress: '0xD6D347ba6987519B4e42EcED43dF98eFf5465a23',
+    factoryAddress: '0x5987A5558d961ee674efe4A8c8eB7B1b5495D3bf',
     hmtAddress: '0x792abbcC99c01dbDec49c9fa9A828a186Da45C33',
-    stakingAddress: '0x2B9C5EC6220BA8Ad08CB51A60FFdbC6a6235B203',
-    rewardPoolAddress: '0xAFf5a986A530ff839d49325A5dF69F96627E8D29',
+    stakingAddress: '0x2163e3A40032Af1C359ac731deaB48258b317890',
     kvstoreAddress: '0xCc0AF0635aa19fE799B6aFDBe28fcFAeA7f00a60',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/sepolia/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmadNQBBzcfJHTmzLezZGbwvLux7HmnmfByBHubS2cmLUr',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmXVFVCLm2XxupxdKgnLRzvmkPJnpRbcoe4RNXoTqSRHsg',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -119,13 +91,12 @@ export const NETWORKS: {
     scanUrl: 'https://bscscan.com',
     factoryAddress: '0x92FD968AcBd521c232f5fB8c33b342923cC72714',
     hmtAddress: '0x711Fd6ab6d65A98904522d4e3586F492B989c527',
-    stakingAddress: '0xdFbB79dC35a3A53741be54a2C9b587d6BafAbd1C',
-    rewardPoolAddress: '0xf376443BCc6d4d4D63eeC086bc4A9E4a83878e0e',
+    stakingAddress: '0xE24e5C08E28331D24758b69A5E9f383D2bDD1c98',
     kvstoreAddress: '0x21A0C4CED7aE447fCf87D9FE3A29FA9B3AB20Ff1',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/bsc/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmXZ4QJMi8kyfXDEJwtdizyKf5JdJui89iYCLCE79N8Xf5',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmPMS6G5evLm5ZpbnmpCfUy8bHJPwzPkZTv9DgfNdFfrCM',
     oldSubgraphUrl: 'https://api.thegraph.com/subgraphs/name/humanprotocol/bsc',
     oldFactoryAddress: '0xc88bC422cAAb2ac8812de03176402dbcA09533f4',
   },
@@ -135,13 +106,12 @@ export const NETWORKS: {
     scanUrl: 'https://testnet.bscscan.com',
     factoryAddress: '0x2bfA592DBDaF434DDcbb893B1916120d181DAD18',
     hmtAddress: '0xE3D74BBFa45B4bCa69FF28891fBE392f4B4d4e4d',
-    stakingAddress: '0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18',
-    rewardPoolAddress: '0xB0A0500103eCEc431b73F6BAd923F0a2774E6e29',
+    stakingAddress: '0xD6D347ba6987519B4e42EcED43dF98eFf5465a23',
     kvstoreAddress: '0x32e27177BA6Ea91cf28dfd91a0Da9822A4b74EcF',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/bsc-testnet/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmdq449rn4WKDf7NLvRZgt7CedZRrvpDzPqcvSmhvuu16D',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmW6JqXvhDnhRVHU6ixKVSD65U1GKWUf3xwJo8E6mTBsAu',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/bsctest',
     oldFactoryAddress: '0xaae6a2646c1f88763e62e0cd08ad050ea66ac46f',
@@ -152,13 +122,12 @@ export const NETWORKS: {
     scanUrl: 'https://polygonscan.com',
     factoryAddress: '0xBDBfD2cC708199C5640C6ECdf3B0F4A4C67AdfcB',
     hmtAddress: '0xc748B2A084F8eFc47E086ccdDD9b7e67aEb571BF',
-    stakingAddress: '0xcbAd56bE3f504E98bd70875823d3CC0242B7bB29',
-    rewardPoolAddress: '0xa8e32d777a3839440cc7c24D591A64B9481753B3',
+    stakingAddress: '0x01D115E9E8bF0C58318793624CC662a030D07F1D',
     kvstoreAddress: '0xbcB28672F826a50B03EE91B28145EAbddA73B2eD',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNdsofT4Cj2KRwr8vgyKgCWpZNmrMN41zUdygRz7eSGC9',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmTyCQMQd5QtogeTEuiqxnGQZa2PtgpUBsWLYwPCCFPbUe',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/polygon',
     oldFactoryAddress: '0x45eBc3eAE6DA485097054ae10BA1A0f8e8c7f794',
@@ -170,7 +139,6 @@ export const NETWORKS: {
     factoryAddress: '0xA8D927C4DA17A6b71675d2D49dFda4E9eBE58f2d',
     hmtAddress: '0x0376D26246Eb35FF4F9924cF13E6C05fd0bD7Fb4',
     stakingAddress: '0x7Fd3dF914E7b6Bd96B4c744Df32183b51368Bfac',
-    rewardPoolAddress: '0xf0145eD99AC3c4f877aDa7dA4D1E059ec9116BAE',
     kvstoreAddress: '0xD96158c7267Ea658a4688F4aEf1c85659851625d',
     subgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/mumbai-v2',
@@ -185,13 +153,12 @@ export const NETWORKS: {
     scanUrl: 'https://amoy.polygonscan.com/',
     factoryAddress: '0xAFf5a986A530ff839d49325A5dF69F96627E8D29',
     hmtAddress: '0x792abbcC99c01dbDec49c9fa9A828a186Da45C33',
-    stakingAddress: '0xCc0AF0635aa19fE799B6aFDBe28fcFAeA7f00a60',
-    rewardPoolAddress: '0xd866bCEFf6D0F77E1c3EAE28230AE6C79b03fDa7',
+    stakingAddress: '0xffE496683F842a923110415b7278ded3F265f2C5',
     kvstoreAddress: '0x724AeFC243EdacCA27EAB86D3ec5a76Af4436Fc7',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/amoy/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmbwio5UnvDn5GQRJ5kLJfK27fqHK9nkEh4YXXYKWCc9rH',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmawobiPUYsGNK9chtb5PvicUtaa8Jsjpwvv8dNyMVXQ9r',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -202,7 +169,6 @@ export const NETWORKS: {
     factoryAddress: '0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a',
     hmtAddress: '0x3b25BC1dC591D24d60560d0135D6750A561D4764',
     stakingAddress: '0x05398211bA2046E296fBc9a9D3EB49e3F15C3123',
-    rewardPoolAddress: '0x4A5963Dd6792692e9147EdC7659936b96251917a',
     kvstoreAddress: '0x2B95bEcb6EBC4589f64CB000dFCF716b4aeF8aA6',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/moonbeam/version/latest',
@@ -218,13 +184,12 @@ export const NETWORKS: {
     scanUrl: 'https://moonbase.moonscan.io/',
     factoryAddress: '0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed',
     hmtAddress: '0x2dd72db2bBA65cE663e476bA8b84A1aAF802A8e3',
-    stakingAddress: '0xBFC7009F3371F93F3B54DdC8caCd02914a37495c',
-    rewardPoolAddress: '0xf46B45Df3d956369726d8Bd93Ba33963Ab692920',
+    stakingAddress: '0xbA537fEF2442cD48f60686FE1Bbbe40F964a7940',
     kvstoreAddress: '0xcC561f4482f4Ff051D2Dcc65c2cE1A0f291bbA46',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/moonbase-alpha/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmeC4JrotcrXWJtJU519RX3KkxE5879wveRJJ58EheH3j1',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmSDPbm5xxMvYVSJzHFVsRiMekvJVYSJ7UfZw17DhPMdaH',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -234,13 +199,12 @@ export const NETWORKS: {
     scanUrl: 'https://testnet.snowtrace.io',
     factoryAddress: '0x56C2ba540726ED4f46E7a134b6b9Ee9C867FcF92',
     hmtAddress: '0x9406d5c635AD22b0d76c75E52De57A2177919ca3',
-    stakingAddress: '0x9890473B0b93E24d6D1a8Dfb739D577C6f25FFd3',
-    rewardPoolAddress: '0x5517fE916Fe9F8dB15B0DDc76ebDf0BdDCd4ed18',
+    stakingAddress: '0xbA537fEF2442cD48f60686FE1Bbbe40F964a7940',
     kvstoreAddress: '0x3aD4B091E054f192a822D1406f4535eAd38580e4',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/fuji/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmcFhecY6w3AhKGSg8XeidXwwuXCV9DAQ5SYGE1sTzydgR',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYXwNPwC5DcitK1SLVUR6gPANmEn3UsVvGeTbjCv1tTb2',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/fuji',
     oldFactoryAddress: '0xfb4469201951C3B9a7F1996c477cb7BDBEcE0A88',
@@ -252,7 +216,6 @@ export const NETWORKS: {
     factoryAddress: '0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a',
     hmtAddress: '0x12365293cb6477d4fc2686e46BB97E3Fb64f1550',
     stakingAddress: '0x05398211bA2046E296fBc9a9D3EB49e3F15C3123',
-    rewardPoolAddress: '0x4A5963Dd6792692e9147EdC7659936b96251917a',
     kvstoreAddress: '0x9Bc7bff35B2Be2413708d48c3B0aEF5c43646728',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/avalanche/version/latest',
@@ -269,7 +232,6 @@ export const NETWORKS: {
     factoryAddress: '0x86Af9f6Cd34B69Db1B202223C6d6D109f2491569',
     hmtAddress: '0x2736B33455A872dC478E1E004106D04c35472468',
     stakingAddress: '0x003548Df34be8836cF0F9673403a1E40ba449a0F',
-    rewardPoolAddress: '0xA9545C2530BD5bdb464d5E274F59ACceAa73eD86',
     kvstoreAddress: '0x938335006ea6F9Eb0e8020969cFF94404425e298',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/celo-alfajores/version/latest',
@@ -285,7 +247,6 @@ export const NETWORKS: {
     factoryAddress: '0xc90B43a5d576D9d8026c48904dfbaED50C15Fa08',
     hmtAddress: '0x19Ead835951493A763c96910255d5eeF147E914F',
     stakingAddress: '0x34cD3Bd6B16c559f321799b516dE61E12017fFd1',
-    rewardPoolAddress: '0xb9344bAD98E3d26a4d83900922baf395a2Ec154c',
     kvstoreAddress: '0x86Af9f6Cd34B69Db1B202223C6d6D109f2491569',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/celo/version/latest',
@@ -301,7 +262,6 @@ export const NETWORKS: {
     factoryAddress: '0x4949C9DFFD83F0D5Ab0AB24C57C4D403D5c20C15',
     hmtAddress: '0x10acbe3b9e6a2ff7f341e5cbf4b6617741ff44aa',
     stakingAddress: '0x01D115E9E8bF0C58318793624CC662a030D07F1D',
-    rewardPoolAddress: '0x7ABa5F75b2b530cB0c8927C86591c21dF44f06b6',
     kvstoreAddress: '0x6512d894cc3d3FE93Da9d0420430136fA889FaB9',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/xlayer/version/latest',
@@ -316,13 +276,12 @@ export const NETWORKS: {
     scanUrl: 'https://www.okx.com/explorer/xlayer-test',
     factoryAddress: '0x6Cd3ecAD36ee88E9ef3665CF381D9dAE0FE0a32e',
     hmtAddress: '0x792abbcC99c01dbDec49c9fa9A828a186Da45C33',
-    stakingAddress: '0x819069fEd50581587fAB9E583b5488fc2D33B7ea',
-    rewardPoolAddress: '0x6daccd1f3a68945f8a7ac6d20260953f7a97fae4',
+    stakingAddress: '0xeF9849a904dF0d494D69ac0B0a6860a3A7936114',
     kvstoreAddress: '0xdE8BE9E3C12E9F546309A429cd88d026a25EaF8C',
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/xlayer-testnet/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-testnet-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmQrTmq89ZCdVABsFpLHtQUWuyyVzbcARoan9eztHd21oP',
+      'https://gateway-testnet-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNoRyqZtJTRrkbKAmWMZQUHuah7YSs8U9R3nzPu8WEhtY',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -330,11 +289,10 @@ export const NETWORKS: {
     chainId: ChainId.LOCALHOST,
     title: 'Localhost',
     scanUrl: '',
-    factoryAddress: '0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9',
+    factoryAddress: '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9',
     hmtAddress: '0x5FbDB2315678afecb367f032d93F642f64180aa3',
-    stakingAddress: '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0',
-    rewardPoolAddress: '0xa513E6E4b8f2a923D98304ec87F64353C4D5C853',
-    kvstoreAddress: '0x5FC8d32690cc91D4c39d9d3abcBD16989F875707',
+    stakingAddress: '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+    kvstoreAddress: '0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9',
     subgraphUrl: 'http://localhost:8000/subgraphs/name/humanprotocol/localhost',
     subgraphUrlApiKey: '',
     oldSubgraphUrl: '',
@@ -347,6 +305,7 @@ export const KVStoreKeys = {
   fee: 'fee',
   publicKey: 'public_key',
   webhookUrl: 'webhook_url',
+  website: 'website',
   url: 'url',
   jobTypes: 'job_types',
   registrationNeeded: 'registration_needed',

package/src/encryption.ts

@@ -1,6 +1,16 @@
 import * as openpgp from 'openpgp';
 import { IKeyPair } from './interfaces';
 
+type MessageDataType = string | Uint8Array;
+
+function makeMessageDataBinary(message: MessageDataType): Uint8Array {
+  if (typeof message === 'string') {
+    return Buffer.from(message);
+  }
+
+  return message;
+}
+
 /**
  * ## Introduction
  *
@@ -126,20 +136,21 @@ export class Encryption {
    * ```
    */
   public async signAndEncrypt(
-    message: string,
+    message: MessageDataType,
     publicKeys: string[]
   ): Promise<string> {
-    const plaintext = message;
-
     const pgpPublicKeys = await Promise.all(
       publicKeys.map((armoredKey) => openpgp.readKey({ armoredKey }))
     );
 
-    const pgpMessage = await openpgp.createMessage({ text: plaintext });
+    const pgpMessage = await openpgp.createMessage({
+      binary: makeMessageDataBinary(message),
+    });
     const encrypted = await openpgp.encrypt({
       message: pgpMessage,
       encryptionKeys: pgpPublicKeys,
       signingKeys: this.privateKey,
+      format: 'armored',
     });
 
     return encrypted as string;
@@ -176,23 +187,43 @@ export class Encryption {
    * const resultMessage = await encription.decrypt('message');
    * ```
    */
-  public async decrypt(message: string, publicKey?: string): Promise<string> {
-    const pgpMessage = await openpgp.readMessage({ armoredMessage: message });
+  public async decrypt(
+    message: string,
+    publicKey?: string
+  ): Promise<Uint8Array> {
+    const pgpMessage = await openpgp.readMessage({
+      armoredMessage: message,
+    });
 
     const decryptionOptions: openpgp.DecryptOptions = {
       message: pgpMessage,
       decryptionKeys: this.privateKey,
-      expectSigned: !!publicKey,
+      format: 'binary',
     };
 
-    if (publicKey) {
+    const shouldVerifySignature = !!publicKey;
+    if (shouldVerifySignature) {
       const pgpPublicKey = await openpgp.readKey({ armoredKey: publicKey });
       decryptionOptions.verificationKeys = pgpPublicKey;
     }
 
-    const { data: decrypted } = await openpgp.decrypt(decryptionOptions);
+    const { data: decrypted, signatures } =
+      await openpgp.decrypt(decryptionOptions);
+
+    /**
+     * There is an option to automatically verify signatures - `expectSigned`,
+     * but atm it has a bug - https://github.com/openpgpjs/openpgpjs/issues/1803,
+     * so we have to verify it manually till it's fixed.
+     */
+    try {
+      if (shouldVerifySignature) {
+        await signatures[0].verified;
+      }
+    } catch {
+      throw new Error('Signature could not be verified');
+    }
 
-    return decrypted as string;
+    return decrypted as Uint8Array;
   }
 
   /**
@@ -382,7 +413,7 @@ export class EncryptionUtils {
    * This function encrypts a message using the specified public keys.
    *
    * @param {string} message Message to encrypt.
-   * @param {string} publicKey Array of public keys to use for encryption.
+   * @param {string} publicKeys Array of public keys to use for encryption.
    * @returns {Promise<string>} Message encrypted.
    *
    * **Code example**
@@ -419,19 +450,20 @@ export class EncryptionUtils {
    * ```
    */
   public static async encrypt(
-    message: string,
+    message: MessageDataType,
     publicKeys: string[]
   ): Promise<string> {
-    const plaintext = message;
-
     const pgpPublicKeys = await Promise.all(
       publicKeys.map((armoredKey) => openpgp.readKey({ armoredKey }))
     );
 
-    const pgpMessage = await openpgp.createMessage({ text: plaintext });
+    const pgpMessage = await openpgp.createMessage({
+      binary: makeMessageDataBinary(message),
+    });
     const encrypted = await openpgp.encrypt({
       message: pgpMessage,
       encryptionKeys: pgpPublicKeys,
+      format: 'armored',
     });
 
     return encrypted as string;