Add temporary twoxtx feature for ConfidentialTransfer extension unit testing

Author: mvines

.github/workflows/pull-request-token.yml

@@ -54,12 +54,17 @@ jobs:
           ./ci/install-program-deps.sh
           echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
 
-      - name: Build and test
+      - name: Build and test token
         run: ./ci/cargo-test-bpf.sh token
 
-      - name: Build and test
+      - name: Build and test ATA
         run: ./ci/cargo-test-bpf.sh associated-token-account
 
+      - name: Build and test token-2022 twoxtx (TEMPORARY)
+        run: |
+          ./token/twoxtx-setup.sh
+          ./ci/cargo-test-bpf.sh token/program-2022-test
+
       - name: Upload programs
         uses: actions/upload-artifact@v2
         with:

token/.gitignore

@@ -0,0 +1 @@
+/twoxtx-solana/

token/program-2022-test/build.rs

@@ -51,4 +51,13 @@ fn main() {
             println!("cargo:warning=(not a warning) {}", sub);
         }
     }
+
+    // Set the temporary `twoxtx` cfg if `../twoxtx-setup.sh` was run
+    let twoxtx_solana_dir = cwd
+        .parent()
+        .expect("Unable to get parent directory of current working dir")
+        .join("twoxtx-solana");
+    if twoxtx_solana_dir.exists() {
+        println!("cargo:rustc-cfg=twoxtx");
+    }
 }

token/program-2022-test/tests/confidential_transfer.rs

@@ -1,4 +1,5 @@
 #![cfg(feature = "test-bpf")]
+#![cfg(twoxtx)]
 
 mod program_test;
 use {

token/twoxtx-setup.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Patch in a Solana v1.10 monorepo that supports 2x transactions for testing the
+# SPL Token 2022 Confidential Transfer extension
+#
+
+set -e
+
+here="$(dirname "$0")"
+cd "$here"
+
+if [[ ! -d twoxtx-solana ]]; then
+  if [[ -n $CI ]]; then
+    git config --global user.email "you@example.com"
+    git config --global user.name "Your Name"
+    git clone https://github.com/solana-labs/solana.git twoxtx-solana
+  else
+    git clone git@github.com:solana-labs/solana.git twoxtx-solana
+  fi
+fi
+
+if [[ ! -f twoxtx-solana/.twoxtx-patched ]]; then
+  git -C twoxtx-solana am "$PWD"/twoxtx.patch
+  touch twoxtx-solana/.twoxtx-patched
+fi
+
+../patch.crates-io.sh twoxtx-solana
+exit 0

token/twoxtx.patch

@@ -0,0 +1,87 @@
+From 935ad2c371da8405bb85922b9941d35b3dc68ceb Mon Sep 17 00:00:00 2001
+From: Steven Czabaniuk <steven@solana.com>
+Date: Wed, 29 Sep 2021 15:43:36 -0500
+Subject: [PATCH] feat: double PACKET_DATA_SIZE
+
+Try blind double of PACKET_DATA_SIZE; this double things across the
+board and is not a permanent solution.
+---
+ rpc/src/rpc.rs             | 16 +++++++++++-----
+ sdk/src/packet.rs          |  3 ++-
+ web3.js/src/transaction.ts |  4 +++-
+ 3 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
+index 987980cb53..607681728c 100644
+--- a/rpc/src/rpc.rs
++++ b/rpc/src/rpc.rs
+@@ -4177,8 +4177,11 @@ pub mod rpc_obsolete_v1_7 {
+     }
+ }
+ 
+-const MAX_BASE58_SIZE: usize = 1683; // Golden, bump if PACKET_DATA_SIZE changes
+-const MAX_BASE64_SIZE: usize = 1644; // Golden, bump if PACKET_DATA_SIZE changes
++// These values need to be updated if PACKET_DATA_SIZE changes. The correct values can
++// be found by hand or by simply encoding `PACKET_DATA_SIZE` bytes and checking length.
++// `test_max_encoded_tx_goldens` ensures these values are correct.
++const MAX_BASE58_SIZE: usize = 3365;
++const MAX_BASE64_SIZE: usize = 3288;
+ fn decode_and_deserialize<T>(
+     encoded: String,
+     encoding: UiTransactionEncoding,
+@@ -7961,7 +7964,7 @@ pub mod tests {
+     }
+ 
+     #[test]
+-    fn test_worst_case_encoded_tx_goldens() {
++    fn test_max_encoded_tx_goldens() {
+         let ff_tx = vec![0xffu8; PACKET_DATA_SIZE];
+         let tx58 = bs58::encode(&ff_tx).into_string();
+         assert_eq!(tx58.len(), MAX_BASE58_SIZE);
+@@ -7971,8 +7974,11 @@ pub mod tests {
+ 
+     #[test]
+     fn test_decode_and_deserialize_too_large_payloads_fail() {
+-        // +2 because +1 still fits in base64 encoded worst-case
+-        let too_big = PACKET_DATA_SIZE + 2;
++        // 4 base64 digits are generated from groups of 3 bytes; however, those 4 digits
++        // are generated even if the group only has 1 or 2 bytes.
++        // So, we need 4 - (PACKET_DATA_SIZE % 3) extra bytes to ensure we'll spill over
++        let extra_bytes = 4 - (PACKET_DATA_SIZE % 3);
++        let too_big = PACKET_DATA_SIZE + extra_bytes;
+         let tx_ser = vec![0xffu8; too_big];
+         let tx58 = bs58::encode(&tx_ser).into_string();
+         let tx58_len = tx58.len();
+diff --git a/sdk/src/packet.rs b/sdk/src/packet.rs
+index efea219043..473a92ecfe 100644
+--- a/sdk/src/packet.rs
++++ b/sdk/src/packet.rs
+@@ -12,7 +12,8 @@ use {
+ ///   1280 is IPv6 minimum MTU
+ ///   40 bytes is the size of the IPv6 header
+ ///   8 bytes is the size of the fragment header
+-pub const PACKET_DATA_SIZE: usize = 1280 - 40 - 8;
++/// Double the minimum to support larger than MTU transactions
++pub const PACKET_DATA_SIZE: usize = 2 * (1280 - 40 - 8);
+ 
+ bitflags! {
+     #[repr(C)]
+diff --git a/web3.js/src/transaction.ts b/web3.js/src/transaction.ts
+index 5466464f5a..5b71b9dc39 100644
+--- a/web3.js/src/transaction.ts
++++ b/web3.js/src/transaction.ts
+@@ -29,8 +29,10 @@ const DEFAULT_SIGNATURE = Buffer.alloc(64).fill(0);
+  * 1280 is IPv6 minimum MTU
+  * 40 bytes is the size of the IPv6 header
+  * 8 bytes is the size of the fragment header
++ *
++ * Double the minimum to support larger than MTU transactions
+  */
+-export const PACKET_DATA_SIZE = 1280 - 40 - 8;
++export const PACKET_DATA_SIZE = 2464;
+ 
+ const SIGNATURE_LENGTH = 64;
+ 
+-- 
+2.32.0 (Apple Git-132)
+