Skip to content

T
t3
Commit 33dc9982 authored by Mark Harding's avatar Mark Harding
Browse files
Options

(wip): marks bump

parent 5ee9358d
master
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4222 additions and 185 deletions
README.md
View file @ 33dc9982
......@@ -8,6 +8,8 @@ T3 uses DID to build trust scores across your social world.
## Trust
Contract address: `0xf4e005be076ed34aed35f66565593bd0c4dca1e9`
There are two trust actions, Trust and Distrust. These actions are written to the blockchain. Trust is given to entities. Entities can consist of either a 'owner' or 'artifact'.
## Registering
......@@ -18,9 +20,9 @@ There are two trust actions, Trust and Distrust. These actions are written to th
## Traversing the Trust Tree
1) Pick an entry point (default is self)
2) Return all entites from the entry point
3) nth degree should have been provided by application.
1. Pick an entry point (default is self)
2. Return all entites from the entry point
3. nth degree should have been provided by application.
## Applications
......
app/angular.json
View file @ 33dc9982
......@@ -15,8 +15,12 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {
"path": "./webpack.config.js",
"mergeStrategies": { "externals": "replace" }
},
"outputPath": "dist/t3",
"index": "src/index.html",
"main": "src/main.ts",
......@@ -28,7 +32,7 @@
"src/styles.scss",
"node_modules/material-design-icons/iconfont/material-icons.css"
],
"scripts": ["./node_modules/crypto-browserify/index.js"]
"scripts": []
},
"configurations": {
"production": {
......@@ -58,7 +62,7 @@
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "t3:build"
},
......
app/package-lock.json
View file @ 33dc9982
This diff is collapsed.
app/package.json
View file @ 33dc9982
......@@ -3,7 +3,7 @@
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
"start": "ng serve --host=0.0.0.0 --disable-host-check",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
......@@ -21,9 +21,12 @@
"@angular/router": "~8.0.0",
"crypto-browserify": "^3.12.0",
"material-design-icons": "^3.0.1",
"ethr-did": "^1.1.0",
"rxjs": "~6.4.0",
"tslib": "^1.9.0",
"uport-connect": "^1.1.11",
"uport-transports": "^0.2.6",
"web3": "^1.2.1",
"zone.js": "~0.9.1"
},
"devDependencies": {
......
app/src/app/modules/uport/uport.module.ts
View file @ 33dc9982
import { NgModule } from "@angular/core";
import { uPortVerificationService } from "./verification.service";
import { Web3Module } from "../web3/web3.module";
@NgModule({
imports: [Web3Module],
providers: [uPortVerificationService]
})
export class uPortModule {}
app/src/app/modules/uport/verification.service.ts
View file @ 33dc9982
import { Injectable } from "@angular/core";
import { Injectable, Inject } from "@angular/core";
import { HttpClient } from "@angular/common/http";
import { SafeUrl, DomSanitizer } from "@angular/platform-browser";
import { Subject, interval, BehaviorSubject } from "rxjs";
import { Subject, interval, BehaviorSubject, Observable } from "rxjs";
import { first } from "rxjs/operators";
import { WEB3 } from "../web3/web3.module";
import Web3 from "web3";
import EthrDID from "ethr-did";
import * as TrustContract from "../web3/contracts/trust.contract";
import * as DIDContract from "../web3/contracts/did.contract";
import { transport, message, crypto } from "uport-transports";
declare const Connect: any;
const T3_SERVER_URI = "https://t3-backend.ngrok.io";
@Injectable()
export class uPortVerificationService {
qrImageUri$: Subject<SafeUrl> = new Subject();
uPortLink$: Subject<SafeUrl> = new Subject();
data$: BehaviorSubject<any> = new BehaviorSubject(null);
polling$: Observable<number> = interval(5000);
did$: BehaviorSubject<string> = new BehaviorSubject(null);
addingDelegate$: BehaviorSubject<boolean> = new BehaviorSubject(false);
constructor(private http: HttpClient, private sanitizer: DomSanitizer) {
constructor(
private http: HttpClient,
private sanitizer: DomSanitizer,
@Inject(WEB3) private web3
) {
this.start();
}
......@@ -22,7 +40,7 @@ export class uPortVerificationService {
}
async fetch(): Promise<void> {
const data = await this.http.get("http://localhost:8088/qr").toPromise();
const data = await this.http.get(T3_SERVER_URI + "/unlock").toPromise();
this.data$.next(data);
}
......@@ -31,13 +49,91 @@ export class uPortVerificationService {
*/
fetchQrImageUri(): void {
this.data$.subscribe((data: any) => {
if (!data) return;
this.qrImageUri$.next(
this.sanitizer.bypassSecurityTrustUrl(data.qrImageData)
);
});
}
fetchUPortLink(): void {
this.data$.subscribe((data: any) => {
if (!data) return;
const transportQR = transport.qr.send();
transportQR(data.requestToken);
});
}
startPolling() {
interval(1000).subscribe(async () => {});
const s = this.polling$.subscribe(async () => {
console.log("polling");
const data = await this.data$.pipe(first()).toPromise();
if (!data || !data.sessionId) {
console.log("no data");
return;
}
this.http
.post(T3_SERVER_URI + "/poll/unlock", {
sessionId: data.sessionId
})
.subscribe((data: any) => {
if (data.status === "ok") {
this.did$.next(data.profile.did);
transport.ui.close(); // close modal
this.addDelegate();
s.unsubscribe();
}
});
});
}
async addDelegate() {
console.log("getting currently set did");
const did = await this.did$.pipe(first()).toPromise();
const address = did.split(":")[2];
console.log(did, address);
const uport = new Connect("Minds T3");
const provider = uport.getProvider();
const web3 = new Web3(provider);
const contract = new web3.eth.Contract(
DIDContract.ABI,
DIDContract.ADDRESS
);
const tx1 = contract.methods
.addDelegate(
"0x6afd852ac0a9bf29e2841453531bba322908732e",
web3.utils.fromAscii("DID-JWT"),
address,
86400 * 365 // 1 year
)
.encodeABI();
console.log(await uport.requestPersonalSign(tx1, null, { from: address }));
// // contract.methods.issueTrustViaDelegate(address, address, 1);
// // console.log(tx1);
// const signed = await web3.eth.sendTransaction(
// {
// to: DIDContract.ADDRESS,
// from: address,
// data: tx1
// },
// address
// );
// console.log(contract, tx1, signed);
const tx = {
to: TrustContract.ADDRESS,
data: {}
};
//web3.sign;
// const ethrDid = new EthrDID({
// provider: web3.currentProvider,
// address: "0xd21b90f056c9e42957da86117f0aa6b821418da4"
// });
// this.addingDelegate$.next(true);
// await ethrDid.addDelegate(TrustContract.ADDRESS);
// this.addingDelegate$.next(false);
}
}
app/src/app/modules/verification/verification.component.html
View file @ 33dc9982
<img [src]="verificationService.qrImageUri$ | async" />
<div class="verification__unlock" *ngIf="!(verificationService.did$ | async)">
<p>
Please wait a moment for uPort modal to appear.
</p>
</div>
<div
class="verification__delegate"
*ngIf="
(verificationService.did$ | async) &&
(verificationService.addingDelegate$ | async)
"
>
<p>
Please wait a moment whilst we figure out the delegate flow. (This can take
up to 60 seconds, because IPFS is very, very, very, very slow).
</p>
</div>
app/src/app/modules/verification/verification.component.ts
View file @ 33dc9982
import { Component } from '@angular/core';
import { uPortVerificationService } from '../uport/verification.service';
import { Component } from "@angular/core";
import { uPortVerificationService } from "../uport/verification.service";
declare const Connect: any;
@Component({
selector: 't3-verification',
templateUrl: './verification.component.html'
selector: "t3-verification",
templateUrl: "./verification.component.html"
})
export class T3VerificationComponent {
constructor(public verificationService: uPortVerificationService) {}
ngOnInit() {
this.verificationService.fetchQrImageUri();
this.verificationService.startPolling();
this.verificationService.fetchUPortLink();
this.verificationService.did$.subscribe(did => {
// if (did) alert("verified via uport");
});
}
}
app/src/app/modules/web3/contracts/did.contract.ts 0 → 100644
View file @ 33dc9982
export const ADDRESS = "0xdca7ef03e98e0dc2b855be647c39abe984fcf21b";
export const ABI = [
{
constant: true,
inputs: [
{
name: "",
type: "address"
}
],
name: "owners",
outputs: [
{
name: "",
type: "address"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: true,
inputs: [
{
name: "",
type: "address"
},
{
name: "",
type: "bytes32"
},
{
name: "",
type: "address"
}
],
name: "delegates",
outputs: [
{
name: "",
type: "uint256"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: true,
inputs: [
{
name: "",
type: "address"
}
],
name: "nonce",
outputs: [
{
name: "",
type: "uint256"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: true,
inputs: [
{
name: "",
type: "address"
}
],
name: "changed",
outputs: [
{
name: "",
type: "uint256"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
anonymous: false,
inputs: [
{
indexed: true,
name: "identity",
type: "address"
},
{
indexed: false,
name: "owner",
type: "address"
},
{
indexed: false,
name: "previousChange",
type: "uint256"
}
],
name: "DIDOwnerChanged",
type: "event"
},
{
anonymous: false,
inputs: [
{
indexed: true,
name: "identity",
type: "address"
},
{
indexed: false,
name: "delegateType",
type: "bytes32"
},
{
indexed: false,
name: "delegate",
type: "address"
},
{
indexed: false,
name: "validTo",
type: "uint256"
},
{
indexed: false,
name: "previousChange",
type: "uint256"
}
],
name: "DIDDelegateChanged",
type: "event"
},
{
anonymous: false,
inputs: [
{
indexed: true,
name: "identity",
type: "address"
},
{
indexed: false,
name: "name",
type: "bytes32"
},
{
indexed: false,
name: "value",
type: "bytes"
},
{
indexed: false,
name: "validTo",
type: "uint256"
},
{
indexed: false,
name: "previousChange",
type: "uint256"
}
],
name: "DIDAttributeChanged",
type: "event"
},
{
constant: true,
inputs: [
{
name: "identity",
type: "address"
}
],
name: "identityOwner",
outputs: [
{
name: "",
type: "address"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: true,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "delegateType",
type: "bytes32"
},
{
name: "delegate",
type: "address"
}
],
name: "validDelegate",
outputs: [
{
name: "",
type: "bool"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "newOwner",
type: "address"
}
],
name: "changeOwner",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "sigV",
type: "uint8"
},
{
name: "sigR",
type: "bytes32"
},
{
name: "sigS",
type: "bytes32"
},
{
name: "newOwner",
type: "address"
}
],
name: "changeOwnerSigned",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "delegateType",
type: "bytes32"
},
{
name: "delegate",
type: "address"
},
{
name: "validity",
type: "uint256"
}
],
name: "addDelegate",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "sigV",
type: "uint8"
},
{
name: "sigR",
type: "bytes32"
},
{
name: "sigS",
type: "bytes32"
},
{
name: "delegateType",
type: "bytes32"
},
{
name: "delegate",
type: "address"
},
{
name: "validity",
type: "uint256"
}
],
name: "addDelegateSigned",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "delegateType",
type: "bytes32"
},
{
name: "delegate",
type: "address"
}
],
name: "revokeDelegate",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "sigV",
type: "uint8"
},
{
name: "sigR",
type: "bytes32"
},
{
name: "sigS",
type: "bytes32"
},
{
name: "delegateType",
type: "bytes32"
},
{
name: "delegate",
type: "address"
}
],
name: "revokeDelegateSigned",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "name",
type: "bytes32"
},
{
name: "value",
type: "bytes"
},
{
name: "validity",
type: "uint256"
}
],
name: "setAttribute",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "sigV",
type: "uint8"
},
{
name: "sigR",
type: "bytes32"
},
{
name: "sigS",
type: "bytes32"
},
{
name: "name",
type: "bytes32"
},
{
name: "value",
type: "bytes"
},
{
name: "validity",
type: "uint256"
}
],
name: "setAttributeSigned",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "name",
type: "bytes32"
},
{
name: "value",
type: "bytes"
}
],
name: "revokeAttribute",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "identity",
type: "address"
},
{
name: "sigV",
type: "uint8"
},
{
name: "sigR",
type: "bytes32"
},
{
name: "sigS",
type: "bytes32"
},
{
name: "name",
type: "bytes32"
},
{
name: "value",
type: "bytes"
}
],
name: "revokeAttributeSigned",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
}
];
app/src/app/modules/web3/contracts/trust.contract.ts 0 → 100644
View file @ 33dc9982
export const ADDRESS = "0x619bebd9d803b4f0796c1dd0aece1e9fcadd55d1";
export const ABI = [
{
constant: true,
inputs: [
{
name: "",
type: "address"
},
{
name: "",
type: "uint256"
}
],
name: "scores",
outputs: [
{
name: "from",
type: "address"
},
{
name: "to",
type: "address"
},
{
name: "score",
type: "int8"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
inputs: [
{
name: "didRegistryAddress",
type: "address"
}
],
payable: false,
stateMutability: "nonpayable",
type: "constructor"
},
{
constant: true,
inputs: [],
name: "sayHello",
outputs: [
{
name: "",
type: "string"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: false,
inputs: [
{
name: "from",
type: "address"
},
{
name: "to",
type: "address"
},
{
name: "score",
type: "int8"
}
],
name: "issueTrustViaDelegate",
outputs: [
{
name: "",
type: "bool"
}
],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: false,
inputs: [
{
name: "to",
type: "address"
},
{
name: "score",
type: "int8"
}
],
name: "issueTrust",
outputs: [],
payable: false,
stateMutability: "nonpayable",
type: "function"
},
{
constant: true,
inputs: [
{
name: "from",
type: "address"
},
{
name: "to",
type: "address"
}
],
name: "getTrust",
outputs: [
{
name: "",
type: "int8"
}
],
payable: false,
stateMutability: "view",
type: "function"
},
{
constant: true,
inputs: [
{
name: "from",
type: "address"
}
],
name: "getTrusts",
outputs: [
{
components: [
{
name: "from",
type: "address"
},
{
name: "to",
type: "address"
},
{
name: "score",
type: "int8"
}
],
name: "",
type: "tuple[]"
}
],
payable: false,
stateMutability: "view",
type: "function"
}
];
app/src/app/modules/web3/web3.module.ts 0 → 100644
View file @ 33dc9982
import { NgModule, InjectionToken } from "@angular/core";
import Web3 from "web3";
export const WEB3 = new InjectionToken<Web3>("web3");
@NgModule({
providers: [
{
provide: WEB3,
useFactory: () => {
try {
const provider =
"ethereum" in window ? window["ethereum"] : Web3.givenProvider;
return new Web3(provider);
} catch (err) {
throw new Error(
"Non-Ethereum browser detected. You should consider trying Mist or MetaMask!"
);
}
}
}
]
})
export class Web3Module {}
app/src/styles.scss
View file @ 33dc9982
/* You can add global styles to this file, and also import other style files */
#uport__modal-content img {
max-width: 60vw;
}
app/webpack.config.js 0 → 100644
View file @ 33dc9982
module.exports = {
node: {
crypto: true,
http: true,
https: true,
os: true,
vm: true,
stream: true
}
}
\ No newline at end of file
blockchain/contracts/Trust.sol
View file @ 33dc9982
pragma solidity >=0.4.21 <0.6.0;
pragma experimental ABIEncoderV2;
import '../node_modules/ethr-did-registry/contracts/EthereumDIDRegistry.sol';
......@@ -12,7 +12,8 @@ contract Trust {
int8 score;
}
mapping(address => mapping(address => TrustScore)) public scores;
mapping(address => TrustScore[]) public scores;
// mapping(address => mapping(address => TrustScore)) public scores;
constructor(address didRegistryAddress) public {
didRegistry = EthereumDIDRegistry(didRegistryAddress);
......@@ -48,13 +49,23 @@ contract Trust {
score
);
scores[from][to] = _trustScore;
// scores[from][to] = _trustScore;
scores[from].push(_trustScore);
return true;
}
function getTrust(address from, address to) public view returns (int8) {
return scores[from][to].score;
for (uint index=0; index < scores[from].length; index++) {
if (scores[from][index].to == to) {
return scores[from][index].score;
}
}
return 0;
}
function getTrusts(address from) public view returns (TrustScore[]) {
return scores[from];
}
}
\ No newline at end of file
blockchain/test/trust.js
View file @ 33dc9982
......@@ -54,4 +54,15 @@ contract("Trust", accounts => {
});
assert.equal(await trust.getTrust(accounts[1], accounts[3]), 1);
});
it("should return a list of users we issued trust on", async () => {
await trust.issueTrust(accounts[2], 1);
await trust.issueTrust(accounts[3], 1);
await trust.issueTrust(accounts[4], -1);
await trust.issueTrust(accounts[5], -1);
await trust.issueTrust(accounts[3], -1, { from: accounts[2] });
console.log(await trust.getTrusts(accounts[0]));
});
});
server/package-lock.json
View file @ 33dc9982
This diff is collapsed.
server/package.json
View file @ 33dc9982
{
"dependencies": {
"did-jwt": "^3.0.0",
"did-resolver": "^1.0.0",
"ethereumjs-tx": "^2.1.1",
"ethr-did": "^1.1.0",
"express": "^4.17.1",
"ngrok": "^3.2.5",
"path": "^0.12.7",
"uport-credentials": "^1.2.2",
"uport-transports": "^0.2.6"
"uport-transports": "^0.2.6",
"web3": "^1.2.1"
}
}
server/src/app-setup/setup.html deleted 100644 → 0
View file @ 5ee9358d
server/src/app-setup/setup.js deleted 100644 → 0
View file @ 5ee9358d
server/src/login.service.js
View file @ 33dc9982
......@@ -5,8 +5,10 @@ const decodeJWT = require("did-jwt").decodeJWT;
const { Credentials } = require("uport-credentials");
const transports = require("uport-transports").transport;
const message = require("uport-transports").message.util;
const fs = require("fs");
const identity = JSON.parse(fs.readFileSync("./identity.json"));
let endpoint = "";
let endpoint = "http://07b7a55f.ngrok.io";
const app = express();
app.use(bodyParser.json({ type: "*/*" }));
......@@ -20,20 +22,22 @@ app.use((req, res, next) => {
//setup Credentials object with newly created application identity.
const credentials = new Credentials({
appName: "Login Example",
did: "did:ethr:0x31486054a6ad2c0b685cd89ce0ba018e210d504e",
privateKey: "ef6a01d0d98ba08bd23ee8b0c650076c65d629560940de9935d0f46f00679e01"
...{ appName: "Minds t3" },
...identity
});
const authenticatedRequests = new Map();
/**
* Collect a QR code and return to the client
*/
app.get("/qr", async (req, res) => {
try {
const sessionId = Date.now();
const requestToken = await credentials.createDisclosureRequest({
requested: ["name"],
notifications: true,
callbackUrl: endpoint + "/callback"
callbackUrl: endpoint + "/callback?session=" + sessionId
});
console.log(decodeJWT(requestToken)); //log request token to console
const uri = message.paramsToQueryString(
......@@ -42,23 +46,64 @@ app.get("/qr", async (req, res) => {
);
const qr = transports.ui.getImageDataURI(uri);
res.send({
uri,
qrImageData: qr
token: requestToken,
qrImageData: qr,
url: uri,
sessionId
});
} catch (err) {}
});
app.post("/callback", async (req, res) => {
const jwt = req.body.access_token;
console.log(jwt);
const sessionId = req.query.session;
console.log(sessionId);
try {
const credentials = await credentials.authenticateDisclosureResponse(jwt);
console.log("[credentials]: ", credentials);
const profile = await credentials.authenticateDisclosureResponse(jwt);
console.log("SUCCESS");
console.log("[credentials]: ", profile);
authenticatedRequests.set(sessionId, profile);
res.send({
status: "success"
});
} catch (err) {
console.log(err);
res.send({
status: "error",
message: err.toString(),
jwt
});
}
});
app.post("/poll-auth", async (req, res) => {
const sessionId = req.body.session;
console.log("polling request received for " + sessionId);
const profile = authenticatedRequests.get(sessionId.toString());
console.log(profile);
if (profile) {
res.send({
status: "ok",
profile
});
} else {
res.send({
status: "error",
message: "Not yet authenticated"
});
}
});
// run the app server and tunneling service
const server = app.listen(8088, () => {});
const server = app.listen(8088, () => {
ngrok
.connect({
proto: "http",
subdomain: "t3-backend",
addr: 8088
})
.then(ngrokUrl => {
endpoint = ngrokUrl;
console.log(`Login Service running, open at ${endpoint}`);
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment