From 4525be98710a3cddf326a596b0965550951f2ffd Mon Sep 17 00:00:00 2001 From: tommy Date: Wed, 11 May 2022 14:56:07 +0100 Subject: [PATCH 1/6] Update QA vars --- common/network-defaults/src/qa.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/network-defaults/src/qa.rs b/common/network-defaults/src/qa.rs index ea004fc221..caf8e18aaa 100644 --- a/common/network-defaults/src/qa.rs +++ b/common/network-defaults/src/qa.rs @@ -3,22 +3,22 @@ use crate::ValidatorDetails; -pub(crate) const BECH32_PREFIX: &str = "nymt"; -pub const DENOM: &str = "unymt"; +pub(crate) const BECH32_PREFIX: &str = "n"; +pub const DENOM: &str = "unym"; -pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "nymt17x6pt4msccvawgxjeg5nmnygttu56tftg5l6j3"; -pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "nymt1t4dmskxea0avvrj8xtmu66hv7dkyg9s8059t3c"; +pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep"; +pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav"; pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = - "nymt17p9rzwnnfxcjp32un9ug7yhhzgtkhvl9f8xzkv"; + "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul1"; pub(crate) const _ETH_CONTRACT_ADDRESS: [u8; 20] = hex_literal::hex!("0000000000000000000000000000000000000000"); pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = hex_literal::hex!("0000000000000000000000000000000000000000"); -pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "nymt1dn52nx8wv9wkqmrvj6tcmdzh4es6jt8tr7f6j9"; +pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n1tfzd4qz3a45u8p4mr5zmzv66457uwjgcl05jdq"; pub(crate) fn validators() -> Vec { vec![ValidatorDetails::new( "https://qa-validator.nymtech.net", - Some("https://qa-validator.nymtech.net/api"), + Some("https://qa-validator-api.nymtech.net/api"), )] } From 11c0e79725d783f00c7744e50b8fb450f1d93fca Mon Sep 17 00:00:00 2001 From: tommy Date: Wed, 11 May 2022 15:03:06 +0100 Subject: [PATCH 2/6] fmt --- common/network-defaults/src/qa.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/network-defaults/src/qa.rs b/common/network-defaults/src/qa.rs index caf8e18aaa..cd7df212de 100644 --- a/common/network-defaults/src/qa.rs +++ b/common/network-defaults/src/qa.rs @@ -6,8 +6,10 @@ use crate::ValidatorDetails; pub(crate) const BECH32_PREFIX: &str = "n"; pub const DENOM: &str = "unym"; -pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep"; -pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav"; +pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = + "n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep"; +pub(crate) const VESTING_CONTRACT_ADDRESS: &str = + "n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav"; pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul1"; pub(crate) const _ETH_CONTRACT_ADDRESS: [u8; 20] = From bcbda8547751b57d71a75eea4128767cb468f9db Mon Sep 17 00:00:00 2001 From: tommy Date: Wed, 11 May 2022 16:01:04 +0100 Subject: [PATCH 3/6] re-map coin type for qa --- nym-wallet/src/utils/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nym-wallet/src/utils/index.ts b/nym-wallet/src/utils/index.ts index 87c14f621c..3c6aa4315a 100644 --- a/nym-wallet/src/utils/index.ts +++ b/nym-wallet/src/utils/index.ts @@ -124,6 +124,11 @@ export const currencyMap = (network?: Network): TCurrency => { minor: 'UNYM', major: 'NYM', }; + case 'QA': + return { + minor: 'UNYM', + major: 'NYM', + }; default: return { minor: 'UNYMT', From a1534d23af83e233334698537ca9b4ac83a52eab Mon Sep 17 00:00:00 2001 From: tommy Date: Wed, 11 May 2022 18:17:49 +0100 Subject: [PATCH 4/6] add correct bech32 address as the network-explorer-api was complaining --- common/network-defaults/src/qa.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/network-defaults/src/qa.rs b/common/network-defaults/src/qa.rs index cd7df212de..5bf6fa1720 100644 --- a/common/network-defaults/src/qa.rs +++ b/common/network-defaults/src/qa.rs @@ -11,7 +11,7 @@ pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav"; pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = - "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul1"; + "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0"; pub(crate) const _ETH_CONTRACT_ADDRESS: [u8; 20] = hex_literal::hex!("0000000000000000000000000000000000000000"); pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = From 1785b10d91a3f877c1f4fe2b5ce48d97d139dbe0 Mon Sep 17 00:00:00 2001 From: tommy Date: Thu, 12 May 2022 10:20:52 +0100 Subject: [PATCH 5/6] clean up --- nym-wallet/src/utils/index.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/nym-wallet/src/utils/index.ts b/nym-wallet/src/utils/index.ts index 3c6aa4315a..0795670f00 100644 --- a/nym-wallet/src/utils/index.ts +++ b/nym-wallet/src/utils/index.ts @@ -119,21 +119,16 @@ export const randomNumberBetween = (min: number, max: number) => { export const currencyMap = (network?: Network): TCurrency => { switch (network) { - case 'MAINNET': + case 'SANDBOX': + return { + minor: 'UNYMT', + major: 'NYMT', + }; + default: return { minor: 'UNYM', major: 'NYM', }; - case 'QA': - return { - minor: 'UNYM', - major: 'NYM', - }; - default: - return { - minor: 'UNYMT', - major: 'NYMT', - }; } }; From 38fcbb7f2e17d924b69aed5a0f7f8d7639f3ef67 Mon Sep 17 00:00:00 2001 From: tommy Date: Thu, 12 May 2022 10:21:37 +0100 Subject: [PATCH 6/6] fmt --- nym-wallet/src/utils/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nym-wallet/src/utils/index.ts b/nym-wallet/src/utils/index.ts index 0795670f00..ca2eaf6091 100644 --- a/nym-wallet/src/utils/index.ts +++ b/nym-wallet/src/utils/index.ts @@ -121,9 +121,9 @@ export const currencyMap = (network?: Network): TCurrency => { switch (network) { case 'SANDBOX': return { - minor: 'UNYMT', - major: 'NYMT', - }; + minor: 'UNYMT', + major: 'NYMT', + }; default: return { minor: 'UNYM',