feat: add chain id to quote fields

Luisfc68 · Luisfc68 · commit f11a0f296171 · 2026-02-12T17:01:30.000+01:00
diff --git a/src/PegInContract.sol b/src/PegInContract.sol
@@ -516,6 +516,9 @@ contract PegInContract is
     }
 
     function _validatePegInQuote(Quotes.PegInQuote calldata quote) private view {
+        if (quote.chainId != block.chainid) {
+            revert Flyover.InvalidChainId(block.chainid, quote.chainId);
+        }
         if (address(this) != quote.lbcAddress) {
             revert Flyover.IncorrectContract(address(this), quote.lbcAddress);
         }
diff --git a/src/PegOutContract.sol b/src/PegOutContract.sol
@@ -274,6 +274,9 @@ contract PegOutContract is
     /// @notice This function is used to validate a peg out quote before hashing it
     /// @param quote The peg out quote to validate
     function _validatePegOutQuote(Quotes.PegOutQuote calldata quote) private view {
+        if (quote.chainId != block.chainid) {
+            revert Flyover.InvalidChainId(block.chainid, quote.chainId);
+        }
         if (address(this) != quote.lbcAddress) {
             revert Flyover.IncorrectContract(address(this), quote.lbcAddress);
         }
diff --git a/src/libraries/Flyover.sol b/src/libraries/Flyover.sol
@@ -31,4 +31,8 @@ library Flyover {
     error InsufficientAmount(uint256 amount, uint256 target);
     error Overflow(uint256 passedAmount);
     error InvalidAddress(address addr);
+    /// @notice Quote was created for a different chain
+    /// @param expected The current chain id (block.chainid)
+    /// @param actual The chain id in the quote
+    error InvalidChainId(uint256 expected, uint256 actual);
 }
diff --git a/src/libraries/Quotes.sol b/src/libraries/Quotes.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.25;
 
 library Quotes {
     struct PegInQuote {
+        uint256 chainId;
         uint256 callFee;
         uint256 penaltyFee;
         uint256 value;
@@ -25,6 +26,7 @@ library Quotes {
     }
 
     struct PegOutQuote {
+        uint256 chainId;
         uint256 callFee;
         uint256 penaltyFee;
         uint256 value;
@@ -130,6 +132,7 @@ library Quotes {
     ) private pure returns (bytes memory) {
         return
             abi.encode(
+                quote.chainId,
                 quote.fedBtcAddress,
                 quote.lbcAddress,
                 quote.liquidityProviderRskAddress,
@@ -165,6 +168,7 @@ library Quotes {
     ) private pure returns (bytes memory) {
         return
             abi.encode(
+                quote.chainId,
                 quote.lbcAddress,
                 quote.lpRskAddress,
                 quote.btcRefundAddress,
diff --git a/test/collateral/CollateralTestBase.sol b/test/collateral/CollateralTestBase.sol
@@ -119,14 +119,15 @@ abstract contract CollateralTestBase is Test {
     /// @notice Helper to create an empty PegIn quote
     function getEmptyPegInQuote()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         bytes memory emptyBytes = new bytes(0);
         bytes memory testAddress = new bytes(20);
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 0,
                 penaltyFee: 0,
                 value: 0,
@@ -152,13 +153,14 @@ abstract contract CollateralTestBase is Test {
     /// @notice Helper to create an empty PegOut quote
     function getEmptyPegOutQuote()
         internal
-        pure
+        view
         returns (Quotes.PegOutQuote memory)
     {
         bytes memory testAddress = new bytes(20);
 
         return
             Quotes.PegOutQuote({
+                chainId: block.chainid,
                 callFee: 0,
                 penaltyFee: 0,
                 value: 0,
diff --git a/test/deployment/DeployFlyoverDiscovery.t.sol b/test/deployment/DeployFlyoverDiscovery.t.sol
@@ -147,7 +147,6 @@ contract DeployFlyoverDiscoveryTest is Test {
             )
         );
 
-        FlyoverDiscovery fd = FlyoverDiscovery(fdProxy);
         CollateralManagementContract cm = CollateralManagementContract(
             payable(collateralManagementProxy)
         );
diff --git a/test/fuzz/pegin/PegInFuzzTestBase.sol b/test/fuzz/pegin/PegInFuzzTestBase.sol
@@ -101,6 +101,7 @@ abstract contract PegInFuzzTestBase is PegInTestBase {
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: DEFAULT_CALL_FEE,
                 penaltyFee: DEFAULT_PENALTY_FEE,
                 value: value,
diff --git a/test/fuzz/pegout/PegOutFuzzTestBase.sol b/test/fuzz/pegout/PegOutFuzzTestBase.sol
@@ -68,6 +68,7 @@ abstract contract PegOutFuzzTestBase is PegOutTestBase {
 
         return
             Quotes.PegOutQuote({
+                chainId: block.chainid,
                 callFee: DEFAULT_CALL_FEE,
                 penaltyFee: DEFAULT_PENALTY_FEE,
                 value: value,
@@ -129,6 +130,7 @@ abstract contract PegOutFuzzTestBase is PegOutTestBase {
 
         return
             Quotes.PegOutQuote({
+                chainId: block.chainid,
                 callFee: DEFAULT_CALL_FEE,
                 penaltyFee: DEFAULT_PENALTY_FEE,
                 value: value,
diff --git a/test/helpers/FlyoverTestBase.sol b/test/helpers/FlyoverTestBase.sol
@@ -475,14 +475,15 @@ abstract contract FlyoverTestBase is Test {
     /// @notice Create an empty PegIn quote for testing
     function getEmptyPegInQuote()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         bytes memory emptyBytes = new bytes(0);
         bytes memory testAddress = new bytes(20);
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 0,
                 penaltyFee: 0,
                 value: 0,
@@ -508,13 +509,14 @@ abstract contract FlyoverTestBase is Test {
     /// @notice Create an empty PegOut quote for testing
     function getEmptyPegOutQuote()
         internal
-        pure
+        view
         returns (Quotes.PegOutQuote memory)
     {
         bytes memory testAddress = new bytes(20);
 
         return
             Quotes.PegOutQuote({
+                chainId: block.chainid,
                 callFee: 0,
                 penaltyFee: 0,
                 value: 0,
@@ -547,6 +549,7 @@ abstract contract FlyoverTestBase is Test {
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 100000000000000,
                 penaltyFee: 10000000000000,
                 value: 0.5 ether,
@@ -582,6 +585,7 @@ abstract contract FlyoverTestBase is Test {
 
         return
             Quotes.PegOutQuote({
+                chainId: block.chainid,
                 callFee: 100000000000000,
                 penaltyFee: 10000000000000,
                 value: 0.5 ether,
diff --git a/test/integration/CollateralManagement.t.sol b/test/integration/CollateralManagement.t.sol
@@ -73,11 +73,12 @@ contract CollateralManagementIntegrationTest is Test {
 
     function getEmptyPegInQuote()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 0,
                 value: 0,
                 gasFee: 0,
diff --git a/test/integration/FlyoverDiscovery.t.sol b/test/integration/FlyoverDiscovery.t.sol
@@ -31,11 +31,12 @@ contract FlyoverDiscoveryIntegrationTest is Test {
 
     function getEmptyPegInQuote()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 0,
                 value: 0,
                 gasFee: 0,
diff --git a/test/pegin/CallForUser.t.sol b/test/pegin/CallForUser.t.sol
@@ -628,6 +628,7 @@ contract CallForUserTest is PegInTestBase {
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 100000000000000,
                 penaltyFee: 10000000000000,
                 value: value,
diff --git a/test/pegin/DerivationAddress.t.sol b/test/pegin/DerivationAddress.t.sol
@@ -38,17 +38,17 @@ contract DerivationAddressTest is Test {
 
     // Deposit addresses (mainnet and testnet for each test case)
     bytes constant MAINNET_DEPOSIT_ADDRESS_1 =
-        hex"05a24b952b63a0827be2967967ea5df30a8c20e01bd6a7cea9";
+        hex"05c93c3553c0f288e2390f0b0ea4192457c3a8c4e534963c55";
     bytes constant TESTNET_DEPOSIT_ADDRESS_1 =
-        hex"c4a24b952b63a0827be2967967ea5df30a8c20e01b2c4fddd9";
+        hex"c4c93c3553c0f288e2390f0b0ea4192457c3a8c4e57f0fd8ff";
     bytes constant MAINNET_DEPOSIT_ADDRESS_2 =
-        hex"054f84ccdfaf8402e3cfca08543956d4a77643c99a33fc2cbb";
+        hex"057fd692c0a900d497fa104ea5c0ec8bc93972d23ccf917ecf";
     bytes constant TESTNET_DEPOSIT_ADDRESS_2 =
-        hex"c44f84ccdfaf8402e3cfca08543956d4a77643c99af5381c32";
+        hex"c47fd692c0a900d497fa104ea5c0ec8bc93972d23ccbd23ea5";
     bytes constant MAINNET_DEPOSIT_ADDRESS_3 =
-        hex"05b4f3f5265c941ae4bf646411956f29bff3fa8c52bcc30929";
+        hex"0585417b12e5387b07e5796da23feac0e4840da9763def19df";
     bytes constant TESTNET_DEPOSIT_ADDRESS_3 =
-        hex"c4b4f3f5265c941ae4bf646411956f29bff3fa8c52c33e94e8";
+        hex"c485417b12e5387b07e5796da23feac0e4840da97652a1a047";
 
     address owner = address(1);
 
@@ -264,9 +264,10 @@ contract DerivationAddressTest is Test {
     /// @notice Creates test quote 1 (nonce: 3635227228603468300)
     function createTestQuote1(
         address lbcAddress
-    ) internal pure returns (Quotes.PegInQuote memory) {
+    ) internal view returns (Quotes.PegInQuote memory) {
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 100000000000000,
                 penaltyFee: 10000000000000,
                 value: 985215170000000000,
@@ -294,9 +295,10 @@ contract DerivationAddressTest is Test {
     /// @notice Creates test quote 2 (nonce: 6080686644105603000)
     function createTestQuote2(
         address lbcAddress
-    ) internal pure returns (Quotes.PegInQuote memory) {
+    ) internal view returns (Quotes.PegInQuote memory) {
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 1478412310000000,
                 penaltyFee: 10000000000000,
                 value: 517700700000000000,
@@ -324,9 +326,10 @@ contract DerivationAddressTest is Test {
     /// @notice Creates test quote 3 (nonce: 7756734892733337000)
     function createTestQuote3(
         address lbcAddress
-    ) internal pure returns (Quotes.PegInQuote memory) {
+    ) internal view returns (Quotes.PegInQuote memory) {
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 2009314000000000,
                 penaltyFee: 10000000000000,
                 value: 578580000000000000,
diff --git a/test/pegin/Hashing.t.sol b/test/pegin/Hashing.t.sol
@@ -13,6 +13,23 @@ contract HashingTest is PegInTestBase {
 
     // ============ hashPegInQuote function tests ============
 
+    function test_HashPegInQuote_RevertsIfQuoteChainIdIsFromAnotherNetwork()
+        public
+    {
+        Quotes.PegInQuote memory quote = createBasicPegInQuote();
+        uint256 wrongChainId = block.chainid == 1 ? 31337 : 1;
+        quote.chainId = wrongChainId;
+
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Flyover.InvalidChainId.selector,
+                block.chainid,
+                wrongChainId
+            )
+        );
+        pegInContract.hashPegInQuote(quote);
+    }
+
     function test_HashPegInQuote_RevertsIfQuoteBelongsToOtherContract() public {
         Quotes.PegInQuote memory quote = createBasicPegInQuote();
         address wrongContract = 0xAA9cAf1e3967600578727F975F283446A3Da6612;
@@ -141,7 +158,7 @@ contract HashingTest is PegInTestBase {
         assertTrue(hash1a != hash3, "Changing quote value should change hash");
     }
 
-    function test_HashPegInQuote_IncludesAllFieldsInHash() public view {
+    function test_HashPegInQuote_IncludesAllFieldsInHash() public {
         // This test ensures every field in PegInQuote affects the hash
         // If a new field is added but not included in the hash function, this test will fail
         Quotes.PegInQuote memory baseQuote = createSpecificPegInQuote1();
@@ -150,6 +167,15 @@ contract HashingTest is PegInTestBase {
 
         Quotes.PegInQuote memory modifiedQuote;
 
+        // Test chainId
+        modifiedQuote = baseQuote;
+        modifiedQuote.chainId = baseQuote.chainId + 1;
+        vm.chainId(modifiedQuote.chainId); // to prevent the hash from failing
+        assertTrue(
+            pegInContract.hashPegInQuote(modifiedQuote) != baseHash,
+            "chainId should affect hash"
+        );
+
         // Test callFee
         modifiedQuote = baseQuote;
         modifiedQuote.callFee = baseQuote.callFee + 1;
@@ -317,6 +343,7 @@ contract HashingTest is PegInTestBase {
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 100000000000000,
                 penaltyFee: 10000000000000,
                 value: 1 ether,
@@ -341,14 +368,15 @@ contract HashingTest is PegInTestBase {
 
     function createSpecificPegInQuote1()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         // This matches QUOTE_MOCK from the TypeScript test
         bytes memory testBtcAddress = new bytes(21);
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 100000000000000,
                 penaltyFee: 10000000000000,
                 value: 985215170000000000,
@@ -377,13 +405,14 @@ contract HashingTest is PegInTestBase {
 
     function createSpecificPegInQuote2()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         bytes memory testBtcAddress = new bytes(21);
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 1478412310000000,
                 penaltyFee: 10000000000000,
                 value: 517700700000000000,
@@ -412,13 +441,14 @@ contract HashingTest is PegInTestBase {
 
     function createSpecificPegInQuote3()
         internal
-        pure
+        view
         returns (Quotes.PegInQuote memory)
     {
         bytes memory testBtcAddress = new bytes(21);
 
         return
             Quotes.PegInQuote({
+                chainId: block.chainid,
                 callFee: 2009314000000000,
                 penaltyFee: 10000000000000,
                 value: 578580000000000000,
diff --git a/test/pegin/RefundExploit.t.sol b/test/pegin/RefundExploit.t.sol
@@ -57,6 +57,7 @@ contract RefundExploitTest is PegInTestBase {
         );
 
         quote = Quotes.PegInQuote({
+            chainId: block.chainid,
             callFee: 100000000000000,
             penaltyFee: 10000000000000,
             value: value,
diff --git a/test/pegin/RegisterPegIn.t.sol b/test/pegin/RegisterPegIn.t.sol
diff --git a/test/pegout/Deposit.t.sol b/test/pegout/Deposit.t.sol
diff --git a/test/pegout/Hashing.t.sol b/test/pegout/Hashing.t.sol
diff --git a/test/pegout/LpRefund.t.sol b/test/pegout/LpRefund.t.sol
diff --git a/test/pegout/UserRefund.t.sol b/test/pegout/UserRefund.t.sol

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,9 @@ contract PegInContract is`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`function _validatePegInQuote(Quotes.PegInQuote calldata quote) private view {`
	`519`	`+ if (quote.chainId != block.chainid) {`
	`520`	`+ revert Flyover.InvalidChainId(block.chainid, quote.chainId);`
	`521`	`+ }`
`519`	`522`	`if (address(this) != quote.lbcAddress) {`
`520`	`523`	`revert Flyover.IncorrectContract(address(this), quote.lbcAddress);`
`521`	`524`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,8 @@ library Flyover {`
`31`	`31`	`error InsufficientAmount(uint256 amount, uint256 target);`
`32`	`32`	`error Overflow(uint256 passedAmount);`
`33`	`33`	`error InvalidAddress(address addr);`
	`34`	`+ /// @notice Quote was created for a different chain`
	`35`	`+ /// @param expected The current chain id (block.chainid)`
	`36`	`+ /// @param actual The chain id in the quote`
	`37`	`+ error InvalidChainId(uint256 expected, uint256 actual);`
`34`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ contract DeployFlyoverDiscoveryTest is Test {`
`147`	`147`	`)`
`148`	`148`	`);`
`149`	`149`
`150`		`- FlyoverDiscovery fd = FlyoverDiscovery(fdProxy);`
`151`	`150`	`CollateralManagementContract cm = CollateralManagementContract(`
`152`	`151`	`payable(collateralManagementProxy)`
`153`	`152`	`);`