fix testnet gas limit according to new gateway

Analog-Labs · Oct 14, 2024 · 758e7f1 · 758e7f1
1 parent 9010639
commit 758e7f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/analog-gmp b/analog-gmp
diff --git a/prices.csv b/prices.csv
@@ -0,0 +1,3 @@
+network_id,symbol,usd_price
+0,ARB,0.5318413166906073
+1,ASTR,0.05837589379134875
diff --git a/primitives/src/gmp.rs b/primitives/src/gmp.rs
@@ -166,8 +166,16 @@ impl Message {
 			e: U256::from_be_slice(&signature[0..32]),
 			s: U256::from_be_slice(&signature[32..64]),
 		};
-		let gas_limit = if let Self::Gmp(GmpMessage { gasLimit, .. }) = &self {
-			let gas_limit = u64::try_from(*gasLimit).unwrap_or(u64::MAX).saturating_add(100_000);
+		let gas_limit = if let Self::Gmp(GmpMessage { gasLimit, data, .. }) = &self {
+			// 50 gas per payload bytes
+			let data_gas: u64 = (data.len() as u64).saturating_mul(50);
+			// Base Cost for executing a gateway message
+			let gateway_execute_cost = 100_000;
+			let gas_limit = u64::try_from(*gasLimit)
+				.unwrap_or(u64::MAX)
+				.saturating_add(100_000)
+				.saturating_add(gateway_execute_cost)
+				.saturating_add(data_gas);
 			Some(gas_limit.min(29_900_000))
 		} else {
 			None
+273 −94		src/Gateway.sol
+43 −0		src/Primitives.sol
+22 −1		src/interfaces/IExecutor.sol
+8 −12		src/interfaces/IGateway.sol
+75 −5		src/utils/BranchlessMath.sol
+117 −0		src/utils/Float9x56.sol
+317 −155		src/utils/GasUtils.sol
+17 −8		test/Example.t.sol
+282 −0		test/GasUtils.t.sol
+220 −269		test/Gateway.t.sol
+3 −3		test/GmpTestTools.sol
+10 −5		test/GmpTestTools.t.sol
+32 −3		test/MockERC20.sol
+37 −32		test/TestUtils.sol