Skip to content

Commit 2b64e59

Browse files
committed
Merge branch 'master' into fix/improve-genmsg-scripts
2 parents 13c02d5 + 95a1497 commit 2b64e59

File tree

133 files changed

+1232
-1858
lines changed

Some content is hidden

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

133 files changed

+1232
-1858
lines changed

.changeset/bright-pandas-float.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@xchainjs/xchain-cosmos-sdk': patch
3+
'@xchainjs/xchain-mayachain': patch
4+
'@xchainjs/xchain-thorchain': patch
5+
'@xchainjs/xchain-cosmos': patch
6+
'@xchainjs/xchain-kujira': patch
7+
---
8+
9+
update to CosmJs 0.34.0, migrate off elliptic to noble cryptography

.changeset/fuzzy-ducks-mate.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@xchainjs/xchain-client': patch
3+
'@xchainjs/xchain-utxo': patch
4+
'@xchainjs/xchain-evm': patch
5+
---
6+
7+
Updated get fee rates to observe Mayachain as well

.eslintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 41 deletions
This file was deleted.

.trunk/trunk.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ lint:
2525
enabled:
2626
# 🧹 General Code Quality & Formatting
2727
# JS/TS linting
28-
- eslint@8.57.0:
28+
- eslint@8.57.1:
2929
use_project_eslint: true
30-
config: .eslintrc
30+
config: eslint.config.mjs
3131
- prettier@2.8.8: # Code formatting
3232
config: .prettierrc
3333
#- codespell@2.4.1 # Spell-checking
@@ -62,7 +62,7 @@ lint:
6262
commands:
6363
- name: linting
6464
output: pass_fail
65-
run: eslint --fix --max-warnings 0 ${target}
65+
run: eslint --fix --max-warnings 0 --no-warn-ignored ${target}
6666
success_codes: [0, 1]
6767

6868
- name: prettier

.yarn/releases/yarn-4.2.2.cjs

Lines changed: 0 additions & 894 deletions
This file was deleted.

.yarn/releases/yarn-4.9.1.cjs renamed to .yarn/releases/yarn-4.9.2.cjs

Lines changed: 273 additions & 279 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-4.2.2.cjs
3+
yarnPath: .yarn/releases/yarn-4.9.2.cjs

eslint.config.mjs

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
import tseslint from '@typescript-eslint/eslint-plugin'
2+
import tsparser from '@typescript-eslint/parser'
3+
import importPlugin from 'eslint-plugin-import'
4+
import prettierPlugin from 'eslint-plugin-prettier'
5+
import prettierConfig from 'eslint-config-prettier'
6+
7+
export default [
8+
{
9+
ignores: [
10+
'**/node_modules/**',
11+
'**/lib/**',
12+
'**/types/proto/**',
13+
'**/*.d.ts',
14+
'packages/xchain-mayachain/src/types/proto/**',
15+
'packages/xchain-thorchain/src/types/proto/**',
16+
],
17+
},
18+
{
19+
files: ['**/*.{js,mjs,cjs,ts,tsx}'],
20+
languageOptions: {
21+
parser: tsparser,
22+
parserOptions: {
23+
ecmaVersion: 2018,
24+
project: true,
25+
sourceType: 'module',
26+
},
27+
},
28+
plugins: {
29+
'@typescript-eslint': tseslint,
30+
import: importPlugin,
31+
prettier: prettierPlugin,
32+
},
33+
settings: {
34+
'import/resolver': {
35+
typescript: {},
36+
},
37+
},
38+
rules: {
39+
// TypeScript ESLint recommended rules
40+
...tseslint.configs['recommended-type-checked'].rules,
41+
42+
// Import plugin rules
43+
...importPlugin.configs.recommended.rules,
44+
...importPlugin.configs.typescript.rules,
45+
46+
// Prettier integration
47+
...prettierConfig.rules,
48+
'prettier/prettier': 'error',
49+
50+
// Custom rule overrides
51+
'@typescript-eslint/explicit-module-boundary-types': 'off',
52+
'@typescript-eslint/explicit-function-return-type': 'off',
53+
'@typescript-eslint/no-use-before-define': 'warn',
54+
'@typescript-eslint/ban-ts-comment': 'off',
55+
'@typescript-eslint/no-base-to-string': 'error',
56+
'@typescript-eslint/no-unnecessary-type-assertion': 'off',
57+
'@typescript-eslint/no-unsafe-argument': 'off',
58+
'@typescript-eslint/no-unsafe-assignment': 'off',
59+
'@typescript-eslint/no-unsafe-call': 'off',
60+
'@typescript-eslint/no-unsafe-enum-comparison': 'off',
61+
'@typescript-eslint/no-unsafe-member-access': 'off',
62+
'@typescript-eslint/no-unsafe-return': 'off',
63+
'@typescript-eslint/no-unused-vars': [
64+
'error',
65+
{
66+
caughtErrorsIgnorePattern: '^_',
67+
varsIgnorePattern: '^_',
68+
argsIgnorePattern: '^_',
69+
},
70+
],
71+
'@typescript-eslint/only-throw-error': 'off',
72+
'@typescript-eslint/prefer-promise-reject-errors': 'off',
73+
'@typescript-eslint/require-await': 'off',
74+
'@typescript-eslint/restrict-template-expressions': 'error',
75+
'@typescript-eslint/unbound-method': 'off',
76+
'@typescript-eslint/await-thenable': 'error',
77+
'@typescript-eslint/no-floating-promises': 'error',
78+
'no-unused-expressions': 'error',
79+
'import/no-duplicates': 'error',
80+
'import/no-named-as-default': 'off',
81+
'import/no-named-as-default-member': 'off',
82+
'no-undef': 'off',
83+
},
84+
},
85+
]

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "root",
33
"private": true,
44
"description": "XChainJS Chain Clients MonoRepo",
5-
"packageManager": "yarn@4.2.2",
5+
"packageManager": "yarn@4.9.2",
66
"engines": {
7-
"yarn": ">=1.4.0"
7+
"yarn": ">=4.9.2"
88
},
99
"workspaces": [
1010
"packages/*",
@@ -42,7 +42,8 @@
4242
"micromatch": "4.0.8",
4343
"word-wrap": "1.2.4",
4444
"undici": "5.29.0",
45-
"form-data": "4.0.4"
45+
"form-data": "4.0.4",
46+
"elliptic": "^6.6.1"
4647
},
4748
"devDependencies": {
4849
"@actions/core": "1.10.0",
@@ -53,8 +54,8 @@
5354
"@rollup/plugin-typescript": "^12.1.2",
5455
"@rollup/plugin-wasm": "^6.2.2",
5556
"@types/jest": "^30.0.0",
56-
"@typescript-eslint/eslint-plugin": "^7.18.0",
57-
"@typescript-eslint/parser": "^7.18.0",
57+
"@typescript-eslint/eslint-plugin": "^8.38.0",
58+
"@typescript-eslint/parser": "^8.38.0",
5859
"dotenv": "^16.0.3",
5960
"eslint": "^8.57.1",
6061
"eslint-config-prettier": "^8.6.0",

0 commit comments

Comments
 (0)