               (make-chaincode-spec chaincode-id)
               (make-chaincode-invocation-spec))]
      
-     (-> (ProposalPackage$ChaincodeProposalPayload/newBuilder)
-         (.setInput (.toByteString chaincode-invocation-spec))
-         (.putAllTransientMap transient-map)
-         (.build)))))
+     (-> (proto/new-builder ProposalPackage$ChaincodeProposalPayload)
+         (proto/set-input (.toByteString chaincode-invocation-spec))
+         (proto/put-all-transient-map transient-map)
+         (proto/build)))))
 
 (defn make-signed-proposal
   [^ProposalPackage$Proposal proposal user]
-  (-> (ProposalPackage$SignedProposal/newBuilder)
-      (.setProposalBytes (.toByteString proposal))
-      (.setSignature (-> (.toByteArray proposal)
-                         #^bytes (crypto-suite/sign
-                                  (:private-key user)
-                                  {:algorithm (:key-algorithm (:crypto-suite user))})
-                         (ByteString/copyFrom)))
-      (.build)))
+  (-> (proto/new-builder ProposalPackage$SignedProposal)
+      (proto/set-proposal-bytes (.toByteString proposal))
+      (proto/set-signature (-> (.toByteArray proposal)
+                               #^bytes (crypto-suite/sign
+                                        (:private-key user)
+                                        {:algorithm (:key-algorithm (:crypto-suite user))})
+                               (ByteString/copyFrom)))
+      (proto/build)))
 
 
 ;;;

  default-epoch)

(defn make-chaincode-header
  [^Chaincode$ChaincodeID chaincode-id channel-id tx-id epoch]
  (make-channel-header Common$HeaderType/ENDORSER_TRANSACTION ; type
                       1                ; version
                       channel-id
                       tx-id


(defn make-signature-header
  [creator nonce]
  (-> (proto/new-builder Common$SignatureHeader)
      (proto/set-creator creator)
      (proto/set-nonce nonce)
      (proto/build)))

(defn make-header
  [^Common$ChannelHeader channel-header ^Common$SignatureHeader signature-header]
  (-> (proto/new-builder Common$Header)
      (proto/set-channel-header (.toByteString channel-header))
      (proto/set-signature-header (.toByteString signature-header))
      (proto/build)))

(defn make-proposal
  ([header payload]
   (make-proposal header payload ByteString/EMPTY))
  ([^Common$Header header ^ProposalPackage$ChaincodeProposalPayload payload extension]
   (-> (proto/new-builder ProposalPackage$Proposal)
       (proto/set-header (.toByteString header))
       (proto/set-payload (.toByteString payload))
       (proto/set-extension extension)
       (proto/build))))

(defn make-chaincode-proposal-payload
  ([chaincode-id fcn args]
