API tools faq
paste
Guest User

Untitled

a guest
May 12th, 2018
197
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.67 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/benchmark/simple/config-iroha.json b/benchmark/simple/config-iroha.json
  2. index 046c9e3..f793cc1 100644
  3. --- a/benchmark/simple/config-iroha.json
  4. +++ b/benchmark/simple/config-iroha.json
  5. @@ -5,7 +5,7 @@
  6. },
  7. "command" : {
  8. "start": "docker-compose -f network/iroha/simplenetwork/docker-compose.yml up -d",
  9. - "end" : "docker-compose -f network/iroha/simplenetwork/docker-compose.yml down"
  10. + "end" : "docker logs iroha_node0; docker logs iroha_node1; docker-compose -f network/iroha/simplenetwork/docker-compose.yml down"
  11. },
  12. "test": {
  13. "clients": {
  14. @@ -40,4 +40,4 @@
  15. ],
  16. "interval": 1
  17. }
  18. -}
  19. \ No newline at end of file
  20. +}
  21. diff --git a/network/iroha/simplenetwork/admin@test.priv b/network/iroha/simplenetwork/admin@test.priv
  22. index 70f1b7d..c8beb1c 100644
  23. --- a/network/iroha/simplenetwork/admin@test.priv
  24. +++ b/network/iroha/simplenetwork/admin@test.priv
  25. @@ -1 +1 @@
  26. -1180502d973ca80fab116e5151ea7208f9f660d50a30f13bf6c24cc209de306b
  27. \ No newline at end of file
  28. +9ee780a64ee96d6fa2fe3d36e9eb70e655ccc483a80dead838ef8845e2036aef
  29. \ No newline at end of file
  30. diff --git a/network/iroha/simplenetwork/admin@test.pub b/network/iroha/simplenetwork/admin@test.pub
  31. index c4eee76..bfa056d 100644
  32. --- a/network/iroha/simplenetwork/admin@test.pub
  33. +++ b/network/iroha/simplenetwork/admin@test.pub
  34. @@ -1 +1 @@
  35. -a59ecc3eb4e94ce187f460024d89bbbb28ba19368b9fbbd65faff51e08e04c96
  36. \ No newline at end of file
  37. +e4ac116c77469f7f8f1d2f856f289e3bedbb02ca411a65213ab012efa198bda2
  38. \ No newline at end of file
  39. diff --git a/network/iroha/simplenetwork/genesis.block b/network/iroha/simplenetwork/genesis.block
  40. index df01809..ad31bc9 100644
  41. --- a/network/iroha/simplenetwork/genesis.block
  42. +++ b/network/iroha/simplenetwork/genesis.block
  43. @@ -1,118 +1 @@
  44. -{
  45. - "signatures": [],
  46. - "created_ts": 0,
  47. - "hash": "491961564837aec0859a7e1ef3ff3fc94d8ac7167e209bcb034a3ab573202927",
  48. - "prev_hash": "0000000000000000000000000000000000000000000000000000000000000000",
  49. - "height": 1,
  50. - "txs_number": 1,
  51. - "transactions": [
  52. - {
  53. - "signatures": [],
  54. - "created_ts": 0,
  55. - "creator_account_id": "",
  56. - "tx_counter": 0,
  57. - "commands": [
  58. - {
  59. - "command_type": "AddPeer",
  60. - "peer": {
  61. - "address": "iroha-node0:10001",
  62. - "peer_key": "bb6fecd300bd8adb717e9431c04e4c809363c00b3a4d91c85b6b6d5557873258"
  63. - }
  64. - },
  65. - {
  66. - "command_type": "AddPeer",
  67. - "peer": {
  68. - "address": "iroha-node1:10001",
  69. - "peer_key": "5bea110012e064a05c087788f3f69fa2b15b1712d5b795d986d882b9b0d8ec51"
  70. - }
  71. - },
  72. - {
  73. - "command_type": "CreateRole",
  74. - "role_name": "admin",
  75. - "permissions": [
  76. - "can_add_peer",
  77. - "can_add_signatory",
  78. - "can_append_role",
  79. - "can_create_account",
  80. - "can_create_domain",
  81. - "can_get_all_acc_ast",
  82. - "can_get_all_acc_ast_txs",
  83. - "can_get_all_acc_txs",
  84. - "can_get_all_accounts",
  85. - "can_get_all_signatories",
  86. - "can_get_all_txs",
  87. - "can_get_roles",
  88. - "can_read_assets",
  89. - "can_remove_signatory",
  90. - "can_set_quorum"
  91. - ]
  92. - },
  93. - {
  94. - "command_type": "CreateRole",
  95. - "role_name": "user",
  96. - "permissions": [
  97. - "can_add_signatory",
  98. - "can_get_my_acc_ast",
  99. - "can_get_my_acc_ast_txs",
  100. - "can_get_my_acc_txs",
  101. - "can_get_my_account",
  102. - "can_get_my_signatories",
  103. - "can_get_my_txs",
  104. - "can_grant_can_add_signatory",
  105. - "can_grant_can_remove_signatory",
  106. - "can_grant_can_set_detail",
  107. - "can_grant_can_set_quorum",
  108. - "can_grant_can_transfer",
  109. - "can_receive",
  110. - "can_remove_signatory",
  111. - "can_set_quorum",
  112. - "can_transfer"
  113. - ]
  114. - },
  115. - {
  116. - "command_type": "CreateRole",
  117. - "role_name": "moneyad",
  118. - "permissions": [
  119. - "can_add_asset_qty",
  120. - "can_create_asset",
  121. - "can_receive",
  122. - "can_transfer"
  123. - ]
  124. - },
  125. - {
  126. - "command_type": "CreateDomain",
  127. - "domain_id": "test",
  128. - "user_default_role": "user"
  129. - },
  130. - {
  131. - "command_type": "CreateAsset",
  132. - "asset_name": "coin",
  133. - "domain_id": "test",
  134. - "precision": 2
  135. - },
  136. - {
  137. - "command_type": "CreateAccount",
  138. - "account_name": "admin",
  139. - "domain_id": "test",
  140. - "pubkey": "a59ecc3eb4e94ce187f460024d89bbbb28ba19368b9fbbd65faff51e08e04c96"
  141. - },
  142. - {
  143. - "command_type": "CreateAccount",
  144. - "account_name": "test",
  145. - "domain_id": "test",
  146. - "pubkey": "b9fab88936a355bb855deecd4e774b290aec2c30d539246f8f26b00dd59aa757"
  147. - },
  148. - {
  149. - "command_type": "AppendRole",
  150. - "account_id": "admin@test",
  151. - "role_name": "admin"
  152. - },
  153. - {
  154. - "command_type": "AppendRole",
  155. - "account_id": "admin@test",
  156. - "role_name": "moneyad"
  157. - }
  158. - ]
  159. - }
  160. - ]
  161. -}
  162. \ No newline at end of file
  163. +{"payload":{"transactions":[{"payload":{"commands":[{"addPeer":{"peer":{"address":"iroha-node0:10001","peerKey":"TU7OhdtoBtOLCZOJqoRQRyXEkyGaEqaBI0C/I5KU56k="}}},{"addPeer":{"peer":{"address":"iroha-node1:10001","peerKey":"ZDhECoYOcjGWp9ldAwv8zR3z4A2fc05oV12HUCBKFEM="}}},{"createRole":{"roleName":"admin","permissions":["can_add_peer","can_add_signatory","can_append_role","can_create_account","can_create_domain","can_get_all_acc_ast","can_get_all_acc_ast_txs","can_get_all_acc_detail","can_get_all_acc_txs","can_get_all_accounts","can_get_all_signatories","can_get_all_txs","can_get_roles","can_read_assets","can_remove_signatory","can_set_quorum"]}},{"createRole":{"roleName":"user","permissions":["can_add_signatory","can_get_my_acc_ast","can_get_my_acc_ast_txs","can_get_my_acc_detail","can_get_my_acc_txs","can_get_my_account","can_get_my_signatories","can_get_my_txs","can_grant_can_add_my_signatory","can_grant_can_remove_my_signatory","can_grant_can_set_my_account_detail","can_grant_can_set_my_quorum","can_grant_can_transfer_my_assets","can_receive","can_remove_signatory","can_set_quorum","can_transfer"]}},{"createRole":{"roleName":"moneyad","permissions":["can_add_asset_qty","can_create_asset","can_receive","can_transfer"]}},{"createDomain":{"domainId":"test","defaultRole":"user"}},{"createAsset":{"assetName":"coin","domainId":"test","precision":2}},{"createAccount":{"accountName":"admin","domainId":"test","mainPubkey":"5KwRbHdGn3+PHS+FbyieO+27AspBGmUhOrAS76GYvaI="}},{"createAccount":{"accountName":"test","domainId":"test","mainPubkey":"nJ+oYg8/10LlJKdMD+CeZjUL7QLWrjsaZJ2N7+FiXXg="}},{"appendRole":{"accountId":"admin@test","roleName":"admin"}},{"appendRole":{"accountId":"admin@test","roleName":"moneyad"}}]}}],"txNumber":1,"height":"1","prevBlockHash":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="}}
  164. diff --git a/network/iroha/simplenetwork/node0/node0.priv b/network/iroha/simplenetwork/node0/node0.priv
  165. index a6a18da..98756f6 100644
  166. --- a/network/iroha/simplenetwork/node0/node0.priv
  167. +++ b/network/iroha/simplenetwork/node0/node0.priv
  168. @@ -1 +1 @@
  169. -255f6a2388ce3bd368435c74d9895f44cde8c6fa7e00a7bfc790fb357829fd5b
  170. \ No newline at end of file
  171. +6de0baf46e214dd92dd0d08b5a5595d6b85c92617f33adb9d1e2290553b961d5
  172. \ No newline at end of file
  173. diff --git a/network/iroha/simplenetwork/node0/node0.pub b/network/iroha/simplenetwork/node0/node0.pub
  174. index 2233aa2..47d53e7 100644
  175. --- a/network/iroha/simplenetwork/node0/node0.pub
  176. +++ b/network/iroha/simplenetwork/node0/node0.pub
  177. @@ -1 +1 @@
  178. -bb6fecd300bd8adb717e9431c04e4c809363c00b3a4d91c85b6b6d5557873258
  179. \ No newline at end of file
  180. +4d4ece85db6806d38b099389aa84504725c493219a12a6812340bf239294e7a9
  181. \ No newline at end of file
  182. diff --git a/network/iroha/simplenetwork/node1/node1.priv b/network/iroha/simplenetwork/node1/node1.priv
  183. index a1be96a..b42931f 100644
  184. --- a/network/iroha/simplenetwork/node1/node1.priv
  185. +++ b/network/iroha/simplenetwork/node1/node1.priv
  186. @@ -1 +1 @@
  187. -c4d68dafced63c2ba9cd9d6a79d38d183e3d9a0891d0b125dea508f1d6e43158
  188. \ No newline at end of file
  189. +02d332020fe4d571b3976522f3c24f032945b179e107b2e7182893bb9d1903cf
  190. \ No newline at end of file
  191. diff --git a/network/iroha/simplenetwork/node1/node1.pub b/network/iroha/simplenetwork/node1/node1.pub
  192. index 660b71c..1a197ba 100644
  193. --- a/network/iroha/simplenetwork/node1/node1.pub
  194. +++ b/network/iroha/simplenetwork/node1/node1.pub
  195. @@ -1 +1 @@
  196. -5bea110012e064a05c087788f3f69fa2b15b1712d5b795d986d882b9b0d8ec51
  197. \ No newline at end of file
  198. +6438440a860e723196a7d95d030bfccd1df3e00d9f734e68575d8750204a1443
  199. \ No newline at end of file
  200. diff --git a/network/iroha/simplenetwork/test@test.priv b/network/iroha/simplenetwork/test@test.priv
  201. index d22eba1..1212bca 100644
  202. --- a/network/iroha/simplenetwork/test@test.priv
  203. +++ b/network/iroha/simplenetwork/test@test.priv
  204. @@ -1 +1 @@
  205. -e378c8eab78f6712b08306f22eadf05d9222aa37fc3d7c891805ee7461295351
  206. \ No newline at end of file
  207. +25936afb5d7ab3dc85ef82618699abb2d0320cb903f879c3c8eab182fc73067c
  208. \ No newline at end of file
  209. diff --git a/network/iroha/simplenetwork/test@test.pub b/network/iroha/simplenetwork/test@test.pub
  210. index 145fce1..ecfaa3a 100644
  211. --- a/network/iroha/simplenetwork/test@test.pub
  212. +++ b/network/iroha/simplenetwork/test@test.pub
  213. @@ -1 +1 @@
  214. -b9fab88936a355bb855deecd4e774b290aec2c30d539246f8f26b00dd59aa757
  215. \ No newline at end of file
  216. +9c9fa8620f3fd742e524a74c0fe09e66350bed02d6ae3b1a649d8defe1625d78
  217. \ No newline at end of file
  218. diff --git a/package.json b/package.json
  219. index 19dddf4..f4aa3e7 100644
  220. --- a/package.json
  221. +++ b/package.json
  222. @@ -21,6 +21,7 @@
  223. "commander": "^2.11.0",
  224. "dockerode": "^2.5.0",
  225. "fs-extra": "^4.0.2",
  226. + "iroha-lib": "0.0.6",
  227. "jsrsasign": "^8.0.4",
  228. "mustache": "^2.3.0",
  229. "node-zookeeper-client": "^0.2.2",
  230. diff --git a/src/iroha/iroha.js b/src/iroha/iroha.js
  231. index c40451e..6dee3af 100644
  232. --- a/src/iroha/iroha.js
  233. +++ b/src/iroha/iroha.js
  234. @@ -428,7 +428,7 @@ module.exports = Iroha;
  235. function irohaCommand(client, account, time, counter, keys, commands) {
  236. try {
  237. var tx = txBuilder.creatorAccountId(account)
  238. - .txCounter(counter)
  239. + // .txCounter(counter)
  240. .createdTime(time);
  241. var txHash;
  242. return commands.reduce((prev, command) => {
  243. @@ -513,4 +513,4 @@ function irohaQuery(client, account, time, counter, keys, commands, callback) {
  244. console.log(err);
  245. return Promise.reject('Failed to submit iroha query');
  246. }
  247. -}
  248. \ No newline at end of file
  249. +}
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!