ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-27 20:54:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,754 Commits 108 Branches 407 Tags
Commit Graph

9754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkit
e6ce42281f Introducing audit table for Doorman and Signing-Server (#69) 
* Introducing audit table for Doorman and Signing-Server

* Addressing review comments

* Removing TODO

* Adding comment on auto-signing path and DOORMAN_SIGNATURE usage

* Fixing integration tests
 2017-10-19 15:07:59 +01:00
Christian Sailer
8428f78821 Merge pull request #56 from corda/christians_perftestflows 
Isolated cash and commercial paper for performance testing
 2017-10-19 12:03:54 +01:00
Christian Sailer
35ef7d19da Merged fix for TwoPartyTradeFlow not finding the seller identity 2017-10-19 10:44:20 +01:00
Christian Sailer
3297be4a07 Clean up imports 2017-10-19 10:43:15 +01:00
mkit
5deb708bb3 Tweaking hibernate to support Azure and H2 dbs (#60) 2017-10-19 10:29:35 +01:00
Christian Sailer
f579393d88 Merge branch 'master' of https://github.com/corda/enterprise into christians_perftestflows 2017-10-19 09:54:06 +01:00
Christian Sailer
c70a7c374e Pick up new implementation of H2CashSelection 2017-10-19 09:53:52 +01:00
Tommy Lillehagen
40b1eca0aa Merge pull request #70 from corda/tlil/ci-fix 
Fix bad Avian dir references in Makefile
 2017-10-19 09:19:58 +01:00
Tommy Lillehagen
a337d1a60b Fix bad Avian dir references in Makefile 2017-10-18 22:53:15 +01:00
Patrick Kuo
42b0db242e Upgrade the doorman to persist the stored network map entries + serving (#54) 
* Upgrade the doorman to persist the stored network map entries + serving

* fixup after rebase

* address PR issues

* address PR issues

* return 400 bad request instead of unauthorized
 2017-10-18 15:19:17 +01:00
josecoll
5f98993324 Merge pull request #61 from corda/hcoll-eliminate-binary-public-key-as-db-key 
ENT-980 Eliminate use of PublicKey (as string or binary) as primary key in database
 2017-10-18 13:26:25 +01:00
josecoll
c2ff4b74e4 Make const MAX_HASH_HEX_SIZE internal 2017-10-18 10:04:19 +01:00
Patrick Kuo
aa5b35a658 Upgrade doorman corda dependancies to v1.0 (#66) 
* upgrade corda dependancy to v1.0.0

* fixup after corda upgrade

* fix CordaX500Name problem for root cert and intermediate cert

* fixup after rebase

* fix dependencies problem

* add back dev repo
 2017-10-17 18:59:53 +01:00
Tommy Lillehagen
9f834b1495 Merge pull request #63 from corda/tlil/sgx-build-files 
Add missing build dependencies and build JDK without X11
 2017-10-17 16:21:09 +01:00
Christian Sailer
1340b037c6 Merge branch 'master' of https://github.com/corda/enterprise into christians_perftestflows 2017-10-17 15:29:03 +01:00
josecoll
698b91bc5e Fix after rebase. 2017-10-17 15:25:01 +01:00
Christian Sailer
3a22962815 Merge pull request #59 from corda/christians-fix-unittests-for-windows 
Fix unittests for windows
 2017-10-17 15:24:38 +01:00
josecoll
b861f4b7cb Standardise Public Key hash size as per discussions with KC. 2017-10-17 14:31:21 +01:00
josecoll
cda3ecbc0a Revert DBPartyAndCertificate change: PK should be party name (not owningKeyHash). 2017-10-17 14:30:34 +01:00
josecoll
72ad9a51fe Use SecureHash extension method. 2017-10-17 14:30:03 +01:00
josecoll
744f2c658a Explicitly set length of key hash to 64. 2017-10-17 14:29:38 +01:00
josecoll
0e5346caa1 Updated DB schemas from using string'ified key to use hash of key. 2017-10-17 14:29:36 +01:00
szymonsztuka
20e0e63eed Change string of PublicKey to hash as database primary key. 2017-10-17 14:27:20 +01:00
Christian Sailer
cf6460592d Replace references to finance packages in unit tests with perftest packages 2017-10-17 14:27:12 +01:00
Christian Sailer
afac8c5728 Rename db tables to have pt in them so states for real cash and perf test cash don't get accidentally mixed up in the db 2017-10-17 14:07:43 +01:00
Tommy Lillehagen
fdf29f3c58 Update docker container and JDK make file 
* Add missing build dependencies to `docker-minimal`
 * Build JDK without ALSA, CUPS, FreeType, Pulse and X11
 2017-10-17 14:02:34 +01:00
Christian Sailer
9a145a710a Remove Pt prefix for classes in perftestcordapp 2017-10-17 13:48:20 +01:00
Christian Sailer
f25c15b194 Rename the module/directory from perftestflows to perftestcordapp and clean up module settings 2017-10-17 12:27:08 +01:00
Christian Sailer
d0a7ce3a4e Rename the package to com.r3.corda.enterprise.perftestcordapp 2017-10-17 11:58:08 +01:00
szymonsztuka
571c1ff31f merge open source to enterprise 
* merge of open source master since the previous merge (changes between Sep 26, 2017 - Oct 16, 2017)

* New differences between O/S and Enterprise branches:
- top level build.gradle references enterprise repository:
 ` publish { .. repository { repoKey = 'enterprise-dev'`

- README.md links to enterprise build status:
href="https://ci-master.corda.r3cev.com/viewType.html?buildTypeId=CordaEnterprise_Build&tab=buildTypeStatusDiv"
 2017-10-17 11:55:09 +01:00
Christian Sailer
1241c79d7c Remove Java parts and unused resources 2017-10-17 11:20:18 +01:00
Christian Sailer
894e407057 Updated modules in compiler.xml 2017-10-17 09:54:55 +01:00
Christian Sailer
4ecc7e9ace Merge branch 'master' of https://github.com/corda/enterprise into christians_perftestflows 2017-10-17 09:47:22 +01:00
szymonsztuka
c436984462 Merge from Corda master - fix compilation errors 2017-10-16 19:08:51 +01:00
szymonsztuka
db0969ebda Merge from Corda master 2017-10-16 18:03:07 +01:00
Ross Nicoll
63b7eb3f70 CORDA-654: Move from chooseIdentity() to singleIdentity() (#1819) 
Move from `chooseIdentity()` to `singleIdentity()` where tests use a single identity, or to fetching by name where multiple identities are present, so we stop using the first identity as special.
 2017-10-16 15:51:26 +01:00
Joel Dudley
d8b81f755a Makes docs fixes flagged by various internals. 2017-10-16 15:15:02 +01:00
Joel Dudley
d3e8df1644 Separates out the tutorial code into separate docs to ensure it compiles. 2017-10-16 14:39:28 +01:00
Christian Sailer
d8462ad662 Make it handle whitespace in paths correctly - even better by using toURI() 2017-10-16 14:36:43 +01:00
Christian Sailer
ead805fb21 Make it handle whitespace in paths correctly (needs to be URL decoded) 2017-10-16 14:32:16 +01:00
mkit
83b9080502 Adding an option to override the default isolation level on per transaction basis (#1886) 2017-10-16 14:03:51 +01:00
josecoll
2a68e23e69 Improved Cash Selection interface (#1858) 
* Cash selection refactoring such that 3d party DB providers are only required to implement Coin Selection SQL logic.

* Re-added debug logging statement.

* Updated to include PR review feedback from VK

* Refactoring following rebase from master.

* Fix broken JUnits following rebase.

* Use JDBC ResultSet getBlob() and added custom serializer to address concern raised by tomtau in PR.

* Fix failing JUnits.
 2017-10-16 13:47:35 +01:00
Christian Sailer
45e4a96d77 Merge branch 'master' of https://github.com/corda/enterprise into christians-fix-unittests-for-windows 2017-10-16 13:21:01 +01:00
Andrzej Cichocki
38cf4a489e CORDA-676 Eager cordapp schemas (#1839) 
* Retire customSchemas.
* Key cordapp-to-hash map by url as native equality too strict.
 2017-10-16 11:35:29 +01:00
mkit
5ee784999a Renaming package to com.r3 (#58) 2017-10-16 11:15:35 +01:00
Alberto Arri
d3d87c2497 [CORDA-442] DemoBench copies around the NodeInfos for running nodes. (#1796) 
[CORDA-442] DemoBench copies around the NodeInfos for running nodes.
 2017-10-16 09:42:13 +01:00
Viktor Kolomeyko
99b509cb68 Attempting to make VerifierTests more stable (#1883) 
* Attempting to make VerifierTests more stable

Main point: Alice node will always be faster to locate Alice by name than NotaryNode. Especially given that it may take some time
for Alice node to get reflected on the Notary's NetworkMap.

Also additional logging which might be helpful during debug and IntelliJ changed project structure reflection.

* Introduce a way for nodes to reliably learn about each other existence in the NetworkMap

Plus minor refactoring of the Driver code.
 2017-10-16 09:16:40 +01:00
Christian Sailer
8549a77a76 Use system tmp dir instead of hardcoding unix path 2017-10-13 16:31:44 +01:00
josecoll
be235673e1 H2 coin selection uses Prepared Statement to protect against SQL injection (#1872) 
* Updated H2 coin selection code to use Prepared Statement to protect against SQL Injection attacks.

* Clean-up deprecations and warnings.

* Revert correct indentation.

* Revert logging back to debug for SQL display.

* Fix broken tests.
 2017-10-13 16:26:55 +01:00
Clinton
2680361696 Renamed "plugins" dir to "cordapps" (#1644) 
* Renamed plugins dir to cordapps dir while maintaining backwards compatibility with the plugins dir.
Bumped gradle plugins to 2.0.4
 2017-10-13 15:01:24 +01:00