From 1070df81703933c3f45a7f0379fe3479ddeb116f Mon Sep 17 00:00:00 2001 From: jnicoulaud-ledger <102984500+jnicoulaud-ledger@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:50:55 +0200 Subject: [PATCH 1/4] ci: run master workflow on `demo` branch as well (#40) --- .github/workflows/master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 539f0f3..5fcad95 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - demo paths-ignore: - 'developer-preview/**' From a1a3b6e6eb015cd9c8b6559f3d2d1f1939475dfa Mon Sep 17 00:00:00 2001 From: jnicoulaud-ledger <102984500+jnicoulaud-ledger@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:05:25 +0200 Subject: [PATCH 2/4] ci: setup API keys in workflows (#44) * ci: setup API keys in workflows * ci: fix conditions --- .github/workflows/master.yml | 8 ++++++++ .github/workflows/pull_request.yml | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5fcad95..984d58a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -26,6 +26,14 @@ jobs: timeout-minutes: 10 uses: actions/checkout@v4 + - name: Get API keys + timeout-minutes: 10 + shell: bash + run: | + cat << EOF | jq -r 'to_entries[] | select(.key|endswith("_API_KEY")) | "\(.key)=\(.value)"' >> "$GITHUB_ENV" + ${{ toJSON(secrets) }} + EOF + - name: Setup python timeout-minutes: 10 uses: actions/setup-python@v5 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6e58361..2b6b519 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -34,6 +34,15 @@ jobs: registry/**/eip712-*.json registry/**/calldata-*.json + - name: Get API keys + timeout-minutes: 10 + if: steps.changed-descriptor-files.outputs.any_changed == 'true' + shell: bash + run: | + cat << EOF | jq -r 'to_entries[] | select(.key|endswith("_API_KEY")) | "\(.key)=\(.value)"' >> "$GITHUB_ENV" + ${{ toJSON(secrets) }} + EOF + - name: Setup python timeout-minutes: 10 if: steps.changed-descriptor-files.outputs.any_changed == 'true' From 12ff70435486bae0d72225d37996af654f332b0a Mon Sep 17 00:00:00 2001 From: lcastillo-ledger <78589616+lcastillo-ledger@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:19:13 +0200 Subject: [PATCH 3/4] Add excluded fields everywhere (#45) --- ercs/eip712-erc2612-permit.json | 4 ++++ registry/1inch/eip712-1inch-ethereum.json | 4 ++++ .../1inch/eip712-1inch-polygon-aggregation-router.json | 4 ++++ registry/uniswap/eip712-UniswapX-DutchOrder.json | 8 ++++++++ .../uniswap/eip712-UniswapX-ExclusiveDutchOrder.json | 10 ++++++++++ registry/uniswap/eip712-UniswapX-LimitOrder.json | 4 ++++ registry/uniswap/eip712-permit2.json | 6 ++++++ 7 files changed, 40 insertions(+) diff --git a/ercs/eip712-erc2612-permit.json b/ercs/eip712-erc2612-permit.json index 7e4f60e..b566d95 100644 --- a/ercs/eip712-erc2612-permit.json +++ b/ercs/eip712-erc2612-permit.json @@ -81,6 +81,10 @@ "spender", "value" ], + "excluded": [ + "owner", + "nonce" + ], "screens": {} } } diff --git a/registry/1inch/eip712-1inch-ethereum.json b/registry/1inch/eip712-1inch-ethereum.json index 5ade885..4d2524b 100644 --- a/registry/1inch/eip712-1inch-ethereum.json +++ b/registry/1inch/eip712-1inch-ethereum.json @@ -107,6 +107,10 @@ "label": "To", "format": "raw" } + ], + "excluded": [ + "salt", + "makerTraits" ] } } diff --git a/registry/1inch/eip712-1inch-polygon-aggregation-router.json b/registry/1inch/eip712-1inch-polygon-aggregation-router.json index 175e398..db1e593 100644 --- a/registry/1inch/eip712-1inch-polygon-aggregation-router.json +++ b/registry/1inch/eip712-1inch-polygon-aggregation-router.json @@ -107,6 +107,10 @@ "label": "To", "format": "raw" } + ], + "excluded": [ + "salt", + "makerTraits" ] } } diff --git a/registry/uniswap/eip712-UniswapX-DutchOrder.json b/registry/uniswap/eip712-UniswapX-DutchOrder.json index 77bbc2d..debec9e 100644 --- a/registry/uniswap/eip712-UniswapX-DutchOrder.json +++ b/registry/uniswap/eip712-UniswapX-DutchOrder.json @@ -186,6 +186,14 @@ "encoding": "timestamp" } } + ], + "excluded": [ + "nonce", + "witness.info", + "witness.decayStartTime", + "witness.decayEndTime", + "witness.inputEndAmount", + "witness.outputs.[].startAmount" ] } } diff --git a/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json b/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json index 2daf48d..5edac87 100644 --- a/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json +++ b/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json @@ -195,6 +195,16 @@ "encoding": "timestamp" } } + ], + "excluded": [ + "nonce", + "witness.info", + "witness.decayStartTime", + "witness.decayEndTime", + "witness.exclusiveFiller", + "witness.exclusivityOverrideBps", + "witness.inputEndAmount", + "witness.outputs.[].startAmount" ] } } diff --git a/registry/uniswap/eip712-UniswapX-LimitOrder.json b/registry/uniswap/eip712-UniswapX-LimitOrder.json index cd85b61..c8b985a 100644 --- a/registry/uniswap/eip712-UniswapX-LimitOrder.json +++ b/registry/uniswap/eip712-UniswapX-LimitOrder.json @@ -168,6 +168,10 @@ "encoding": "timestamp" } } + ], + "excluded": [ + "nonce", + "witness.info" ] } } diff --git a/registry/uniswap/eip712-permit2.json b/registry/uniswap/eip712-permit2.json index d8f93c3..8f582a6 100644 --- a/registry/uniswap/eip712-permit2.json +++ b/registry/uniswap/eip712-permit2.json @@ -145,6 +145,9 @@ "spender", "details.amount" ], + "excluded": [ + "sigDeadline" + ], "screens": {} }, @@ -183,6 +186,9 @@ "spender", "details" ], + "excluded": [ + "sigDeadline" + ], "screens": {} } } From 02302c5682e66f4b721213389f4a385b17f9209a Mon Sep 17 00:00:00 2001 From: jnicoulaud-ledger <102984500+jnicoulaud-ledger@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:35:02 +0200 Subject: [PATCH 4/4] ci: use `erc7730` from PyPI instead of internal repository (#29) * ci: use `erc7730` from PyPI instead of internal repository see LedgerHQ/python-erc7730#57 * revert to jfrog for master workflow --------- Co-authored-by: lcastillo-ledger <78589616+lcastillo-ledger@users.noreply.github.com> --- .github/workflows/pull_request.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2b6b519..cdd7344 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -5,11 +5,6 @@ on: paths-ignore: - 'developer-preview/**' -permissions: - id-token: write - contents: read - pull-requests: write - concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -51,20 +46,10 @@ jobs: python-version: '3.12' cache: 'pip' - - name: Login to Ledger JFrog - timeout-minutes: 10 - if: steps.changed-descriptor-files.outputs.any_changed == 'true' - uses: LedgerHQ/actions-security/actions/jfrog-login@actions/jfrog-login-1 - - - name: Setup pip - timeout-minutes: 10 - if: steps.changed-descriptor-files.outputs.any_changed == 'true' - run: jf pipc --global --repo-resolve=virtual-pypi-prod-green - - name: Install ERC-7730 library timeout-minutes: 10 if: steps.changed-descriptor-files.outputs.any_changed == 'true' - run: jf pip install erc7730 + run: pip install erc7730 - name: Validate ERC-7730 descriptors changed in pull request timeout-minutes: 10