Commit Graph

1620 Commits

Author SHA1 Message Date
0662798b0f Introduce some new cryptographic utility functions
1. Function for converting raw entropy into an EDDSA key pair. This is useful for unit tests when you don't want a random key but would rather be able to identify it from the logs by eyesight, and will be useful later also when implementing deterministic key derivation.
2. Function that can format any collection of public keys using the bitcoin-style base58 form.
3. A dummy NullSignature object, again, useful for tests when you don't want to provide a real signature.

Then set a handful of dummy unit testing keys to predictable/fixed values.
2016-08-01 16:42:56 +02:00
b40fee1512 Allow for easier conversion from Amount<Issued<T>> to Amount<T> and de-issuerify a few places. 2016-08-01 16:42:56 +02:00
309159da14 Better toString for Amount post-issuer refactoring. 2016-08-01 16:09:22 +02:00
a44d3edebf Correct obligationTestRoots to cashObligationTestRoots 2016-08-01 15:05:00 +01:00
0ac29bec26 Merged in rnicoll-obligation-fungible (pull request #199)
Add commodities to provide worked example of a different thing under Obligation
2016-08-01 14:26:13 +01:00
7aef03baab Merged in rnicoll-obligation-settle-amount (pull request #252)
Add missing checks on settled amount
2016-08-01 14:26:00 +01:00
e1d1aed541 Add commodity contract and test obligations can be settled for it 2016-08-01 14:20:04 +01:00
f72e223f3b Add Commodity class 2016-08-01 14:20:04 +01:00
406196fb69 Add missing checks on settled amount
The obligation `Settle` command takes in an amount to be settled, but only uses the underlying token from it.
This enforces that the settled amount matches the value seen moving.
2016-08-01 14:19:07 +01:00
44dee97899 Begin M3 2016-08-01 14:50:50 +02:00
b788956800 Merge branch 'master' of https://bitbucket.org/R3-CEV/r3prototyping 2016-08-01 14:39:14 +02:00
d53c130ffd Merged in mike-fix-progress-renderer-after-log4j (pull request #255)
Fix progress rendering after the switch to log4j, as ANSIProgressRenderer had assumed JDK logging.
2016-08-01 14:38:36 +02:00
0da057dbd8 Address review comments 2016-08-01 14:01:58 +02:00
1081e8d2ce Regen docsite 2016-08-01 13:16:47 +02:00
d08ab24c42 Merged in mike-m2-release-notes (pull request #248)
Release notes for M2
2016-08-01 13:13:33 +02:00
a5c8df8dab # This is a combination of 2 commits.
# The first commit's message is:

Release notes for M2

# The 2nd commit message will be skipped:

#	Docs: Address release notes review comments, re-arrange the sidebar and mention the new TF code that has been added.
2016-08-01 13:12:39 +02:00
97ad07be89 Fix progress rendering after the switch to log4j, as ANSIProgressRenderer had assumed JDK logging.
Also, start using colours and a more compact logging format in the default log4j config.
2016-08-01 13:07:48 +02:00
9c9248f71e Merged in rnicoll-message-topic (pull request #245)
Break down topic into component parts
2016-07-29 14:25:32 +01:00
cf4bb0c9af Break down topic into component parts
Break down what is referred to as "topic" of a message into its component parts. This splits the
general topic from the session ID, so it's clear where a session ID is provided, and whether any
given topic string includes a session ID or not.
2016-07-29 14:24:46 +01:00
7d39a101d4 Merged in COR-276 (pull request #239)
Added Jacoco code coverage to gradle.
2016-07-29 13:29:47 +01:00
8d3d9d6572 Removed inline that has Kotlin specific compile bug with specific Gradle configurations. 2016-07-29 13:23:33 +01:00
e25085297c Merged in rnicoll-contract-catalogue (pull request #231)
Add contract catalogue to documentation
2016-07-29 12:00:36 +01:00
98aac62a42 Add contract catalogue to documentation 2016-07-29 11:59:28 +01:00
4a3da67c6c Merged in rg_trade_finance_experimental (pull request #250)
Rg_trade_finance_experimental
2016-07-29 10:41:00 +01:00
8c77ae7c84 Add comment to explain why AbstractNode is marked as SingletonSerializeAsToken 2016-07-28 16:54:40 +01:00
3e5a8145b5 Merged in mnesbit-cor-199-more-plugins (pull request #249)
Mnesbit cor 199 more plugins
2016-07-28 16:37:25 +01:00
a462bb1d6a Incorporate comments from PR 2016-07-28 16:30:53 +01:00
601b2faf5f Incorporate comments from PR 2016-07-28 16:22:35 +01:00
87bc02d2a8 all tests now pass - but some are commented out 2016-07-28 16:00:19 +01:00
e3f36a4942 Modified tests for new DSL 2016-07-28 15:57:09 +01:00
92e05f07aa Initial checkin for Trade Finance work into experimental module 2016-07-28 15:48:40 +01:00
ac0d0ec0ec Initial checkin for Trade Finance work into experimental branch 2016-07-28 15:47:55 +01:00
c57f265cce Fixup plugins to include static content property after rebase inclusive of that work 2016-07-28 13:55:06 +01:00
10f68b22f9 Minor fix after rebase 2016-07-28 13:39:16 +01:00
235497e0f4 Convert long lived services supporting protocol listeners to plugins 2016-07-28 13:39:12 +01:00
454f555728 Merged in mnesbit-cor-261-artemis-over-ssl (pull request #247)
Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
2016-07-28 13:35:44 +01:00
09c795e341 Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl 2016-07-28 13:28:31 +01:00
5410f8b228 Merged in demowebui (pull request #230)
Added an IRS demo web interface
2016-07-28 13:19:32 +01:00
ec726da7d0 Merged in rnicoll-warnings (pull request #246)
Correct warnings
2016-07-28 13:03:55 +01:00
bcbac345e8 Fixed display issue when using double digit months and days. 2016-07-28 11:37:10 +01:00
7d5ee8ba08 Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
Activate WhitelistTrustManager for now to secure the TLS messaging.
2016-07-28 11:25:57 +01:00
7e6c1332e7 Regen docsite 2016-07-28 12:20:11 +02:00
f4e8537cf0 Fixed documentation. 2016-07-28 09:26:47 +01:00
5167ed7df2 Merged in mike-fix-irs (pull request #244)
Fix how the IRS contract uses fix commands
2016-07-28 10:19:16 +02:00
aebdc86225 Reverted change from previous commit. 2016-07-28 09:17:49 +01:00
188fc29436 Cleaned up build.gradle files. 2016-07-28 09:17:49 +01:00
ffc3c8f421 Added Jacoco code coverage to gradle. 2016-07-28 09:17:49 +01:00
2a0066ae74 Merged in rnicoll-wallet-notify-transaction (pull request #237)
Add wallet service for notifying remote nodes of transactions
2016-07-27 17:45:21 +01:00
d54beca77e Add wallet service for notifying remote nodes of transactions 2016-07-27 17:40:52 +01:00
aaaf6ea4f6 Correct warnings 2016-07-27 17:11:46 +01:00