Skip to content

Commit

Permalink
[dex] Bump to dcrdex v0.5.2 (#3791)
Browse files Browse the repository at this point in the history
  • Loading branch information
chappjc authored Sep 7, 2022
1 parent 12d17ed commit 78a6a3b
Show file tree
Hide file tree
Showing 18 changed files with 1,112 additions and 308 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
node-version: [14.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.16
go-version: 1.18
- name: Use nodejs ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const DexOpenOrdersModal = ({ show, onCancelModal }) => (
<div>
<T
id="dex.openorders.message"
m="There are currently open orders still being managed at the DEX. Please wait until all orders are finished excuting before closing. If you close before the orders are executed, you will not finish the trade and may be penalized."
m="There are currently open orders still being managed on the DEX. Please wait until all orders are finished executing before closing. If you close before the orders are executed, you will not finish the trade and may be penalized."
/>
</div>
<div className={styles.toolbar}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ const CreateWalletsPage = () => {
description={
<T
id="dex.btcWalletLocation.description"
m="If you have a non-default bitcoin location, please check the box and indentify the location."
m="If you have a non-default bitcoin location, please check the box and identify the location."
/>
}
checked={hasNonDefault}
Expand Down
2 changes: 1 addition & 1 deletion app/components/views/DexPage/InitPage/InitPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const InitPage = () => {
description={
<T
id="dex.hasDexSeed.description"
m="A DEX seed allows you to recover your account at a paticular server."
m="A DEX seed allows you to recover your account at a particular server and your native DEX wallets."
/>
}
checked={hasSeed}
Expand Down
2 changes: 1 addition & 1 deletion app/components/views/DexPage/RegisterPage/RegisterPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const RegisterPage = () => {
</div>
<div className={styles.sendToDexAccount}>
<div className={styles.title}>
<T id="dex.sendToDexAccount.title" m="Send to Dex Account" />
<T id="dex.sendToDexAccount.title" m="Send to DEX Account" />
</div>
<SendTransaction
onlySendSelfAllowed={true}
Expand Down
4 changes: 2 additions & 2 deletions app/i18n/translations/original.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
"createwallet.watchOnly.label": "Watch only",
"createwallet.watchonly.description": "A watch-only wallet has limited functionality. It can only be used to view the balance and monitor transaction history. You won't be able to spend any DCR associated with this wallet.",
"daemon.connect.error": "Error connecting to daemon",
"daemonSyncingTimeout.errors": "Daemon connection timeout exceded.\n That Probably means you filled your parameters wrong. Please review it.",
"daemonSyncingTimeout.errors": "Daemon connection timeout exceeded.\n That Probably means you filled your parameters wrong. Please review it.",
"decryptWalletForm.openBtn": "Open Wallet",
"dex.btcWalletConnected": "BTC Wallet has been successfully connected!",
"dex.btcWalletLocation.description": "If you have a non-default bitcoin location, please check the box and indentify the location.",
Expand Down Expand Up @@ -298,7 +298,7 @@
"dex.startup.failed": "DEX Client Failed to Start: {originalError}",
"dex.updateBTCConfig": "You must update your bitcoin.conf to properly communicate with the DEX.",
"dex.updateBTCConfigButton": "Create BTC Config",
"dex.user.failed": "Failed to retreive user information: {originalError}",
"dex.user.failed": "Failed to retrieve user information: {originalError}",
"dialogs.cancelButton": "Cancel",
"dialogs.confirmFileOverwrite": "Overwrite contents of file {filename}?",
"dialogs.yesButton": "Yes",
Expand Down
12 changes: 10 additions & 2 deletions app/main.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -434,14 +434,20 @@ function createDexWindow(serverAddress) {
event.preventDefault();
}
});
dexWindow.webContents.setWindowOpenHandler(({ url }) => {
mainWindow.webContents.send("open-external", url);
return { action: "deny" };
});
dexWindow.once("closed", () => {
dexWindow = new BrowserWindow({
show: false,
autoHideMenuBar: true,
webPreferences: {
nodeIntegration: false,
contextIsolation: true
}
},
width: 1280,
height: 940
});
});
}
Expand Down Expand Up @@ -873,7 +879,9 @@ app.on("ready", async () => {
webPreferences: {
nodeIntegration: false,
contextIsolation: true
}
},
width: 1280,
height: 940
});
});

