@ocap/tx-protocols 1.18.16 → 1.18.18
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/lib/pipes/ensure-cost.js +13 -4
- package/package.json +14 -14
package/lib/pipes/ensure-cost.js
CHANGED
|
@@ -38,14 +38,23 @@ module.exports = function CreateEnsureTxCostPipe({ attachSenderChanges = true }
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
// verify gas staking headers
|
|
41
|
-
const { tx, extra = {} } = context;
|
|
41
|
+
const { tx, extra = {}, txHash } = context;
|
|
42
42
|
const { token, pk } = extra.gasStakeHeaders || {};
|
|
43
43
|
const gasStake = {};
|
|
44
44
|
if (token && pk && JWT.verify(token, pk, { enforceTimestamp: true, tolerance: 5 })) {
|
|
45
45
|
const decoded = JWT.decode(token);
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
46
|
+
const txHashes = (decoded.txHash || '')
|
|
47
|
+
.split(',')
|
|
48
|
+
.map((x) => x.trim())
|
|
49
|
+
.filter(Boolean);
|
|
50
|
+
if (txHashes.includes(txHash)) {
|
|
51
|
+
gasStake.owner = toAddress(decoded.iss);
|
|
52
|
+
gasStake.stakeId = toStakeAddress(gasStake.owner, gasStake.owner);
|
|
53
|
+
} else {
|
|
54
|
+
console.warn(`Invalid gas payer header for: ${txHash}`);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
if (!gasStake.owner) {
|
|
49
58
|
gasStake.owner = tx.from;
|
|
50
59
|
gasStake.stakeId = toStakeAddress(gasStake.owner, gasStake.owner);
|
|
51
60
|
}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.18.
|
|
6
|
+
"version": "1.18.18",
|
|
7
7
|
"description": "Predefined tx pipeline sets to execute certain type of transactions",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -21,18 +21,18 @@
|
|
|
21
21
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
22
22
|
"license": "MIT",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@arcblock/did": "1.18.
|
|
25
|
-
"@arcblock/did-util": "1.18.
|
|
26
|
-
"@arcblock/jwt": "1.18.
|
|
27
|
-
"@arcblock/validator": "1.18.
|
|
28
|
-
"@ocap/asset": "1.18.
|
|
29
|
-
"@ocap/mcrypto": "1.18.
|
|
30
|
-
"@ocap/merkle-tree": "1.18.
|
|
31
|
-
"@ocap/message": "1.18.
|
|
32
|
-
"@ocap/state": "1.18.
|
|
33
|
-
"@ocap/tx-pipeline": "1.18.
|
|
34
|
-
"@ocap/util": "1.18.
|
|
35
|
-
"@ocap/wallet": "1.18.
|
|
24
|
+
"@arcblock/did": "1.18.18",
|
|
25
|
+
"@arcblock/did-util": "1.18.18",
|
|
26
|
+
"@arcblock/jwt": "1.18.18",
|
|
27
|
+
"@arcblock/validator": "1.18.18",
|
|
28
|
+
"@ocap/asset": "1.18.18",
|
|
29
|
+
"@ocap/mcrypto": "1.18.18",
|
|
30
|
+
"@ocap/merkle-tree": "1.18.18",
|
|
31
|
+
"@ocap/message": "1.18.18",
|
|
32
|
+
"@ocap/state": "1.18.18",
|
|
33
|
+
"@ocap/tx-pipeline": "1.18.18",
|
|
34
|
+
"@ocap/util": "1.18.18",
|
|
35
|
+
"@ocap/wallet": "1.18.18",
|
|
36
36
|
"debug": "^4.3.4",
|
|
37
37
|
"deep-diff": "^1.0.2",
|
|
38
38
|
"empty-value": "^1.0.1",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"jest": "^27.5.1",
|
|
48
48
|
"start-server-and-test": "^1.14.0"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "c8575d3072c92339706ecb31613ed2ec75553745"
|
|
51
51
|
}
|