mirror of
https://github.com/datahaven-xyz/datahaven
synced 2026-05-24 01:38:32 +00:00
## 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>
40 lines
1.7 KiB
Solidity
40 lines
1.7 KiB
Solidity
// SPDX-License-Identifier: UNLICENSED
|
|
pragma solidity ^0.8.27;
|
|
|
|
import {Script} from "forge-std/Script.sol";
|
|
|
|
contract Accounts is Script {
|
|
uint256 internal _deployerPrivateKey = vm.envOr(
|
|
"DEPLOYER_PRIVATE_KEY",
|
|
uint256(0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80) // First pre-funded account from Anvil
|
|
);
|
|
address internal _deployer = vm.addr(_deployerPrivateKey);
|
|
|
|
uint256 internal _operatorPrivateKey = vm.envOr(
|
|
"OPERATOR_PRIVATE_KEY",
|
|
uint256(0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d) // Second pre-funded account from Anvil
|
|
);
|
|
address internal _operator = vm.addr(_operatorPrivateKey);
|
|
address internal _operatorSolochainAddress = vm.envOr(
|
|
"OPERATOR_SOLOCHAIN_ADDRESS",
|
|
address(0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac) // Alith
|
|
);
|
|
|
|
uint256 internal _executorMultisigPrivateKey = vm.envOr(
|
|
"EXECUTOR_MULTISIG_PRIVATE_KEY",
|
|
uint256(0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a) // Fourth pre-funded account from Anvil
|
|
);
|
|
address internal _executorMultisig = vm.addr(_executorMultisigPrivateKey);
|
|
|
|
uint256 internal _operationsMultisigPrivateKey = vm.envOr(
|
|
"OPERATIONS_MULTISIG_PRIVATE_KEY",
|
|
uint256(0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba) // Fifth pre-funded account from Anvil
|
|
);
|
|
address internal _operationsMultisig = vm.addr(_operationsMultisigPrivateKey);
|
|
|
|
uint256 internal _avsOwnerPrivateKey = vm.envOr(
|
|
"AVS_OWNER_PRIVATE_KEY",
|
|
uint256(0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e) // Sixth pre-funded account from Anvil
|
|
);
|
|
address internal _avsOwner = vm.addr(_avsOwnerPrivateKey);
|
|
}
|