Expand Down
4 changes: 2 additions & 2 deletions app/reducers/snackbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ const messages = defineMessages({
DAEMONCONNECTING_TIMEOUT: {
id: "daemonSyncingTimeout.errors",
defaultMessage:
"Daemon connection timeout exceded.\n That Probably means you filled your parameters wrong. Please review it."
"Daemon connection timeout exceeded.\n That Probably means you filled your parameters wrong. Please review it."
},
DAEMONCONNECTING_ERROR: {
id: "daemon.connect.error",
Expand Down Expand Up @@ -695,7 +695,7 @@ const messages = defineMessages({
},
DEX_USER_FAILED: {
id: "dex.user.failed",
defaultMessage: "Failed to retreive user information: {originalError}"
defaultMessage: "Failed to retrieve user information: {originalError}"
},
STARTTICKETBUYERV3_FAILED: {
id: "vsp.runautobuyer.failed",
Expand Down
4 changes: 4 additions & 0 deletions app/wallet/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import {
} from "lodash";
import qr from "qr-image";

if (ipcRenderer.on) {
ipcRenderer.on("open-external", (e, url) => openExternalURL(url));
}

export const onAppReloadRequested = (cb) =>
ipcRenderer.on("app-reload-requested", cb);

Expand Down
120 changes: 116 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,126 @@
module github.com/decred/decrediton

go 1.16
go 1.18

require (
decred.org/dcrdex v0.4.3
decred.org/dcrdex v0.5.2
github.com/decred/slog v1.2.0
github.com/jrick/logrotate v1.0.0
)

require (
decred.org/cspp/v2 v2.0.0 // indirect
decred.org/dcrwallet/v2 v2.0.8 // indirect
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/aead/siphash v1.0.1 // indirect
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/btcsuite/btcd v0.22.0-beta.0.20220413172512-bf64c8bdbbbf // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/btcsuite/btcd/btcutil v1.1.1 // indirect
github.com/btcsuite/btcd/btcutil/psbt v1.1.3 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
github.com/btcsuite/btcwallet v0.14.1-0.20220322205928-94c51d7bdbf9 // indirect
github.com/btcsuite/btcwallet/wallet/txauthor v1.2.3 // indirect
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 // indirect
github.com/btcsuite/btcwallet/wallet/txsizes v1.1.0 // indirect
github.com/btcsuite/btcwallet/walletdb v1.4.0 // indirect
github.com/btcsuite/btcwallet/wtxmgr v1.5.0 // indirect
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/blake2b v1.0.0 // indirect
github.com/dchest/siphash v1.2.2 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/base58 v1.0.4 // indirect
github.com/decred/dcrd/addrmgr/v2 v2.0.0 // indirect
github.com/decred/dcrd/blockchain/stake/v4 v4.0.0 // indirect
github.com/decred/dcrd/blockchain/standalone/v2 v2.1.0 // indirect
github.com/decred/dcrd/blockchain/v4 v4.0.2 // indirect
github.com/decred/dcrd/certgen v1.1.2-0.20210914212651-723d86274b0d // indirect
github.com/decred/dcrd/chaincfg/chainhash v1.0.4-0.20210914212651-723d86274b0d // indirect
github.com/decred/dcrd/chaincfg/v3 v3.1.1 // indirect
github.com/decred/dcrd/connmgr/v3 v3.1.0 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20210914212651-723d86274b0d // indirect
github.com/decred/dcrd/crypto/ripemd160 v1.0.2-0.20210914212651-723d86274b0d // indirect
github.com/decred/dcrd/database/v3 v3.0.0 // indirect
github.com/decred/dcrd/dcrec v1.0.1-0.20210914212651-723d86274b0d // indirect
github.com/decred/slog v1.2.0
github.com/jrick/logrotate v1.0.0
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/decred/dcrd/dcrjson/v4 v4.0.0 // indirect
github.com/decred/dcrd/dcrutil/v4 v4.0.0 // indirect
github.com/decred/dcrd/gcs/v3 v3.0.0 // indirect
github.com/decred/dcrd/hdkeychain/v3 v3.1.0 // indirect
github.com/decred/dcrd/lru v1.1.1 // indirect
github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0 // indirect
github.com/decred/dcrd/rpcclient/v7 v7.0.0 // indirect
github.com/decred/dcrd/txscript/v4 v4.0.0 // indirect
github.com/decred/dcrd/wire v1.5.0 // indirect
github.com/decred/go-socks v1.1.0 // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/ethereum/go-ethereum v1.10.20 // indirect
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
github.com/gcash/bchd v0.19.0 // indirect
github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6 // indirect
github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 // indirect
github.com/go-chi/chi/v5 v5.0.1 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/go-bexpr v0.1.10 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/huin/goupnp v1.0.3 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jrick/bitset v1.0.0 // indirect
github.com/jrick/wsrpc/v2 v2.3.4 // indirect
github.com/kkdai/bstream v1.0.0 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/lib/pq v1.10.4 // indirect
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
github.com/lightninglabs/neutrino v0.14.1 // indirect
github.com/lightningnetwork/lnd/clock v1.0.1 // indirect
github.com/lightningnetwork/lnd/queue v1.0.1 // indirect
github.com/lightningnetwork/lnd/ticker v1.0.0 // indirect
github.com/lightningnetwork/lnd/tlv v1.0.2 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.12 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/pointerstructure v1.2.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rjeczalik/notify v0.9.1 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
github.com/urfave/cli/v2 v2.10.2 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.etcd.io/bbolt v1.3.7-0.20220130032806-d5db64bdbfde // indirect
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
lukechampine.com/blake3 v1.1.7 // indirect
)
Loading

0 comments on commit 78a6a3b

Please sign in to comment.