Skip to content

Commit

Permalink
Merge branch 'release/v0.1.3'
Browse files Browse the repository at this point in the history
fix infinite loop while attempting to resolve did with multiple events in one block
  • Loading branch information
mi-xu committed Sep 28, 2018
2 parents 3ddbdc6 + 4a7a319 commit 2fc3285
Show file tree
Hide file tree
Showing 5 changed files with 684 additions and 242 deletions.
33 changes: 33 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Jest All",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["--runInBand"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
},
{
"type": "node",
"request": "launch",
"name": "Jest Current File",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["${relativeFile}"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
}
]
}

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: "Ethr DID Resolver"
index: 7
category: "reference"
type: "content"
category: "ethr-did-resolver"
type: "reference"
source: "https://github.com/uport-project/ethr-did-resolver/blob/develop/README.md"
---

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ethr-did-resolver",
"version": "0.1.1",
"version": "0.1.3",
"description": "Resolve DID documents around ethereum addresses",
"main": "lib/register.js",
"repository": {
Expand Down
Loading

0 comments on commit 2fc3285

Please sign in to comment.