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.

Sign up for GitHub

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

mm: Fix multi split option related bugs #2866

Merged
merged 1 commit into from
Jul 15, 2024
Merged

mm: Fix multi split option related bugs #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions client/asset/bch/bch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,24 @@ var (
Description: "Connect to bitcoind",
DefaultConfigPath: dexbtc.SystemConfigPath("bitcoin"), // Same as bitcoin. That's dumb.
ConfigOpts: append(btc.RPCConfigOpts("Bitcoin Cash", ""), btc.CommonConfigOpts("BCH", true)...),
MultiFundingOpts: btc.MultiFundingOpts,
}
spvWalletDefinition = &asset.WalletDefinition{
Type: walletTypeSPV,
Tab: "Native",
Description: "Use the built-in SPV wallet",
ConfigOpts: btc.CommonConfigOpts("BCH", true),
Seeded: true,
Type: walletTypeSPV,
Tab: "Native",
Description: "Use the built-in SPV wallet",
ConfigOpts: btc.CommonConfigOpts("BCH", true),
Seeded: true,
MultiFundingOpts: btc.MultiFundingOpts,
}

electrumWalletDefinition = &asset.WalletDefinition{
Type: walletTypeElectrum,
Tab: "Electron Cash (external)",
Description: "Use an external Electron Cash (BCH Electrum fork) Wallet",
// json: DefaultConfigPath: filepath.Join(btcutil.AppDataDir("electrom-cash", false), "config"), // maybe?
ConfigOpts: btc.CommonConfigOpts("BCH", true),
ConfigOpts: btc.CommonConfigOpts("BCH", true),
MultiFundingOpts: btc.MultiFundingOpts,
}

