-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add CapabilityConfiguration struct * Add CapabilityConfiguration and DON structs * --wip-- [skip CI] * implement add don on capability registry * verify DON nodes unique * add check for whether or not a node supports a capability * update check for nodes supporting capability * fix tests * address PR feedback * pack node struct * check that capability is not deprecated when adding dons * update node struct * address nits * add notice tag --------- Co-authored-by: Christopher Dimitri Sastropranoto <christopher.sastropranoto@smartcontract.com>
- Loading branch information
Showing
14 changed files
with
708 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "chainlink": patch | ||
| --- | ||
|
|
||
| #internal regen geth wrappers for capability registry |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@chainlink/contracts": patch | ||
| --- | ||
|
|
||
| implement add don for capability regsitry |
Large diffs are not rendered by default.
Oops, something went wrong.
179 changes: 179 additions & 0 deletions
179
contracts/src/v0.8/keystone/test/CapabilityRegistry_AddDONTest.t.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.19; | ||
|
|
||
| import {BaseTest} from "./BaseTest.t.sol"; | ||
|
|
||
| import {CapabilityRegistry} from "../CapabilityRegistry.sol"; | ||
|
|
||
| contract CapabilityRegistry_AddDONTest is BaseTest { | ||
| event DONAdded(uint256 donId, bool isPublic); | ||
|
|
||
| uint32 private constant TEST_NODE_OPERATOR_ONE_ID = 0; | ||
| uint256 private constant TEST_NODE_OPERATOR_TWO_ID = 1; | ||
| bytes32 private constant INVALID_P2P_ID = bytes32("fake-p2p"); | ||
| bytes private constant CONFIG = bytes("onchain-config"); | ||
|
|
||
| function setUp() public override { | ||
| BaseTest.setUp(); | ||
|
|
||
| s_capabilityRegistry.addNodeOperators(_getNodeOperators()); | ||
| s_capabilityRegistry.addCapability(s_basicCapability); | ||
| s_capabilityRegistry.addCapability(s_capabilityWithConfigurationContract); | ||
|
|
||
| CapabilityRegistry.NodeParams[] memory nodes = new CapabilityRegistry.NodeParams[](2); | ||
| bytes32[] memory capabilityIds = new bytes32[](2); | ||
| capabilityIds[0] = s_basicHashedCapabilityId; | ||
| capabilityIds[1] = s_capabilityWithConfigurationContractId; | ||
|
|
||
| nodes[0] = CapabilityRegistry.NodeParams({ | ||
| nodeOperatorId: TEST_NODE_OPERATOR_ONE_ID, | ||
| p2pId: P2P_ID, | ||
| signer: NODE_OPERATOR_ONE_SIGNER_ADDRESS, | ||
| hashedCapabilityIds: capabilityIds | ||
| }); | ||
|
|
||
| bytes32[] memory nodeTwoCapabilityIds = new bytes32[](1); | ||
| nodeTwoCapabilityIds[0] = s_basicHashedCapabilityId; | ||
|
|
||
| nodes[1] = CapabilityRegistry.NodeParams({ | ||
| nodeOperatorId: TEST_NODE_OPERATOR_ONE_ID, | ||
| p2pId: P2P_ID_TWO, | ||
| signer: NODE_OPERATOR_TWO_SIGNER_ADDRESS, | ||
| hashedCapabilityIds: nodeTwoCapabilityIds | ||
| }); | ||
|
|
||
| changePrank(NODE_OPERATOR_ONE_ADMIN); | ||
| s_capabilityRegistry.addNodes(nodes); | ||
|
|
||
| changePrank(ADMIN); | ||
| } | ||
|
|
||
| function test_RevertWhen_CalledByNonAdmin() public { | ||
| changePrank(STRANGER); | ||
| vm.expectRevert("Only callable by owner"); | ||
| bytes32[] memory nodes = new bytes32[](1); | ||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](1); | ||
|
|
||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_basicHashedCapabilityId, | ||
| config: CONFIG | ||
| }); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
| } | ||
|
|
||
| function test_RevertWhen_NodeDoesNotSupportCapability() public { | ||
| bytes32[] memory nodes = new bytes32[](1); | ||
| nodes[0] = P2P_ID_TWO; | ||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](1); | ||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_capabilityWithConfigurationContractId, | ||
| config: CONFIG | ||
| }); | ||
| vm.expectRevert( | ||
| abi.encodeWithSelector( | ||
| CapabilityRegistry.NodeDoesNotSupportCapability.selector, | ||
| P2P_ID_TWO, | ||
| s_capabilityWithConfigurationContractId | ||
| ) | ||
| ); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
| } | ||
|
|
||
| function test_RevertWhen_CapabilityDoesNotExist() public { | ||
| bytes32[] memory nodes = new bytes32[](1); | ||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](1); | ||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_nonExistentHashedCapabilityId, | ||
| config: CONFIG | ||
| }); | ||
| vm.expectRevert( | ||
| abi.encodeWithSelector(CapabilityRegistry.CapabilityDoesNotExist.selector, s_nonExistentHashedCapabilityId) | ||
| ); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
| } | ||
|
|
||
| function test_RevertWhen_DuplicateCapabilityAdded() public { | ||
| bytes32[] memory nodes = new bytes32[](1); | ||
| nodes[0] = P2P_ID; | ||
|
|
||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](2); | ||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_basicHashedCapabilityId, | ||
| config: CONFIG | ||
| }); | ||
| capabilityConfigs[1] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_basicHashedCapabilityId, | ||
| config: CONFIG | ||
| }); | ||
|
|
||
| vm.expectRevert( | ||
| abi.encodeWithSelector(CapabilityRegistry.DuplicateDONCapability.selector, 1, s_basicHashedCapabilityId) | ||
| ); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
| } | ||
|
|
||
| function test_RevertWhen_DeprecatedCapabilityAdded() public { | ||
| bytes32 capabilityId = s_basicHashedCapabilityId; | ||
| s_capabilityRegistry.deprecateCapability(capabilityId); | ||
|
|
||
| bytes32[] memory nodes = new bytes32[](1); | ||
| nodes[0] = P2P_ID; | ||
|
|
||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](1); | ||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({capabilityId: capabilityId, config: CONFIG}); | ||
|
|
||
| vm.expectRevert(abi.encodeWithSelector(CapabilityRegistry.CapabilityIsDeprecated.selector, capabilityId)); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
| } | ||
|
|
||
| function test_RevertWhen_DuplicateNodeAdded() public { | ||
| bytes32[] memory nodes = new bytes32[](2); | ||
| nodes[0] = P2P_ID; | ||
| nodes[1] = P2P_ID; | ||
|
|
||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](1); | ||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_basicHashedCapabilityId, | ||
| config: CONFIG | ||
| }); | ||
| vm.expectRevert(abi.encodeWithSelector(CapabilityRegistry.DuplicateDONNode.selector, 1, P2P_ID)); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
| } | ||
|
|
||
| function test_AddDON() public { | ||
| bytes32[] memory nodes = new bytes32[](1); | ||
| nodes[0] = P2P_ID; | ||
|
|
||
| CapabilityRegistry.CapabilityConfiguration[] | ||
| memory capabilityConfigs = new CapabilityRegistry.CapabilityConfiguration[](1); | ||
| capabilityConfigs[0] = CapabilityRegistry.CapabilityConfiguration({ | ||
| capabilityId: s_basicHashedCapabilityId, | ||
| config: CONFIG | ||
| }); | ||
|
|
||
| vm.expectEmit(true, true, true, true, address(s_capabilityRegistry)); | ||
| emit DONAdded(1, true); | ||
| s_capabilityRegistry.addDON(nodes, capabilityConfigs, true); | ||
|
|
||
| ( | ||
| uint32 id, | ||
| bool isPublic, | ||
| bytes32[] memory donNodes, | ||
| CapabilityRegistry.CapabilityConfiguration[] memory donCapabilityConfigs | ||
| ) = s_capabilityRegistry.getDON(1); | ||
| assertEq(id, 1); | ||
| assertEq(isPublic, true); | ||
| assertEq(donCapabilityConfigs.length, 1); | ||
| assertEq(donCapabilityConfigs[0].capabilityId, s_basicHashedCapabilityId); | ||
| assertEq(s_capabilityRegistry.getDONCapabilityConfig(1, s_basicHashedCapabilityId), CONFIG); | ||
|
|
||
| assertEq(donNodes.length, 1); | ||
| assertEq(donNodes[0], P2P_ID); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.