(Feature) [xDai] Use generic config by fernandomg · Pull Request #1422 · 5afe/safe-react

fernandomg · 2020-10-02T00:56:05Z

This PR closes #1415, by:

replacing the current environment configs with newly created "generic configs"
updating the config to expose the necessary information added in the network config
adding tests to the config interface

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

…ai-generic-configs

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

…ai-generic-configs

github-actions · 2020-10-02T00:56:21Z

CLA Assistant Lite All Contributors have signed the CLA.

github-actions · 2020-10-02T01:01:31Z

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	19	0
Ignored	10	N/A

Result: ✅ success
Annotations: 19 total

[warning] @typescript-eslint/explicit-module-boundary-types

Require explicit return and argument types on exported functions' and classes' public class methods

src/components/ConnectButton/index.tsx Line 68 - Argument 'props' should be typed.
src/logic/contractInteraction/sources/EtherscanService.ts Line 8 - Missing return type on function.
src/logic/contractInteraction/sources/EtherscanService.ts Line 39 - Argument 'options' should be typed.
src/logic/contractInteraction/sources/EtherscanService.ts Line 43 - Missing return type on function.
src/logic/contractInteraction/sources/EtherscanService.ts Line 43 - Argument 'contractAddress' should be typed.
src/logic/contractInteraction/sources/EtherscanService.ts Line 43 - Argument 'network' should be typed.
src/logic/cookies/utils/index.ts Line 7 - Missing return type on function.
src/logic/cookies/utils/index.ts Line 7 - Argument 'key' should be typed.
src/logic/cookies/utils/index.ts Line 21 - Missing return type on function.
src/logic/cookies/utils/index.ts Line 21 - Argument 'key' should be typed.
src/logic/cookies/utils/index.ts Line 21 - Argument 'value' should be typed.
src/logic/cookies/utils/index.ts Line 21 - Argument 'expirationDays' should be typed.
src/logic/tokens/api/fetchTokenBalanceList.ts Line 5 - Missing return type on function.
src/logic/tokens/api/fetchTokenBalanceList.ts Line 5 - Argument 'safeAddress' should be typed.
src/logic/wallets/store/actions/fetchProvider.ts Line 14 - Missing return type on function.
src/logic/wallets/store/actions/fetchProvider.ts Line 14 - Argument 'dispatch' should be typed.
src/logic/wallets/store/actions/fetchProvider.ts Line 14 - Argument 'provider' should be typed.
src/logic/wallets/utils/walletList.ts Line 59 - Missing return type on function.
src/utils/intercom.ts Line 4 - Missing return type on function.

^{Report generated by eslint-plus-action}

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

…xDai-use-generic-config # Conflicts: # src/config/networks/__tests__/networks.test.ts # src/config/networks/network.d.ts

…ion file Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

- also added 'local' as a network for testing purposes

…etwork'

ghost · 2020-10-02T18:29:46Z

Travis automatic deployment:
https://pr1422--safereact.review.gnosisdev.com/app

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

…ai-use-generic-config # Conflicts: # src/config/networks/__tests__/networks.test.ts # src/config/networks/mainnet.ts # src/config/networks/network.d.ts # src/config/networks/rinkeby.ts # src/config/networks/xdai.ts # src/logic/wallets/getWeb3.ts

ghost · 2020-10-02T20:17:22Z

Travis automatic deployment:
https://pr1422--safereact.review.gnosisdev.com/app

ghost · 2020-10-02T20:25:53Z

Travis automatic deployment:
https://pr1422--safereact.review.gnosisdev.com/app

nicosampler · 2020-10-05T16:32:00Z

src/config/__tests__/config.test.ts

+      NETWORK: 'MAINNET',
+    }))
+    const { getTxServiceUrl, getGnosisSafeAppsUrl } = require('src/config')
+    const TX_SERVICE_URL = 'https://safe-transaction.mainnet.staging.gnosisdev.com/api/v1/'


shouldn't it be taken from src/config/networks/mainnet.ts?

🤔 yes, you're right, as the goal of the test is to verify NODE_ENV and NETWORK values.

ghost · 2020-10-05T17:27:10Z

Travis automatic deployment:
https://pr1422--safereact.review.gnosisdev.com/app

fernandomg and others added 11 commits September 30, 2020 16:33

add network based configs

9ab2060

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

Merge branch 'feature/#1353-xDai-compatibility' into feature/#1414-xD…

fd48894

…ai-generic-configs

