From bfc56df2ab06a77a3765b6ffc29057262d856f8f Mon Sep 17 00:00:00 2001 From: Stefan Popov <17688105+stefashkaa@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:44:01 +0200 Subject: [PATCH 1/4] Fix json config --- env.json | 113 +++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/env.json b/env.json index 5993aeba8..1e5ec8d75 100644 --- a/env.json +++ b/env.json @@ -1,63 +1,62 @@ { - "BASE_API_URL": "", - "API_KEYS": { - "moonpay": "pk_live_LEyw9bsfK0n0v3cdHUaZS1z0qYdDRDu6", - "x1ex": "sprkwdgt-WUQBA5U2", - "etherscan": "XBS98SSP8J5FNS7EKQHMHRU94Z2YG7HFFK", - "nftStorage": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDBmMzgwOTMyQTNDODM3ZDNiN2JEYzBBNTc0NmNkMDlBRGIyNUZGMzQiLCJpc3MiOiJuZnQtc3RvcmFnZSIsImlhdCI6MTY0NTU0MDQ4MTQ5OSwibmFtZSI6Im5mdC1zdG9yYWdlLXByb2QifQ.CnW1bq8eWEYQxA6cggGMeAqCTozCJZ6s2oL_bssqnmc", - "googleApi": "AIzaSyCazdRheGfy7_bwVi0m5UgUYjz7l0c54nM", - "googleClientId": "728106973134-pfmcagr0t4lchepajcp7llp7f1t09lf0.apps.googleusercontent.com" + "BASE_API_URL": "", + "API_KEYS": { + "moonpay": "pk_live_LEyw9bsfK0n0v3cdHUaZS1z0qYdDRDu6", + "x1ex": "sprkwdgt-WUQBA5U2", + "etherscan": "XBS98SSP8J5FNS7EKQHMHRU94Z2YG7HFFK", + "nftStorage": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDBmMzgwOTMyQTNDODM3ZDNiN2JEYzBBNTc0NmNkMDlBRGIyNUZGMzQiLCJpc3MiOiJuZnQtc3RvcmFnZSIsImlhdCI6MTY0NTU0MDQ4MTQ5OSwibmFtZSI6Im5mdC1zdG9yYWdlLXByb2QifQ.CnW1bq8eWEYQxA6cggGMeAqCTozCJZ6s2oL_bssqnmc", + "googleApi": "AIzaSyCazdRheGfy7_bwVi0m5UgUYjz7l0c54nM", + "googleClientId": "728106973134-pfmcagr0t4lchepajcp7llp7f1t09lf0.apps.googleusercontent.com" + }, + "FEATURE_FLAGS": { + "moonpay": true, + "x1ex": true, + "charts": true, + "soraCard": true + }, + "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod-sub4", + "DEFAULT_NETWORKS": [ + { + "chain": "SORA", + "name": "SORA Parliament Ministry of Finance #1", + "address": "wss://ws.mof.sora.org", + "location": "GB" }, - "FEATURE_FLAGS": { - "moonpay": true, - "x1ex": true, - "charts": true, - "soraCard": true + { + "chain": "SORA", + "name": "SORA Parliament Ministry of Finance #2", + "address": "wss://mof2.sora.org", + "location": "SG" }, - "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod-sub4", - "DEFAULT_NETWORKS": [ - { - "chain": "SORA", - "name": "SORA Parliament Ministry of Finance #1", - "address": "wss://ws.mof.sora.org", - "location": "GB" - }, - { - "chain": "SORA", - "name": "SORA Parliament Ministry of Finance #2", - "address": "wss://mof2.sora.org", - "location": "SG" - }, - { - "chain": "SORA", - "name": "SORA Parliament Ministry of Finance #3", - "address": "wss://mof3.sora.org", - "location": "DE" - }, - { - "chain": "SORA", - "name": "OnFinality", - "address": "wss://sora.api.onfinality.io/public-ws", - "location": "JP" - }, - { - "chain": "SORA", - "name": "Soramitsu", - "address": "wss://ws.framenode-0.a1.sora2.soramitsu.co.jp", - "location": "IE" - } - ], - "NETWORK_TYPE": "Prod", - "CHAIN_GENESIS_HASH": "0x7e4e32d0feafd4f9c9414b0be86373f9a1efa904809b683453a9af6856d38ad5", - "SUB_NETWORKS": {}, - "EVM_NETWORKS_IDS": [56, 8217], - "ETH_BRIDGE": { - "evmNetwork": 1, - "address": { - "XOR": "0xc08edf13be9b9cc584c5da8004ce7e6be63c1316", - "VAL": "0xd1eeb2f30016fffd746233ee12c486e7ca8efef1", - "OTHER": "0x313416870A4da6F12505a550B67bB73c8E21D5d3" - } + { + "chain": "SORA", + "name": "SORA Parliament Ministry of Finance #3", + "address": "wss://mof3.sora.org", + "location": "DE" + }, + { + "chain": "SORA", + "name": "OnFinality", + "address": "wss://sora.api.onfinality.io/public-ws", + "location": "JP" + }, + { + "chain": "SORA", + "name": "Soramitsu", + "address": "wss://ws.framenode-0.a1.sora2.soramitsu.co.jp", + "location": "IE" + } + ], + "NETWORK_TYPE": "Prod", + "CHAIN_GENESIS_HASH": "0x7e4e32d0feafd4f9c9414b0be86373f9a1efa904809b683453a9af6856d38ad5", + "SUB_NETWORKS": {}, + "EVM_NETWORKS_IDS": [56, 8217], + "ETH_BRIDGE": { + "evmNetwork": 1, + "address": { + "XOR": "0xc08edf13be9b9cc584c5da8004ce7e6be63c1316", + "VAL": "0xd1eeb2f30016fffd746233ee12c486e7ca8efef1", + "OTHER": "0x313416870A4da6F12505a550B67bB73c8E21D5d3" } } } From 71afe8b19c36f662c51752280c10d8794224ccfa Mon Sep 17 00:00:00 2001 From: Stefan Popov <17688105+stefashkaa@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:55:56 +0200 Subject: [PATCH 2/4] Update package.json --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 869e1966f..8e5597fc2 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,10 @@ "*.{js,jsx,vue,ts,tsx}": [ "vue-cli-service lint", "git add" + ], + "*.{json}": [ + "prettier --write", + "git add" ] } } From affa3efc185b1420c488921d840e48219b0e229f Mon Sep 17 00:00:00 2001 From: Stefan Popov <17688105+stefashkaa@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:56:31 +0200 Subject: [PATCH 3/4] Update env.json --- public/env.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/env.json b/public/env.json index 53eb1b1a3..39b8e8acd 100644 --- a/public/env.json +++ b/public/env.json @@ -43,11 +43,11 @@ "RococoSora": "wss://ws.parachain-collator-1.c1.dev.sora2.soramitsu.co.jp" }, "ETH_BRIDGE": { - "evmNetwork": 11155111, + "evmNetwork": 111551112, "address": { - "XOR": "0x7F62CCd5566c64cfb785f73B3c19653D93e5414c", - "VAL": "0xe2C58207Cc6dF5565044eccffdf7aeb2DAe89647", - "OTHER": "0x401c6A23a44f72151D90878DF0aa86E77fBde0e2" + "XOR": "0x7F62CCd5566c64cfb785f73B3c19653D93e5414c", + "VAL": "0xe2C58207Cc6dF5565044eccffdf7aeb2DAe89647", + "OTHER": "0x401c6A23a44f72151D90878DF0aa86E77fBde0e2" } } } From 0d3ad8910f1f6886305bb2e5a866da4395d52ee1 Mon Sep 17 00:00:00 2001 From: Stefan Popov <17688105+stefashkaa@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:58:00 +0200 Subject: [PATCH 4/4] Test --- package.json | 4 ---- public/env.json | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 8e5597fc2..869e1966f 100644 --- a/package.json +++ b/package.json @@ -105,10 +105,6 @@ "*.{js,jsx,vue,ts,tsx}": [ "vue-cli-service lint", "git add" - ], - "*.{json}": [ - "prettier --write", - "git add" ] } } diff --git a/public/env.json b/public/env.json index 39b8e8acd..53eb1b1a3 100644 --- a/public/env.json +++ b/public/env.json @@ -43,11 +43,11 @@ "RococoSora": "wss://ws.parachain-collator-1.c1.dev.sora2.soramitsu.co.jp" }, "ETH_BRIDGE": { - "evmNetwork": 111551112, + "evmNetwork": 11155111, "address": { - "XOR": "0x7F62CCd5566c64cfb785f73B3c19653D93e5414c", - "VAL": "0xe2C58207Cc6dF5565044eccffdf7aeb2DAe89647", - "OTHER": "0x401c6A23a44f72151D90878DF0aa86E77fBde0e2" + "XOR": "0x7F62CCd5566c64cfb785f73B3c19653D93e5414c", + "VAL": "0xe2C58207Cc6dF5565044eccffdf7aeb2DAe89647", + "OTHER": "0x401c6A23a44f72151D90878DF0aa86E77fBde0e2" } } }