BACK-7120: Fix uniswap wrong names in schema (#193)

* BACK-7120: Fix 1inch fusion EIP-712 token references * BACK-7380: fix validator not enforcing ordering of schema types * BACK-7380: remove debug code * BACK-7120: Fix uniswap wrong names in schema
LedgerHQ · Jun 18, 2024 · d005d92 · d005d92
1 parent 0f00d0e
commit d005d92
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 42 deletions.
diff --git a/arbitrum/uniswap/eip712.json b/arbitrum/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/arbitrum_sepolia/uniswap/eip712.json b/arbitrum_sepolia/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/avalanche/uniswap/eip712.json b/avalanche/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/base/uniswap/eip712.json b/base/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/base_sepolia/uniswap/eip712.json b/base_sepolia/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/blast/uniswap/eip712.json b/blast/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/bsc/uniswap/eip712.json b/bsc/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/celo/uniswap/eip712.json b/celo/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/ethereum/uniswap/eip712.json b/ethereum/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/ethereum_sepolia/uniswap/eip712.json b/ethereum_sepolia/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/optimism/uniswap/eip712.json b/optimism/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/optimism_sepolia/uniswap/eip712.json b/optimism_sepolia/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/polygon/uniswap/eip712.json b/polygon/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/polygon_mumbai/uniswap/eip712.json b/polygon_mumbai/uniswap/eip712.json
@@ -442,7 +442,7 @@
  "assetPath": "witness.inputToken",
  "format": "amount",
  "label": "To swap",
- "path": "witness.intStartAmount"
+ "path": "witness.inputStartAmount"
  },
  {
  "format": "token",
@@ -526,11 +526,11 @@
  "type": "address"
  },
  {
- "name": "intStartAmount",
+ "name": "inputStartAmount",
  "type": "uint256"
  },
  {
- "name": "intEndAmount",
+ "name": "inputEndAmount",
  "type": "uint256"
  },
  {

diff --git a/scripts/validation/validators.py b/scripts/validation/validators.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import glob
+import hashlib
 import json
 import logging
 import re
@@ -220,6 +221,11 @@ def _inner_validator(data: str, filename: str) -> Tuple[bool, str]:
 def eip712_schema_validator(data: str, filename: str) -> Tuple[bool, str]:
  try:
  loaded = json.loads(data)
+ for contract in loaded["contracts"]:
+ for message in contract["messages"]:
+ # schema types must be sorted by key for reproducible hashing
+ message["schema"] = dict(sorted(message["schema"].items()))
+
  formatted = json.dumps(loaded, indent=4, sort_keys=True, ensure_ascii=False)
  if formatted != data and (formatted + "\n") != data:
  logger.debug(