Merge branch 'feature/#1353-xDai-compatibility' into feature/#1414-xD…

8adeaf0

…ai-generic-configs

Rename dev config by baseConfig

79fdcd9

use ETHEREUM_NETWORK enum to define the network id

5b90fa9

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

change config keys from CONSTANT_CASE to upperCase

c0859fd

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

replace Host and Url with Uri in config keys

1b39ee1

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

move network config files into a networks directory

79e2a70

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

add tests for config files

ab69f74

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

Merge branch 'feature/#1353-xDai-compatibility' into feature/#1414-xD…

45cb541

…ai-generic-configs

replace current configs with generic configs

7ea7c10

fernandomg self-assigned this Oct 2, 2020

fernandomg assigned matextrem Oct 2, 2020

fernandomg and others added 15 commits October 2, 2020 09:23

fix test description

9e2e755

rename getNetwork to getNetworkId

4cc35e1

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

create getNetworkName function and use it where needed

1f132ef

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

simplify config file and use CONSTANTS where possible

9a467d0

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

update tests

95bd0fb

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

change features' type to boolean

dfd1b2a

replace Uri with Url

dc26462

add networkExplorerName key

35604e7

Merge branch 'feature/#1414-xDai-generic-configs' into feature/#1415-…

d0d7a6d

…xDai-use-generic-config # Conflicts: # src/config/networks/__tests__/networks.test.ts # src/config/networks/network.d.ts

move ETHEREUM_NETWORK enum into config/networks/network.d definit…

4e5e8bf

…ion file Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

rename getxServiceHost to getTxServiceUrl

834f383

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

export all the network config information

3e7f284

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

return proper config based on network and environment variables

b7155a5

- also added 'local' as a network for testing purposes

changed environment discovery to a switch/case statement

cf29302

specify the declaration file on importing from 'src/config/networks/n…

e353434

…etwork'

force uppercase for the NETWORK const

b2fed32

fernandomg and others added 2 commits October 2, 2020 17:01

add tests

feea729

Co-authored-by: Matias Dastugue <matias.dastugue@altoros.com>

fernandomg marked this pull request as ready for review October 2, 2020 20:08

fernandomg requested review from Agupane, dasanra and nicosampler October 2, 2020 20:15

fix typo in dir name

c871d26

Agupane mentioned this pull request Oct 5, 2020

(Feature) [xDai] - Contract interaction abi lookup #1429

Merged

dasanra approved these changes Oct 5, 2020

View reviewed changes

nicosampler reviewed Oct 5, 2020

View reviewed changes

nicosampler approved these changes Oct 5, 2020

View reviewed changes

update tests to use dynamic environment values

6c61d97

fernandomg merged commit ab2d1cf into feature/#1353-xDai-compatibility Oct 5, 2020

fernandomg deleted the feature/#1415-xDai-use-generic-config branch October 5, 2020 17:44

github-actions bot locked and limited conversation to collaborators Oct 5, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Feature) [xDai] Use generic config#1422

(Feature) [xDai] Use generic config#1422
fernandomg merged 31 commits intofeature/#1353-xDai-compatibilityfrom
feature/#1415-xDai-use-generic-config

fernandomg commented Oct 2, 2020 •

edited

Loading

Uh oh!

github-actions bot commented Oct 2, 2020

Uh oh!

github-actions bot commented Oct 2, 2020 •

edited

Loading

Uh oh!

ghost commented Oct 2, 2020

Uh oh!

ghost commented Oct 2, 2020

Uh oh!

ghost commented Oct 2, 2020

Uh oh!

nicosampler Oct 5, 2020

Uh oh!

fernandomg Oct 5, 2020 •

edited

Loading

Uh oh!

ghost commented Oct 5, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

fernandomg commented Oct 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 2, 2020

Uh oh!

github-actions bot commented Oct 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ESLint Summary View Full Report

[warning] @typescript-eslint/explicit-module-boundary-types

Uh oh!

ghost commented Oct 2, 2020

Uh oh!

ghost commented Oct 2, 2020

Uh oh!

ghost commented Oct 2, 2020

Uh oh!

nicosampler Oct 5, 2020

Choose a reason for hiding this comment

Uh oh!

fernandomg Oct 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Oct 5, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fernandomg commented Oct 2, 2020 •

edited

Loading

github-actions bot commented Oct 2, 2020 •

edited

Loading

fernandomg Oct 5, 2020 •

edited

Loading