Skip to content

Commit

Permalink
Merge pull request #248 from ERC725Alliance/develop
Browse files Browse the repository at this point in the history
chore: release 7.0.0
  • Loading branch information
frozeman authored Nov 27, 2023
2 parents aef27d2 + 990aac0 commit 96b6edc
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 15 deletions.
8 changes: 4 additions & 4 deletions docs/ERC-725.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@ _Returns:_ `bytes[]` , array list of returned data of the called function, or th
#### Executed

```solidity
event Executed(uint256 indexed operationType, address indexed target, uint256 indexed value, bytes4 data);
event Executed(uint256 indexed operationType, address indexed target, uint256 value, bytes4 indexed selector);
```

MUST be triggered when `execute` creates a new call using the `operationType` `0`, `3`, `4`.

#### ContractCreated

```solidity
event ContractCreated(uint256 indexed operationType, address indexed contractAddress, uint256 indexed value, bytes32 salt);
event ContractCreated(uint256 indexed operationType, address indexed contractAddress, uint256 value, bytes32 indexed salt);
```

MUST be triggered when `execute` creates a new contract using the `operationType` `1`, `2`.
Expand Down Expand Up @@ -283,8 +283,8 @@ When using the operation type `4` for `delegatecall`, it is important to conside
pragma solidity >=0.5.0 <0.7.0;
interface IERC725X /* is ERC165, ERC173 */ {
event ContractCreated(uint256 indexed operationType, address indexed contractAddress, uint256 indexed value, bytes32 salt);
event Executed(uint256 indexed operationType, address indexed target, uint256 indexed value, bytes4 data);
event ContractCreated(uint256 indexed operationType, address indexed contractAddress, uint256 value, bytes32 indexed salt);
event Executed(uint256 indexed operationType, address indexed target, uint256 value, bytes4 indexed selector);
function execute(uint256 operationType, address target, uint256 value, bytes memory data) external payable returns(bytes memory);
Expand Down
9 changes: 9 additions & 0 deletions implementations/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [7.0.0](https://github.com/ERC725Alliance/ERC725/compare/v6.0.0...v7.0.0) (2023-11-27)

### ⚠ BREAKING CHANGES

### Refactor

- Update `Executed` event in ERC725X to index `selector` instead of `value` ([#246](https://github.com/ERC725Alliance/ERC725/pull/246))
- Update `ContractCreated` event in ERC725X to index `salt` instead of `value` ([#246](https://github.com/ERC725Alliance/ERC725/pull/246))

## [6.0.0](https://github.com/ERC725Alliance/ERC725/compare/v5.2.0...v6.0.0) (2023-10-10)

### ⚠ BREAKING CHANGES
Expand Down
8 changes: 4 additions & 4 deletions implementations/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ const EventSignatures = {
* event ContractCreated(
* uint256 indexed _operation,
* address indexed _contractAddress,
* uint256 indexed _value
* bytes32 _salt
* uint256 _value
* bytes32 indexed _salt
* );
*
* signature = keccak256('ContractCreated(uint256,address,uint256,bytes32)')
Expand All @@ -84,8 +84,8 @@ const EventSignatures = {
* event Executed(
* uint256 indexed _operation,
* address indexed _to,
* uint256 indexed _value,
* bytes4 _data
* uint256 _value,
* bytes4 indexed _selector
* );
*
* signature = keccak256('Executed(uint256,address,uint256,bytes4)')
Expand Down
8 changes: 4 additions & 4 deletions implementations/contracts/interfaces/IERC725X.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ interface IERC725X is IERC165 {
event ContractCreated(
uint256 indexed operationType,
address indexed contractAddress,
uint256 indexed value,
bytes32 salt
uint256 value,
bytes32 indexed salt
);

/**
Expand All @@ -38,8 +38,8 @@ interface IERC725X is IERC165 {
event Executed(
uint256 indexed operationType,
address indexed target,
uint256 indexed value,
bytes4 selector
uint256 value,
bytes4 indexed selector
);

/**
Expand Down
4 changes: 2 additions & 2 deletions implementations/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion implementations/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@erc725/smart-contracts",
"version": "6.0.0",
"version": "7.0.0",
"description": "ERC725 contract implementations",
"homepage": "https://erc725alliance.org",
"repository": {
Expand Down

0 comments on commit 96b6edc

Please sign in to comment.