Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 26d3a33

Browse files
author
Tyera Eulberg
authored
Update twoxtx patch (#2997)
1 parent b7b7690 commit 26d3a33

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

token/twoxtx.patch

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ board and is not a permanent solution.
1212
3 files changed, 16 insertions(+), 7 deletions(-)
1313

1414
diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
15-
index 987980cb53..607681728c 100644
15+
index 1a0dcdeb6c..e33492fa84 100644
1616
--- a/rpc/src/rpc.rs
1717
+++ b/rpc/src/rpc.rs
18-
@@ -4177,8 +4177,11 @@ pub mod rpc_obsolete_v1_7 {
18+
@@ -4214,8 +4214,11 @@ pub mod rpc_obsolete_v1_7 {
1919
}
2020
}
21-
21+
2222
-const MAX_BASE58_SIZE: usize = 1683; // Golden, bump if PACKET_DATA_SIZE changes
2323
-const MAX_BASE64_SIZE: usize = 1644; // Golden, bump if PACKET_DATA_SIZE changes
2424
+// These values need to be updated if PACKET_DATA_SIZE changes. The correct values can
@@ -28,18 +28,18 @@ index 987980cb53..607681728c 100644
2828
+const MAX_BASE64_SIZE: usize = 3288;
2929
fn decode_and_deserialize<T>(
3030
encoded: String,
31-
encoding: UiTransactionEncoding,
32-
@@ -7961,7 +7964,7 @@ pub mod tests {
31+
encoding: TransactionBinaryEncoding,
32+
@@ -7749,7 +7752,7 @@ pub mod tests {
3333
}
34-
34+
3535
#[test]
3636
- fn test_worst_case_encoded_tx_goldens() {
3737
+ fn test_max_encoded_tx_goldens() {
3838
let ff_tx = vec![0xffu8; PACKET_DATA_SIZE];
3939
let tx58 = bs58::encode(&ff_tx).into_string();
4040
assert_eq!(tx58.len(), MAX_BASE58_SIZE);
41-
@@ -7971,8 +7974,11 @@ pub mod tests {
42-
41+
@@ -7759,8 +7762,11 @@ pub mod tests {
42+
4343
#[test]
4444
fn test_decode_and_deserialize_too_large_payloads_fail() {
4545
- // +2 because +1 still fits in base64 encoded worst-case
@@ -63,7 +63,7 @@ index efea219043..473a92ecfe 100644
6363
-pub const PACKET_DATA_SIZE: usize = 1280 - 40 - 8;
6464
+/// Double the minimum to support larger than MTU transactions
6565
+pub const PACKET_DATA_SIZE: usize = 2 * (1280 - 40 - 8);
66-
66+
6767
bitflags! {
6868
#[repr(C)]
6969
diff --git a/web3.js/src/transaction.ts b/web3.js/src/transaction.ts
@@ -79,9 +79,8 @@ index 5466464f5a..5b71b9dc39 100644
7979
*/
8080
-export const PACKET_DATA_SIZE = 1280 - 40 - 8;
8181
+export const PACKET_DATA_SIZE = 2464;
82-
82+
8383
const SIGNATURE_LENGTH = 64;
84-
85-
--
86-
2.32.0 (Apple Git-132)
8784

85+
--
86+
2.32.0 (Apple Git-132)

0 commit comments

Comments
 (0)