Merge pull request #9 from JoyStream/development

dev to master - v0.2.0

Author: mnaamani

conan_package/base.py

@@ -9,11 +9,11 @@ class PaymentChannelBase(ConanFile):
     repo_https_url = "https://github.com/JoyStream/paymentchannel-cpp.git"
     description = "Conan recipe for paymentchannel-cpp library"
 
-    version="0.1.2"
+    version="0.2.0"
     build_policy = "missing"
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
-    requires = "Common/0.1.2@joystream/stable", "CoinCore/0.1.2@joystream/stable"
+    requires = "Common/0.2.0@joystream/stable"
 
     def source(self):
         raise Exception("abstract base package was exported")

conan_package/release_include_source.py conan_package/dev_include_source.pyconan_package/release_include_source.py renamed to conan_package/dev_include_source.py

@@ -12,6 +12,8 @@ class PaymnetChannelRelease(PaymentChannelBase):
 
     exports_sources = "../sources*"
 
+    build_policy="always"
+
     def source(self):
         os.mkdir("repo")
         shutil.move("sources", "repo/")

conan_package/test_package/CMakeLists.txt

@@ -1,5 +1,5 @@
 PROJECT(PackageTest)
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 11)
 

conan_package/test_package/example.cpp

@@ -1,7 +1,8 @@
 #include <paymentchannel/paymentchannel.hpp>
 
 int main() {
-  joystream::paymentchannel::Payor payor;
-  joystream::paymentchannel::Payee payee;
+  const Coin::Network network = Coin::Network::mainnet;
+  joystream::paymentchannel::Payor payor(network);
+  joystream::paymentchannel::Payee payee(network);
   return 0;
 }

example/CMakeLists.txt

@@ -1,5 +1,5 @@
 PROJECT(PackageTest)
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 11)
 

example/example.cpp

