Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-smart-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
echo "Deploying to: ${{ inputs.network }} with ${{ inputs.environment }} environment"
npm run deploy -- --network ${{ inputs.network }}

- name: Update config.json with ERC1538Proxy address
- name: Update config.json with DiamondProxy address
if: inputs.network != 'hardhat'
run: npx hardhat run scripts/tools/update-config.ts --network ${{ inputs.network }}

Expand Down
2 changes: 1 addition & 1 deletion config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"v5": {
"factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
"factoryType": "createx",
"ERC1538Proxy": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
"DiamondProxy": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <contact@iex.ec>
// SPDX-FileCopyrightText: 2020-2025 IEXEC BLOCKCHAIN TECH <contact@iex.ec>
// SPDX-License-Identifier: Apache-2.0

pragma solidity ^0.6.0;

import "../Store.sol";
import "./interfaces/IOwnable.sol";

// Functions that were declared in ERC1538Store are re-declared here.
// Functions that were declared in ERC2535Store are re-declared here.
// TODO clean this (use LibDiamond)
// - All calls to `owner()` should use `LibDiamond.contractOwner()`.
// TODO rename this contract to `FacetBase`.

abstract contract DelegateBase is Store {
abstract contract FacetBase is Store {
modifier onlyOwner() {
require(_msgSender() == owner(), "Ownable: caller is not the owner");
_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ pragma solidity ^0.8.0;
import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol";
import {Store} from "../Store.v8.sol";

// Functions that were declared in ERC1538Store are re-declared here.
// Functions that were declared in ERC2535Store are re-declared here.
// TODO clean this (use LibDiamond)
// - All calls to `owner()` should use `LibDiamond.contractOwner()`.
// TODO rename this contract to `FacetBase`.

/**
* @title Base contract of all Delegate contracts.
* @dev Every module must inherit from this contract.
* @title Base contract of all Facet contracts.
* @dev Every facet must inherit from this contract.
*/
abstract contract DelegateBase is Store {
abstract contract FacetBase is Store {
modifier onlyOwner() {
require(_msgSender() == owner(), "Ownable: caller is not the owner");
_;
Expand Down
159 changes: 0 additions & 159 deletions contracts/modules/delegates/IexecAccessorsABILegacyDelegate.sol

This file was deleted.

Loading