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
0c07764b
Commit
0c07764b
authored
Apr 28, 2022
by
Eriksson Monteiro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix node crash during consensus
parent
61f312ea
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
13 deletions
+20
-13
millix_node/README.md
millix_node/README.md
+1
-1
millix_node/core/config/config.js
millix_node/core/config/config.js
+2
-2
millix_node/core/wallet/wallet-transaction-consensus.js
millix_node/core/wallet/wallet-transaction-consensus.js
+9
-3
millix_node/database/pool/pool.js
millix_node/database/pool/pool.js
+2
-1
millix_node/index.js
millix_node/index.js
+1
-1
millix_node/tangled-advertisement.js
millix_node/tangled-advertisement.js
+5
-5
No files found.
millix_node/README.md
View file @
0c07764b
...
...
@@ -2,7 +2,7 @@
<br>
<a
href=
"#"
><img
src=
"https://github.com/millix/millix-wallet/blob/master/app/icon.png?raw=true"
alt=
"millix node"
width=
"200"
></a>
<br>
millix node
<small>
v1.18.
1
</small>
millix node
<small>
v1.18.
2
</small>
<br>
</h1>
...
...
millix_node/core/config/config.js
View file @
0c07764b
...
...
@@ -779,8 +779,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX = 1500;
export
const
DATABASE_ENGINE
=
'
sqlite
'
;
export
const
DATABASE_CONNECTION
=
{};
export
const
MILLIX_CIRCULATION
=
9
e15
;
export
const
NODE_MILLIX_BUILD_DATE
=
165
0985641
;
export
const
NODE_MILLIX_VERSION
=
'
1.18.
1
-tangled
'
;
export
const
NODE_MILLIX_BUILD_DATE
=
165
1110189
;
export
const
NODE_MILLIX_VERSION
=
'
1.18.
2
-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/core/wallet/wallet-transaction-consensus.js
View file @
0c07764b
...
...
@@ -1011,9 +1011,10 @@ export class WalletTransactionConsensus {
cache
.
removeCacheItem
(
'
validation
'
,
transactionID
);
consensusData
.
active
=
false
;
if
(
transaction
)
{
if
(
transaction
)
{
walletSync
.
syncTransactionSpendingOutputs
(
transaction
,
config
.
MODE_NODE_SYNC_FULL
);
}
else
{
}
else
{
console
.
log
(
'
[wallet-transaction-consensus] unexpected null transaction object detected
'
);
}
...
...
@@ -1150,12 +1151,17 @@ export class WalletTransactionConsensus {
pendingTransaction
=
rejectedTransactions
[
0
];
}
const
transactionID
=
pendingTransaction
.
transaction_id
;
if
(
!
pendingTransaction
)
{
console
.
log
(
'
[wallet-transaction-consensus] no pending funds available for validation.
'
);
return
;
}
else
if
(
this
.
_transactionRetryValidation
[
transactionID
])
{
console
.
log
(
'
[wallet-transaction-consensus] already active for transaction
'
,
transactionID
);
return
;
}
const
transactionID
=
pendingTransaction
.
transaction_id
;
console
.
log
(
'
[wallet-transaction-consensus] starting consensus round for
'
,
transactionID
);
this
.
_transactionRetryValidation
[
transactionID
]
=
Date
.
now
();
...
...
millix_node/database/pool/pool.js
View file @
0c07764b
...
...
@@ -4,6 +4,7 @@ import async from 'async';
export
class
Pool
{
static
WORKER_MAX
=
32
;
constructor
(
databaseFolder
,
databaseName
,
initScriptFile
,
size
)
{
this
.
initialized
=
false
;
...
...
@@ -13,7 +14,7 @@ export class Pool {
this
.
initScriptFile
=
initScriptFile
;
this
.
workerList
=
[];
this
.
queue
=
[];
this
.
size
=
size
||
os
.
cpus
().
length
;
this
.
size
=
size
||
Math
.
min
(
os
.
cpus
().
length
,
Pool
.
WORKER_MAX
)
;
}
drainQueue
()
{
...
...
millix_node/index.js
View file @
0c07764b
...
...
@@ -130,4 +130,4 @@ logger.initialize().then(() => {
}
});
});
//millix v1.18.
1
-tangled
//millix v1.18.
2
-tangled
millix_node/tangled-advertisement.js
View file @
0c07764b
This diff is collapsed.
Click to expand it.
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