Skip to content

Commit c87bd4f

Browse files
authored
Merge pull request #40 from reef-defi/mario/bump-reef-libs
Bump reef libs
2 parents 41d6818 + ca7dac8 commit c87bd4f

File tree

11 files changed

+865
-12767
lines changed

11 files changed

+865
-12767
lines changed

api/package.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
"test": "echo \"Error: no test specified\" && exit 1"
1212
},
1313
"dependencies": {
14-
"@polkadot/api": "^4.9.2",
15-
"@reef-defi/evm-provider": "^0.1.10",
16-
"@types/express": "^4.17.13",
17-
"@types/express-fileupload": "^1.1.7",
18-
"@types/morgan": "^1.9.3",
14+
"@polkadot/api": "^6.3.1",
15+
"@reef-defi/evm-provider": "^1.0.2",
1916
"axios": "^0.21.1",
2017
"body-parser": "^1.19.0",
2118
"cors": "^2.8.5",
@@ -30,15 +27,14 @@
3027
"typescript": "^4.4.3"
3128
},
3229
"devDependencies": {
30+
"@types/express": "^4.17.13",
31+
"@types/express-fileupload": "^1.1.7",
32+
"@types/morgan": "^1.9.3",
3333
"@types/pg": "^8.6.1"
3434
},
3535
"resolutions": {
36-
"@reef-defi/type-definitions": "0.1.9-0",
37-
"@ethersproject/abstract-signer": "5.0.9",
38-
"@ethersproject/abstract-provider": "5.0.9",
39-
"@ethersproject/bignumber": "5.0.9",
40-
"@ethersproject/bytes": "5.0.9",
41-
"@ethersproject/logger": "5.0.9",
42-
"@ethersproject/properties": "5.0.9"
36+
"@polkadot/api": "^6.3.1",
37+
"@polkadot/types": "^6.3.1",
38+
"@polkadot/types-known": "^6.3.1"
4339
}
4440
}

backend/backend.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ module.exports = {
3939
parseInt(process.env.RANKING_POLLING_TIME_MS, 10)
4040
|| 5 * 60 * 1000,
4141
historySize: 84,
42-
erasPerDay: 4,
43-
tokenDecimals: 12,
42+
erasPerDay: 1,
43+
tokenDecimals: 18,
4444
},
4545
{
4646
name: 'activeAccounts',
@@ -59,7 +59,7 @@ module.exports = {
5959
startDelay: parseInt(process.env.TOKEN_HOLDERS_START_DELAY_MS, 10) || 2 * 60 * 1000,
6060
pollingTime:
6161
parseInt(process.env.TOKEN_HOLDERS_POLLING_TIME_MS, 10)
62-
|| 1 * 60 * 1000, // 1 min
62+
|| 10 * 60 * 1000, // 10 min
6363
},
6464
],
6565
};

backend/docker/docker-compose-reef-mainnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- '9944:9944'
1717
expose:
1818
- '9944'
19-
command: -d /data --ws-max-connections 1000 --chain /data/chain_spec_mainnet.json --pruning=archive --rpc-cors "*" --ws-port 9944 --port 30333 --unsafe-ws-external --no-prometheus --name 'Reef explorer' --telemetry-url 'wss://telemetry.polkadot.io/submit/ 0'
19+
command: -d /data --ws-max-connections 1000 --chain mainnet --pruning=archive --rpc-cors "*" --ws-port 9944 --port 30333 --unsafe-ws-external --no-prometheus --name 'Reef explorer' --telemetry-url 'wss://telemetry.polkadot.io/submit/ 0'
2020
restart: always
2121
#
2222
# SQL data base

backend/docker/docker-compose-reef-testnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- '9944:9944'
1717
expose:
1818
- '9944'
19-
command: -d /data --ws-max-connections 1000 --chain /data/chain_spec_testnet.json --pruning=archive --rpc-cors "*" --ws-port 9944 --port 30333 --unsafe-ws-external --no-prometheus --name 'Reef explorer' --telemetry-url 'wss://telemetry.polkadot.io/submit/ 0'
19+
command: -d /data --ws-max-connections 1000 --chain testnet --pruning=archive --rpc-cors "*" --ws-port 9944 --port 30333 --unsafe-ws-external --no-prometheus --name 'Reef explorer' --telemetry-url 'wss://telemetry.polkadot.io/submit/ 0'
2020
restart: always
2121
#
2222
# SQL data base

