various tweaks, combine payloads in ImportTx

src/cc/betprotocol.h

@@ -54,7 +54,6 @@ protected:
     char* disputeFunc = (char*) "DisputeBet";
     std::vector<CC*> playerConditions();
 public:
-    CAmount MINFEE = 1;
     std::vector<CPubKey> players;
     DisputeHeader disputeHeader;
 
@@ -64,7 +63,7 @@ public:
 
     // on PANGEA
     CC* MakeDisputeCond();
-    CMutableTransaction MakeSessionTx();
+    CMutableTransaction MakeSessionTx(CAmount spendFee);
     CMutableTransaction MakeDisputeTx(uint256 signedSessionTxHash, uint256 vmResultHash);
     CMutableTransaction MakePostEvidenceTx(uint256 signedSessionTxHash,
             int playerIndex, std::vector<unsigned char> state);
@@ -78,4 +77,8 @@ public:
 };
 
 
+
+bool GetOpReturnHash(CScript script, uint256 &hash);
+
+
 #endif /* BETPROTOCOL_H */