Skip to content

Commit

Permalink
Merge branch 'main' into update-create-lsp7-token
Browse files Browse the repository at this point in the history
  • Loading branch information
@fhildeb
fhildeb authored Dec 11, 2023
2 parents 79f116b + f0eacc1 commit f389a02
Show file tree
Hide file tree
Showing 47 changed files with 5,092 additions and 916 deletions.
4 changes: 2 additions & 2 deletions docs/contracts/_interface_ids_table.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
| **LSP1UniversalReceiver** | `0x6bb56a14` | Interface of the LSP1 - Universal Receiver standard, an entry function for a contract to receive arbitrary information. |
| **LSP1UniversalReceiverDelegate** | `0xa245bbda` | Interface of the LSP1 - Universal Receiver Delegate standard. |
| **LSP6KeyManager** | `0x23f34c62` | Interface of the LSP6 - Key Manager standard, a contract acting as a controller of an ERC725 Account using predfined permissions. |
| **LSP7DigitalAsset** | `0xdaa746b7` | Interface of the LSP7 - Digital Asset standard, a fungible digital asset. |
| **LSP8IdentifiableDigitalAsset** | `0x30dc5278` | Interface of the LSP8 - Identifiable Digital Asset standard, a non-fungible digital asset. |
| **LSP7DigitalAsset** | `0xb3c4928f` | Interface of the LSP7 - Digital Asset standard, a fungible digital asset. |
| **LSP8IdentifiableDigitalAsset** | `0x3a271706` | Interface of the LSP8 - Identifiable Digital Asset standard, a non-fungible digital asset. |
| **LSP9Vault** | `0x28af17e6` | Interface of LSP9 - Vault standard, a blockchain vault that can hold assets and interact with other smart contracts. |
| **LSP11BasicSocialRecovery** | `0x049a28f1` | Interface of the LSP11 - Basic Social Recovery standard, a contract to recover access control into an account. |
| **LSP14Ownable2Step** | `0x94be5999` | Interface of the LSP14 - Ownable 2-step standard, an extension of the [EIP173] (Ownable) standard with 2-step process to transfer or renounce ownership. |
Expand Down
12 changes: 6 additions & 6 deletions docs/contracts/contracts/ERC725/ERC725.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ mapping(bytes32 => bytes) _store
:::

```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);
```

_Deployed new contract at address `contractAddress` and funded with `value` wei (deployed using opcode: `operationType`)._
Expand All @@ -736,8 +736,8 @@ Emitted when a new contract was created and deployed.
| ------------------------------- | :-------: | ----------------------------------------------------------------------------------------------------------------------------------------- |
| `operationType` **`indexed`** | `uint256` | The opcode used to deploy the contract (`CREATE` or `CREATE2`). |
| `contractAddress` **`indexed`** | `address` | The created contract address. |
| `value` **`indexed`** | `uint256` | The amount of native tokens (in Wei) sent to fund the created contract on deployment. |
| `salt` | `bytes32` | The salt used to deterministically deploy the contract (`CREATE2` only). If `CREATE` opcode is used, the salt value will be `bytes32(0)`. |
| `value` | `uint256` | The amount of native tokens (in Wei) sent to fund the created contract on deployment. |
| `salt` **`indexed`** | `bytes32` | The salt used to deterministically deploy the contract (`CREATE2` only). If `CREATE` opcode is used, the salt value will be `bytes32(0)`. |

<br/>

Expand Down Expand Up @@ -781,7 +781,7 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
:::

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

_Called address `target` using `operationType` with `value` wei and `data`._
Expand All @@ -794,8 +794,8 @@ Emitted when calling an address `target` (EOA or contract) with `value`.
| ----------------------------- | :-------: | ---------------------------------------------------------------------------------------------------- |
| `operationType` **`indexed`** | `uint256` | The low-level call opcode used to call the `target` address (`CALL`, `STATICALL` or `DELEGATECALL`). |
| `target` **`indexed`** | `address` | The address to call. `target` will be unused if a contract is created (operation types 1 and 2). |
| `value` **`indexed`** | `uint256` | The amount of native tokens transferred along the call (in Wei). |
| `selector` | `bytes4` | The first 4 bytes (= function selector) of the data sent with the call. |
| `value` | `uint256` | The amount of native tokens transferred along the call (in Wei). |
| `selector` **`indexed`** | `bytes4` | The first 4 bytes (= function selector) of the data sent with the call. |

