From 8b93c4cb5f7eb2d79f0d781015bf452dba1ad63c Mon Sep 17 00:00:00 2001 From: Dmitriy Creed Date: Thu, 2 Feb 2023 16:05:23 +0300 Subject: [PATCH 1/4] Add fleek CD --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 358c8a116..3b254b6fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,10 +11,10 @@ def pipeline = new org.js.AppPipeline(steps: this, sonarProjectKey: 'jp.co.soramitsu:adar-web', stageDeploy: true, downstreamJob: '../deploy/web-stage1' - // copyToBranches: ['fleek-pre', 'fleek'], - // copyFile: 'env.json', + copyToBranches: ['fleek-pre', 'fleek'], + copyFile: 'env.json', // ipfsHashNotification: true, // fleekDefaultSiteName: 'long-firefly-8047', // ipfsHashChatID: '-1001375555544' ) -pipeline.runPipeline() \ No newline at end of file +pipeline.runPipeline() From 51aa6d36d5846009a7a499226d17a5e2113238e2 Mon Sep 17 00:00:00 2001 From: Dmitriy Creed Date: Thu, 2 Feb 2023 16:12:03 +0300 Subject: [PATCH 2/4] Update env.json --- env.json | 156 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 68 deletions(-) diff --git a/env.json b/env.json index 5f49709a5..d2955dd02 100644 --- a/env.json +++ b/env.json @@ -1,76 +1,96 @@ { - "BASE_API_URL": "", - "API_KEYS": { - "moonpay": "pk_live_LEyw9bsfK0n0v3cdHUaZS1z0qYdDRDu6", - "etherscan": "XBS98SSP8J5FNS7EKQHMHRU94Z2YG7HFFK", - "nftStorage": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDBmMzgwOTMyQTNDODM3ZDNiN2JEYzBBNTc0NmNkMDlBRGIyNUZGMzQiLCJpc3MiOiJuZnQtc3RvcmFnZSIsImlhdCI6MTY0NTU0MDQ4MTQ5OSwibmFtZSI6Im5mdC1zdG9yYWdlLXByb2QifQ.CnW1bq8eWEYQxA6cggGMeAqCTozCJZ6s2oL_bssqnmc" + "BASE_API_URL": "test.polkaswap.io", + "FAUCET_URL": "https://testfaucet.polkaswap.io/", + "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-staging__c29yY", + "API_KEYS": { + "moonpay": "pk_test_4ASGxHKGpLPE6sdQq1V3QjtpUFSpWLk", + "nftStorage": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDBmMzgwOTMyQTNDODM3ZDNiN2JEYzBBNTc0NmNkMDlBRGIyNUZGMzQiLCJpc3MiOiJuZnQtc3RvcmFnZSIsImlhdCI6MTY0MjU4OTQ2ODA4MSwibmFtZSI6Im5mdC1zdG9yYWdlLWRldiJ9.hkvzea9ltcriXXHKoYd3F2Iu1Y8X5H-zunAQboC_3vw", + "etherscan": "UPTTMBUBCE5FIE7XJZYAJ3YZGFE7DA6374" + }, + "FEATURE_FLAGS": { + "moonpay": true, + "charts": true + }, + "DEFAULT_NETWORKS": [ + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-1.s1.stg1.sora2.soramitsu.co.jp" }, - "FEATURE_FLAGS": { - "moonpay": true, - "charts": true, - "soraCard": false + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-2.s1.stg1.sora2.soramitsu.co.jp" }, - "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod-sub4", - "DEFAULT_NETWORKS": [ - { - "chain": "SORA", - "name": "SORA Parliament Ministry of Finance", - "address": "wss://ws.mof.sora.org" - }, - { - "chain": "SORA", - "name": "SORA Parliament Ministry of Finance", - "address": "wss://mof2.sora.org" + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-3.s2.stg1.sora2.soramitsu.co.jp" + }, + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-4.s2.stg1.sora2.soramitsu.co.jp" + }, + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-5.s3.stg1.sora2.soramitsu.co.jp" + }, + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-6.s3.stg1.sora2.soramitsu.co.jp" + }, + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-7.s4.stg1.sora2.soramitsu.co.jp" + }, + { + "chain": "SORA-staging Testnet", + "name": "SORA", + "address": "wss://ws.framenode-8.s5.stg1.sora2.soramitsu.co.jp" + } + ], + "NETWORK_TYPE": "Stage", + "CHAIN_GENESIS_HASH": "0x1a0983c6c9fd3178ae24656bcfca4510a439ab7b90c83e360a1671609752b09a", + "SUB_NETWORKS": [ + { + "name": "ethereum", + "id": 0, + "symbol": "ETH", + "currency": "ETH", + "defaultType": "rinkeby", + "CONTRACTS": { + "XOR": { + "MASTER": "0xcceb41100aa2a9a6f144d7c1f876070b810bf7ae" }, - { - "chain": "SORA", - "name": "SORA Parliament Ministry of Finance", - "address": "wss://mof3.sora.org" + "VAL": { + "MASTER": "0xd7f81ed173cb3af28f983670164df30851fba678" }, - { - "chain": "SORA", - "name": "OnFinality", - "address": "wss://sora.api.onfinality.io/public-ws" + "OTHER": { + "MASTER": "0x78cb1bfd2256515019b03584d66eca516cd5893c" } - ], - "NETWORK_TYPE": "Prod", - "CHAIN_GENESIS_HASH": "0x7e4e32d0feafd4f9c9414b0be86373f9a1efa904809b683453a9af6856d38ad5", - "SUB_NETWORKS": [ - { - "name": "ethereum", - "id": 0, - "symbol": "ETH", - "currency": "ETH", - "defaultType": "main", - "CONTRACTS": { - "XOR": { - "MASTER": "0xc08edf13be9b9cc584c5da8004ce7e6be63c1316" - }, - "VAL": { - "MASTER": "0xd1eeb2f30016fffd746233ee12c486e7ca8efef1" - }, - "OTHER": { - "MASTER": "0x313416870A4da6F12505a550B67bB73c8E21D5d3" - } - } + } + }, + { + "name": "energy", + "id": 1, + "symbol": "VT", + "currency": "VT", + "defaultType": "private", + "CONTRACTS": { + "XOR": { + "MASTER": "" + }, + "VAL": { + "MASTER": "" }, - { - "name": "energy", - "id": 1, - "symbol": "VT", - "currency": "VT", - "defaultType": "private", - "CONTRACTS": { - "XOR": { - "MASTER": "" - }, - "VAL": { - "MASTER": "" - }, - "OTHER": { - "MASTER": "" - } - } + "OTHER": { + "MASTER": "0x906111a433731a563Aa0d0FA871FF93f9A3B3035" } - ] -} \ No newline at end of file + } + } + ] +} From d9cbbabf4d74c1452542ceeded02dd4ac62ff1ac Mon Sep 17 00:00:00 2001 From: Dmitriy Creed Date: Thu, 2 Feb 2023 16:12:29 +0300 Subject: [PATCH 3/4] Update env.json --- env.json | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/env.json b/env.json index d2955dd02..4f645fb82 100644 --- a/env.json +++ b/env.json @@ -12,36 +12,6 @@ "charts": true }, "DEFAULT_NETWORKS": [ - { - "chain": "SORA-staging Testnet", - "name": "SORA", - "address": "wss://ws.framenode-1.s1.stg1.sora2.soramitsu.co.jp" - }, - { - "chain": "SORA-staging Testnet", - "name": "SORA", - "address": "wss://ws.framenode-2.s1.stg1.sora2.soramitsu.co.jp" - }, - { - "chain": "SORA-staging Testnet", - "name": "SORA", - "address": "wss://ws.framenode-3.s2.stg1.sora2.soramitsu.co.jp" - }, - { - "chain": "SORA-staging Testnet", - "name": "SORA", - "address": "wss://ws.framenode-4.s2.stg1.sora2.soramitsu.co.jp" - }, - { - "chain": "SORA-staging Testnet", - "name": "SORA", - "address": "wss://ws.framenode-5.s3.stg1.sora2.soramitsu.co.jp" - }, - { - "chain": "SORA-staging Testnet", - "name": "SORA", - "address": "wss://ws.framenode-6.s3.stg1.sora2.soramitsu.co.jp" - }, { "chain": "SORA-staging Testnet", "name": "SORA", From 0145e81d81e3f90bacc9e891e4f4e341b1934d05 Mon Sep 17 00:00:00 2001 From: Dmitriy Creed Date: Thu, 2 Feb 2023 16:26:25 +0300 Subject: [PATCH 4/4] Update Jenkinsfile --- Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b254b6fe..678702821 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,15 +6,16 @@ def pipeline = new org.js.AppPipeline(steps: this, dockerRegistryCred: 'bot-adar-rw', // buildEnvironment: buildEnvironment, // secretScannerExclusion: 'Jenkinsfile-UCAN', + dockerImageTags: ['adar': 'latest', 'adar-dev': 'dev'], copyStaticToBranch: true, - sonarProjectName: 'adar-web', - sonarProjectKey: 'jp.co.soramitsu:adar-web', + sonarProjectName: 'adar-web', + sonarProjectKey: 'jp.co.soramitsu:adar-web', stageDeploy: true, - downstreamJob: '../deploy/web-stage1' + downstreamJob: '../deploy/web-stage1', copyToBranches: ['fleek-pre', 'fleek'], copyFile: 'env.json', // ipfsHashNotification: true, - // fleekDefaultSiteName: 'long-firefly-8047', + fleekDefaultSiteName: 'dawn-block-3896' // ipfsHashChatID: '-1001375555544' ) pipeline.runPipeline()