From 55d4c38e4e75a89265bcc9e5e2101fccf4ca2a3d Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Thu, 20 Jun 2024 14:59:56 -0400 Subject: [PATCH 1/4] Change currency units --- runtime/src/constants.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/runtime/src/constants.rs b/runtime/src/constants.rs index e929b202d..0527f4825 100644 --- a/runtime/src/constants.rs +++ b/runtime/src/constants.rs @@ -34,9 +34,11 @@ pub mod currency { use crate::Balance; - pub const MILLICENTS: Balance = 1_000_000_000; - pub const CENTS: Balance = 1_000 * MILLICENTS; // assume this is worth about a cent. - pub const DOLLARS: Balance = 100 * CENTS; + pub const UNITS: Balance = 10_000_000_000; + pub const DOLLARS: Balance = UNITS; // 10_000_000_000 + pub const GRAND: Balance = DOLLARS * 1_000; // 10_000_000_000_000 + pub const CENTS: Balance = DOLLARS / 100; // 100_000_000 + pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000 pub const fn deposit(items: u32, bytes: u32) -> Balance { items as Balance * 15 * CENTS + (bytes as Balance) * 6 * CENTS From 2aa76771692e3e78b0fe4703df9029251cc956b9 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Thu, 20 Jun 2024 15:02:05 -0400 Subject: [PATCH 2/4] clean --- CHANGELOG.md | 1 + crates/client/entropy_metadata.scale | Bin 204290 -> 204290 bytes runtime/src/constants.rs | 8 ++++---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 106931eb3..9994ddfa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ At the moment this project **does not** adhere to - Move TSS mnemonic out of keystore [#853](https://github.com/entropyxyz/entropy-core/pull/853) - Prepare test CLI for use in Programs repo ([#856](https://github.com/entropyxyz/entropy-core/pull/856)) - Replace timestamp with block number ([#866](https://github.com/entropyxyz/entropy-core/pull/866)) +- Change currency units ([#901](https://github.com/entropyxyz/entropy-core/pull/901)) ## [0.1.0](https://github.com/entropyxyz/entropy-core/compare/release/v0.0.12...release/v0.1.0) - 2024-05-20 diff --git a/crates/client/entropy_metadata.scale b/crates/client/entropy_metadata.scale index cc84a36287d69cf2f15b28e300241dfce1282b50..1f54d684ce77284a6cb98ab22588cb22285d12b2 100644 GIT binary patch delta 445 zcmZqL!_%~fr=f*$3saRI>l5w}CWh_xdQAIS1;K0vI8bn$exZj+bbE>k(@Zgl!s$%j zOwKG1zp^rH_w;5eb7T`(dgTQJ!}g;+Ojo$sUX*!=GcZh_KZ7ZrZM~%zCy>oDlj#ua zfs6_khV7?kGQH!4+P7~x(*gmQ`jj0^0jzF^m4V84?qJGfJt4jVs9b#~(+(E466+=0 zK=G%0nVzwJV%1_~*nVLj6F(DFeEZV_OtY8-A&!8%o8`syiy(I|J5VA> delta 445 zcmZqL!_%~fr=f*$3saRIt3#E*=cw)VdQAIS1;K0vI8bn$exZj+bbE>k(@Zgl!s$%j zOwKFt&uke+E-L+Xv^|$61WiS!OaF zVr4i}J%8Qy(=(ag@j~s}x14E#08D+#4yFLsgnPeBSf}sY!Ia6`@I~R-*6r#$nRc+S zIV1<|KgKxy>0YL1tO~XrmAcz6>|^3*f{Jf{dVpyblOV(qaCfu3n0^uD?xlyBp0lui zm>1$>Iep>@rmw6CtI9>TZ0|nF^odarEDYDeAYeHC!(Jx4>1R$eb+H`?d9RVdxIN|! zlLjN(2N|y0ZyC3Don>-og!<&#IVL+Ms81v>GTml`2E+7UmzYYS0R{A7{PfG0nZ#gT zcz>D677}s>SD2ES!OZDEX4>?>*O?wdbv?ep6eY-TRBz9sjc~WIOqqW06qCsIq?=3& FTmT5pt5yI2 diff --git a/runtime/src/constants.rs b/runtime/src/constants.rs index 0527f4825..80b83aa68 100644 --- a/runtime/src/constants.rs +++ b/runtime/src/constants.rs @@ -35,10 +35,10 @@ pub mod currency { use crate::Balance; pub const UNITS: Balance = 10_000_000_000; - pub const DOLLARS: Balance = UNITS; // 10_000_000_000 - pub const GRAND: Balance = DOLLARS * 1_000; // 10_000_000_000_000 - pub const CENTS: Balance = DOLLARS / 100; // 100_000_000 - pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000 + pub const DOLLARS: Balance = UNITS; // 10_000_000_000 + pub const GRAND: Balance = DOLLARS * 1_000; // 10_000_000_000_000 + pub const CENTS: Balance = DOLLARS / 100; // 100_000_000 + pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000 pub const fn deposit(items: u32, bytes: u32) -> Balance { items as Balance * 15 * CENTS + (bytes as Balance) * 6 * CENTS From ad637432309ef0627cd4f3a2764cfc9eec967349 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Fri, 21 Jun 2024 13:05:59 -0400 Subject: [PATCH 3/4] add chain properties to all chains --- node/cli/src/chain_spec/dev.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node/cli/src/chain_spec/dev.rs b/node/cli/src/chain_spec/dev.rs index 581ceab5c..0dacbac27 100644 --- a/node/cli/src/chain_spec/dev.rs +++ b/node/cli/src/chain_spec/dev.rs @@ -46,6 +46,7 @@ pub fn development_config() -> ChainSpec { .with_name("Development") .with_id("dev") .with_chain_type(ChainType::Development) + .with_properties(crate::chain_spec::entropy_properties()) .with_genesis_config_patch(development_genesis_config( vec![ crate::chain_spec::authority_keys_from_seed("Alice"), @@ -67,6 +68,7 @@ pub fn devnet_local_config() -> crate::chain_spec::ChainSpec { ChainSpec::builder(wasm_binary_unwrap(), Default::default()) .with_name("Devnet Local") .with_id("devnet_local") + .with_properties(crate::chain_spec::entropy_properties()) .with_chain_type(ChainType::Development) .with_genesis_config_patch(development_genesis_config( vec![ From 8f33627f7bf9589560bf059cdcbc9ffeac6a64a2 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Fri, 21 Jun 2024 13:09:56 -0400 Subject: [PATCH 4/4] fix comment --- crates/shared/src/constants.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/shared/src/constants.rs b/crates/shared/src/constants.rs index b4b137f0d..02720885b 100644 --- a/crates/shared/src/constants.rs +++ b/crates/shared/src/constants.rs @@ -29,8 +29,8 @@ lazy_static! { pub const SIGNING_PARTY_SIZE: usize = 2; -// min balance 12 decimal chain = 0.1 -pub const MIN_BALANCE: u128 = 10000000000; +// min balance 10 decimal chain = 1 +pub const MIN_BALANCE: u128 = 10_000_000_000; // 6 seconds a block this is one day /// The amount of blocks before a tx request is pruned from the kvdb