Skip to content

Commit

Permalink
BACK-7120: Fix 1inch fusion EIP-712 token references (#192)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnicoulaud-ledger
jnicoulaud-ledger authored Jun 18, 2024
1 parent 86d5fc9 commit 0f00d0e
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 48 deletions.
20 changes: 10 additions & 10 deletions arbitrum/1inch/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -107,21 +107,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -212,7 +212,7 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
Expand All @@ -223,7 +223,7 @@
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
Expand Down
20 changes: 10 additions & 10 deletions bsc/1inch/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -107,21 +107,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -212,7 +212,7 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
Expand All @@ -223,7 +223,7 @@
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
Expand Down
26 changes: 18 additions & 8 deletions ethereum/1inch/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -105,13 +105,23 @@
"path": "maker"
},
{
"assetPath": "makingToken",
"format": "token",
"label": "Swap Token",
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"assetPath": "takingToken",
"format": "token",
"label": "Receive Token",
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -202,7 +212,7 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
Expand All @@ -213,7 +223,7 @@
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
Expand Down
20 changes: 10 additions & 10 deletions optimism/1inch/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -107,21 +107,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -212,7 +212,7 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
Expand All @@ -223,7 +223,7 @@
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
Expand Down
20 changes: 10 additions & 10 deletions polygon/1inch/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -107,21 +107,21 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makingToken",
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takingToken",
"assetPath": "takerAsset",
"format": "amount",
"label": "Receive Minimum",
"path": "takingAmount"
Expand Down Expand Up @@ -212,7 +212,7 @@
{
"format": "token",
"label": "Swap Token",
"path": "makingToken"
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
Expand All @@ -223,7 +223,7 @@
{
"format": "token",
"label": "Receive Token",
"path": "takingToken"
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
Expand Down

0 comments on commit 0f00d0e

Please sign in to comment.