From 0f00d0e694a0394fd6575793ab0fee77e2047b6a Mon Sep 17 00:00:00 2001 From: jnicoulaud-ledger <102984500+jnicoulaud-ledger@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:39:58 +0200 Subject: [PATCH] BACK-7120: Fix 1inch fusion EIP-712 token references (#192) --- arbitrum/1inch/eip712.json | 20 ++++++++++---------- bsc/1inch/eip712.json | 20 ++++++++++---------- ethereum/1inch/eip712.json | 26 ++++++++++++++++++-------- optimism/1inch/eip712.json | 20 ++++++++++---------- polygon/1inch/eip712.json | 20 ++++++++++---------- 5 files changed, 58 insertions(+), 48 deletions(-) diff --git a/arbitrum/1inch/eip712.json b/arbitrum/1inch/eip712.json index 8f9c645a..b2116676 100644 --- a/arbitrum/1inch/eip712.json +++ b/arbitrum/1inch/eip712.json @@ -16,10 +16,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -27,10 +27,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -107,10 +107,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -118,10 +118,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -212,7 +212,7 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { "assetPath": "makerAsset", @@ -223,7 +223,7 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { "assetPath": "takerAsset", diff --git a/bsc/1inch/eip712.json b/bsc/1inch/eip712.json index 08d6c9e0..e747fc87 100644 --- a/bsc/1inch/eip712.json +++ b/bsc/1inch/eip712.json @@ -16,10 +16,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -27,10 +27,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -107,10 +107,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -118,10 +118,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -212,7 +212,7 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { "assetPath": "makerAsset", @@ -223,7 +223,7 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { "assetPath": "takerAsset", diff --git a/ethereum/1inch/eip712.json b/ethereum/1inch/eip712.json index 2427ecc4..9f3b0a19 100644 --- a/ethereum/1inch/eip712.json +++ b/ethereum/1inch/eip712.json @@ -16,10 +16,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -27,10 +27,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -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" @@ -202,7 +212,7 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { "assetPath": "makerAsset", @@ -213,7 +223,7 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { "assetPath": "takerAsset", diff --git a/optimism/1inch/eip712.json b/optimism/1inch/eip712.json index e196c080..3a4c3be1 100644 --- a/optimism/1inch/eip712.json +++ b/optimism/1inch/eip712.json @@ -16,10 +16,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -27,10 +27,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -107,10 +107,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -118,10 +118,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -212,7 +212,7 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { "assetPath": "makerAsset", @@ -223,7 +223,7 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { "assetPath": "takerAsset", diff --git a/polygon/1inch/eip712.json b/polygon/1inch/eip712.json index 97d814c4..60f121f0 100644 --- a/polygon/1inch/eip712.json +++ b/polygon/1inch/eip712.json @@ -16,10 +16,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -27,10 +27,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -107,10 +107,10 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { - "assetPath": "makingToken", + "assetPath": "makerAsset", "format": "amount", "label": "Swap Amount", "path": "makingAmount" @@ -118,10 +118,10 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { - "assetPath": "takingToken", + "assetPath": "takerAsset", "format": "amount", "label": "Receive Minimum", "path": "takingAmount" @@ -212,7 +212,7 @@ { "format": "token", "label": "Swap Token", - "path": "makingToken" + "path": "makerAsset" }, { "assetPath": "makerAsset", @@ -223,7 +223,7 @@ { "format": "token", "label": "Receive Token", - "path": "takingToken" + "path": "takerAsset" }, { "assetPath": "takerAsset",