Skip to content

Quick fix #139

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.

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

Merged
merged 2 commits into from
Mar 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions contracts/access/AMultiOwnable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ abstract contract AMultiOwnable is IMultiOwnable, Initializable {
_addOwners(msg.sender.asSingletonArray());
}

/**
* @dev Initializes the contract setting the array of initial owners.
*/
function __AMultiOwnable_init(address[] memory initialOwners_) internal onlyInitializing {
if (initialOwners_.length == 0) revert InvalidOwner();

_addOwners(initialOwners_);
}

/**
* @notice The function to add equally rightful owners to the contract
* @param newOwners_ the owners to be added
Expand Down
14 changes: 13 additions & 1 deletion contracts/mock/access/MultiOwnableMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,26 @@
// solhint-disable
pragma solidity ^0.8.21;

import {AMultiOwnable} from "./../../access/AMultiOwnable.sol";
import {AMultiOwnable} from "../../access/AMultiOwnable.sol";

import {TypeCaster} from "../../libs/utils/TypeCaster.sol";

contract MultiOwnableMock is AMultiOwnable {
using TypeCaster for address;

function __MultiOwnableMock_init() external initializer {
__AMultiOwnable_init();
}

function __MultiOwnableMockMulti_init(address[] memory initialOwners_) external initializer {
__AMultiOwnable_init(initialOwners_);
}

function mockInit() external {
__AMultiOwnable_init();
}

function mockMultiInit() external {
__AMultiOwnable_init(msg.sender.asSingletonArray());
}
}
4 changes: 2 additions & 2 deletions contracts/mock/oracles/uniswap-v2/UniswapV2OracleMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ contract UniswapV2OracleMock is AUniswapV2Oracle {
address uniswapV2Factory_,
uint256 timeWindow_
) external initializer {
__OracleV2_init(uniswapV2Factory_, timeWindow_);
__AUniswapV2Oracle_init(uniswapV2Factory_, timeWindow_);
}

function mockInit(address uniswapV2Factory_, uint256 timeWindow_) external {
__OracleV2_init(uniswapV2Factory_, timeWindow_);
__AUniswapV2Oracle_init(uniswapV2Factory_, timeWindow_);
}

function addPaths(address[][] calldata paths_) external {
Expand Down
2 changes: 1 addition & 1 deletion contracts/oracles/AUniswapV2Oracle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ abstract contract AUniswapV2Oracle is Initializable {
* @param uniswapV2Factory_ the Uniswap V2 factory
* @param timeWindow_ the time between oracle observations
*/
function __OracleV2_init(
function __AUniswapV2Oracle_init(
address uniswapV2Factory_,
uint256 timeWindow_
) internal onlyInitializing {
Expand Down
19 changes: 19 additions & 0 deletions test/access/MultiOwnable.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,30 @@ describe("MultiOwnable", () => {
afterEach(reverter.revert);

describe("access", () => {
it("should initialize", async () => {
const multiOwnableMock = await ethers.deployContract("MultiOwnableMock");

await expect(multiOwnableMock.__MultiOwnableMockMulti_init([]))
.to.be.revertedWithCustomError(multiOwnable, "InvalidOwner")
.withArgs();

await multiOwnableMock.__MultiOwnableMockMulti_init([FIRST.address]);

expect(await multiOwnableMock.isOwner(FIRST.address)).to.be.true;
});

it("should not initialize twice", async () => {
await expect(multiOwnable.mockInit()).to.be.revertedWithCustomError(multiOwnable, "NotInitializing").withArgs();
await expect(multiOwnable.mockMultiInit())
.to.be.revertedWithCustomError(multiOwnable, "NotInitializing")
.withArgs();

await expect(multiOwnable.__MultiOwnableMock_init())
.to.be.revertedWithCustomError(multiOwnable, "InvalidInitialization")
.withArgs();
await expect(multiOwnable.__MultiOwnableMockMulti_init([FIRST.address]))
.to.be.revertedWithCustomError(multiOwnable, "InvalidInitialization")
.withArgs();
});

it("only owner should call these functions", async () => {
Expand Down