// WalletInfo defines some general information about a Bitcoin Cash wallet.
Expand Down
9 changes: 5 additions & 4 deletions client/asset/btc/btc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ var (
defaultWalletBirthdayUnix = 1622668320
DefaultWalletBirthday = time.Unix(int64(defaultWalletBirthdayUnix), 0)

multiFundingOpts = []*asset.OrderOption{
MultiFundingOpts = []*asset.OrderOption{
{
ConfigOption: asset.ConfigOption{
Key: multiSplitKey,
Expand Down Expand Up @@ -185,23 +185,24 @@ var (
Description: "Connect to bitcoind",
DefaultConfigPath: dexbtc.SystemConfigPath("bitcoin"),
ConfigOpts: append(RPCConfigOpts("Bitcoin", "8332"), CommonConfigOpts("BTC", true)...),
MultiFundingOpts: multiFundingOpts,
MultiFundingOpts: MultiFundingOpts,
}
spvWalletDefinition = &asset.WalletDefinition{
Type: walletTypeSPV,
Tab: "Native",
Description: "Use the built-in SPV wallet",
ConfigOpts: CommonConfigOpts("BTC", true),
Seeded: true,
MultiFundingOpts: multiFundingOpts,
MultiFundingOpts: MultiFundingOpts,
}

electrumWalletDefinition = &asset.WalletDefinition{
Type: walletTypeElectrum,
Tab: "Electrum (external)",
Description: "Use an external Electrum Wallet",
// json: DefaultConfigPath: filepath.Join(btcutil.AppDataDir("electrum", false), "config"), // e.g. ~/.electrum/config
ConfigOpts: append(append(ElectrumConfigOpts, CommonConfigOpts("BTC", false)...), apiFallbackOpt(false)),
ConfigOpts: append(append(ElectrumConfigOpts, CommonConfigOpts("BTC", false)...), apiFallbackOpt(false)),
MultiFundingOpts: MultiFundingOpts,
}

// WalletInfo defines some general information about a Bitcoin wallet.
Expand Down
22 changes: 9 additions & 13 deletions client/asset/ltc/ltc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,29 @@ var (
Testnet: "19332",
Simnet: "19443",
}
walletNameOpt = []*asset.ConfigOption{ // slice for easy appends
{
Key: "walletname",
DisplayName: "Wallet Name",
Description: "The wallet name",
},
}
rpcWalletDefinition = &asset.WalletDefinition{
Type: walletTypeRPC,
Tab: "Litecoin Core (external)",
Description: "Connect to litecoind",
DefaultConfigPath: dexbtc.SystemConfigPath("litecoin"),
ConfigOpts: append(btc.RPCConfigOpts("Litecoin", "9332"), btc.CommonConfigOpts("LTC", true)...),
MultiFundingOpts: btc.MultiFundingOpts,
}
electrumWalletDefinition = &asset.WalletDefinition{
Type: walletTypeElectrum,
Tab: "Electrum-LTC (external)",
Description: "Use an external Electrum-LTC Wallet",
// json: DefaultConfigPath: filepath.Join(btcutil.AppDataDir("electrum-ltc", false), "config"), // e.g. ~/.electrum-ltc/config ConfigOpts: append(rpcOpts, commonOpts...),
ConfigOpts: append(btc.ElectrumConfigOpts, btc.CommonConfigOpts("LTC", true)...),
ConfigOpts: append(btc.ElectrumConfigOpts, btc.CommonConfigOpts("LTC", true)...),
MultiFundingOpts: btc.MultiFundingOpts,
}
spvWalletDefinition = &asset.WalletDefinition{
Type: walletTypeSPV,
Tab: "Native",
Description: "Use the built-in SPV wallet",
ConfigOpts: btc.CommonConfigOpts("LTC", true),
Seeded: true,
Type: walletTypeSPV,
Tab: "Native",
Description: "Use the built-in SPV wallet",
ConfigOpts: btc.CommonConfigOpts("LTC", true),
Seeded: true,
MultiFundingOpts: btc.MultiFundingOpts,
}
// WalletInfo defines some general information about a Litecoin wallet.
WalletInfo = &asset.WalletInfo{
Expand Down
1 change: 1 addition & 0 deletions client/asset/zec/zec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ var (
DefaultConfigPath: dexbtc.SystemConfigPath("zcash"),
ConfigOpts: configOpts,
NoAuth: true,
MultiFundingOpts: btc.MultiFundingOpts,
}},
}

Expand Down
1 change: 1 addition & 0 deletions client/webserver/locales/en-us.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,4 +627,5 @@ var EnUS = map[string]*intl.Translation{
"remotegap_tooltip": {T: "The buy-sell spread on the linked cex market"},
"max_zero_no_fees": {T: `<span id="maxZeroNoFeesTicker"></span> balance < min fees ~<span id="maxZeroMinFees"></span>`},
"max_zero_no_bal": {T: `low <span id="maxZeroNoBalTicker"></span> balance`},
"Wallet Options": {T: "Wallet Options"},
}
2 changes: 1 addition & 1 deletion client/webserver/site/src/html/mmsettings.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
<div class="col-12 px-3 py-2 flex-stretch-column">
<div class="d-flex align-items-center">
<span class="ico-settings fs15 pe-2"></span>
<span class="fs18">Wallet Options</span>
<span class="fs18">[[[Wallet Options]]]</span>
</div>
<div data-tmpl="walletSettingsNone" class="text-center p-2 my-2 border-top border-bottom rounded3">no settings available</div>
<div data-tmpl="walletSettings" class="flex-stretch-column fs15">
Expand Down
1 change: 1 addition & 0 deletions client/webserver/site/src/js/mmsettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,6 +2368,7 @@ class AssetPane {
for (const optKey of optKeys) Doc.setVis(vis, optToDiv[optKey])
}
const addOpt = (opt: OrderOption) => {
if (opt.quoteAssetOnly && !this.isQuote) return
const currVal = walletConfig[opt.key]
let div: PageElement | undefined
if (opt.isboolean) {
Expand Down
Loading