@lodestar/reqresp 1.48.0-dev.e25eb75f31 → 1.48.0-dev.e9c9b8835d
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimiterGRCA.d.ts","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,gBAAgB;IAC/B,oDAAoD;IACpD,WAAW,EAAE,WAAW,CAAC;IACzB,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,eAAe,CAAC,GAAG;IAM5B,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,uCAAuC;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,gGAAgG;IAChG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C;IACE,kFAAkF;IACjE,WAAW,EAAE,WAAW;IACzC,uCAAuC;IACtB,UAAU,EAAE,WAAW,EACtC;IAEJ,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,CAUnE;IAED,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"rateLimiterGRCA.d.ts","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,gBAAgB;IAC/B,oDAAoD;IACpD,WAAW,EAAE,WAAW,CAAC;IACzB,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,eAAe,CAAC,GAAG;IAM5B,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,uCAAuC;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,gGAAgG;IAChG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C;IACE,kFAAkF;IACjE,WAAW,EAAE,WAAW;IACzC,uCAAuC;IACtB,UAAU,EAAE,WAAW,EACtC;IAEJ,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,CAUnE;IAED,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CA8BxC;IAED,kEAAkE;IAClE,WAAW,CAAC,SAAS,EAAE,WAAW,GAAG,IAAI,CAOxC;IAED,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAEzB;CACF"}
|
|
@@ -36,12 +36,11 @@ export class RateLimiterGRCA {
|
|
|
36
36
|
return new RateLimiterGRCA(msPerBucket, msPerToken);
|
|
37
37
|
}
|
|
38
38
|
allows(key, tokens) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
39
|
+
// Defense in depth: a non-positive count must still be charged, not skipped.
|
|
40
|
+
const chargedTokens = Math.max(1, tokens);
|
|
42
41
|
const msSinceStart = Date.now() - this.startTimeMs;
|
|
43
42
|
/** how long does it take to replenish these tokens */
|
|
44
|
-
const additionalTime = this.msPerToken *
|
|
43
|
+
const additionalTime = this.msPerToken * chargedTokens;
|
|
45
44
|
if (additionalTime > this.msPerBucket) {
|
|
46
45
|
// the time required to process this amount of tokens is longer than the time that makes the bucket full.
|
|
47
46
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimiterGRCA.js","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,eAAe;IAOP,WAAW;IAEX,UAAU;IAR7B,gGAAgG;IAC/E,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE1C;IACE,kFAAkF;IACjE,WAAwB;IACzC,uCAAuC;IACtB,UAAuB;2BAFvB,WAAW;0BAEX,UAAU;IAC1B,CAAC;IAEJ,MAAM,CAAC,SAAS,CAAM,KAAuB;QAC3C,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7C,OAAO,IAAI,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,MAAc;QAC7B,
|
|
1
|
+
{"version":3,"file":"rateLimiterGRCA.js","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,eAAe;IAOP,WAAW;IAEX,UAAU;IAR7B,gGAAgG;IAC/E,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE1C;IACE,kFAAkF;IACjE,WAAwB;IACzC,uCAAuC;IACtB,UAAuB;2BAFvB,WAAW;0BAEX,UAAU;IAC1B,CAAC;IAEJ,MAAM,CAAC,SAAS,CAAM,KAAuB;QAC3C,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7C,OAAO,IAAI,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,MAAc;QAC7B,6EAA6E;QAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAEnD,sDAAsD;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;QAEvD,IAAI,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACtC,yGAAyG;YACzG,OAAO,KAAK,CAAC;QACf,CAAC;QAED,gGAAgG;QAChG,IAAI,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,eAAe,GAAG,YAAY,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC3C,CAAC;QAED,2CAA2C;QAC3C,MAAM,YAAY,GAAG,eAAe,GAAG,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC;QACzE,IAAI,YAAY,GAAG,YAAY,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kEAAkE;IAClE,WAAW,CAAC,SAAsB;QAChC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7C,mCAAmC;YACnC,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAQ;QACjB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.48.0-dev.
|
|
14
|
+
"version": "1.48.0-dev.e9c9b8835d",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -47,20 +47,20 @@
|
|
|
47
47
|
"@chainsafe/fast-crc32c": "^4.2.0",
|
|
48
48
|
"@libp2p/interface": "^3.3.0",
|
|
49
49
|
"@libp2p/utils": "^7.4.0",
|
|
50
|
-
"@lodestar/config": "^1.48.0-dev.
|
|
51
|
-
"@lodestar/params": "^1.48.0-dev.
|
|
52
|
-
"@lodestar/utils": "^1.48.0-dev.
|
|
50
|
+
"@lodestar/config": "^1.48.0-dev.e9c9b8835d",
|
|
51
|
+
"@lodestar/params": "^1.48.0-dev.e9c9b8835d",
|
|
52
|
+
"@lodestar/utils": "^1.48.0-dev.e9c9b8835d",
|
|
53
53
|
"snappy": "^7.2.2",
|
|
54
54
|
"snappyjs": "^0.7.0",
|
|
55
55
|
"uint8-varint": "^2.0.2",
|
|
56
56
|
"uint8arraylist": "^3.0.2"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@chainsafe/ssz": "^1.
|
|
59
|
+
"@chainsafe/ssz": "^1.7.0",
|
|
60
60
|
"@libp2p/crypto": "^5.1.23",
|
|
61
61
|
"@libp2p/peer-id": "^6.0.15",
|
|
62
|
-
"@lodestar/logger": "^1.48.0-dev.
|
|
63
|
-
"@lodestar/types": "^1.48.0-dev.
|
|
62
|
+
"@lodestar/logger": "^1.48.0-dev.e9c9b8835d",
|
|
63
|
+
"@lodestar/types": "^1.48.0-dev.e9c9b8835d",
|
|
64
64
|
"libp2p": "3.3.9"
|
|
65
65
|
},
|
|
66
66
|
"peerDependencies": {
|
|
@@ -74,5 +74,5 @@
|
|
|
74
74
|
"reqresp",
|
|
75
75
|
"blockchain"
|
|
76
76
|
],
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "37d9901d2effe005e9b5de4e25d019c216c23fff"
|
|
78
78
|
}
|
|
@@ -44,14 +44,13 @@ export class RateLimiterGRCA<Key> {
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
allows(key: Key, tokens: number): boolean {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
}
|
|
47
|
+
// Defense in depth: a non-positive count must still be charged, not skipped.
|
|
48
|
+
const chargedTokens = Math.max(1, tokens);
|
|
50
49
|
|
|
51
50
|
const msSinceStart = Date.now() - this.startTimeMs;
|
|
52
51
|
|
|
53
52
|
/** how long does it take to replenish these tokens */
|
|
54
|
-
const additionalTime = this.msPerToken *
|
|
53
|
+
const additionalTime = this.msPerToken * chargedTokens;
|
|
55
54
|
|
|
56
55
|
if (additionalTime > this.msPerBucket) {
|
|
57
56
|
// the time required to process this amount of tokens is longer than the time that makes the bucket full.
|