mirror of
https://github.com/datahaven-xyz/datahaven
synced 2026-05-24 01:38:32 +00:00
e9fc4f271f
## Summary of changes - We decided to remove the topics and nonce from the massage encoding since we don't use them (original commit:ee2a3f2fd4). - Besides, we already have a nonce at the Snowbridge message levelf4ab5c2b2e/operator/primitives/snowbridge/inbound-queue/src/v2/message.rs (L105)- I had to recreate the static test for _encoding_ (happens in [DataHavenSnowbridgeMessages.sol](d12d40634f/contracts/src/libraries/DataHavenSnowbridgeMessages.sol) ) / _decoding_ (happens in [operator/primitives/bridge/src/lib.rs)](f9f9cc65fe/operator/primitives/bridge/src/lib.rs). Now it matches the current structure. The idea is that now we can test that we don't break the decoding in followup refactoring. - Fixes a problem with EigenLayer validator addresses. In all our contracts we were using `bytes32` to refer to a Solochain validator address. But on our Substrate change we actually expect AccountId20, so only 20 bytes. This was causing the decoding to fail. - I opted for the minimal change that would be to take the right-most 20 bytes to send that to our chain. But we might want aswell to limit our EigenLayer contracts to be only 20 bytes long. @ahmadkaouk showcase this [here](92a34c273c) - Adds a bash script to run the static test. The test will compile the contracts, run the encoding test, compile the operator, and run the decoding test. This saves a huge amount of time since we don't need to run the full e2e setup. The way of running it is the following: ```bash cd operator/test/scripts ./test_message_encoding.sh ``` - As a consequence of this PR, the execution relayer now works properly. EDIT: > [!IMPORTANT] **We decided to use 20-byte addresses in our contracts**. So what is stated above is not valid anymore. The change implies that the mapping from Ethereum addresses to bytes32 addresses now it's a mapping as follows:dd3ba99ac0/contracts/src/DataHavenServiceManager.sol (L51-L52)I've updated helper functions, tests, etc to be compliant with this change. The execution relayer and beefy relayer look stable now. --------- Co-authored-by: Ahmad Kaouk <ahmadkaouk.93@gmail.com> Co-authored-by: Ahmad Kaouk <56095276+ahmadkaouk@users.noreply.github.com>
64 lines
2.1 KiB
Solidity
64 lines
2.1 KiB
Solidity
// SPDX-License-Identifier: UNLICENSED
|
|
pragma solidity ^0.8.27;
|
|
|
|
/**
|
|
* @title TestUtils
|
|
* @notice Utility functions for testing DataHaven contracts
|
|
*/
|
|
library TestUtils {
|
|
/**
|
|
* @notice Generates mock validator addresses for testing
|
|
* @param count Number of validators to generate
|
|
* @param startIndex Starting index for validator numbering (defaults to 0)
|
|
* @return Array of validator addresses
|
|
*/
|
|
function generateMockValidatorsAddresses(
|
|
uint256 count,
|
|
uint256 startIndex
|
|
) internal pure returns (address[] memory) {
|
|
address[] memory validators = new address[](count);
|
|
for (uint256 i = 0; i < count; i++) {
|
|
validators[i] = address(uint160(uint256(bytes32(startIndex + i + 1))));
|
|
}
|
|
return validators;
|
|
}
|
|
|
|
/**
|
|
* @notice Generates mock validator addresses for testing (overload with default startIndex = 0)
|
|
* @param count Number of validators to generate
|
|
* @return Array of validator addresses
|
|
*/
|
|
function generateMockValidatorsAddresses(
|
|
uint256 count
|
|
) internal pure returns (address[] memory) {
|
|
return generateMockValidatorsAddresses(count, 0);
|
|
}
|
|
|
|
/**
|
|
* @notice Generates mock validator addresses for testing
|
|
* @param count Number of validators to generate
|
|
* @param startIndex Starting index for validator numbering (defaults to 0)
|
|
* @return Array of validator addresses
|
|
*/
|
|
function generateMockValidators(
|
|
uint256 count,
|
|
uint256 startIndex
|
|
) internal pure returns (bytes32[] memory) {
|
|
bytes32[] memory validators = new bytes32[](count);
|
|
for (uint256 i = 0; i < count; i++) {
|
|
validators[i] = bytes32(startIndex + i + 1);
|
|
}
|
|
return validators;
|
|
}
|
|
|
|
/**
|
|
* @notice Generates mock validator addresses for testing (overload with default startIndex = 0)
|
|
* @param count Number of validators to generate
|
|
* @return Array of validator addresses
|
|
*/
|
|
function generateMockValidators(
|
|
uint256 count
|
|
) internal pure returns (bytes32[] memory) {
|
|
return generateMockValidators(count, 0);
|
|
}
|
|
}
|