복호화 이전까지 작업 완료

G0Yang · Aug 29, 2018 · 8142af6 · 8142af6
1 parent 943b122
commit 8142af6
Show file tree

Hide file tree

Showing 78 changed files with 688 additions and 891 deletions.
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
@@ -7,8 +7,10 @@
     "\\encryption",
     "\\ledger",
     "\\msp",
-    "\\msp\\msp_Client"
+    "\\msp\\msp_Client",
+    "\\msp\\msp_Server",
+    "\\Stakeholder"
   ],
-  "SelectedNode": "\\chaincode\\server_Json.py",
+  "SelectedNode": "\\test.py",
   "PreviewInSolutionExplorer": false
 }
diff --git a/.vs/foodchain/v15/.suo b/.vs/foodchain/v15/.suo
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/__pycache__/metadata.cpython-36.pyc b/__pycache__/metadata.cpython-36.pyc
diff --git a/chaincode/__pycache__/__init__.cpython-36.pyc b/chaincode/__pycache__/__init__.cpython-36.pyc
diff --git a/chaincode/__pycache__/blockToJson.cpython-36.pyc b/chaincode/__pycache__/blockToJson.cpython-36.pyc
diff --git a/chaincode/__pycache__/chainToJson.cpython-36.pyc b/chaincode/__pycache__/chainToJson.cpython-36.pyc
diff --git a/chaincode/__pycache__/leader_rand.cpython-36.pyc b/chaincode/__pycache__/leader_rand.cpython-36.pyc
diff --git a/chaincode/__pycache__/randFileName.cpython-36.pyc b/chaincode/__pycache__/randFileName.cpython-36.pyc
diff --git a/chaincode/__pycache__/server_Json.cpython-36.pyc b/chaincode/__pycache__/server_Json.cpython-36.pyc
diff --git a/chaincode/__pycache__/transactionToJson.cpython-36.pyc b/chaincode/__pycache__/transactionToJson.cpython-36.pyc
diff --git a/data_client/test.json b/data_client/test.json
diff --git a/data_client/tx_.json b/data_client/tx_.json
diff --git a/data_client/tx_52qp2i55919387.json b/data_client/tx_52qp2i55919387.json
diff --git a/data_client/tx_9z3crvy7897529.json b/data_client/tx_9z3crvy7897529.json
diff --git a/data_client/tx_opg5kvm5042464.json b/data_client/tx_opg5kvm5042464.json
diff --git a/data_server/202.31.146.57_skec.txt b/data_server/202.31.146.57_skec.txt
diff --git a/data_server/block_1n0o7t8l327069.json b/data_server/block_1n0o7t8l327069.json
diff --git a/data_server/block_5ngp95al922442.json b/data_server/block_5ngp95al922442.json
diff --git a/data_server/block_5wgc0aic535453.json b/data_server/block_5wgc0aic535453.json
diff --git a/data_server/block__4hkji3b357890.json b/data_server/block__4hkji3b357890.json
diff --git a/data_server/block_firmkm3l790079.json b/data_server/block_firmkm3l790079.json
diff --git a/data_server/block_iagt6o67749865.json b/data_server/block_iagt6o67749865.json
diff --git a/data_server/block_onrpj9qu731346.json b/data_server/block_onrpj9qu731346.json
diff --git a/data_server/block_owtn_tpj454413 b/data_server/block_owtn_tpj454413
diff --git a/data_server/block_owtn_tpj454413.json b/data_server/block_owtn_tpj454413.json
diff --git a/data_server/block_p992a85mn57458.json b/data_server/block_p992a85mn57458.json
diff --git a/data_server/block_przlvdlzy59073 b/data_server/block_przlvdlzy59073
diff --git a/data_server/block_przlvdlzy59073.json b/data_server/block_przlvdlzy59073.json
diff --git a/data_server/block_pvqpxmgnk65403.json b/data_server/block_pvqpxmgnk65403.json
diff --git a/data_server/block_px49ho0qf80261.json b/data_server/block_px49ho0qf80261.json
diff --git a/data_server/block_ssr624o9124819.json b/data_server/block_ssr624o9124819.json
diff --git a/data_server/block_w0_cwm84182280 b/data_server/block_w0_cwm84182280
diff --git a/data_server/block_w0_cwm84182280.json b/data_server/block_w0_cwm84182280.json
diff --git a/data_server/block_zeh1ca9p444012.json b/data_server/block_zeh1ca9p444012.json
diff --git a/data_server/ch_1.json b/data_server/ch_1.json
diff --git a/data_server/tx_52qp2i55919387.json b/data_server/tx_52qp2i55919387.json
diff --git a/data_server/tx_9z3crvy7897529.json b/data_server/tx_9z3crvy7897529.json
diff --git a/data_server/tx_opg5kvm5042464.json b/data_server/tx_opg5kvm5042464.json
diff --git a/data_server/tx_panub__9023091.json b/data_server/tx_panub__9023091.json
diff --git a/encryption/__pycache__/__init__.cpython-36.pyc b/encryption/__pycache__/__init__.cpython-36.pyc
diff --git a/encryption/__pycache__/createSymKey.cpython-36.pyc b/encryption/__pycache__/createSymKey.cpython-36.pyc
diff --git a/encryption/__pycache__/tr_sk_decrypt.cpython-36.pyc b/encryption/__pycache__/tr_sk_decrypt.cpython-36.pyc
diff --git a/encryption/__pycache__/tr_sk_encrypt.cpython-36.pyc b/encryption/__pycache__/tr_sk_encrypt.cpython-36.pyc
diff --git a/hash256/__pycache__/__init__.cpython-36.pyc b/hash256/__pycache__/__init__.cpython-36.pyc
diff --git a/hash256/__pycache__/hash256.cpython-36.pyc b/hash256/__pycache__/hash256.cpython-36.pyc
diff --git a/ledger/__pycache__/__init__.cpython-36.pyc b/ledger/__pycache__/__init__.cpython-36.pyc
diff --git a/ledger/__pycache__/block.cpython-36.pyc b/ledger/__pycache__/block.cpython-36.pyc
diff --git a/ledger/__pycache__/blockheader.cpython-36.pyc b/ledger/__pycache__/blockheader.cpython-36.pyc
diff --git a/ledger/__pycache__/chain.cpython-36.pyc b/ledger/__pycache__/chain.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction.cpython-36.pyc b/ledger/__pycache__/transaction.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction_Auction.cpython-36.pyc b/ledger/__pycache__/transaction_Auction.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction_Inventory_Management.cpython-36.pyc b/ledger/__pycache__/transaction_Inventory_Management.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction_Producer.cpython-36.pyc b/ledger/__pycache__/transaction_Producer.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction_Seller.cpython-36.pyc b/ledger/__pycache__/transaction_Seller.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction_Vehicle_shipment.cpython-36.pyc b/ledger/__pycache__/transaction_Vehicle_shipment.cpython-36.pyc
diff --git a/ledger/__pycache__/transaction_Vehicle_wearing.cpython-36.pyc b/ledger/__pycache__/transaction_Vehicle_wearing.cpython-36.pyc
diff --git a/ledger/block.py b/ledger/block.py
@@ -16,14 +16,24 @@ def __init__(self, *args, **kwargs):
         self.BB = []
         try: 
             tx = args[0]
