Commit Graph

8824 Commits

Author SHA1 Message Date
Andrzej Cichocki
0aadc037ef Make logging available in IntelliJ between gradle clean and assemble (#929)
* Enforce absence of node from client rpc smokeTest classpath
2017-06-28 09:54:09 +01:00
Andrzej Cichocki
77e1d54c43 Make OGSwapPricingCcpExample runnable from any working directory (#925) 2017-06-27 19:06:14 +01:00
Katarzyna Streich
58da76c052 Network map redesign: Change field types in NodeInfo, move away messaging data from NodeInfo (#921)
* First stage of changing fields in NodeInfo.

Part of work related to NetworkMapService upgrade. Create slots for
multiple IP addresses and legalIdentities per node.

* NodeInfo stores HostAndPort.

Move information specific to messaging layer away from NodeInfo.
Only HostAndPort addresses are stored. Add peer name - peer handle
mapping to MockNetwork to reflect that change.
2017-06-27 18:14:51 +01:00
josecoll
4139cf497d Added vault query as tokenizable service. (#926)
* Added vault query as tokenizable service.

* Add JUnit test to test access of vault query service within a flow.

* Improved JUnit test to correctly validate tokenizable behaviour.

* Minor cleanup
2017-06-27 17:22:06 +01:00
Andrzej Cichocki
c6d1274e47 Add tz to all non-test logging config (#894)
* Use millis comma and pattern= consistently
2017-06-27 16:34:02 +01:00
Katelyn Baker
cb8c19f9a5 Merge pull request #903 from corda/kat-carpent-interfaces
Add Interface synthesis to the carpenter
2017-06-27 15:58:23 +01:00
Andras Slemmer
4f85026dfc Merge remote-tracking branch 'open/master' 2017-06-27 14:45:30 +01:00
Mike Hearn
ddad4e1ac4 Merge branch 'enterprise' into mike-enterprise-merge-june-21st 2017-06-27 13:34:12 +01:00
Andrzej Cichocki
37c918a8f5 BFT tests no longer use NodeBasedTest (#917)
* Move Raft config to the interface
* Inline method only used in 1 test
2017-06-27 11:49:19 +01:00
josecoll
3e124b0b48 Automatically persist Linear and/or FungibleState attributes for quer… (#920)
* Automatically persist Linear and/or FungibleState attributes for querying (even when Contract does not implement QueryableState).

* Return single() state.
2017-06-26 18:01:07 +01:00
Chris Rankin
92c238b2aa Alter logging patterns to a more explicit form. (#918) 2017-06-26 13:24:24 +01:00
Patrick Kuo
4d698372f4 Change binary column to blob since x509 certificate and request have no size limit. (#10)
(cherry picked from commit e0587d6)
2017-06-26 10:29:37 +01:00
Chris Rankin
433a9ab5c3 DemoBench operates exclusively on localhost, so no need for public IP. (#919) 2017-06-26 10:12:48 +01:00
Andrzej Cichocki
27a8f6fc47 Unrwap ExecutionException, use Duration. (#900) 2017-06-23 17:49:17 +01:00
Andrzej Cichocki
a69178ca73 Fix logging that always says zero (#895) 2017-06-23 17:49:07 +01:00
Clinton
cd694b898f Merge pull request #908 from corda/joel-cookbook
Flow cookbook added and merged into flow API page.
2017-06-23 17:23:26 +01:00
Ross Nicoll
14068f1b96 Enforce certificate constraints on all identities
* Enforce that the identity service must always have a root CA specified, which all identities have
certificates signed by (or intermediaries of). Also adds a certificate store to the identity service
for help building/verifying certificate paths.
* Add a certificate store for the CA certificate and intermediaries
* Use the certificate factory directly to build paths rather than assembling them via an interim
API call. After reducing the complexity of the utility API, it's replacing two lines of code,
at which point it seems better to make the behaviour clearer rather than having a function
hide what's actually going on.
2017-06-23 15:18:13 +01:00
josecoll
1866f6ff7f Align CordaRPCOps Vault Query API's for Java/Kotlin with VaultQuery service equivalents. (#914)
Added Kotlin extension functions for ease of use in simplest case.
Added missing Java contractType class (previously was forced cast of ContractState::class)

Fixed generic typing.

Addressed items raised in SA PR review.

Removed 2 blank lines.

Fixed generics typing.

Updates RST doc and grouped API helpers accordingly.
2017-06-23 14:35:55 +01:00
Konstantinos Chalkias
61a24897fe deriveKeyPair renaming 2017-06-23 13:48:21 +01:00
Konstantinos Chalkias
3cabdf4430 Delete not used steps in IRS demo M13 rst (#912) 2017-06-23 13:35:50 +01:00
Joel Dudley
849d5921d3 Updates the cookbook to reflect vault API changes. 2017-06-23 13:31:04 +01:00
Andrius Dagys
7804c68401 Add a config option to toggle auto IP discovery 2017-06-23 13:14:37 +01:00
Konstantinos Chalkias
bf9e2c6f54 M13 changelog (#896) 2017-06-23 13:12:56 +01:00
Konstantinos Chalkias
47eee88f37 Release notes for M13 (#910) 2017-06-23 12:40:06 +01:00
Andrzej Cichocki
cf5b089412 Make 2 tests no longer depend on working directory (#893) 2017-06-23 11:25:49 +01:00
Konstantinos Chalkias
7e34d7b05a SIMM demo Ack CordaSerializable (#911) 2017-06-23 10:44:26 +01:00
Andrzej Cichocki
5233c50098 More specific message when a corda service fails to instantiate. (#901) 2017-06-23 10:17:49 +01:00
Andrzej Cichocki
48bb191ea2 Fix the corda logo, protect it from IDE formatter. (#882) 2017-06-23 10:17:28 +01:00
Katelyn Baker
28b7610e47 IntelliJ reformat of the code 2017-06-23 09:02:00 +01:00
Katelyn Baker
b356220da1 Remove blank line 2017-06-22 16:34:58 +01:00
Katelyn Baker
de9a3da572 Remove warnings 2017-06-22 16:28:02 +01:00
Joel Dudley
e62a54b74d Flow cookbook added and merged into flow API page. 2017-06-22 16:13:54 +01:00
Katelyn Baker
9d2905e125 Review Comments
Refactor generator calls to use a visitor type pattern to avoid duplicating
the class writer boiler plate. Each generate<Type> call passes its own
function to the wrapping class that writes the boiler plate and then
calls back into the type specific methods before returning bacl to
finlaise the class writer and load it into the class loader

Remove unkotlinesq spaces
2017-06-22 16:02:02 +01:00
Joel Dudley
575acd2983 Moves vault API information into the API section. 2017-06-22 15:57:40 +01:00
Clinton
791af7db53 Merge pull request #906 from corda/clint-irsdemojarfix
Including test files in the IRS JAR to add the time change API to the…
2017-06-22 15:52:14 +01:00
Clinton Alexander
a679a7ab0e Including test files in the IRS JAR to add the time change API to the cordapp. 2017-06-22 15:09:07 +01:00
Katelyn Baker
a330360834 Add Interface synthesis to the carpenter
Currently the carpenter only generates concreate classes, add the
ability to also synthesise interfaces and have those interfaces used by
other gnerated classes
2017-06-22 14:31:52 +01:00
Konstantinos Chalkias
6b17a9a948 addDefaultFixes to IRS Demo to make it work (#885) 2017-06-22 11:58:20 +01:00
Andrius Dagys
aaf7de0d02 RPC server: buffer response messages until the client queue is fully set up.
The issue arises when the server restarts, and the client is sometimes
not able to recreate its queue in time, so the server is unable to send
back a response message and just drops it, causing the client to hang.
2017-06-22 11:26:04 +01:00
Andrius Dagys
4f16512dcf Revert "Reverting "Upgrade Artemis to 2.1.0" as the new version seems to introduce a race condition that causes a RPC stability test to randomly hang."
This reverts commit 022fb7b8cb.
2017-06-22 11:26:04 +01:00
josecoll
f8ad5c9d10 Vault Query Service JPA implementation (#840)
* Vault Query Service API implementation using JPA Hibernate

Added queryBy(QueryCriteria) Vault API and Junit tests.

Minor cosmetic API changes following rebase.

Fixes following rebase from master

Upgraded to requery 1.3.1

WIP - removed 'latestOnly' from LinearStateQueryCriteria

WIP - CommercialSchemas V2, V3, V4 testing

WIP - sort out generics handling.

WIP - most general queries completed.

WIP - join queries, contractStateType derivation

WIP - refactoring Requery

WIP - refactored VaultService to extract a VaultQueryService interface (and associated Requery implementation).

WIP - HibernateVaultQuery implementation

WIP - Re-structured all Schema definitions (requery/jpa) and make Hibernate Config reusable.

WIP - Multi-version schema testing, hibernate query testing.

WIP - Custom Criteria and Fungible Criteria impl & testing.

WIP - Kotlin Comparable Generics error

WIP - Party queries all working now

WIP - All VaultQueryTests now working (refactored for AND / OR composition)

WIP - added schema registration in CordaPluginRegistry to enable custom vault queries on arbitrary schemas.

WIP - added new default Sort NULL order to be NONE + added lots more tests for Logical Operator testing.

Mostly identity fixes following rebase from master.

Exception handling and public API cleanup in prep for PR.

Additional tests for Logical Operators; additional tests for NULLS sort ordering; additional logging;

Additional parser to handle Nullable attribute values; added Unary and Collection logical expression handlers

Lots of cleanup: participants; trackBy interfaces; additional fungible tests; parser cleanup and improved support for Java

Removed all traces of Requery implementation.

Further minor cleanup and Junit test fix.

Final identity and schema related identity clean-up.

Revert unrelated changes.

PR review updates: blank lines, isRelevant.

Fixed wiring of updatesPublisher for dynamic trackBy queries.

PR review changes: multi-versioned schema samples and associated dummy contracts moved to test packages.

Fixed problem with sorted queries (not specifying any filterable criteria).

PR review: minor updates to address RP comments.

Typesafe custom query criteria

Cleanup: remove redundant tests.

Further clean-up and make all Java test work successfully.

Remove debugging print statements.

Rebased from master - changes required due to DealState module change.

fixed broken assertion caused by DealState ordering change (different package)

Fixed transaction demarcation issue causing "java.lang.IllegalStateException: Was not expecting to find existing database transaction on current strand"

trackBy() now filters on ContractType and StateStatus (CONSUMED, UNCONSUMED, ALL)

Added tests to exercise RPCOps trackBy and queryBy (RPC smoke test and CordaRPCOps)

Added additional @CordaSerializable annotations.

Updated documentation and referenced sample code.

Added deprecation annotations.

Re-added missing deprecation annotation.

Hibernate debug logging is now configurable and disabled by default.

Introduced common Sort attributes based on the node schemas.

Completely removed NULL_HANDLING sort parameter as this is not supported in JPA.

Revisited and fixed usage of @CordaSerializable.

* Minor fix following rebase from master.

* Remove blank line as per RP PR feedback request.

* Minor Java documentation and example clean-up.

* Disable BFT Notary Service tests.
2017-06-22 10:35:49 +01:00
Mike Hearn
ca8f5050cf Merge branch 'master' into mike-enterprise-merge-june-20th 2017-06-21 19:49:33 +02:00
Katarzyna Streich
c22614ae86 Reduce diffs. 2017-06-21 19:25:51 +02:00
Patrick Kuo
a8d7fe11ea Doorman changes for corda M12 testnet (#5)
* Doorman changes for corda M12

* Address PR issues - remove sun.security from test

* Address PR issues - fixed whitespace, added comments on corda version in doorman
2017-06-21 16:11:48 +01:00
Ross Nicoll
4d66e21f32 Release notes for M13 2017-06-21 14:04:22 +01:00
Ross Nicoll
19ff72a411 Correct ISO country code in names 2017-06-21 14:04:22 +01:00
Joel Dudley
d9d20f2215 Formatting and typos. Groups API docs in sidebar. Renames Persistence to API: Persistence and fixes some links. 2017-06-21 13:55:48 +01:00
Konstantinos Chalkias
d16813597c Update BC to 1.5.7 as it has a fix that reduces timing side-channel attacks on EC operations 2017-06-21 13:42:27 +01:00
Shams Asari
a4e4ecff8a Moved FlowStateMachine into an internal package 2017-06-21 12:19:09 +01:00
Ross Nicoll
a1450b5990 Force certificate keys into a known format before comparing
Force certificate keys into a well known key format before comparing during path validation.
This works around Sun's X509Key class appearing in certificates, which is incomparable to other
key types (i.e. EdDSAKey).
2017-06-21 11:42:55 +01:00