blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: Re-enable twotx job (#3553) 

* ci: Re-enable twotx job

* Remake patch file
This commit is contained in:
Jon Cinque 2022-08-31 01:41:05 +02:00 committed by GitHub
parent f0dd422f2a
commit 422544b906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/pull-request-token.yml vendored
View File

@ -80,14 +80,13 @@ jobs:
if-no-files-found: error if-no-files-found: error
cargo-test-sbf-twoxtx: cargo-test-sbf-twoxtx:
if: ${{ false }} # disable for now
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set env vars - name: Set env vars
run: | run: |
echo "RUST_STABLE_VERSION=1.60.0" >> $GITHUB_ENV echo "RUST_STABLE_VERSION=1.63.0" >> $GITHUB_ENV
source ci/rust-version.sh source ci/rust-version.sh
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
source ci/solana-version.sh source ci/solana-version.sh
@ -104,7 +103,7 @@ jobs:
path: | path: |
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }}
- name: Install dependencies - name: Install dependencies
run: | run: |

2
token/twoxtx-setup.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Patch in a Solana v1.11 monorepo that supports 2x transactions for testing the # Patch in a Solana v1.12 monorepo that supports 2x transactions for testing the
# SPL Token 2022 Confidential Transfer extension # SPL Token 2022 Confidential Transfer extension
# #

39
token/twoxtx.patch
View File

@ -1,21 +1,21 @@
From 935ad2c371da8405bb85922b9941d35b3dc68ceb Mon Sep 17 00:00:00 2001 From aa223c645791be158a597efb8579270dbe5bdd82 Mon Sep 17 00:00:00 2001
From: Steven Czabaniuk <steven@solana.com> From: Jon Cinque <jon.cinque@gmail.com>
Date: Wed, 29 Sep 2021 15:43:36 -0500 Date: Wed, 31 Aug 2022 01:02:34 +0200
Subject: [PATCH] feat: double PACKET_DATA_SIZE Subject: [PATCH] [PATCH] feat: double PACKET_DATA_SIZE
Try blind double of PACKET_DATA_SIZE; this double things across the Try blind double of PACKET_DATA_SIZE; this double things across the
board and is not a permanent solution. board and is not a permanent solution.
--- ---
rpc/src/rpc.rs | 16 +++++++++++----- rpc/src/rpc.rs | 16 +++++++++++-----
sdk/src/packet.rs | 3 ++- sdk/src/packet.rs | 3 ++-
web3.js/src/transaction.ts | 4 +++- web3.js/src/transaction/constants.ts | 2 +-
3 files changed, 16 insertions(+), 7 deletions(-) 3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
index 1a0dcdeb6c..e33492fa84 100644 index 8d5d12f033..9d46a315ce 100644
--- a/rpc/src/rpc.rs --- a/rpc/src/rpc.rs
+++ b/rpc/src/rpc.rs +++ b/rpc/src/rpc.rs
@@ -4214,8 +4214,11 @@ pub mod rpc_obsolete_v1_7 { @@ -4393,8 +4393,11 @@ pub mod rpc_obsolete_v1_7 {
} }
} }
@ -29,7 +29,7 @@ index 1a0dcdeb6c..e33492fa84 100644
fn decode_and_deserialize<T>( fn decode_and_deserialize<T>(
encoded: String, encoded: String,
encoding: TransactionBinaryEncoding, encoding: TransactionBinaryEncoding,
@@ -7749,7 +7752,7 @@ pub mod tests { @@ -8285,7 +8288,7 @@ pub mod tests {
} }
#[test] #[test]
@ -38,7 +38,7 @@ index 1a0dcdeb6c..e33492fa84 100644
let ff_tx = vec![0xffu8; PACKET_DATA_SIZE]; let ff_tx = vec![0xffu8; PACKET_DATA_SIZE];
let tx58 = bs58::encode(&ff_tx).into_string(); let tx58 = bs58::encode(&ff_tx).into_string();
assert_eq!(tx58.len(), MAX_BASE58_SIZE); assert_eq!(tx58.len(), MAX_BASE58_SIZE);
@@ -7759,8 +7762,11 @@ pub mod tests { @@ -8295,8 +8298,11 @@ pub mod tests {
#[test] #[test]
fn test_decode_and_deserialize_too_large_payloads_fail() { fn test_decode_and_deserialize_too_large_payloads_fail() {
@ -53,10 +53,10 @@ index 1a0dcdeb6c..e33492fa84 100644
let tx58 = bs58::encode(&tx_ser).into_string(); let tx58 = bs58::encode(&tx_ser).into_string();
let tx58_len = tx58.len(); let tx58_len = tx58.len();
diff --git a/sdk/src/packet.rs b/sdk/src/packet.rs diff --git a/sdk/src/packet.rs b/sdk/src/packet.rs
index efea219043..473a92ecfe 100644 index 412375e35f..112d962fe8 100644
--- a/sdk/src/packet.rs --- a/sdk/src/packet.rs
+++ b/sdk/src/packet.rs +++ b/sdk/src/packet.rs
@@ -12,7 +12,8 @@ use { @@ -15,7 +15,8 @@ static_assertions::const_assert_eq!(PACKET_DATA_SIZE, 1232);
/// 1280 is IPv6 minimum MTU /// 1280 is IPv6 minimum MTU
/// 40 bytes is the size of the IPv6 header /// 40 bytes is the size of the IPv6 header
/// 8 bytes is the size of the fragment header /// 8 bytes is the size of the fragment header
@ -66,18 +66,19 @@ index efea219043..473a92ecfe 100644
bitflags! { bitflags! {
#[repr(C)] #[repr(C)]
diff --git a/web3.js/src/transaction-constants.ts b/web3.js/src/transaction-constants.ts diff --git a/web3.js/src/transaction/constants.ts b/web3.js/src/transaction/constants.ts
index 591873f8b6..f94d5778ba 100644 index 075337e8dc..618d48cdfd 100644
--- a/web3.js/src/transaction-constants.ts --- a/web3.js/src/transaction/constants.ts
+++ b/web3.js/src/transaction-constants.ts +++ b/web3.js/src/transaction/constants.ts
@@ -5,6 +5,6 @@ @@ -5,7 +5,7 @@
* 40 bytes is the size of the IPv6 header * 40 bytes is the size of the IPv6 header
* 8 bytes is the size of the fragment header * 8 bytes is the size of the fragment header
*/ */
-export const PACKET_DATA_SIZE = 1280 - 40 - 8; -export const PACKET_DATA_SIZE = 1280 - 40 - 8;
+export const PACKET_DATA_SIZE = 2464; +export const PACKET_DATA_SIZE = 2464;
export const SIGNATURE_LENGTH_IN_BYTES = 64; export const VERSION_PREFIX_MASK = 0x7f;
-- --
2.32.0 (Apple Git-132) 2.37.2