Merge branch 'master' into paraswap

.github/workflows/master.yml

@@ -4,6 +4,7 @@ on:
  push:
  branches:
  - master
+ - demo
  paths-ignore:
  - 'developer-preview/**'
 
@@ -25,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

.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
@@ -34,6 +29,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'
@@ -42,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

ercs/eip712-erc2612-permit.json

@@ -81,6 +81,10 @@
  "spender",
  "value"
  ],
+ "excluded": [
+ "owner",
+ "nonce"
+ ],
  "screens": {}
  }
  }

registry/1inch/eip712-1inch-ethereum.json

@@ -107,6 +107,10 @@
  "label": "To",
  "format": "raw"
  }
+ ],
+ "excluded": [
+ "salt",
+ "makerTraits"
  ]
  }
  }

registry/1inch/eip712-1inch-polygon-aggregation-router.json

@@ -107,6 +107,10 @@
  "label": "To",
  "format": "raw"
  }
+ ],
+ "excluded": [
+ "salt",
+ "makerTraits"
  ]
  }
  }

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" 
  ]
  }
  }

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"
  ]
  }
  }

registry/uniswap/eip712-UniswapX-LimitOrder.json

@@ -168,6 +168,10 @@
  "encoding": "timestamp"
  }
  }
+ ],
+ "excluded": [
+ "nonce",
+ "witness.info"
  ]
  }
  }

registry/uniswap/eip712-permit2.json

@@ -145,6 +145,9 @@
  "spender",
  "details.amount"
  ],
+ "excluded": [
+ "sigDeadline"
+ ],
  "screens": {}
  },
 
@@ -183,6 +186,9 @@
  "spender",
  "details"
  ],
+ "excluded": [
+ "sigDeadline"
+ ],
  "screens": {}
  }
  }