Merge branch 'fix/1.6/tx_chaining' into '1.6' (31d789bf) · Commits · nodes / typescript / duniter · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

duniter
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Service Desk
- Model experiments

Snippets Groups Projects

31d789bf

Commit 31d789bf authored 7 years ago by Cédric Moreau

Downloads
- Plain Diff

Merge branch 'fix/1.6/tx_chaining' into '1.6'

Fix/1.6/tx chaining

See merge request !1230

parents e843c8e0 d8aa8657

No related branches found

No related tags found

2 merge requests!12331.6,!1230Fix/1.6/tx chaining

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
app/lib/common-libs/constants.ts 2 additions, 0 deletions

app/lib/common-libs/constants.ts
app/lib/indexer.ts 22 additions, 22 deletions

app/lib/indexer.ts
app/lib/rules/index.ts 2 additions, 0 deletions

app/lib/rules/index.ts
app/lib/rules/local_rules.ts 62 additions, 16 deletions

app/lib/rules/local_rules.ts
app/modules/prover/lib/blockGenerator.ts 5 additions, 9 deletions

app/modules/prover/lib/blockGenerator.ts
app/service/BlockchainService.ts 2 additions, 1 deletion

app/service/BlockchainService.ts
app/service/TransactionsService.ts 1 addition, 1 deletion

app/service/TransactionsService.ts
doc/Protocol.md 53 additions, 4 deletions

doc/Protocol.md
test/fast/protocol-local-rule-chained-tx-depth.ts 45 additions, 0 deletions

test/fast/protocol-local-rule-chained-tx-depth.ts
test/integration/transactions-chaining.ts 109 additions, 0 deletions

test/integration/transactions-chaining.ts

with 307 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment