From 95d7f7236bf076c4b8be903987eeb611129d912d Mon Sep 17 00:00:00 2001 From: Rens Rooimans Date: Thu, 19 Dec 2024 17:11:25 +0100 Subject: [PATCH] fix merge --- contracts/gas-snapshots/ccip.gas-snapshot | 13 ++++++------- .../onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol | 2 +- contracts/src/v0.8/keystone/KeystoneForwarder.sol | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot index 0b5500ce08f..bff4b17ea6b 100644 --- a/contracts/gas-snapshots/ccip.gas-snapshot +++ b/contracts/gas-snapshots/ccip.gas-snapshot @@ -279,17 +279,16 @@ OnRamp_applyAllowlistUpdates:test_applyAllowlistUpdates() (gas: 325979) OnRamp_applyAllowlistUpdates:test_applyAllowlistUpdates_InvalidAllowListRequestDisabledAllowListWithAdds() (gas: 17190) OnRamp_applyDestChainConfigUpdates:test_ApplyDestChainConfigUpdates() (gas: 65874) OnRamp_constructor:test_Constructor() (gas: 2672129) -OnRamp_forwardFromRouter:test_ForwardFromRouter() (gas: 145451) +OnRamp_forwardFromRouter:test_ForwardFromRouter() (gas: 145362) OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2() (gas: 146196) OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue() (gas: 115375) -OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 145738) +OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 145760) OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 144036) -OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 145979) -OnRamp_forwardFromRouter:test_ForwardFromRouter_ConfigurableSourceRouter() (gas: 140727) -OnRamp_forwardFromRouter:test_MessageFeeTooHigh_Revert() (gas: 36668) +OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 146001) +OnRamp_forwardFromRouter:test_ForwardFromRouter_ConfigurableSourceRouter() (gas: 140639) OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered() (gas: 186473) -OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce() (gas: 212806) -OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 147094) +OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce() (gas: 212828) +OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 147007) OnRamp_forwardFromRouter:test_forwardFromRouter_WithInterception() (gas: 274726) OnRamp_getFee:test_EmptyMessage() (gas: 99005) OnRamp_getFee:test_GetFeeOfZeroForTokenMessage() (gas: 86961) diff --git a/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol b/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol index 2901c12471a..8168cff7e1c 100644 --- a/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol +++ b/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRamp.forwardFromRouter.t.sol @@ -371,7 +371,7 @@ contract OnRamp_forwardFromRouter is OnRampSetup { s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, 0, OWNER); } - function test_MessageFeeTooHigh_Revert() public { + function test_RevertWhen_MessageFeeTooHigh() public { Client.EVM2AnyMessage memory message = _generateEmptyMessage(); vm.expectRevert( diff --git a/contracts/src/v0.8/keystone/KeystoneForwarder.sol b/contracts/src/v0.8/keystone/KeystoneForwarder.sol index ee800dc9922..5807f042593 100644 --- a/contracts/src/v0.8/keystone/KeystoneForwarder.sol +++ b/contracts/src/v0.8/keystone/KeystoneForwarder.sol @@ -320,7 +320,7 @@ contract KeystoneForwarder is OwnerIsCreator, ITypeAndVersion, IRouter { // workflow_execution_id offset 33, size 32 // timestamp offset 65, size 4 // don_id offset 69, size 4 - // don_config_version, offset 73, size 4 + // don_config_version, offset 73, size 4 // workflow_cid offset 77, size 32 // workflow_name offset 109, size 10 // workflow_owner offset 119, size 20