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
d1e2fa5e
Commit
d1e2fa5e
authored
Aug 24, 2021
by
Eriksson Monteiro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update millix-node v1.11.4
parent
9e2dddfb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
11 deletions
+13
-11
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
+5
-2
millix_node/database/repositories/transaction.js
millix_node/database/repositories/transaction.js
+3
-4
millix_node/index.js
millix_node/index.js
+1
-1
millix_node/net/network.js
millix_node/net/network.js
+2
-2
No files found.
millix_node/core/config/config.js
View file @
d1e2fa5e
...
...
@@ -774,8 +774,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
=
1629
385375
;
export
const
NODE_MILLIX_VERSION
=
'
1.11.
3
-tangled
'
;
export
const
NODE_MILLIX_BUILD_DATE
=
1629
813663
;
export
const
NODE_MILLIX_VERSION
=
'
1.11.
4
-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 @
d1e2fa5e
...
...
@@ -883,7 +883,9 @@ export class WalletTransactionConsensus {
}
delete
this
.
_consensusRoundState
[
lockerID
];
this
.
_consensusRoundState
[
transactionID
]
=
{};
this
.
_consensusRoundState
[
transactionID
]
=
{
timestamp
:
Date
.
now
()
};
let
unstableDateStart
=
ntp
.
now
();
unstableDateStart
.
setMinutes
(
unstableDateStart
.
getMinutes
()
-
config
.
TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN
);
...
...
@@ -901,7 +903,8 @@ export class WalletTransactionConsensus {
return
(()
=>
{
if
(
unstableDateStart
.
getTime
()
<
pendingTransaction
.
transaction_date
.
getTime
())
{
// if not hibernated yet, we try to do a local validation first
return
this
.
_validateTransaction
(
transactionID
,
null
,
0
);
return
this
.
_validateTransaction
(
transactionID
,
null
,
0
)
.
catch
(()
=>
Promise
.
resolve
());
}
else
{
return
Promise
.
resolve
();
...
...
millix_node/database/repositories/transaction.js
View file @
d1e2fa5e
...
...
@@ -1800,16 +1800,15 @@ export default class Transaction {
FROM transaction_input_chain
WHERE status = 1;
UPDATE 'transaction' AS t
SET is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER)
, status = 2
SET is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER)
WHERE transaction_id IN (SELECT transaction_id FROM transaction_input_chain);
UPDATE transaction_input
SET status = 2,
is_double_spend = 0,
SET is_double_spend = 0,
double_spend_date = NULL
WHERE transaction_id IN
(SELECT transaction_id FROM transaction_input_chain);
UPDATE transaction_output AS o
SET
status = 2,
is_double_spend = 0, double_spend_date = NULL, is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER), is_spent = EXISTS (
SET is_double_spend = 0, double_spend_date = NULL, is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER), is_spent = EXISTS (
SELECT i.output_transaction_id FROM transaction_input i
INNER JOIN transaction_output o2 ON i.transaction_id = o2.transaction_id
WHERE i.output_transaction_id = o.transaction_id AND i.output_position = o.output_position AND
...
...
millix_node/index.js
View file @
d1e2fa5e
...
...
@@ -108,4 +108,4 @@ db.initialize()
});
}
});
//millix v1.11.
3
-tangled
//millix v1.11.
4
-tangled
millix_node/net/network.js
View file @
d1e2fa5e
...
...
@@ -287,11 +287,11 @@ class Network {
database
.
getRepository
(
'
node
'
)
.
listNodes
()
.
then
((
nodes
)
=>
{
async
.
eachSeries
(
nodes
,
(
node
,
callback
)
=>
{
async
.
eachSeries
(
_
.
shuffle
(
nodes
)
,
(
node
,
callback
)
=>
{
this
.
addNode
(
node
.
node_prefix
,
node
.
node_address
,
node
.
node_port
,
node
.
node_port_api
,
node
.
node_id
);
callback
();
},
()
=>
{
_
.
each
(
config
.
NODE_INITIAL_LIST
,
({
host
,
port_protocol
:
port
,
port_api
:
portApi
})
=>
{
_
.
each
(
_
.
shuffle
(
config
.
NODE_INITIAL_LIST
)
,
({
host
,
port_protocol
:
port
,
port_api
:
portApi
})
=>
{
let
prefix
=
config
.
WEBSOCKET_PROTOCOL
;
let
url
=
`
${
prefix
}
://
${
host
}
:
${
port
}
`
;
if
((
!
this
.
_nodeList
[
url
]
||
!
this
.
_nodeList
[
url
].
node_id
)
&&
(
prefix
&&
host
&&
port
&&
portApi
))
{
...
...
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