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

refactor: rename to LSP23LinkedContractsFactory #675

Merged
merged 6 commits into from
Aug 15, 2023
Merged

refactor: rename to LSP23LinkedContractsFactory #675

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94e1c32
refactor: rename to LSP23LinkedContractsFactory
skimaharvey Aug 12, 2023
4bec285
chore: add lsp23 to hardhat.config
skimaharvey Aug 14, 2023
bcbf6cc
Merge branch 'develop' of github.com:lukso-network/lsp-smart-contract…
skimaharvey Aug 14, 2023
66655ac
test: resolve LSP23 gas issue on test deployment
CJ42 Aug 14, 2023
ffcda30
Merge branch 'develop' of github.com:lukso-network/lsp-smart-contract…
skimaharvey Aug 15, 2023
cfac2b6
docs: generate docs for lsp23
skimaharvey Aug 15, 2023
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
2 changes: 1 addition & 1 deletion ...ctsDeployment/ILinkedContractsFactory.sol → ...ployment/ILSP23LinkedContractsFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.4;

interface ILinkedContractsFactory {
interface ILSP23LinkedContractsFactory {
event DeployedContracts(
address indexed primaryContract,
address indexed secondaryContract,
Expand Down
12 changes: 6 additions & 6 deletions ...actsDeployment/LinkedContractsFactory.sol → ...eployment/LSP23LinkedContractsFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ pragma solidity ^0.8.4;
import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
import {IPostDeploymentModule} from "./IPostDeploymentModule.sol";
import {ILinkedContractsFactory} from "./ILinkedContractsFactory.sol";
import {ILSP23LinkedContractsFactory} from "./ILSP23LinkedContractsFactory.sol";
import {
InvalidValueSum,
PrimaryContractProxyInitFailureError,
SecondaryContractProxyInitFailureError
} from "./LSP23Errors.sol";

contract LinkedContractsFactory is ILinkedContractsFactory {
contract LSP23LinkedContractsFactory is ILSP23LinkedContractsFactory {
/**
* @inheritdoc ILinkedContractsFactory
* @inheritdoc ILSP23LinkedContractsFactory
*/
function deployContracts(
PrimaryContractDeployment calldata primaryContractDeployment,
Expand Down Expand Up @@ -69,7 +69,7 @@ contract LinkedContractsFactory is ILinkedContractsFactory {
}

/**
* @inheritdoc ILinkedContractsFactory
* @inheritdoc ILSP23LinkedContractsFactory
*/
function deployERC1167Proxies(
PrimaryContractDeploymentInit calldata primaryContractDeploymentInit,
Expand Down Expand Up @@ -128,7 +128,7 @@ contract LinkedContractsFactory is ILinkedContractsFactory {
}

/**
* @inheritdoc ILinkedContractsFactory
* @inheritdoc ILSP23LinkedContractsFactory
*/
function computeAddresses(
PrimaryContractDeployment calldata primaryContractDeployment,
Expand Down Expand Up @@ -174,7 +174,7 @@ contract LinkedContractsFactory is ILinkedContractsFactory {
}

/**
* @inheritdoc ILinkedContractsFactory
* @inheritdoc ILSP23LinkedContractsFactory
*/
function computeERC1167Addresses(
PrimaryContractDeploymentInit calldata primaryContractDeploymentInit,
Expand Down
6 changes: 5 additions & 1 deletion ...racts/LSP23LinkedContractsDeployment/modules/UniversalProfileInitPostDeploymentModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.4;

import {
OPERATION_4_DELEGATECALL
} from "@erc725/smart-contracts/contracts/constants.sol";

import {UniversalProfileInit} from "../../UniversalProfileInit.sol";

contract UniversalProfileInitPostDeploymentModule is UniversalProfileInit {
Expand Down Expand Up @@ -45,7 +49,7 @@ contract UniversalProfileInitPostDeploymentModule is UniversalProfileInit {

// call the execute function with delegate_call on the universalProfile contract to setData and transferOwnership
UniversalProfileInit(payable(universalProfile)).execute(
4,
OPERATION_4_DELEGATECALL,
address(this),
0,
abi.encodeWithSignature(
Expand Down
6 changes: 5 additions & 1 deletion contracts/LSP23LinkedContractsDeployment/modules/UniversalProfilePostDeploymentModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.4;

import {
OPERATION_4_DELEGATECALL
} from "@erc725/smart-contracts/contracts/constants.sol";

import {UniversalProfile} from "../../UniversalProfile.sol";

contract UniversalProfilePostDeploymentModule is UniversalProfile {
Expand Down Expand Up @@ -43,7 +47,7 @@ contract UniversalProfilePostDeploymentModule is UniversalProfile {

// call the execute function with delegate_call on the universalProfile contract to setData and transferOwnership
UniversalProfile(payable(universalProfile)).execute(
4,
OPERATION_4_DELEGATECALL,
address(this),
0,
abi.encodeWithSignature(
Expand Down
2 changes: 1 addition & 1 deletion hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const config: HardhatUserConfig = {
// ------------------
'Create2Factory',
'LSP16UniversalFactory',
'LinkedContractsFactory',
'LSP23LinkedContractsFactory',
],
// Whether to include the TypeChain factories or not.
// If this is enabled, you need to run the TypeChain files through the TypeScript compiler before shipping to the registry.
Expand Down
Loading
Loading