change to trigger ci

yarn-project/circuit-types/src/logs/l1_payload/encrypted_log_payload.ts

@@ -9,10 +9,10 @@ import {
   computeOvskApp,
   derivePublicKeyFromSecretKey,
 } from '@aztec/circuits.js';
-import { Aes128 } from '@aztec/circuits.js/barretenberg';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { deriveDiffieHellmanAESSecret, derivePoseidonAESSecret } from './shared_secret_derivation.js';
+import { decrypt, encrypt } from './encryption_util.js';
+import { derivePoseidonAESSecret } from './shared_secret_derivation.js';
 
 // Both the incoming and the outgoing header are 48 bytes../shared_secret_derivation.js
 // 32 bytes for the address, and 16 bytes padding to follow PKCS#7
@@ -208,48 +208,3 @@ export class EncryptedLogPayload {
     );
   }
 }
-
-/**
- * Encrypts the plaintext using the secret key and public key
- *
- * @param plaintext - The plaintext buffer
- * @param secret - The secret key used to derive the AES secret
- * @param publicKey - Public key used to derived the AES secret
- * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
- * @returns The ciphertext
- */
-function encrypt(
-  plaintext: Buffer,
-  secret: GrumpkinScalar,
-  publicKey: PublicKey,
-  deriveSecret: (secret: GrumpkinScalar, publicKey: PublicKey) => Buffer = deriveDiffieHellmanAESSecret,
-): Buffer {
-  const aesSecret = deriveSecret(secret, publicKey);
-  const key = aesSecret.subarray(0, 16);
-  const iv = aesSecret.subarray(16, 32);
-
-  const aes128 = new Aes128();
-  return aes128.encryptBufferCBC(plaintext, iv, key);
-}
-
-/**
- * Decrypts the ciphertext using the secret key and public key
- * @param ciphertext - The ciphertext buffer
- * @param secret - The secret key used to derive the AES secret
- * @param publicKey - The public key used to derive the AES secret
- * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
- * @returns
- */
-function decrypt(
-  ciphertext: Buffer,
-  secret: GrumpkinScalar,
-  publicKey: PublicKey,
-  deriveSecret: (secret: GrumpkinScalar, publicKey: PublicKey) => Buffer = deriveDiffieHellmanAESSecret,
-): Buffer {
-  const aesSecret = deriveSecret(secret, publicKey);
-  const key = aesSecret.subarray(0, 16);
-  const iv = aesSecret.subarray(16, 32);
-
-  const aes128 = new Aes128();
-  return aes128.decryptBufferCBC(ciphertext, iv, key);
-}

yarn-project/circuit-types/src/logs/l1_payload/encryption_util.ts

@@ -0,0 +1,49 @@
+import { type GrumpkinScalar, type PublicKey } from '@aztec/circuits.js';
+import { Aes128 } from '@aztec/circuits.js/barretenberg';
+
+import { deriveDiffieHellmanAESSecret } from './shared_secret_derivation.js';
+
+/**
+ * Encrypts the plaintext using the secret key and public key
+ *
+ * @param plaintext - The plaintext buffer
+ * @param secret - The secret key used to derive the AES secret
+ * @param publicKey - Public key used to derived the AES secret
+ * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
+ * @returns The ciphertext
+ */
+export function encrypt(
+  plaintext: Buffer,
+  secret: GrumpkinScalar,
+  publicKey: PublicKey,
+  deriveSecret: (secret: GrumpkinScalar, publicKey: PublicKey) => Buffer = deriveDiffieHellmanAESSecret,
+): Buffer {
+  const aesSecret = deriveSecret(secret, publicKey);
+  const key = aesSecret.subarray(0, 16);
+  const iv = aesSecret.subarray(16, 32);
+
+  const aes128 = new Aes128();
+  return aes128.encryptBufferCBC(plaintext, iv, key);
+}
+
+/**
+ * Decrypts the ciphertext using the secret key and public key
+ * @param ciphertext - The ciphertext buffer
+ * @param secret - The secret key used to derive the AES secret
+ * @param publicKey - The public key used to derive the AES secret
+ * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
+ * @returns
+ */
+export function decrypt(
+  ciphertext: Buffer,
+  secret: GrumpkinScalar,
+  publicKey: PublicKey,
+  deriveSecret: (secret: GrumpkinScalar, publicKey: PublicKey) => Buffer = deriveDiffieHellmanAESSecret,
+): Buffer {
+  const aesSecret = deriveSecret(secret, publicKey);
+  const key = aesSecret.subarray(0, 16);
+  const iv = aesSecret.subarray(16, 32);
+
+  const aes128 = new Aes128();
+  return aes128.decryptBufferCBC(ciphertext, iv, key);
+}