Commit Graph

180 Commits

Author SHA1 Message Date
Andras Slemmer
b354d335a3 Remove extra blank line 2017-10-11 10:35:11 +01:00
Andras Slemmer
c56c9fd455 Add README.md, some docs 2017-10-11 10:06:27 +01:00
Andras Slemmer
16b26970a9 Add kryo-hook javaagent 2017-10-11 09:54:19 +01:00
Tommy Lillehagen
b1fb321230 Reformat files in experimental 2017-10-09 15:26:39 +01:00
Michele Sollecito
0b35a99c5a [CORDA-682]: Claim Jigsaw module names (#1824)
[CORDA-682] Specify Jigsaw module names for all JAR projects.
2017-10-06 15:37:33 +01:00
Andrzej Cichocki
9874e1ff34 uncheckedCast crusade (#1667) 2017-09-27 12:58:48 +01:00
Clinton
532bbb5cca Contract constraints (#1518)
* Contract constraints and attachment loading

Fix compiler warnings.

Fixed IdentitySyncFlowTests in confidential-identities.

Fixes.

Fix AttachmentClassLoaderTests.

Added a TODO.

Renamed cordapp service.

Fix compilation error in java code.

Fix RaftNotaryServiceTests

Fix AttachmentLoadingTest

Fix DistributedServiceTests and LargeTransactionTests.

Add cordapp packages to Verifier tests.

Refactor DummyContractBackdoor back out of internal package.

Resolve compiler warnings.

Consolidate excluding `isolated` project at top-level.

Fix contract attachment serialisation for remote verifier.

Fix integration tests for client:rpc.

Contract constraints and attachment loading

Fix compiler warnings.

Fixed IdentitySyncFlowTests in confidential-identities.

Fixes.

Fix AttachmentClassLoaderTests.

Added a TODO.

Renamed cordapp service.

Fix compilation error in java code.

Fix example compilation.

Fix RaftNotaryServiceTests

Fix AttachmentLoadingTest

Fix DistributedServiceTests and LargeTransactionTests.

Add cordapp packages to Verifier tests.

Refactor DummyContractBackdoor back out of internal package.

Resolve compiler warnings.

Consolidate excluding `isolated` project at top-level.

Fix integration tests for client:rpc.

Fixed issues with node driver and differing ZIPs.

Review changes.

Refactor GeneratedAttachment into node-api module.

Merge branch 'clint/hash-constraint' of https://github.com/corda/corda into clint/hash-constraint

Fixed compile error following rebase.

wip - test to check that app code isn't loaded from attachments sent over the wire.

Use Kotlin copyTo() rather than Apache's IOUtils.

Fixes

more fixes.

Removing unconstrained output.

More fixes.

Fixed another test.

Added missing plugin definition in net.corda.core.node.CordaPluginRegistry: net.corda.finance.contracts.isolated.IsolatedPlugin

Re-added missing magic string used in unit test.

Remove unused FlowSession variable.

* Review fixes.

* More review fixes.

* Moved Cordapp implementation to an internal package.

* More JVMOverloads.
2017-09-25 17:05:18 +01:00
Ross Nicoll
c05e482c8f Change public constant values to Kotlin constants (#1588)
* Make string constants into Kotlin constants

* Add JvmName annotation to KeyStoreUtilities
2017-09-21 15:32:02 +01:00
Michele Sollecito
ea61e6e9d5 [CORDA-461] Remove deprecated APIs. (#1480)
https://r3-cev.atlassian.net/browse/CORDA-461
2017-09-13 15:39:39 +01:00
Ross Nicoll
c18b0ecdc3 Clean up CordaX500Name (#1487)
* Remove unused imports
* Move X500 name generation into test code as it's no longer used in the main code
2017-09-12 13:08:43 +01:00
Clinton
bc6628a072 ContractState now references contract by class name (#1407)
* ContractState's contract type has been moved to TransactionState and is now a string representing the class name of the contract class to allow classloading of arbitrary contracts from custom classloaders.

* Upgraded isolated JAR to new version.
2017-09-11 16:44:18 +01:00
Patrick Kuo
57412d4498 Enforce X500Name format defined in design doc (#1427)
* Standardise X500Name format - WIP

* address PR issues

* failing test fix and replace X500Name with getX500Name

* gradle plugin fix

* Added country code validation
2017-09-07 14:47:42 +01:00
Andrzej Cichocki
15f741f315 Spinoff driver into own project with demorun (#1401) 2017-09-05 09:50:51 +01:00
Ross Nicoll
7e3dd4c12c Restructure net.corda.core.crypto package
* Rename KeyFactory to CompositeKeyFactory
* Move expandedCompositeKeys into TestDSL as the only place that uses it
* Move NullKeys out of their own package
* Move remaining crypto classes into superpackage
* Move utility classes out of crypto and into utilities package
2017-09-01 10:55:58 +01:00
Chris Rankin
03ddaaac11 Remove the copy of Guava from within the finance module. (#1362) 2017-08-31 14:40:32 +01:00
szymonsztuka
bbebea234d remove reference to repository with JetBrains/Exposed library 2017-08-31 13:42:08 +01:00
Andras Slemmer
660d012800 Merge pull request #1352 from corda/aslemmer-quasar-exclude
Add exclude pattern to the quasar agent
2017-08-30 17:39:05 +01:00
Andras Slemmer
e9f3b92e97 Add alwaysExcluded flag to quasar-hook, run config for generating exclude pattern 2017-08-30 17:14:01 +01:00
Andrius Dagys
73664c3383 Test DSL: update tests to handle new transaction constraints 2017-08-29 17:05:13 +01:00
Matthew Nesbit
c86e78599f Rename finance module to own package
Fixup after rebase

Correct bad merges

Fixup docs

Fix integration test

Correct doc references to finance
2017-08-22 13:25:31 +01:00
Andrzej Cichocki
2829faa01f Retire legalContractReference (#1188)
* Add LegalProseReference annotation
* Migrate code from autogenerated javascript to TypeScript source
* Add instructions to rebuild the web resources
* Make installWeb more reproducible
2017-08-18 13:30:39 +01:00
Shams Asari
62b26bcd89 Moved Currency stuff in ContractsDSL out of core and into finance 2017-08-15 18:08:02 +01:00
Matthew Nesbit
9a02a27619 Add state query methods to LedgerTransaction.
Update to use LedgerTransaction api

Push query output logic onto BaseTransaction and update usages where possible

Migrate a few more uses

Address some PR comments

Address some PR comments

Fixup after rebase
2017-07-21 15:41:00 +01:00
Matthew Nesbit
0fdd4ae6c6 Remove TransactionForContract and just use LedgerTransaction
Fix minor doc error

Get rid of @deprecated method that was only present for technical reasons.

Minor fix and include in changelog
2017-07-20 09:16:07 +01:00
Shams Asari
2973755bc8 Moved TestConstants.kt from core into test-utils 2017-07-05 11:54:43 +01:00
Katelyn Baker
f11f17e2aa Move carpenter into core 2017-07-03 14:42:59 +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
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
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
Matthew Nesbit
6933c8fda3 Move all advanced finance types into finance module.
Fixup after rebase

Also pull in the interpolator code, which is used for financial calculations.

Fix up rebase
2017-06-16 11:19:24 +01:00
Matthew Nesbit
0fc38d71dc Ignore the flaky sandbox test, which keeps throwing stackoverflow exceptions. 2017-05-26 09:39:42 +01:00
Konstantinos Chalkias
9f2b44f8f7 Rename Timestamp to TimeWindow (#706)
Rename Timestamp to TimeWindow + refactoring
2017-05-25 13:18:49 +01:00
Ross Nicoll
c13a99a2f9 Replaces keys and parties in states with AbstractParty
Switch to using AbstractParty as the standard identifier for parties in
states, so that full parties can be used during construction of
transactions and anonymised parties when the transaction is being added
to the ledger.
2017-05-16 12:07:14 +01:00
Andras Slemmer
1ecce79913 Merge pull request #669 from corda/aslemmer-quasar-hook
Add quasar-hook agent for inspecting quasar instrumentation
2017-05-11 15:34:46 +01:00
Ross Nicoll
e4a0bc6e11 Move party classes into identity package
Move AbstractParty, AnonymousParty and Party into a new net.corda.core.identity package,
as they're not really cryptography tools, and in preparation for further code coming in
for identity.

Optimize imports on many files to clean up the resulting refactor.
2017-05-11 11:25:59 +01:00
Andras Slemmer
a7fbb860e7 Fix hook into InstrumentMethod 2017-05-11 11:22:41 +01:00
Andras Slemmer
5e103ac91a Address comments #669 2017-05-11 11:13:18 +01:00
Konstantinos Chalkias
5188e672eb Generic PublicKey.toStringShort() (#641)
Generic PublicKey.toStringShort() using the hash of the serialised form.
2017-05-09 14:47:58 +01:00
Ross Nicoll
25dbac0f07 Change party to hold an X.500 name
Change the legal name of parties to be an X500 name. This ensures that we aren't converting between
common names and X500 names in various places, eliminating substantial scope for error in the conversion
process. As a result, all node names must now be full X500 names, which has impact on most configurations.
2017-05-05 16:13:29 +01:00
Chris Rankin
e22ad19fcd Use assert methods from test framework. Don't use Java assert. (#625) 2017-05-03 17:32:30 +01:00
Chris Rankin
f715ab39a2 Integrate sandbox properly with top-level build, create fat jar and remove unused imports. (#575) 2017-04-24 20:30:21 +01:00
Ross Nicoll
684d1089f0 Introduce full legal names for test parties
Use full names for test parties, ahead of complete X.500 name support.
2017-04-24 15:18:21 +01:00
gary-rowe
108f171e03 Replace 'by' with 'using' to avoid overloading Kotlin keyword in contracts DSL. Deprecates 'by' with offered replacement. 2017-04-12 12:27:02 +02:00
kasiastreich
36d5d0d7b2 Refactor of CompositeKeys to implement PublicKey interface. (#433)
* Make CompositeKey implement PublicKey

The initial implementation of composite keys as their own distinct class separate from PublicKey
means that the keys cannot be used on standard classes such as Certificate. This work is a beginning
to modifying CompositeKey to being a PublicKey implementation, although significant further work
is required to integrate this properly with the standard Java APIs, especially around verifying
signatures using the new key type.

* First stage of making CompositeKey implement PublicKey interface. Revert to using PublicKey everywhere we expect a key.

* Move algorithm and format into companion object (#432)

Move algorithm and format into companion object so that they can be referenced from other
classes (i.e. the upcoming signature class).

* Add simple invariants to construction of CompositeKey.
Builder emits CompositeKeys in simplified normalised form. Forbid keys with single child node, force ordering on children and forbid duplicates on the same level. It's not full semantical normalisation.

* Make constructor of CompositeKey private, move NodeWeight inside the class.
Add utility function for Kryo deserialization to read list with length constraints.
2017-04-12 11:13:20 +01:00
Mike Hearn
4853e41a58 Minor: inspector fixes 2017-04-11 15:53:05 +02:00
Mike Hearn
c097229935 Minor: run code cleanup inspections 2017-04-11 15:53:05 +02:00
Rick Parker
8ef1d767c9 Consolidate maven repositories (#445)
* Consolidate repositories into root build.gradle
2017-03-28 17:17:40 +01:00
Mike Hearn
a394adbb44 Work around JaCoCo injecting fields/methods into classes when the tests are run from gradle 2017-03-14 14:41:50 +01:00
Mike Hearn
8e1a48d935 Add experimental class building class (the 'carpenter').
This is intended for use in the serialisation framework.
2017-03-14 14:41:50 +01:00
Rick Parker
c4c4c51d7d Kryo serialisation whitelisting and misc enhancements. (#267)
Kryo serialisation whitelisting and misc enhancements
2017-02-28 08:12:18 +00:00
Ross Nicoll
2f9af7d7dc Revert Party.Full in preference for a less invasive change 2017-02-02 13:47:32 +00:00
Ross Nicoll
1b86ddfd6e Replace Party with Party.Full
Replace Party with Party.Full as an interim step to introducing the Party.Anonymised class.

Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
2017-02-01 15:18:12 +00:00
Sofus Mortensen
8ac7d7c189 universal: pretty print, more JVM<3 type erasure fun 2017-01-11 23:44:11 +01:00
Sofus Mortensen
abb361f207 universal: pretty print, type erasure workaround 2017-01-11 22:51:00 +01:00
Sofus Mortensen
336ce362e8 universal: swaption 2017-01-11 21:26:32 +01:00
Sofus Mortensen
bfd7aa4fc2 universal: pretty print 2017-01-11 21:26:32 +01:00
Sofus Mortensen
306a3cdff7 universal: prettyPrint 2017-01-11 21:26:32 +01:00
Sofus Mortensen
4fdeee5bf8 universal: pretty print 2017-01-11 21:26:32 +01:00
Sofus Mortensen
02e0b2218c universal: wrong exception type 2017-01-11 21:26:32 +01:00
sofusmortensen
607fd67519 universal: added split command 2017-01-11 21:26:32 +01:00
sofusmortensen
66692542bd universal: completed example FX Fwd Time Option 2017-01-11 21:26:32 +01:00
sofusmortensen
f19df50351 universal: simplied Actions squashing condition and actors together (suggested by Simon Peyton-Jones) 2017-01-11 21:26:32 +01:00
sofusmortensen
edc30717bb universal: new example/unit test FX Fwd with Time Option
syntax enhancement with re-use of contracts.
2017-01-11 21:26:32 +01:00
Mike Hearn
119d00c384 Upgrade dependencies and centralise some more version numbers in the root gradle file 2017-01-04 15:44:56 +01:00
Mike Hearn
eec16a41cf Minor: fix some compiler warnings and update some universal contract DSL code to use may as an infix function 2016-12-20 15:18:25 +01:00
Matthew Nesbit
a976045675 Merge pull request #9 from corda/mnesbit-gradle-no-install-builds
Change gradle to not need an install step before build
2016-11-30 17:12:19 +00:00
Matthew Nesbit
e54a304e2e Depend upon an internal artifact, rather than a maven local published artifact when building the corda fatjar. 2016-11-30 16:16:51 +00:00
Matthew Nesbit
8f47d393ca Fix file cleanup of sandbox unit tests on Windows machines.
Use try with resources to close stream after file copy.
2016-11-30 16:13:40 +00:00
Mike Hearn
7aa20dfbe4 Move sandbox code into the experimental module to reflect its status 2016-11-29 10:59:13 +00:00
Mike Hearn
fe5df11b23 Tweak experimental README 2016-11-29 10:30:49 +00:00
Mike Hearn
6c8996fb5e Tech white paper: update example from Sofus 2016-11-28 14:22:11 +00:00
sofusmortensen
68d1f8868d rename transfer/give to obligation/owes 2016-11-26 18:08:01 +01:00
Andrius Dagys
64299591c3 Rename PublicKeyTree -> CompositeKey and unify terminology across documentation. 2016-11-21 14:47:19 +00:00
Mike Hearn
8a680b3726 Minor style tweaks to the universal contract. 2016-11-15 19:17:30 +01:00
Mike Hearn
d1b279c2b2 Remove experimental trade finance code: it's not maintained, hasn't been code reviewed and we don't wish to release it as open source. 2016-11-15 19:08:14 +01:00
Andrius Dagys
c33c55eb20 Replace PublicKey with PublicKeyTree in Party. A single entity can now be identified by more than one key. 2016-11-14 14:57:16 +00:00
Mike Hearn
d7defd3157 Minor tweaks to the experimental universal contract DSL 2016-11-14 12:47:49 +01:00
Andras Slemmer
ea6b1b8435 experimental: tests com.r3corda -> net.corda 2016-11-11 11:27:30 +00:00
Mike Hearn
ce99f354cb Rename com.r3corda -> net.corda 2016-11-10 17:14:24 +01:00
Clinton Alexander
7e198e7cf3 Renamed contracts project to finance to better reflect the purpose of the project. 2016-11-04 13:35:25 +00:00
sofusmortensen
c328655f68 Universal: completed Cap unit test, full life cycle 2016-09-19 00:06:42 +02:00
sofusmortensen
2299b3beae Universal: fixed syntax issue that should have resulted in compile error 2016-09-18 18:09:00 +02:00
sofusmortensen
9c5ef6cdfe Universal: more refactor + cap rollout unit test 2016-09-17 16:16:18 +02:00
sofusmortensen
789bb2bb9d Universal: removed some debug code 2016-09-12 16:51:39 +01:00
sofusmortensen
143c6d2d90 Universal: started IRS contract/test, added min/max 2016-09-12 16:41:19 +01:00
Andras Slemmer
836933d223 experimental: Fix compile errors 2016-09-12 14:34:11 +01:00
sofusmortensen
9f6415efab Universal: Post refactor, rollout unit test passing 2016-09-12 13:49:50 +01:00
sofusmortensen
b93aa71afa Universal: checkpoint before refactor 2016-09-12 13:49:50 +01:00
sofusmortensen
c7b164897b Universal: example parties renamed 2016-09-07 14:40:56 +02:00
sofusmortensen
1ceee48696 Universal: refactoring 2016-09-07 14:40:56 +02:00
Mike Hearn
99f8477bf1 Minor: move code from TransactionTools.kt into the respective classes, and add some @Throws annotations that were missing (matters for java users) 2016-09-06 15:06:28 +02:00
Mike Hearn
9d83a9b6d2 Minor: move transaction types out of the contracts package and into a new transactions package 2016-09-06 14:20:32 +02:00
sofusmortensen
fffc049e12 Universal: refactoring, reduction/evaluation with unit test first steps 2016-09-04 22:50:32 +02:00
Ross Nicoll
868b23a923 Move simulations to top level 2016-09-01 11:15:05 +01:00
Ross Nicoll
232db9a1fd Move test utilities into their own package
This moves a lot of the test support code into its own package which is only imported for tests,
so it's not shipped as a part of core Corda. The node currently depends on this support code to
compile, although future work could try to separate this out. This change highlights that parts
of production code is dependent on test elements (i.e. dummy keys), and makes it harder for
such accidental crosses to occur later.

An integration test category is also added as part of this work, to contribute towards COR-345.
2016-08-31 15:40:54 +01:00
sofusmortensen
2680687dcb Universal: Fixing and reduction 2016-08-29 22:29:24 +02:00
sofusmortensen
5daad3580c verify of conditions, timestamp working 2016-08-21 23:40:32 +02:00
sofusmortensen
d5172ea2d0 added timestamp check 2016-08-21 10:39:20 +02:00