Skip to content

Commit e3fca85

Browse files
Merge pull request #197 from iExecBlockchainComputing/next
v8.0.0 to master
2 parents 5cfb4a1 + f10c805 commit e3fca85

File tree

256 files changed

+60009
-28974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+60009
-28974
lines changed

.drone.yml

+39-26
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
pipeline:
2-
# test_node18:
3-
# image: node:18
4-
# pull: true
5-
# secrets: [infura_project_id, alchemy_api_key, etherscan_api_key]
6-
# commands:
7-
# - apt update
8-
# - apt install xxd
9-
# - node -v
10-
# - npm -v
11-
# - npm ci
12-
# - npm run build
13-
# - npm -g install .
14-
# - npm test
15-
# when:
16-
# ref: refs/tags/v*
17-
18-
test_node16:
19-
image: node:16
2+
test_node18:
3+
image: node:18
204
pull: true
215
secrets: [infura_project_id, alchemy_api_key, etherscan_api_key]
226
commands:
@@ -31,14 +15,13 @@ pipeline:
3115
when:
3216
ref: refs/tags/v*
3317

34-
test_node14:
35-
image: node:14
18+
test_node16:
19+
image: node:16
3620
pull: true
3721
secrets: [infura_project_id, alchemy_api_key, etherscan_api_key]
3822
commands:
3923
- apt update
4024
- apt install xxd
41-
- npm i -g npm@8
4225
- node -v
4326
- npm -v
4427
- npm ci
@@ -48,8 +31,8 @@ pipeline:
4831
when:
4932
ref: refs/tags/v*
5033

51-
test_node12:
52-
image: node:12
34+
test_node14:
35+
image: node:14
5336
pull: true
5437
secrets: [infura_project_id, alchemy_api_key, etherscan_api_key]
5538
commands:
@@ -63,6 +46,13 @@ pipeline:
6346
- npm -g install .
6447
- npm test
6548

49+
code_analysis:
50+
image: sonarsource/sonar-scanner-cli
51+
pull: true
52+
secrets: [sonar_token, sonar_host]
53+
commands:
54+
- sonar-scanner -Dsonar.host.url=$SONAR_HOST -Dsonar.branch.name=$DRONE_BRANCH
55+
6656
publish_npm:
6757
image: plugins/npm
6858
secrets: [npm_token]
@@ -113,7 +103,30 @@ services:
113103
image: iexechub/poco-chaintest:5.3.2-token-openethereum
114104
pull: true
115105

116-
token-sms:
106+
token-sms-scone:
107+
image: iexechub/iexec-sms:7.1.0
108+
pull: true
109+
environment:
110+
- TZ=Europe/Paris
111+
- IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS=http://token-chain-openethereum:8545
112+
- IEXEC_HUB_ADDRESS=0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca
113+
- IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE=docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
114+
- IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT=9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
115+
- IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB=4
116+
- IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE=docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
117+
- IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT=face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
118+
- IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB=4
119+
- IEXEC_IGNORED_SGX_ADVISORIES=INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
120+
- IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS=debug-mode,hyperthreading,outdated-tcb
121+
- IEXEC_SMS_DISPLAY_DEBUG_SESSION=true
122+
- IEXEC_SCONE_CAS_HOST=foo
123+
- IEXEC_SMS_IMAGE_LAS_IMAGE=foo
124+
expose:
125+
- 13300
126+
depends_on:
127+
- token-chain-openethereum
128+
129+
token-sms-gramine:
117130
image: iexechub/iexec-sms:7.1.0
118131
pull: true
119132
environment:
@@ -173,7 +186,7 @@ services:
173186
command: redis-server --appendonly yes
174187

175188
token-watcher:
176-
image: iexechub/iexec-market-watcher:5
189+
image: iexechub/iexec-market-watcher:6.1
177190
commands:
178191
- sleep 10
179192
- cd /app
@@ -190,7 +203,7 @@ services:
190203
- REDIS_HOST=gateway-redis
191204

192205
token-gateway:
193-
image: iexechub/iexec-market-api:5
206+
image: iexechub/iexec-market-api:6.1
194207
commands:
195208
- sleep 10
196209
- cd /app

.eslintrc

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
2-
"extends": ["airbnb-base", "prettier"],
2+
"plugins": ["sonarjs"],
3+
"extends": [
4+
"airbnb-base",
5+
"plugin:import/recommended",
6+
"plugin:sonarjs/recommended",
7+
"prettier"
8+
],
39
"rules": {
410
"default-param-last": "off",
511
"new-cap": 0,
@@ -9,6 +15,7 @@
915
{
1016
"allow": [
1117
"_args",
18+
"_data",
1219
"_ethersType",
1320
"_eventName",
1421
"_execs",
@@ -28,6 +35,8 @@
2835
],
2936
"no-template-curly-in-string": "off",
3037
"max-classes-per-file": "off",
31-
"max-len": "off"
38+
"max-len": "off",
39+
"import/prefer-default-export": "off",
40+
"import/extensions": ["error", "always"]
3241
}
3342
}

CHANGELOG.md

+80-36
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)