High-level Aqua API (#35)

2024-12-04 07:10:21 +00:00 · 2022-02-04 18:45:37 +03:00 · 2022-02-04 18:45:37 +03:00 · 5609740216
commit 5609740216
parent 58648d7037
30 changed files with 12599 additions and 2177 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -23,7 +23,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
 "once_cell",
 "version_check",
 ]
@ -39,9 +39,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.51"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
+checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"

 [[package]]
 name = "arrayref"
@ -88,9 +88,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

 [[package]]
 name = "backtrace"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
 "addr2line",
 "cc",
@ -155,7 +155,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]

 [[package]]
@ -164,7 +164,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]

 [[package]]
@ -196,9 +196,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"

 [[package]]
 name = "bumpalo"
-version = "3.8.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"

 [[package]]
 name = "byte-tools"
@ -352,9 +352,9 @@ dependencies = [

 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
 "cfg-if 1.0.0",
 "crossbeam-utils",
@ -373,9 +373,9 @@ dependencies = [

 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
 dependencies = [
 "cfg-if 1.0.0",
 "crossbeam-utils",
@ -386,9 +386,9 @@ dependencies = [

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
 dependencies = [
 "cfg-if 1.0.0",
 "lazy_static",
@ -406,7 +406,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]

 [[package]]
@ -425,7 +425,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 "subtle 2.4.1",
 ]

@ -464,12 +464,12 @@ dependencies = [

 [[package]]
 name = "darling"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12"
+checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
 dependencies = [
- "darling_core 0.13.0",
- "darling_macro 0.13.0",
+ "darling_core 0.13.1",
+ "darling_macro 0.13.1",
 ]

 [[package]]
@ -488,9 +488,9 @@ dependencies = [

 [[package]]
 name = "darling_core"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3"
+checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
 dependencies = [
 "fnv",
 "ident_case",
@ -513,11 +513,11 @@ dependencies = [

 [[package]]
 name = "darling_macro"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc"
+checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
 dependencies = [
- "darling_core 0.13.0",
+ "darling_core 0.13.1",
 "quote",
 "syn",
 ]
@ -554,7 +554,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]

 [[package]]
@ -565,7 +565,7 @@ checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
 dependencies = [
 "block-buffer 0.10.0",
 "crypto-common",
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]

 [[package]]
@ -589,7 +589,7 @@ dependencies = [
 "rand 0.7.3",
 "serde",
 "serde_bytes",
- "sha2 0.9.8",
+ "sha2 0.9.9",
 "zeroize",
 ]

@ -611,9 +611,9 @@ dependencies = [

 [[package]]
 name = "erased-serde"
-version = "0.3.16"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de9ad4541d99dc22b59134e7ff8dc3d6c988c89ecd7324bf10a8362b07a2afa"
+checksum = "56047058e1ab118075ca22f9ecd737bcc961aa3566a3019cb71388afa280bd8a"
 dependencies = [
 "serde",
 ]
@ -641,9 +641,9 @@ dependencies = [

 [[package]]
 name = "eyre"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b"
+checksum = "bc225d8f637923fe585089fcf03e705c222131232d2c1fb622e84ecf725d0eb8"
 dependencies = [
 "indenter",
 "once_cell",
@ -689,6 +689,15 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"

+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.1"
@ -769,7 +778,7 @@ dependencies = [
 "serde_bytes",
 "serde_json",
 "serde_with",
- "sha2 0.9.8",
+ "sha2 0.9.9",
 "signature",
 "thiserror",
 "zeroize",
@ -793,9 +802,9 @@ dependencies = [

 [[package]]
 name = "futures"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
+checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -808,9 +817,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
+checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
 dependencies = [
 "futures-core",
 "futures-sink",
@ -818,15 +827,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
+checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"

 [[package]]
 name = "futures-executor"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
+checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
 dependencies = [
 "futures-core",
 "futures-task",
@ -836,15 +845,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
+checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"

 [[package]]
 name = "futures-macro"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
+checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
 dependencies = [
 "proc-macro2",
 "quote",
@ -853,15 +862,15 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
+checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"

 [[package]]
 name = "futures-task"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
+checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"

 [[package]]
 name = "futures-timer"
@ -871,9 +880,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"

 [[package]]
 name = "futures-util"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
+checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -908,9 +917,9 @@ dependencies = [

 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
 "typenum",
 "version_check",
@ -929,9 +938,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@ -1045,7 +1054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
 "digest 0.9.0",
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 "hmac 0.8.1",
 ]

@ -1080,9 +1089,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"

 [[package]]
 name = "indexmap"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
 "autocfg",
 "hashbrown",
@ -1100,9 +1109,9 @@ dependencies = [

 [[package]]
 name = "inventory"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1367fed6750ff2a5bcb967a631528303bb85631f167a75eb1bf7762d57eb7678"
+checksum = "ce6b5d8c669bfbad811d95ddd7a1c6cf9cfdbf2777e59928b6f3fa8ff54f72a0"
 dependencies = [
 "ctor",
 "ghost",
@ -1146,15 +1155,15 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "0.4.8"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"

 [[package]]
 name = "js-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
 "wasm-bindgen",
 ]
@ -1186,9 +1195,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.109"
+version = "0.2.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01"
+checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"

 [[package]]
 name = "libp2p-core"
@ -1211,7 +1220,7 @@ dependencies = [
 "multihash",
 "multistream-select",
 "parking_lot 0.11.2",
- "pin-project 1.0.8",
+ "pin-project 1.0.10",
 "prost",
 "prost-build",
 "rand 0.8.4",
@ -1256,7 +1265,7 @@ dependencies = [
 "libsecp256k1-gen-genmult",
 "rand 0.8.4",
 "serde",
- "sha2 0.9.8",
+ "sha2 0.9.9",
 "typenum",
 ]

@ -1291,9 +1300,9 @@ dependencies = [

 [[package]]
 name = "libsqlite3-sys"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2"
+checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58"
 dependencies = [
 "pkg-config",
 "vcpkg",
@ -1310,9 +1319,9 @@ dependencies = [

 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
 "scopeguard",
 ]
@ -1635,9 +1644,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8"
 dependencies = [
 "digest 0.9.0",
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 "multihash-derive",
- "sha2 0.9.8",
+ "sha2 0.9.9",
 "unsigned-varint",
 ]

@ -1673,7 +1682,7 @@ dependencies = [
 "bytes",
 "futures",
 "log",
- "pin-project 1.0.8",
+ "pin-project 1.0.10",
 "smallvec",
 "unsigned-varint",
 ]
@ -1729,9 +1738,9 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
 "hermit-abi",
 "libc",
@ -1748,9 +1757,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"

 [[package]]
 name = "opaque-debug"
@ -1797,7 +1806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
 "instant",
- "lock_api 0.4.5",
+ "lock_api 0.4.6",
 "parking_lot_core 0.8.5",
 ]

@ -1862,27 +1871,27 @@ dependencies = [

 [[package]]
 name = "pin-project"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
+checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909"
 dependencies = [
- "pin-project-internal 0.4.28",
+ "pin-project-internal 0.4.29",
 ]

 [[package]]
 name = "pin-project"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
- "pin-project-internal 1.0.8",
+ "pin-project-internal 1.0.10",
 ]

 [[package]]
 name = "pin-project-internal"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
+checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1891,9 +1900,9 @@ dependencies = [

 [[package]]
 name = "pin-project-internal"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1902,9 +1911,9 @@ dependencies = [

 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"

 [[package]]
 name = "pin-utils"
@ -1914,9 +1923,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkg-config"
-version = "0.3.23"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1a3ea4f0dd7f1f3e512cf97bf100819aa547f36a6eccac8dbaae839eb92363e"
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"

 [[package]]
 name = "polyplets"
@ -1931,9 +1940,9 @@ dependencies = [

 [[package]]
 name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"

 [[package]]
 name = "proc-macro-crate"
@ -1971,9 +1980,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
 "unicode-xid",
 ]
@ -2056,9 +2065,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
 "proc-macro2",
 ]
@ -2123,7 +2132,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
 ]

 [[package]]
@ -2268,9 +2277,9 @@ dependencies = [

 [[package]]
 name = "rmp-serde"
-version = "0.15.1"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f74489002493a9984ee753ebd049552a1c82f0740e347ee9fc57c907fb19f83"
+checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d"
 dependencies = [
 "byteorder",
 "rmp",
@ -2279,9 +2288,9 @@ dependencies = [

 [[package]]
 name = "rusqlite"
-version = "0.26.1"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7"
+checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7"
 dependencies = [
 "bitflags",
 "fallible-iterator",
@ -2307,6 +2316,12 @@ dependencies = [
 "semver 0.9.0",
 ]

+[[package]]
+name = "rustversion"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
@ -2314,15 +2329,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
 "futures",
- "pin-project 0.4.28",
+ "pin-project 0.4.29",
 "static_assertions",
 ]

 [[package]]
 name = "ryu"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"

 [[package]]
 name = "safe-transmute"
@ -2371,9 +2386,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.118"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
 "serde_derive",
 ]
@ -2409,9 +2424,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2420,9 +2435,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.72"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
+checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
 dependencies = [
 "itoa",
 "ryu",
@ -2431,10 +2446,11 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "1.6.4"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44be9227e214a0420707c9ca74c2d4991d9955bae9415a8f93f05cebf561be5"
+checksum = "ad6056b4cb69b6e43e3a0f055def223380baecc99da683884f205bf347f7c4b3"
 dependencies = [
+ "rustversion",
 "serde",
 "serde_with_macros",
 ]
@ -2445,7 +2461,7 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e"
 dependencies = [
- "darling 0.13.0",
+ "darling 0.13.1",
 "proc-macro2",
 "quote",
 "syn",
@ -2465,9 +2481,9 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
 "block-buffer 0.9.0",
 "cfg-if 1.0.0",
@ -2489,9 +2505,9 @@ dependencies = [

 [[package]]
 name = "signature"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"

 [[package]]
 name = "slab"
@ -2501,9 +2517,9 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"

 [[package]]
 name = "smallvec"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"

 [[package]]
 name = "spin"
@ -2537,9 +2553,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

 [[package]]
 name = "syn"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2566,13 +2582,13 @@ checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"

 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
 "cfg-if 1.0.0",
+ "fastrand",
 "libc",
- "rand 0.8.4",
 "redox_syscall 0.2.10",
 "remove_dir_all",
 "winapi",
@ -2649,7 +2665,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_with",
- "sha2 0.9.8",
+ "sha2 0.9.9",
 "signature",
 "thiserror",
 ]
@ -2680,9 +2696,9 @@ dependencies = [

 [[package]]
 name = "typenum"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"

 [[package]]
 name = "typetag"
@ -2771,7 +2787,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
 ]

 [[package]]
@ -2792,9 +2808,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "void"
@ -2842,9 +2858,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
 "cfg-if 1.0.0",
 "wasm-bindgen-macro",
@ -2852,9 +2868,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
 "bumpalo",
 "lazy_static",
@ -2867,9 +2883,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@ -2877,9 +2893,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2890,9 +2906,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"

 [[package]]
 name = "wasmer-clif-backend-fl"
@ -3093,9 +3109,9 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@ -3103,9 +3119,9 @@ dependencies = [

 [[package]]
 name = "which"
-version = "4.2.2"
+version = "4.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9"
+checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
 dependencies = [
 "either",
 "lazy_static",
@ -3136,18 +3152,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "zeroize"
-version = "1.4.3"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
+checksum = "4062c749be08d90be727e9c5895371c3a0e49b90ba2b9592dc7afda95cc2b719"
 dependencies = [
 "zeroize_derive",
 ]

 [[package]]
 name = "zeroize_derive"
-version = "1.2.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
+checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 Trust Graph is network-wide peer relationship layer. It's designed to be used to prioritize resources and control permissions in open networks. Being a decentralized graph of relationships, basically a Web of Trust, Trust Graph is distributed among all network peers. 

-Specifically, Trust Graph is used is used to prioritize connections from known peers to counteract Sybil attacks while still keeping network open by reserving resources for unknown peers. 
+Specifically, Trust Graph is used to prioritize connections from known peers to counteract Sybil attacks while still keeping network open by reserving resources for unknown peers. 

 At the same time, Trust Graph can be used at the application level in various ways such as prioritization of service execution on authorized peers or to define an interconnected subnetwork among peers of a single protocol.

@ -14,7 +14,7 @@ See [example](./example):

 ## API

-Low-level API is defined in the [trust-graph-api.aqua](./aqua/trust-graph-api.aqua) module.
+High-level API is defined in the [trust-graph-api.aqua](./aqua/trust-graph-api.aqua) module.

 ## Directory structure

@ -22,9 +22,9 @@ Low-level API is defined in the [trust-graph-api.aqua](./aqua/trust-graph-api.aq

 - [`keypair`](./keypair) directory is an abstracted cryptographical layer (key pairs, public keys, signatures, etc.)

- [`service`](./service) is a package that provides `marine` API and could be compiled to a Wasm file. It is uses `SQLite` as storage.
+- [`service`](./service) is a package that provides `marine` API and could be compiled to a Wasm file. It is uses `SQLite` as storage

- [`example`](./example) is a `js` script that shows how to issue, sign trusts/revocations, export certificates and distinguish Fluence nodes
+- [`example`](./example) is a `js` script that shows how to use Trust Graph to label peers

 - [`builtin-package`](./builtin-package) contains blueprint, configs and scripts for generation builtin package locally or via CI

@ -35,3 +35,58 @@ Low-level API is defined in the [trust-graph-api.aqua](./aqua/trust-graph-api.aq
 * [Aqua Book](https://fluence.dev/aqua-book/)
 * [Aqua Playground](https://github.com/fluencelabs/aqua-playground)
 * [Aqua repo](https://github.com/fluencelabs/aqua)
+
+## How to use in Aqua
+
+```
+import "@fluencelabs/trust-graph/trust-graph-api.aqua"
+import "@fluencelabs/trust-graph/trust-graph.aqua"
+
+func my_function(peer_id: string) -> u32:
+    on HOST_PEER_ID:
+        result <- get_weight(peer_id)
+    <- result
+```
+
+## How to use is js
+1. Add the following to your dependencies
+    - `@fluencelabs/trust-graph`
+    - `@fluencelabs/aqua`
+    - `@fluencelabs/aqua-lib`
+    - `@fluencelabs/fluence`
+    - `@fluencelabs/fluence-network-environment`
+
+2. Import dependencies
+   ```typescript
+   import * as tg from "./generated/export";
+   import { Fluence, KeyPair } from "@fluencelabs/fluence";
+   import { krasnodar, Node } from "@fluencelabs/fluence-network-environment";
+   ```
+3. Create client (specify keypair if you are node owner
+[link](https://github.com/fluencelabs/node-distro/blob/main/fluence/Config.default.toml#L9))
+
+   ```typescript
+   await Fluence.start({ connectTo: relay /*, KeyPair: builtins_keypair*/});
+   ```
+4. Add root and issue root trust.
+   ```typescript
+   let peer_id = Fluence.getStatus().peerId;
+   let relay = Fluence.getStatus().relayPeerId;
+   assert(peer_id !== null);
+   assert(relay !== null);
+   let max_chain_len = 2;
+   let far_future = tg.timestamp_sec() + 9999999999;
+   let error = await tg.add_root_trust(relay, peer_id, max_chain_len, far_future);
+   if (error !== null) {
+    console.log(error);
+   }
+   ```
+5. For now, trusts/revocations can only be signed with the client's private key.
+   Keypair specification will be available soon.
+   ```typescript
+   // issue signed trust
+   let error = await tg.issue_trust(relay, peer_id, issued_for_peer_id, expires_at_sec);
+   if (error !== null) {
+    console.log(error);
+   }
+   ```
--- a/admin/README.md
+++ b/admin/README.md
@ -10,3 +10,5 @@
 all Fluence Labs relations. Trust from issuer key to any peer id means that this peer is official Fluence Labs peer.
 isFluencePeer method from [trust-graph-api.aqua](./aqua/trust-graph-api.aqua) module checks these relations. You can build your own
 structure of peers similarly.
+
+`example_secret_key.ed25519` publicly available and used for test purposes.
--- a/admin/aqua/export.aqua
+++ b/admin/aqua/export.aqua
@ -1,4 +1,4 @@
-import get_trust_bytes, issue_trust from "../../aqua/trust-graph-api.aqua"
+import "@fluencelabs/trust-graph/trust-graph.aqua"
 export get_trust_bytes, issue_trust

 import "@fluencelabs/aqua-lib/builtin.aqua"
@ -7,3 +7,13 @@ func timestamp_sec(node: string) -> u64:
    on node:
        result <- Peer.timestamp_sec()
    <- result
+
+func get_trust_bytes(node: string, issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64) -> GetTrustBytesResult:
+    on node:
+        result <- TrustGraph.get_trust_bytes(issued_for_peer_id, expires_at_sec, issued_at_sec)
+    <- result
+
+func issue_trust(node: string, issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64, trust_bytes: []u8) ->IssueTrustResult:
+    on node:
+        result <- TrustGraph.issue_trust(issued_for_peer_id, expires_at_sec, issued_at_sec, trust_bytes)
+    <- result
--- a/admin/index.ts
+++ b/admin/index.ts
@ -49,28 +49,34 @@ async function main(environment: Node[]) {
        Fluence.getStatus().peerId,
        Fluence.getStatus().relayPeerId
    );
-
    let root_sk_b58 = fs.readFileSync("./root_secret_key.ed25519").toString();
    let issuer_sk_b58 = fs.readFileSync("./issuer_secret_key.ed25519").toString();
+    let example_sk_b58 = fs.readFileSync("../example_secret_key.ed25519").toString();
    let root_kp = await KeyPair.fromEd25519SK(bs58.decode(root_sk_b58));
    let issuer_kp = await KeyPair.fromEd25519SK(bs58.decode(issuer_sk_b58));
+    let example_kp = await KeyPair.fromEd25519SK(bs58.decode(example_sk_b58));
    console.log("Root private key: %s", root_sk_b58);
    console.log("Root peer id: %s", root_kp.Libp2pPeerId.toB58String());
    console.log("Issuer private key: %s", issuer_sk_b58);

    let cur_time = await timestamp_sec(node);
    let expires_at = cur_time + 60 * 60 * 24 * 365;
-    let common_chain = [] as any;
-    // self-signed root trust
-    common_chain.push(await issue_trust_helper(node, root_kp,  root_kp.Libp2pPeerId.toB58String(), root_kp.Libp2pPeerId.toB58String(), expires_at, cur_time));
-    // from root to issuer
-    common_chain.push(await issue_trust_helper(node, root_kp, root_kp.Libp2pPeerId.toB58String(), issuer_kp.Libp2pPeerId.toB58String(), expires_at, cur_time));
-
    let certificates = [];
+    // self-signed root trust
+    let root_trust = await issue_trust_helper(node, root_kp,  root_kp.Libp2pPeerId.toB58String(), root_kp.Libp2pPeerId.toB58String(), expires_at, cur_time);
+    // from root to issuer
+    let issuer_trust = await issue_trust_helper(node, root_kp, root_kp.Libp2pPeerId.toB58String(), issuer_kp.Libp2pPeerId.toB58String(), expires_at, cur_time);
+    // from root to example
+    let example_trust = await issue_trust_helper(node, root_kp, root_kp.Libp2pPeerId.toB58String(), example_kp.Libp2pPeerId.toB58String(), expires_at, cur_time);
+
+    // cert for example key
+    certificates.push({chain: [root_trust, example_trust]});
+
    for (let i = 0; i < krasnodar.length; i++)  {
        // from issuer to node
-        let trust = await issue_trust_helper(node, issuer_kp, issuer_kp.Libp2pPeerId.toB58String(), krasnodar[i].peerId, expires_at, cur_time);
-        let cert = {chain: [...common_chain, trust]};
+        let node_trust = await issue_trust_helper(node, issuer_kp, issuer_kp.Libp2pPeerId.toB58String(), krasnodar[i].peerId, expires_at, cur_time);
+        // cert for every krasnodar node
+        let cert = {chain: [root_trust, issuer_trust, node_trust]};
        certificates.push(cert);
    }

--- a/admin/package-lock.json
+++ b/admin/package-lock.json
--- a/admin/package.json
+++ b/admin/package.json
@ -13,9 +13,9 @@
  "author": "Fluence Labs",
  "license": "MIT",
  "dependencies": {
-    "@fluencelabs/aqua": "0.5.0-246",
-    "@fluencelabs/aqua-lib": "0.2.1",
-    "@fluencelabs/fluence": "0.15.0",
+    "@fluencelabs/aqua": "^0.5.2-257",
+    "@fluencelabs/aqua-lib": "^0.3.2",
+    "@fluencelabs/fluence": "^0.18.0",
    "@fluencelabs/fluence-network-environment": "^1.0.10",
    "@fluencelabs/trust-graph": "file:../aqua",
    "bs58": "^4.0.1"
--- a/aqua/labelling.aqua
+++ b/aqua/labelling.aqua
@ -0,0 +1,39 @@
+import "misc.aqua"
+import get_host_certs_from from "trust-graph-api.aqua"
+
+alias Error: string
+
+-- TrustGraph builtin distributed with predefined certificates which used to identify Fluence Labs peers.
+-- Each certificate contains 3 trusts: self-signed fluence root trust, trust for label trust and trust to target peer.
+--
+-- Usage:
+--  on target_node:
+--    result, error <- isFluencePeer()
+--
+-- Returns:
+--   `true, nil` if `target_node` is identified as official Fluence Labs peer
+--   `false, nil` otherwise
+--
+-- Errors:
+--   if get_host_certs_from failed, `nil, error_msg` is returned
+func isFluencePeer() -> ?bool, ?Error:
+    fluence_root_peer_id = "12D3KooWNbZKaPWRZ8wgjGvrxdJFz9Fq5uVwkR6ERV1f74HhPdyB"
+    label_peer_id = "12D3KooWM45u7AQxsb4MuQJNYT3NWHHMLU7JTbBV66RTfF3KSzdR"
+
+    result: ?bool
+    error: *Error
+    -- get all certs issued by `label_peer_id` to current host
+    certs_result <- get_host_certs_from(label_peer_id)
+
+    if certs_result.success:
+        for cert  <- certs_result.certificates:
+            len <- TrustOp.array_length(cert.chain)
+            if len == 3:
+                if cert.chain!0.issued_for == fluence_root_peer_id:
+                    if cert.chain!1.issued_for == label_peer_id:
+                        result <<- true
+        if result == nil:
+            result <<- false
+    else:
+        error <<- certs_result.error
+    <- result, error
--- a/aqua/misc.aqua
+++ b/aqua/misc.aqua
@ -0,0 +1,13 @@
+import "trust-graph.aqua"
+
+-- helpers for isFluencePeer
+service TrustOp("op"):
+  array_length(a: []Trust) -> u32
+
+service BoolOp("op"):
+  array_length(a: []bool) -> u32
+
+-- check if error is not nil and append to error_stream
+func append_error(error_stream: *Error, error: ?Error):
+    if error != nil:
+        error_stream <<- error!
--- a/aqua/package-lock.json
+++ b/aqua/package-lock.json
--- a/aqua/package.json
+++ b/aqua/package.json
@ -1,12 +1,12 @@
 {
  "name": "@fluencelabs/trust-graph",
-  "version": "0.2.0",
+  "version": "0.2.2",
  "description": "Aqua Trust Graph API library",
  "files": [
    "*.aqua"
  ],
  "dependencies": {
-    "@fluencelabs/aqua-lib": "0.2.0"
+    "@fluencelabs/aqua-lib": "^0.3.1"
  },
  "scripts": {
    "generate-aqua": "../service/build.sh",
@ -31,6 +31,6 @@
  },
  "homepage": "https://github.com/fluencelabs/trust-graph#readme",
  "devDependencies": {
-    "@fluencelabs/aqua": "0.4.1-240"
+    "@fluencelabs/aqua": "^0.5.2-257"
  }
 }
--- a/aqua/trust-graph-api.aqua
+++ b/aqua/trust-graph-api.aqua
@ -1,100 +1,220 @@
+import Sig, Peer from "@fluencelabs/aqua-lib/builtin.aqua"
+import "misc.aqua"
 import "trust-graph.aqua"
-import "@fluencelabs/aqua-lib/builtin.aqua"

-func get_trust_bytes(node: string, issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64) -> GetTrustBytesResult:
-    on node:
-        result <- TrustGraph.get_trust_bytes(issued_for_peer_id, expires_at_sec, issued_at_sec)
+alias PeerId: string
+alias Error: string
+
+-- Call context: any node with registered `trust-graph` service
+-- Set `peer_id` as a root
+-- Self-signed trust should be added in next call for correct behaviour
+-- `max_chain_len` specifies maximum chain length after root trust,
+-- if `max_chain_len` is zero there is no trusts except self-signed root trust in certificates for this root
+func set_root(peer_id: PeerId, max_chain_len: u32) -> SetRootResult:
+    result <- TrustGraph.set_root(peer_id, max_chain_len)
    <- result

-func issue_trust(node: string, issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64, trust_bytes: []u8) -> IssueTrustResult:
-    on node:
-        result <- TrustGraph.issue_trust(issued_for_peer_id, expires_at_sec, issued_at_sec, trust_bytes)
-    <- result
+-- Call context: %init_peer_id%
+-- Create on relay and sign trust on client
+-- If `issuer` is not %init_peer_id%, Sig service with `issuer` peer id as service id should be defined
+-- Errors:
+--  If TrustGraph.get_trust_bytes or TrustGraph.issue_trust fails, (nil, error) is returned.
+func issue_trust(issuer: PeerId, issued_for: PeerId, expires_at_sec: u64) -> ?Trust, ?Error:
+    -- after marine-web release this will be done on %init_peer_id%
+    on HOST_PEER_ID:
+        issued_at_sec <- Peer.timestamp_sec()
+        bytes <- TrustGraph.get_trust_bytes(issued_for, expires_at_sec, issued_at_sec)

-func verify_trust(node: string, trust: Trust, issuer_peer_id: string) -> VerifyTrustResult:
-    on node:
+    result: ?Trust
+    error: *Error
+    if bytes.success:
+        -- for %init_peer_id% Sig service available by default and registered as "sig"
+        -- for other peer ids custom Sig service should be implemented and registered with this peer id as service id
+        if issuer != %init_peer_id%:
+            Sig issuer
+        else:
+            Sig "sig"
+
+        signature <- Sig.sign(bytes.result)
+
+        on HOST_PEER_ID:
+            issue_result <- TrustGraph.issue_trust(issued_for, expires_at_sec, issued_at_sec, signature)
+        if issue_result.success:
+            result <<- issue_result.trust
+        else:
+            error <<- issue_result.error
+    else:
+        error <<- bytes.error
+    <- result, error
+
+-- Call context: any node with registered `trust-graph` service
+-- Add trust to TG
+-- Errors:
+--  If TrustGraph.add_trust fails, error is returned.
+func import_trust(trust: Trust, issuer: PeerId) -> ?Error:
+    error: *Error
    timestamp_sec <- Peer.timestamp_sec()
-        result <- TrustGraph.verify_trust(trust, issuer_peer_id, timestamp_sec)
-    <- result
+    add_result <- TrustGraph.add_trust(trust, issuer, timestamp_sec)
+    if add_result.success != true:
+        error <<- add_result.error
+    <- error

-func add_trust(node: string, trust: Trust, issuer_peer_id: string) -> AddTrustResult:
+-- Call context: %init_peer_id%
+-- Issue trust and add to TG instance on `node`
+-- If `issuer` is not %init_peer_id%, Sig service with `issuer` peer id as service id should be defined
+-- Errors:
+--  If issue_trust or import_trust fails, error is returned.
+func add_trust(node: PeerId, issuer: PeerId, issued_for: PeerId, expires_at_sec: u64) -> ?Error:
+    trust, issue_error <- issue_trust(issuer, issued_for, expires_at_sec)
+
+    error: *Error
+    if issue_error != nil:
+        error <<- issue_error!
+    else:
        on node:
+            import_error <- import_trust(trust!, issuer)
+            append_error(error, import_error)
+    <- error
+
+-- Call context: %init_peer_id%
+-- Set `peer_id` as a root and add self-signed trust to TG instance on `node`
+-- If `peer_id` is not %init_peer_id%, Sig service with `peer_id` as service id should be defined
+-- Errors:
+--  If issue_trust, import_trust or set_root fails, error is returned.
+func add_root_trust(node: PeerId, peer_id: PeerId, max_chain_len: u32, expires_at_sec: u64) -> ?Error:
+    trust, issue_error <- issue_trust(peer_id, peer_id, expires_at_sec)
+
+    error: *Error
+    if issue_error != nil:
+        error <<- issue_error!
+    else:
+        on node:
+            set_root_result <- set_root(peer_id, max_chain_len)
+            if set_root_result.success:
+                import_error <- import_trust(trust!, peer_id)
+                append_error(error, import_error)
+            else:
+                error <<- set_root_result.error
+
+    <- error
+
+-- Call context: any node with registered `trust-graph` service
+-- Check signature and expiration time of trust
+func verify_trust(trust: Trust, issuer: PeerId) -> VerifyTrustResult:
    timestamp_sec <- Peer.timestamp_sec()
-        result <- TrustGraph.add_trust(trust, issuer_peer_id, timestamp_sec)
+    result <- TrustGraph.verify_trust(trust, issuer, timestamp_sec)
    <- result

-func add_root(node: string, peer_id: string, weight_factor: u32) -> AddRootResult:
-    on node:
-        result <- TrustGraph.add_root(peer_id, weight_factor)
-    <- result
-
-func get_weight(node: string, peer_id: string) -> WeightResult:
-    on node:
+-- Call context: any node with registered `trust-graph` service
+-- Get the maximum weight of trust for `peer_id`
+-- Trust has weight if there is at least 1 trust chain from one of the roots
+func get_weight(peer_id: PeerId) -> WeightResult:
    timestamp_sec <- Peer.timestamp_sec()
    result <- TrustGraph.get_weight(peer_id, timestamp_sec)
    <- result

-func get_all_certs(node: string, issued_for: string) -> AllCertsResult:
-    on node:
+-- Call context: any node with registered `trust-graph` service
+-- Get maximum weight of trust for `peer_id` among all chains which contain trust from `issuer`
+func get_weight_from(peer_id: PeerId, issuer: PeerId) -> WeightResult:
    timestamp_sec <- Peer.timestamp_sec()
-        result <- TrustGraph.get_all_certs(issued_for, timestamp_sec)
+    result <- TrustGraph.get_weight_from(peer_id, issuer, timestamp_sec)
    <- result

-func get_host_certs(node: string, issued_for: string) -> AllCertsResult:
-    on node:
-        timestamp_sec <- Peer.timestamp_sec()
-        result <- TrustGraph.get_host_certs(timestamp_sec)
-    <- result
+-- Call context: %init_peer_id%
+-- Create revocation signed by %init_peer_id%
+-- If `revoked_by` is not %init_peer_id%, Sig service with `revoked_by` peer id as service id should be defined
+-- Errors:
+--  If TrustGraph.get_revocation_bytes or TrustGraph.issue_revocation fails, (nil, error) is returned.
+func issue_revocation(revoked_by: PeerId, revoked: PeerId) -> ?Revocation, ?Error:
+    -- after marine-web release this will be done on %init_peer_id%
+    on HOST_PEER_ID:
+        issued_at_sec <- Peer.timestamp_sec()
+        bytes <- TrustGraph.get_revocation_bytes(revoked, issued_at_sec)

-func get_host_certs_from(issuer: string) -> AllCertsResult:
+    result: ?Revocation
+    error: *Error
+    if bytes.success:
+        -- for %init_peer_id% Sig service available by default and registered as "sig"
+        -- for other peer ids custom Sig service should be implemented and registered with this peer id as service id
+        if revoked_by != %init_peer_id%:
+            Sig revoked_by
+        else:
+            Sig "sig"
+
+        signature <- Sig.sign(bytes.result)
+
+        on HOST_PEER_ID:
+            issue_result <- TrustGraph.issue_revocation(revoked_by, revoked, issued_at_sec, signature)
+        if issue_result.success:
+            result <<- issue_result.revocation
+        else:
+            error <<- issue_result.error
+    else:
+        error <<- bytes.error
+    <- result, error
+
+-- Call context: any node with registered `trust-graph` service
+-- Import revocation to TG
+-- Errors:
+--  If TrustGraph.revoke fails, error is returned.
+func import_revocation(revocation: Revocation) -> ?Error:
+    error: *Error
+    timestamp_sec <- Peer.timestamp_sec()
+    add_result <- TrustGraph.revoke(revocation, timestamp_sec)
+    if add_result.success != true:
+        error <<- add_result.error
+
+    <- error
+
+-- Call context: %init_peer_id%
+-- Revoke all certificates on `node` TG instance
+-- which contain path from %init_peer_id% to `revoked_peer_id`
+-- If `revoked_by` is not %init_peer_id%, Sig service with `revoked_by` peer id as service id should be defined
+-- Errors:
+--  if issue_revocation or import_revocation fails, error is returned.
+func revoke(node: PeerId, revoked_by: PeerId, revoked: PeerId) -> ?Error:
+    revocation, issue_error <- issue_revocation(revoked_by, revoked)
+
+    error: *Error
+    if revocation == nil:
+        error <<- issue_error!
+    else:
+        on node:
+           import_error <- import_revocation(revocation!)
+           append_error(error, import_error)
+    <- error
+
+-- Call context: any node with registered `trust-graph` service
+-- Return all certificates issued for current node which contains trust from `issuer`
+func get_host_certs_from(issuer: PeerId) -> AllCertsResult:
    timestamp_sec <- Peer.timestamp_sec()
    result <- TrustGraph.get_host_certs_from(issuer, timestamp_sec)
    <- result

-func insert_cert(node: string, certificate: Certificate) -> InsertResult:
-    on node:
+-- Call context: any node with registered `trust-graph` service
+-- Return all certificates issued for given peer id
+func get_all_certs(issued_for: PeerId) -> AllCertsResult:
+    timestamp_sec <- Peer.timestamp_sec()
+    result <- TrustGraph.get_all_certs(issued_for, timestamp_sec)
+    <- result
+
+-- Call context: any node with registered `trust-graph` service
+-- Return all certificates issued for given peer id which contains trust from `issuer`
+func get_all_certs_from(issued_for: PeerId, issuer: PeerId) -> AllCertsResult:
+    timestamp_sec <- Peer.timestamp_sec()
+    result <- TrustGraph.get_all_certs_from(issued_for, issuer, timestamp_sec)
+    <- result
+
+-- Call context: any node with registered `trust-graph` service
+-- Return all certificates issued for current node
+func get_host_certs() -> AllCertsResult:
+    timestamp_sec <- Peer.timestamp_sec()
+    result <- TrustGraph.get_host_certs(timestamp_sec)
+    <- result
+
+-- Call context: any node with registered `trust-graph` service
+-- Insert certificate to TG instance on current node
+func insert_cert(certificate: Certificate) -> InsertResult:
    timestamp_sec <- Peer.timestamp_sec()
    result <- TrustGraph.insert_cert(certificate, timestamp_sec)
    <- result
-
-func get_revoke_bytes(node: string, revoked_peer_id: string, revoked_at: u64) -> GetRevokeBytesResult:
-    on node:
-        result <- TrustGraph.get_revoke_bytes(revoked_peer_id, revoked_at)
-    <- result
-
-func issue_revocation(node: string, revoked_peer_id: string, revoked_by_peer_id: string, revoked_at_sec: u64, signature_bytes: []u8) -> IssueRevocationResult:
-    on node:
-        result <- TrustGraph.issue_revocation(revoked_peer_id, revoked_by_peer_id, revoked_at_sec, signature_bytes)
-    <- result
-
-func revoke(node: string, revocation: Revocation) -> RevokeResult:
-    on node:
-        timestamp_sec <- Peer.timestamp_sec()
-        result <- TrustGraph.revoke(revocation, timestamp_sec)
-    <- result
-
-service TrustOp("op"):
-  array_length(a: []Trust) -> u32
-
-service BoolOp("op"):
-  array_length(a: []bool) -> u32
-
-func isFluencePeer(node: string) -> bool:
-    on node:
-        certs_result <- get_host_certs_from("12D3KooWM45u7AQxsb4MuQJNYT3NWHHMLU7JTbBV66RTfF3KSzdR")
-        resultBox: *bool
-        if certs_result.success:
-            for cert  <- certs_result.certificates:
-                len <- TrustOp.array_length(cert.chain)
-                if len == 3:
-                    if cert.chain!0.issued_for == "12D3KooWNbZKaPWRZ8wgjGvrxdJFz9Fq5uVwkR6ERV1f74HhPdyB":
-                        if cert.chain!1.issued_for == "12D3KooWM45u7AQxsb4MuQJNYT3NWHHMLU7JTbBV66RTfF3KSzdR":
-                            resultBox <<- true
-
-        result_len <- BoolOp.array_length(resultBox)
-        result: *bool
-        if result_len == 0:
-            result <<- false
-        else:
-            result <<- true
-    <- result!
--- a/aqua/trust-graph.aqua
+++ b/aqua/trust-graph.aqua
@ -1,9 +1,5 @@
 module TrustGraph declares *

-data AddRootResult:
-  success: bool
-  error: string
-
 data AddTrustResult:
  success: bool
  error: string
@ -24,6 +20,18 @@ data AllCertsResult:
  certificates: []Certificate
  error: string

+data Revocation:
+  revoked_peer_id: string
+  revoked_at: u64
+  signature: string
+  sig_type: string
+  revoked_by: string
+
+data ExportRevocationsResult:
+  success: bool
+  revocations: []Revocation
+  error: string
+
 data GetRevokeBytesResult:
  success: bool
  error: string
@ -38,13 +46,6 @@ data InsertResult:
  success: bool
  error: string

-data Revocation:
-  revoked_peer_id: string
-  revoked_at: u64
-  signature: string
-  sig_type: string
-  revoked_by: string
-
 data IssueRevocationResult:
  success: bool
  error: string
@ -59,6 +60,10 @@ data RevokeResult:
  success: bool
  error: string

+data SetRootResult:
+  success: bool
+  error: string
+
 data VerifyTrustResult:
  success: bool
  error: string
@ -70,18 +75,20 @@ data WeightResult:
  error: string

 service TrustGraph("trust-graph"):
-  add_root(peer_id: string, weight_factor: u32) -> AddRootResult
  add_trust(trust: Trust, issuer_peer_id: string, timestamp_sec: u64) -> AddTrustResult
+  export_revocations(issued_for: string) -> ExportRevocationsResult
  get_all_certs(issued_for: string, timestamp_sec: u64) -> AllCertsResult
+  get_all_certs_from(issued_for: string, issuer: string, timestamp_sec: u64) -> AllCertsResult
  get_host_certs(timestamp_sec: u64) -> AllCertsResult
  get_host_certs_from(issuer: string, timestamp_sec: u64) -> AllCertsResult
-  get_revoke_bytes(revoked_peer_id: string, revoked_at: u64) -> GetRevokeBytesResult
+  get_revocation_bytes(revoked_peer_id: string, revoked_at: u64) -> GetRevokeBytesResult
  get_trust_bytes(issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64) -> GetTrustBytesResult
  get_weight(peer_id: string, timestamp_sec: u64) -> WeightResult
-  get_weight_factor(max_chain_len: u32) -> u32
+  get_weight_from(peer_id: string, issuer: string, timestamp_sec: u64) -> WeightResult
  insert_cert(certificate: Certificate, timestamp_sec: u64) -> InsertResult
  insert_cert_raw(certificate: string, timestamp_sec: u64) -> InsertResult
-  issue_revocation(revoked_peer_id: string, revoked_by_peer_id: string, revoked_at_sec: u64, signature_bytes: []u8) -> IssueRevocationResult
+  issue_revocation(revoked_by_peer_id: string, revoked_peer_id: string, revoked_at_sec: u64, signature_bytes: []u8) -> IssueRevocationResult
  issue_trust(issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64, trust_bytes: []u8) -> IssueTrustResult
  revoke(revoke: Revocation, timestamp_sec: u64) -> RevokeResult
+  set_root(peer_id: string, max_chain_len: u32) -> SetRootResult
  verify_trust(trust: Trust, issuer_peer_id: string, timestamp_sec: u64) -> VerifyTrustResult
--- a/builtin-package/on_start.air
+++ b/builtin-package/on_start.air
@ -1,6 +1,7 @@
 (seq
    (seq
-        (call relay ("trust-graph" "add_root") ["12D3KooWNbZKaPWRZ8wgjGvrxdJFz9Fq5uVwkR6ERV1f74HhPdyB" 2] add_root_res)
+        ; set fluence root peer id as TG root
+        (call relay ("trust-graph" "set_root") ["12D3KooWNbZKaPWRZ8wgjGvrxdJFz9Fq5uVwkR6ERV1f74HhPdyB" 5] add_root_res)
        (xor
            (match add_root_res.$.success! true
                (null)
@ -14,6 +15,7 @@
                (seq
                    (seq
                        (call relay ("peer" "timestamp_sec") [] cur_time)
+                        ; insert all certificates from on_start.json
                        (call relay ("trust-graph" "insert_cert") [i cur_time] insert_result)
                    )
                    (xor
--- a/builtin-package/on_start.json
+++ b/builtin-package/on_start.json
--- a/example/README.md
+++ b/example/README.md
@ -1,23 +1,10 @@
-# Run example locally
+## Description
+This example shows how to use Trust Graph to label peers. There are some `trusted_computation` which can only be executed 
+on labeled peer. The label is determined by the presence of certificate from `%init_peer_id` to this peer.
+
+## Run example locally
 1. Go to `local-network`
 2. Run `docker compose up -d` to start Fluence node
 3. Go back to `../example`
 4. Run `npm i`
 5. Run `npm run start`
-
-## How to use
-1. Add the following to your dependencies
-   - `@fluencelabs/trust-graph`
-   - `@fluencelabs/aqua`
-   - `@fluencelabs/aqua-lib`
-   - `@fluencelabs/fluence`
-   - `@fluencelabs/fluence-network-environment`
-
-2. Import dependencies
-   ```typescript
-   import * as tg from "./generated/export";
-   import { Fluence, KeyPair } from "@fluencelabs/fluence";
-   import { krasnodar, Node } from "@fluencelabs/fluence-network-environment";
-   ```
-3. Add root and issue self-signed root trust.
-4. For now, you can sign trusts/revocations only on js side with KeyPair.
--- a/example/aqua/computation.aqua
+++ b/example/aqua/computation.aqua
@ -0,0 +1,27 @@
+
+import "@fluencelabs/trust-graph/trust-graph-api.aqua"
+import "@fluencelabs/trust-graph/trust-graph.aqua"
+import "@fluencelabs/aqua-lib/builtin.aqua"
+
+export trusted_computation
+
+service CertOp("op"):
+  array_length(a: []Certificate) -> u32
+
+service TrustedComputation("op"):
+    identity(s: u64) -> u64
+
+func trusted_computation(node: string) -> ?u64:
+    result: ?u64
+    -- on our trusted relay
+    on HOST_PEER_ID:
+        -- get all certificates issued for given node by our client's peer id
+        certs_result <- get_all_certs_from(node, %init_peer_id%)
+        if certs_result.success:
+            len <- CertOp.array_length(certs_result.certificates)
+        -- if there is any certificate node is trusted and computation is possible
+        if len != 0:
+            on node:
+                result <- TrustedComputation.identity(5)
+
+    <- result
--- a/example/aqua/export.aqua
+++ b/example/aqua/export.aqua
@ -1,10 +1,10 @@
-import get_trust_bytes, issue_trust, verify_trust, add_trust, add_root, get_weight, get_all_certs, insert_cert, get_revoke_bytes, issue_revocation, revoke, isFluencePeer from "../../aqua/trust-graph-api.aqua"
+import add_root_trust, add_trust, revoke from "@fluencelabs/trust-graph/trust-graph-api.aqua"
+export add_root_trust, add_trust, revoke
+import Peer from "@fluencelabs/aqua-lib/builtin.aqua"

-export get_trust_bytes, issue_trust, verify_trust, add_trust, add_root, get_weight, get_all_certs, insert_cert, get_revoke_bytes, issue_revocation, revoke, isFluencePeer
+alias PeerId: string

-import "@fluencelabs/aqua-lib/builtin.aqua"
-
-func timestamp_sec(node: string) -> u64:
-    on node:
+func timestamp_sec() -> u64:
+    on HOST_PEER_ID:
        result <- Peer.timestamp_sec()
    <- result
--- a/example/index.ts
+++ b/example/index.ts
@ -14,9 +14,10 @@
 * limitations under the License.
 */

+import {trusted_computation} from "./generated/computation";
 import * as tg from "./generated/export";
-import { Fluence, KeyPair } from "@fluencelabs/fluence";
-import { krasnodar, Node } from "@fluencelabs/fluence-network-environment";
+import {Fluence, FluencePeer, KeyPair} from "@fluencelabs/fluence";
+import {krasnodar, Node, testNet, stage} from "@fluencelabs/fluence-network-environment";
 import assert from "assert";
 const bs58 = require('bs58');

@ -31,105 +32,109 @@ let local: Node[] = [
        multiaddr:
            "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWRABanQHUn28dxavN9ZS1zZghqoZVAYtFpoN7FdtoGTFv",
    },
+    {
+        peerId: "12D3KooWFpQ7LHxcC9FEBUh3k4nSCC12jBhijJv3gJbi7wsNYzJ5",
+        multiaddr:
+            "/ip4/127.0.0.1/tcp/9992/ws/p2p/12D3KooWFpQ7LHxcC9FEBUh3k4nSCC12jBhijJv3gJbi7wsNYzJ5",
+    },
 ];

-async function is_fluence_peer(relay: string) {
-   let result =  await tg.isFluencePeer(relay);
-
-    if (result) {
-        console.log("Current relay %s identified as Fluence Labs' peer", relay)
-    } else {
-        console.log("Current relay %s is not Fluence Labs' peer", relay)
+async function revoke_all(relay: string, revoked_by: string) {
+    for (var node of local) {
+        let error = await tg.revoke(relay, revoked_by, node.peerId);
+        if (error === null) {
+            console.log(error)
+        }
+    }
+}
+async function add_root(relay: string, peer_id: string) {
+    let current_time = await tg.timestamp_sec();
+    let far_future = current_time + 9999999;
+    let error = await tg.add_root_trust(relay, peer_id, 2, far_future);
+    if (error === null) {
+        console.log(error)
    }
-
 }

-async function add_trust_helper(relay: string, issuer_kp: KeyPair, issuer_peer_id: string, issued_for_peer_id: string, expires_at_sec: number, issued_at_sec: number) {
-    let trust_metadata = await tg.get_trust_bytes(relay, issued_for_peer_id, expires_at_sec, issued_at_sec);
-    const signed_metadata = await issuer_kp.Libp2pPeerId.privKey.sign(Uint8Array.from(trust_metadata.result));
-
-    let trust = await tg.issue_trust(relay, issued_for_peer_id, expires_at_sec, issued_at_sec, Array.from(signed_metadata));
-    assert(trust.success)
-
-    let result = await tg.verify_trust(relay, trust.trust, issuer_peer_id);
-    assert(result.success)
-
-    let result_add = await tg.add_trust(relay, trust.trust, issuer_peer_id);
-    assert(result_add.success)
+async function add_new_trust_checked(relay: string, issuer: string, issued_for_peer_id: string, expires_at_sec: number) {
+    let error = await tg.add_trust(relay, issuer, issued_for_peer_id, expires_at_sec);
+    if (error !== null) {
+        console.error("%s", error);
+    } else {
+        console.log("Trust issued for %s successfully added", issued_for_peer_id)
+    }
 }

-async function revoke_helper(node: string, issuer_kp: KeyPair, revoked_by_peer_id: string, revoked_peer_id: string, revoked_at_sec: number) {
-    let trust_metadata = await tg.get_revoke_bytes(node, revoked_peer_id, revoked_at_sec);
-    const signed_metadata = await issuer_kp.Libp2pPeerId.privKey.sign(Uint8Array.from(trust_metadata.result));
+async function revoke_checked(relay: string, revoked_by: string, revoked_peer_id: string) {
+    let error = await tg.revoke(relay, revoked_by, revoked_peer_id);
+    if (error !== null) {
+        console.log("%s", error);
+    } else {
+        console.log("Trust issued for %s revoked", revoked_peer_id)
+    }
+}

-    let revocation = await tg.issue_revocation(node, revoked_peer_id, revoked_by_peer_id, revoked_at_sec, Array.from(signed_metadata));
-    assert(revocation.success)
+async function exec_trusted_computation(node: string) {
+    let result = await trusted_computation(node)

-    let result_add = await tg.revoke(node, revocation.revocation);
-    assert(result_add.success)
+    if (result !== null) {
+        console.log("📗 Trusted computation on node %s successful, result is %s", node, result)
+    } else {
+        console.log("📕 Trusted computation on node %s failed", node)
+    }
 }

 async function main() {
+    console.log("In this example we try to execute some trusted computations based on trusts");
    console.log("📘 Will connect to local nodes");
    // key from local-network/builtins_secret_key.ed25519 to connect as builtins owner
    let sk = bs58.decode("5FwE32bDcphFzuMca7Y2qW1gdR64fTBYoRNvD4MLE1hecDGhCMQGKn8aseMr5wRo4Xo2CRFdrEAawUNLYkgQD78K").slice(0, 32); // first 32 bytes - secret key, second - public key
    let builtins_keypair = await KeyPair.fromEd25519SK(sk);

-    await Fluence.start({ connectTo: local[0], KeyPair: builtins_keypair});
+    let relay = local[0];
+    await Fluence.start({ connectTo: relay, KeyPair: builtins_keypair});
    console.log(
        "📗 created a fluence peer %s with relay %s",
        Fluence.getStatus().peerId,
        Fluence.getStatus().relayPeerId
    );
-    let relay = local[0].peerId
-    let nodeA = local[0].peerId
-    let nodeB = local[1].peerId
+    let local_peer_id = Fluence.getStatus().peerId;
+    assert(local_peer_id !== null);

-    // keypair if nodeA specified in local-network/docker-compose.yml
-    const issuer_kp = await KeyPair.fromEd25519SK(bs58.decode("29Apzfedhw2Jxh94Jj4rNSmavQ1TkNe8ALYRA7bMegobwp423aLrURxLk32WtXgXHDqoSz7GAT9fQfoMhVd1e5Ww"));
+    let current_time = await tg.timestamp_sec();
+    let far_future = current_time + 9999999;

-    // set nodeA as a root
-    let add_root_result = await tg.add_root(relay, nodeA, 2);
-    assert(add_root_result.success)
-
-    // add self-signed root trust
-    const issued_timestamp_sec = await tg.timestamp_sec(relay);
-    const expires_at_sec = issued_timestamp_sec + 999999999;
-    await add_trust_helper(relay, issuer_kp, nodeA, nodeB, expires_at_sec, issued_timestamp_sec);
-
-    let root_weight_result = await tg.get_weight(relay, nodeA);
-    assert(root_weight_result.success)
-    console.log("Root weight (nodeA) is: %s", root_weight_result.weight);
-
-    // issue trust by nodeA to nodeB and add to tg
-    await add_trust_helper(relay, issuer_kp, nodeA, nodeB, expires_at_sec, issued_timestamp_sec);
-    let weight_result = await tg.get_weight(relay, nodeB);
-    console.log("Weight of nodeB: is %s", weight_result.weight);
-
-    assert(root_weight_result.weight / 2 === weight_result.weight);
-
-    let certs = await tg.get_all_certs(relay, nodeB);
-    assert(certs.certificates.length === 1);
-    console.log("There is one cert for nodeB with chain len %s", certs.certificates[0].chain.length);
-    console.log("It contains self-signed nodeA root trust and nodeA->nodeB trust");
-
-    // wait to create revoke after trust (because timestamp in secs)
+    // clear all trusts from our peer id on relay
+    await revoke_all(relay.peerId, local_peer_id);
+    // wait to be sure that last revocation will be older than future trusts at least on 1 second (because timestamp in secs)
    await new Promise(f => setTimeout(f, 1000));

-    console.log("Now we will revoke trust for nodeB")
-    // revoke nodeB by nodeA
-    await revoke_helper(relay, issuer_kp, nodeA, nodeB, await tg.timestamp_sec(relay));
+    // set our peer id as root to our relay
+    await add_root(relay.peerId, local_peer_id);

-    let empty_certs = await tg.get_all_certs(relay, nodeB);
-    assert(empty_certs.certificates.length === 0);
-    console.log("Now there is no certs for nodeB");
+    let nodeA = local[0].peerId
+    let nodeB = local[1].peerId
+    let nodeC = local[2].peerId

-    console.log("Let's check if our node is Fluence Labs peer");
-    await is_fluence_peer(relay);
+    // try to exec computation on every node, will fail
+    await exec_trusted_computation(nodeA); // fail
+    await exec_trusted_computation(nodeB); // fail
+    await exec_trusted_computation(nodeC); // fail

-    console.log("Now let's check some krasnodar's node");
-    await is_fluence_peer(krasnodar[0].peerId);
+    console.log("🌀 Issue trust to nodeB: %s", nodeB);
+    await add_new_trust_checked(relay.peerId, local_peer_id, nodeB, far_future);

+    await exec_trusted_computation(nodeA); // fail
+    await exec_trusted_computation(nodeB); // success
+    await exec_trusted_computation(nodeC); // fail
+
+    await new Promise(f => setTimeout(f, 1000));
+    console.log("🚫 Revoke trust to nodeB");
+    await revoke_checked(relay.peerId, local_peer_id, nodeB);
+
+    await exec_trusted_computation(nodeA); // fail
+    await exec_trusted_computation(nodeB); // fail
+    await exec_trusted_computation(nodeC); // fail
    return;
 }

--- a/example/package-lock.json
+++ b/example/package-lock.json
--- a/example/package.json
+++ b/example/package.json
@ -13,9 +13,9 @@
  "author": "Fluence Labs",
  "license": "MIT",
  "dependencies": {
-    "@fluencelabs/aqua": "0.5.0-247",
-    "@fluencelabs/aqua-lib": "0.2.1",
-    "@fluencelabs/fluence": "0.15.1",
+    "@fluencelabs/aqua": "^0.5.2-257",
+    "@fluencelabs/aqua-lib": "^0.3.2",
+    "@fluencelabs/fluence": "^0.18.0",
    "@fluencelabs/fluence-network-environment": "^1.0.10",
    "@fluencelabs/trust-graph": "file:../aqua",
    "bs58": "^4.0.1"
--- a/example_secret_key.ed25519
+++ b/example_secret_key.ed25519
@ -0,0 +1 @@
+E5ay3731i4HN8XjJozouV92RDMGAn3qSnb9dKSnujiWv
--- a/local-network/docker-compose.yml
+++ b/local-network/docker-compose.yml
@ -1,7 +1,7 @@
 # management secret key is NAB5rGwT4qOEB+6nLQawkTfCOV2eiFSjgQK8bfEdZXY=
 services:
  fluence-0: # /ip4/127.0.0.1/tcp/9990/ws/p2p/12D3KooWHBG9oaVx4i3vi6c1rSBUm7MLBmyGmmbHoZ23pmjDCnvK
-    command: -f ed25519 -k 29Apzfedhw2Jxh94Jj4rNSmavQ1TkNe8ALYRA7bMegobwp423aLrURxLk32WtXgXHDqoSz7GAT9fQfoMhVd1e5Ww -m 12D3KooWFRgVmb1uWcmCbmJqLr8tBQghL6ysSpK2VyE2VZbaQ6wy -t 7770 -w 9990 # --bootstraps /dns4/fluence-1/tcp/7771 /dns4/fluence-2/tcp/7772
+    command: -f ed25519 -k 29Apzfedhw2Jxh94Jj4rNSmavQ1TkNe8ALYRA7bMegobwp423aLrURxLk32WtXgXHDqoSz7GAT9fQfoMhVd1e5Ww -m 12D3KooWFRgVmb1uWcmCbmJqLr8tBQghL6ysSpK2VyE2VZbaQ6wy -t 7770 -w 9990 --bootstraps /dns4/fluence-1/tcp/7771 /dns4/fluence-2/tcp/7772
    container_name: fluence-0
    environment:
      RUST_BACKTRACE: full
@ -11,7 +11,7 @@ services:
    ports:
      - 7770:7770 # tcp
      - 9990:9990 # ws
-      - 5002:5001 # ipfs rpc
+      - 5003:5001 # ipfs rpc
      - 4000:4001 # ipfs swarm
      - 18080:18080 # /metrics
    restart: always
@ -22,56 +22,58 @@ services:
    networks:
      - fluence

-#  fluence-1: # /ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWRABanQHUn28dxavN9ZS1zZghqoZVAYtFpoN7FdtoGTFv
-#    command: -f ed25519 -k 5fNENMwkUT4dW3hPs9ZwqV4qA5pdTtUChTazAx9Awe2Vpz1yaJu3VCmcEZow6YgdFBGoZoFAZUZBbF3c2Ebd2iL -m 12D3KooWFRgVmb1uWcmCbmJqLr8tBQghL6ysSpK2VyE2VZbaQ6wy -t 7771 -w 9991 --bootstraps /dns4/fluence-0/tcp/7770 /dns4/fluence-2/tcp/7772 #/dns4/kras-00.fluence.dev/tcp/7770
-#    container_name: fluence-1
-#    environment:
-#      RUST_BACKTRACE: full
-#      RUST_LOG: info,network=trace,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,particle_server::behaviour::identify=info,libp2p_mplex=info,libp2p_identify=info,walrus=info,particle_protocol::libp2p_protocol::upgrade=info,kademlia::behaviour=info
-#      WASM_LOG: info
-#    image: fluencelabs/node:latest
-#    ports:
-#      - 7771:7771 # tcp
-#      - 9991:9991 # ws
-#      - 5001:5001 # ipfs rpc
-#      - 4001:4001 # ipfs swarm
-#      - 18081:18080 # /metrics
-#    restart: always
-#    volumes:
-#      - fluence-1:/.fluence
-#      - data-1:/config
-#    networks:
-#      - fluence
-#
-#  fluence-2: # /ip4/127.0.0.1/tcp/9992/ws/p2p/12D3KooWFpQ7LHxcC9FEBUh3k4nSCC12jBhijJv3gJbi7wsNYzJ5
-#    command: -f ed25519 -k 5DTs9LQS8Ay2dM8xBcikDRwYLMcanhsC6tynSSgpLyBZEv5Ey34LVw1fYcCuUj9A9EfvQJB2bsaGhSRoHQ7D6UE5 -m 12D3KooWFRgVmb1uWcmCbmJqLr8tBQghL6ysSpK2VyE2VZbaQ6wy -t 7772 -w 9992 --bootstraps /dns4/fluence-0/tcp/7770 /dns4/fluence-1/tcp/7771 #/dns4/kras-00.fluence.dev/tcp/7770
-#    container_name: fluence-2
-#    environment:
-#      RUST_BACKTRACE: full
-#      RUST_LOG: info,network=trace,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,particle_server::behaviour::identify=info,libp2p_mplex=info,libp2p_identify=info,walrus=info,particle_protocol::libp2p_protocol::upgrade=info,kademlia::behaviour=info
-#      WASM_LOG: info
-#    image: fluencelabs/node:latest
-#    ports:
-#      - 7772:7772 # tcp
-#      - 9992:9992 # ws
-#      - 5002:5001 # ipfs rpc
-#      - 4002:4001 # ipfs swarm
-#      - 18082:18080 # /metrics
-#    restart: always
-#    volumes:
-#      - fluence-2:/.fluence
-#      - data-2:/config
-#    networks:
-#      - fluence
+  fluence-1: # /ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWRABanQHUn28dxavN9ZS1zZghqoZVAYtFpoN7FdtoGTFv
+    command: -f ed25519 -k 5fNENMwkUT4dW3hPs9ZwqV4qA5pdTtUChTazAx9Awe2Vpz1yaJu3VCmcEZow6YgdFBGoZoFAZUZBbF3c2Ebd2iL -m 12D3KooWFRgVmb1uWcmCbmJqLr8tBQghL6ysSpK2VyE2VZbaQ6wy -t 7771 -w 9991 --bootstraps /dns4/fluence-0/tcp/7770 /dns4/fluence-2/tcp/7772 #/dns4/kras-00.fluence.dev/tcp/7770
+    container_name: fluence-1
+    environment:
+      RUST_BACKTRACE: full
+      RUST_LOG: info,network=trace,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,particle_server::behaviour::identify=info,libp2p_mplex=info,libp2p_identify=info,walrus=info,particle_protocol::libp2p_protocol::upgrade=info,kademlia::behaviour=info
+      WASM_LOG: info
+    image: fluencelabs/node:latest
+    ports:
+      - 7771:7771 # tcp
+      - 9991:9991 # ws
+      - 5001:5001 # ipfs rpc
+      - 4001:4001 # ipfs swarm
+      - 18081:18080 # /metrics
+    restart: always
+    volumes:
+      - fluence-1:/.fluence
+      - data-1:/config
+      - ./builtins_secret_key.ed25519:/.fluence/v1/builtins_secret_key.ed25519
+    networks:
+      - fluence
+
+  fluence-2: # /ip4/127.0.0.1/tcp/9992/ws/p2p/12D3KooWFpQ7LHxcC9FEBUh3k4nSCC12jBhijJv3gJbi7wsNYzJ5
+    command: -f ed25519 -k 5DTs9LQS8Ay2dM8xBcikDRwYLMcanhsC6tynSSgpLyBZEv5Ey34LVw1fYcCuUj9A9EfvQJB2bsaGhSRoHQ7D6UE5 -m 12D3KooWFRgVmb1uWcmCbmJqLr8tBQghL6ysSpK2VyE2VZbaQ6wy -t 7772 -w 9992 --bootstraps /dns4/fluence-0/tcp/7770 /dns4/fluence-1/tcp/7771 #/dns4/kras-00.fluence.dev/tcp/7770
+    container_name: fluence-2
+    environment:
+      RUST_BACKTRACE: full
+      RUST_LOG: info,network=trace,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,particle_server::behaviour::identify=info,libp2p_mplex=info,libp2p_identify=info,walrus=info,particle_protocol::libp2p_protocol::upgrade=info,kademlia::behaviour=info
+      WASM_LOG: info
+    image: fluencelabs/node:latest
+    ports:
+      - 7772:7772 # tcp
+      - 9992:9992 # ws
+      - 5002:5001 # ipfs rpc
+      - 4002:4001 # ipfs swarm
+      - 18082:18080 # /metrics
+    restart: always
+    volumes:
+      - fluence-2:/.fluence
+      - data-2:/config
+      - ./builtins_secret_key.ed25519:/.fluence/v1/builtins_secret_key.ed25519
+    networks:
+      - fluence

 version: "3.5"
 volumes:
  fluence-0:
-#  fluence-1:
-#  fluence-2:
+  fluence-1:
+  fluence-2:
  data-0:
-#  data-1:
-#  data-2:
+  data-1:
+  data-2:

 networks:
  fluence: 
--- a/service/src/results.rs
+++ b/service/src/results.rs
@ -60,9 +60,9 @@ pub struct AllCertsResult {
 impl From<Result<Vec<Certificate>, ServiceError>> for AllCertsResult {
    fn from(result: Result<Vec<Certificate>, ServiceError>) -> Self {
        match result {
-            Ok(certs) => AllCertsResult {
+            Ok(certificates) => AllCertsResult {
                success: true,
-                certificates: certs,
+                certificates,
                error: "".to_string(),
            },
            Err(e) => AllCertsResult {
@ -75,19 +75,19 @@ impl From<Result<Vec<Certificate>, ServiceError>> for AllCertsResult {
 }

 #[marine]
-pub struct AddRootResult {
+pub struct SetRootResult {
    pub success: bool,
    pub error: String,
 }

-impl From<Result<(), ServiceError>> for AddRootResult {
+impl From<Result<(), ServiceError>> for SetRootResult {
    fn from(result: Result<(), ServiceError>) -> Self {
        match result {
-            Ok(()) => AddRootResult {
+            Ok(()) => SetRootResult {
                success: true,
                error: "".to_string(),
            },
-            Err(e) => AddRootResult {
+            Err(e) => SetRootResult {
                success: false,
                error: format!("{}", e),
            },
@ -256,3 +256,27 @@ impl From<Result<(), ServiceError>> for RevokeResult {
        }
    }
 }
+
+#[marine]
+pub struct ExportRevocationsResult {
+    pub success: bool,
+    pub revocations: Vec<Revocation>,
+    pub error: String,
+}
+
+impl From<Result<Vec<Revocation>, ServiceError>> for ExportRevocationsResult {
+    fn from(result: Result<Vec<Revocation>, ServiceError>) -> Self {
+        match result {
+            Ok(revocations) => ExportRevocationsResult {
+                success: true,
+                revocations,
+                error: "".to_string(),
+            },
+            Err(e) => ExportRevocationsResult {
+                success: false,
+                revocations: vec![],
+                error: format!("{}", e),
+            },
+        }
+    }
+}
--- a/service/src/service_api.rs
+++ b/service/src/service_api.rs
@ -2,9 +2,9 @@ use crate::dto::{Certificate, Revocation, Trust};
 use crate::error::ServiceError;
 use crate::misc::{check_timestamp_tetraplets, extract_public_key, with_tg, wrapped_try};
 use crate::results::{
-    AddRootResult, AddTrustResult, AllCertsResult, GetRevokeBytesResult, GetTrustBytesResult,
-    InsertResult, IssueRevocationResult, IssueTrustResult, RevokeResult, VerifyTrustResult,
-    WeightResult,
+    AddTrustResult, AllCertsResult, ExportRevocationsResult, GetRevokeBytesResult,
+    GetTrustBytesResult, InsertResult, IssueRevocationResult, IssueTrustResult, RevokeResult,
+    SetRootResult, VerifyTrustResult, WeightResult,
 };
 use crate::storage_impl::SQLiteStorage;
 use fluence_keypair::Signature;
@ -12,27 +12,22 @@ use marine_rs_sdk::{get_call_parameters, marine, CallParameters};
 use std::convert::{TryFrom, TryInto};
 use std::str::FromStr;
 use std::time::Duration;
-use trust_graph::{TrustGraph, MAX_WEIGHT_FACTOR};
+use trust_graph::TrustGraph;

 #[marine]
-fn get_weight_factor(max_chain_len: u32) -> u32 {
-    MAX_WEIGHT_FACTOR.checked_sub(max_chain_len).unwrap_or(0u32)
-}
-
-#[marine]
-/// could add only a owner of a trust graph service
-fn add_root(peer_id: String, weight_factor: u32) -> AddRootResult {
+/// Only service owner can set roots
+fn set_root(peer_id: String, max_chain_len: u32) -> SetRootResult {
    let call_parameters: CallParameters = marine_rs_sdk::get_call_parameters();
    let init_peer_id = call_parameters.init_peer_id;
    if call_parameters.service_creator_peer_id == init_peer_id {
        with_tg(|tg| {
            let public_key = extract_public_key(peer_id)?;
-            tg.add_root_weight_factor(public_key, weight_factor)?;
+            tg.set_root(public_key, max_chain_len)?;
            Ok(())
        })
        .into()
    } else {
-        return AddRootResult {
+        return SetRootResult {
            success: false,
            error: ServiceError::NotOwner.to_string(),
        };
@ -71,17 +66,40 @@ fn get_certs(
    tg: &mut TrustGraph<SQLiteStorage>,
    issued_for: String,
    timestamp_sec: u64,
-) -> Result<impl Iterator<Item = Certificate>, ServiceError> {
+) -> Result<Vec<Certificate>, ServiceError> {
    let public_key = extract_public_key(issued_for)?;
    let certs = tg.get_all_certs(public_key, Duration::from_secs(timestamp_sec))?;
-    Ok(certs.into_iter().map(|c| c.into()))
+    Ok(certs.into_iter().map(|c| c.into()).collect())
+}
+
+fn get_certs_from(
+    tg: &mut TrustGraph<SQLiteStorage>,
+    issued_for: String,
+    issuer: String,
+    timestamp_sec: u64,
+) -> Result<Vec<Certificate>, ServiceError> {
+    let issued_for_pk = extract_public_key(issued_for)?;
+    let issuer_pk = extract_public_key(issuer)?;
+    let certs =
+        tg.get_all_certs_from(issued_for_pk, issuer_pk, Duration::from_secs(timestamp_sec))?;
+    Ok(certs.into_iter().map(|c| c.into()).collect())
 }

 #[marine]
 fn get_all_certs(issued_for: String, timestamp_sec: u64) -> AllCertsResult {
    with_tg(|tg| {
        check_timestamp_tetraplets(&marine_rs_sdk::get_call_parameters(), 1)?;
-        get_certs(tg, issued_for, timestamp_sec).map(|iter| iter.collect())
+        get_certs(tg, issued_for, timestamp_sec)
+    })
+    .into()
+}
+
+#[marine]
+fn get_all_certs_from(issued_for: String, issuer: String, timestamp_sec: u64) -> AllCertsResult {
+    with_tg(|tg| {
+        let cp = get_call_parameters();
+        check_timestamp_tetraplets(&cp, 1)?;
+        get_certs_from(tg, issued_for, issuer, timestamp_sec)
    })
    .into()
 }
@ -91,7 +109,7 @@ fn get_host_certs(timestamp_sec: u64) -> AllCertsResult {
    with_tg(|tg| {
        let cp = marine_rs_sdk::get_call_parameters();
        check_timestamp_tetraplets(&cp, 0)?;
-        get_certs(tg, cp.host_id, timestamp_sec).map(|iter| iter.collect())
+        get_certs(tg, cp.host_id, timestamp_sec)
    })
    .into()
 }
@ -101,10 +119,7 @@ fn get_host_certs_from(issuer: String, timestamp_sec: u64) -> AllCertsResult {
    with_tg(|tg| {
        let cp = get_call_parameters();
        check_timestamp_tetraplets(&cp, 1)?;
-        get_certs(tg, cp.host_id, timestamp_sec).map(|c| {
-            c.filter(|cert: &Certificate| cert.chain.iter().any(|t| t.issued_for == issuer))
-                .collect()
-        })
+        get_certs_from(tg, cp.host_id, issuer, timestamp_sec)
    })
    .into()
 }
@ -121,6 +136,20 @@ fn get_weight(peer_id: String, timestamp_sec: u64) -> WeightResult {
    .into()
 }

+#[marine]
+fn get_weight_from(peer_id: String, issuer: String, timestamp_sec: u64) -> WeightResult {
+    with_tg(|tg| {
+        check_timestamp_tetraplets(&marine_rs_sdk::get_call_parameters(), 1)?;
+        let issued_for_pk = extract_public_key(peer_id.clone())?;
+        let issuer_pk = extract_public_key(issuer)?;
+        let weight =
+            tg.weight_from(issued_for_pk, issuer_pk, Duration::from_secs(timestamp_sec))?;
+        Ok(weight)
+    })
+    .map(|w| (w, peer_id))
+    .into()
+}
+
 #[marine]
 fn get_trust_bytes(
    issued_for_peer_id: String,
@ -187,18 +216,17 @@ fn add_trust(trust: Trust, issuer_peer_id: String, timestamp_sec: u64) -> AddTru
            return Err(ServiceError::InvalidTimestamp("trust".to_string()));
        }

-        tg.add_trust(
+        Ok(tg.add_trust(
            &trust.try_into()?,
            public_key,
            Duration::from_secs(timestamp_sec),
-        )
-        .map_err(ServiceError::TGError)
+        )?)
    })
    .into()
 }

 #[marine]
-fn get_revoke_bytes(revoked_peer_id: String, revoked_at: u64) -> GetRevokeBytesResult {
+fn get_revocation_bytes(revoked_peer_id: String, revoked_at: u64) -> GetRevokeBytesResult {
    wrapped_try(|| {
        let public_key = extract_public_key(revoked_peer_id)?;
        Ok(trust_graph::Revocation::signature_bytes(
@ -211,8 +239,8 @@ fn get_revoke_bytes(revoked_peer_id: String, revoked_at: u64) -> GetRevokeBytesR

 #[marine]
 fn issue_revocation(
-    revoked_peer_id: String,
    revoked_by_peer_id: String,
+    revoked_peer_id: String,
    revoked_at_sec: u64,
    signature_bytes: Vec<u8>,
 ) -> IssueRevocationResult {
@ -222,7 +250,7 @@ fn issue_revocation(

        let revoked_at = Duration::from_secs(revoked_at_sec);
        let signature = Signature::from_bytes(revoked_by_pk.get_key_format(), signature_bytes);
-        Ok(trust_graph::Revocation::new(revoked_pk, revoked_by_pk, revoked_at, signature).into())
+        Ok(trust_graph::Revocation::new(revoked_by_pk, revoked_pk, revoked_at, signature).into())
    })
    .into()
 }
@ -236,7 +264,20 @@ fn revoke(revoke: Revocation, timestamp_sec: u64) -> RevokeResult {
            return Err(ServiceError::InvalidTimestamp("revoke".to_string()));
        }

-        tg.revoke(revoke.try_into()?).map_err(ServiceError::TGError)
+        Ok(tg.revoke(revoke.try_into()?)?)
+    })
+    .into()
+}
+
+#[marine]
+fn export_revocations(issued_for: String) -> ExportRevocationsResult {
+    with_tg(|tg| {
+        let issued_for_pk = extract_public_key(issued_for)?;
+        Ok(tg
+            .get_revocations(issued_for_pk)?
+            .into_iter()
+            .map(|r| r.into())
+            .collect())
    })
    .into()
 }
--- a/service/src/storage_impl.rs
+++ b/service/src/storage_impl.rs
@ -293,7 +293,7 @@ impl Storage for SQLiteStorage {
        }
    }

-    fn add_root_weight_factor(
+    fn set_root_weight_factor(
        &mut self,
        pk: PK,
        weight_factor: WeightFactor,
@ -321,7 +321,6 @@ impl Storage for SQLiteStorage {
        let mut roots = vec![];

        while let Some(row) = cursor.next()? {
-            log::info!("row: {:?}", row);
            let pk = row[0].as_string().ok_or(PublicKeyConversion)?;
            let pk: PK = PK::from_str(pk).map_err(|e| PublicKeyFromStr(e.to_string()))?;

--- a/service/src/tests.rs
+++ b/service/src/tests.rs
@ -87,8 +87,8 @@ mod service_tests {
        cp
    }

-    fn add_root_peer_id(trust_graph: &mut ServiceInterface, peer_id: PeerId, weight_factor: u32) {
-        let result = trust_graph.add_root(peer_id.to_base58(), weight_factor);
+    fn set_root_peer_id(trust_graph: &mut ServiceInterface, peer_id: PeerId, max_chain_len: u32) {
+        let result = trust_graph.set_root(peer_id.to_base58(), max_chain_len);
        assert!(result.success, "{}", result.error);
    }

@ -97,9 +97,9 @@ mod service_tests {
        issuer_kp: &KeyPair,
        issued_at_sec: u64,
        expires_at_sec: u64,
-        weight_factor: u32,
+        max_chain_len: u32,
    ) -> Trust {
-        let result = trust_graph.add_root(issuer_kp.get_peer_id().to_base58(), weight_factor);
+        let result = trust_graph.set_root(issuer_kp.get_peer_id().to_base58(), max_chain_len);
        assert!(result.success, "{}", result.error);
        add_trust(
            trust_graph,
@ -201,13 +201,13 @@ mod service_tests {
        revoked_peer_id: &PeerId,
        revoked_at_sec: u64,
    ) -> Revocation {
-        let result = trust_graph.get_revoke_bytes(revoked_peer_id.to_base58(), revoked_at_sec);
+        let result = trust_graph.get_revocation_bytes(revoked_peer_id.to_base58(), revoked_at_sec);
        assert!(result.success, "{}", result.error);

        let revoke_bytes = issuer_kp.sign(&result.result).unwrap().to_vec().to_vec();
        let issue_result = trust_graph.issue_revocation(
-            revoked_peer_id.to_base58(),
            issuer_kp.get_peer_id().to_base58(),
+            revoked_peer_id.to_base58(),
            revoked_at_sec,
            revoke_bytes,
        );
@ -325,7 +325,7 @@ mod service_tests {
        };

        let some_peer_id = KeyPair::generate_ed25519().get_peer_id();
-        let result = trust_graph.add_root_cp(some_peer_id.to_base58(), 0, cp);
+        let result = trust_graph.set_root_cp(some_peer_id.to_base58(), 0, cp);
        assert!(!result.success);
        assert_eq!(result.error, ServiceError::NotOwner.to_string());
    }
@ -343,7 +343,7 @@ mod service_tests {
        };

        let some_peer_id = KeyPair::generate_ed25519().get_peer_id();
-        let result = trust_graph.add_root_cp(some_peer_id.to_base58(), 0, cp);
+        let result = trust_graph.set_root_cp(some_peer_id.to_base58(), 0, cp);
        assert!(result.success, "{}", result.error);
    }

@ -357,7 +357,7 @@ mod service_tests {
        let expires_at_sec = 9999u64;
        let issued_at_sec = 0u64;

-        add_root_peer_id(&mut trust_graph, root_kp.get_peer_id(), 4u32);
+        set_root_peer_id(&mut trust_graph, root_kp.get_peer_id(), 4u32);

        let result =
            trust_graph.get_trust_bytes(root_peer_id.to_base58(), expires_at_sec, issued_at_sec);
@ -408,7 +408,7 @@ mod service_tests {
            &root_kp,
            cur_time,
            root_expired_time - 1,
-            4,
+            10,
        );

        let trust_kp = KeyPair::generate_ed25519();
@ -447,7 +447,7 @@ mod service_tests {

        let peerA_kp = KeyPair::generate_ed25519();
        let mut cur_time = 100u64;
-        add_root_with_trust(&mut trust_graph, &peerA_kp, cur_time, cur_time + 9999, 4u32);
+        add_root_with_trust(&mut trust_graph, &peerA_kp, cur_time, cur_time + 9999, 10);

        let peerB_kp = KeyPair::generate_ed25519();
        add_trust(
@ -490,7 +490,7 @@ mod service_tests {
        let mut cur_time = current_time();

        let root_peer_id = key_pairs[0].get_peer_id();
-        add_root_peer_id(&mut trust_graph, root_peer_id, 2);
+        set_root_peer_id(&mut trust_graph, root_peer_id, 10);
        add_trusts(&mut trust_graph, &trusts, cur_time);

        let target_peer_id = key_pairs[4].get_peer_id();
@ -536,7 +536,7 @@ mod service_tests {
        let cur_time = current_time();

        let root_peer_id = key_pairs[0].get_peer_id();
-        add_root_peer_id(&mut trust_graph, root_peer_id, 2);
+        set_root_peer_id(&mut trust_graph, root_peer_id, 10);
        add_trusts(&mut trust_graph, &trusts, cur_time);

        let issued_by = key_pairs.last().unwrap().get_peer_id();
@ -577,7 +577,7 @@ mod service_tests {
        let cur_time = current_time();

        let root1_peer_id = key_pairs[0].get_peer_id();
-        add_root_peer_id(&mut trust_graph, root1_peer_id, 2);
+        set_root_peer_id(&mut trust_graph, root1_peer_id, 10);
        add_trusts(&mut trust_graph, &trusts, cur_time);

        let issued_by = key_pairs.last().unwrap().get_peer_id();
@ -620,7 +620,7 @@ mod service_tests {

        let cur_time = current_time();
        let root_peer_id = key_pairs[0].get_peer_id();
-        add_root_peer_id(&mut trust_graph, root_peer_id, 1);
+        set_root_peer_id(&mut trust_graph, root_peer_id, 10);

        for auth in trusts.iter() {
            add_trust_checked(&mut trust_graph, auth.trust.clone(), auth.issuer, cur_time);
@ -649,9 +649,9 @@ mod service_tests {
        let far_future = cur_time + 9999;

        // add first and last trusts as roots
-        add_root_peer_id(&mut trust_graph, kps[0].get_peer_id(), 0);
+        set_root_peer_id(&mut trust_graph, kps[0].get_peer_id(), 10);
        add_trusts(&mut trust_graph, &trusts, cur_time);
-        add_root_with_trust(&mut trust_graph, &kps[5], cur_time, far_future, 0);
+        add_root_with_trust(&mut trust_graph, &kps[5], cur_time, far_future, 10);

        let certs = get_all_certs(&mut trust_graph, kps[5].get_peer_id(), cur_time);
        // first with self-signed last trust, second - without
@ -667,7 +667,7 @@ mod service_tests {

        let root_kp = KeyPair::generate_ed25519();
        let cur_time = 100u64;
-        add_root_with_trust(&mut trust_graph, &root_kp, cur_time, cur_time + 999, 4u32);
+        add_root_with_trust(&mut trust_graph, &root_kp, cur_time, cur_time + 999, 10);

        let trust_kp = KeyPair::generate_ed25519();
        add_trust(
@ -712,7 +712,7 @@ mod service_tests {

        let root_kp = KeyPair::generate_ed25519();
        let mut cur_time = 100u64;
-        add_root_with_trust(&mut trust_graph, &root_kp, cur_time, cur_time + 999, 4u32);
+        add_root_with_trust(&mut trust_graph, &root_kp, cur_time, cur_time + 999, 10);

        let trust_kp = KeyPair::generate_ed25519();
        let expires_at_sec = cur_time + 10;
@ -752,10 +752,10 @@ mod service_tests {
        let root2_kp = KeyPair::generate_ed25519();
        let cur_time = 100;
        let far_future = cur_time + 99999;
-        // root with bigger weight (smaller weight factor)
-        add_root_with_trust(&mut trust_graph, &root1_kp, cur_time, far_future, 0u32);
+        // root with bigger weight (bigger max_chain_len)
+        add_root_with_trust(&mut trust_graph, &root1_kp, cur_time, far_future, 10);
        // opposite
-        add_root_with_trust(&mut trust_graph, &root2_kp, cur_time, far_future, 5u32);
+        add_root_with_trust(&mut trust_graph, &root2_kp, cur_time, far_future, 5);

        // issue trust from root2 to any other peer_id
        let issued_by_root2_peer_id = KeyPair::generate_ed25519().get_peer_id();
@ -832,7 +832,7 @@ mod service_tests {

        let cur_time = current_time();
        let root_peer_id = key_pairs[0].get_peer_id();
-        add_root_peer_id(&mut trust_graph, root_peer_id, 1);
+        set_root_peer_id(&mut trust_graph, root_peer_id, 10);

        for auth in trusts.iter() {
            add_trust_checked(&mut trust_graph, auth.trust.clone(), auth.issuer, cur_time);
@ -862,7 +862,7 @@ mod service_tests {

        let cur_time = current_time();
        let root_peer_id = key_pairs[0].get_peer_id();
-        add_root_peer_id(&mut trust_graph, root_peer_id, 1);
+        set_root_peer_id(&mut trust_graph, root_peer_id, 10);

        for auth in trusts.iter() {
            add_trust_checked(&mut trust_graph, auth.trust.clone(), auth.issuer, cur_time);
--- a/src/revoke.rs
+++ b/src/revoke.rs
@ -48,10 +48,9 @@ pub struct Revocation {
 }

 impl Revocation {
-    #[allow(dead_code)]
    pub fn new(
-        pk: PublicKey,
        revoked_by: PublicKey,
+        pk: PublicKey,
        revoked_at: Duration,
        signature: Signature,
    ) -> Self {
@ -64,12 +63,11 @@ impl Revocation {
    }

    /// Creates new revocation signed by a revoker.
-    #[allow(dead_code)]
    pub fn create(revoker: &KeyPair, to_revoke: PublicKey, revoked_at: Duration) -> Self {
        let msg = Revocation::signature_bytes(&to_revoke, revoked_at);
        let signature = revoker.sign(&msg).unwrap();

-        Revocation::new(to_revoke, revoker.public(), revoked_at, signature)
+        Revocation::new(revoker.public(), to_revoke, revoked_at, signature)
    }

    pub fn signature_bytes(pk: &PublicKey, revoked_at: Duration) -> Vec<u8> {
@ -120,8 +118,8 @@ mod tests {

        let duration2 = Duration::new(95, 0);
        let corrupted_revoke = Revocation::new(
-            to_revoke.public(),
            revoker.public(),
+            to_revoke.public(),
            duration2,
            revoke.signature,
        );
--- a/src/trust_graph.rs
+++ b/src/trust_graph.rs
@ -94,6 +94,10 @@ impl From<TrustGraphError> for String {
    }
 }

+fn get_weight_factor(max_chain_len: u32) -> u32 {
+    MAX_WEIGHT_FACTOR.checked_sub(max_chain_len).unwrap_or(0u32)
+}
+
 pub fn get_weight_from_factor(wf: WeightFactor) -> u32 {
    2u32.pow(MAX_WEIGHT_FACTOR.saturating_sub(wf))
 }
@ -107,12 +111,10 @@ where
    }

    /// Insert new root weight
-    pub fn add_root_weight_factor(
-        &mut self,
-        pk: PublicKey,
-        weight: WeightFactor,
-    ) -> Result<(), TrustGraphError> {
-        Ok(self.storage.add_root_weight_factor(pk.into(), weight)?)
+    pub fn set_root(&mut self, pk: PublicKey, max_chain_len: u32) -> Result<(), TrustGraphError> {
+        Ok(self
+            .storage
+            .set_root_weight_factor(pk.into(), get_weight_factor(max_chain_len))?)
    }

    pub fn add_trust<T, P>(
@ -198,6 +200,29 @@ where
        Ok(max_weight)
    }

+    /// Get the maximum weight of trust for one public key.
+    /// for all chains which contain `issuer`
+    pub fn weight_from<P>(
+        &mut self,
+        issued_for: P,
+        issuer: P,
+        cur_time: Duration,
+    ) -> Result<u32, TrustGraphError>
+    where
+        P: Borrow<PublicKey>,
+    {
+        let mut max_weight = 0;
+
+        // get all possible certificates from the given public key to all roots in the graph
+        // which contain `issuer`
+        let certs = self.get_all_certs_from(issued_for, issuer, cur_time)?;
+        if let Some(weight_factor) = self.certificates_weight_factor(certs)? {
+            max_weight = std::cmp::max(max_weight, get_weight_from_factor(weight_factor))
+        }
+
+        Ok(max_weight)
+    }
+
    /// Calculate weight from given certificates
    /// Returns None if there is no such public key
    /// or some trust between this key and a root key is revoked.
@ -300,6 +325,27 @@ where
        Ok(terminated_chains)
    }

+    /// Get all possible certificates where `issued_for` will be the last element of the chain,
+    /// all certificates contain `issuer`
+    /// and one of the destinations is the root of this chain.
+    pub fn get_all_certs_from<P>(
+        &mut self,
+        issued_for: P,
+        issuer: P,
+        cur_time: Duration,
+    ) -> Result<Vec<Certificate>, TrustGraphError>
+    where
+        P: Borrow<PublicKey>,
+    {
+        self.get_all_certs(issued_for, cur_time).map(|c| {
+            c.into_iter()
+                .filter(|cert: &Certificate| {
+                    cert.chain.iter().any(|t| t.issued_for.eq(issuer.borrow()))
+                })
+                .collect()
+        })
+    }
+
    /// Get all possible certificates where `issued_for` will be the last element of the chain
    /// and one of the destinations is the root of this chain.
    pub fn get_all_certs<P>(
@ -344,4 +390,11 @@ where

        Ok(self.storage.revoke(revocation)?)
    }
+
+    pub fn get_revocations<P>(&self, issued_for: P) -> Result<Vec<Revocation>, TrustGraphError>
+    where
+        P: Borrow<PublicKey>,
+    {
+        Ok(self.storage.get_revocations(issued_for.borrow().as_ref())?)
+    }
 }
--- a/src/trust_graph_storage.rs
+++ b/src/trust_graph_storage.rs
@ -22,7 +22,11 @@ pub trait Storage {
    fn insert(&mut self, node: TrustRelation) -> Result<(), Self::Error>;

    fn get_root_weight_factor(&self, pk: &PK) -> Result<Option<WeightFactor>, Self::Error>;
-    fn add_root_weight_factor(&mut self, pk: PK, weight: WeightFactor) -> Result<(), Self::Error>;
+    fn set_root_weight_factor(
+        &mut self,
+        pk: PK,
+        weight_factor: WeightFactor,
+    ) -> Result<(), Self::Error>;
    fn root_keys(&self) -> Result<Vec<PK>, Self::Error>;
    fn revoke(&mut self, revocation: Revocation) -> Result<(), Self::Error>;
    fn update_auth(&mut self, auth: Auth, cur_time: Duration) -> Result<(), Self::Error>;
				`@ -0,0 +1 @@`
				`E5ay3731i4HN8XjJozouV92RDMGAn3qSnb9dKSnujiWv`