@ocap/tx-protocols 1.13.42 → 1.13.44
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.
|
@@ -282,7 +282,7 @@ runner.use(
|
|
|
282
282
|
runner.use(async (context, next) => {
|
|
283
283
|
const { tx, itx, txs, statedb, rollupState, senderState, tokenState, signerStates, stakeStates, formattedItx } =
|
|
284
284
|
context;
|
|
285
|
-
const { withdrawFeeRate, proposerFeeShare } = rollupState;
|
|
285
|
+
const { depositFeeRate, withdrawFeeRate, proposerFeeShare } = rollupState;
|
|
286
286
|
|
|
287
287
|
const ZERO = new BN(0);
|
|
288
288
|
|
|
@@ -297,6 +297,8 @@ runner.use(async (context, next) => {
|
|
|
297
297
|
txs.forEach((x) => {
|
|
298
298
|
const amount = x.tx.itxJson.token.value;
|
|
299
299
|
if (x.type === 'deposit_token_v2') {
|
|
300
|
+
const { feeAmount } = splitTokenAmount(amount, depositFeeRate, proposerFeeShare, signerStates.length, false);
|
|
301
|
+
context.blockReward = context.blockReward.add(feeAmount);
|
|
300
302
|
context.mintedAmount = context.mintedAmount.add(new BN(amount));
|
|
301
303
|
|
|
302
304
|
// mint tokens for deposit proposer
|
|
@@ -112,6 +112,9 @@ runner.use(async (context, next) => {
|
|
|
112
112
|
),
|
|
113
113
|
]);
|
|
114
114
|
|
|
115
|
+
// FIXME: create-rollup 的时候不能校验 stake，还是在这里创建 stake？如果在这里创建 stake，是否需要多签？
|
|
116
|
+
// FIXME: seed validator 无法离开， account migration 也需要测试下
|
|
117
|
+
|
|
115
118
|
context.senderState = newSenderState;
|
|
116
119
|
context.rollupState = rollupState;
|
|
117
120
|
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.13.
|
|
6
|
+
"version": "1.13.44",
|
|
7
7
|
"description": "Predefined tx pipeline sets to execute certain type of transactions",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -19,16 +19,16 @@
|
|
|
19
19
|
"author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
|
|
20
20
|
"license": "MIT",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@arcblock/did": "1.13.
|
|
23
|
-
"@arcblock/did-util": "1.13.
|
|
24
|
-
"@ocap/asset": "1.13.
|
|
25
|
-
"@ocap/mcrypto": "1.13.
|
|
26
|
-
"@ocap/merkle-tree": "1.13.
|
|
27
|
-
"@ocap/message": "1.13.
|
|
28
|
-
"@ocap/state": "1.13.
|
|
29
|
-
"@ocap/tx-pipeline": "1.13.
|
|
30
|
-
"@ocap/util": "1.13.
|
|
31
|
-
"@ocap/wallet": "1.13.
|
|
22
|
+
"@arcblock/did": "1.13.44",
|
|
23
|
+
"@arcblock/did-util": "1.13.44",
|
|
24
|
+
"@ocap/asset": "1.13.44",
|
|
25
|
+
"@ocap/mcrypto": "1.13.44",
|
|
26
|
+
"@ocap/merkle-tree": "1.13.44",
|
|
27
|
+
"@ocap/message": "1.13.44",
|
|
28
|
+
"@ocap/state": "1.13.44",
|
|
29
|
+
"@ocap/tx-pipeline": "1.13.44",
|
|
30
|
+
"@ocap/util": "1.13.44",
|
|
31
|
+
"@ocap/wallet": "1.13.44",
|
|
32
32
|
"debug": "^4.3.2",
|
|
33
33
|
"empty-value": "^1.0.1",
|
|
34
34
|
"lodash": "^4.17.21",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"jest": "^26.6.3"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "72116480f29ddbf98543ffee58205aef29943366"
|
|
45
45
|
}
|