Fix bn254pairing budget number, update xdr version (#1613)

jayz22 · web-flow · commit 0a0c2df704ed · 2025-11-05T21:10:19.000Z
### What

Also fixed the bn/bls pairing calibration input floor (in the current
setup, passing inputs {1, 2} ends up running input=1 twice).

### Why

[TODO: Why this change is being made. Include any context required to
understand the why.]

### Known limitations

[TODO or N/A]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,9 +34,9 @@ wasmparser = "=0.116.1"
 
 # NB: When updating, also update the version in rs-soroban-env dev-dependencies
 [workspace.dependencies.stellar-xdr]
-version = "=23.0.0"
+version = "=24.0.1"
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "abcfb947e8c8551ae52604f6d57b43895e2bd76d"
+rev = "89cc1cbadf1b9a16843826954dede7fec514d8e7"
 default-features = false
 
 [workspace.dependencies.wasmi]
diff --git a/soroban-env-host/Cargo.toml b/soroban-env-host/Cargo.toml
@@ -85,9 +85,9 @@ p256 = {version = "0.13.2", default-features = false, features = ["alloc"]}
 lazy_static = "1.5.0"
 
 [dev-dependencies.stellar-xdr]
-version = "=23.0.0"
+version = "=24.0.1"
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "abcfb947e8c8551ae52604f6d57b43895e2bd76d"
+rev = "89cc1cbadf1b9a16843826954dede7fec514d8e7"
 default-features = false
 features = ["arbitrary"]
 
diff --git a/soroban-env-host/benches/common/cost_types/bls12_381.rs b/soroban-env-host/benches/common/cost_types/bls12_381.rs
@@ -339,15 +339,10 @@ impl HostCostMeasurement for Bls12381PairingMeasure {
     type Runner = Bls12381PairingRun;
 
     fn new_random_case(_host: &Host, rng: &mut StdRng, input: u64) -> Bls12381PairingSample {
+        let i = input.max(1);
         Bls12381PairingSample(
-            (0..input)
-                .into_iter()
-                .map(|_| G1Affine::rand(rng))
-                .collect(),
-            (0..input)
-                .into_iter()
-                .map(|_| G2Affine::rand(rng))
-                .collect(),
+            (0..i).into_iter().map(|_| G1Affine::rand(rng)).collect(),
+            (0..i).into_iter().map(|_| G2Affine::rand(rng)).collect(),
         )
     }
 }
diff --git a/soroban-env-host/benches/common/cost_types/bn254.rs b/soroban-env-host/benches/common/cost_types/bn254.rs
@@ -141,10 +141,10 @@ impl HostCostMeasurement for Bn254PairingMeasure {
     type Runner = Bn254PairingRun;
 
     fn new_random_case(_host: &Host, rng: &mut StdRng, input: u64) -> Bn254PairingSample {
-        let i = input.max(2);
+        let i = input.max(1);
         Bn254PairingSample(
-            (1..i).into_iter().map(|_| G1Affine::rand(rng)).collect(),
-            (1..i).into_iter().map(|_| G2Affine::rand(rng)).collect(),
+            (0..i).into_iter().map(|_| G1Affine::rand(rng)).collect(),
+            (0..i).into_iter().map(|_| G2Affine::rand(rng)).collect(),
         )
     }
 }
diff --git a/soroban-env-host/observations/25/test__bn254__test_bn254_multi_pairing_check.json b/soroban-env-host/observations/25/test__bn254__test_bn254_multi_pairing_check.json
@@ -39,7 +39,7 @@
   "  37 ret vec_len -> Ok(U32(3))": "cpu:10906",
   "  38 call vec_len(Vec(obj#67))": "cpu:17176, mem:1440",
   "  39 ret vec_len -> Ok(U32(3))": "cpu:17298",
-  "  40 ret bn254_multi_pairing_check -> Ok(True)": "cpu:33243006, mem:222961",
+  "  40 ret bn254_multi_pairing_check -> Ok(True)": "cpu:23308023, mem:149736",
   "  41 call bn254_g1_add(Bytes(obj#69), Bytes(obj#71))": "cpu:2947855, mem:768, objs:-/38@3d38193f",
   "  42 ret bn254_g1_add -> Ok(Bytes(obj#77))": "cpu:2957223, mem:928, objs:-/39@d695fd46",
   "  43 call vec_new_from_slice(3)": "",
@@ -51,7 +51,7 @@
   "  49 ret vec_len -> Ok(U32(3))": "cpu:2959893",
   "  50 call vec_len(Vec(obj#81))": "cpu:2966163, mem:1376",
   "  51 ret vec_len -> Ok(U32(3))": "cpu:2966285",
-  "  52 ret bn254_multi_pairing_check -> Ok(True)": "cpu:36191993, mem:222897",
+  "  52 ret bn254_multi_pairing_check -> Ok(True)": "cpu:26257010, mem:149672",
   "  53 call obj_from_u256_pieces(1010788071183958826, 11343673176685890334, 5321920092515675630, 13294342434574159125)": "cpu:0, mem:0",
   "  54 ret obj_from_u256_pieces -> Ok(U256(obj#83))": "cpu:503, mem:80, objs:-/42@1ef08dab",
   "  55 call obj_from_u256_pieces(2069246105850674101, 2198446477011941359, 661982898885800758, 4032643384944951997)": "",
@@ -73,7 +73,7 @@
   "  71 ret vec_len -> Ok(U32(4))": "cpu:3491116",
   "  72 call vec_len(Vec(obj#109))": "cpu:3499311, mem:2464",
   "  73 ret vec_len -> Ok(U32(4))": "cpu:3499433",
-  "  74 ret bn254_multi_pairing_check -> Ok(True)": "cpu:44427711, mem:297085",
+  "  74 ret bn254_multi_pairing_check -> Ok(True)": "cpu:32798899, mem:199580",
   "  75 call vec_new_from_slice(3)": "cpu:5001, mem:480, objs:-/58@13a45342",
   "  76 ret vec_new_from_slice -> Ok(Vec(obj#117))": "cpu:6153, mem:600, objs:-/59@e788809a",
   "  77 call vec_new_from_slice(3)": "cpu:9138, mem:1272, objs:-/62@c3c2a88",
@@ -83,7 +83,7 @@
   "  81 ret vec_len -> Ok(U32(3))": "cpu:10656",
   "  82 call vec_len(Vec(obj#125))": "cpu:16926, mem:1600",
   "  83 ret vec_len -> Ok(U32(3))": "cpu:17048",
-  "  84 ret bn254_multi_pairing_check -> Ok(False)": "cpu:33242756, mem:223121",
+  "  84 ret bn254_multi_pairing_check -> Ok(False)": "cpu:23307773, mem:149896",
   "  85 call vec_new_from_slice(3)": "cpu:5001, mem:480, objs:-/66@c109b6ce",
   "  86 ret vec_new_from_slice -> Ok(Vec(obj#133))": "cpu:6153, mem:600, objs:-/67@1722c54b",
   "  87 call vec_new_from_slice(3)": "cpu:9138, mem:1272, objs:-/70@bbdb09cd",
@@ -93,7 +93,7 @@
   "  91 ret vec_len -> Ok(U32(3))": "cpu:10656",
   "  92 call vec_len(Vec(obj#141))": "cpu:16926, mem:1600",
   "  93 ret vec_len -> Ok(U32(3))": "cpu:17048",
-  "  94 ret bn254_multi_pairing_check -> Ok(False)": "cpu:33242756, mem:223121",
+  "  94 ret bn254_multi_pairing_check -> Ok(False)": "cpu:23307773, mem:149896",
   "  95 call vec_new_from_slice(2)": "cpu:3334, mem:320, objs:-/73@d5c975db",
   "  96 ret vec_new_from_slice -> Ok(Vec(obj#147))": "cpu:4423, mem:432, objs:-/74@598dad8f",
   "  97 call vec_new_from_slice(2)": "cpu:6413, mem:880, objs:-/76@7c6b8e4a",
@@ -103,6 +103,6 @@
   " 101 ret vec_len -> Ok(U32(2))": "cpu:7868",
   " 102 call vec_len(Vec(obj#153))": "cpu:12213, mem:1136",
   " 103 ret vec_len -> Ok(U32(2))": "cpu:12335",
-  " 104 ret bn254_multi_pairing_check -> Ok(True)": "cpu:25535472, mem:149556",
-  " 105 end": "cpu:25535472, mem:149556, prngs:-/-, objs:-/77@7903cbb2, vm:-/-, evt:-, store:-/-, foot:-, stk:-, auth:-/-"
+  " 104 ret bn254_multi_pairing_check -> Ok(True)": "cpu:17294319, mem:100612",
+  " 105 end": "cpu:17294319, mem:100612, prngs:-/-, objs:-/77@7903cbb2, vm:-/-, evt:-, store:-/-, foot:-, stk:-, auth:-/-"
 }
