Skip to content

Commit 473302d

Browse files
minsulee2minsulee2
authored
Merge pull request #928 from ainblockchain/release/v1.0.4
Release/v1.0.4
2 parents e367d19 + 4e10104 commit 473302d

File tree

10 files changed

+61
-22
lines changed

10 files changed

+61
-22
lines changed

‎blockchain-configs/base/timer_flags.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
"has_bandage": true
2121
},
2222
"update_max_state_tree_size_per_byte2": {
23-
"enabled_block": 3,
23+
"enabled_block": 2,
24+
"has_bandage": true
25+
},
26+
"update_bandwidth_budget_params": {
27+
"enabled_block": 2,
2428
"has_bandage": true
2529
}
2630
}

‎blockchain-configs/mainnet-prod/timer_flags.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@
2222
"update_max_state_tree_size_per_byte2": {
2323
"enabled_block": 58300,
2424
"has_bandage": true
25+
},
26+
"update_bandwidth_budget_params": {
27+
"enabled_block": 130800,
28+
"has_bandage": true
2529
}
2630
}

‎blockchain-configs/testnet-prod/timer_flags.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@
2626
"update_max_state_tree_size_per_byte2": {
2727
"enabled_block": 56300,
2828
"has_bandage": true
29+
},
30+
"update_bandwidth_budget_params": {
31+
"enabled_block": 124440,
32+
"has_bandage": true
2933
}
3034
}

‎client/protocol_versions.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,8 @@
8686
},
8787
"1.0.3": {
8888
"min": "1.0.0"
89+
},
90+
"1.0.4": {
91+
"min": "1.0.0"
8992
}
9093
}

‎db/bandage-files/update_bandwidth_budget_params.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module.exports = {
2+
data: [
3+
{
4+
path: ['values', 'blockchain_params', 'resource', 'bandwidth_budget_per_block'],
5+
value: 1000000,
6+
prevValue: 10000
7+
},
8+
{
9+
path: ['values', 'blockchain_params', 'resource', 'service_bandwidth_budget_ratio'],
10+
value: 0.05,
11+
prevValue: 0.5
12+
},
13+
{
14+
path: ['values', 'blockchain_params', 'resource', 'apps_bandwidth_budget_ratio'],
15+
value: 0.9495,
16+
prevValue: 0.495
17+
},
18+
{
19+
path: ['values', 'blockchain_params', 'resource', 'free_bandwidth_budget_ratio'],
20+
value: 0.0005,
21+
prevValue: 0.005
22+
}
23+
]
24+
};

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ain-blockchain",
33
"description": "AI Network Blockchain",
4-
"version": "1.0.3",
4+
"version": "1.0.4",
55
"private": true,
66
"license": "MIT",
77
"author": "dev@ainetwork.ai",
@@ -111,7 +111,7 @@
111111
"nock": "^12.0.0",
112112
"node-jq": "^2.0.0",
113113
"semistandard": "^12.0.1",
114-
"shelljs": "^0.8.3",
114+
"shelljs": "^0.8.5",
115115
"sync-request": "^6.1.0"
116116
}
117117
}

‎tools/simple-chatbot-server/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/simple-load-test/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ find-replace@^3.0.0:
8585
array-back "^3.0.1"
8686

8787
follow-redirects@^1.14.0:
88-
version "1.14.4"
89-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
90-
integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
88+
version "1.14.7"
89+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
90+
integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
9191

9292
has-flag@^3.0.0:
9393
version "3.0.0"

‎tx-pool/index.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,15 @@ class TransactionPool {
181181
return appStakesTotal > 0 ? appsBandwidthBudgetPerBlock * appStake / appStakesTotal : 0;
182182
}
183183

184-
getBandwidthBudgets(blockNumber, stateVersion) {
184+
getBandwidthBudgets(stateVersion) {
185185
const bandwidthBudgetPerBlock = this.node.getBlockchainParam(
186-
'resource/bandwidth_budget_per_block', blockNumber, stateVersion);
186+
'resource/bandwidth_budget_per_block', null, stateVersion);
187187
const serviceBandwidthBudgetRatio = this.node.getBlockchainParam(
188-
'resource/service_bandwidth_budget_ratio', blockNumber, stateVersion);
188+
'resource/service_bandwidth_budget_ratio', null, stateVersion);
189189
const appsBandwidthBudgetRatio = this.node.getBlockchainParam(
190-
'resource/apps_bandwidth_budget_ratio', blockNumber, stateVersion);
190+
'resource/apps_bandwidth_budget_ratio', null, stateVersion);
191191
const freeBandwidthBudgetRatio = this.node.getBlockchainParam(
192-
'resource/free_bandwidth_budget_ratio', blockNumber, stateVersion);
192+
'resource/free_bandwidth_budget_ratio', null, stateVersion);
193193
const serviceBandwidthBudgetPerBlock = bandwidthBudgetPerBlock * serviceBandwidthBudgetRatio;
194194
const appsBandwidthBudgetPerBlock = bandwidthBudgetPerBlock * appsBandwidthBudgetRatio;
195195
const freeBandwidthBudgetPerBlock = bandwidthBudgetPerBlock * freeBandwidthBudgetRatio;
@@ -218,7 +218,7 @@ class TransactionPool {
218218
serviceBandwidthBudgetPerBlock,
219219
appsBandwidthBudgetPerBlock,
220220
freeBandwidthBudgetPerBlock,
221-
} = this.getBandwidthBudgets(db.blockNumberSnapshot, db.stateVersion);
221+
} = this.getBandwidthBudgets(db.stateVersion);
222222
for (const tx of txList) {
223223
const nonce = tx.tx_body.nonce;
224224
if (addrToDiscardedNoncedTx[tx.address] && nonce >= 0) {

‎yarn.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2859,9 +2859,9 @@ fn.name@1.x.x:
28592859
integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
28602860

28612861
follow-redirects@^1.14.0:
2862-
version "1.14.4"
2863-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
2864-
integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
2862+
version "1.14.7"
2863+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
2864+
integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
28652865

28662866
foreach@^2.0.5:
28672867
version "2.0.5"
@@ -5633,10 +5633,10 @@ shebang-regex@^1.0.0:
56335633
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
56345634
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
56355635

5636-
shelljs@^0.8.3:
5637-
version "0.8.4"
5638-
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
5639-
integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
5636+
shelljs@^0.8.5:
5637+
version "0.8.5"
5638+
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
5639+
integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
56405640
dependencies:
56415641
glob "^7.0.0"
56425642
interpret "^1.0.0"

0 commit comments

Comments
 (0)