Skip to content

Commit

Permalink
BACK-7356: remove format=token from EIP-712 schemas (LedgerHQ#196)
Browse files Browse the repository at this point in the history 
* BACK-7356: remove format=token from EIP-712 schemas

* BACK-7356: remove all format=token fields from descriptors

* BACK-7352: Permit EIP-712: switch allowance to `format=amount` (LedgerHQ#197)

Will default to `verifyingContract` as the token ref.

See:
 - https://ledgerhq.atlassian.net/browse/BACK-7352
  • Loading branch information
@jnicoulaud-ledger
jnicoulaud-ledger authored Jun 20, 2024
1 parent 0fdd15a commit b37ea9a
Show file tree
Hide file tree
Showing 43 changed files with 15 additions and 657 deletions.
30 changes: 0 additions & 30 deletions arbitrum/1inch/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,12 @@
"label": "From",
"path": "maker"
},
{
"format": "token",
"label": "Swap Token",
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
"format": "amount",
Expand Down Expand Up @@ -104,22 +94,12 @@
"label": "From",
"path": "maker"
},
{
"format": "token",
"label": "Swap Token",
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
"format": "amount",
Expand Down Expand Up @@ -209,22 +189,12 @@
"label": "From",
"path": "maker"
},
{
"format": "token",
"label": "Swap Token",
"path": "makerAsset"
},
{
"assetPath": "makerAsset",
"format": "amount",
"label": "Swap Amount",
"path": "makingAmount"
},
{
"format": "token",
"label": "Receive Token",
"path": "takerAsset"
},
{
"assetPath": "takerAsset",
"format": "amount",
Expand Down
1 change: 0 additions & 1 deletion arbitrum/eip712.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
},
"format": {
"enum": [
"token",
"amount",
"raw",
"datetime"
Expand Down
2 changes: 2 additions & 0 deletions arbitrum/permit/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"path": "spender"
},
{
"format": "amount",
"label": "Allowance",
"path": "value"
},
Expand Down Expand Up @@ -90,6 +91,7 @@
"path": "spender"
},
{
"format": "amount",
"label": "Allowance",
"path": "value"
},
Expand Down
35 changes: 0 additions & 35 deletions arbitrum/uniswap/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
{
"mapper": {
"fields": [
{
"format": "token",
"label": "Token",
"path": "details.token"
},
{
"assetPath": "details.token",
"format": "amount",
Expand Down Expand Up @@ -88,22 +83,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down Expand Up @@ -244,22 +229,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down Expand Up @@ -416,22 +391,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down
1 change: 0 additions & 1 deletion arbitrum_sepolia/eip712.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
},
"format": {
"enum": [
"token",
"amount",
"raw",
"datetime"
Expand Down
35 changes: 0 additions & 35 deletions arbitrum_sepolia/uniswap/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
{
"mapper": {
"fields": [
{
"format": "token",
"label": "Token",
"path": "details.token"
},
{
"assetPath": "details.token",
"format": "amount",
Expand Down Expand Up @@ -88,22 +83,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down Expand Up @@ -244,22 +229,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down Expand Up @@ -416,22 +391,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down
1 change: 0 additions & 1 deletion avalanche/eip712.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
},
"format": {
"enum": [
"token",
"amount",
"raw",
"datetime"
Expand Down
2 changes: 2 additions & 0 deletions avalanche/permit/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"path": "spender"
},
{
"format": "amount",
"label": "Allowance",
"path": "value"
},
Expand Down Expand Up @@ -90,6 +91,7 @@
"path": "spender"
},
{
"format": "amount",
"label": "Allowance",
"path": "value"
},
Expand Down
35 changes: 0 additions & 35 deletions avalanche/uniswap/eip712.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
{
"mapper": {
"fields": [
{
"format": "token",
"label": "Token",
"path": "details.token"
},
{
"assetPath": "details.token",
"format": "amount",
Expand Down Expand Up @@ -88,22 +83,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down Expand Up @@ -244,22 +229,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down Expand Up @@ -416,22 +391,12 @@
"label": "Spender",
"path": "spender"
},
{
"format": "token",
"label": "Approve token",
"path": "permitted.token"
},
{
"assetPath": "permitted.token",
"format": "amount",
"label": "Approve amount",
"path": "permitted.amount"
},
{
"format": "token",
"label": "Token to swap",
"path": "witness.inputToken"
},
{
"assetPath": "witness.inputToken",
"format": "amount",
Expand Down
1 change: 0 additions & 1 deletion base/eip712.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
},
"format": {
"enum": [
"token",
"amount",
"raw",
"datetime"
Expand Down
Loading

0 comments on commit b37ea9a

Please sign in to comment.