-            if str(type(tx)) == "<class 'ledger.transaction.transaction'>":
-                self.BB.append(tx)
-                self.BH.setCurrentHash(hash256(str(tx.toDict())).getHash())
-                self.transactionCount = self.transactionCount + 1
-                self.BB[0].txCount = self.transactionCount
-                sizeof = str(self.toDict())
-                self.blocksize = len(sizeof)
-                self.blockID=randFileName()[0:-5]
+            list_tx = ["<class 'ledger.transaction.transaction'>",
+                       "<class 'ledger.transaction_Producer.transaction_Producer'>",
+                       "<class 'ledger.transaction_Vehicle_wearing.transaction_Vehicle_wearing'>",
+                       "<class 'ledger.transaction_Vehicle_shipment.transaction_Vehicle_shipment'>",
+                       "<class 'ledger.transaction_Inventory_Management.transaction_Inventory_Management'>",
+                       "<class 'ledger.transaction_Auction.transaction_Auction'>",
+                       "<class 'ledger.transaction_Seller.transaction_Seller'>"]
+
+            for i in list_tx:
+                if str(type(tx)) == i:
+                    self.BB.append(tx)
+                    self.BH.setCurrentHash(hash256(str(tx.toDict())).getHash())
+                    self.transactionCount = self.transactionCount + 1
+                    self.BB[0].txCount = self.transactionCount
+                    sizeof = str(self.toDict())
+                    self.blocksize = len(sizeof)
+                    self.blockID=randFileName()[0:-5]
+
         except:
             print("init Error")
         return
@@ -123,4 +133,3 @@ def fromDict(self, Dict):
     print()
     print(b1.toDict())
     print("---------------------------------------------------")
-