Skip to content

Commit

Permalink
Merge branch 'develop' into natspec/lsp0
Browse files Browse the repository at this point in the history
  • Loading branch information
CJ42 authored Nov 7, 2023
2 parents 4fadea5 + 9ba0fcd commit b33ac8b
Show file tree
Hide file tree
Showing 20 changed files with 158 additions and 152 deletions.
14 changes: 10 additions & 4 deletions constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,11 @@ export type LSP4DigitalAssetMetadata = {
export type ImageMetadata = {
width: number;
height: number;
verificationFunction: string;
verificationData: string;
verification?: {
method: string;
data: string;
source?: string;
};
url: string;
};

Expand All @@ -134,8 +137,11 @@ export type LinkMetadata = {
};

export type AssetMetadata = {
verificationFunction: string;
verificationData: string;
verification?: {
method: string;
data: string;
source?: string;
};
url: string;
fileType: string;
};
Expand Down
8 changes: 4 additions & 4 deletions docs/contracts/LSP0ERC725Account/LSP0ERC725Account.md
Original file line number Diff line number Diff line change
Expand Up @@ -1481,11 +1481,11 @@ Emitted when the [`universalReceiver`](#universalreceiver) function was called w

| Name | Type | Description |
| ---------------------- | :-------: | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `from` **`indexed`** | `address` | The address of the EOA or smart contract that called the {universalReceiver(...)} function. |
| `value` **`indexed`** | `uint256` | The amount sent to the {universalReceiver(...)} function. |
| `from` **`indexed`** | `address` | The address of the EOA or smart contract that called the [`universalReceiver(...)`](#universalreceiver) function. |
| `value` **`indexed`** | `uint256` | The amount sent to the [`universalReceiver(...)`](#universalreceiver) function. |
| `typeId` **`indexed`** | `bytes32` | A `bytes32` unique identifier (= _"hook"_)that describe the type of notification, information or transaction received by the contract. Can be related to a specific standard or a hook. |
| `receivedData` | `bytes` | Any arbitrary data that was sent to the {universalReceiver(...)} function. |
| `returnedValue` | `bytes` | The value returned by the {universalReceiver(...)} function. |
| `receivedData` | `bytes` | Any arbitrary data that was sent to the [`universalReceiver(...)`](#universalreceiver) function. |
| `returnedValue` | `bytes` | The value returned by the [`universalReceiver(...)`](#universalreceiver) function. |

<br/>

Expand Down
14 changes: 7 additions & 7 deletions docs/contracts/LSP25ExecuteRelayCall/LSP25MultiChannelNonce.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ The address of the signer will be recovered using the LSP25 signature format.

#### Parameters

| Name | Type | Description |
| -------------------- | :-------: | ----------------------------------------------------------------------------------------------------------------------- |
| `signature` | `bytes` | A 65 bytes long signature generated according to the signature format specified in the LSP25 standard. |
| `nonce` | `uint256` | The nonce that the signer used to generate the `signature`. |
| `validityTimestamps` | `uint256` | The validity timestamp that the signer used to generate the signature (See {\_verifyValidityTimestamps} to learn more). |
| `msgValue` | `uint256` | The amount of native tokens intended to be sent for the relay transaction. |
| `callData` | `bytes` | The calldata to execute as a relay transaction that the signer signed for. |
| Name | Type | Description |
| -------------------- | :-------: | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
| `signature` | `bytes` | A 65 bytes long signature generated according to the signature format specified in the LSP25 standard. |
| `nonce` | `uint256` | The nonce that the signer used to generate the `signature`. |
| `validityTimestamps` | `uint256` | The validity timestamp that the signer used to generate the signature (See [`_verifyValidityTimestamps`](#_verifyvaliditytimestamps) to learn more). |
| `msgValue` | `uint256` | The amount of native tokens intended to be sent for the relay transaction. |
| `callData` | `bytes` | The calldata to execute as a relay transaction that the signer signed for. |

#### Returns

Expand Down
Loading

0 comments on commit b33ac8b

Please sign in to comment.