Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 0-conf support #199

Merged
merged 35 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2aa5677
move pending transactions fetching to `walletStore`
arobsn Sep 14, 2024
ec4c818
Merge branch 'master' into arobsn/i167
arobsn Sep 20, 2024
35b77a9
bump dependencies
arobsn Sep 20, 2024
a651a9c
Merge branch 'master' into arobsn/i167
arobsn Sep 24, 2024
1ccb22b
bump dependencies
arobsn Oct 1, 2024
61503c2
resolve conflicts
arobsn Oct 7, 2024
f07a2aa
fix hight updating
arobsn Oct 7, 2024
302d828
move mempool tracking to a dedicated store
arobsn Oct 7, 2024
64c130e
fix number formatting
arobsn Oct 8, 2024
9e91835
merge confirmed balance with unconfirmed
arobsn Oct 9, 2024
2d1f6dd
clean up
arobsn Oct 9, 2024
2b75c67
refactor
arobsn Oct 11, 2024
2aef829
bump dependencies
arobsn Oct 11, 2024
6ee8c40
version bump
arobsn Oct 14, 2024
5c63972
override vulnerable packages
arobsn Oct 14, 2024
8bbffe6
Add unconfirmed boxes/balance fetching workflow
arobsn Oct 24, 2024
d2a8af8
Merge branch 'master' into arobsn/i167
arobsn Oct 28, 2024
6705caf
add 0-conf as an optional setting
arobsn Oct 28, 2024
3cf28ca
only query for transaction when the addresses are loaded
arobsn Oct 29, 2024
5872422
handle wallet changes
arobsn Oct 29, 2024
92d6f68
only patches the state if wallet remains the same
arobsn Oct 30, 2024
bebf281
migrate to eslint 9
arobsn Oct 31, 2024
f0cc154
merge
arobsn Nov 13, 2024
a9e4472
bump dependencies
arobsn Nov 13, 2024
c25f768
merge
arobsn Nov 13, 2024
1f20f29
Merge branch 'master' into arobsn/i167
arobsn Nov 13, 2024
0339e99
fix merge conflicts
arobsn Nov 13, 2024
5fa4082
Merge branch 'master' into arobsn/i167
arobsn Nov 15, 2024
33dfd53
temporarily disable lint checking on CI
arobsn Nov 15, 2024
63a5b31
fjx formatting
arobsn Nov 15, 2024
91381f3
fix box fetching when only unconfirmed balance is available
arobsn Nov 20, 2024
273e799
make `get_balance` mempool aware
arobsn Nov 20, 2024
ff31928
rename `enableZeroConf` setting to `zeroConf`
arobsn Nov 20, 2024
79c2a66
bump version
arobsn Nov 20, 2024
7318d54
refactor
arobsn Nov 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions .eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cache: "pnpm"

- run: pnpm install --frozen-lockfile
- run: pnpm run test:lint
# - run: pnpm run test:lint
- run: pnpm run test:format

