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

Jump to bottom

fork tests on other chains + fork test bug fix #556

Closed
wants to merge 6 commits into from
Closed

fork tests on other chains + fork test bug fix #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aebf4b4
run fork tests against easily configurable chain
anna-carroll Nov 29, 2022
a037154
feat: getDomainName
anna-carroll Nov 29, 2022
93c6d69
fix governance router tests for non-governor domains
anna-carroll Nov 29, 2022
acc422c
add test for not updater signature
anna-carroll Nov 29, 2022
c1bfff6
add test: getUpdater
anna-carroll Nov 29, 2022
e30605d
fix bug in setting up updater keys
anna-carroll Nov 29, 2022
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
4 changes: 2 additions & 2 deletions packages/contracts-core/contracts/test/GovernanceRouter.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ contract GovernanceRouterTest is NomadTest {
// todo: expectNoCall Home.Dispatch
vm.expectEmit(true, true, true, true);
emit TransferGovernor(
homeDomain,
governanceRouter.governorDomain(),
newDomain,
governanceRouter.governor(),
newGovernor
Expand Down Expand Up @@ -889,7 +889,7 @@ contract GovernanceRouterTest is NomadTest {
// todo: expectNoCall Home.Dispatch
vm.expectEmit(true, true, true, true);
emit TransferGovernor(
homeDomain,
governanceRouter.governorDomain(),
newDomain,
governanceRouter.governor(),
newGovernor
Expand Down
12 changes: 12 additions & 0 deletions packages/contracts-core/contracts/test/Home.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,18 @@ contract HomeTest is NomadTestWithUpdaterManager {
assert(!home.queueContains(newRoot));
}

function test_notUpdaterSig() public {
dispatchTestMessage();
bytes32 newRoot = home.root();
bytes32 oldRoot = home.committedRoot();
uint256 randomFakePk = 777;
bytes memory sig = signHomeUpdate(randomFakePk, oldRoot, newRoot);
vm.expectRevert("!updater sig");
home.update(oldRoot, newRoot, sig);
assertEq(oldRoot, home.committedRoot());
assert(home.queueContains(newRoot));
}

function test_udpdateMultipleMessages() public {
dispatchTestMessage();
dispatchTestMessage();
Expand Down
27 changes: 23 additions & 4 deletions packages/contracts-ops/contracts/Config.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,11 @@ abstract contract Config is INomadProtocol {
);
}

function getGovernorDomain() public view override returns (uint256) {
function getGovernorDomain() public view override returns (uint32) {
return
abi.decode(
vm.parseJson(config, ".protocol.governor.domain"),
(uint256)
(uint32)
);
}

Expand Down Expand Up @@ -424,7 +424,7 @@ abstract contract Config is INomadProtocol {
function protocolConfigAttributePath(
string memory domain,
string memory key
) private pure returns (string memory) {
) internal pure returns (string memory) {
return string(abi.encodePacked(protocolConfigPath(domain), ".", key));
}

Expand Down Expand Up @@ -466,6 +466,20 @@ abstract contract Config is INomadProtocol {
);
}

function getDomainName(uint32 _domainNumber)
public
view
returns (string memory)
{
string[] memory networks = getNetworks();
for (uint256 i; i < networks.length; i++) {
if (getDomainNumber(networks[i]) == _domainNumber) {
return networks[i];
}
}
revert("domain name not found");
}

function getDomainNumber(string memory domain)
public
view
Expand Down Expand Up @@ -583,7 +597,7 @@ abstract contract Config is INomadProtocol {
contract TestJson is Test, Config {
function setUp() public {
// solhint-disable-next-line quotes
config = '{ "networks": ["avalanche", "ethereum"], "protocol": { "networks": { "avalanche": { "bridgeConfiguration": { "accountant": { "owner": "0x0000011111222223333344444555557777799999" }}}}, "governor": {"domain": 6648936, "id": "0x93277b8f5939975b9e6694d5fd2837143afbf68a"}}, "core": {"ethereum": {"deployHeight": 1234, "governanceRouter": {"proxy":"0x569D80f7FC17316B4C83f072b92EF37B72819DE0","implementation":"0x569D80f7FC17316B4C83f072b92EF37B72819DE0","beacon":"0x569D80f7FC17316B4C83f072b92EF37B72819DE0"}, "ethHelper": "0x999d80F7FC17316b4c83f072b92EF37b72718De0"}}}';
config = '{ "networks": ["avalanche", "ethereum"], "protocol": { "networks": { "avalanche": { "bridgeConfiguration": { "accountant": { "owner": "0x0000011111222223333344444555557777799999" }}, "configuration": { "updater": "0x5067c8a9cBf708f885195aA318F8d7A3f2f5D112"}, "domain": 1635148152}}, "governor": {"domain": 6648936, "id": "0x93277b8f5939975b9e6694d5fd2837143afbf68a"}}, "core": {"ethereum": {"deployHeight": 1234, "governanceRouter": {"proxy":"0x569D80f7FC17316B4C83f072b92EF37B72819DE0","implementation":"0x569D80f7FC17316B4C83f072b92EF37B72819DE0","beacon":"0x569D80f7FC17316B4C83f072b92EF37B72819DE0"}, "ethHelper": "0x999d80F7FC17316b4c83f072b92EF37b72718De0"}}}';
}

function test_Json() public {
Expand All @@ -593,6 +607,11 @@ contract TestJson is Test, Config {
);
vm.expectRevert("no ethHelper for randomDomain");
getEthHelper("randomDomain");
assertEq(
getUpdater("avalanche"),
0x5067c8a9cBf708f885195aA318F8d7A3f2f5D112
);
assertEq(getDomainName(1635148152), "avalanche");
assertEq(getNetworks()[0], "avalanche");
assertEq(
getFundsRecipient("avalanche"),
Expand Down
34 changes: 26 additions & 8 deletions packages/contracts-ops/contracts/test/Reboot.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {NomadTest} from "@nomad-xyz/contracts-core/contracts/test/utils/NomadTes

contract RebootTest is RebootLogic, NomadTest {
string remote;
string constant _domain = "ethereum";
string constant testDomain = "ethereum";

function setUpReboot(string memory testName) public {
// ALL
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could get RPC from config instead of .env, that would make it easier to switch between chains quickly, but the config RPC situation is grim because those are all public endpoints that are usually quite frail

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

additionally, we could remove the pinned block number in order to make it more seamlessly compatible with all chains, but then the tests wouldn't cache the block which would make them even slower

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't get RPC from config, we don't want to keep good RPCs in those

Expand All @@ -25,15 +25,37 @@ contract RebootTest is RebootLogic, NomadTest {
vm.writeFile(_path, vm.readFile("./actions/config.json"));
__Config_initialize(_configName);
// init fresh callbatch
__CallBatch_initialize(_domain, getDomainNumber(_domain), "", true);
__CallBatch_initialize(
testDomain,
getDomainNumber(testDomain),
"",
true
);
// call base setup
super.setUp();
// set fake updater for ethereum & 1 remote chain
// basic vars
string memory governorDomainName = getDomainName(getGovernorDomain());
if (
keccak256(bytes(localDomainName)) ==
keccak256(bytes(governorDomainName))
) {
remote = getConnections(localDomainName)[0];
} else {
remote = governorDomainName;
}
remoteDomain = getDomainNumber(remote);
homeDomain = getDomainNumber(localDomainName);
// set fake updater for remote chain replica
// before updater rotation, so it will be rotated on-chain
vm.writeJson(
vm.toString(updaterAddr),
outputPath,
protocolAttributePath(remote, "updater")
protocolConfigAttributePath(localDomainName, "updater")
);
vm.writeJson(
vm.toString(updaterAddr),
outputPath,
protocolConfigAttributePath(remote, "updater")
);
reloadConfig();
// perform reboot actions
Expand All @@ -43,9 +65,5 @@ contract RebootTest is RebootLogic, NomadTest {
address(getGovernanceRouter(localDomainName)),
getDomainNumber(localDomainName)
);
// basic vars
remote = getConnections(localDomainName)[0];
remoteDomain = getDomainNumber(remote);
homeDomain = getDomainNumber(localDomainName);
}
}
40 changes: 23 additions & 17 deletions packages/contracts-ops/contracts/test/RebootBridgeRouter.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,31 @@ contract BridgeRouterRebootTest is RebootTest, BridgeRouterTest {
address bridgeRouterHarnessImpl;
address tokenRegistryHarnessImpl;

string constant ethereum = "ethereum";

function setUp() public override(BridgeRouterBaseTest, NomadTest) {
setUpReboot("bridgeRouter");
// load proxies
tokenRegistry = TokenRegistryHarness(
address(getTokenRegistry(ethereum))
address(getTokenRegistry(localDomainName))
);
vm.label(address(tokenRegistry), "tokenRegistry");
bridgeRouter = IBridgeRouterHarness(address(getBridgeRouter(ethereum)));
bridgeRouter = IBridgeRouterHarness(
address(getBridgeRouter(localDomainName))
);
vm.label(address(bridgeRouter), "bridgeRouter");
// upgrade to harness
setUp_upgradeTokenRegistryHarness();
setUp_upgradeBridgeRouterHarness();
// load necessary contracts
xAppConnectionManager = getXAppConnectionManager(ethereum);
xAppConnectionManager = getXAppConnectionManager(localDomainName);
vm.label(address(xAppConnectionManager), "XAppConnectionManager");
upgradeBeaconController = getUpgradeBeaconController(ethereum);
upgradeBeaconController = getUpgradeBeaconController(localDomainName);
vm.label(address(upgradeBeaconController), "upgradeBeaconController");
tokenBeacon = UpgradeBeacon(payable(tokenRegistry.tokenBeacon()));
vm.label(address(tokenBeacon), "tokenBeacon");
bridgeToken = BridgeToken(beaconImplementation(tokenBeacon));
vm.label(address(bridgeToken), "bridgeToken");
// home needed for vm.expectCall
home = address(getHome("ethereum"));
home = address(getHome(localDomainName));
vm.label(home, "home");
BridgeRouterBaseTest.setUp_testFixtures();
}
Expand All @@ -54,13 +54,16 @@ contract BridgeRouterRebootTest is RebootTest, BridgeRouterTest {
vm.writeJson(
vm.toString(tokenRegistryHarnessImpl),
outputPath,
bridgeAttributePath(ethereum, "tokenRegistry.implementation")
bridgeAttributePath(localDomainName, "tokenRegistry.implementation")
);
reloadConfig();
pushSingleUpgrade(tokenRegistryUpgrade(ethereum), ethereum);
pushSingleUpgrade(
tokenRegistryUpgrade(localDomainName),
localDomainName
);
prankExecuteRecoveryManager(
address(getGovernanceRouter(ethereum)),
getDomainNumber(ethereum)
address(getGovernanceRouter(localDomainName)),
getDomainNumber(localDomainName)
);
}

Expand All @@ -70,25 +73,28 @@ contract BridgeRouterRebootTest is RebootTest, BridgeRouterTest {
vm.writeJson(
vm.toString(bridgeRouterHarnessImpl),
outputPath,
bridgeAttributePath(ethereum, "bridgeRouter.implementation")
bridgeAttributePath(localDomainName, "bridgeRouter.implementation")
);
reloadConfig();
pushSingleUpgrade(bridgeRouterUpgrade(ethereum), ethereum);
pushSingleUpgrade(
bridgeRouterUpgrade(localDomainName),
localDomainName
);
prankExecuteRecoveryManager(
address(getGovernanceRouter(ethereum)),
getDomainNumber(ethereum)
address(getGovernanceRouter(localDomainName)),
getDomainNumber(localDomainName)
);
}

function test_setUp_rebootBridgeRouter() public {
// check that the harnesses have harness methods available
assertEq(
bridgeRouterHarnessImpl,
bridgeRouterUpgrade(ethereum).implementation
bridgeRouterUpgrade(localDomainName).implementation
);
assertEq(
tokenRegistryHarnessImpl,
tokenRegistryUpgrade(ethereum).implementation
tokenRegistryUpgrade(localDomainName).implementation
);
bridgeRouter.exposed_dust(address(this));
tokenRegistry.exposed_localDomain();
Expand Down
48 changes: 30 additions & 18 deletions packages/contracts-ops/contracts/test/RebootEthereumBridgeRouter.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,35 @@ contract EthereumBridgeRouterRebootTest is RebootTest, BridgeRouterTest {
address bridgeRouterHarnessImpl;
address tokenRegistryHarnessImpl;

string constant ethereum = "ethereum";

function setUp() public override(BridgeRouterBaseTest, NomadTest) {
setUpReboot("ethBridgeRouter");
require(
keccak256(bytes(localDomainName)) == keccak256(bytes("ethereum")),
"not ethereum bridge router"
);
// load proxies
tokenRegistry = TokenRegistryHarness(
address(getTokenRegistry(ethereum))
address(getTokenRegistry(localDomainName))
);
vm.label(address(tokenRegistry), "tokenRegistry");
bridgeRouter = IBridgeRouterHarness(address(getBridgeRouter(ethereum)));
bridgeRouter = IBridgeRouterHarness(
address(getBridgeRouter(localDomainName))
);
vm.label(address(bridgeRouter), "bridgeRouter");
// upgrade to harness
setUp_upgradeTokenRegistryHarness();
setUp_upgradeBridgeRouterHarness();
// load necessary contracts
xAppConnectionManager = getXAppConnectionManager(ethereum);
xAppConnectionManager = getXAppConnectionManager(localDomainName);
vm.label(address(xAppConnectionManager), "XAppConnectionManager");
upgradeBeaconController = getUpgradeBeaconController(ethereum);
upgradeBeaconController = getUpgradeBeaconController(localDomainName);
vm.label(address(upgradeBeaconController), "upgradeBeaconController");
tokenBeacon = UpgradeBeacon(payable(tokenRegistry.tokenBeacon()));
vm.label(address(tokenBeacon), "tokenBeacon");
bridgeToken = BridgeToken(beaconImplementation(tokenBeacon));
vm.label(address(bridgeToken), "bridgeToken");
// home needed for vm.expectCall
home = address(getHome("ethereum"));
home = address(getHome(localDomainName));
vm.label(home, "home");
BridgeRouterBaseTest.setUp_testFixtures();
}
Expand All @@ -54,43 +58,51 @@ contract EthereumBridgeRouterRebootTest is RebootTest, BridgeRouterTest {
vm.writeJson(
vm.toString(tokenRegistryHarnessImpl),
outputPath,
bridgeAttributePath(ethereum, "tokenRegistry.implementation")
bridgeAttributePath(localDomainName, "tokenRegistry.implementation")
);
reloadConfig();
pushSingleUpgrade(tokenRegistryUpgrade(ethereum), ethereum);
pushSingleUpgrade(
tokenRegistryUpgrade(localDomainName),
localDomainName
);
prankExecuteRecoveryManager(
address(getGovernanceRouter(ethereum)),
getDomainNumber(ethereum)
address(getGovernanceRouter(localDomainName)),
getDomainNumber(localDomainName)
);
}

function setUp_upgradeBridgeRouterHarness() public {
bridgeRouterHarnessImpl = address(
new EthereumBridgeRouterHarness(address(getAccountant(ethereum)))
new EthereumBridgeRouterHarness(
address(getAccountant(localDomainName))
)
);
vm.label(bridgeRouterHarnessImpl, "bridgeRouterHarnessImpl");
vm.writeJson(
vm.toString(bridgeRouterHarnessImpl),
outputPath,
bridgeAttributePath(ethereum, "bridgeRouter.implementation")
bridgeAttributePath(localDomainName, "bridgeRouter.implementation")
);
reloadConfig();
pushSingleUpgrade(bridgeRouterUpgrade(ethereum), ethereum);
pushSingleUpgrade(
bridgeRouterUpgrade(localDomainName),
localDomainName
);
prankExecuteRecoveryManager(
address(getGovernanceRouter(ethereum)),
getDomainNumber(ethereum)
address(getGovernanceRouter(localDomainName)),
getDomainNumber(localDomainName)
);
}

function test_setUp_rebootBridgeRouter() public {
// check that the harnesses have harness methods available
assertEq(
bridgeRouterHarnessImpl,
bridgeRouterUpgrade(ethereum).implementation
bridgeRouterUpgrade(localDomainName).implementation
);
assertEq(
tokenRegistryHarnessImpl,
tokenRegistryUpgrade(ethereum).implementation
tokenRegistryUpgrade(localDomainName).implementation
);
bridgeRouter.exposed_dust(address(this));
tokenRegistry.exposed_localDomain();
Expand Down
Loading