fluencelabs/trust-graph
1
0
Fork 0
mirror of https://github.com/fluencelabs/trust-graph synced 2025-04-24 23:32:13 +00:00
Code Issues Projects Releases Wiki Activity

aqua: update sig service (#39)

Browse Source
This commit is contained in:
Aleksey Proshutisnkiy 2022-02-05 03:17:07 +03:00 committed by GitHub
parent 7c72a59bef
commit b9fbbbcafb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 50 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/package-lock.json generated
View File

@ -10,7 +10,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua": "^0.5.2-257", "@fluencelabs/aqua": "^0.5.2-257",
"@fluencelabs/aqua-lib": "^0.3.2", "@fluencelabs/aqua-lib": "^0.3.4",
"@fluencelabs/fluence": "^0.18.0", "@fluencelabs/fluence": "^0.18.0",
"@fluencelabs/fluence-network-environment": "^1.0.10", "@fluencelabs/fluence-network-environment": "^1.0.10",
"@fluencelabs/trust-graph": "file:../aqua", "@fluencelabs/trust-graph": "file:../aqua",
@ -22,7 +22,7 @@
}, },
"../aqua": { "../aqua": {
"name": "@fluencelabs/trust-graph", "name": "@fluencelabs/trust-graph",
"version": "0.2.0", "version": "0.2.2",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua-lib": "^0.3.1" "@fluencelabs/aqua-lib": "^0.3.1"
@ -133,9 +133,9 @@
"integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg=="
}, },
"node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.4.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==" "integrity": "sha512-DH7TZgflTJDxK18URlELnHI65jYtZf7b5e25gjRL9AiT/nvdodQqSvCcdVKK/jvhPy9q3RXM/rOcHfqh5mmpSQ=="
}, },
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": {
"version": "0.2.1", "version": "0.2.1",
@ -4345,9 +4345,9 @@
} }
}, },
"@fluencelabs/aqua-lib": { "@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.4.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==" "integrity": "sha512-DH7TZgflTJDxK18URlELnHI65jYtZf7b5e25gjRL9AiT/nvdodQqSvCcdVKK/jvhPy9q3RXM/rOcHfqh5mmpSQ=="
}, },
"@fluencelabs/avm": { "@fluencelabs/avm": {
"version": "0.20.0", "version": "0.20.0",

2
admin/package.json
View File

@ -14,7 +14,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua": "^0.5.2-257", "@fluencelabs/aqua": "^0.5.2-257",
"@fluencelabs/aqua-lib": "^0.3.2", "@fluencelabs/aqua-lib": "^0.3.4",
"@fluencelabs/fluence": "^0.18.0", "@fluencelabs/fluence": "^0.18.0",
"@fluencelabs/fluence-network-environment": "^1.0.10", "@fluencelabs/fluence-network-environment": "^1.0.10",
"@fluencelabs/trust-graph": "file:../aqua", "@fluencelabs/trust-graph": "file:../aqua",

18
aqua/package-lock.json generated
View File

@ -1,15 +1,15 @@
{ {
"name": "@fluencelabs/trust-graph", "name": "@fluencelabs/trust-graph",
"version": "0.2.0", "version": "0.2.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@fluencelabs/trust-graph", "name": "@fluencelabs/trust-graph",
"version": "0.2.0", "version": "0.2.2",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua-lib": "^0.3.1" "@fluencelabs/aqua-lib": "^0.3.4"
}, },
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua": "^0.5.2-257" "@fluencelabs/aqua": "^0.5.2-257"
@ -130,9 +130,9 @@
"dev": true "dev": true
}, },
"node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.4.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==" "integrity": "sha512-DH7TZgflTJDxK18URlELnHI65jYtZf7b5e25gjRL9AiT/nvdodQqSvCcdVKK/jvhPy9q3RXM/rOcHfqh5mmpSQ=="
}, },
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": {
"version": "0.2.1", "version": "0.2.1",
@ -4576,9 +4576,9 @@
} }
}, },
"@fluencelabs/aqua-lib": { "@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.4.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==" "integrity": "sha512-DH7TZgflTJDxK18URlELnHI65jYtZf7b5e25gjRL9AiT/nvdodQqSvCcdVKK/jvhPy9q3RXM/rOcHfqh5mmpSQ=="
}, },
"@fluencelabs/avm": { "@fluencelabs/avm": {
"version": "0.16.0-restriction-operator.9", "version": "0.16.0-restriction-operator.9",

2
aqua/package.json
View File

@ -6,7 +6,7 @@
"*.aqua" "*.aqua"
], ],
"dependencies": { "dependencies": {
"@fluencelabs/aqua-lib": "^0.3.1" "@fluencelabs/aqua-lib": "^0.3.4"
}, },
"scripts": { "scripts": {
"generate-aqua": "../service/build.sh", "generate-aqua": "../service/build.sh",

45
aqua/trust-graph-api.aqua
View File

@ -27,21 +27,18 @@ func issue_trust(issuer: PeerId, issued_for: PeerId, expires_at_sec: u64) -> ?Tr
result: ?Trust result: ?Trust
error: *Error error: *Error
if bytes.success: if bytes.success:
-- for %init_peer_id% Sig service available by default and registered as "sig" Sig issuer
-- for other peer ids custom Sig service should be implemented and registered with this peer id as service id sig_res <- Sig.sign(bytes.result)
if issuer != %init_peer_id%:
Sig issuer
else:
Sig "sig"
signature <- Sig.sign(bytes.result) if sig_res.success:
on HOST_PEER_ID:
on HOST_PEER_ID: issue_result <- TrustGraph.issue_trust(issued_for, expires_at_sec, issued_at_sec, sig_res.signature!)
issue_result <- TrustGraph.issue_trust(issued_for, expires_at_sec, issued_at_sec, signature) if issue_result.success:
if issue_result.success: result <<- issue_result.trust
result <<- issue_result.trust else:
error <<- issue_result.error
else: else:
error <<- issue_result.error error <<- sig_res.error!
else: else:
error <<- bytes.error error <<- bytes.error
<- result, error <- result, error
@ -133,21 +130,19 @@ func issue_revocation(revoked_by: PeerId, revoked: PeerId) -> ?Revocation, ?Erro
result: ?Revocation result: ?Revocation
error: *Error error: *Error
if bytes.success: if bytes.success:
-- for %init_peer_id% Sig service available by default and registered as "sig" Sig revoked_by
-- 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) sig_res <- Sig.sign(bytes.result)
on HOST_PEER_ID: if sig_res.success:
issue_result <- TrustGraph.issue_revocation(revoked_by, revoked, issued_at_sec, signature) on HOST_PEER_ID:
if issue_result.success: issue_result <- TrustGraph.issue_revocation(revoked_by, revoked, issued_at_sec, sig_res.signature!)
result <<- issue_result.revocation if issue_result.success:
result <<- issue_result.revocation
else:
error <<- issue_result.error
else: else:
error <<- issue_result.error error <<- sig_res.error!
else: else:
error <<- bytes.error error <<- bytes.error
<- result, error <- result, error

20
example/package-lock.json generated
View File

@ -10,7 +10,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua": "^0.5.2-257", "@fluencelabs/aqua": "^0.5.2-257",
"@fluencelabs/aqua-lib": "^0.3.2", "@fluencelabs/aqua-lib": "^0.3.4",
"@fluencelabs/fluence": "^0.18.0", "@fluencelabs/fluence": "^0.18.0",
"@fluencelabs/fluence-network-environment": "^1.0.10", "@fluencelabs/fluence-network-environment": "^1.0.10",
"@fluencelabs/trust-graph": "file:../aqua", "@fluencelabs/trust-graph": "file:../aqua",
@ -75,10 +75,10 @@
}, },
"../aqua": { "../aqua": {
"name": "@fluencelabs/trust-graph", "name": "@fluencelabs/trust-graph",
"version": "0.2.0", "version": "0.2.2",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua-lib": "^0.3.1" "@fluencelabs/aqua-lib": "^0.3.4"
}, },
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua": "^0.5.2-257" "@fluencelabs/aqua": "^0.5.2-257"
@ -186,9 +186,9 @@
"integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg=="
}, },
"node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.4.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==" "integrity": "sha512-DH7TZgflTJDxK18URlELnHI65jYtZf7b5e25gjRL9AiT/nvdodQqSvCcdVKK/jvhPy9q3RXM/rOcHfqh5mmpSQ=="
}, },
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": {
"version": "0.2.1", "version": "0.2.1",
@ -4398,9 +4398,9 @@
} }
}, },
"@fluencelabs/aqua-lib": { "@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.4.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==" "integrity": "sha512-DH7TZgflTJDxK18URlELnHI65jYtZf7b5e25gjRL9AiT/nvdodQqSvCcdVKK/jvhPy9q3RXM/rOcHfqh5mmpSQ=="
}, },
"@fluencelabs/avm": { "@fluencelabs/avm": {
"version": "0.20.0", "version": "0.20.0",
@ -4455,7 +4455,7 @@
"version": "file:../aqua", "version": "file:../aqua",
"requires": { "requires": {
"@fluencelabs/aqua": "^0.5.2-257", "@fluencelabs/aqua": "^0.5.2-257",
"@fluencelabs/aqua-lib": "^0.3.1" "@fluencelabs/aqua-lib": "^0.3.4"
}, },
"dependencies": { "dependencies": {
"@fluencelabs/aqua": { "@fluencelabs/aqua": {

2
example/package.json
View File

@ -14,7 +14,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua": "^0.5.2-257", "@fluencelabs/aqua": "^0.5.2-257",
"@fluencelabs/aqua-lib": "^0.3.2", "@fluencelabs/aqua-lib": "^0.3.4",
"@fluencelabs/fluence": "^0.18.0", "@fluencelabs/fluence": "^0.18.0",
"@fluencelabs/fluence-network-environment": "^1.0.10", "@fluencelabs/fluence-network-environment": "^1.0.10",
"@fluencelabs/trust-graph": "file:../aqua", "@fluencelabs/trust-graph": "file:../aqua",