unit-test:
Expand Down
73 changes: 73 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { fileURLToPath } from "node:url";
import path from "node:path";
import { fixupConfigRules } from "@eslint/compat";
import parser from "vue-eslint-parser";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const compat = new FlatCompat({
baseDirectory: path.dirname(fileURLToPath(import.meta.url)),
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [
{
ignores: ["**/node_modules", "**/dist", "**/coverage"]
},
...fixupConfigRules(
compat.extends(
"eslint:recommended",
"plugin:vue/vue3-recommended",
"prettier",
"plugin:@typescript-eslint/recommended",
"plugin:import/recommended",
"plugin:import/typescript"
)
),
{
languageOptions: {
globals: {
BigInt: true,
console: true,
WebAssembly: true,
chrome: true,
process: true
},

parser: parser,
ecmaVersion: 5,
sourceType: "script",

parserOptions: {
parser: "@typescript-eslint/parser"
}
},

settings: {
"import/resolver": {
typescript: true,
node: true
}
},

rules: {
"vue/component-api-style": ["warn", ["script-setup", "composition"]],
"no-console": "error",
"@typescript-eslint/explicit-module-boundary-types": "off",

"sort-imports": [
"warn",
{
ignoreDeclarationSort: true,
ignoreCase: true
}
],

"import/order": "warn",
"import/default": "off",
"import/no-named-as-default-member": "off",
"import/no-unresolved": "off"
}
}
];
53 changes: 27 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nautilus-wallet",
"version": "0.14.2",
"version": "0.15.0-beta.1",
"private": true,
"type": "module",
"engines": {
Expand All @@ -16,9 +16,9 @@
"build:mainnet:stage": "vite build --mode staging",
"build:docs": "vitepress build docs",
"test:unit": "vitest run",
"test:lint": "eslint .",
"test:format": "prettier . --check",
"fix:format": "prettier . --write"
"test:lint": "eslint ./src",
"test:format": "prettier ./src --check",
"fix:format": "prettier ./src --write"
},
"dependencies": {
"@download/blockies": "^1.0.3",
Expand All @@ -30,64 +30,65 @@
"@fleet-sdk/crypto": "^0.6.4",
"@fleet-sdk/serializer": "^0.7.0",
"@fleet-sdk/wallet": "^0.7.0",
"@ledgerhq/hw-transport-webusb": "^6.29.2",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
"@mdi/js": "^7.4.47",
"@oruga-ui/oruga-next": "0.6.0",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vueuse/core": "^11.0.3",
"@vueuse/core": "^11.2.0",
"bignumber.js": "^9.1.2",
"cleave.js": "^1.6.0",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
"dexie": "^4.0.8",
"dexie": "^4.0.10",
"ergo-lib-wasm-browser": "^0.28.0",
"feather-icons": "^4.29.2",
"ledger-ergo-js": "^0.1.18",
"lodash-es": "^4.17.21",
"mdi-vue": "^3.0.13",
"pinia": "^2.2.2",
"pinia": "^2.2.6",
"uqr": "^0.1.2",
"vue": "^3.5.8",
"vue": "^3.5.13",
"vue-feather": "^2.0.0",
"vue-json-pretty": "2.4.0",
"vue-router": "^4.4.4",
"vue-router": "^4.4.5",
"webext-bridge": "^6.0.1",
"webextension-polyfill": "^0.12.0",
"yaml": "^2.5.1"
"yaml": "^2.6.1"
},
"devDependencies": {
"@ergo-graphql/types": "^0.5.1",
"@eslint/compat": "^1.2.3",
"@nautilus-js/eip12-types": "^0.1.11",
"@tsconfig/node20": "^20.1.4",
"@types/chrome": "^0.0.270",
"@types/chrome": "^0.0.283",
"@types/cleave.js": "^1.4.12",
"@types/crypto-js": "^4.2.2",
"@types/json-bigint": "^1.0.4",
"@types/lodash-es": "^4.17.12",
"@types/webextension-polyfill": "^0.12.1",
"@typescript-eslint/parser": "^8.5.0",
"@vitejs/plugin-vue": "^5.1.3",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"eslint": "8.57.0",
"@typescript-eslint/parser": "^8.15.0",
"@vitejs/plugin-vue": "^5.2.0",
"@vue/eslint-config-prettier": "^10.1.0",
"@vue/eslint-config-typescript": "^14.1.3",
"@vue/tsconfig": "^0.6.0",
"eslint": "^9.15.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.28.0",
"eslint-plugin-vue": "^9.31.0",
"prettier": "^3.3.3",
"type-fest": "^4.26.1",
"typescript": "5.6.2",
"vite": "^5.4.4",
"type-fest": "^4.27.0",
"typescript": "5.6.3",
"vite": "^5.4.11",
"vite-plugin-node-polyfills": "^0.22.0",
"vite-plugin-top-level-await": "^1.4.4",
"vite-plugin-wasm": "^3.3.0",
"vite-plugin-web-extension": "^4.1.6",
"vite-plugin-web-extension": "^4.3.1",
"vite-plugin-windicss": "^1.9.3",
"vite-svg-loader": "^5.1.0",
"vitepress": "^1.4.3",
"vitest": "^2.1.0",
"vitepress": "^1.5.0",
"vitest": "^2.1.5",
"vue-eslint-parser": "^9.4.3"
}
}
Loading