Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add signature check to hub and spoke propose #5078

Merged
merged 14 commits into from
Nov 8, 2023
Merged

feat: add signature check to hub and spoke propose #5078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bd5410d
feat: add signature check to hub and spoke propose
preethamr Oct 28, 2023
d647a7f
fix: resove relayerproxy test
preethamr Oct 28, 2023
d8a64d9
feat: add finalize and update tests
preethamr Oct 31, 2023
7f92368
feat: add replay protection for propose proxy call
preethamr Nov 4, 2023
f2c9e1a
fix: remove custom args inside error
liu-zhipeng Nov 7, 2023
318fefc
test: fix forge tests for remove
liu-zhipeng Nov 7, 2023
3f053fb
feat: add nonce to propose payload
liu-zhipeng Nov 7, 2023
8ccf765
fix: deploy & init scripts
liu-zhipeng Nov 7, 2023
5b7d185
fix: cool down modifier
liu-zhipeng Nov 7, 2023
f5b9c2d
fix: remove unused functions
liu-zhipeng Nov 7, 2023
1419a6d
fix: remove nonce & add chain id
liu-zhipeng Nov 8, 2023
ec08e52
fix: fix reviews
liu-zhipeng Nov 8, 2023
72ee556
fix: distinctive naming
liu-zhipeng Nov 8, 2023
2e90894
chore: rebuild
liu-zhipeng Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...yments/contracts/abi/contracts/core/connext/helpers/RelayerProxy.sol/ISpokeConnector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
[
"function DOMAIN() view returns (uint32)",
"function allowlistedProposers(address _proposer) view returns (bool)",
"function proposeAggregateRoot(bytes32 _aggregateRoot, uint256 _rootTimestamp)",
"function proveAndProcess(tuple(bytes message, bytes32[32] path, uint256 index)[] _proofs, bytes32 _aggregateRoot, bytes32[32] _aggregatePath, uint256 _aggregateIndex)",
"function send(bytes _encodedData) payable"
]
21 changes: 14 additions & 7 deletions ...ployments/contracts/abi/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
[
"constructor(address _connext, address _spokeConnector, address _gelatoRelayer, address _feeCollector, address _keep3r)",
"constructor(tuple(address connext, address spokeConnector, address gelatoRelayer, address feeCollector, address keep3r, uint256 proposeAggregateRootCooldown) _params)",
"error ProposedOwnable__onlyOwner_notOwner()",
"error ProposedOwnable__onlyProposed_notProposedOwner()",
"error ProposedOwnable__ownershipDelayElapsed_delayNotElapsed()",
"error ProposedOwnable__proposeNewOwner_invalidProposal()",
"error ProposedOwnable__proposeNewOwner_noOwnershipChange()",
"error ProposedOwnable__renounceOwnership_invalidProposal()",
"error ProposedOwnable__renounceOwnership_noProposal()",
"error RelayerProxy__addRelayer_relayerAdded(address _relayer)",
"error RelayerProxy__definedAddress_empty(address _address)",
"error RelayerProxy__isWorkableBySender_notWorkable(address _sender)",
"error RelayerProxy__onlyRelayer_notRelayer(address _sender)",
"error RelayerProxy__removeRelayer_relayerNotAdded(address _relayer)",
"error RelayerProxy__validateAndPayWithCredits_notKeep3r(address _sender)",
"error RelayerProxy__addRelayer_relayerAdded()",
"error RelayerProxy__definedAddress_empty()",
"error RelayerProxy__isWorkableBySender_notWorkable()",
"error RelayerProxy__onlyRelayer_notRelayer()",
"error RelayerProxy__proposeAggregateRootCooledDown_notCooledDown()",
"error RelayerProxy__removeRelayer_relayerNotAdded()",
"error RelayerProxy__validateAndPayWithCredits_notKeep3r()",
"error RelayerProxy__validateProposeSignature_notProposer(address signer)",
"event ConnextChanged(address updated, address previous)",
"event FeeCollectorChanged(address updated, address previous)",
"event FundsDeducted(uint256 amount, uint256 balance)",
Expand All @@ -21,6 +23,7 @@
"event Keep3rChanged(address updated, address previous)",
"event OwnershipProposed(address indexed proposedOwner)",
"event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)",
"event ProposeAggregateRootCooldownChanged(uint256 proposeAggregateRootCooldown, uint256 oldProposeAggregateRootCooldown)",
"event RelayerAdded(address relayer)",
"event RelayerRemoved(address relayer)",
"event SpokeConnectorChanged(address updated, address previous)",
Expand All @@ -29,11 +32,15 @@
"function allowedRelayer(address) view returns (bool)",
"function connext() view returns (address)",
"function delay() view returns (uint256)",
"function domain() view returns (uint32)",
"function execute(tuple(tuple(uint32 originDomain, uint32 destinationDomain, uint32 canonicalDomain, address to, address delegate, bool receiveLocal, bytes callData, uint256 slippage, address originSender, uint256 bridgedAmt, uint256 normalizedIn, uint256 nonce, bytes32 canonicalId) params, address[] routers, bytes[] routerSignatures, address sequencer, bytes sequencerSignature) _args, uint256 _fee) returns (bytes32 transferId)",
"function feeCollector() view returns (address)",
"function gelatoRelayer() view returns (address)",
"function keep3r() view returns (address)",
"function lastProposeAggregateRootAt() view returns (uint256)",
"function owner() view returns (address)",
"function proposeAggregateRoot(bytes32 _aggregateRoot, uint256 _rootTimestamp, bytes _signature, uint256 _fee)",
"function proposeAggregateRootCooldown() view returns (uint256)",
"function proposeNewOwner(address newlyProposed)",
"function proposed() view returns (address)",
"function proposedTimestamp() view returns (uint256)",
Expand Down
1 change: 1 addition & 0 deletions ...yments/contracts/abi/contracts/core/connext/helpers/RelayerProxyHub.sol/IRootManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
"function allowlistedProposers(address _proposer) view returns (bool)",
"function dequeue() returns (bytes32, uint256)",
"function finalize(bytes32 _proposedAggregateRoot, uint256 _endOfDispute) payable",
"function finalizeAndPropagate(address[] _connectors, uint256[] _fees, bytes[] _encodedData, bytes32 _proposedAggregateRoot, uint256 _endOfDispute) payable",
"function lastPropagatedRoot(uint32 _domain) view returns (bytes32)",
"function propagate(address[] _connectors, uint256[] _fees, bytes[] _encodedData) payable",
Expand Down
40 changes: 24 additions & 16 deletions ...nts/contracts/abi/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
[
"constructor(address _connext, address _spokeConnector, address _gelatoRelayer, address _feeCollector, address _keep3r, address _rootManager, address _autonolas, uint256 _propagateCooldown, uint256 _proposeAggregateRootCooldown, address[] _hubConnectors, uint32[] _hubConnectorChains)",
"constructor(tuple(address connext, address spokeConnector, address gelatoRelayer, address feeCollector, address keep3r, address rootManager, address autonolas, uint256 propagateCooldown, uint256 finalizeCooldown, uint256 proposeAggregateRootCooldown, address[] hubConnectors, uint32[] hubConnectorChains) _params)",
"error ProposedOwnable__onlyOwner_notOwner()",
"error ProposedOwnable__onlyProposed_notProposedOwner()",
"error ProposedOwnable__ownershipDelayElapsed_delayNotElapsed()",
"error ProposedOwnable__proposeNewOwner_invalidProposal()",
"error ProposedOwnable__proposeNewOwner_noOwnershipChange()",
"error ProposedOwnable__renounceOwnership_invalidProposal()",
"error ProposedOwnable__renounceOwnership_noProposal()",
"error RelayerProxyHub__finalizeAndPropagateCooledDown_notCooledDown(uint256 timestamp, uint256 nextWorkable)",
"error RelayerProxyHub__processFromRoot_alreadyProcessed(uint32 chain, bytes32 l2Hash)",
"error RelayerProxyHub__processFromRoot_noHubConnector(uint32 chain)",
"error RelayerProxyHub__processFromRoot_unsupportedChain(uint32 chain)",
"error RelayerProxyHub__propagateCooledDown_notCooledDown(uint256 timestamp, uint256 nextWorkable)",
"error RelayerProxyHub__proposeAggregateRootCooledDown_notCooledDown(uint256 timestamp, uint256 nextWorkable)",
"error RelayerProxyHub__validateProposeSignature_notProposer(address proposer)",
"error RelayerProxy__addRelayer_relayerAdded(address _relayer)",
"error RelayerProxy__definedAddress_empty(address _address)",
"error RelayerProxy__isWorkableBySender_notWorkable(address _sender)",
"error RelayerProxy__onlyRelayer_notRelayer(address _sender)",
"error RelayerProxy__removeRelayer_relayerNotAdded(address _relayer)",
"error RelayerProxy__validateAndPayWithCredits_notKeep3r(address _sender)",
"error RelayerProxyHub__finalizeCooledDown_notCooledDown()",
"error RelayerProxyHub__processFromRoot_alreadyProcessed()",
"error RelayerProxyHub__processFromRoot_noHubConnector()",
"error RelayerProxyHub__processFromRoot_unsupportedChain()",
"error RelayerProxyHub__propagateCooledDown_notCooledDown()",
"error RelayerProxyHub__validateProposeSignature_notProposer(address signer)",
"error RelayerProxy__addRelayer_relayerAdded()",
"error RelayerProxy__definedAddress_empty()",
"error RelayerProxy__isWorkableBySender_notWorkable()",
"error RelayerProxy__onlyRelayer_notRelayer()",
"error RelayerProxy__proposeAggregateRootCooledDown_notCooledDown()",
"error RelayerProxy__removeRelayer_relayerNotAdded()",
"error RelayerProxy__validateAndPayWithCredits_notKeep3r()",
"error RelayerProxy__validateProposeSignature_notProposer(address signer)",
"event AutonolasChanged(address updated, address previous)",
"event AutonolasPriorityChanged(uint8 fn, uint8 updated, uint8 previous)",
"event ConnextChanged(address updated, address previous)",
"event FeeCollectorChanged(address updated, address previous)",
"event FinalizeCooldownChanged(uint256 finalizeCooldown, uint256 oldFinalizeCooldown)",
"event FundsDeducted(uint256 amount, uint256 balance)",
"event FundsReceived(uint256 amount, uint256 balance)",
"event GelatoRelayerChanged(address updated, address previous)",
Expand All @@ -44,13 +46,17 @@
"function autonolasPriority(uint8) view returns (uint8)",
"function connext() view returns (address)",
"function delay() view returns (uint256)",
"function domain() view returns (uint32)",
"function execute(tuple(tuple(uint32 originDomain, uint32 destinationDomain, uint32 canonicalDomain, address to, address delegate, bool receiveLocal, bytes callData, uint256 slippage, address originSender, uint256 bridgedAmt, uint256 normalizedIn, uint256 nonce, bytes32 canonicalId) params, address[] routers, bytes[] routerSignatures, address sequencer, bytes sequencerSignature) _args, uint256 _fee) returns (bytes32 transferId)",
"function feeCollector() view returns (address)",
"function finalizeAndPropagate(address[] _connectors, uint256[] _fees, bytes[] _encodedData, bytes32 _proposedAggregateRoot, uint256 _endOfDispute)",
"function finalize(bytes32 _proposedAggregateRoot, uint256 _endOfDispute)",
"function finalizeAndPropagate(address[] _connectors, uint256[] _fees, bytes[] _encodedData, bytes32 _proposedAggregateRoot, uint256 _endOfDispute) returns (uint256 _fee)",
"function finalizeAndPropagateKeep3r(address[] _connectors, uint256[] _fees, bytes[] _encodedData, bytes32 _proposedAggregateRoot, uint256 _endOfDispute) returns (uint256 _fee)",
"function finalizeCooldown() view returns (uint256)",
"function gelatoRelayer() view returns (address)",
"function hubConnectors(uint32) view returns (address)",
"function keep3r() view returns (address)",
"function lastFinalizeAt() view returns (uint256)",
"function lastPropagateAt() view returns (uint256)",
"function lastProposeAggregateRootAt() view returns (uint256)",
"function owner() view returns (address)",
Expand All @@ -61,8 +67,10 @@
"function propagateCooldown() view returns (uint256)",
"function propagateKeep3r(address[] _connectors, uint256[] _messageFees, bytes[] _encodedData)",
"function propagateWorkable(uint32[] domains) returns (bool)",
"function proposeAggregateRoot(bytes32 _aggregateRoot, uint256 _rootTimestamp, bytes _signature, uint256 _fee)",
"function proposeAggregateRootCooldown() view returns (uint256)",
"function proposeAggregateRootKeep3r(uint256 _snapshotId, bytes32 _aggregateRoot, bytes32[] _snapshotsRoots, uint32[] _domains, bytes _signature)",
"function proposeAggregateRootOnRoot(uint256 _snapshotId, bytes32 _aggregateRoot, bytes32[] _snapshotsRoots, uint32[] _domains, bytes _signature)",
"function proposeAggregateRootOnRootKeep3r(uint256 _snapshotId, bytes32 _aggregateRoot, bytes32[] _snapshotsRoots, uint32[] _domains, bytes _signature)",
"function proposeNewOwner(address newlyProposed)",
"function proposed() view returns (address)",
"function proposedTimestamp() view returns (uint256)",
Expand Down
Loading