Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Duniter v2S
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
rust
Duniter v2S
Compare revisions
718937c47663d412e7f59e1c92cef60ef798ea8a to 3cb4c309e26959f395fd1e774e0bf4a00eda38a3
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
nodes/rust/duniter-v2s
Select target project
No results found
3cb4c309e26959f395fd1e774e0bf4a00eda38a3
Select Git revision
Swap
Target
nodes/rust/duniter-v2s
Select target project
nodes/rust/duniter-v2s
llaq/lc-core-substrate
pini-gh/duniter-v2s
vincentux/duniter-v2s
mildred/duniter-v2s
d0p1/duniter-v2s
bgallois/duniter-v2s
Nicolas80/duniter-v2s
8 results
718937c47663d412e7f59e1c92cef60ef798ea8a
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (4)
fix: docker-compose volume mount point
· 1ced9bc4
Gilles Filippini
authored
3 years ago
1ced9bc4
feat(chain-spec): handle simple wallets
· 2a381814
Éloïs
authored
2 years ago
2a381814
fix(chain-spec): gen genesis: ensure genesis smiths have balance
· bc911e68
Éloïs
authored
2 years ago
bc911e68
feat(node): support chain spec alias "gdev_local"
· 3cb4c309
Éloïs
authored
2 years ago
3cb4c309
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
node/src/chain_spec/gen_genesis_data.rs
+31
-1
31 additions, 1 deletion
node/src/chain_spec/gen_genesis_data.rs
node/src/command.rs
+1
-1
1 addition, 1 deletion
node/src/command.rs
with
33 additions
and
3 deletions
docker-compose.yml
View file @
3cb4c309
...
@@ -18,7 +18,7 @@ services:
...
@@ -18,7 +18,7 @@ services:
DUNITER_CHAIN_NAME
:
"
dev"
DUNITER_CHAIN_NAME
:
"
dev"
#DUNITER_DISABLE_PROMETHEUS: "false"
#DUNITER_DISABLE_PROMETHEUS: "false"
volumes
:
volumes
:
-
data:/var/lib/
lc-core
-
data:/var/lib/
duniter
volumes
:
volumes
:
data
:
data
:
This diff is collapsed.
Click to expand it.
node/src/chain_spec/gen_genesis_data.rs
View file @
3cb4c309
...
@@ -21,6 +21,8 @@ use std::collections::BTreeMap;
...
@@ -21,6 +21,8 @@ use std::collections::BTreeMap;
type
MembershipData
=
sp_membership
::
MembershipData
<
u32
>
;
type
MembershipData
=
sp_membership
::
MembershipData
<
u32
>
;
const
EXISTENTIAL_DEPOSIT
:
u64
=
100
;
#[derive(Clone)]
#[derive(Clone)]
pub
struct
GenesisData
<
Parameters
:
DeserializeOwned
,
SessionKeys
:
Decode
>
{
pub
struct
GenesisData
<
Parameters
:
DeserializeOwned
,
SessionKeys
:
Decode
>
{
pub
accounts
:
BTreeMap
<
AccountId
,
GenesisAccountData
<
u64
>>
,
pub
accounts
:
BTreeMap
<
AccountId
,
GenesisAccountData
<
u64
>>
,
...
@@ -57,6 +59,8 @@ struct GenesisConfig<Parameters> {
...
@@ -57,6 +59,8 @@ struct GenesisConfig<Parameters> {
#[serde(rename
=
"smiths"
)]
#[serde(rename
=
"smiths"
)]
smith_identities
:
BTreeMap
<
String
,
SmithData
>
,
smith_identities
:
BTreeMap
<
String
,
SmithData
>
,
sudo_key
:
Option
<
AccountId
>
,
sudo_key
:
Option
<
AccountId
>
,
#[serde(default)]
wallets
:
BTreeMap
<
AccountId
,
u64
>
,
}
}
#[derive(Clone,
Deserialize,
Serialize)]
#[derive(Clone,
Deserialize,
Serialize)]
...
@@ -133,6 +137,7 @@ where
...
@@ -133,6 +137,7 @@ where
parameters
,
parameters
,
identities
,
identities
,
smith_identities
,
smith_identities
,
wallets
,
}
=
genesis_config
;
}
=
genesis_config
;
// MONEY AND WOT //
// MONEY AND WOT //
...
@@ -145,13 +150,31 @@ where
...
@@ -145,13 +150,31 @@ where
let
mut
memberships
=
BTreeMap
::
new
();
let
mut
memberships
=
BTreeMap
::
new
();
//let mut total_dust = 0;
//let mut total_dust = 0;
let
mut
ud_accounts
=
BTreeMap
::
new
();
let
mut
ud_accounts
=
BTreeMap
::
new
();
// SIMPLE WALLETS //
let
mut
wallet_index
:
u32
=
0
;
for
(
pubkey
,
balance
)
in
wallets
{
wallet_index
+=
1
;
accounts
.insert
(
pubkey
.clone
(),
GenesisAccountData
{
random_id
:
H256
(
blake2_256
(
&
(
wallet_index
,
&
pubkey
)
.encode
())),
balance
,
is_identity
:
false
,
},
);
}
// IDENTITIES //
for
(
idty_name
,
identity
)
in
&
identities
{
for
(
idty_name
,
identity
)
in
&
identities
{
if
!
validate_idty_name
(
idty_name
)
{
if
!
validate_idty_name
(
idty_name
)
{
return
Err
(
format!
(
"Identity name '{}' is invalid"
,
&
idty_name
));
return
Err
(
format!
(
"Identity name '{}' is invalid"
,
&
idty_name
));
}
}
// Money
// Money
let
balance
=
if
identity
.balance
>=
100
{
let
balance
=
if
identity
.balance
>=
EXISTENTIAL_DEPOSIT
{
identity
.balance
identity
.balance
}
else
{
}
else
{
//total_dust += identity.balance;
//total_dust += identity.balance;
...
@@ -221,6 +244,13 @@ where
...
@@ -221,6 +244,13 @@ where
.get
(
&
idty_name
)
.get
(
&
idty_name
)
.ok_or
(
format!
(
"Identity '{}' not exist"
,
&
idty_name
))
?
;
.ok_or
(
format!
(
"Identity '{}' not exist"
,
&
idty_name
))
?
;
if
identity
.balance
<
EXISTENTIAL_DEPOSIT
{
return
Err
(
format!
(
"Identity '{}' have balance '{}' < EXISTENTIAL_DEPOSIT"
,
idty_name
,
identity
.balance
,
));
}
// Initial authorities
// Initial authorities
initial_authorities
.insert
(
*
idty_index
,
(
identity
.pubkey
.clone
(),
smith_data
.authority
));
initial_authorities
.insert
(
*
idty_index
,
(
identity
.pubkey
.clone
(),
smith_data
.authority
));
...
...
This diff is collapsed.
Click to expand it.
node/src/command.rs
View file @
3cb4c309
...
@@ -59,7 +59,7 @@ impl SubstrateCli for Cli {
...
@@ -59,7 +59,7 @@ impl SubstrateCli for Cli {
#[cfg(feature
=
"gdev"
)]
#[cfg(feature
=
"gdev"
)]
"dev"
=>
Box
::
new
(
chain_spec
::
gdev
::
development_chain_spec
()
?
),
"dev"
=>
Box
::
new
(
chain_spec
::
gdev
::
development_chain_spec
()
?
),
#[cfg(feature
=
"gdev"
)]
#[cfg(feature
=
"gdev"
)]
"local"
=>
Box
::
new
(
chain_spec
::
gdev
::
local_testnet_config
(
1
,
3
,
4
)
?
),
"local"
|
"gdev_local"
=>
Box
::
new
(
chain_spec
::
gdev
::
local_testnet_config
(
1
,
3
,
4
)
?
),
#[cfg(feature
=
"gdev"
)]
#[cfg(feature
=
"gdev"
)]
"local2"
=>
Box
::
new
(
chain_spec
::
gdev
::
local_testnet_config
(
2
,
3
,
4
)
?
),
"local2"
=>
Box
::
new
(
chain_spec
::
gdev
::
local_testnet_config
(
2
,
3
,
4
)
?
),
#[cfg(feature
=
"gdev"
)]
#[cfg(feature
=
"gdev"
)]
...
...
This diff is collapsed.
Click to expand it.