Skip to content

Commit

Permalink
revert usage of local descriptors package in coordinator
Browse files Browse the repository at this point in the history
  • Loading branch information
bucko13 committed Feb 21, 2024
1 parent fd35981 commit 571fd90
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 174 deletions.
5 changes: 2 additions & 3 deletions .changeset/new-seas-vanish.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
"@caravan/descriptors": major
"@caravan/coordinator": patch
"@caravan/descriptors": minor
---

Add new package for encoding and decoding descriptors using bdk with wasm bindings. Adds initial usage of descriptors in coordinator
Add new package for encoding and decoding descriptors using bdk with wasm bindings.
4 changes: 1 addition & 3 deletions apps/coordinator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
"standard-version": "^9.0.0",
"typescript": "^5.0.2",
"vite": "^4.2.3",
"vite-plugin-node-polyfills": "^0.7.0",
"vite-plugin-wasm": "^3.3.0"
"vite-plugin-node-polyfills": "^0.7.0"
},
"scripts": {
"build": "npm run check && tsc && __GIT_SHA__=`git rev-parse --short HEAD` vite build",
Expand Down Expand Up @@ -95,7 +94,6 @@
"dependencies": {
"@caravan/bitcoin": "*",
"@caravan/clients": "*",
"@caravan/descriptors": "*",
"@caravan/wallets": "*",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
Expand Down
53 changes: 0 additions & 53 deletions apps/coordinator/src/components/Wallet/DownloadDescriptors.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from "react";
import PropTypes from "prop-types";
import { Button, Grid } from "@mui/material";
import { CARAVAN_CONFIG } from "./constants";
import { DownloadDescriptors } from "./DownloadDescriptors";

const WalletConfigInteractionButtons = ({ onClearFn, onDownloadFn }) => {
const handleClearClick = (e) => {
Expand All @@ -27,9 +26,6 @@ const WalletConfigInteractionButtons = ({ onClearFn, onDownloadFn }) => {
Clear Wallet
</Button>
</Grid>
<Grid item>
<DownloadDescriptors />
</Grid>
</Grid>
);
};
Expand Down

This file was deleted.

4 changes: 0 additions & 4 deletions apps/coordinator/src/components/Wallet/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import {
SET_CLIENT_USERNAME,
} from "../../actions/clientActions";
import { clientPropTypes, slicePropTypes } from "../../proptypes";
import { WalletDescriptorImporter } from "./WalletDescriptorImporter";

class CreateWallet extends React.Component {
static validateProperties(config, properties, key) {
Expand Down Expand Up @@ -540,9 +539,6 @@ class CreateWallet extends React.Component {
<Grid item xs={12}>
<Grid container style={{ marginTop: "10px" }} spacing={3}>
<Grid item>{this.renderWalletImporter()}</Grid>
<Grid item>
<WalletDescriptorImporter />
</Grid>
</Grid>
</Grid>
<Grid item md={configuring ? 8 : 12}>
Expand Down
7 changes: 0 additions & 7 deletions apps/coordinator/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import { nodePolyfills } from "vite-plugin-node-polyfills";
import path from "path";
import wasm from "vite-plugin-wasm";

// https://vitejs.dev/config/
export default defineConfig({
Expand All @@ -11,14 +10,12 @@ export default defineConfig({
// then the sub-path can cause issues
base:
process.env.GH_PAGES || process.env.GITHUB_ACTIONS ? "/caravan/#" : "/#",
assetsInclude: ["**/*.wasm"],
resolve: {
alias: {
utils: path.resolve(__dirname, "./src/utils"),
},
},
plugins: [
wasm(),
react(),
nodePolyfills({
protocolImports: true,
Expand All @@ -39,8 +36,4 @@ export default defineConfig({
__GIT_SHA__: JSON.stringify(process.env.__GIT_SHA__),
__APP_VERSION__: JSON.stringify(process.env.npm_package_version),
},
optimizeDeps: {
// needed for local development to support proper handling of wasm
exclude: ["@caravan/descriptors"],
},
});
13 changes: 1 addition & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 571fd90

Please sign in to comment.