Skip to content

Commit a12c7df

Browse files
arietrouwarietrouw
committed
Merge branch 'develop'
2 parents 49a3cd1 + 801e804 commit a12c7df

14 files changed

+2255
-1179
lines changed

‎.eslintrc

+42-38
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,39 @@
1-
/*
2-
* File: .eslintrc
3-
* Project: @xyo-network/sdk-core-nodejs
4-
* File Created: Friday, 13th November 2020 10:18:05 am
5-
* Author: XYO Development Team ([email protected])
6-
* -----
7-
* Last Modified: Friday, 13th November 2020 11:22:27 am
8-
* Modified By: XYO Development Team ([email protected]>)
9-
* -----
10-
* Copyright 2017 - 2020 XY - The Persistent Company
11-
*/
12-
131
{
142
"root": true,
153
"parser": "@typescript-eslint/parser",
16-
"ignorePatterns": [
17-
"node_modules/",
18-
"build/",
19-
"/*.ts",
20-
"/*.js",
21-
"src/contracts"
22-
],
4+
"ignorePatterns": ["node_modules/", "build/"],
235
"plugins": [
246
"@typescript-eslint",
257
"prettier",
268
"sort-keys-fix",
27-
"sort-export-all",
9+
"typescript-sort-keys",
2810
"json",
11+
"workspaces",
2912
"import",
3013
"simple-import-sort",
3114
"no-secrets"
3215
],
33-
"parserOptions": {
34-
"project": "./tsconfig.json"
35-
},
3616
"extends": [
3717
"eslint:recommended",
3818
"plugin:import/errors",
3919
"plugin:import/warnings",
4020
"plugin:import/typescript",
4121
"plugin:@typescript-eslint/recommended",
4222
"plugin:json/recommended",
43-
"plugin:prettier/recommended"
23+
"plugin:prettier/recommended",
24+
"plugin:workspaces/recommended"
4425
],
26+
"settings": {
27+
"import/parsers": {
28+
"@typescript-eslint/parser": [".ts", ".tsx"]
29+
}
30+
},
4531
"rules": {
4632
"no-secrets/no-secrets": ["off"],
4733
"workspaces/require-dependency": ["off"],
48-
"prettier/prettier": "error",
49-
"semi": "off",
50-
"@typescript-eslint/semi": ["error", "never"],
34+
"prettier/prettier": "warn",
35+
"semi": ["warn", "never"],
36+
"@typescript-eslint/semi": ["warn", "never"],
5137

5238
"no-tabs": ["error"],
5339
"@typescript-eslint/member-delimiter-style": [
@@ -63,19 +49,13 @@
6349
}
6450
}
6551
],
66-
"sort-export-all/sort-export-all": "warn",
6752
"require-await": "error",
68-
"sort-keys": [
69-
"warn",
70-
"asc",
71-
{ "caseSensitive": true, "natural": false, "minKeys": 2 }
72-
],
53+
"sort-keys": ["warn", "asc", { "caseSensitive": true, "natural": false, "minKeys": 2 }],
54+
"typescript-sort-keys/interface": "warn",
55+
"typescript-sort-keys/string-enum": "warn",
7356
"sort-keys-fix/sort-keys-fix": "warn",
7457
"no-unused-vars": "off",
75-
"@typescript-eslint/no-unused-vars": [
76-
"error",
77-
{ "argsIgnorePattern": "^_" }
78-
],
58+
"@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }],
7959
"@typescript-eslint/no-explicit-any": "off",
8060
"@typescript-eslint/explicit-module-boundary-types": "off",
8161
"quotes": [2, "single", "avoid-escape"],
@@ -85,11 +65,35 @@
8565
"max-lines": ["error", { "max": 512, "skipBlankLines": true }],
8666
"max-nested-callbacks": ["error", 6],
8767
"import/no-named-as-default": ["off"],
68+
"import/no-self-import": ["warn"],
8869
"import/no-absolute-path": ["warn"],
70+
"import/no-internal-modules": [ "off", {
71+
"allow": [
72+
"react-icons/*",
73+
"*/img/**",
74+
"source-map-support/*",
75+
"lodash/*",
76+
"@material-ui/**",
77+
"aws-sdk/**",
78+
"firebase/**",
79+
"@ethersproject/**",
80+
"aos/**",
81+
"filepond*/**",
82+
"pure-react-carousel/**",
83+
"mapbox-gl/**",
84+
"react-share/**",
85+
"sdk-xyoworld-typechain/**",
86+
"react-git-info/**",
87+
"react-player/**"
88+
]
89+
} ],
8990
"import/no-restricted-paths": ["warn"],
9091
"import/namespace": ["warn"],
9192
"import/no-cycle": ["warn"],
9293
"import/no-useless-path-segments": ["warn"],
93-
"simple-import-sort/sort": ["error"]
94+
"simple-import-sort/imports": ["warn"],
95+
"simple-import-sort/exports": ["warn"],
96+
"workspaces/no-relative-imports": ["off"],
97+
"workspaces/no-absolute-imports": ["off"]
9498
}
9599
}

