notlesh · notlesh · Apr 7, 2019 · Apr 7, 2019 · Apr 7, 2019 · Apr 7, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,123 @@
 # Changelog
 
+## 1.1 
+
+### Additions and Improvements 
+
+- [Privacy](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Privacy-Overview/) 
+- [Onchain Permissioning](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Onchain-Permissioning/)
+- [Fastsync](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#fast-sync-options) 
+- Documentation updates include: 
+    - Added JSON-RPC methods: 
+      - [`txpool_pantheonStatistics`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#txpool_pantheonstatistics)
+      - [`net_services`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#net_services)
+    - [Updated to indicate Docker image doesn't run on Windows](https://docs.pantheon.pegasys.tech/en/latest/Getting-Started/Run-Docker-Image/)
+    - [Added how to configure a free gas network](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/FreeGas/) 
+
+### Technical Improvements 
+
+- eea_getTransactionCount fails if account has not interacted with private state [\#1369](https://github.com/PegaSysEng/pantheon/pull/1369) 
+- Updating Orion to 0.9.0 [\#1360](https://github.com/PegaSysEng/pantheon/pull/1360)
+- Allow use of large chain IDs [\#1357](https://github.com/PegaSysEng/pantheon/pull/1357)
+- Allow private contract invocations in multiple privacy groups [\#1340](https://github.com/PegaSysEng/pantheon/pull/1340)
+- Missing p2p info when queried live [\#1338](https://github.com/PegaSysEng/pantheon/pull/1338)
+- Fix expose transaction statistics [\#1337](https://github.com/PegaSysEng/pantheon/pull/1337)
+- Normalize account permissioning addresses in whitelist [\#1321](https://github.com/PegaSysEng/pantheon/pull/1321)
+- Update Enclave executePost method [\#1319](https://github.com/PegaSysEng/pantheon/pull/1319)
+- Fix account permissioning check case matching [\#1315](https://github.com/PegaSysEng/pantheon/pull/1315)
+- Removing 'all' from the help wording for host-whitelist [\#1304](https://github.com/PegaSysEng/pantheon/pull/1304)
+
+## 1.1 RC 
+
+### Technical Improvements 
+
+- Better errors for when permissioning contract is set up wrong [\#1296](https://github.com/PegaSysEng/pantheon/pull/1296) 
+- Consolidate p2p node info methods [\#1288](https://github.com/PegaSysEng/pantheon/pull/1288) 
+- Update permissioning smart contract interface to match updated EEA proposal [\#1287](https://github.com/PegaSysEng/pantheon/pull/1287) 
+- Switch to new sync target if it exceeds the td threshold [\#1286](https://github.com/PegaSysEng/pantheon/pull/1286) 
+- Fix running ATs with in-process node runner [\#1285](https://github.com/PegaSysEng/pantheon/pull/1285) 
+- Simplify enode construction [\#1283](https://github.com/PegaSysEng/pantheon/pull/1283) 
+- Cleanup PeerConnection interface [\#1282](https://github.com/PegaSysEng/pantheon/pull/1282) 
+- Undo changes to PendingTransactions method visibility [\#1281](https://github.com/PegaSysEng/pantheon/pull/1281) 
+- Use default enclave public key to generate eea_getTransactionReceipt [\#1280](https://github.com/PegaSysEng/pantheon/pull/1280) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Rollback to rocksdb 5.15.10 [\#1279](https://github.com/PegaSysEng/pantheon/pull/1279) 
+- Log error when a JSON decode problem is encountered [\#1278](https://github.com/PegaSysEng/pantheon/pull/1278) 
+- Create EnodeURL builder [\#1275](https://github.com/PegaSysEng/pantheon/pull/1275) 
+- Keep enode nodeId stored as a BytesValue [\#1274](https://github.com/PegaSysEng/pantheon/pull/1274) 
+- Feature/move subclass in pantheon command [\#1272](https://github.com/PegaSysEng/pantheon/pull/1272) 
+- Expose sync mode option [\#1270](https://github.com/PegaSysEng/pantheon/pull/1270) 
+- Refactor RocksDBStats [\#1266](https://github.com/PegaSysEng/pantheon/pull/1266) 
+- Normalize EnodeURLs [\#1264](https://github.com/PegaSysEng/pantheon/pull/1264) 
+- Build broken in Java 12 [\#1263](https://github.com/PegaSysEng/pantheon/pull/1263) 
+- Make PeerDiscovertAgentTest less flakey [\#1262](https://github.com/PegaSysEng/pantheon/pull/1262) 
+- Ignore extra json rpc params [\#1261](https://github.com/PegaSysEng/pantheon/pull/1261) 
+- Fetch local transactions in isolation [\#1259](https://github.com/PegaSysEng/pantheon/pull/1259) 
+- Update to debug trace transaction [\#1258](https://github.com/PegaSysEng/pantheon/pull/1258) 
+- Use labelled timer to differentiate between rocks db metrics [\#1254](https://github.com/PegaSysEng/pantheon/pull/1254) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Migrate TransactionPool (& affiliated test) from 'core' to 'eth' [\#1251](https://github.com/PegaSysEng/pantheon/pull/1251) 
+- Use single instance of Rocksdb for privacy [\#1247](https://github.com/PegaSysEng/pantheon/pull/1247) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Subscribing to sync events should receive false when in sync [\#1240](https://github.com/PegaSysEng/pantheon/pull/1240) 
+- Ignore transactions from the network while behind chain head [\#1228](https://github.com/PegaSysEng/pantheon/pull/1228) 
+- RocksDB Statistics in Metrics [\#1169](https://github.com/PegaSysEng/pantheon/pull/1169) 
+- Add block trace RPC methods [\#1088](https://github.com/PegaSysEng/pantheon/pull/1088) (thanks to [kziemianek](https://github.com/kziemianek))
+
+## 1.0.3
+
+### Additions and Improvements 
+
+- Notify of dropped messages [\#1156](https://github.com/PegaSysEng/pantheon/pull/1156) 
+- Documentation updates include: 
+    - Added [Permissioning Overview](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Permissioning-Overview/)
+    - Added content on [Network vs Node Configuration](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Using-Configuration-File/)   
+    - Updated [RAM requirements](https://docs.pantheon.pegasys.tech/en/latest/Installation/Overview/)  
+    - Added [Privacy Overview](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Privacy-Overview/) and [Processing Private Transactions](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Private-Transaction-Processing/)
+    - Renaming of Ethstats Lite Explorer to [Ethereum Lite Explorer](https://docs.pantheon.pegasys.tech/en/latest/EthStats/Lite-Block-Explorer/) (thanks to [tzapu](https://github.com/tzapu))
+    - Added content on using [Truffle with Pantheon](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Truffle/)
+    - Added [`droppedPendingTransactions` RPC Pub/Sub subscription](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/RPC-PubSub/#dropped-transactions) 
+    - Added [`eea_*` JSON-RPC API methods](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#eea-methods)  
+    - Added [architecture diagram](https://docs.pantheon.pegasys.tech/en/latest/Architecture/Overview/) 
+    - Updated [permissioning CLI options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#permissions-accounts-config-file-enabled) and [permissioned network tutorial](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Create-Permissioned-Network/)  
+
+### Technical Improvements 
+
+- Choose sync target based on td rather than height [\#1256](https://github.com/PegaSysEng/pantheon/pull/1256)
+- CLI ewp options [\#1246](https://github.com/PegaSysEng/pantheon/pull/1246)
+- Update PantheonCommand.java [\#1245](https://github.com/PegaSysEng/pantheon/pull/1245)
+- Reduce memory usage in import [\#1239](https://github.com/PegaSysEng/pantheon/pull/1239)
+- Improve eea_sendRawTransaction error messages [\#1238](https://github.com/PegaSysEng/pantheon/pull/1238) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Single topic filter [\#1235](https://github.com/PegaSysEng/pantheon/pull/1235)
+- Enable pipeline chain downloader for fast sync [\#1232](https://github.com/PegaSysEng/pantheon/pull/1232)
+- Make contract size limit configurable [\#1227](https://github.com/PegaSysEng/pantheon/pull/1227)
+- Refactor PrivacyParameters config to use builder pattern [\#1226](https://github.com/PegaSysEng/pantheon/pull/1226) (thanks to [antonydenyer](https://github.com/antonydenyer))
+- Different request limits for different request types [\#1224](https://github.com/PegaSysEng/pantheon/pull/1224)
+- Finish off fast sync pipeline download [\#1222](https://github.com/PegaSysEng/pantheon/pull/1222) 
+- Enable fast-sync options on command line [\#1218](https://github.com/PegaSysEng/pantheon/pull/1218) 
+- Replace filtering headers after the fact with calculating number to request up-front [\#1216](https://github.com/PegaSysEng/pantheon/pull/1216) 
+- Support async processing while maintaining output order [\#1215](https://github.com/PegaSysEng/pantheon/pull/1215) 
+- Add Unstable Options to the CLI [\#1213](https://github.com/PegaSysEng/pantheon/pull/1213) 
+- Add private cluster acceptance tests [\#1211](https://github.com/PegaSysEng/pantheon/pull/1211) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Re-aligned smart contract interface to EEA client spec 477 [\#1209](https://github.com/PegaSysEng/pantheon/pull/1209) 
+- Count the number of items discarded when a pipe is aborted [\#1208](https://github.com/PegaSysEng/pantheon/pull/1208) 
+- Pipeline chain download - fetch and import data [\#1207](https://github.com/PegaSysEng/pantheon/pull/1207) 
+- Permission provider that allows bootnodes if you have no other connections [\#1206](https://github.com/PegaSysEng/pantheon/pull/1206) 
+- Cancel in-progress async operations when the pipeline is aborted [\#1205](https://github.com/PegaSysEng/pantheon/pull/1205) 
+- Pipeline chain download - Checkpoints [\#1203](https://github.com/PegaSysEng/pantheon/pull/1203) 
+- Push development images to public dockerhub [\#1202](https://github.com/PegaSysEng/pantheon/pull/1202) 
+- Push builds of master as docker development images [\#1200](https://github.com/PegaSysEng/pantheon/pull/1200) 
+- Doc CI pipeline for build and tests [\#1199](https://github.com/PegaSysEng/pantheon/pull/1199) 
+- Replace the use of a disconnect listener with EthPeer.isDisconnected [\#1197](https://github.com/PegaSysEng/pantheon/pull/1197) 
+- Prep chain downloader for branch by abstraction [\#1194](https://github.com/PegaSysEng/pantheon/pull/1194) 
+- Maintain the state of MessageFrame in private Tx [\#1193](https://github.com/PegaSysEng/pantheon/pull/1193) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Persist private world state only if we are mining [\#1191](https://github.com/PegaSysEng/pantheon/pull/1191) (thanks to [Puneetha17](https://github.com/Puneetha17))
+- Remove SyncState from SyncTargetManager [\#1188](https://github.com/PegaSysEng/pantheon/pull/1188) 
+- Acceptance tests base for smart contract node permissioning [\#1186](https://github.com/PegaSysEng/pantheon/pull/1186) 
+- Fix metrics breakages [\#1185](https://github.com/PegaSysEng/pantheon/pull/1185) 
+- Typo [\#1184](https://github.com/PegaSysEng/pantheon/pull/1184) (thanks to [araskachoi](https://github.com/araskachoi))
+- StaticNodesParserTest to pass on Windows [\#1183](https://github.com/PegaSysEng/pantheon/pull/1183) 
+- Don't mark world state as stalled until a minimum time without progress is reached [\#1179](https://github.com/PegaSysEng/pantheon/pull/1179) 
+- Use header validation policy in DownloadHeaderSequenceTask [\#1172](https://github.com/PegaSysEng/pantheon/pull/1172) 
+- Bond with bootnodes [\#1160](https://github.com/PegaSysEng/pantheon/pull/1160) 
+
 ## 1.0.2 
 
 ### Additions and Improvements

diff --git a/CODING-CONVENTIONS.md b/CODING-CONVENTIONS.md
@@ -149,7 +149,9 @@ Method parameters must be final.  Class level and local fields should be final w
 
 * Getters follow idiomatic format with `get` prefix.  For example, `getBlock()` gets a block property.
 * Setters follow idiomatic format with `set` prefix. For example, `setBlock(Block block)` sets a block property.
-* For `toString methods`,  use the Guava 18+ `MoreObjects.toStringHelper`
+* The Setter pattern should not be used for chained builder methods.
+* Methods returning a `Stream` should be prefixed with `stream`.  For example `streamIdlePeers()` returns a stream of the idle peers.
+* For `toString` methods use the Guava 18+ `MoreObjects.toStringHelper`
 * Equals and `hashCode()` methods use the `Object.equals` and `Object.hash` methods (this is the _Java 7+_ template in IntelliJ. Don’t accept subclasses and don’t use getters)
 
 ## 4.2.4 Testing

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -44,7 +44,9 @@ def abortPreviousBuilds() {
     }
 }
 
-abortPreviousBuilds()
+if (env.BRANCH_NAME != "master") {
+    abortPreviousBuilds()
+}
 
 try {
     parallel UnitTests: {

diff --git a/Jenkinsfile.smoke b/Jenkinsfile.smoke
@@ -0,0 +1,120 @@
+def runDocker(image, cmd) {
+    powershell """
+        docker run `
+          --rm `
+          -w "${env.WORKSPACE}" `
+          -v "${env.WORKSPACE}:${env.WORKSPACE}:rw" `
+          -e "WORKSPACE=${env.WORKSPACE}" `
+          -e "BUILD_NUMBER=${env.BUILD_NUMBER}" `
+          $image powershell -C "$cmd"
+    """
+}
+
+def linuxImages = [
+    'openjdk:8-jdk',
+    'openjdk:11-jdk',
+    'openjdk:12-jdk',
+    'azul/zulu-openjdk:8',
+    'azul/zulu-openjdk:11',
+    'azul/zulu-openjdk:12',
+    'adoptopenjdk/openjdk8-openj9:latest',
+    'adoptopenjdk/openjdk11-openj9:latest'
+]
+
+def createLinuxBuild(dockerImage) {
+    return {
+        stage("Smoke ${dockerImage}") {
+            node {
+                checkout scm
+                docker.image(dockerImage).inside {
+                    try {
+                        timeout(30) {
+                            sh './gradlew --no-daemon ' + params.gradle_options + ' build'
+                        }
+                    } finally {
+                        junit testResults: '**/build/test-results/**/*.xml', allowEmptyResults: true
+                    }
+                }
+            }
+        }
+    }
+}
+
+def linuxImagesPrivate = [
+    'pegasyseng/jdk:oracle-8-0.0.1',
+    'pegasyseng/jdk:oracle-11-0.0.1',
+    'pegasyseng/jdk:corretto-8-0.0.1'
+]
+
+def createLinuxBuildPrivateImage(dockerImage) {
+    return {
+        stage("Smoke ${dockerImage}") {
+            node {
+                checkout scm
+                docker.withRegistry('https://registry.hub.docker.com', 'dockerhub-pegasysengci') {
+                    docker.image(dockerImage).inside {
+                        try {
+                            timeout(30) {
+                                sh './gradlew --no-daemon ' + params.gradle_options + ' build'
+                            }
+                        } finally {
+                            junit testResults: '**/build/test-results/**/*.xml', allowEmptyResults: true
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+def windowsImages = [
+    "openjdk:8-windowsservercore",
+    "openjdk:11-windowsservercore",
+    "openjdk:12-windowsservercore"
+]
+
+def createWindowsBuild(dockerImage) {
+    return {
+        stage("Smoke ${dockerImage}") {
+            node("windows-server-2019") {
+                checkout scm
+                try {
+                    timeout(30) {
+                        runDocker(
+                            dockerImage,
+                            ".\\gradlew --no-daemon " + params.gradle_options + " build"
+                        )
+                    }
+                } finally {
+                    junit testResults: "**\\build\\test-results\\**\\*.xml", allowEmptyResults: true
+                }
+            }
+        }
+    }
+}
+
+def builds = [:]
+
+if (params.javas != 'all') {
+    builds = builds + (windowsImages.findAll {it.contains(params.javas)}.collectEntries {
+        ["Smoke ${it}", createWindowsBuild(it)]
+    })
+    builds = builds + (linuxImages.findAll {it.contains(params.javas)}.collectEntries {
+        ["Smoke ${it}", createLinuxBuild(it)]
+    })
+    builds = builds + (linuxImagesPrivate.findAll {it.contains(params.javas)}.collectEntries {
+        ["Smoke ${it}", createLinuxBuildPrivateImage(it)]
+    })
+} else {
+    builds = builds + (windowsImages.collectEntries {
+        ["Smoke ${it}", createWindowsBuild(it)]
+    })
+    builds = builds + (linuxImages.collectEntries {
+        ["Smoke ${it}", createLinuxBuild(it)]
+    })
+    builds = builds + (linuxImagesPrivate.collectEntries {
+        ["Smoke ${it}", createLinuxBuildPrivateImage(it)]
+    })
+}
+
+parallel builds
diff --git a/PRIVACYROADMAP.MD b/PRIVACYROADMAP.MD
@@ -0,0 +1,26 @@
+# Privacy Roadmap
+
+This document provides a more detailed view of the privacy roadmap. Like [the overall roadmap](ROADMAP.md), 
+it is a living document, which will evolve and change over time.  In particular the features in later versions 
+are likely to be refined and change.
+
+We use the approach of  `#now`, `#next`, `#later` [used by foursquare](https://medium.com/@noah_weiss/now-next-later-roadmaps-without-the-drudgery-1cfe65656645), with a slightly different time horizon.  
+Our now scale is about 3 months, next about 6 months, and then later is beyond.
+
+## Now (up to v1.2)
+
+* Privacy group management added to JSON RPC-API
+* Support for external key management 
+
+## Next 
+
+* Ability to add and remove members from privacy groups
+* Many to many relationship between Pantheon nodes and Orion nodes 
+* Privacy group consensus 
+* Cross privacy group communication 
+* On-chain privacy 
+
+## Later
+
+* Sidechains
+
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -5,34 +5,17 @@ evolve and change over time.  In particular the features in later versions are l
 We use the approach of  `#now`, `#next`, `#later` [used by foursquare](https://medium.com/@noah_weiss/now-next-later-roadmaps-without-the-drudgery-1cfe65656645), with a slightly different time horizon.  
 Our now scale is about 3 months, next about 6 months, and then later is beyond.
 
-## Now (up to v1.1)
+## Now (up to v1.2)
 Our key areas for now are:
 * Privacy
 * Smart Contract Based Permissioning
 * First Class Client
 
-### Privacy
-The Enterprise Ethereum `restricted` privacy will be implemented.
+### Advanced Privacy
+The current privacy functionality will be enhanced as described in the [privacy roadmap](PRIVACYROADMAP.MD).
 
 ### Smart Contract Based Permissioning
-Building on the Permissioning mechanism implemented in v1.0, Pantheon will use a smart contract to share 
-permissioning information across the network. This will create a single, decentralized source of truth for node and account 
- permissions.
-
-### First Class Client
-There is ongoing work to enhance Pantheon's performance, to ensure it behaves well as a first class client. 
-The current initiatives include the implementation of performance benchmarks, of a fast sync mechanism, and of 
-support for all major testnets.
-
-## Next
-The key areas for next are:
-* IBFT 2.x
-* Ethereum 1.x
-* State Pruning
-
-### IBFT 2.x 
-
-Continued network and consensus improvements to IBFT 2.0. 
+Building on the smart contract based permissioning mechanism implemented in v1.1, additional tooling will be provided through a Dapp to simplify and enhance the interaction with the smart contracts. Permissioning for Ethereum accounts will also be introduced.
 
 ### Ethereum 1.x
 The 1.x series of EIPs that are currently under early development will be implemented as they are ready.  In addition, the team will work on helping the specification of the Ethereum roadmap.
@@ -41,11 +24,16 @@ The 1.x series of EIPs that are currently under early development will be implem
 
 State pruning will be implemented. State pruning reduces the disk space required for the Pantheon database by discarding outdated world state data.
 
+## Next
+The key areas for next are:
+* Secure key-store and key management
+* Disaster Recovery
+* Permissioning governance
+* IBFT 2.x 
+
 ## Future
 In addition to making incremental improvements to the above features, there will be some bigger pieces of work.  
 These are deliberately kept vague at this time, and will be elaborated upon when they move up to the now and next levels of work.
 * Ethereum 2.0
-* Advanced Privacy
 * Alternate Consensus Mechanisms
 * Sidechains
-