<br/>

Expand Down
29 changes: 17 additions & 12 deletions docs/contracts/contracts/LSP0ERC725Account/LSP0ERC725Account.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1115,22 +1115,27 @@ mapping(bytes32 => bytes) _store
function _setData(bytes32 dataKey, bytes dataValue) internal nonpayable;
```

This function overrides the [`ERC725YCore`](#erc725ycore) internal [`_setData`](#_setdata) function to optimize gas usage by emitting only the first 256 bytes of the `dataValue`.
Write a `dataValue` to the underlying ERC725Y storage, represented as a mapping of
`bytes32` data keys mapped to their `bytes` data values.

```solidity
mapping(bytes32 => bytes) _store
```

<blockquote>

**Emitted events:**

- [`DataChanged`](#datachanged) event with only the first 256 bytes of [`dataValue`](#datavalue).
- [`DataChanged`](#datachanged) event emitted after a successful `setData` call.

</blockquote>

#### Parameters

| Name | Type | Description |
| ----------- | :-------: | -------------------------------------- |
| `dataKey` | `bytes32` | The key to store the data value under. |
| `dataValue` | `bytes` | The data value to be stored. |
| Name | Type | Description |
| ----------- | :-------: | ------------------------------------------------------------------------------- |
| `dataKey` | `bytes32` | A bytes32 data key to write the associated `bytes` value to the store. |
| `dataValue` | `bytes` | The `bytes` value to associate with the given `dataKey` in the ERC725Y storage. |

<br/>

Expand Down Expand Up @@ -1286,7 +1291,7 @@ function _revertWithLSP20DefaultError(
:::

```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);
```

_Deployed new contract at address `contractAddress` and funded with `value` wei (deployed using opcode: `operationType`)._
Expand All @@ -1299,8 +1304,8 @@ Emitted when a new contract was created and deployed.
| ------------------------------- | :-------: | ----------------------------------------------------------------------------------------------------------------------------------------- |
| `operationType` **`indexed`** | `uint256` | The opcode used to deploy the contract (`CREATE` or `CREATE2`). |
| `contractAddress` **`indexed`** | `address` | The created contract address. |
| `value` **`indexed`** | `uint256` | The amount of native tokens (in Wei) sent to fund the created contract on deployment. |
| `salt` | `bytes32` | The salt used to deterministically deploy the contract (`CREATE2` only). If `CREATE` opcode is used, the salt value will be `bytes32(0)`. |
| `value` | `uint256` | The amount of native tokens (in Wei) sent to fund the created contract on deployment. |
| `salt` **`indexed`** | `bytes32` | The salt used to deterministically deploy the contract (`CREATE2` only). If `CREATE` opcode is used, the salt value will be `bytes32(0)`. |

<br/>

Expand Down Expand Up @@ -1344,7 +1349,7 @@ Emitted when data at a specific `dataKey` was changed to a new value `dataValue`
:::

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

_Called address `target` using `operationType` with `value` wei and `data`._
Expand All @@ -1357,8 +1362,8 @@ Emitted when calling an address `target` (EOA or contract) with `value`.
| ----------------------------- | :-------: | ---------------------------------------------------------------------------------------------------- |
| `operationType` **`indexed`** | `uint256` | The low-level call opcode used to call the `target` address (`CALL`, `STATICALL` or `DELEGATECALL`). |
| `target` **`indexed`** | `address` | The address to call. `target` will be unused if a contract is created (operation types 1 and 2). |
| `value` **`indexed`** | `uint256` | The amount of native tokens transferred along the call (in Wei). |
| `selector` | `bytes4` | The first 4 bytes (= function selector) of the data sent with the call. |
| `value` | `uint256` | The amount of native tokens transferred along the call (in Wei). |
| `selector` **`indexed`** | `bytes4` | The first 4 bytes (= function selector) of the data sent with the call. |

<br/>

Expand Down
Loading

0 comments on commit f389a02

Please sign in to comment.