Skip to content

Commit

Permalink
EIP-712: fix Uniswap EIP-712 descriptors using unsupported syntax (#195)
Browse files Browse the repository at this point in the history
Array elements cannot be referenced individually yet. Fallback to what is supported for now
  • Loading branch information
jnicoulaud-ledger authored Jun 19, 2024
1 parent 1644ec6 commit 0fdd15a
Show file tree
Hide file tree
Showing 14 changed files with 252 additions and 378 deletions.
45 changes: 18 additions & 27 deletions arbitrum/uniswap/eip712.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,16 @@
"path": "witness.inputAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].amount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -270,19 +267,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -445,19 +439,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down
45 changes: 18 additions & 27 deletions arbitrum_sepolia/uniswap/eip712.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,16 @@
"path": "witness.inputAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].amount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -270,19 +267,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -445,19 +439,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down
45 changes: 18 additions & 27 deletions avalanche/uniswap/eip712.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,16 @@
"path": "witness.inputAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].amount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -270,19 +267,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -445,19 +439,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down
45 changes: 18 additions & 27 deletions base/uniswap/eip712.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,16 @@
"path": "witness.inputAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].amount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -270,19 +267,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down Expand Up @@ -445,19 +439,16 @@
"path": "witness.inputStartAmount"
},
{
"format": "token",
"label": "Token to receive",
"path": "witness.outputs[-1].token"
"label": "Tokens to receive",
"path": "witness.outputs.[].tokens"
},
{
"assetPath": "witness.outputs[-1].token",
"format": "amount",
"label": "Receive at Minimum",
"path": "witness.outputs[-1].endAmount"
"label": "Minimum amounts to receive",
"path": "witness.outputs.[].amount"
},
{
"label": "On Address",
"path": "witness.outputs[-1].recipient"
"label": "On Addresses",
"path": "witness.outputs.[].recipient"
},
{
"format": "datetime",
Expand Down
Loading

0 comments on commit 0fdd15a

Please sign in to comment.