Update VersionedTransaction tests

solana-labs · Sep 20, 2022 · 7601207 · 7601207
1 parent c413b3b
commit 7601207
Showing 1 changed file with 67 additions and 37 deletions.
diff --git a/web3.js/test/transaction.test.ts b/web3.js/test/transaction.test.ts
@@ -861,26 +861,6 @@ describe('Transaction', () => {
     expect(tx.verifySignatures()).to.be.true;
   });
 
-  it('deserializes versioned transactions', () => {
-    const serializedVersionedTx = Buffer.from(
-      'AdTIDASR42TgVuXKkd7mJKk373J3LPVp85eyKMVcrboo9KTY8/vm6N/Cv0NiHqk2I8iYw6VX5ZaBKG8z' +
-        '9l1XjwiAAQACA+6qNbqfjaIENwt9GzEK/ENiB/ijGwluzBUmQ9xlTAMcCaS0ctnyxTcXXlJr7u2qtnaM' +
-        'gIAO2/c7RBD0ipHWUcEDBkZv5SEXMv/srbpyw5vnvIzlu8X3EmssQ5s6QAAAAJbI7VNs6MzREUlnzRaJ' +
-        'pBKP8QQoDn2dWQvD0KIgHFDiAwIACQAgoQcAAAAAAAIABQEAAAQAATYPBwAKBDIBAyQWIw0oCxIdCA4i' +
-        'JzQRKwUZHxceHCohMBUJJiwpMxAaGC0TLhQxGyAMBiU2NS8VDgAAAADuAgAAAAAAAAIAAAAAAAAAAdGCT' +
-        'Qiq5yw3+3m1sPoRNj0GtUNNs0FIMocxzt3zuoSZHQABAwQFBwgLDA8RFBcYGhwdHh8iIyUnKiwtLi8yF' +
-        'wIGCQoNDhASExUWGRsgISQmKCkrMDEz',
-      'base64',
-    );
-
-    expect(() => Transaction.from(serializedVersionedTx)).to.throw(
-      'Versioned messages must be deserialized with VersionedMessage.deserialize()',
-    );
-
-    const versionedTx = VersionedTransaction.deserialize(serializedVersionedTx);
-    expect(versionedTx.message.version).to.eq(0);
-  });
-
   it('can serialize, deserialize, and reserialize with a partial signer', () => {
     const signer = Keypair.generate();
     const acc0Writable = Keypair.generate();
@@ -963,24 +943,57 @@ describe('Transaction', () => {
     t1.partialSign(signer);
     t1.serialize();
   });
+});
 
-  it('externally signed versioned transaction', () => {
-    const signer = Keypair.generate();
-    const invalidSigner = Keypair.generate();
+describe('VersionedTransaction', () => {
+  it('deserializes versioned transactions', () => {
+    const serializedVersionedTx = Buffer.from(
+      'AdTIDASR42TgVuXKkd7mJKk373J3LPVp85eyKMVcrboo9KTY8/vm6N/Cv0NiHqk2I8iYw6VX5ZaBKG8z' +
+        '9l1XjwiAAQACA+6qNbqfjaIENwt9GzEK/ENiB/ijGwluzBUmQ9xlTAMcCaS0ctnyxTcXXlJr7u2qtnaM' +
+        'gIAO2/c7RBD0ipHWUcEDBkZv5SEXMv/srbpyw5vnvIzlu8X3EmssQ5s6QAAAAJbI7VNs6MzREUlnzRaJ' +
+        'pBKP8QQoDn2dWQvD0KIgHFDiAwIACQAgoQcAAAAAAAIABQEAAAQAATYPBwAKBDIBAyQWIw0oCxIdCA4i' +
+        'JzQRKwUZHxceHCohMBUJJiwpMxAaGC0TLhQxGyAMBiU2NS8VDgAAAADuAgAAAAAAAAIAAAAAAAAAAdGCT' +
+        'Qiq5yw3+3m1sPoRNj0GtUNNs0FIMocxzt3zuoSZHQABAwQFBwgLDA8RFBcYGhwdHh8iIyUnKiwtLi8yF' +
+        'wIGCQoNDhASExUWGRsgISQmKCkrMDEz',
+      'base64',
+    );
+
+    expect(() => Transaction.from(serializedVersionedTx)).to.throw(
+      'Versioned messages must be deserialized with VersionedMessage.deserialize()',
+    );
+
+    const versionedTx = VersionedTransaction.deserialize(serializedVersionedTx);
+    expect(versionedTx.message.version).to.eq(0);
+  });
+
+  describe('addSignature', () => {
+    const signer1 = Keypair.generate();
+    const signer2 = Keypair.generate();
+    const signer3 = Keypair.generate();
 
     const recentBlockhash = new PublicKey(3).toBuffer();
 
     const message = new TransactionMessage({
-      payerKey: signer.publicKey,
+      payerKey: signer1.publicKey,
       instructions: [
         new TransactionInstruction({
           data: Buffer.from('Hello!'),
           keys: [
             {
-              pubkey: signer.publicKey,
+              pubkey: signer1.publicKey,
+              isSigner: true,
+              isWritable: true,
+            },
+            {
+              pubkey: signer2.publicKey,
               isSigner: true,
               isWritable: true,
             },
+            {
+              pubkey: signer3.publicKey,
+              isSigner: false,
+              isWritable: false,
+            },
           ],
           programId: new PublicKey(
             'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr',
@@ -992,19 +1005,36 @@ describe('Transaction', () => {
 
     const transaction = new VersionedTransaction(message.compileToV0Message());
 
-    const signature = sign(transaction.message.serialize(), signer.secretKey);
+    it('appends externally generated signatures at correct indexes', () => {
+      const signature1 = sign(
+        transaction.message.serialize(),
+        signer1.secretKey,
+      );
+      const signature2 = sign(
+        transaction.message.serialize(),
+        signer2.secretKey,
+      );
 
-    transaction.addSignature(signer.publicKey, signature);
+      transaction.addSignature(signer2.publicKey, signature2);
+      transaction.addSignature(signer1.publicKey, signature1);
 
-    expect(transaction.signatures).to.have.length(1);
-    expect(transaction.signatures[0]).to.eq(signature);
-    expect(() => {
-      transaction.addSignature(signer.publicKey, new Uint8Array(32));
-    }).to.throw('Signature must be 64 bytes long');
-    expect(() => {
-      transaction.addSignature(invalidSigner.publicKey, new Uint8Array(64));
-    }).to.throw(
-      `Can not add signature; \`${invalidSigner.publicKey.toBase58()}\` is not required to sign this transaction`,
-    );
+      expect(transaction.signatures).to.have.length(2);
+      expect(transaction.signatures[0]).to.eq(signature1);
+      expect(transaction.signatures[1]).to.eq(signature2);
+    });
+
+    it('fatals when the signature is the wrong length', () => {
+      expect(() => {
+        transaction.addSignature(signer1.publicKey, new Uint8Array(32));
+      }).to.throw('Signature must be 64 bytes long');
+    });
+
+    it('fatals when adding a signature for a public key that has not been marked as a signer', () => {
+      expect(() => {
+        transaction.addSignature(signer3.publicKey, new Uint8Array(64));
+      }).to.throw(
+        `Can not add signature; \`${signer3.publicKey.toBase58()}\` is not required to sign this transaction`,
+      );
+    });
   });
 });