Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
girazoki committed Jan 22, 2025
1 parent 74fd7d2 commit 84e3721
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 177 deletions.
165 changes: 56 additions & 109 deletions overridden_contracts/src/Gateway.sol

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions overridden_contracts/src/Operators.sol
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ library Operators {

uint16 private constant MAX_OPERATORS = 1000;

function encodeOperatorsData(
bytes32[] calldata operatorsKeys
) internal returns (Ticket memory ticket) {
function encodeOperatorsData(bytes32[] calldata operatorsKeys) internal returns (Ticket memory ticket) {
if (operatorsKeys.length == 0) {
revert Operators__OperatorsKeysCannotBeEmpty();
}
Expand Down
17 changes: 11 additions & 6 deletions overridden_contracts/src/Verification.sol
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,12 @@ library Verification {
/// @param messageCommitment The message commitment root expected to be contained within the
/// digest of BridgeHub parachain header.
/// @param proof The chain of proofs described above
function verifyCommitment(address beefyClient, bytes4 encodedParaID, bytes32 messageCommitment, Proof calldata proof)
external
view
returns (bool)
{
function verifyCommitment(
address beefyClient,
bytes4 encodedParaID,
bytes32 messageCommitment,
Proof calldata proof
) external view returns (bool) {
bytes32 leafHash = createMMRLeaf(proof.leafPartial, proof.parachainHeadsRoot, messageCommitment);

// Verify that the MMR leaf is part of the MMR maintained by the BEEFY light client
Expand Down Expand Up @@ -202,7 +203,11 @@ library Verification {

// SCALE-encode: MMRLeaf
// Reference: https://github.com/paritytech/substrate/blob/14e0a0b628f9154c5a2c870062c3aac7df8983ed/primitives/consensus/beefy/src/mmr.rs#L52
function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot, bytes32 messageCommitment) internal pure returns (bytes32) {
function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot, bytes32 messageCommitment)
internal
pure
returns (bytes32)
{
bytes memory encodedLeaf = bytes.concat(
ScaleCodec.encodeU8(leaf.version),
ScaleCodec.encodeU32(leaf.parentNumber),
Expand Down
8 changes: 3 additions & 5 deletions overridden_contracts/src/interfaces/IMiddlewareBasic.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
pragma solidity ^0.8.0;

interface IMiddlewareBasic {
/**
/**
* @notice Distributes rewards
* @param epoch The epoch of the rewards distribution
* @param eraIndex The era index of the rewards distribution
Expand Down Expand Up @@ -45,7 +45,5 @@ interface IMiddlewareBasic {
* @param timestamp The timestamp to check
* @return epoch The corresponding epoch number
*/
function getEpochAtTs(
uint48 timestamp
) external view returns (uint48 epoch);
}
function getEpochAtTs(uint48 timestamp) external view returns (uint48 epoch);
}
6 changes: 2 additions & 4 deletions overridden_contracts/src/interfaces/IOGateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,5 @@ interface IOGateway is IGateway {
uint256 timestamp;
}

function sendOperatorsData(
bytes32[] calldata data
) external;
}
function sendOperatorsData(bytes32[] calldata data) external;
}
9 changes: 5 additions & 4 deletions overridden_contracts/src/libraries/OSubstrateTypes.sol
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ library OSubstrateTypes {
ReceiveValidators
}

function EncodedOperatorsData(
bytes32[] calldata operatorsKeys,
uint32 operatorsCount
) internal view returns (bytes memory) {
function EncodedOperatorsData(bytes32[] calldata operatorsKeys, uint32 operatorsCount)
internal
view
returns (bytes memory)
{
bytes memory operatorsFlattened = new bytes(operatorsCount * 32);
for (uint32 i = 0; i < operatorsCount; i++) {
for (uint32 j = 0; j < 32; j++) {
Expand Down
3 changes: 1 addition & 2 deletions overridden_contracts/test/BeefyClient.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ contract BeefyClientTest is Test {
uint32 nextAuthoritySetLen = uint32(beefyCommitmentRaw.readUint(".params.leaf.nextAuthoritySetLen"));
bytes32 nextAuthoritySetRoot = beefyCommitmentRaw.readBytes32(".params.leaf.nextAuthoritySetRoot");
bytes32 parachainHeadsRoot = beefyCommitmentRaw.readBytes32(".params.leaf.parachainHeadsRoot");
bytes32 messageCommitment = beefyCommitmentRaw.readBytes32(".params.leaf.messageCommitment");
bytes32 messageCommitment = beefyCommitmentRaw.readBytes32(".params.leaf.messageCommitment");
mmrLeaf = BeefyClient.MMRLeaf(
version,
parentNumber,
Expand All @@ -165,7 +165,6 @@ contract BeefyClientTest is Test {
nextAuthoritySetRoot,
parachainHeadsRoot,
messageCommitment

);
}

Expand Down
64 changes: 20 additions & 44 deletions overridden_contracts/test/mocks/MockOGateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,58 +23,44 @@ contract MockOGateway is Gateway {
Gateway(beefyClient, agentExecutor, bridgeHubParaID, bridgeHubHubAgentID, foreignTokenDecimals, maxDestinationFee)
{}

function agentExecutePublic(
bytes calldata params
) external {
function agentExecutePublic(bytes calldata params) external {
this.agentExecute(params);
}

function createAgentPublic(
bytes calldata params
) external {
function createAgentPublic(bytes calldata params) external {
this.createAgent(params);
}

function upgradePublic(
bytes calldata params
) external {
function upgradePublic(bytes calldata params) external {
this.upgrade(params);
}

function createChannelPublic(
bytes calldata params
) external {
function createChannelPublic(bytes calldata params) external {
this.createChannel(params);
}

function updateChannelPublic(
bytes calldata params
) external {
function updateChannelPublic(bytes calldata params) external {
this.updateChannel(params);
}

function setOperatingModePublic(
bytes calldata params
) external {
function setOperatingModePublic(bytes calldata params) external {
this.setOperatingMode(params);
}

function transferNativeFromAgentPublic(
bytes calldata params
) external {
function transferNativeFromAgentPublic(bytes calldata params) external {
this.transferNativeFromAgent(params);
}

function setCommitmentsAreVerified(
bool value
) external {
function setCommitmentsAreVerified(bool value) external {
commitmentsAreVerified = value;
}

function _verifyCommitment(
bytes32 commitment,
Verification.Proof calldata proof
) internal view override returns (bool) {
function _verifyCommitment(bytes32 commitment, Verification.Proof calldata proof)
internal
view
override
returns (bool)
{
if (BEEFY_CLIENT != address(0)) {
return super._verifyCommitment(commitment, proof);
} else {
Expand All @@ -83,33 +69,23 @@ contract MockOGateway is Gateway {
}
}

function setTokenTransferFeesPublic(
bytes calldata params
) external {
function setTokenTransferFeesPublic(bytes calldata params) external {
this.setTokenTransferFees(params);
}

function setPricingParametersPublic(
bytes calldata params
) external {
function setPricingParametersPublic(bytes calldata params) external {
this.setPricingParameters(params);
}

function registerForeignTokenPublic(
bytes calldata params
) external {
function registerForeignTokenPublic(bytes calldata params) external {
this.registerForeignToken(params);
}

function mintForeignTokenPublic(
bytes calldata params
) external {
function mintForeignTokenPublic(bytes calldata params) external {
this.mintForeignToken(params);
}

function transferNativeTokenPublic(
bytes calldata params
) external {
function transferNativeTokenPublic(bytes calldata params) external {
this.transferNativeToken(params);
}
}
}

0 comments on commit 84e3721

Please sign in to comment.