‎package.json

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json.schemastore.org/package",
33
"name": "@xyo-network/sdk-core-nodejs",
4-
"version": "0.71.4",
4+
"version": "0.71.6",
55
"description": "A workspace to aggregated nodejs XYO projects",
66
"main": "dist/src/index.js",
77
"types": "dist/src/index.d.ts",
@@ -26,36 +26,37 @@
2626
"devDependencies": {
2727
"@types/bs58": "^4.0.1",
2828
"@types/elliptic": "^6.4.8",
29-
"@types/jest": "^26.0.15",
30-
"@typescript-eslint/eslint-plugin": "^4.1.1",
31-
"@typescript-eslint/parser": "^4.1.1",
29+
"@types/jest": "^26.0.22",
30+
"@typescript-eslint/eslint-plugin": "^4.22.0",
31+
"@typescript-eslint/parser": "^4.22.0",
3232
"enquirer": "^2.3.6",
33-
"eslint": "^7.13.0",
34-
"eslint-config-prettier": "^6.12.0",
33+
"eslint": "^7.24.0",
34+
"eslint-config-prettier": "^8.2.0",
3535
"eslint-plugin-import": "^2.22.1",
3636
"eslint-plugin-json": "^2.1.2",
37-
"eslint-plugin-no-secrets": "^0.6.8",
38-
"eslint-plugin-prettier": "^3.1.4",
39-
"eslint-plugin-react": "^7.21.3",
37+
"eslint-plugin-no-secrets": "^0.8.9",
38+
"eslint-plugin-prettier": "^3.4.0",
39+
"eslint-plugin-react": "^7.23.2",
4040
"eslint-plugin-react-hooks": "^4.1.2",
41-
"eslint-plugin-simple-import-sort": "^5.0.3",
42-
"eslint-plugin-sort-export-all": "^1.0.5",
41+
"eslint-plugin-simple-import-sort": "^7.0.0",
42+
"eslint-plugin-sort-export-all": "^1.1.1",
4343
"eslint-plugin-sort-keys-fix": "^1.1.1",
44+
"eslint-plugin-typescript-sort-keys": "^1.6.0",
4445
"eslint-plugin-workspaces": "^0.6.0",
4546
"jest": "^26.6.3",
4647
"license-checker": "^25.0.1",
47-
"prettier": "^2.1.2",
48+
"prettier": "^2.2.1",
4849
"shelljs": "^0.8.4",
49-
"snyk": "^1.426.0",
50-
"ts-jest": "^26.4.4",
51-
"ts-node": "9.0.0",
52-
"typescript": "^4.0.5"
50+
"snyk": "^1.543.0",
51+
"ts-jest": "^26.5.5",
52+
"ts-node": "9.1.1",
53+
"typescript": "^4.2.4"
5354
},
5455
"dependencies": {
55-
"@xyo-network/sdk-base-nodejs": "^0.7.3",
56+
"@xyo-network/sdk-base-nodejs": "^0.7.6",
5657
"bs58": "4.0.1",
57-
"delay": "^4.4.0",
58-
"elliptic": "6.5.3"
58+
"delay": "^5.0.0",
59+
"elliptic": "6.5.4"
5960
},
6061
"prettier": {
6162
"semi": false,

‎src/heuristics/common/defaultResolvers.ts

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
/*
2+
* File: defaultResolvers.ts
3+
* Project: @xyo-network/sdk-core-nodejs
4+
* File Created: Friday, 13th November 2020 2:22:50 pm
5+
* Author: XYO Development Team ([email protected])
6+
* -----
7+
* Last Modified: Friday, 13th November 2020 2:30:21 pm
8+
* Modified By: XYO Development Team ([email protected]>)
9+
* -----
10+
* Copyright 2017 - 2020 XY - The Persistent Company
11+
*/
12+
13+
import { XyoObjectSchema } from '../../schema'
14+
import {
15+
boundWitnessResolver,
16+
bridgeHashSetResolver,
17+
fetterResolver,
18+
gpsResolver,
19+
indexResolver,
20+
keySetResolver,
21+
latResolver,
22+
lngResolver,
23+
paymentKeyResolver,
24+
previousHashResolver,
25+
rsaPublicKeyResolver,
26+
rsaSignatureResolver,
27+
rssiAt1MResolver,
28+
rssiResolver,
29+
secp256K1PublicKeyResolver,
30+
secp256K1SignatureResolver,
31+
sha3Resolver,
32+
sha256Resolver,
33+
signatureSetResolver,
34+
stubHashResolver,
35+
stubPublicKey,
36+
stubSignatureResolver,
37+
timeResolver,
38+
witnessResolver,
39+
} from './resolvers'
40+
41+
const defaultResolvers = [
42+
{
43+
id: XyoObjectSchema.BLE_POWER_LEVEL.id,
44+
resolver: rssiAt1MResolver,
45+
},
46+
{
47+
id: XyoObjectSchema.EC_PUBLIC_KEY.id,
48+
resolver: secp256K1PublicKeyResolver,
49+
},
50+
{
51+
id: XyoObjectSchema.EC_SIGNATURE.id,
52+
resolver: secp256K1SignatureResolver,
53+
},
54+
{
55+
id: XyoObjectSchema.INDEX.id,
56+
resolver: indexResolver,
57+
},
58+
{
59+
id: XyoObjectSchema.LAT.id,
60+
resolver: latResolver,
61+
},
62+
{
63+
id: XyoObjectSchema.LNG.id,
64+
resolver: lngResolver,
65+
},
66+
{
67+
id: XyoObjectSchema.PAYMENT_KEY.id,
68+
resolver: paymentKeyResolver,
69+
},
70+
{
71+
id: XyoObjectSchema.RSA_PUBLIC_KEY.id,
72+
resolver: rsaPublicKeyResolver,
73+
},
74+
{
75+
id: XyoObjectSchema.RSA_SIGNATURE.id,
76+
resolver: rsaSignatureResolver,
77+
},
78+
{
79+
id: XyoObjectSchema.RSSI.id,
80+
resolver: rssiResolver,
81+
},
82+
{
83+
id: XyoObjectSchema.SHA_256.id,
84+
resolver: sha256Resolver,
85+
},
86+
{
87+
id: XyoObjectSchema.SHA_3.id,
88+
resolver: sha3Resolver,
89+
},
90+
{
91+
id: XyoObjectSchema.STUB_HASH.id,
92+
resolver: stubHashResolver,
93+
},
94+
{
95+
id: XyoObjectSchema.STUB_PUBLIC_KEY.id,
96+
resolver: stubPublicKey,
97+
},
98+
{
99+
id: XyoObjectSchema.STUB_SIGNATURE.id,
100+
resolver: stubSignatureResolver,
101+
},
102+
{
103+
id: XyoObjectSchema.UNIX_TIME.id,
104+
resolver: timeResolver,
105+
},
106+
{
107+
id: XyoObjectSchema.GPS.id,
108+
resolver: gpsResolver,
109+
},
110+
{
111+
id: XyoObjectSchema.BW.id,
112+
resolver: boundWitnessResolver,
113+
},
114+
{
115+
id: XyoObjectSchema.KEY_SET.id,
116+
resolver: keySetResolver,
117+
},
118+
{
119+
id: XyoObjectSchema.SIGNATURE_SET.id,
120+
resolver: signatureSetResolver,
121+
},
122+
{
123+
id: XyoObjectSchema.FETTER.id,
124+
resolver: fetterResolver,
125+
},
126+
{
127+
id: XyoObjectSchema.WITNESS.id,
128+
resolver: witnessResolver,
129+
},
130+
{
131+
id: XyoObjectSchema.PREVIOUS_HASH.id,
132+
resolver: previousHashResolver,
133+
},
134+
{
135+
id: XyoObjectSchema.BRIDGE_HASH_SET.id,
136+
resolver: bridgeHashSetResolver,
137+
},
138+
]
139+
140+
export default defaultResolvers

0 commit comments

Comments
 (0)