Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring/44 transaction factory #51

Merged
merged 50 commits into from
Sep 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
c286494
added classes tor state-channel transaction types
marc0olo Mar 10, 2019
f4acf5c
added implementation for native creation of channel transactions
marc0olo Mar 16, 2019
2eb6dc0
merge with current dev-branch
marc0olo Jul 19, 2019
c34f467
added testclass for state channels and updated some javadoc in the tr…
marc0olo Jul 19, 2019
c93f532
fix broken test
marc0olo Jul 19, 2019
a60f752
added javadocs
marc0olo Jul 21, 2019
aec74dd
add OracleRegisterTransaction
marc0olo Jul 21, 2019
8bc8386
add all tx types for oracles and integration test for OracleRegisterTx
marc0olo Jul 21, 2019
9c0eae6
fix swagger file, put logger properties into test/resources and add t…
marc0olo Jul 22, 2019
2eeebc6
add OracleService and provide method to obtain queryId based on pubke…
marc0olo Jul 23, 2019
1f7ad44
added result object facade for accountService
mitch-lbw Jul 27, 2019
f8cdd3a
moved accountresult to service specific domain package
mitch-lbw Jul 27, 2019
a98d2af
reformat
mitch-lbw Jul 27, 2019
77cc83d
add test for a OracleExtendTransaction
marc0olo Jul 31, 2019
f57434b
updated to node v4.1.0 and compiler v3.2.0
marc0olo Aug 4, 2019
509190a
fix docker-compose namespace
marc0olo Aug 4, 2019
e433e23
refactoring: added txModel facade
mitch-lbw Aug 6, 2019
5eb9cd8
Merge remote-tracking branch 'origin/feature/8-oracles-support' into …
mitch-lbw Aug 6, 2019
64bd6ac
added external tag to all methods
mitch-lbw Aug 15, 2019
e9c8af5
initial commit
mitch-lbw Aug 16, 2019
a5ed330
renamed aeternity service, introduced interface
mitch-lbw Aug 18, 2019
211796f
refactored AeternityService
mitch-lbw Aug 19, 2019
6b66eaa
transaction class resolved over model
mitch-lbw Aug 19, 2019
58bb3dc
adapted refactoring to contract and address services
mitch-lbw Aug 19, 2019
bb8e15b
refactored general testing
mitch-lbw Aug 23, 2019
2980342
baseKeyPair retrieval throws RTE if not set, added Info Service to re…
mitch-lbw Aug 24, 2019
a82b78c
Refactored all remaining models
mitch-lbw Aug 24, 2019
889646d
further refactoring for contract deployment
mitch-lbw Aug 25, 2019
85d8c90
Further refactoring for channels
mitch-lbw Aug 25, 2019
de01ded
Refactoring of compiler service
mitch-lbw Aug 25, 2019
f36eed8
Refactoring of contract services and tests
mitch-lbw Aug 25, 2019
a097197
Refactoring of aens services
mitch-lbw Aug 26, 2019
764645d
finished model refactoring
mitch-lbw Aug 28, 2019
1b9cb7c
refactoring: moving models to domain specific packages, wrapped dryru…
mitch-lbw Sep 4, 2019
40a7c04
cleaned result object generation, refactored oracle service results
mitch-lbw Sep 8, 2019
57b041f
refactored compiler service
mitch-lbw Sep 8, 2019
884be78
refactored compiler service
mitch-lbw Sep 8, 2019
c19a782
refactoring info service results
mitch-lbw Sep 8, 2019
c4ec988
Fixed postspend tx nonce, formatting
mitch-lbw Sep 8, 2019
90e8063
increased numtrials
mitch-lbw Sep 9, 2019
72cad9b
added backward mapping of every tx type on info, added async executio…
mitch-lbw Sep 9, 2019
48425fb
Merge branch 'refactoring/44-transaction-factory' of github.com:krypt…
mitch-lbw Sep 9, 2019
a5b47a7
corrected format
mitch-lbw Sep 9, 2019
087819c
fixed closing asnyc twice
mitch-lbw Sep 9, 2019
81f7eb7
rework wait for contract deploy unit test
mitch-lbw Sep 9, 2019
84ccae7
increased success wait time
mitch-lbw Sep 9, 2019
d1bbd09
refactored tests
Sep 10, 2019
73f1284
refactored tests
mitch-lbw Sep 10, 2019
4d228c8
Merge branch 'refactoring/44-transaction-factory' of github.com:krypt…
mitch-lbw Sep 10, 2019
bd7dcf0
adapted txSpendTest
mitch-lbw Sep 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AETERNITY_TAG=v3.3.0
SOPHIA_COMPILER_TAG=v3.0.0
AETERNITY_TAG=v4.1.0
SOPHIA_COMPILER_TAG=v3.2.0
NGINX_TAG=1.13.8
43 changes: 42 additions & 1 deletion api/swagger_aeternity_v3.0.1.yml → api/swagger_aeternity.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
description: 'This is the [Aeternity](https://www.aeternity.com/) node API.'
version: 3.0.1
version: 4.1.0
title: Aeternity node
termsOfService: 'https://www.aeternity.com/terms/'
contact:
Expand Down Expand Up @@ -193,6 +193,7 @@ paths:
/key-blocks:
post:
tags:
- external
- internal
- chain
operationId: PostKeyBlock
Expand Down Expand Up @@ -950,6 +951,7 @@ paths:
/debug/contracts/create:
post:
tags:
- external
- internal
- contract
- debug
Expand Down Expand Up @@ -981,6 +983,7 @@ paths:
/debug/contracts/call:
post:
tags:
- external
- internal
- contract
- debug
Expand Down Expand Up @@ -1012,6 +1015,7 @@ paths:
/debug/oracles/register:
post:
tags:
- external
- internal
- oracle
- debug
Expand Down Expand Up @@ -1043,6 +1047,7 @@ paths:
/debug/oracles/extend:
post:
tags:
- external
- internal
- oracle
- debug
Expand Down Expand Up @@ -1074,6 +1079,7 @@ paths:
/debug/oracles/query:
post:
tags:
- external
- internal
- oracle
- debug
Expand Down Expand Up @@ -1105,6 +1111,7 @@ paths:
/debug/oracles/respond:
post:
tags:
- external
- internal
- oracle
- debug
Expand Down Expand Up @@ -1136,6 +1143,7 @@ paths:
/debug/names/preclaim:
post:
tags:
- external
- internal
- name_service
- debug
Expand Down Expand Up @@ -1165,6 +1173,7 @@ paths:
/debug/names/claim:
post:
tags:
- external
- internal
- name_service
- debug
Expand Down Expand Up @@ -1194,6 +1203,7 @@ paths:
/debug/names/update:
post:
tags:
- external
- internal
- name_service
- debug
Expand Down Expand Up @@ -1223,6 +1233,7 @@ paths:
/debug/names/transfer:
post:
tags:
- external
- internal
- name_service
- debug
Expand Down Expand Up @@ -1252,6 +1263,7 @@ paths:
/debug/names/revoke:
post:
tags:
- external
- internal
- name_service
- debug
Expand Down Expand Up @@ -1281,6 +1293,7 @@ paths:
/debug/transactions/spend:
post:
tags:
- external
- internal
- transaction
- debug
Expand Down Expand Up @@ -1313,6 +1326,7 @@ paths:
/debug/channels/create:
post:
tags:
- external
- internal
- channel
- debug
Expand Down Expand Up @@ -1342,6 +1356,7 @@ paths:
/debug/channels/deposit:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1367,6 +1382,7 @@ paths:
/debug/channels/withdraw:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1392,6 +1408,7 @@ paths:
/debug/channels/snapshot/solo:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1417,6 +1434,7 @@ paths:
/debug/channels/close/mutual:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1442,6 +1460,7 @@ paths:
/debug/channels/close/solo:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1467,6 +1486,7 @@ paths:
/debug/channels/slash:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1492,6 +1512,7 @@ paths:
/debug/channels/settle:
post:
tags:
- external
- internal
- channel
- debug
Expand All @@ -1517,6 +1538,7 @@ paths:
/debug/transactions/pending:
get:
tags:
- external
- internal
- transaction
- debug
Expand All @@ -1532,6 +1554,7 @@ paths:
/debug/names/commitment-id:
get:
tags:
- external
- internal
- name_service
- debug
Expand All @@ -1558,6 +1581,7 @@ paths:
/debug/accounts/beneficiary:
get:
tags:
- external
- internal
- node_info
- debug
Expand All @@ -1577,6 +1601,7 @@ paths:
/debug/accounts/node:
get:
tags:
- external
- internal
- node_info
- debug
Expand All @@ -1596,6 +1621,7 @@ paths:
/debug/peers:
get:
tags:
- external
- internal
- node_info
- debug
Expand All @@ -1615,6 +1641,7 @@ paths:
/debug/transactions/dry-run:
post:
tags:
- external
- internal
- debug
operationId: 'DryRunTxs'
Expand Down Expand Up @@ -1642,6 +1669,7 @@ paths:
/debug/token-supply/height/{height}:
get:
tags:
- external
- internal
- debug
operationId: GetTokenSupplyByHeight
Expand Down Expand Up @@ -2322,6 +2350,10 @@ definitions:
state_hash:
description: 'Root hash of the channel''s internal state tree'
$ref: '#/definitions/EncodedHash'
delegate_ids:
type: array
items:
$ref: '#/definitions/EncodedPubkey'
required:
- initiator_id
- initiator_amount
Expand Down Expand Up @@ -2605,6 +2637,12 @@ definitions:
$ref: '#/definitions/UInt32'
network_id:
type: string
peer_pubkey:
$ref: '#/definitions/EncodedPubkey'
top_key_block_hash:
$ref: '#/definitions/EncodedHash'
top_block_height:
$ref: '#/definitions/UInt64'
required:
- genesis_key_block_hash
- solutions
Expand All @@ -2617,6 +2655,9 @@ definitions:
- peer_count
- pending_transactions_count
- network_id
- peer_pubkey
- top_key_block_hash
- top_block_height
Protocol:
type: object
properties:
Expand Down
Loading