Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
tangled
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
eriksson monteiro
tangled
Commits
e35460c2
Commit
e35460c2
authored
Feb 04, 2022
by
Eriksson Monteiro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update millix wallet ui and millix node
parent
a55b0d52
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
12 deletions
+33
-12
chrome/browser/resources/millix/app/static/js/main.chunk.js
chrome/browser/resources/millix/app/static/js/main.chunk.js
+1
-1
chrome/browser/resources/millix/app/static/js/main.chunk.js.map
.../browser/resources/millix/app/static/js/main.chunk.js.map
+1
-1
millix_node/api/4wR3kjTwwC67R94Z/index.js
millix_node/api/4wR3kjTwwC67R94Z/index.js
+2
-2
millix_node/core/config/config.js
millix_node/core/config/config.js
+1
-1
millix_node/database/database.js
millix_node/database/database.js
+27
-6
millix_node/index.js
millix_node/index.js
+1
-1
No files found.
chrome/browser/resources/millix/app/static/js/main.chunk.js
View file @
e35460c2
This source diff could not be displayed because it is too large. You can
view the blob
instead.
chrome/browser/resources/millix/app/static/js/main.chunk.js.map
View file @
e35460c2
This diff is collapsed.
Click to expand it.
millix_node/api/4wR3kjTwwC67R94Z/index.js
View file @
e35460c2
...
...
@@ -25,8 +25,8 @@ class _4wR3kjTwwC67R94Z extends Endpoint {
wallet
.
stop
();
network
.
stop
();
peer
.
stop
();
database
.
runVacuum
()
.
then
(()
=>
database
.
runWallCheckpoint
())
database
.
runVacuum
All
()
.
then
(()
=>
database
.
runWallCheckpoint
All
())
.
then
(()
=>
{
return
wallet
.
initialize
(
true
)
.
then
(()
=>
network
.
initialize
())
...
...
millix_node/core/config/config.js
View file @
e35460c2
...
...
@@ -772,7 +772,7 @@ export const DATABASE_ENGINE = 'sqlite';
export
const
DATABASE_CONNECTION
=
{};
export
const
MILLIX_CIRCULATION
=
9
e15
;
export
const
NODE_MILLIX_BUILD_DATE
=
1640009160
;
export
const
NODE_MILLIX_VERSION
=
'
1.14.
4
-tangled
'
;
export
const
NODE_MILLIX_VERSION
=
'
1.14.
5
-tangled
'
;
export
const
DATA_BASE_DIR_MAIN_NETWORK
=
'
./millix-tangled
'
;
export
const
DATA_BASE_DIR_TEST_NETWORK
=
'
./millix-tangled
'
;
let
DATA_BASE_DIR
=
MODE_TEST_NETWORK
?
DATA_BASE_DIR_TEST_NETWORK
:
DATA_BASE_DIR_MAIN_NETWORK
;
...
...
millix_node/database/database.js
View file @
e35460c2
...
...
@@ -65,7 +65,7 @@ export class Database {
}
else
if
(
key
.
endsWith
(
'
_in
'
))
{
sql
+=
`
${
key
.
substring
(
0
,
key
.
lastIndexOf
(
'
_
'
))}
IN (
${
where
[
key
].
map
(()
=>
'
?
'
).
join
(
'
,
'
)}
)`
;
for
(
let
parameter
of
where
[
key
])
{
for
(
let
parameter
of
where
[
key
])
{
parameters
.
push
(
parameter
);
}
return
;
...
...
@@ -521,11 +521,21 @@ export class Database {
});
}
runWallCheckpoint
()
{
runWallCheckpointAll
()
{
return
new
Promise
(
resolve
=>
{
async
.
eachSeries
(
_
.
keys
(
this
.
shards
),
(
shardID
,
callback
)
=>
{
Database
.
runWallCheckpoint
(
this
.
shards
[
shardID
].
database
)
.
then
(
callback
)
.
catch
(
callback
);
},
()
=>
resolve
());
});
}
static
runWallCheckpoint
(
db
)
{
return
new
Promise
(
resolve
=>
{
mutex
.
lock
([
'
transaction
'
],
(
unlock
)
=>
{
console
.
log
(
'
[database] locking for wal checkpoint
'
);
this
.
databaseMillix
.
run
(
'
PRAGMA wal_checkpoint(TRUNCATE)
'
,
function
(
err
)
{
db
.
run
(
'
PRAGMA wal_checkpoint(TRUNCATE)
'
,
function
(
err
)
{
if
(
err
)
{
console
.
log
(
'
[database] wal checkpoint error
'
,
err
);
}
...
...
@@ -539,11 +549,21 @@ export class Database {
});
}
runVacuum
()
{
runVacuumAll
()
{
return
new
Promise
(
resolve
=>
{
async
.
eachSeries
(
_
.
keys
(
this
.
shards
),
(
shardID
,
callback
)
=>
{
Database
.
runVacuum
(
this
.
shards
[
shardID
].
database
)
.
then
(
callback
)
.
catch
(
callback
);
},
()
=>
resolve
());
});
}
static
runVacuum
(
db
)
{
return
new
Promise
(
resolve
=>
{
mutex
.
lock
([
'
transaction
'
],
(
unlock
)
=>
{
console
.
log
(
'
[database] locking for vacuum
'
);
this
.
databaseMillix
.
run
(
'
VACUUM; PRAGMA wal_checkpoint(TRUNCATE);
'
,
function
(
err
)
{
db
.
run
(
'
VACUUM; PRAGMA wal_checkpoint(TRUNCATE);
'
,
function
(
err
)
{
if
(
err
)
{
console
.
log
(
'
[database] vacuum error
'
,
err
);
}
...
...
@@ -620,7 +640,8 @@ export class Database {
.
then
(()
=>
this
.
_initializeJobEngineSqlite3
())
.
then
(()
=>
this
.
_migrateTables
())
.
then
(()
=>
this
.
_initializeShards
())
.
then
(()
=>
this
.
_initializeTables
());
.
then
(()
=>
this
.
_initializeTables
())
.
then
(()
=>
this
.
runWallCheckpointAll
());
}
return
Promise
.
resolve
();
}
...
...
millix_node/index.js
View file @
e35460c2
...
...
@@ -126,6 +126,6 @@ db.initialize()
});
}
});
//millix v1.14.
4
-tangled
//millix v1.14.
5
-tangled
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment