From e8fff73af95ff31a6e6511129d0dd296a34cafeb Mon Sep 17 00:00:00 2001
From: Daniel Santos <danielmelos@gmail.com>
Date: Thu, 22 Nov 2018 06:35:31 -0200
Subject: [PATCH 1/3] Changing injection of SecureRandom

---
 dist/browser/creds/VerifiableCredential.js   | 2 +-
 dist/browser/services/index.js               | 2 +-
 dist/browser/uca/UserCollectableAttribute.js | 2 +-
 dist/cjs/creds/VerifiableCredential.js       | 3 +--
 dist/cjs/services/index.js                   | 2 +-
 dist/cjs/uca/UserCollectableAttribute.js     | 6 +++---
 dist/es/creds/VerifiableCredential.js        | 3 +--
 dist/es/services/index.js                    | 2 +-
 dist/es/uca/UserCollectableAttribute.js      | 6 +++---
 package.json                                 | 2 +-
 src/creds/VerifiableCredential.js            | 7 ++-----
 src/uca/UserCollectableAttribute.js          | 7 ++-----
 12 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/dist/browser/creds/VerifiableCredential.js b/dist/browser/creds/VerifiableCredential.js
index dadf34a6..98c79b68 100644
--- a/dist/browser/creds/VerifiableCredential.js
+++ b/dist/browser/creds/VerifiableCredential.js
@@ -1 +1 @@
-"use strict";var _toConsumableArray2=require("babel-runtime/helpers/toConsumableArray"),_toConsumableArray3=_interopRequireDefault(_toConsumableArray2),_slicedToArray2=require("babel-runtime/helpers/slicedToArray"),_slicedToArray3=_interopRequireDefault(_slicedToArray2),_regenerator=require("babel-runtime/regenerator"),_regenerator2=_interopRequireDefault(_regenerator),_asyncToGenerator2=require("babel-runtime/helpers/asyncToGenerator"),_asyncToGenerator3=_interopRequireDefault(_asyncToGenerator2),_classCallCheck2=require("babel-runtime/helpers/classCallCheck"),_classCallCheck3=_interopRequireDefault(_classCallCheck2),_createClass2=require("babel-runtime/helpers/createClass"),_createClass3=_interopRequireDefault(_createClass2),_typeof2=require("babel-runtime/helpers/typeof"),_typeof3=_interopRequireDefault(_typeof2),_keys=require("babel-runtime/core-js/object/keys"),_keys2=_interopRequireDefault(_keys);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),sift=require("sift"),MerkleTools=require("merkle-tools"),sjcl=require("sjcl"),timestamp=require("unix-timestamp"),flatten=require("flat"),uuidv4=require("uuid/v4"),definitions=require("./definitions"),UCA=require("../uca/UserCollectableAttribute"),_require=require("../services"),services=_require.services,secureRandom=services.container.SecureRandom;function getAnchorService(){return services.container.AnchorService}function sha256(a){return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(a))}function getClaimPath(a,b){var c=_.split(a,":"),d=_.camelCase(c[1]),e=d+"."+c[2],f=_.find(b,function(a){return _.endsWith(a,e)});return f||e}function validIdentifiers(){var a=_.map(definitions,function(a){return a.identifier});return a}function getClaimsWithFlatKeys(a){var b=flatten(a,{maxDepth:3}),c=flatten(a,{maxDepth:2}),d=_.merge({},b,c),e=_(d).toPairs().sortBy(0).fromPairs().value();return e}function paths(a){for(var b=[],c=[{obj:a,path:[]}],d=function(){var a=c.pop();(0,_keys2.default)(a.obj).forEach(function(d){if("object"===(0,_typeof3.default)(a.obj[d])){var e=a.path.concat(d);b.push(e),c.unshift({obj:a.obj[d],path:e})}})};0<c.length;)d();var e=[];return b.forEach(function(a){e.push(a.join("."))}),e}function getLeavesClaimPaths(a){return _.map(a,"claimPath")}function verifyLeave(a,b,c,d,e,f,g){var h=new UCA(a.identifier,{attestableValue:a.value});if("String"===h.type||"Number"===h.type)h.value!==_.get(c,a.claimPath)&&e.push(a.value);else if("Object"===h.type){var i=h.value,j=_.get(c,a.claimPath),k=_.keys(h.value);_.each(k,function(a){var b=j[a];b&&_.get(i[a],"value")!==b&&e.push(j[a])})}else e.push(a.value);var l=sha256(a.value);l!==a.targetHash&&f.push(a.targetHash);var m=b.validateProof(a.node,a.targetHash,d.merkleRoot);m||g.push(a.targetHash)}function transformConstraint(a){var b=[];return _.forEach(a.claims,function(a){if(!a.path)throw new Error("Malformed contraint: missing PATTH");if(!a.is)throw new Error("Malformed contraint: missing IS");var c={};c[a.path]=a.is,b.push(c)}),b}var CvcMerkleProof=function(){function a(b,c){(0,_classCallCheck3.default)(this,a);var d=a.padTree(b);this.type="CvcMerkleProof2018",this.merkleRoot=null,this.anchor="TBD (Civic Blockchain Attestation)",this.leaves=a.getAllAttestableValue(d),this.buildMerkleTree(c)}return(0,_createClass3.default)(a,null,[{key:"PADDING_INCREMENTS",get:function(){return 16}}]),(0,_createClass3.default)(a,[{key:"buildMerkleTree",value:function(a){var b=this,c=new MerkleTools,d=_.map(this.leaves,function(a){return sha256(a.value)});c.addLeaves(d),c.makeTree(),_.forEach(d,function(d,e){b.leaves[e].claimPath=getClaimPath(b.leaves[e].identifier,a),b.leaves[e].targetHash=d,b.leaves[e].node=c.getProof(e)}),this.leaves=_.filter(this.leaves,function(a){return"cvc:Random:node"!==a.identifier}),this.merkleRoot=c.getMerkleRoot().toString("hex")}}],[{key:"padTree",value:function(b){for(var c=b.length,d=c<a.PADDING_INCREMENTS?a.PADDING_INCREMENTS:_.ceil(c/a.PADDING_INCREMENTS)*a.PADDING_INCREMENTS,e=_.clone(b);e.length<d;)e.push(new UCA("cvc:Random:node",secureRandom.wordWith(16)));return e}},{key:"getAllAttestableValue",value:function(a){var b=[];return _.forEach(a,function(a){var c=a.getAttestableValues();_.reduce(c,function(a,b){return a.push(b),a},b)}),b}}]),a}(),ClaimModel=function a(b){var c=this;(0,_classCallCheck3.default)(this,a),_.forEach(b,function(a){var b=a.getClaimRootPropertyName();c[b]||(c[b]={}),c[b][a.getClaimPropertyName()]=a.getPlainValue()})},VERIFY_LEVELS={INVALID:-1,PROOFS:0,ANCHOR:1,BLOCKCHAIN:2};function VerifiableCredentialBaseConstructor(a,b,c,d,e){var f=this;this.id=uuidv4(),this.issuer=b;var g=new UCA("cvc:Meta:issuer",this.issuer);this.issuanceDate=new Date().toISOString();var h=new UCA("cvc:Meta:issuanceDate",this.issuanceDate);this.identifier=a,this.expirationDate=c?timestamp.toDate(timestamp.now(c)).toISOString():null;var i=new UCA("cvc:Meta:expirationDate",this.expirationDate?this.expirationDate:"null"),j=i?_.concat(d,g,h,i):_.concat(d,g,h);if(!_.includes(validIdentifiers(),a))throw new Error(a+" is not defined");var k=e?_.find(definitions,{identifier:a,version:""+e}):_.find(definitions,{identifier:a});if(!k)throw new Error("Credential definition for "+a+" v"+e+" not found");if(this.version=""+e||k.version,this.type=["Credential",a],!_.isEmpty(d)){this.claim=new ClaimModel(d);var l=paths(this.claim),m=_.keys(flatten(this.claim,{safe:!0})),n=l.concat(m);if(this.proof=new CvcMerkleProof(j,n),!_.isEmpty(k.excludes)){var o=_.remove(this.proof.leaves,function(a){return _.includes(k.excludes,a.identifier)});_.forEach(o,function(a){_.unset(f.claim,a.claimPath)})}}return this.getGlobalCredentialItemIdentifier=function(){return"credential-"+f.identifier+"-"+f.version},this.filter=function(a){var b=_.cloneDeep(f);return _.remove(b.proof.leaves,function(b){return!_.includes(a,b.identifier)}),b.claim={},_.forEach(b.proof.leaves,function(a){_.set(b.claim,a.claimPath,_.get(f.claim,a.claimPath))}),b},this.requestAnchor=function(){var a=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(b){var c;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.next=2,getAnchorService().anchor(f.identifier,f.proof.merkleRoot,b);case 2:return c=a.sent,f.proof.anchor=c,a.abrupt("return",f);case 5:case"end":return a.stop();}},a,f)}));return function(){return a.apply(this,arguments)}}(),this.updateAnchor=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){var b;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.next=2,getAnchorService().update(f.proof.anchor);case 2:return b=a.sent,f.proof.anchor=b,a.abrupt("return",f);case 5:case"end":return a.stop();}},a,f)})),this.verifyProofs=function(){var a=_.clone(f.expirationDate),b=_.clone(f.claim),c=_.clone(f.proof),d=_.get(c,"leaves"),e=!1,g=new MerkleTools,h=getClaimsWithFlatKeys(b),i=getLeavesClaimPaths(d),j=[],k=[],l=[],m=[],n=[];_.forEach(_.keys(h),function(a){var e=_.indexOf(i,a);if(-1===e){_.findLastIndex(a,".");var f=a.substring(0,_.lastIndexOf(a,"."));if(-1<_.indexOf(i,f))return;j.push(a)}else{var h=d[e];verifyLeave(h,g,b,c,l,m,n)}});var o=_.indexOf(i,"meta.expirationDate");if(0<=o){var p=d[o],q=l.length+m.length+n.length;verifyLeave(p,g,{meta:{expirationDate:a}},c,l,m,n);var r=l.length+m.length+n.length;if(r===q&&null!==a){var s=new Date,t=new Date(a);s.getTime()>t.getTime()&&k.push(a)}}return _.isEmpty(j)&&_.isEmpty(l)&&_.isEmpty(m)&&_.isEmpty(n)&&_.isEmpty(k)&&(e=!0),e},this.verify=function(a){var b=a||VERIFY_LEVELS.PROOFS,c=VERIFY_LEVELS.INVALID;return b>=VERIFY_LEVELS.PROOFS&&f.verifyProofs()&&(c=VERIFY_LEVELS.PROOFS),c},this.verifySignature=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().verifySignature(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.verifyAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().verifyAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.revokeAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().revokeAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isRevoked=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().isRevoked(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isMatch=function(a){var b=transformConstraint(a),c=!0;return _.forEach(b,function(a){return c=-1<sift.indexOf(a,[f.claim]),c}),c},this}var CREDENTIAL_META_FIELDS=["id","identifier","issuer","issuanceDate","expirationDate","version","type"],getCredentialMeta=function(a){return _.pick(a,CREDENTIAL_META_FIELDS)};function transformMetaConstraint(a){var b={},c=_.get(a,"meta.credential");if(c){var d=/(.*)-(.*)-(.*)/g,e=d.exec(c),f=(0,_slicedToArray3.default)(e,4);b.identifier=f[2],b.version=f[3];var g=getCredentialMeta(a.meta);_.forEach(_.keys(g),function(a){b[a]=g[a].is})}return b}var isMatchCredentialMeta=function(a,b){var c=transformMetaConstraint(b),d=!1;return _.isEmpty(c)||(d=-1<sift.indexOf(c,[a])),d};VerifiableCredentialBaseConstructor.CREDENTIAL_META_FIELDS=CREDENTIAL_META_FIELDS,VerifiableCredentialBaseConstructor.getCredentialMeta=getCredentialMeta,VerifiableCredentialBaseConstructor.isMatchCredentialMeta=isMatchCredentialMeta,VerifiableCredentialBaseConstructor.fromJSON=function(a){var b=new VerifiableCredentialBaseConstructor(a.identifier,a.issuer);return b.id=_.clone(a.id),b.issuanceDate=_.clone(a.issuanceDate),b.expirationDate=_.clone(a.expirationDate),b.identifier=_.clone(a.identifier),b.version=_.clone(a.version),b.type=_.cloneDeep(a.type),b.claim=_.cloneDeep(a.claim),b.proof=_.cloneDeep(a.proof),b},VerifiableCredentialBaseConstructor.getAllProperties=function(a){var b=_.find(definitions,{identifier:a});if(b){var c=[];_.forEach(b.depends,function(a){c.push.apply(c,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))});var d=[];return _.forEach(b.excludes,function(a){d.push.apply(d,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))}),_.difference(c,d)}return null},VerifiableCredentialBaseConstructor.VERIFY_LEVELS=VERIFY_LEVELS,module.exports=VerifiableCredentialBaseConstructor;
\ No newline at end of file
+"use strict";var _toConsumableArray2=require("babel-runtime/helpers/toConsumableArray"),_toConsumableArray3=_interopRequireDefault(_toConsumableArray2),_slicedToArray2=require("babel-runtime/helpers/slicedToArray"),_slicedToArray3=_interopRequireDefault(_slicedToArray2),_regenerator=require("babel-runtime/regenerator"),_regenerator2=_interopRequireDefault(_regenerator),_asyncToGenerator2=require("babel-runtime/helpers/asyncToGenerator"),_asyncToGenerator3=_interopRequireDefault(_asyncToGenerator2),_classCallCheck2=require("babel-runtime/helpers/classCallCheck"),_classCallCheck3=_interopRequireDefault(_classCallCheck2),_createClass2=require("babel-runtime/helpers/createClass"),_createClass3=_interopRequireDefault(_createClass2),_typeof2=require("babel-runtime/helpers/typeof"),_typeof3=_interopRequireDefault(_typeof2),_keys=require("babel-runtime/core-js/object/keys"),_keys2=_interopRequireDefault(_keys);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),sift=require("sift"),MerkleTools=require("merkle-tools"),sjcl=require("sjcl"),timestamp=require("unix-timestamp"),flatten=require("flat"),uuidv4=require("uuid/v4"),definitions=require("./definitions"),UCA=require("../uca/UserCollectableAttribute"),_require=require("../services"),services=_require.services;function getAnchorService(){return services.container.AnchorService}function sha256(a){return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(a))}function getClaimPath(a,b){var c=_.split(a,":"),d=_.camelCase(c[1]),e=d+"."+c[2],f=_.find(b,function(a){return _.endsWith(a,e)});return f||e}function validIdentifiers(){var a=_.map(definitions,function(a){return a.identifier});return a}function getClaimsWithFlatKeys(a){var b=flatten(a,{maxDepth:3}),c=flatten(a,{maxDepth:2}),d=_.merge({},b,c),e=_(d).toPairs().sortBy(0).fromPairs().value();return e}function paths(a){for(var b=[],c=[{obj:a,path:[]}],d=function(){var a=c.pop();(0,_keys2.default)(a.obj).forEach(function(d){if("object"===(0,_typeof3.default)(a.obj[d])){var e=a.path.concat(d);b.push(e),c.unshift({obj:a.obj[d],path:e})}})};0<c.length;)d();var e=[];return b.forEach(function(a){e.push(a.join("."))}),e}function getLeavesClaimPaths(a){return _.map(a,"claimPath")}function verifyLeave(a,b,c,d,e,f,g){var h=new UCA(a.identifier,{attestableValue:a.value});if("String"===h.type||"Number"===h.type)h.value!==_.get(c,a.claimPath)&&e.push(a.value);else if("Object"===h.type){var i=h.value,j=_.get(c,a.claimPath),k=_.keys(h.value);_.each(k,function(a){var b=j[a];b&&_.get(i[a],"value")!==b&&e.push(j[a])})}else e.push(a.value);var l=sha256(a.value);l!==a.targetHash&&f.push(a.targetHash);var m=b.validateProof(a.node,a.targetHash,d.merkleRoot);m||g.push(a.targetHash)}function transformConstraint(a){var b=[];return _.forEach(a.claims,function(a){if(!a.path)throw new Error("Malformed contraint: missing PATTH");if(!a.is)throw new Error("Malformed contraint: missing IS");var c={};c[a.path]=a.is,b.push(c)}),b}var CvcMerkleProof=function(){function a(b,c){(0,_classCallCheck3.default)(this,a);var d=a.padTree(b);this.type="CvcMerkleProof2018",this.merkleRoot=null,this.anchor="TBD (Civic Blockchain Attestation)",this.leaves=a.getAllAttestableValue(d),this.buildMerkleTree(c)}return(0,_createClass3.default)(a,null,[{key:"PADDING_INCREMENTS",get:function(){return 16}}]),(0,_createClass3.default)(a,[{key:"buildMerkleTree",value:function(a){var b=this,c=new MerkleTools,d=_.map(this.leaves,function(a){return sha256(a.value)});c.addLeaves(d),c.makeTree(),_.forEach(d,function(d,e){b.leaves[e].claimPath=getClaimPath(b.leaves[e].identifier,a),b.leaves[e].targetHash=d,b.leaves[e].node=c.getProof(e)}),this.leaves=_.filter(this.leaves,function(a){return"cvc:Random:node"!==a.identifier}),this.merkleRoot=c.getMerkleRoot().toString("hex")}}],[{key:"padTree",value:function(b){for(var c=b.length,d=c<a.PADDING_INCREMENTS?a.PADDING_INCREMENTS:_.ceil(c/a.PADDING_INCREMENTS)*a.PADDING_INCREMENTS,e=_.clone(b),f=services.container.SecureRandom;e.length<d;)e.push(new UCA("cvc:Random:node",f.wordWith(16)));return e}},{key:"getAllAttestableValue",value:function(a){var b=[];return _.forEach(a,function(a){var c=a.getAttestableValues();_.reduce(c,function(a,b){return a.push(b),a},b)}),b}}]),a}(),ClaimModel=function a(b){var c=this;(0,_classCallCheck3.default)(this,a),_.forEach(b,function(a){var b=a.getClaimRootPropertyName();c[b]||(c[b]={}),c[b][a.getClaimPropertyName()]=a.getPlainValue()})},VERIFY_LEVELS={INVALID:-1,PROOFS:0,ANCHOR:1,BLOCKCHAIN:2};function VerifiableCredentialBaseConstructor(a,b,c,d,e){var f=this;this.id=uuidv4(),this.issuer=b;var g=new UCA("cvc:Meta:issuer",this.issuer);this.issuanceDate=new Date().toISOString();var h=new UCA("cvc:Meta:issuanceDate",this.issuanceDate);this.identifier=a,this.expirationDate=c?timestamp.toDate(timestamp.now(c)).toISOString():null;var i=new UCA("cvc:Meta:expirationDate",this.expirationDate?this.expirationDate:"null"),j=i?_.concat(d,g,h,i):_.concat(d,g,h);if(!_.includes(validIdentifiers(),a))throw new Error(a+" is not defined");var k=e?_.find(definitions,{identifier:a,version:""+e}):_.find(definitions,{identifier:a});if(!k)throw new Error("Credential definition for "+a+" v"+e+" not found");if(this.version=""+e||k.version,this.type=["Credential",a],!_.isEmpty(d)){this.claim=new ClaimModel(d);var l=paths(this.claim),m=_.keys(flatten(this.claim,{safe:!0})),n=l.concat(m);if(this.proof=new CvcMerkleProof(j,n),!_.isEmpty(k.excludes)){var o=_.remove(this.proof.leaves,function(a){return _.includes(k.excludes,a.identifier)});_.forEach(o,function(a){_.unset(f.claim,a.claimPath)})}}return this.getGlobalCredentialItemIdentifier=function(){return"credential-"+f.identifier+"-"+f.version},this.filter=function(a){var b=_.cloneDeep(f);return _.remove(b.proof.leaves,function(b){return!_.includes(a,b.identifier)}),b.claim={},_.forEach(b.proof.leaves,function(a){_.set(b.claim,a.claimPath,_.get(f.claim,a.claimPath))}),b},this.requestAnchor=function(){var a=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(b){var c;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.next=2,getAnchorService().anchor(f.identifier,f.proof.merkleRoot,b);case 2:return c=a.sent,f.proof.anchor=c,a.abrupt("return",f);case 5:case"end":return a.stop();}},a,f)}));return function(){return a.apply(this,arguments)}}(),this.updateAnchor=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){var b;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.next=2,getAnchorService().update(f.proof.anchor);case 2:return b=a.sent,f.proof.anchor=b,a.abrupt("return",f);case 5:case"end":return a.stop();}},a,f)})),this.verifyProofs=function(){var a=_.clone(f.expirationDate),b=_.clone(f.claim),c=_.clone(f.proof),d=_.get(c,"leaves"),e=!1,g=new MerkleTools,h=getClaimsWithFlatKeys(b),i=getLeavesClaimPaths(d),j=[],k=[],l=[],m=[],n=[];_.forEach(_.keys(h),function(a){var e=_.indexOf(i,a);if(-1===e){_.findLastIndex(a,".");var f=a.substring(0,_.lastIndexOf(a,"."));if(-1<_.indexOf(i,f))return;j.push(a)}else{var h=d[e];verifyLeave(h,g,b,c,l,m,n)}});var o=_.indexOf(i,"meta.expirationDate");if(0<=o){var p=d[o],q=l.length+m.length+n.length;verifyLeave(p,g,{meta:{expirationDate:a}},c,l,m,n);var r=l.length+m.length+n.length;if(r===q&&null!==a){var s=new Date,t=new Date(a);s.getTime()>t.getTime()&&k.push(a)}}return _.isEmpty(j)&&_.isEmpty(l)&&_.isEmpty(m)&&_.isEmpty(n)&&_.isEmpty(k)&&(e=!0),e},this.verify=function(a){var b=a||VERIFY_LEVELS.PROOFS,c=VERIFY_LEVELS.INVALID;return b>=VERIFY_LEVELS.PROOFS&&f.verifyProofs()&&(c=VERIFY_LEVELS.PROOFS),c},this.verifySignature=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().verifySignature(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.verifyAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().verifyAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.revokeAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().revokeAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isRevoked=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().isRevoked(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isMatch=function(a){var b=transformConstraint(a),c=!0;return _.forEach(b,function(a){return c=-1<sift.indexOf(a,[f.claim]),c}),c},this}var CREDENTIAL_META_FIELDS=["id","identifier","issuer","issuanceDate","expirationDate","version","type"],getCredentialMeta=function(a){return _.pick(a,CREDENTIAL_META_FIELDS)};function transformMetaConstraint(a){var b={},c=_.get(a,"meta.credential");if(c){var d=/(.*)-(.*)-(.*)/g,e=d.exec(c),f=(0,_slicedToArray3.default)(e,4);b.identifier=f[2],b.version=f[3];var g=getCredentialMeta(a.meta);_.forEach(_.keys(g),function(a){b[a]=g[a].is})}return b}var isMatchCredentialMeta=function(a,b){var c=transformMetaConstraint(b),d=!1;return _.isEmpty(c)||(d=-1<sift.indexOf(c,[a])),d};VerifiableCredentialBaseConstructor.CREDENTIAL_META_FIELDS=CREDENTIAL_META_FIELDS,VerifiableCredentialBaseConstructor.getCredentialMeta=getCredentialMeta,VerifiableCredentialBaseConstructor.isMatchCredentialMeta=isMatchCredentialMeta,VerifiableCredentialBaseConstructor.fromJSON=function(a){var b=new VerifiableCredentialBaseConstructor(a.identifier,a.issuer);return b.id=_.clone(a.id),b.issuanceDate=_.clone(a.issuanceDate),b.expirationDate=_.clone(a.expirationDate),b.identifier=_.clone(a.identifier),b.version=_.clone(a.version),b.type=_.cloneDeep(a.type),b.claim=_.cloneDeep(a.claim),b.proof=_.cloneDeep(a.proof),b},VerifiableCredentialBaseConstructor.getAllProperties=function(a){var b=_.find(definitions,{identifier:a});if(b){var c=[];_.forEach(b.depends,function(a){c.push.apply(c,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))});var d=[];return _.forEach(b.excludes,function(a){d.push.apply(d,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))}),_.difference(c,d)}return null},VerifiableCredentialBaseConstructor.VERIFY_LEVELS=VERIFY_LEVELS,module.exports=VerifiableCredentialBaseConstructor;
\ No newline at end of file
diff --git a/dist/browser/services/index.js b/dist/browser/services/index.js
index 7a87df48..4bcdde71 100644
--- a/dist/browser/services/index.js
+++ b/dist/browser/services/index.js
@@ -1 +1 @@
-"use strict";var Bottle=require("bottlejs"),_require=require("./DummyAnchorServiceImpl.js"),CurrentCivicAnchor=_require.CurrentCivicAnchor,logger=require("../logger"),HttpServiceConstructor=require("./httpService"),config=require("./config"),SecureRandom=require("../SecureRandom"),services=new Bottle,initServices=function(a,b,c){return b&&(services.resetProviders(["Http"]),logger.debug("Registering custom HTTP service implementation"),services.factory("Http",function(){return b})),a&&(services.resetProviders(["Config"]),logger.debug("Registering custom Config service implementation"),services.factory("Config",function(){return a})),c&&(services.resetProviders(["SecureRandom"]),logger.debug("Registering custom SecureRandom service implementation"),services.factory("SecureRandom",function(){return c})),services};services.factory("Config",function(){return config}),logger.info("Registering request-promise-native as Http service implementation."),services.service("Http",HttpServiceConstructor),services.service("SecureRandom",SecureRandom),services.service("AnchorService",CurrentCivicAnchor,"Config","Http"),module.exports={services:services,initServices:initServices};
\ No newline at end of file
+"use strict";var Bottle=require("bottlejs"),_require=require("./DummyAnchorServiceImpl.js"),CurrentCivicAnchor=_require.CurrentCivicAnchor,logger=require("../logger"),HttpServiceConstructor=require("./httpService"),config=require("./config"),SecureRandom=require("../SecureRandom"),services=new Bottle,initServices=function(a,b,c){return b&&(services.resetProviders(["Http"]),logger.debug("Registering custom HTTP service implementation"),services.factory("Http",function(){return b})),a&&(services.resetProviders(["Config"]),logger.debug("Registering custom Config service implementation"),services.factory("Config",function(){return a})),c&&(services.resetProviders(["SecureRandom"]),logger.debug("Registering custom SecureRandom service implementation"),services.factory("SecureRandom",function(){return c})),services};services.factory("Config",function(){return config}),logger.info("Registering request-promise-native as Http service implementation."),services.service("Http",HttpServiceConstructor),services.factory("SecureRandom",function(){return new SecureRandom}),services.service("AnchorService",CurrentCivicAnchor,"Config","Http"),module.exports={services:services,initServices:initServices};
\ No newline at end of file
diff --git a/dist/browser/uca/UserCollectableAttribute.js b/dist/browser/uca/UserCollectableAttribute.js
index 6de992fe..5fbb8de8 100644
--- a/dist/browser/uca/UserCollectableAttribute.js
+++ b/dist/browser/uca/UserCollectableAttribute.js
@@ -1 +1 @@
-"use strict";var _stringify=require("babel-runtime/core-js/json/stringify"),_stringify2=_interopRequireDefault(_stringify),_getIterator2=require("babel-runtime/core-js/get-iterator"),_getIterator3=_interopRequireDefault(_getIterator2);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),timestamp=require("unix-timestamp"),sjcl=require("sjcl"),definitions=require("./definitions"),_require=require("../services"),services=_require.services,secureRandom=services.container.SecureRandom,validIdentifiers=_.map(definitions,function(a){return a.identifier});function isValueOfType(a,b){return"String"===b?_.isString(a):"Number"===b?_.isNumber(a):!("Boolean"!=b)&&_.isBoolean(a)}function isValid(a,b,c){return"String"===b?(!c.pattern||c.pattern.test(a))&&(!c.minimumLength||a.length>=c.minimumLength)&&(!c.maximumLength||a.length<=c.minimumLength):"Number"===b?((!_.isNil(c.minimum)&&c.exclusiveMinimum?a>c.minimum:a>=c.minimum)||_.isNil(c.minimum))&&((!_.isNil(c.maximum)&&c.exclusiveMaximum?a<c.maximum:a<=c.maximum)||_.isNil(c.maximum)):!("Boolean"!=b)&&_.isBoolean(a)}var getTypeName=function a(b){if(_.isString(b.type)){if(_.includes(validIdentifiers,b.type)){var c=_.find(definitions,{identifier:b.type});return a(c)}return b.type}return"Object"},resolveType=function a(b){var c=getTypeName(b);if("Object"!==c)return c;if(!_.isString(b.type))return b.type;var d=_.find(definitions,{identifier:b.type});return a(d)},findDefinitionByAttestableValue=function a(b,c){var d=!0,e=!1,f=void 0;try{for(var g,h=(0,_getIterator3.default)(c.type.properties);!(d=(g=h.next()).done);d=!0){var i=g.value,j=_.find(definitions,{identifier:i.type});if(!j.type.properties&&i.name===b)return i.type;if(j.type.properties)return a(b,j)}}catch(a){e=!0,f=a}finally{try{!d&&h.return&&h.return()}finally{if(e)throw f}}return null},getAllProperties=function a(b,c){var d=_.find(definitions,{identifier:b}),e=[],f=resolveType(d),g=_.isString(f)?_.find(definitions,{identifier:f}):d;if(g&&"Object"===getTypeName(g)){var h;if(g.type.properties)h=g.type.properties;else{var i=_.find(definitions,{identifier:g.type});h=resolveType(i).properties}var j=void 0,k=_.split(g.identifier,":");j=c?_.includes(c,_.lowerCase(k[1]))?c+"."+k[2]:c+"."+_.lowerCase(k[1])+"."+k[2]:_.lowerCase(k[1])+"."+k[2],_.includes(["String","Number","Boolean"],""+h.type)?e.push(j+"."+h.name):_.forEach(h,function(b){var c=_.split(b.type,":")[2],d=b.name===c?j:j+"."+b.name,f=a(b.type,d);_.forEach(f,function(a){return e.push(a)})})}else if(c){var l=c+"."+_.split(d.identifier,":")[2];e.push(l)}else{var m=_.split(b,":"),n=_.lowerCase(m[1])+"."+m[2];e.push(n)}return e},isAttestableValue=function(a){return a&&a.attestableValue},parseAttestableValue=function(a){var b=[],c=_.split(a.attestableValue,"|"),d=/^urn:(\w+(?:\.\w+)*):(\w+):(.+)/;if(_.each(c,function(a){var c=d.exec(a);if(c&&4===c.length){var e={propertyName:c[1],salt:c[2],value:c[3],stringValue:a};b.push(e)}}),c.length!==b.length&&c.length!==b.length+1)throw new Error("Invalid attestableValue");return b};function UCABaseConstructor(a,b,c){var d=this;if(this.timestamp=null,this.id=null,!_.includes(validIdentifiers,a))throw new Error(a+" is not defined");this.identifier=a;var e=c?_.find(definitions,{identifier:a,version:c}):_.find(definitions,{identifier:a});if(this.version=c||e.version,this.type=getTypeName(e),e.type=resolveType(e),isAttestableValue(b)){var f=parseAttestableValue(b);if(1===f.length){this.timestamp=null,this.salt=f[0].salt;var g=f[0].value;this.value=_.includes(["null","undefined"],g)?null:g}else{for(var h={},j=function(a){var b=f[a].propertyName,c=b.split("."),d=c[c.length-2],g=d.substring(0,1).toUpperCase()+d.substring(1),i=c[c.length-1],j="cvc:"+g+":"+i,k=definitions.find(function(a){return a.identifier===j});k||(j=findDefinitionByAttestableValue(i,e)),h[b]=new UCABaseConstructor(j,{attestableValue:f[a].stringValue})},k=0;k<f.length;k+=1)j(k);this.value=h}}else if(isValueOfType(b,this.type)){if(this.timestamp=timestamp.now(),!isValid(b,this.type,e))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);this.value=b,this.salt=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(secureRandom.wordWith(64)))}else if(_.isEmpty(e.type.properties))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);else{var l=_.reduce(e.type.required,function(a,c){return b[c]&&a},!0);if(!l)throw new Error("Missing required fields to "+a);var m=_.mapValues(_.keyBy(_.map(b,function(a,b){var c=_.find(e.type.properties,{name:b}),d=new UCABaseConstructor(c.type,a,c.version);return{key:b,value:d}}),"key"),"value");this.value=m}this.getAttestableValue=function(a){var b=d.identifier.lastIndexOf(":"),c=d.identifier.substring(b+1);switch(a&&(c=a+"."+c),d.type){case"String":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Number":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Boolean":return"urn:"+c+":"+d.salt+":"+d.value+"|";default:return _.reduce(_.sortBy(_.keys(d.value)),function(a,b){return""+a+d.value[b].getAttestableValue(c)},"");}},this.getGlobalCredentialItemIdentifier=function(){return"claim-"+d.identifier+"-"+d.version},this.getClaimRootPropertyName=function(){var a=_.split(d.identifier,":");return _.lowerCase(a[1])},this.getClaimPropertyName=function(){var a=_.split(d.identifier,":");return a[2]},this.getClaimPath=function(){var a=_.split(d.identifier,":"),b=_.lowerCase(a[1]);return b+"."+a[2]},this.getAttestableValues=function(){var a=[],b=_.find(definitions,{identifier:d.identifier,version:d.version});return(b.credentialItem||b.attestable)&&(a.push({identifier:d.identifier,value:d.getAttestableValue()}),"Object"===d.type&&_.forEach(_.keys(d.value),function(b){var c=d.value[b].getAttestableValues();_.reduce(c,function(a,b){return a.push(b)},a)})),a},this.getPlainValue=function(a){var b={},c=[];switch(d.type){case"String":case"Number":case"Boolean":if(a)b[a]=d.value;else{if(!d.credentialItem)return d.value;b[d.identifier]=d.value}return b;default:return _.forEach(_.sortBy(_.keys(d.value)),function(a){c.push(d.value[a].getPlainValue(a))}),_.forEach(c,function(c){a?(b[a]=b[a]?b[a]:{},_.assign(b[a],c)):_.assign(b,c)}),b;}};var n=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.getAttestableValue()));return this.id=this.version+":"+this.identifier+":"+n,this}var UCA=UCABaseConstructor;function convertIdentifierToClassName(a){var b=_.split(a,":"),c=b[1],d=_.upperFirst(_.camelCase(b[2]));return""+c+d}_.forEach(_.filter(definitions,function(a){return a.credentialItem}),function(a){var b=convertIdentifierToClassName(a.identifier),c={},d=a.identifier;c[b]=function(a,b){var c=new UCABaseConstructor(d,a,b);return c},_.mixin(UCA,c)}),UCA.getTypeName=getTypeName,UCA.resolveType=resolveType,UCA.getAllProperties=getAllProperties,module.exports=UCA;
\ No newline at end of file
+"use strict";var _stringify=require("babel-runtime/core-js/json/stringify"),_stringify2=_interopRequireDefault(_stringify),_getIterator2=require("babel-runtime/core-js/get-iterator"),_getIterator3=_interopRequireDefault(_getIterator2);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),timestamp=require("unix-timestamp"),sjcl=require("sjcl"),definitions=require("./definitions"),_require=require("../services"),services=_require.services,validIdentifiers=_.map(definitions,function(a){return a.identifier});function isValueOfType(a,b){return"String"===b?_.isString(a):"Number"===b?_.isNumber(a):!("Boolean"!=b)&&_.isBoolean(a)}function isValid(a,b,c){return"String"===b?(!c.pattern||c.pattern.test(a))&&(!c.minimumLength||a.length>=c.minimumLength)&&(!c.maximumLength||a.length<=c.minimumLength):"Number"===b?((!_.isNil(c.minimum)&&c.exclusiveMinimum?a>c.minimum:a>=c.minimum)||_.isNil(c.minimum))&&((!_.isNil(c.maximum)&&c.exclusiveMaximum?a<c.maximum:a<=c.maximum)||_.isNil(c.maximum)):!("Boolean"!=b)&&_.isBoolean(a)}var getTypeName=function a(b){if(_.isString(b.type)){if(_.includes(validIdentifiers,b.type)){var c=_.find(definitions,{identifier:b.type});return a(c)}return b.type}return"Object"},resolveType=function a(b){var c=getTypeName(b);if("Object"!==c)return c;if(!_.isString(b.type))return b.type;var d=_.find(definitions,{identifier:b.type});return a(d)},findDefinitionByAttestableValue=function a(b,c){var d=!0,e=!1,f=void 0;try{for(var g,h=(0,_getIterator3.default)(c.type.properties);!(d=(g=h.next()).done);d=!0){var i=g.value,j=_.find(definitions,{identifier:i.type});if(j.type=resolveType(j),!j.type.properties&&i.name===b)return i.type;if(j.type.properties)return a(b,j)}}catch(a){e=!0,f=a}finally{try{!d&&h.return&&h.return()}finally{if(e)throw f}}return null},getAllProperties=function a(b,c){var d=_.find(definitions,{identifier:b}),e=[],f=resolveType(d),g=_.isString(f)?_.find(definitions,{identifier:f}):d;if(g&&"Object"===getTypeName(g)){var h;if(g.type.properties)h=g.type.properties;else{var i=_.find(definitions,{identifier:g.type});h=resolveType(i).properties}var j=void 0,k=_.split(g.identifier,":");j=c?_.includes(c,_.lowerCase(k[1]))?c+"."+k[2]:c+"."+_.lowerCase(k[1])+"."+k[2]:_.lowerCase(k[1])+"."+k[2],_.includes(["String","Number","Boolean"],""+h.type)?e.push(j+"."+h.name):_.forEach(h,function(b){var c=_.split(b.type,":")[2],d=b.name===c?j:j+"."+b.name,f=a(b.type,d);_.forEach(f,function(a){return e.push(a)})})}else if(c){var l=c+"."+_.split(d.identifier,":")[2];e.push(l)}else{var m=_.split(b,":"),n=_.lowerCase(m[1])+"."+m[2];e.push(n)}return e},isAttestableValue=function(a){return a&&a.attestableValue},parseAttestableValue=function(a){var b=[],c=_.split(a.attestableValue,"|"),d=/^urn:(\w+(?:\.\w+)*):(\w+):(.+)/;if(_.each(c,function(a){var c=d.exec(a);if(c&&4===c.length){var e={propertyName:c[1],salt:c[2],value:c[3],stringValue:a};b.push(e)}}),c.length!==b.length&&c.length!==b.length+1)throw new Error("Invalid attestableValue");return b};function UCABaseConstructor(a,b,c){var d=this;if(this.timestamp=null,this.id=null,this.secureRandom=services.container.SecureRandom,!_.includes(validIdentifiers,a))throw new Error(a+" is not defined");this.identifier=a;var e=c?_.find(definitions,{identifier:a,version:c}):_.find(definitions,{identifier:a});if(this.version=c||e.version,this.type=getTypeName(e),e.type=resolveType(e),isAttestableValue(b)){var f=parseAttestableValue(b);if(1===f.length){this.timestamp=null,this.salt=f[0].salt;var g=f[0].value;this.value=_.includes(["null","undefined"],g)?null:g}else{for(var h={},j=function(a){var b=f[a].propertyName,c=b.split("."),d=c[c.length-2],g=d.substring(0,1).toUpperCase()+d.substring(1),i=c[c.length-1],j="cvc:"+g+":"+i,k=definitions.find(function(a){return a.identifier===j});k||(j=findDefinitionByAttestableValue(i,e)),h[b]=new UCABaseConstructor(j,{attestableValue:f[a].stringValue})},k=0;k<f.length;k+=1)j(k);this.value=h}}else if(isValueOfType(b,this.type)){if(this.timestamp=timestamp.now(),!isValid(b,this.type,e))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);this.value=b,this.salt=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)))}else if(_.isEmpty(e.type.properties))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);else{var l=_.reduce(e.type.required,function(a,c){return b[c]&&a},!0);if(!l)throw new Error("Missing required fields to "+a);var m=_.mapValues(_.keyBy(_.map(b,function(a,b){var c=_.find(e.type.properties,{name:b}),d=new UCABaseConstructor(c.type,a,c.version);return{key:b,value:d}}),"key"),"value");this.value=m}this.getAttestableValue=function(a){var b=d.identifier.lastIndexOf(":"),c=d.identifier.substring(b+1);switch(a&&(c=a+"."+c),d.type){case"String":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Number":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Boolean":return"urn:"+c+":"+d.salt+":"+d.value+"|";default:return _.reduce(_.sortBy(_.keys(d.value)),function(a,b){return""+a+d.value[b].getAttestableValue(c)},"");}},this.getGlobalCredentialItemIdentifier=function(){return"claim-"+d.identifier+"-"+d.version},this.getClaimRootPropertyName=function(){var a=_.split(d.identifier,":");return _.lowerCase(a[1])},this.getClaimPropertyName=function(){var a=_.split(d.identifier,":");return a[2]},this.getClaimPath=function(){var a=_.split(d.identifier,":"),b=_.lowerCase(a[1]);return b+"."+a[2]},this.getAttestableValues=function(){var a=[],b=_.find(definitions,{identifier:d.identifier,version:d.version});return(b.credentialItem||b.attestable)&&(a.push({identifier:d.identifier,value:d.getAttestableValue()}),"Object"===d.type&&_.forEach(_.keys(d.value),function(b){var c=d.value[b].getAttestableValues();_.reduce(c,function(a,b){return a.push(b)},a)})),a},this.getPlainValue=function(a){var b={},c=[];switch(d.type){case"String":case"Number":case"Boolean":if(a)b[a]=d.value;else{if(!d.credentialItem)return d.value;b[d.identifier]=d.value}return b;default:return _.forEach(_.sortBy(_.keys(d.value)),function(a){c.push(d.value[a].getPlainValue(a))}),_.forEach(c,function(c){a?(b[a]=b[a]?b[a]:{},_.assign(b[a],c)):_.assign(b,c)}),b;}};var n=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.getAttestableValue()));return this.id=this.version+":"+this.identifier+":"+n,this}var UCA=UCABaseConstructor;function convertIdentifierToClassName(a){var b=_.split(a,":"),c=b[1],d=_.upperFirst(_.camelCase(b[2]));return""+c+d}_.forEach(_.filter(definitions,function(a){return a.credentialItem}),function(a){var b=convertIdentifierToClassName(a.identifier),c={},d=a.identifier;c[b]=function(a,b){var c=new UCABaseConstructor(d,a,b);return c},_.mixin(UCA,c)}),UCA.getTypeName=getTypeName,UCA.resolveType=resolveType,UCA.getAllProperties=getAllProperties,module.exports=UCA;
\ No newline at end of file
diff --git a/dist/cjs/creds/VerifiableCredential.js b/dist/cjs/creds/VerifiableCredential.js
index 0f32faaf..f6a8d420 100644
--- a/dist/cjs/creds/VerifiableCredential.js
+++ b/dist/cjs/creds/VerifiableCredential.js
@@ -13,8 +13,6 @@ const definitions = require('./definitions');
 const UCA = require('../uca/UserCollectableAttribute');
 const { services } = require('../services');
 
