Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
Merge branch 'LedgerHQ:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
LL782 authored Oct 4, 2024
2 parents 1168962 + c31567f commit 8a9300f
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 62 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,6 @@ concurrency:
cancel-in-progress: true

jobs:
setup_pull_request:
name: 🤖 setup pull request
runs-on: public-ledgerhq-shared-small
timeout-minutes: 10
steps:

- name: Checkout
timeout-minutes: 10
uses: actions/checkout@v4

- name: Add labels
timeout-minutes: 5
uses: actions/labeler@v5

- name: Enforce labels
timeout-minutes: 5
uses: mheap/github-action-required-labels@v5
with:
mode: minimum
count: 1
labels: |
documentation
specifications
descriptors
ci
add_comment: true

validate_descriptors:
name: 🔎 validate descriptors
runs-on: public-ledgerhq-shared-small
Expand All @@ -50,23 +23,6 @@ jobs:
timeout-minutes: 10
uses: actions/checkout@v4

- name: Add labels
timeout-minutes: 5
uses: actions/labeler@v5

- name: Enforce labels
timeout-minutes: 5
uses: mheap/github-action-required-labels@v5
with:
add_comment: true
mode: minimum
count: 1
labels: |
documentation
specifications
descriptors
ci
- name: Get all changed descriptor files
timeout-minutes: 5
id: changed-descriptor-files
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/pull_request_setup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: ✨ pull request setup

on:
pull_request_target:

permissions:
contents: read
pull-requests: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
setup_pull_request:
name: 🤖 setup pull request
runs-on: public-ledgerhq-shared-small
timeout-minutes: 10
steps:

- name: Checkout
timeout-minutes: 10
uses: actions/checkout@v4

- name: Add labels
timeout-minutes: 5
uses: actions/labeler@v5

- name: Enforce labels
timeout-minutes: 5
uses: mheap/github-action-required-labels@v5
with:
mode: minimum
count: 1
labels: |
documentation
specifications
descriptors
ci
add_comment: true
4 changes: 2 additions & 2 deletions registry/uniswap/calldata-UniswapV3Router02.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
},
{
"path": "params.amountOut",
"path": "params.amountOutMinimum",
"label": "Minimum amount to Receive",
"format": "tokenAmount",
"params": {
Expand All @@ -49,7 +49,7 @@
"format": "addressName"
}
],
"required": ["params.amountIn", "params.amountOut", "params.recipient"]
"required": ["params.amountIn", "params.amountOutMinimum", "params.recipient"]
},
"0x04e45aaf": {
"$id": "exactInputSingle",
Expand Down
10 changes: 6 additions & 4 deletions specs/erc-7730.md
Original file line number Diff line number Diff line change
Expand Up @@ -1050,10 +1050,12 @@ When omitted, a wallet MAY use any source to resolve an address.

A wallet MAY verify that a `wallet` address is in fact controlled by the wallet, and reject signing if not the case.

| Source type | Description |
| --- | --- |
| local | Address MAY be replaced with a local name trusted by user. Wallets MAY consider that `local` setting for `sources` is always valid |
| ens | Address MAY be replaced with an associated ENS domain |
Sources values are wallet manufacturer specific. Some example values could be:

| Source type | Description |
|-------------| --- |
| local | Address MAY be replaced with a local name trusted by user. Wallets MAY consider that `local` setting for `sources` is always valid |
| ens | Address MAY be replaced with an associated ENS domain |

### Wallets

Expand Down
27 changes: 15 additions & 12 deletions specs/erc7730-v1.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"main" : {
"title": "Binding Context Section",
"type": "object",
"description": "The binding context is a set constraints that are used to bind the ERC7730 file to a specific structured data being displayed. Currently, supported contexts include contract-specific constraints or EIP712 message specific constraints.",
"description": "The binding context is a set of constraints that are used to bind the ERC7730 file to a specific structured data being displayed. Currently, supported contexts include contract-specific constraints or EIP712 message specific constraints.",

"properties": {
"$id" : {
Expand Down Expand Up @@ -376,7 +376,7 @@
},
"screens": {
"title": "Screens grouping information",
"description": "Screens section is used to group multiple fields to display into screens. Each key is a wallet type name. The format of the screens is wallet type dependent, as well as what can be done (reordering fields, max number of screens, etc..). See each wallet manufacturer documentatio for more information.",
"description": "Screens section is used to group multiple fields to display into screens. Each key is a wallet type name. The format of the screens is wallet type dependent, as well as what can be done (reordering fields, max number of screens, etc...). See each wallet manufacturer documentation for more information.",
"type": "object",

"additionalProperties": {
Expand Down Expand Up @@ -475,7 +475,7 @@
},
"$ref": {
"title": "Internal Definition",
"description": "An internal defintion that should be used as the field formatting defintion. The value is the key in the display definitions section, as a path expression $.display.definitions.DEFINITION_NAME.",
"description": "An internal definition that should be used as the field formatting definition. The value is the key in the display definitions section, as a path expression $.display.definitions.DEFINITION_NAME.",
"type": "string"
},
"params": {
Expand Down Expand Up @@ -627,7 +627,7 @@
{
"title": "integer format",
"const": "duration",
"description": "The field should be displayed as a duration in HH:MM:ss form. Value is interpreted as a number of seconds"
"description": "The field should be displayed as a duration in HH:MM:ss form. Value is interpreted as a number of seconds."
},
{
"title": "integer format",
Expand All @@ -645,18 +645,21 @@
"title": "Address Names Formatting Parameters",
"type": "object",
"properties": {
"type": {
"types": {
"title": "Address Type",
"type": "string",
"description": "The type of address to display. Restrict allowable sources of names and MAY lead to additional checks from wallets.",
"enum": [ "wallet", "eoa", "contract", "token", "nft" ]
"type": "array",
"description": "The types of address to display. Restrict allowable sources of names and MAY lead to additional checks from wallets.",
"items": {
"type": "string",
"enum": [ "wallet", "eoa", "contract", "token", "collection" ]
}
},
"sources": {
"title": "Trusted Sources for names, in order of preferences. See specification for more details on sources values.",
"title": "Trusted Sources",
"description": "Trusted Sources for names, in order of preferences. Sources values are wallet manufacturer specific, example values are \"local\" or \"ens\". See specification for more details on sources values.",
"type": "array",
"items": {
"type": "string",
"enum": [ "local", "ens" ]
"type": "string"
}
}
},
Expand Down Expand Up @@ -745,7 +748,7 @@
},

"unitParameters": {
"title": "Percentage Formatting Parameters",
"title": "Unit Formatting Parameters",
"type": "object",
"properties": {
"base": {
Expand Down

0 comments on commit 8a9300f

Please sign in to comment.