diff --git a/soroban-env-host/src/budget.rs b/soroban-env-host/src/budget.rs
@@ -655,8 +655,8 @@ impl Default for BudgetImpl {
                     cpu.lin_term = ScaledU64(0);
                 }
                 ContractCostType::Bn254Pairing => {
-                    cpu.const_term = 10117409;
-                    cpu.lin_term = ScaledU64(609283036);
+                    cpu.const_term = 5263916;
+                    cpu.lin_term = ScaledU64(392472814);
                 }
                 ContractCostType::Bn254FrFromU256 => {
                     cpu.const_term = 2052;
@@ -1007,8 +1007,8 @@ impl Default for BudgetImpl {
                     mem.lin_term = ScaledU64(0);
                 }
                 ContractCostType::Bn254Pairing => {
-                    mem.const_term = 2204;
-                    mem.lin_term = ScaledU64(9340474);
+                    mem.const_term = 1821;
+                    mem.lin_term = ScaledU64(6232546);
                 }
                 ContractCostType::Bn254FrFromU256 => {
                     mem.const_term = 0;
diff --git a/soroban-env-host/src/test/budget_metering.rs b/soroban-env-host/src/test/budget_metering.rs
@@ -523,7 +523,7 @@ fn total_amount_charged_from_random_inputs() -> Result<(), HostError> {
         Bn254G1ProjectiveToAffine          0              None           0              0              61                  0                   0                   0                   
         Bn254G1Add                         0              None           0              0              3623                0                   0                   0                   
         Bn254G1Mul                         0              None           0              0              1150435             0                   0                   0                   
-        Bn254Pairing                       0              Some(0)        0              0              10117409            609283036           2204                9340474             
+        Bn254Pairing                       0              Some(0)        0              0              5263916             392472814           1821                6232546             
         Bn254FrFromU256                    0              None           0              0              2052                0                   0                   0                   
         Bn254FrToU256                      0              None           0              0              1133                0                   312                 0                   
         Bn254FrAddSub                      0              None           0              0              74                  0                   0                   0                   

Original file line number	Diff line number	Diff line change
`@@ -339,15 +339,10 @@ impl HostCostMeasurement for Bls12381PairingMeasure {`
`339`	`339`	`type Runner = Bls12381PairingRun;`
`340`	`340`
`341`	`341`	`fn new_random_case(_host: &Host, rng: &mut StdRng, input: u64) -> Bls12381PairingSample {`
	`342`	`+ let i = input.max(1);`
`342`	`343`	`Bls12381PairingSample(`
`343`		`- (0..input)`
`344`		`- .into_iter()`
`345`		`- .map(\|_\| G1Affine::rand(rng))`
`346`		`- .collect(),`
`347`		`- (0..input)`
`348`		`- .into_iter()`
`349`		`- .map(\|_\| G2Affine::rand(rng))`
`350`		`- .collect(),`
	`344`	`+ (0..i).into_iter().map(\|_\| G1Affine::rand(rng)).collect(),`
	`345`	`+ (0..i).into_iter().map(\|_\| G2Affine::rand(rng)).collect(),`
`351`	`346`	`)`
`352`	`347`	`}`
`353`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,10 @@ impl HostCostMeasurement for Bn254PairingMeasure {`
`141`	`141`	`type Runner = Bn254PairingRun;`
`142`	`142`
`143`	`143`	`fn new_random_case(_host: &Host, rng: &mut StdRng, input: u64) -> Bn254PairingSample {`
`144`		`- let i = input.max(2);`
	`144`	`+ let i = input.max(1);`
`145`	`145`	`Bn254PairingSample(`
`146`		`- (1..i).into_iter().map(\|_\| G1Affine::rand(rng)).collect(),`
`147`		`- (1..i).into_iter().map(\|_\| G2Affine::rand(rng)).collect(),`
	`146`	`+ (0..i).into_iter().map(\|_\| G1Affine::rand(rng)).collect(),`
	`147`	`+ (0..i).into_iter().map(\|_\| G2Affine::rand(rng)).collect(),`
`148`	`148`	`)`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -655,8 +655,8 @@ impl Default for BudgetImpl {`
`655`	`655`	`cpu.lin_term = ScaledU64(0);`
`656`	`656`	`}`
`657`	`657`	`ContractCostType::Bn254Pairing => {`
`658`		`- cpu.const_term = 10117409;`
`659`		`- cpu.lin_term = ScaledU64(609283036);`
	`658`	`+ cpu.const_term = 5263916;`
	`659`	`+ cpu.lin_term = ScaledU64(392472814);`
`660`	`660`	`}`
`661`	`661`	`ContractCostType::Bn254FrFromU256 => {`
`662`	`662`	`cpu.const_term = 2052;`
`@@ -1007,8 +1007,8 @@ impl Default for BudgetImpl {`
`1007`	`1007`	`mem.lin_term = ScaledU64(0);`
`1008`	`1008`	`}`
`1009`	`1009`	`ContractCostType::Bn254Pairing => {`
`1010`		`- mem.const_term = 2204;`
`1011`		`- mem.lin_term = ScaledU64(9340474);`
	`1010`	`+ mem.const_term = 1821;`
	`1011`	`+ mem.lin_term = ScaledU64(6232546);`
`1012`	`1012`	`}`
`1013`	`1013`	`ContractCostType::Bn254FrFromU256 => {`
`1014`	`1014`	`mem.const_term = 0;`