@@ -11,6 +11,7 @@ int main(int argc, char* argv[]) {
   const uint64_t settlementFee = 2500;
   const uint64_t refundFee = 2500;
   const uint64_t refundAmount = funds - refundFee;
+  const Coin::Network network = Coin::Network::mainnet;
 
   Coin::RelativeLockTime refundLockTime = Coin::RelativeLockTime::fromBlockUnits(5);
   const Coin::typesafeOutPoint anchor;
@@ -19,7 +20,7 @@ int main(int argc, char* argv[]) {
   const Coin::PublicKey payeeContractPk = Coin::PrivateKey::generate().toPublicKey();
   const Coin::PubKeyHash payeeFinalPkHash;
 
-  joystream::paymentchannel::Payor payor(price, numberOfPaymentsMade, funds, settlementFee, refundLockTime, anchor, payorContractKeyPair, payorFinalPkHash, payeeContractPk, payeeFinalPkHash);
+  joystream::paymentchannel::Payor payor(price, numberOfPaymentsMade, funds, settlementFee, refundLockTime, anchor, payorContractKeyPair, payorFinalPkHash, payeeContractPk, payeeFinalPkHash, network);
 
   auto refund = payor.refund();
 

sources/include/paymentchannel/ContractTransactionBuilder.hpp

@@ -17,6 +17,7 @@
 
 namespace Coin {
     class Transaction;
+    enum class Network;
 }
 
 namespace joystream {
@@ -44,15 +45,16 @@ class ContractTransactionBuilder {
      * is also signed if funding was provided.
      * @return contract transaction
      */
-    Coin::Transaction transaction() const;
+    Coin::Transaction transaction(Coin::Network) const;
 
     // Transaction fee for contract with given terms
-    static uint64_t totalFee(uint32_t numberOfCommitments, bool hasChange, uint64_t feePerKb, uint64_t sizeOfAllInputs);
+    static uint64_t totalFee(uint32_t numberOfCommitments, bool hasChange, uint64_t feePerKb, uint64_t sizeOfAllInputs,
+                                Coin::Network);
 
 private:
 
     // The size of a contract transaction with given terms
-    static uint64_t transactionSize(uint32_t, bool);
+    static uint64_t transactionSize(uint32_t, bool, Coin::Network);
 
     // Funding contract
     boost::optional<Coin::UnspentOutputSet> _funding;

sources/include/paymentchannel/Payee.hpp

@@ -36,7 +36,7 @@ namespace paymentchannel {
 
     public:
 
-        Payee();
+        Payee(Coin::Network network);
 
         Payee(uint64_t numberOfPaymentsMade,
               Coin::RelativeLockTime lockTime,
@@ -48,7 +48,8 @@ namespace paymentchannel {
               const Coin::PubKeyHash & payeeFinalPkHash,
               const Coin::PublicKey & payorContractPk,
               const Coin::PubKeyHash & payorFinalPkHash,
-              const Coin::Signature & lastValidPayorPaymentSignature);
+              const Coin::Signature & lastValidPayorPaymentSignature,
+              Coin::Network network);
 
         // Attempts to register payment if signature is valid
         // ==================================================
@@ -145,6 +146,7 @@ namespace paymentchannel {
         // The last valid payment signature received, corresponds to _numberOfPaymentsMade
         Coin::Signature _lastValidPayorPaymentSignature;
 
+        Coin::Network _network;
     };
 
 }

sources/include/paymentchannel/Payor.hpp

@@ -38,7 +38,7 @@ namespace paymentchannel {
 
     public:
 
-        Payor();
+        Payor(Coin::Network network);
 
         Payor(uint64_t price,
                 uint64_t numberOfPaymentsMade,
@@ -49,7 +49,8 @@ namespace paymentchannel {
                 const Coin::KeyPair & payorContractKeyPair,
                 const Coin::PubKeyHash & payorFinalPkHash,
                 const Coin::PublicKey & payeeContractPk,
-                const Coin::PubKeyHash & payeeFinalPkHash);
+                const Coin::PubKeyHash & payeeFinalPkHash,
+                Coin::Network network);
 
         // Commitment for channel
         Commitment commitment() const;
@@ -132,6 +133,8 @@ namespace paymentchannel {
 
         // Controls payee payments, received in sign_refund.pk
         Coin::PubKeyHash _payeeFinalPkHash;
+
+        Coin::Network _network;
     };
 
 }

sources/include/paymentchannel/Settlement.hpp

@@ -11,13 +11,13 @@
 #include <paymentchannel/Commitment.hpp>
 #include <common/Payment.hpp>
 #include <common/typesafeOutPoint.hpp>
-#include <common/Utilities.hpp>
 
 namespace Coin {
     class Transaction;
     class typesafeOutPoint;
     class TransactionSignature;
     class PrivateKey;
+    class SigHashType;
 }
 
 namespace joystream {
@@ -30,11 +30,13 @@ namespace paymentchannel {
         Settlement(const Coin::typesafeOutPoint & contractOutPoint,
                    const Commitment & commitment,
                    const Coin::Payment & toPayor,
-                   const Coin::Payment & toPayee);
+                   const Coin::Payment & toPayee,
+                   Coin::Network network);
 
         Settlement(const Coin::typesafeOutPoint & contractOutPoint,
                    const Commitment & commitment,
-                   const Coin::Payment & toPayor);
+                   const Coin::Payment & toPayor,
+                   Coin::Network network);
 
         // Creates to appropriate settlement given the dust
         // limit and transaction fee
@@ -43,7 +45,8 @@ namespace paymentchannel {
                                                          const Coin::PubKeyHash & payorPkHash,
                                                          const Coin::PubKeyHash & payeePkHash,
                                                          uint64_t paid,
-                                                         uint64_t fee);
+                                                         uint64_t fee,
+                                                         Coin::Network network);
 
         // Implicit fee by comparing commitment and (payor + payee) payment
         int64_t fee() const;
@@ -90,10 +93,11 @@ namespace paymentchannel {
 
         // Payment back to payor
         Coin::Payment _toPayor;
+
+        Coin::Network _network;
     };
 
 }
 }
 
 #endif // PAYMENT_CHANNEL_SETTLEMENT_HPP
-