backend/docker/reef-node-mainnet/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM phusion/baseimage:master-amd64
22

3-
ARG REEF_NODE=mainnet-1
4-
ARG CHAIN_SPEC=mainnet-1
3+
ARG REEF_NODE=v8
54

65
RUN apt-get update && apt-get install wget -y
76

@@ -13,8 +12,6 @@ RUN chmod +x reef-node
1312

1413
WORKDIR /data
1514

16-
RUN wget https://github.com/reef-defi/reef-chain/releases/download/$CHAIN_SPEC/chain_spec_mainnet.json
17-
1815
EXPOSE 30333 9933 9944
1916

2017
VOLUME ["/data"]

backend/docker/reef-node-testnet/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM phusion/baseimage:master-amd64
22

3-
ARG REEF_NODE=v7
4-
ARG CHAIN_SPEC=testnet-5
3+
ARG REEF_NODE=v8
54

65
RUN apt-get update && apt-get install wget -y
76

@@ -13,8 +12,6 @@ RUN chmod +x reef-node
1312

1413
WORKDIR /data
1514

16-
RUN wget https://github.com/reef-defi/reef-chain/releases/download/$CHAIN_SPEC/chain_spec_testnet.json
17-
1815
EXPOSE 30333 9933 9944
1916

2017
VOLUME ["/data"]

backend/package.json

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"lint": "eslint --ext \".js\" --ignore-path .gitignore ."
2020
},
2121
"dependencies": {
22-
"@polkadot/api": "^4.9.2",
23-
"@polkadot/keyring": "^6.4.1",
24-
"@polkadot/util": "^6.4.1",
25-
"@reef-defi/evm-provider": "^0.1.10",
22+
"@polkadot/api": "^6.3.1",
23+
"@polkadot/keyring": "^7.5.1",
24+
"@polkadot/util": "^7.5.1",
25+
"@reef-defi/evm-provider": "^1.0.2",
2626
"axios": "^0.21.1",
2727
"bignumber.js": "^9.0.1",
2828
"dotenv": "^8.2.0",
@@ -39,12 +39,8 @@
3939
"eslint-plugin-import": "^2.22.1"
4040
},
4141
"resolutions": {
42-
"@reef-defi/type-definitions": "0.1.9-0",
43-
"@ethersproject/abstract-signer": "5.0.9",
44-
"@ethersproject/abstract-provider": "5.0.9",
45-
"@ethersproject/bignumber": "5.0.9",
46-
"@ethersproject/bytes": "5.0.9",
47-
"@ethersproject/logger": "5.0.9",
48-
"@ethersproject/properties": "5.0.9"
42+
"@polkadot/api": "^6.3.1",
43+
"@polkadot/types": "^6.3.1",
44+
"@polkadot/types-known": "^6.3.1"
4945
}
5046
}

frontend/package.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,21 @@
2525
}
2626
},
2727
"dependencies": {
28+
"@ethersproject/address": "^5.5.0",
29+
"@ethersproject/hash": "^5.5.0",
30+
"@ethersproject/strings": "^5.5.0",
2831
"@fortawesome/free-regular-svg-icons": "^5.15.2",
2932
"@fortawesome/free-solid-svg-icons": "^5.15.2",
3033
"@nuxtjs/apollo": "^4.0.1-rc.5",
3134
"@nuxtjs/axios": "^5.12.5",
3235
"@nuxtjs/fontawesome": "^1.1.2",
3336
"@nuxtjs/recaptcha": "^1.0.4",
34-
"@polkadot/extension-dapp": "^0.39.3",
35-
"@polkadot/keyring": "^6.4.1",
36-
"@polkadot/util": "^6.4.1",
37-
"@polkadot/vue-identicon": "^0.68.1",
38-
"@reef-defi/evm-provider": "^0.1.10",
37+
"@polkadot/api": "^6.3.1",
38+
"@polkadot/extension-dapp": "^0.40.3",
39+
"@polkadot/keyring": "^7.5.1",
40+
"@polkadot/util": "^7.5.1",
41+
"@polkadot/vue-identicon": "^0.86.2",
42+
"@reef-defi/evm-provider": "^1.0.2",
3943
"@vue/composition-api": "^1.1.3",
4044
"bootstrap": "^4.5.3",
4145
"bootstrap-vue": "^2.21.2",

0 commit comments

Comments
 (0)