@libp2p/peer-record 0.0.0 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/envelope/index.d.ts +1 -1
- package/dist/src/envelope/index.d.ts.map +1 -1
- package/dist/src/envelope/index.js +4 -4
- package/dist/src/envelope/index.js.map +1 -1
- package/dist/src/peer-record/index.d.ts +1 -1
- package/dist/src/peer-record/index.d.ts.map +1 -1
- package/dist/src/peer-record/index.js +3 -3
- package/dist/src/peer-record/index.js.map +1 -1
- package/package.json +24 -16
- package/src/envelope/index.ts +6 -5
- package/src/peer-record/consts.js +0 -1
- package/src/peer-record/index.ts +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/envelope/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/envelope/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AAEjE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,UAAU,CAAA;IACvB,OAAO,EAAE,UAAU,CAAA;IACnB,SAAS,EAAE,UAAU,CAAA;CACtB;AAED,qBAAa,cAAe,YAAW,QAAQ;IAC7C;;OAEG;IACH,MAAM,CAAC,kBAAkB,SAAgB,UAAU,6BAUlD;IAED;;;OAGG;IACH,MAAM,CAAC,IAAI,WAAkB,MAAM,UAAU,MAAM,6BAoBlD;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc,SAAgB,UAAU,UAAU,MAAM,6BAS9D;IAEM,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,UAAU,CAAA;IACvB,OAAO,EAAE,UAAU,CAAA;IACnB,SAAS,EAAE,UAAU,CAAA;IACrB,SAAS,CAAC,EAAE,UAAU,CAAA;IAE7B;;;OAGG;gBACU,OAAO,EAAE,eAAe;IASrC;;OAEG;IACH,OAAO;IAaP;;OAEG;IACH,MAAM,CAAE,KAAK,EAAE,QAAQ;IAIvB;;OAEG;IACG,QAAQ,CAAE,MAAM,EAAE,MAAM;CAW/B"}
|
|
@@ -7,7 +7,7 @@ import varint from 'varint';
|
|
|
7
7
|
import { equals as uint8arraysEquals } from 'uint8arrays/equals';
|
|
8
8
|
import { codes } from '../errors.js';
|
|
9
9
|
import { Envelope as Protobuf } from './envelope.js';
|
|
10
|
-
import {
|
|
10
|
+
import { peerIdFromKeys } from '@libp2p/peer-id';
|
|
11
11
|
export class RecordEnvelope {
|
|
12
12
|
/**
|
|
13
13
|
* The Envelope is responsible for keeping an arbitrary signed record
|
|
@@ -43,13 +43,13 @@ export class RecordEnvelope {
|
|
|
43
43
|
/**
|
|
44
44
|
* Validate envelope data signature for the given domain
|
|
45
45
|
*/
|
|
46
|
-
validate(domain) {
|
|
46
|
+
async validate(domain) {
|
|
47
47
|
const signData = formatSignaturePayload(domain, this.payloadType, this.payload);
|
|
48
48
|
if (this.peerId.publicKey == null) {
|
|
49
49
|
throw new Error('Missing public key');
|
|
50
50
|
}
|
|
51
51
|
const key = unmarshalPublicKey(this.peerId.publicKey);
|
|
52
|
-
return key.verify(signData, this.signature);
|
|
52
|
+
return await key.verify(signData, this.signature);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
_a = RecordEnvelope;
|
|
@@ -58,7 +58,7 @@ _a = RecordEnvelope;
|
|
|
58
58
|
*/
|
|
59
59
|
RecordEnvelope.createFromProtobuf = async (data) => {
|
|
60
60
|
const envelopeData = Protobuf.decode(data);
|
|
61
|
-
const peerId = await
|
|
61
|
+
const peerId = await peerIdFromKeys(envelopeData.publicKey);
|
|
62
62
|
return new RecordEnvelope({
|
|
63
63
|
peerId,
|
|
64
64
|
payloadType: envelopeData.payloadType,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/envelope/index.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,MAAM,IAAI,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,EAAE,UAAU,IAAI,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/envelope/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/peer-record/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/peer-record/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AASxD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,EAAE,CAAA;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED;;;GAGG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,QAAS,UAAU,gBAO3C;IAED,MAAM,CAAC,MAAM,SAA8B;IAC3C,MAAM,CAAC,KAAK,aAAoC;IAEzC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,SAAS,EAAE,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,SAAoB;IAC1B,KAAK,aAAmB;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAY;gBAEjB,OAAO,EAAE,iBAAiB;IAQvC;;OAEG;IACH,OAAO;IAcP;;OAEG;IACH,MAAM,CAAE,KAAK,EAAE,OAAO;CAsBvB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Multiaddr } from '@multiformats/multiaddr';
|
|
2
|
-
import { PeerId } from '@libp2p/peer-id';
|
|
3
2
|
import { arrayEquals } from '@libp2p/utils/array-equals';
|
|
3
|
+
import { peerIdFromBytes } from '@libp2p/peer-id';
|
|
4
4
|
import { PeerRecord as Protobuf } from './peer-record.js';
|
|
5
5
|
import { ENVELOPE_DOMAIN_PEER_RECORD, ENVELOPE_PAYLOAD_TYPE_PEER_RECORD } from './consts.js';
|
|
6
6
|
/**
|
|
@@ -61,8 +61,8 @@ export class PeerRecord {
|
|
|
61
61
|
*/
|
|
62
62
|
PeerRecord.createFromProtobuf = (buf) => {
|
|
63
63
|
const peerRecord = Protobuf.decode(buf);
|
|
64
|
-
const peerId =
|
|
65
|
-
const multiaddrs = (peerRecord.addresses
|
|
64
|
+
const peerId = peerIdFromBytes(peerRecord.peerId);
|
|
65
|
+
const multiaddrs = (peerRecord.addresses ?? []).map((a) => new Multiaddr(a.multiaddr));
|
|
66
66
|
const seqNumber = Number(peerRecord.seq);
|
|
67
67
|
return new PeerRecord({ peerId, multiaddrs, seqNumber });
|
|
68
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/peer-record/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/peer-record/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,UAAU,IAAI,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EAClC,MAAM,aAAa,CAAA;AAgBpB;;;GAGG;AACH,MAAM,OAAO,UAAU;IA0BrB,YAAa,OAA0B;QAJhC,WAAM,GAAG,UAAU,CAAC,MAAM,CAAA;QAC1B,UAAK,GAAG,UAAU,CAAC,KAAK,CAAA;QAI7B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;QAEjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,EAAE,CAAA;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;IAC1C,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;YAC1B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBAC7B,GAAG,EAAE,IAAI,CAAC,SAAS;gBACnB,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACrC,SAAS,EAAE,CAAC,CAAC,KAAK;iBACnB,CAAC,CAAC;aACJ,CAAC,CAAC,MAAM,EAAE,CAAA;SACZ;QAED,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAE,KAAc;QACpB,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,EAAE;YAClC,OAAO,KAAK,CAAA;SACb;QAED,kBAAkB;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YACrC,OAAO,KAAK,CAAA;SACb;QAED,qBAAqB;QACrB,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE;YACtC,OAAO,KAAK,CAAA;SACb;QAED,sBAAsB;QACtB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE;YACnD,OAAO,KAAK,CAAA;SACb;QAED,OAAO,IAAI,CAAA;IACb,CAAC;;AA1ED;;;;;GAKG;AACI,6BAAkB,GAAG,CAAC,GAAe,EAAE,EAAE;IAC9C,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IACtF,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAExC,OAAO,IAAI,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAA;AAEM,iBAAM,GAAG,2BAA2B,CAAA;AACpC,gBAAK,GAAG,iCAAiC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/peer-record",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1.0.3",
|
|
4
4
|
"description": "Used to transfer signed peer data across the network",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-peer-record#readme",
|
|
@@ -35,7 +35,13 @@
|
|
|
35
35
|
"extends": "ipfs",
|
|
36
36
|
"parserOptions": {
|
|
37
37
|
"sourceType": "module"
|
|
38
|
-
}
|
|
38
|
+
},
|
|
39
|
+
"ignorePatterns": [
|
|
40
|
+
"src/envelope/*.d.ts",
|
|
41
|
+
"src/envelope/envelope.js",
|
|
42
|
+
"src/peer-record/*.d.ts",
|
|
43
|
+
"src/peer-record/peer-record.js"
|
|
44
|
+
]
|
|
39
45
|
},
|
|
40
46
|
"release": {
|
|
41
47
|
"branches": [
|
|
@@ -120,9 +126,8 @@
|
|
|
120
126
|
},
|
|
121
127
|
"scripts": {
|
|
122
128
|
"lint": "aegir lint",
|
|
123
|
-
"dep-check": "aegir dep-check dist/src/**/*.js test
|
|
124
|
-
"build": "tsc",
|
|
125
|
-
"postbuild": "npm run build:copy-proto-files",
|
|
129
|
+
"dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
|
|
130
|
+
"build": "tsc && npm run build:copy-proto-files",
|
|
126
131
|
"generate": "npm run generate:envelope && npm run generate:envelope-types && npm run generate:peer-record && npm run generate:peer-record-types",
|
|
127
132
|
"generate:envelope": "pbjs -t static-module -w es6 -r libp2p-peer-record-envelope --force-number --no-verify --no-delimited --no-create --no-beautify --no-defaults --lint eslint-disable -o src/envelope/envelope.js ./src/envelope/envelope.proto",
|
|
128
133
|
"generate:envelope-types": "pbts -o src/envelope/envelope.d.ts src/envelope/envelope.js",
|
|
@@ -130,7 +135,7 @@
|
|
|
130
135
|
"generate:peer-record-types": "pbts -o src/peer-record/peer-record.d.ts src/peer-record/peer-record.js",
|
|
131
136
|
"build:copy-proto-files": "cp src/envelope/envelope.js dist/src/envelope && cp src/envelope/*.d.ts dist/src/envelope && cp src/peer-record/peer-record.js dist/src/peer-record && cp src/peer-record/*.d.ts dist/src/peer-record",
|
|
132
137
|
"pretest": "npm run build",
|
|
133
|
-
"test": "aegir test -f ./dist/test",
|
|
138
|
+
"test": "aegir test -f ./dist/test/*.js -f ./dist/test/**/*.js",
|
|
134
139
|
"test:chrome": "npm run test -- -t browser",
|
|
135
140
|
"test:chrome-webworker": "npm run test -- -t webworker",
|
|
136
141
|
"test:firefox": "npm run test -- -t browser -- --browser firefox",
|
|
@@ -139,26 +144,29 @@
|
|
|
139
144
|
"test:electron-main": "npm run test -- -t electron-main"
|
|
140
145
|
},
|
|
141
146
|
"dependencies": {
|
|
147
|
+
"@libp2p/crypto": "^0.22.7",
|
|
142
148
|
"@libp2p/interfaces": "^1.2.0",
|
|
143
|
-
"protobufjs": "^6.10.2",
|
|
144
149
|
"@libp2p/logger": "^1.0.1",
|
|
145
|
-
"
|
|
150
|
+
"@libp2p/peer-id": "^1.0.4",
|
|
151
|
+
"@libp2p/utils": "^1.0.5",
|
|
146
152
|
"@multiformats/multiaddr": "^10.1.5",
|
|
153
|
+
"err-code": "^3.0.1",
|
|
154
|
+
"interface-datastore": "^6.1.0",
|
|
147
155
|
"it-all": "^1.0.6",
|
|
148
156
|
"it-filter": "^1.0.3",
|
|
149
|
-
"it-pipe": "^2.0.3",
|
|
150
|
-
"it-map": "^1.0.6",
|
|
151
157
|
"it-foreach": "^0.1.1",
|
|
158
|
+
"it-map": "^1.0.6",
|
|
159
|
+
"it-pipe": "^2.0.3",
|
|
152
160
|
"multiformats": "^9.6.3",
|
|
153
|
-
"
|
|
154
|
-
"
|
|
155
|
-
"
|
|
161
|
+
"protobufjs": "^6.10.2",
|
|
162
|
+
"uint8arrays": "^3.0.0",
|
|
163
|
+
"varint": "^6.0.0"
|
|
156
164
|
},
|
|
157
165
|
"devDependencies": {
|
|
166
|
+
"@libp2p/interface-compliance-tests": "^1.0.8",
|
|
167
|
+
"@libp2p/peer-id-factory": "^1.0.3",
|
|
158
168
|
"@types/varint": "^6.0.0",
|
|
159
169
|
"aegir": "^36.1.3",
|
|
160
|
-
"sinon": "^13.0.1"
|
|
161
|
-
"@libp2p/peer-id-factory": "^1.0.3",
|
|
162
|
-
"@libp2p/interface-compliance-tests": "^1.0.8"
|
|
170
|
+
"sinon": "^13.0.1"
|
|
163
171
|
}
|
|
164
172
|
}
|
package/src/envelope/index.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import errCode from 'err-code'
|
|
2
2
|
import { concat as uint8arraysConcat } from 'uint8arrays/concat'
|
|
3
|
-
import { fromString as uint8arraysFromString }from 'uint8arrays/from-string'
|
|
3
|
+
import { fromString as uint8arraysFromString } from 'uint8arrays/from-string'
|
|
4
4
|
import { unmarshalPrivateKey, unmarshalPublicKey } from '@libp2p/crypto/keys'
|
|
5
5
|
import varint from 'varint'
|
|
6
6
|
import { equals as uint8arraysEquals } from 'uint8arrays/equals'
|
|
7
7
|
import { codes } from '../errors.js'
|
|
8
8
|
import { Envelope as Protobuf } from './envelope.js'
|
|
9
|
-
import {
|
|
9
|
+
import { peerIdFromKeys } from '@libp2p/peer-id'
|
|
10
|
+
import type { PeerId } from '@libp2p/interfaces/peer-id'
|
|
10
11
|
import type { Record, Envelope } from '@libp2p/interfaces/record'
|
|
11
12
|
|
|
12
13
|
export interface EnvelopeOptions {
|
|
@@ -22,7 +23,7 @@ export class RecordEnvelope implements Envelope {
|
|
|
22
23
|
*/
|
|
23
24
|
static createFromProtobuf = async (data: Uint8Array) => {
|
|
24
25
|
const envelopeData = Protobuf.decode(data)
|
|
25
|
-
const peerId = await
|
|
26
|
+
const peerId = await peerIdFromKeys(envelopeData.publicKey)
|
|
26
27
|
|
|
27
28
|
return new RecordEnvelope({
|
|
28
29
|
peerId,
|
|
@@ -118,7 +119,7 @@ export class RecordEnvelope implements Envelope {
|
|
|
118
119
|
/**
|
|
119
120
|
* Validate envelope data signature for the given domain
|
|
120
121
|
*/
|
|
121
|
-
validate (domain: string) {
|
|
122
|
+
async validate (domain: string) {
|
|
122
123
|
const signData = formatSignaturePayload(domain, this.payloadType, this.payload)
|
|
123
124
|
|
|
124
125
|
if (this.peerId.publicKey == null) {
|
|
@@ -127,7 +128,7 @@ export class RecordEnvelope implements Envelope {
|
|
|
127
128
|
|
|
128
129
|
const key = unmarshalPublicKey(this.peerId.publicKey)
|
|
129
130
|
|
|
130
|
-
return key.verify(signData, this.signature)
|
|
131
|
+
return await key.verify(signData, this.signature)
|
|
131
132
|
}
|
|
132
133
|
}
|
|
133
134
|
|
package/src/peer-record/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Multiaddr } from '@multiformats/multiaddr'
|
|
2
|
-
import { PeerId } from '@libp2p/peer-id'
|
|
2
|
+
import type { PeerId } from '@libp2p/interfaces/peer-id'
|
|
3
3
|
import { arrayEquals } from '@libp2p/utils/array-equals'
|
|
4
|
+
import { peerIdFromBytes } from '@libp2p/peer-id'
|
|
4
5
|
import { PeerRecord as Protobuf } from './peer-record.js'
|
|
5
6
|
import {
|
|
6
7
|
ENVELOPE_DOMAIN_PEER_RECORD,
|
|
@@ -34,8 +35,8 @@ export class PeerRecord {
|
|
|
34
35
|
*/
|
|
35
36
|
static createFromProtobuf = (buf: Uint8Array) => {
|
|
36
37
|
const peerRecord = Protobuf.decode(buf)
|
|
37
|
-
const peerId =
|
|
38
|
-
const multiaddrs = (peerRecord.addresses
|
|
38
|
+
const peerId = peerIdFromBytes(peerRecord.peerId)
|
|
39
|
+
const multiaddrs = (peerRecord.addresses ?? []).map((a) => new Multiaddr(a.multiaddr))
|
|
39
40
|
const seqNumber = Number(peerRecord.seq)
|
|
40
41
|
|
|
41
42
|
return new PeerRecord({ peerId, multiaddrs, seqNumber })
|