-const secureRandom = services.container.SecureRandom;
-
 function getAnchorService() {
   return services.container.AnchorService;
 }
@@ -164,6 +162,7 @@ class CvcMerkleProof {
     const currentLength = nodes.length;
     const targetLength = currentLength < CvcMerkleProof.PADDING_INCREMENTS ? CvcMerkleProof.PADDING_INCREMENTS : _.ceil(currentLength / CvcMerkleProof.PADDING_INCREMENTS) * CvcMerkleProof.PADDING_INCREMENTS;
     const newNodes = _.clone(nodes);
+    const secureRandom = services.container.SecureRandom;
     while (newNodes.length < targetLength) {
       newNodes.push(new UCA('cvc:Random:node', secureRandom.wordWith(16)));
     }
diff --git a/dist/cjs/services/index.js b/dist/cjs/services/index.js
index bba6293b..b265d06d 100644
--- a/dist/cjs/services/index.js
+++ b/dist/cjs/services/index.js
@@ -42,7 +42,7 @@ services.factory('Config', () => config);
 logger.info('Registering request-promise-native as Http service implementation.');
 services.service('Http', HttpServiceConstructor);
 
-services.service('SecureRandom', SecureRandom);
+services.factory('SecureRandom', () => new SecureRandom());
 
 services.service('AnchorService', CurrentCivicAnchor, 'Config', 'Http');
 
diff --git a/dist/cjs/uca/UserCollectableAttribute.js b/dist/cjs/uca/UserCollectableAttribute.js
index 6e84c244..53123435 100644
--- a/dist/cjs/uca/UserCollectableAttribute.js
+++ b/dist/cjs/uca/UserCollectableAttribute.js
@@ -6,8 +6,6 @@ const sjcl = require('sjcl');
 const definitions = require('./definitions');
 const { services } = require('../services');
 
-const secureRandom = services.container.SecureRandom;
-
 const validIdentifiers = _.map(definitions, d => d.identifier);
 
 /**
@@ -75,6 +73,7 @@ const findDefinitionByAttestableValue = (attestableValuePropertyName, rootDefini
   // eslint-disable-next-line no-restricted-syntax
   for (const property of rootDefinition.type.properties) {
     const resolvedDefinition = _.find(definitions, { identifier: property.type });
+    resolvedDefinition.type = resolveType(resolvedDefinition);
     if (!resolvedDefinition.type.properties && property.name === attestableValuePropertyName) {
       return property.type;
     }
@@ -166,6 +165,7 @@ const parseAttestableValue = value => {
 function UCABaseConstructor(identifier, value, version) {
   this.timestamp = null;
   this.id = null;
+  this.secureRandom = services.container.SecureRandom;
 
   if (!_.includes(validIdentifiers, identifier)) {
     throw new Error(`${identifier} is not defined`);
@@ -217,7 +217,7 @@ function UCABaseConstructor(identifier, value, version) {
     }
     this.value = value;
 
-    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(secureRandom.wordWith(64)));
+    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)));
   } else if (_.isEmpty(definition.type.properties)) {
     throw new Error(`${JSON.stringify(value)} is not valid for ${identifier}`);
   } else {
diff --git a/dist/es/creds/VerifiableCredential.js b/dist/es/creds/VerifiableCredential.js
index 1e6aa389..9b5bd819 100644
--- a/dist/es/creds/VerifiableCredential.js
+++ b/dist/es/creds/VerifiableCredential.js
@@ -9,8 +9,6 @@ const definitions = require('./definitions');
 const UCA = require('../uca/UserCollectableAttribute');
 const { services } = require('../services');
 
-const secureRandom = services.container.SecureRandom;
-
 function getAnchorService() {
   return services.container.AnchorService;
 }
@@ -160,6 +158,7 @@ class CvcMerkleProof {
     const currentLength = nodes.length;
     const targetLength = currentLength < CvcMerkleProof.PADDING_INCREMENTS ? CvcMerkleProof.PADDING_INCREMENTS : _.ceil(currentLength / CvcMerkleProof.PADDING_INCREMENTS) * CvcMerkleProof.PADDING_INCREMENTS;
     const newNodes = _.clone(nodes);
+    const secureRandom = services.container.SecureRandom;
     while (newNodes.length < targetLength) {
       newNodes.push(new UCA('cvc:Random:node', secureRandom.wordWith(16)));
     }
diff --git a/dist/es/services/index.js b/dist/es/services/index.js
index 161fe999..b59dd0fc 100644
--- a/dist/es/services/index.js
+++ b/dist/es/services/index.js
@@ -40,7 +40,7 @@ services.factory('Config', () => config);
 logger.info('Registering request-promise-native as Http service implementation.');
 services.service('Http', HttpServiceConstructor);
 
-services.service('SecureRandom', SecureRandom);
+services.factory('SecureRandom', () => new SecureRandom());
 
 services.service('AnchorService', CurrentCivicAnchor, 'Config', 'Http');
 
diff --git a/dist/es/uca/UserCollectableAttribute.js b/dist/es/uca/UserCollectableAttribute.js
index f25dbc9f..5365cb08 100644
--- a/dist/es/uca/UserCollectableAttribute.js
+++ b/dist/es/uca/UserCollectableAttribute.js
@@ -4,8 +4,6 @@ const sjcl = require('sjcl');
 const definitions = require('./definitions');
 const { services } = require('../services');
 
-const secureRandom = services.container.SecureRandom;
-
 const validIdentifiers = _.map(definitions, d => d.identifier);
 
 /**
@@ -73,6 +71,7 @@ const findDefinitionByAttestableValue = (attestableValuePropertyName, rootDefini
   // eslint-disable-next-line no-restricted-syntax
   for (const property of rootDefinition.type.properties) {
     const resolvedDefinition = _.find(definitions, { identifier: property.type });
+    resolvedDefinition.type = resolveType(resolvedDefinition);
     if (!resolvedDefinition.type.properties && property.name === attestableValuePropertyName) {
       return property.type;
     }
@@ -164,6 +163,7 @@ const parseAttestableValue = value => {
 function UCABaseConstructor(identifier, value, version) {
   this.timestamp = null;
   this.id = null;
+  this.secureRandom = services.container.SecureRandom;
 
   if (!_.includes(validIdentifiers, identifier)) {
     throw new Error(`${identifier} is not defined`);
@@ -215,7 +215,7 @@ function UCABaseConstructor(identifier, value, version) {
     }
     this.value = value;
 
-    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(secureRandom.wordWith(64)));
+    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)));
   } else if (_.isEmpty(definition.type.properties)) {
     throw new Error(`${JSON.stringify(value)} is not valid for ${identifier}`);
   } else {
diff --git a/package.json b/package.json
index b8317edd..7e91daa0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@identity.com/credential-commons",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "author": "Identity.com Community",
   "license": "MIT",
   "description": "Verifiable Credential and Attestation Library",
diff --git a/src/creds/VerifiableCredential.js b/src/creds/VerifiableCredential.js
index f9f771d9..41c0005d 100644
--- a/src/creds/VerifiableCredential.js
+++ b/src/creds/VerifiableCredential.js
@@ -9,10 +9,6 @@ const definitions = require('./definitions');
 const UCA = require('../uca/UserCollectableAttribute');
 const { services } = require('../services');
 
-function getSecureRandom() {
-  return services.container.SecureRandom;
-}
-
 function getAnchorService() {
   return services.container.AnchorService;
 }
@@ -168,8 +164,9 @@ class CvcMerkleProof {
     const targetLength = currentLength < CvcMerkleProof.PADDING_INCREMENTS ? CvcMerkleProof.PADDING_INCREMENTS
       : _.ceil(currentLength / CvcMerkleProof.PADDING_INCREMENTS) * CvcMerkleProof.PADDING_INCREMENTS;
     const newNodes = _.clone(nodes);
+    const secureRandom = services.container.SecureRandom;
     while (newNodes.length < targetLength) {
-      newNodes.push(new UCA('cvc:Random:node', getSecureRandom().wordWith(16)));
+      newNodes.push(new UCA('cvc:Random:node', secureRandom.wordWith(16)));
     }
     return newNodes;
   }
diff --git a/src/uca/UserCollectableAttribute.js b/src/uca/UserCollectableAttribute.js
index 24e2d237..3a18d541 100644
--- a/src/uca/UserCollectableAttribute.js
+++ b/src/uca/UserCollectableAttribute.js
@@ -4,10 +4,6 @@ const sjcl = require('sjcl');
 const definitions = require('./definitions');
 const { services } = require('../services');
 
-function getSecureRandom() {
-  return services.container.SecureRandom;
-}
-
 const validIdentifiers = _.map(definitions, d => d.identifier);
 
 /**
@@ -176,6 +172,7 @@ const parseAttestableValue = (value) => {
 function UCABaseConstructor(identifier, value, version) {
   this.timestamp = null;
   this.id = null;
+  this.secureRandom = services.container.SecureRandom;
 
   if (!_.includes(validIdentifiers, identifier)) {
     throw new Error(`${identifier} is not defined`);
@@ -229,7 +226,7 @@ function UCABaseConstructor(identifier, value, version) {
     }
     this.value = value;
 
-    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(getSecureRandom().wordWith(64)));
+    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)));
   } else if (_.isEmpty(definition.type.properties)) {
     throw new Error(`${JSON.stringify(value)} is not valid for ${identifier}`);
   } else {

From 2da92688395871ab5b6fcb89c3f53fddebd78c3f Mon Sep 17 00:00:00 2001
From: Bruno Carneiro <brunoac88@gmail.com>
Date: Thu, 22 Nov 2018 11:01:01 -0200
Subject: [PATCH 2/3] Changing injection of AnchorService

---
 src/creds/VerifiableCredential.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/creds/VerifiableCredential.js b/src/creds/VerifiableCredential.js
index 41c0005d..3c32ceb3 100644
--- a/src/creds/VerifiableCredential.js
+++ b/src/creds/VerifiableCredential.js
@@ -9,10 +9,6 @@ const definitions = require('./definitions');
 const UCA = require('../uca/UserCollectableAttribute');
 const { services } = require('../services');
 
-function getAnchorService() {
-  return services.container.AnchorService;
-}
-
 function sha256(string) {
   return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(string));
 }
@@ -279,7 +275,8 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * @param {*} options
    */
   this.requestAnchor = async (options) => {
-    const anchor = await getAnchorService().anchor(this.identifier, this.proof.merkleRoot, options);
+    const anchorService = services.container.AnchorService;
+    const anchor = await anchorService.anchor(this.identifier, this.proof.merkleRoot, options);
     this.proof.anchor = anchor;
     return this;
   };
@@ -289,7 +286,8 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * already confirmed on the blockchain.
    */
   this.updateAnchor = async () => {
-    const anchor = await getAnchorService().update(this.proof.anchor);
+    const anchorService = services.container.AnchorService;
+    const anchor = await anchorService.update(this.proof.anchor);
     this.proof.anchor = anchor;
     return this;
   };
@@ -382,24 +380,24 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * This method checks if the signature matches for the root of the Merkle Tree
    * @return true or false for the validation
    */
-  this.verifySignature = async () => getAnchorService().verifySignature(this.proof);
+  this.verifySignature = async () => services.container.AnchorService.verifySignature(this.proof);
 
   /**
    * This method checks that the attestation / anchor exists on the BC
    */
-  this.verifyAttestation = async () => getAnchorService().verifyAttestation(this.proof);
+  this.verifyAttestation = async () => services.container.AnchorService.verifyAttestation(this.proof);
 
   /**
    * This method will revoke the attestation on the chain
    * @returns {Promise<Promise<*>|void>}
    */
-  this.revokeAttestation = async () => getAnchorService().revokeAttestation(this.proof);
+  this.revokeAttestation = async () => services.container.AnchorService.revokeAttestation(this.proof);
 
   /**
    * This method will check on the chain the balance of the transaction and if it's still unspent, than it's not revoked
    * @returns {Promise<Promise<*>|void>}
    */
-  this.isRevoked = async () => getAnchorService().isRevoked(this.proof);
+  this.isRevoked = async () => services.container.AnchorService.isRevoked(this.proof);
 
   this.isMatch = (constraints) => {
     const siftConstraints = transformConstraint(constraints);

From e10f93f316cd785442fc099fcb3eea1181aed6ce Mon Sep 17 00:00:00 2001
From: Daniel Santos <danielmelos@gmail.com>
Date: Thu, 22 Nov 2018 11:49:29 -0200
Subject: [PATCH 3/3] Changing injection of SecureRandom

---
 dist/browser/creds/VerifiableCredential.js   |  2 +-
 dist/browser/uca/UserCollectableAttribute.js |  2 +-
 dist/cjs/creds/VerifiableCredential.js       | 18 ++++++++----------
 dist/cjs/uca/UserCollectableAttribute.js     |  4 ++--
 dist/es/creds/VerifiableCredential.js        | 18 ++++++++----------
 dist/es/uca/UserCollectableAttribute.js      |  4 ++--
 src/uca/UserCollectableAttribute.js          |  4 ++--
 7 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/dist/browser/creds/VerifiableCredential.js b/dist/browser/creds/VerifiableCredential.js
index 98c79b68..262cafb9 100644
--- a/dist/browser/creds/VerifiableCredential.js
+++ b/dist/browser/creds/VerifiableCredential.js
@@ -1 +1 @@
-"use strict";var _toConsumableArray2=require("babel-runtime/helpers/toConsumableArray"),_toConsumableArray3=_interopRequireDefault(_toConsumableArray2),_slicedToArray2=require("babel-runtime/helpers/slicedToArray"),_slicedToArray3=_interopRequireDefault(_slicedToArray2),_regenerator=require("babel-runtime/regenerator"),_regenerator2=_interopRequireDefault(_regenerator),_asyncToGenerator2=require("babel-runtime/helpers/asyncToGenerator"),_asyncToGenerator3=_interopRequireDefault(_asyncToGenerator2),_classCallCheck2=require("babel-runtime/helpers/classCallCheck"),_classCallCheck3=_interopRequireDefault(_classCallCheck2),_createClass2=require("babel-runtime/helpers/createClass"),_createClass3=_interopRequireDefault(_createClass2),_typeof2=require("babel-runtime/helpers/typeof"),_typeof3=_interopRequireDefault(_typeof2),_keys=require("babel-runtime/core-js/object/keys"),_keys2=_interopRequireDefault(_keys);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),sift=require("sift"),MerkleTools=require("merkle-tools"),sjcl=require("sjcl"),timestamp=require("unix-timestamp"),flatten=require("flat"),uuidv4=require("uuid/v4"),definitions=require("./definitions"),UCA=require("../uca/UserCollectableAttribute"),_require=require("../services"),services=_require.services;function getAnchorService(){return services.container.AnchorService}function sha256(a){return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(a))}function getClaimPath(a,b){var c=_.split(a,":"),d=_.camelCase(c[1]),e=d+"."+c[2],f=_.find(b,function(a){return _.endsWith(a,e)});return f||e}function validIdentifiers(){var a=_.map(definitions,function(a){return a.identifier});return a}function getClaimsWithFlatKeys(a){var b=flatten(a,{maxDepth:3}),c=flatten(a,{maxDepth:2}),d=_.merge({},b,c),e=_(d).toPairs().sortBy(0).fromPairs().value();return e}function paths(a){for(var b=[],c=[{obj:a,path:[]}],d=function(){var a=c.pop();(0,_keys2.default)(a.obj).forEach(function(d){if("object"===(0,_typeof3.default)(a.obj[d])){var e=a.path.concat(d);b.push(e),c.unshift({obj:a.obj[d],path:e})}})};0<c.length;)d();var e=[];return b.forEach(function(a){e.push(a.join("."))}),e}function getLeavesClaimPaths(a){return _.map(a,"claimPath")}function verifyLeave(a,b,c,d,e,f,g){var h=new UCA(a.identifier,{attestableValue:a.value});if("String"===h.type||"Number"===h.type)h.value!==_.get(c,a.claimPath)&&e.push(a.value);else if("Object"===h.type){var i=h.value,j=_.get(c,a.claimPath),k=_.keys(h.value);_.each(k,function(a){var b=j[a];b&&_.get(i[a],"value")!==b&&e.push(j[a])})}else e.push(a.value);var l=sha256(a.value);l!==a.targetHash&&f.push(a.targetHash);var m=b.validateProof(a.node,a.targetHash,d.merkleRoot);m||g.push(a.targetHash)}function transformConstraint(a){var b=[];return _.forEach(a.claims,function(a){if(!a.path)throw new Error("Malformed contraint: missing PATTH");if(!a.is)throw new Error("Malformed contraint: missing IS");var c={};c[a.path]=a.is,b.push(c)}),b}var CvcMerkleProof=function(){function a(b,c){(0,_classCallCheck3.default)(this,a);var d=a.padTree(b);this.type="CvcMerkleProof2018",this.merkleRoot=null,this.anchor="TBD (Civic Blockchain Attestation)",this.leaves=a.getAllAttestableValue(d),this.buildMerkleTree(c)}return(0,_createClass3.default)(a,null,[{key:"PADDING_INCREMENTS",get:function(){return 16}}]),(0,_createClass3.default)(a,[{key:"buildMerkleTree",value:function(a){var b=this,c=new MerkleTools,d=_.map(this.leaves,function(a){return sha256(a.value)});c.addLeaves(d),c.makeTree(),_.forEach(d,function(d,e){b.leaves[e].claimPath=getClaimPath(b.leaves[e].identifier,a),b.leaves[e].targetHash=d,b.leaves[e].node=c.getProof(e)}),this.leaves=_.filter(this.leaves,function(a){return"cvc:Random:node"!==a.identifier}),this.merkleRoot=c.getMerkleRoot().toString("hex")}}],[{key:"padTree",value:function(b){for(var c=b.length,d=c<a.PADDING_INCREMENTS?a.PADDING_INCREMENTS:_.ceil(c/a.PADDING_INCREMENTS)*a.PADDING_INCREMENTS,e=_.clone(b),f=services.container.SecureRandom;e.length<d;)e.push(new UCA("cvc:Random:node",f.wordWith(16)));return e}},{key:"getAllAttestableValue",value:function(a){var b=[];return _.forEach(a,function(a){var c=a.getAttestableValues();_.reduce(c,function(a,b){return a.push(b),a},b)}),b}}]),a}(),ClaimModel=function a(b){var c=this;(0,_classCallCheck3.default)(this,a),_.forEach(b,function(a){var b=a.getClaimRootPropertyName();c[b]||(c[b]={}),c[b][a.getClaimPropertyName()]=a.getPlainValue()})},VERIFY_LEVELS={INVALID:-1,PROOFS:0,ANCHOR:1,BLOCKCHAIN:2};function VerifiableCredentialBaseConstructor(a,b,c,d,e){var f=this;this.id=uuidv4(),this.issuer=b;var g=new UCA("cvc:Meta:issuer",this.issuer);this.issuanceDate=new Date().toISOString();var h=new UCA("cvc:Meta:issuanceDate",this.issuanceDate);this.identifier=a,this.expirationDate=c?timestamp.toDate(timestamp.now(c)).toISOString():null;var i=new UCA("cvc:Meta:expirationDate",this.expirationDate?this.expirationDate:"null"),j=i?_.concat(d,g,h,i):_.concat(d,g,h);if(!_.includes(validIdentifiers(),a))throw new Error(a+" is not defined");var k=e?_.find(definitions,{identifier:a,version:""+e}):_.find(definitions,{identifier:a});if(!k)throw new Error("Credential definition for "+a+" v"+e+" not found");if(this.version=""+e||k.version,this.type=["Credential",a],!_.isEmpty(d)){this.claim=new ClaimModel(d);var l=paths(this.claim),m=_.keys(flatten(this.claim,{safe:!0})),n=l.concat(m);if(this.proof=new CvcMerkleProof(j,n),!_.isEmpty(k.excludes)){var o=_.remove(this.proof.leaves,function(a){return _.includes(k.excludes,a.identifier)});_.forEach(o,function(a){_.unset(f.claim,a.claimPath)})}}return this.getGlobalCredentialItemIdentifier=function(){return"credential-"+f.identifier+"-"+f.version},this.filter=function(a){var b=_.cloneDeep(f);return _.remove(b.proof.leaves,function(b){return!_.includes(a,b.identifier)}),b.claim={},_.forEach(b.proof.leaves,function(a){_.set(b.claim,a.claimPath,_.get(f.claim,a.claimPath))}),b},this.requestAnchor=function(){var a=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(b){var c;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.next=2,getAnchorService().anchor(f.identifier,f.proof.merkleRoot,b);case 2:return c=a.sent,f.proof.anchor=c,a.abrupt("return",f);case 5:case"end":return a.stop();}},a,f)}));return function(){return a.apply(this,arguments)}}(),this.updateAnchor=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){var b;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.next=2,getAnchorService().update(f.proof.anchor);case 2:return b=a.sent,f.proof.anchor=b,a.abrupt("return",f);case 5:case"end":return a.stop();}},a,f)})),this.verifyProofs=function(){var a=_.clone(f.expirationDate),b=_.clone(f.claim),c=_.clone(f.proof),d=_.get(c,"leaves"),e=!1,g=new MerkleTools,h=getClaimsWithFlatKeys(b),i=getLeavesClaimPaths(d),j=[],k=[],l=[],m=[],n=[];_.forEach(_.keys(h),function(a){var e=_.indexOf(i,a);if(-1===e){_.findLastIndex(a,".");var f=a.substring(0,_.lastIndexOf(a,"."));if(-1<_.indexOf(i,f))return;j.push(a)}else{var h=d[e];verifyLeave(h,g,b,c,l,m,n)}});var o=_.indexOf(i,"meta.expirationDate");if(0<=o){var p=d[o],q=l.length+m.length+n.length;verifyLeave(p,g,{meta:{expirationDate:a}},c,l,m,n);var r=l.length+m.length+n.length;if(r===q&&null!==a){var s=new Date,t=new Date(a);s.getTime()>t.getTime()&&k.push(a)}}return _.isEmpty(j)&&_.isEmpty(l)&&_.isEmpty(m)&&_.isEmpty(n)&&_.isEmpty(k)&&(e=!0),e},this.verify=function(a){var b=a||VERIFY_LEVELS.PROOFS,c=VERIFY_LEVELS.INVALID;return b>=VERIFY_LEVELS.PROOFS&&f.verifyProofs()&&(c=VERIFY_LEVELS.PROOFS),c},this.verifySignature=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().verifySignature(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.verifyAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().verifyAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.revokeAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().revokeAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isRevoked=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",getAnchorService().isRevoked(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isMatch=function(a){var b=transformConstraint(a),c=!0;return _.forEach(b,function(a){return c=-1<sift.indexOf(a,[f.claim]),c}),c},this}var CREDENTIAL_META_FIELDS=["id","identifier","issuer","issuanceDate","expirationDate","version","type"],getCredentialMeta=function(a){return _.pick(a,CREDENTIAL_META_FIELDS)};function transformMetaConstraint(a){var b={},c=_.get(a,"meta.credential");if(c){var d=/(.*)-(.*)-(.*)/g,e=d.exec(c),f=(0,_slicedToArray3.default)(e,4);b.identifier=f[2],b.version=f[3];var g=getCredentialMeta(a.meta);_.forEach(_.keys(g),function(a){b[a]=g[a].is})}return b}var isMatchCredentialMeta=function(a,b){var c=transformMetaConstraint(b),d=!1;return _.isEmpty(c)||(d=-1<sift.indexOf(c,[a])),d};VerifiableCredentialBaseConstructor.CREDENTIAL_META_FIELDS=CREDENTIAL_META_FIELDS,VerifiableCredentialBaseConstructor.getCredentialMeta=getCredentialMeta,VerifiableCredentialBaseConstructor.isMatchCredentialMeta=isMatchCredentialMeta,VerifiableCredentialBaseConstructor.fromJSON=function(a){var b=new VerifiableCredentialBaseConstructor(a.identifier,a.issuer);return b.id=_.clone(a.id),b.issuanceDate=_.clone(a.issuanceDate),b.expirationDate=_.clone(a.expirationDate),b.identifier=_.clone(a.identifier),b.version=_.clone(a.version),b.type=_.cloneDeep(a.type),b.claim=_.cloneDeep(a.claim),b.proof=_.cloneDeep(a.proof),b},VerifiableCredentialBaseConstructor.getAllProperties=function(a){var b=_.find(definitions,{identifier:a});if(b){var c=[];_.forEach(b.depends,function(a){c.push.apply(c,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))});var d=[];return _.forEach(b.excludes,function(a){d.push.apply(d,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))}),_.difference(c,d)}return null},VerifiableCredentialBaseConstructor.VERIFY_LEVELS=VERIFY_LEVELS,module.exports=VerifiableCredentialBaseConstructor;
\ No newline at end of file
+"use strict";var _toConsumableArray2=require("babel-runtime/helpers/toConsumableArray"),_toConsumableArray3=_interopRequireDefault(_toConsumableArray2),_slicedToArray2=require("babel-runtime/helpers/slicedToArray"),_slicedToArray3=_interopRequireDefault(_slicedToArray2),_regenerator=require("babel-runtime/regenerator"),_regenerator2=_interopRequireDefault(_regenerator),_asyncToGenerator2=require("babel-runtime/helpers/asyncToGenerator"),_asyncToGenerator3=_interopRequireDefault(_asyncToGenerator2),_classCallCheck2=require("babel-runtime/helpers/classCallCheck"),_classCallCheck3=_interopRequireDefault(_classCallCheck2),_createClass2=require("babel-runtime/helpers/createClass"),_createClass3=_interopRequireDefault(_createClass2),_typeof2=require("babel-runtime/helpers/typeof"),_typeof3=_interopRequireDefault(_typeof2),_keys=require("babel-runtime/core-js/object/keys"),_keys2=_interopRequireDefault(_keys);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),sift=require("sift"),MerkleTools=require("merkle-tools"),sjcl=require("sjcl"),timestamp=require("unix-timestamp"),flatten=require("flat"),uuidv4=require("uuid/v4"),definitions=require("./definitions"),UCA=require("../uca/UserCollectableAttribute"),_require=require("../services"),services=_require.services;function sha256(a){return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(a))}function getClaimPath(a,b){var c=_.split(a,":"),d=_.camelCase(c[1]),e=d+"."+c[2],f=_.find(b,function(a){return _.endsWith(a,e)});return f||e}function validIdentifiers(){var a=_.map(definitions,function(a){return a.identifier});return a}function getClaimsWithFlatKeys(a){var b=flatten(a,{maxDepth:3}),c=flatten(a,{maxDepth:2}),d=_.merge({},b,c),e=_(d).toPairs().sortBy(0).fromPairs().value();return e}function paths(a){for(var b=[],c=[{obj:a,path:[]}],d=function(){var a=c.pop();(0,_keys2.default)(a.obj).forEach(function(d){if("object"===(0,_typeof3.default)(a.obj[d])){var e=a.path.concat(d);b.push(e),c.unshift({obj:a.obj[d],path:e})}})};0<c.length;)d();var e=[];return b.forEach(function(a){e.push(a.join("."))}),e}function getLeavesClaimPaths(a){return _.map(a,"claimPath")}function verifyLeave(a,b,c,d,e,f,g){var h=new UCA(a.identifier,{attestableValue:a.value});if("String"===h.type||"Number"===h.type)h.value!==_.get(c,a.claimPath)&&e.push(a.value);else if("Object"===h.type){var i=h.value,j=_.get(c,a.claimPath),k=_.keys(h.value);_.each(k,function(a){var b=j[a];b&&_.get(i[a],"value")!==b&&e.push(j[a])})}else e.push(a.value);var l=sha256(a.value);l!==a.targetHash&&f.push(a.targetHash);var m=b.validateProof(a.node,a.targetHash,d.merkleRoot);m||g.push(a.targetHash)}function transformConstraint(a){var b=[];return _.forEach(a.claims,function(a){if(!a.path)throw new Error("Malformed contraint: missing PATTH");if(!a.is)throw new Error("Malformed contraint: missing IS");var c={};c[a.path]=a.is,b.push(c)}),b}var CvcMerkleProof=function(){function a(b,c){(0,_classCallCheck3.default)(this,a);var d=a.padTree(b);this.type="CvcMerkleProof2018",this.merkleRoot=null,this.anchor="TBD (Civic Blockchain Attestation)",this.leaves=a.getAllAttestableValue(d),this.buildMerkleTree(c)}return(0,_createClass3.default)(a,null,[{key:"PADDING_INCREMENTS",get:function(){return 16}}]),(0,_createClass3.default)(a,[{key:"buildMerkleTree",value:function(a){var b=this,c=new MerkleTools,d=_.map(this.leaves,function(a){return sha256(a.value)});c.addLeaves(d),c.makeTree(),_.forEach(d,function(d,e){b.leaves[e].claimPath=getClaimPath(b.leaves[e].identifier,a),b.leaves[e].targetHash=d,b.leaves[e].node=c.getProof(e)}),this.leaves=_.filter(this.leaves,function(a){return"cvc:Random:node"!==a.identifier}),this.merkleRoot=c.getMerkleRoot().toString("hex")}}],[{key:"padTree",value:function(b){for(var c=b.length,d=c<a.PADDING_INCREMENTS?a.PADDING_INCREMENTS:_.ceil(c/a.PADDING_INCREMENTS)*a.PADDING_INCREMENTS,e=_.clone(b),f=services.container.SecureRandom;e.length<d;)e.push(new UCA("cvc:Random:node",f.wordWith(16)));return e}},{key:"getAllAttestableValue",value:function(a){var b=[];return _.forEach(a,function(a){var c=a.getAttestableValues();_.reduce(c,function(a,b){return a.push(b),a},b)}),b}}]),a}(),ClaimModel=function a(b){var c=this;(0,_classCallCheck3.default)(this,a),_.forEach(b,function(a){var b=a.getClaimRootPropertyName();c[b]||(c[b]={}),c[b][a.getClaimPropertyName()]=a.getPlainValue()})},VERIFY_LEVELS={INVALID:-1,PROOFS:0,ANCHOR:1,BLOCKCHAIN:2};function VerifiableCredentialBaseConstructor(a,b,c,d,e){var f=this;this.id=uuidv4(),this.issuer=b;var g=new UCA("cvc:Meta:issuer",this.issuer);this.issuanceDate=new Date().toISOString();var h=new UCA("cvc:Meta:issuanceDate",this.issuanceDate);this.identifier=a,this.expirationDate=c?timestamp.toDate(timestamp.now(c)).toISOString():null;var i=new UCA("cvc:Meta:expirationDate",this.expirationDate?this.expirationDate:"null"),j=i?_.concat(d,g,h,i):_.concat(d,g,h);if(!_.includes(validIdentifiers(),a))throw new Error(a+" is not defined");var k=e?_.find(definitions,{identifier:a,version:""+e}):_.find(definitions,{identifier:a});if(!k)throw new Error("Credential definition for "+a+" v"+e+" not found");if(this.version=""+e||k.version,this.type=["Credential",a],!_.isEmpty(d)){this.claim=new ClaimModel(d);var l=paths(this.claim),m=_.keys(flatten(this.claim,{safe:!0})),n=l.concat(m);if(this.proof=new CvcMerkleProof(j,n),!_.isEmpty(k.excludes)){var o=_.remove(this.proof.leaves,function(a){return _.includes(k.excludes,a.identifier)});_.forEach(o,function(a){_.unset(f.claim,a.claimPath)})}}return this.getGlobalCredentialItemIdentifier=function(){return"credential-"+f.identifier+"-"+f.version},this.filter=function(a){var b=_.cloneDeep(f);return _.remove(b.proof.leaves,function(b){return!_.includes(a,b.identifier)}),b.claim={},_.forEach(b.proof.leaves,function(a){_.set(b.claim,a.claimPath,_.get(f.claim,a.claimPath))}),b},this.requestAnchor=function(){var a=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(b){var c,d;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return c=services.container.AnchorService,a.next=3,c.anchor(f.identifier,f.proof.merkleRoot,b);case 3:return d=a.sent,f.proof.anchor=d,a.abrupt("return",f);case 6:case"end":return a.stop();}},a,f)}));return function(){return a.apply(this,arguments)}}(),this.updateAnchor=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){var b,c;return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return b=services.container.AnchorService,a.next=3,b.update(f.proof.anchor);case 3:return c=a.sent,f.proof.anchor=c,a.abrupt("return",f);case 6:case"end":return a.stop();}},a,f)})),this.verifyProofs=function(){var a=_.clone(f.expirationDate),b=_.clone(f.claim),c=_.clone(f.proof),d=_.get(c,"leaves"),e=!1,g=new MerkleTools,h=getClaimsWithFlatKeys(b),i=getLeavesClaimPaths(d),j=[],k=[],l=[],m=[],n=[];_.forEach(_.keys(h),function(a){var e=_.indexOf(i,a);if(-1===e){_.findLastIndex(a,".");var f=a.substring(0,_.lastIndexOf(a,"."));if(-1<_.indexOf(i,f))return;j.push(a)}else{var h=d[e];verifyLeave(h,g,b,c,l,m,n)}});var o=_.indexOf(i,"meta.expirationDate");if(0<=o){var p=d[o],q=l.length+m.length+n.length;verifyLeave(p,g,{meta:{expirationDate:a}},c,l,m,n);var r=l.length+m.length+n.length;if(r===q&&null!==a){var s=new Date,t=new Date(a);s.getTime()>t.getTime()&&k.push(a)}}return _.isEmpty(j)&&_.isEmpty(l)&&_.isEmpty(m)&&_.isEmpty(n)&&_.isEmpty(k)&&(e=!0),e},this.verify=function(a){var b=a||VERIFY_LEVELS.PROOFS,c=VERIFY_LEVELS.INVALID;return b>=VERIFY_LEVELS.PROOFS&&f.verifyProofs()&&(c=VERIFY_LEVELS.PROOFS),c},this.verifySignature=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",services.container.AnchorService.verifySignature(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.verifyAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",services.container.AnchorService.verifyAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.revokeAttestation=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",services.container.AnchorService.revokeAttestation(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isRevoked=(0,_asyncToGenerator3.default)(_regenerator2.default.mark(function a(){return _regenerator2.default.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return a.abrupt("return",services.container.AnchorService.isRevoked(f.proof));case 1:case"end":return a.stop();}},a,f)})),this.isMatch=function(a){var b=transformConstraint(a),c=!0;return _.forEach(b,function(a){return c=-1<sift.indexOf(a,[f.claim]),c}),c},this}var CREDENTIAL_META_FIELDS=["id","identifier","issuer","issuanceDate","expirationDate","version","type"],getCredentialMeta=function(a){return _.pick(a,CREDENTIAL_META_FIELDS)};function transformMetaConstraint(a){var b={},c=_.get(a,"meta.credential");if(c){var d=/(.*)-(.*)-(.*)/g,e=d.exec(c),f=(0,_slicedToArray3.default)(e,4);b.identifier=f[2],b.version=f[3];var g=getCredentialMeta(a.meta);_.forEach(_.keys(g),function(a){b[a]=g[a].is})}return b}var isMatchCredentialMeta=function(a,b){var c=transformMetaConstraint(b),d=!1;return _.isEmpty(c)||(d=-1<sift.indexOf(c,[a])),d};VerifiableCredentialBaseConstructor.CREDENTIAL_META_FIELDS=CREDENTIAL_META_FIELDS,VerifiableCredentialBaseConstructor.getCredentialMeta=getCredentialMeta,VerifiableCredentialBaseConstructor.isMatchCredentialMeta=isMatchCredentialMeta,VerifiableCredentialBaseConstructor.fromJSON=function(a){var b=new VerifiableCredentialBaseConstructor(a.identifier,a.issuer);return b.id=_.clone(a.id),b.issuanceDate=_.clone(a.issuanceDate),b.expirationDate=_.clone(a.expirationDate),b.identifier=_.clone(a.identifier),b.version=_.clone(a.version),b.type=_.cloneDeep(a.type),b.claim=_.cloneDeep(a.claim),b.proof=_.cloneDeep(a.proof),b},VerifiableCredentialBaseConstructor.getAllProperties=function(a){var b=_.find(definitions,{identifier:a});if(b){var c=[];_.forEach(b.depends,function(a){c.push.apply(c,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))});var d=[];return _.forEach(b.excludes,function(a){d.push.apply(d,(0,_toConsumableArray3.default)(UCA.getAllProperties(a)))}),_.difference(c,d)}return null},VerifiableCredentialBaseConstructor.VERIFY_LEVELS=VERIFY_LEVELS,module.exports=VerifiableCredentialBaseConstructor;
\ No newline at end of file
diff --git a/dist/browser/uca/UserCollectableAttribute.js b/dist/browser/uca/UserCollectableAttribute.js
index 5fbb8de8..c70de3e9 100644
--- a/dist/browser/uca/UserCollectableAttribute.js
+++ b/dist/browser/uca/UserCollectableAttribute.js
@@ -1 +1 @@
-"use strict";var _stringify=require("babel-runtime/core-js/json/stringify"),_stringify2=_interopRequireDefault(_stringify),_getIterator2=require("babel-runtime/core-js/get-iterator"),_getIterator3=_interopRequireDefault(_getIterator2);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),timestamp=require("unix-timestamp"),sjcl=require("sjcl"),definitions=require("./definitions"),_require=require("../services"),services=_require.services,validIdentifiers=_.map(definitions,function(a){return a.identifier});function isValueOfType(a,b){return"String"===b?_.isString(a):"Number"===b?_.isNumber(a):!("Boolean"!=b)&&_.isBoolean(a)}function isValid(a,b,c){return"String"===b?(!c.pattern||c.pattern.test(a))&&(!c.minimumLength||a.length>=c.minimumLength)&&(!c.maximumLength||a.length<=c.minimumLength):"Number"===b?((!_.isNil(c.minimum)&&c.exclusiveMinimum?a>c.minimum:a>=c.minimum)||_.isNil(c.minimum))&&((!_.isNil(c.maximum)&&c.exclusiveMaximum?a<c.maximum:a<=c.maximum)||_.isNil(c.maximum)):!("Boolean"!=b)&&_.isBoolean(a)}var getTypeName=function a(b){if(_.isString(b.type)){if(_.includes(validIdentifiers,b.type)){var c=_.find(definitions,{identifier:b.type});return a(c)}return b.type}return"Object"},resolveType=function a(b){var c=getTypeName(b);if("Object"!==c)return c;if(!_.isString(b.type))return b.type;var d=_.find(definitions,{identifier:b.type});return a(d)},findDefinitionByAttestableValue=function a(b,c){var d=!0,e=!1,f=void 0;try{for(var g,h=(0,_getIterator3.default)(c.type.properties);!(d=(g=h.next()).done);d=!0){var i=g.value,j=_.find(definitions,{identifier:i.type});if(j.type=resolveType(j),!j.type.properties&&i.name===b)return i.type;if(j.type.properties)return a(b,j)}}catch(a){e=!0,f=a}finally{try{!d&&h.return&&h.return()}finally{if(e)throw f}}return null},getAllProperties=function a(b,c){var d=_.find(definitions,{identifier:b}),e=[],f=resolveType(d),g=_.isString(f)?_.find(definitions,{identifier:f}):d;if(g&&"Object"===getTypeName(g)){var h;if(g.type.properties)h=g.type.properties;else{var i=_.find(definitions,{identifier:g.type});h=resolveType(i).properties}var j=void 0,k=_.split(g.identifier,":");j=c?_.includes(c,_.lowerCase(k[1]))?c+"."+k[2]:c+"."+_.lowerCase(k[1])+"."+k[2]:_.lowerCase(k[1])+"."+k[2],_.includes(["String","Number","Boolean"],""+h.type)?e.push(j+"."+h.name):_.forEach(h,function(b){var c=_.split(b.type,":")[2],d=b.name===c?j:j+"."+b.name,f=a(b.type,d);_.forEach(f,function(a){return e.push(a)})})}else if(c){var l=c+"."+_.split(d.identifier,":")[2];e.push(l)}else{var m=_.split(b,":"),n=_.lowerCase(m[1])+"."+m[2];e.push(n)}return e},isAttestableValue=function(a){return a&&a.attestableValue},parseAttestableValue=function(a){var b=[],c=_.split(a.attestableValue,"|"),d=/^urn:(\w+(?:\.\w+)*):(\w+):(.+)/;if(_.each(c,function(a){var c=d.exec(a);if(c&&4===c.length){var e={propertyName:c[1],salt:c[2],value:c[3],stringValue:a};b.push(e)}}),c.length!==b.length&&c.length!==b.length+1)throw new Error("Invalid attestableValue");return b};function UCABaseConstructor(a,b,c){var d=this;if(this.timestamp=null,this.id=null,this.secureRandom=services.container.SecureRandom,!_.includes(validIdentifiers,a))throw new Error(a+" is not defined");this.identifier=a;var e=c?_.find(definitions,{identifier:a,version:c}):_.find(definitions,{identifier:a});if(this.version=c||e.version,this.type=getTypeName(e),e.type=resolveType(e),isAttestableValue(b)){var f=parseAttestableValue(b);if(1===f.length){this.timestamp=null,this.salt=f[0].salt;var g=f[0].value;this.value=_.includes(["null","undefined"],g)?null:g}else{for(var h={},j=function(a){var b=f[a].propertyName,c=b.split("."),d=c[c.length-2],g=d.substring(0,1).toUpperCase()+d.substring(1),i=c[c.length-1],j="cvc:"+g+":"+i,k=definitions.find(function(a){return a.identifier===j});k||(j=findDefinitionByAttestableValue(i,e)),h[b]=new UCABaseConstructor(j,{attestableValue:f[a].stringValue})},k=0;k<f.length;k+=1)j(k);this.value=h}}else if(isValueOfType(b,this.type)){if(this.timestamp=timestamp.now(),!isValid(b,this.type,e))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);this.value=b,this.salt=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)))}else if(_.isEmpty(e.type.properties))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);else{var l=_.reduce(e.type.required,function(a,c){return b[c]&&a},!0);if(!l)throw new Error("Missing required fields to "+a);var m=_.mapValues(_.keyBy(_.map(b,function(a,b){var c=_.find(e.type.properties,{name:b}),d=new UCABaseConstructor(c.type,a,c.version);return{key:b,value:d}}),"key"),"value");this.value=m}this.getAttestableValue=function(a){var b=d.identifier.lastIndexOf(":"),c=d.identifier.substring(b+1);switch(a&&(c=a+"."+c),d.type){case"String":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Number":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Boolean":return"urn:"+c+":"+d.salt+":"+d.value+"|";default:return _.reduce(_.sortBy(_.keys(d.value)),function(a,b){return""+a+d.value[b].getAttestableValue(c)},"");}},this.getGlobalCredentialItemIdentifier=function(){return"claim-"+d.identifier+"-"+d.version},this.getClaimRootPropertyName=function(){var a=_.split(d.identifier,":");return _.lowerCase(a[1])},this.getClaimPropertyName=function(){var a=_.split(d.identifier,":");return a[2]},this.getClaimPath=function(){var a=_.split(d.identifier,":"),b=_.lowerCase(a[1]);return b+"."+a[2]},this.getAttestableValues=function(){var a=[],b=_.find(definitions,{identifier:d.identifier,version:d.version});return(b.credentialItem||b.attestable)&&(a.push({identifier:d.identifier,value:d.getAttestableValue()}),"Object"===d.type&&_.forEach(_.keys(d.value),function(b){var c=d.value[b].getAttestableValues();_.reduce(c,function(a,b){return a.push(b)},a)})),a},this.getPlainValue=function(a){var b={},c=[];switch(d.type){case"String":case"Number":case"Boolean":if(a)b[a]=d.value;else{if(!d.credentialItem)return d.value;b[d.identifier]=d.value}return b;default:return _.forEach(_.sortBy(_.keys(d.value)),function(a){c.push(d.value[a].getPlainValue(a))}),_.forEach(c,function(c){a?(b[a]=b[a]?b[a]:{},_.assign(b[a],c)):_.assign(b,c)}),b;}};var n=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.getAttestableValue()));return this.id=this.version+":"+this.identifier+":"+n,this}var UCA=UCABaseConstructor;function convertIdentifierToClassName(a){var b=_.split(a,":"),c=b[1],d=_.upperFirst(_.camelCase(b[2]));return""+c+d}_.forEach(_.filter(definitions,function(a){return a.credentialItem}),function(a){var b=convertIdentifierToClassName(a.identifier),c={},d=a.identifier;c[b]=function(a,b){var c=new UCABaseConstructor(d,a,b);return c},_.mixin(UCA,c)}),UCA.getTypeName=getTypeName,UCA.resolveType=resolveType,UCA.getAllProperties=getAllProperties,module.exports=UCA;
\ No newline at end of file
+"use strict";var _stringify=require("babel-runtime/core-js/json/stringify"),_stringify2=_interopRequireDefault(_stringify),_getIterator2=require("babel-runtime/core-js/get-iterator"),_getIterator3=_interopRequireDefault(_getIterator2);function _interopRequireDefault(a){return a&&a.__esModule?a:{default:a}}var _=require("lodash"),timestamp=require("unix-timestamp"),sjcl=require("sjcl"),definitions=require("./definitions"),_require=require("../services"),services=_require.services,validIdentifiers=_.map(definitions,function(a){return a.identifier});function isValueOfType(a,b){return"String"===b?_.isString(a):"Number"===b?_.isNumber(a):!("Boolean"!=b)&&_.isBoolean(a)}function isValid(a,b,c){return"String"===b?(!c.pattern||c.pattern.test(a))&&(!c.minimumLength||a.length>=c.minimumLength)&&(!c.maximumLength||a.length<=c.minimumLength):"Number"===b?((!_.isNil(c.minimum)&&c.exclusiveMinimum?a>c.minimum:a>=c.minimum)||_.isNil(c.minimum))&&((!_.isNil(c.maximum)&&c.exclusiveMaximum?a<c.maximum:a<=c.maximum)||_.isNil(c.maximum)):!("Boolean"!=b)&&_.isBoolean(a)}var getTypeName=function a(b){if(_.isString(b.type)){if(_.includes(validIdentifiers,b.type)){var c=_.find(definitions,{identifier:b.type});return a(c)}return b.type}return"Object"},resolveType=function a(b){var c=getTypeName(b);if("Object"!==c)return c;if(!_.isString(b.type))return b.type;var d=_.find(definitions,{identifier:b.type});return a(d)},findDefinitionByAttestableValue=function a(b,c){var d=!0,e=!1,f=void 0;try{for(var g,h=(0,_getIterator3.default)(c.type.properties);!(d=(g=h.next()).done);d=!0){var i=g.value,j=_.find(definitions,{identifier:i.type});if(j.type=resolveType(j),!j.type.properties&&i.name===b)return i.type;if(j.type.properties)return a(b,j)}}catch(a){e=!0,f=a}finally{try{!d&&h.return&&h.return()}finally{if(e)throw f}}return null},getAllProperties=function a(b,c){var d=_.find(definitions,{identifier:b}),e=[],f=resolveType(d),g=_.isString(f)?_.find(definitions,{identifier:f}):d;if(g&&"Object"===getTypeName(g)){var h;if(g.type.properties)h=g.type.properties;else{var i=_.find(definitions,{identifier:g.type});h=resolveType(i).properties}var j=void 0,k=_.split(g.identifier,":");j=c?_.includes(c,_.lowerCase(k[1]))?c+"."+k[2]:c+"."+_.lowerCase(k[1])+"."+k[2]:_.lowerCase(k[1])+"."+k[2],_.includes(["String","Number","Boolean"],""+h.type)?e.push(j+"."+h.name):_.forEach(h,function(b){var c=_.split(b.type,":")[2],d=b.name===c?j:j+"."+b.name,f=a(b.type,d);_.forEach(f,function(a){return e.push(a)})})}else if(c){var l=c+"."+_.split(d.identifier,":")[2];e.push(l)}else{var m=_.split(b,":"),n=_.lowerCase(m[1])+"."+m[2];e.push(n)}return e},isAttestableValue=function(a){return a&&a.attestableValue},parseAttestableValue=function(a){var b=[],c=_.split(a.attestableValue,"|"),d=/^urn:(\w+(?:\.\w+)*):(\w+):(.+)/;if(_.each(c,function(a){var c=d.exec(a);if(c&&4===c.length){var e={propertyName:c[1],salt:c[2],value:c[3],stringValue:a};b.push(e)}}),c.length!==b.length&&c.length!==b.length+1)throw new Error("Invalid attestableValue");return b};function UCABaseConstructor(a,b,c){var d=this;if(this.timestamp=null,this.id=null,!_.includes(validIdentifiers,a))throw new Error(a+" is not defined");this.identifier=a;var e=c?_.find(definitions,{identifier:a,version:c}):_.find(definitions,{identifier:a});if(this.version=c||e.version,this.type=getTypeName(e),e.type=resolveType(e),isAttestableValue(b)){var f=parseAttestableValue(b);if(1===f.length){this.timestamp=null,this.salt=f[0].salt;var g=f[0].value;this.value=_.includes(["null","undefined"],g)?null:g}else{for(var h={},j=function(a){var b=f[a].propertyName,c=b.split("."),d=c[c.length-2],g=d.substring(0,1).toUpperCase()+d.substring(1),i=c[c.length-1],j="cvc:"+g+":"+i,k=definitions.find(function(a){return a.identifier===j});k||(j=findDefinitionByAttestableValue(i,e)),h[b]=new UCABaseConstructor(j,{attestableValue:f[a].stringValue})},k=0;k<f.length;k+=1)j(k);this.value=h}}else if(isValueOfType(b,this.type)){if(this.timestamp=timestamp.now(),!isValid(b,this.type,e))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);this.value=b;var l=services.container.SecureRandom;this.salt=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(l.wordWith(64)))}else if(_.isEmpty(e.type.properties))throw new Error((0,_stringify2.default)(b)+" is not valid for "+a);else{var m=_.reduce(e.type.required,function(a,c){return b[c]&&a},!0);if(!m)throw new Error("Missing required fields to "+a);var n=_.mapValues(_.keyBy(_.map(b,function(a,b){var c=_.find(e.type.properties,{name:b}),d=new UCABaseConstructor(c.type,a,c.version);return{key:b,value:d}}),"key"),"value");this.value=n}this.getAttestableValue=function(a){var b=d.identifier.lastIndexOf(":"),c=d.identifier.substring(b+1);switch(a&&(c=a+"."+c),d.type){case"String":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Number":return"urn:"+c+":"+d.salt+":"+d.value+"|";case"Boolean":return"urn:"+c+":"+d.salt+":"+d.value+"|";default:return _.reduce(_.sortBy(_.keys(d.value)),function(a,b){return""+a+d.value[b].getAttestableValue(c)},"");}},this.getGlobalCredentialItemIdentifier=function(){return"claim-"+d.identifier+"-"+d.version},this.getClaimRootPropertyName=function(){var a=_.split(d.identifier,":");return _.lowerCase(a[1])},this.getClaimPropertyName=function(){var a=_.split(d.identifier,":");return a[2]},this.getClaimPath=function(){var a=_.split(d.identifier,":"),b=_.lowerCase(a[1]);return b+"."+a[2]},this.getAttestableValues=function(){var a=[],b=_.find(definitions,{identifier:d.identifier,version:d.version});return(b.credentialItem||b.attestable)&&(a.push({identifier:d.identifier,value:d.getAttestableValue()}),"Object"===d.type&&_.forEach(_.keys(d.value),function(b){var c=d.value[b].getAttestableValues();_.reduce(c,function(a,b){return a.push(b)},a)})),a},this.getPlainValue=function(a){var b={},c=[];switch(d.type){case"String":case"Number":case"Boolean":if(a)b[a]=d.value;else{if(!d.credentialItem)return d.value;b[d.identifier]=d.value}return b;default:return _.forEach(_.sortBy(_.keys(d.value)),function(a){c.push(d.value[a].getPlainValue(a))}),_.forEach(c,function(c){a?(b[a]=b[a]?b[a]:{},_.assign(b[a],c)):_.assign(b,c)}),b;}};var o=sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.getAttestableValue()));return this.id=this.version+":"+this.identifier+":"+o,this}var UCA=UCABaseConstructor;function convertIdentifierToClassName(a){var b=_.split(a,":"),c=b[1],d=_.upperFirst(_.camelCase(b[2]));return""+c+d}_.forEach(_.filter(definitions,function(a){return a.credentialItem}),function(a){var b=convertIdentifierToClassName(a.identifier),c={},d=a.identifier;c[b]=function(a,b){var c=new UCABaseConstructor(d,a,b);return c},_.mixin(UCA,c)}),UCA.getTypeName=getTypeName,UCA.resolveType=resolveType,UCA.getAllProperties=getAllProperties,module.exports=UCA;
\ No newline at end of file
diff --git a/dist/cjs/creds/VerifiableCredential.js b/dist/cjs/creds/VerifiableCredential.js
index f6a8d420..88befb12 100644
--- a/dist/cjs/creds/VerifiableCredential.js
+++ b/dist/cjs/creds/VerifiableCredential.js
@@ -13,10 +13,6 @@ const definitions = require('./definitions');
 const UCA = require('../uca/UserCollectableAttribute');
 const { services } = require('../services');
 
-function getAnchorService() {
-  return services.container.AnchorService;
-}
-
 function sha256(string) {
   return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(string));
 }
@@ -278,7 +274,8 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    */
   this.requestAnchor = (() => {
     var _ref = _asyncToGenerator(function* (options) {
-      const anchor = yield getAnchorService().anchor(_this.identifier, _this.proof.merkleRoot, options);
+      const anchorService = services.container.AnchorService;
+      const anchor = yield anchorService.anchor(_this.identifier, _this.proof.merkleRoot, options);
       _this.proof.anchor = anchor;
       return _this;
     });
@@ -293,7 +290,8 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * already confirmed on the blockchain.
    */
   this.updateAnchor = _asyncToGenerator(function* () {
-    const anchor = yield getAnchorService().update(_this.proof.anchor);
+    const anchorService = services.container.AnchorService;
+    const anchor = yield anchorService.update(_this.proof.anchor);
     _this.proof.anchor = anchor;
     return _this;
   });
@@ -383,14 +381,14 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * @return true or false for the validation
    */
   this.verifySignature = _asyncToGenerator(function* () {
-    return getAnchorService().verifySignature(_this.proof);
+    return services.container.AnchorService.verifySignature(_this.proof);
   });
 
   /**
    * This method checks that the attestation / anchor exists on the BC
    */
   this.verifyAttestation = _asyncToGenerator(function* () {
-    return getAnchorService().verifyAttestation(_this.proof);
+    return services.container.AnchorService.verifyAttestation(_this.proof);
   });
 
   /**
@@ -398,7 +396,7 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * @returns {Promise<Promise<*>|void>}
    */
   this.revokeAttestation = _asyncToGenerator(function* () {
-    return getAnchorService().revokeAttestation(_this.proof);
+    return services.container.AnchorService.revokeAttestation(_this.proof);
   });
 
   /**
@@ -406,7 +404,7 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * @returns {Promise<Promise<*>|void>}
    */
   this.isRevoked = _asyncToGenerator(function* () {
-    return getAnchorService().isRevoked(_this.proof);
+    return services.container.AnchorService.isRevoked(_this.proof);
   });
 
   this.isMatch = constraints => {
diff --git a/dist/cjs/uca/UserCollectableAttribute.js b/dist/cjs/uca/UserCollectableAttribute.js
index 53123435..6c38d942 100644
--- a/dist/cjs/uca/UserCollectableAttribute.js
+++ b/dist/cjs/uca/UserCollectableAttribute.js
@@ -165,7 +165,6 @@ const parseAttestableValue = value => {
 function UCABaseConstructor(identifier, value, version) {
   this.timestamp = null;
   this.id = null;
-  this.secureRandom = services.container.SecureRandom;
 
   if (!_.includes(validIdentifiers, identifier)) {
     throw new Error(`${identifier} is not defined`);
@@ -217,7 +216,8 @@ function UCABaseConstructor(identifier, value, version) {
     }
     this.value = value;
 
-    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)));
+    const secureRandom = services.container.SecureRandom;
+    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(secureRandom.wordWith(64)));
   } else if (_.isEmpty(definition.type.properties)) {
     throw new Error(`${JSON.stringify(value)} is not valid for ${identifier}`);
   } else {
diff --git a/dist/es/creds/VerifiableCredential.js b/dist/es/creds/VerifiableCredential.js
index 9b5bd819..159c1a50 100644
--- a/dist/es/creds/VerifiableCredential.js
+++ b/dist/es/creds/VerifiableCredential.js
@@ -9,10 +9,6 @@ const definitions = require('./definitions');
 const UCA = require('../uca/UserCollectableAttribute');
 const { services } = require('../services');
 
-function getAnchorService() {
-  return services.container.AnchorService;
-}
-
 function sha256(string) {
   return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(string));
 }
@@ -271,7 +267,8 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * @param {*} options
    */
   this.requestAnchor = async options => {
-    const anchor = await getAnchorService().anchor(this.identifier, this.proof.merkleRoot, options);
+    const anchorService = services.container.AnchorService;
+    const anchor = await anchorService.anchor(this.identifier, this.proof.merkleRoot, options);
     this.proof.anchor = anchor;
     return this;
   };
@@ -281,7 +278,8 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * already confirmed on the blockchain.
    */
   this.updateAnchor = async () => {
-    const anchor = await getAnchorService().update(this.proof.anchor);
+    const anchorService = services.container.AnchorService;
+    const anchor = await anchorService.update(this.proof.anchor);
     this.proof.anchor = anchor;
     return this;
   };
@@ -370,24 +368,24 @@ function VerifiableCredentialBaseConstructor(identifier, issuer, expiryIn, ucas,
    * This method checks if the signature matches for the root of the Merkle Tree
    * @return true or false for the validation
    */
-  this.verifySignature = async () => getAnchorService().verifySignature(this.proof);
+  this.verifySignature = async () => services.container.AnchorService.verifySignature(this.proof);
 
   /**
    * This method checks that the attestation / anchor exists on the BC
    */
-  this.verifyAttestation = async () => getAnchorService().verifyAttestation(this.proof);
+  this.verifyAttestation = async () => services.container.AnchorService.verifyAttestation(this.proof);
 
   /**
    * This method will revoke the attestation on the chain
    * @returns {Promise<Promise<*>|void>}
    */
-  this.revokeAttestation = async () => getAnchorService().revokeAttestation(this.proof);
+  this.revokeAttestation = async () => services.container.AnchorService.revokeAttestation(this.proof);
 
   /**
    * This method will check on the chain the balance of the transaction and if it's still unspent, than it's not revoked
    * @returns {Promise<Promise<*>|void>}
    */
-  this.isRevoked = async () => getAnchorService().isRevoked(this.proof);
+  this.isRevoked = async () => services.container.AnchorService.isRevoked(this.proof);
 
   this.isMatch = constraints => {
     const siftConstraints = transformConstraint(constraints);
diff --git a/dist/es/uca/UserCollectableAttribute.js b/dist/es/uca/UserCollectableAttribute.js
index 5365cb08..b47a83b7 100644
--- a/dist/es/uca/UserCollectableAttribute.js
+++ b/dist/es/uca/UserCollectableAttribute.js
@@ -163,7 +163,6 @@ const parseAttestableValue = value => {
 function UCABaseConstructor(identifier, value, version) {
   this.timestamp = null;
   this.id = null;
-  this.secureRandom = services.container.SecureRandom;
 
   if (!_.includes(validIdentifiers, identifier)) {
     throw new Error(`${identifier} is not defined`);
@@ -215,7 +214,8 @@ function UCABaseConstructor(identifier, value, version) {
     }
     this.value = value;
 
-    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)));
+    const secureRandom = services.container.SecureRandom;
+    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(secureRandom.wordWith(64)));
   } else if (_.isEmpty(definition.type.properties)) {
     throw new Error(`${JSON.stringify(value)} is not valid for ${identifier}`);
   } else {
diff --git a/src/uca/UserCollectableAttribute.js b/src/uca/UserCollectableAttribute.js
index 3a18d541..67ea1a4f 100644
--- a/src/uca/UserCollectableAttribute.js
+++ b/src/uca/UserCollectableAttribute.js
@@ -172,7 +172,6 @@ const parseAttestableValue = (value) => {
 function UCABaseConstructor(identifier, value, version) {
   this.timestamp = null;
   this.id = null;
-  this.secureRandom = services.container.SecureRandom;
 
   if (!_.includes(validIdentifiers, identifier)) {
     throw new Error(`${identifier} is not defined`);
@@ -226,7 +225,8 @@ function UCABaseConstructor(identifier, value, version) {
     }
     this.value = value;
 
-    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(this.secureRandom.wordWith(64)));
+    const secureRandom = services.container.SecureRandom;
+    this.salt = sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(secureRandom.wordWith(64)));
   } else if (_.isEmpty(definition.type.properties)) {
     throw new Error(`${JSON.stringify(value)} is not valid for ${identifier}`);
   } else {