From 326f101245f31817feed08edc2f7042ac971a4e8 Mon Sep 17 00:00:00 2001 From: Mathieu Geukens Date: Sun, 28 Jun 2026 12:32:47 +0200 Subject: [PATCH] update deps to 0.14.0-next.0 & show calculated fee and fee rate in TransactionBuilder (#46) --- package.json | 6 +- src/components/Editor.tsx | 2 +- src/components/Main.tsx | 10 ++-- src/components/TransactionBuilder.tsx | 82 +++++++++++++++++++-------- src/editor/cashscript/diagnostics.ts | 2 +- src/editor/cashscript/version.ts | 4 +- yarn.lock | 28 ++++----- 7 files changed, 83 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 4e334e4..2160298 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,14 @@ "lint": "next lint" }, "dependencies": { - "@cashscript/utils": "^0.13.1", + "@cashscript/utils": "^0.14.0-next.0", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", "@monaco-editor/react": "^4.7.0", "bootstrap": "^5.3.7", - "cashc": "^0.13.1", + "cashc": "^0.14.0-next.0", "cashc-v0.12": "npm:cashc@^0.12.2", - "cashscript": "^0.13.1", + "cashscript": "^0.14.0-next.0", "next": "15.5.9", "react": "18.2.0", "react-bootstrap": "^2.10.10", diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx index 1dc1cb6..d5b31e9 100644 --- a/src/components/Editor.tsx +++ b/src/components/Editor.tsx @@ -94,7 +94,7 @@ const Editor: React.FC = ({ code, setCode, compile, compilerVersion, setC onChange={(e) => setCompilerVersion(e.target.value as CashScriptVersion)} style={{ width: '170px', borderRadius: '30px' }} > - + diff --git a/src/editor/cashscript/diagnostics.ts b/src/editor/cashscript/diagnostics.ts index 4a407a5..29e79cb 100644 --- a/src/editor/cashscript/diagnostics.ts +++ b/src/editor/cashscript/diagnostics.ts @@ -62,7 +62,7 @@ export interface CashScriptDiagnostic { } const compileStringByVersion: Record = { - '0.13': compileString, + '0.14': compileString, '0.12': compileStringV012, }; diff --git a/src/editor/cashscript/version.ts b/src/editor/cashscript/version.ts index 22c23b4..e5a1085 100644 --- a/src/editor/cashscript/version.ts +++ b/src/editor/cashscript/version.ts @@ -7,9 +7,9 @@ // versions, which avoids re-registering providers (Monaco can't cleanly // unregister them) while still gating version-specific language features. -export type CashScriptVersion = '0.12' | '0.13'; +export type CashScriptVersion = '0.12' | '0.14'; -let currentVersion: CashScriptVersion = '0.13'; +let currentVersion: CashScriptVersion = '0.14'; // Listeners notified when the selected version changes. Used by the highlighting // layer, which (unlike completions/hover) is registered statically and must be diff --git a/yarn.lock b/yarn.lock index 1c01f3c..113dae2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -77,10 +77,10 @@ dependencies: "@bitauth/libauth" "^3.1.0-next.8" -"@cashscript/utils@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.13.1.tgz#cfcfcf7c6a8edb41f4c3887b908592147c9a3736" - integrity sha512-MAZ0SK+wvgQbTKHHgTDocfOI+Yrmw5c8bv4FyKUuCtjw/+JE/HJEEKyL/0ppEFbOzv5Jy4JQIV6n7GPNWm/wbQ== +"@cashscript/utils@^0.14.0-next.0": + version "0.14.0-next.0" + resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.14.0-next.0.tgz#9e9ea4cd72875d5e9ddbf46b2ea016cc913c6882" + integrity sha512-N0LQE2Tf63NWMeuk/bflyBbgLYBOMu8x1L8qbWDY6RaygUAz5qNTel/5ZoAyyZ6yAFanrtPL27OvLDbyTlj7Xw== dependencies: "@bitauth/libauth" "^3.1.0-next.8" @@ -1200,24 +1200,24 @@ caniuse-lite@^1.0.30001579: commander "^14.0.0" semver "^7.7.2" -cashc@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.13.1.tgz#9b246f2997eda2fbe5c358fdedbb36bdc57b5a96" - integrity sha512-u0tcMNyK29FOLhVzoQsynmd51QtAGxPIpy8pScLu18RV1MMI0WD1YJY1DBtRNaQlOupeBeO24O6lTNoJ621d2w== +cashc@^0.14.0-next.0: + version "0.14.0-next.0" + resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.14.0-next.0.tgz#20b3d57da50036d5f3430c40d7b1fcd58bc2f827" + integrity sha512-JLsKsi4Zk/KbTszdLVUFFSta7VgdEk0UHoAx7ugGREtDQFsXcR+JN/yGihuO3BmcTqyKDe9P/GDva5CMhOQJ0Q== dependencies: "@bitauth/libauth" "^3.1.0-next.8" - "@cashscript/utils" "^0.13.1" + "@cashscript/utils" "^0.14.0-next.0" antlr4 "^4.13.2" commander "^14.0.0" semver "^7.7.2" -cashscript@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.13.1.tgz#06059881922c35064347e13d97eeb0eb057eea3f" - integrity sha512-BrPFO4TYFTFc41Ft4Hpsky9UNct2SEv6QdC89utu4B/9+8kl4uJLy4SjUv9ZJciGSigQOg4McKYzuYCc/oYl2g== +cashscript@^0.14.0-next.0: + version "0.14.0-next.0" + resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.14.0-next.0.tgz#8e48bdb45761bac03460950f2a678a9a8c0c732a" + integrity sha512-s6DQ8cA5Z23c/HU2tKcFvKyYp6Q95Ppa1c+p0NCPosBSy/hggkRPfDk5aBOCzpx0WG1K19ip9peAcZcXIg4zIA== dependencies: "@bitauth/libauth" "^3.1.0-next.8" - "@cashscript/utils" "^0.13.1" + "@cashscript/utils" "^0.14.0-next.0" "@electrum-cash/network" "^4.1.3" fflate "^0.8.2" semver "^7.7.2"