Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ĞMixer-py
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pascal Engélibert
ĞMixer-py
Commits
a0ae9040
Commit
a0ae9040
authored
6 years ago
by
Pascal Engélibert
Browse files
Options
Downloads
Patches
Plain Diff
Currency settings
parent
2a9849f5
No related branches found
No related tags found
No related merge requests found
Pipeline
#5715
passed
6 years ago
Stage: deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
server.py
+11
-9
11 additions, 9 deletions
server.py
utils.py
+6
-4
6 additions, 4 deletions
utils.py
with
17 additions
and
13 deletions
server.py
+
11
−
9
View file @
a0ae9040
...
...
@@ -49,12 +49,13 @@ PUBLIC_PORT = BIND_PORT
ID_SALT
=
""
ID_PASSWORD
=
""
BMA_HOSTS
=
[
"
g1.duniter.fr 443
"
,
"
g1.duniter.org 443
"
,
"
g1.presles.fr 443
"
,
"
g1.cgeek.fr 443
"
,
"
ts.g1.librelois.fr 443
"
]
MIX_INTERVAL
=
6
0
MIX_INTERVAL
=
12
0
MIX_MIN_TXS
=
5
# minimum amount of txs to mix
MIX_REQ_AGE_MAX
=
604800
# maximum mix request age before return to sender
PEER_INFO_INTERVAL
=
60
# interval for renewing my peer document
PEER_SIG_AGE_MAX
=
600
# max age of a peer document signature
PEER_INFO_INTERVAL
=
60
0
# interval for renewing my peer document
PEER_SIG_AGE_MAX
=
60
480
0
# max age of a peer document signature
PEER_DETECT_INTERVAL
=
120
# interval for fetching peer list
CURRENCY
=
"
g1
"
def
send_response
(
client
,
code
,
resp
,
dataformat
=
"
ubjson
"
):
if
dataformat
==
"
ubjson
"
:
...
...
@@ -179,6 +180,7 @@ def read_config(cdir, conf_overwrite={}):
utils
.
logprint
(
"
Config: bad JSON => abort
"
,
utils
.
LOG_ERROR
)
exit
(
1
)
conf
.
setdefault
(
"
currency
"
,
CURRENCY
)
conf
.
setdefault
(
"
server
"
,
{})
conf
[
"
server
"
].
setdefault
(
"
bind_host
"
,
BIND_HOST
)
conf
[
"
server
"
].
setdefault
(
"
bind_port
"
,
BIND_PORT
)
...
...
@@ -495,7 +497,7 @@ class ServerThread(Thread):
if
"
new
"
in
url
:
try
:
new_peer
=
utils
.
Peer
(
content
)
new_peer
=
utils
.
Peer
(
self
.
conf
,
content
)
except
Exception
as
e
:
# TODO more specific exceptions
send_response
(
client
,
"
400 Bad Request
"
,
{
"
error
"
:
"
bad_peer
"
},
resp_format
)
utils
.
logprint
(
"
Peer: bad peer:
"
+
str
(
e
),
utils
.
LOG_ERROR
)
...
...
@@ -580,7 +582,7 @@ class ClientThread(Thread):
continue
try
:
new_peer
=
utils
.
Peer
(
data
[
"
info
"
])
new_peer
=
utils
.
Peer
(
self
.
conf
,
data
[
"
info
"
])
except
Exception
as
e
:
print
(
"
Peer detection: info:
"
+
str
(
e
))
new_peers
.
setdefault
(
new_peer
.
hash
,
[])
...
...
@@ -588,7 +590,7 @@ class ClientThread(Thread):
for
raw
in
data
[
"
peers
"
]:
try
:
new_peer
=
utils
.
Peer
(
raw
)
new_peer
=
utils
.
Peer
(
self
.
conf
,
raw
)
except
Exception
as
e
:
utils
.
logprint
(
"
Peer detection:
"
+
str
(
e
),
utils
.
LOG_WARN
)
if
new_peer
.
hash
==
self
.
local_peer
.
hash
:
...
...
@@ -829,7 +831,7 @@ def main():
# Load peers
peers
=
{}
db_peers
=
plyvel
.
DB
(
DIR
+
"
/db_peers
"
,
create_if_missing
=
True
)
utils
.
load_peers
(
db_peers
,
peers
)
utils
.
load_peers
(
conf
,
db_peers
,
peers
)
# Load txs
pool
=
[]
...
...
@@ -933,12 +935,12 @@ if __name__ == "__main__":
# Load peers
peers
=
{}
db_peers
=
plyvel
.
DB
(
DIR
+
"
/db_peers
"
,
create_if_missing
=
True
)
utils
.
load_peers
(
db_peers
,
peers
)
utils
.
load_peers
(
conf
,
db_peers
,
peers
)
# Import peers
for
raw
in
new_peers
:
try
:
new_peer
=
utils
.
Peer
(
raw
)
new_peer
=
utils
.
Peer
(
conf
,
raw
)
except
Exception
as
e
:
# TODO more specific exceptions
print
(
"
Error: invalid peer data:
"
+
str
(
e
))
continue
...
...
This diff is collapsed.
Click to expand it.
utils.py
+
6
−
4
View file @
a0ae9040
...
...
@@ -126,7 +126,7 @@ def getargv(arg:str, default:str="", n:int=1, args:list=sys.argv) -> str:
class
Peer
:
VERSION
=
"
1
"
def
__init__
(
self
,
raw
:
bytes
):
def
__init__
(
self
,
conf
:
dict
,
raw
:
bytes
):
self
.
rectime
=
time
.
time
()
self
.
raw
=
raw
data
=
ubjson
.
loadb
(
raw
)
...
...
@@ -136,6 +136,7 @@ class Peer:
# TODO try except
# TODO tests
assert
data
[
"
currency
"
]
==
conf
[
"
currency
"
]
,
"
Not the same currency
"
self
.
doctype
=
data
[
"
doctype
"
]
self
.
docver
=
data
[
"
docver
"
]
...
...
@@ -156,6 +157,7 @@ class Peer:
data
=
{
"
doctype
"
:
"
peer
"
,
"
docver
"
:
Peer
.
VERSION
,
"
currency
"
:
conf
[
"
currency
"
],
"
pubkey
"
:
keys
.
pubkey
,
"
sigtime
"
:
time
.
time
(),
"
host
"
:
[
conf
[
"
server
"
][
"
public_host
"
],
conf
[
"
server
"
][
"
public_port
"
]],
...
...
@@ -168,11 +170,11 @@ class Peer:
"
raw
"
:
raw
}
raw
=
ubjson
.
dumpb
(
data
)
return
Peer
(
raw
)
return
Peer
(
conf
,
raw
)
def
load_peers
(
db_peers
:
plyvel
.
DB
,
peers
:
dict
):
def
load_peers
(
conf
:
dict
,
db_peers
:
plyvel
.
DB
,
peers
:
dict
):
for
_
,
data
in
db_peers
:
peer
=
Peer
(
data
)
peer
=
Peer
(
conf
,
data
)
peers
[
peer
.
hash
]
=
peer
def
save_peers
(
db_peers
:
plyvel
.
DB
,
peers
:
dict
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment