-
-
+
diff --git a/client/webserver/site/src/js/forms.ts b/client/webserver/site/src/js/forms.ts
index 037aca5f43..31550d8063 100644
--- a/client/webserver/site/src/js/forms.ts
+++ b/client/webserver/site/src/js/forms.ts
@@ -417,6 +417,7 @@ export class WalletConfigForm {
textInputTmpl: PageElement
dateInputTmpl: PageElement
checkboxTmpl: PageElement
+ repeatableTmplOuter: PageElement
repeatableTmpl: PageElement
fileSelector: PageElement
fileInput: PageElement
@@ -449,8 +450,14 @@ export class WalletConfigForm {
this.dateInputTmpl.remove()
this.checkboxTmpl = Doc.tmplElement(form, 'checkbox')
this.checkboxTmpl.remove()
- this.repeatableTmpl = Doc.tmplElement(form, 'repeatableInput')
+ // repeatableTmplOuter holds the repeatableInput element that we will
+ // duplicate. Outer also exists to be duplicated but can be used to find
+ // the last child per repeatableInput chain.
+ this.repeatableTmplOuter = Doc.tmplElement(form, 'repeatableInputOuter')
+ // repeatableTmpl is only ever copied and the copies are used.
+ this.repeatableTmpl = Doc.tmplElement(this.repeatableTmplOuter, 'repeatableInput')
this.repeatableTmpl.remove()
+ this.repeatableTmplOuter.remove()
this.fileSelector = Doc.tmplElement(form, 'fileSelector')
this.fileInput = Doc.tmplElement(form, 'fileInput')
this.errMsg = Doc.tmplElement(form, 'errMsg')
@@ -507,18 +514,52 @@ export class WalletConfigForm {
if (loadedOpts + defaultOpts === 0) Doc.hide(this.showOther, this.otherSettings)
}
- addOpt (box: HTMLElement, opt: ConfigOption, insertAfter?: PageElement, n?: number): PageElement {
+ /*
+ * copyRepeatableOpt copies the repeatable option that can be used for the
+ * ith place.
+ */
+ copyRepeatableOpt (opt: ConfigOption, i: number): ConfigOption {
+ const description = opt.repeatableDescription ? opt.repeatableDescription[i] : ''
+ const displayname = opt.repeatableDisplayName ? opt.repeatableDisplayName[i] : ''
+ return {
+ key: opt.key,
+ displayname: displayname,
+ description: description,
+ repeatableDisplayName: opt.repeatableDisplayName,
+ repeatableDescription: opt.repeatableDescription,
+ required: true,
+ default: ''
+ }
+ }
+
+ /*
+ * addOpt adds options. n and noClick are used with repeatable options. n is
+ * always the package level repeatableCounter.
+ */
+ addOpt (box: HTMLElement, opt: ConfigOption, n?: number, noClick?: boolean): PageElement {
const elID = 'wcfg-' + opt.key + (n ? String(n) : '')
let el: HTMLElement
if (opt.isboolean) el = this.checkboxTmpl.cloneNode(true) as HTMLElement
else if (opt.isdate) el = this.dateInputTmpl.cloneNode(true) as HTMLElement
- else if (opt.repeatable) {
+ else if (opt.repeatableDescription) {
el = this.repeatableTmpl.cloneNode(true) as HTMLElement
- el.classList.add('repeatable')
- Doc.bind(Doc.tmplElement(el, 'add'), 'click', () => {
- repeatableCounter++
- this.addOpt(box, opt, el, repeatableCounter)
- })
+ if (noClick) {
+ // Disable adding for all but the first repeatable option of a set.
+ Doc.hide(Doc.tmplElement(el, 'add'))
+ } else {
+ // Adding for repeatable options may add several elements to the end
+ // of box.
+ Doc.bind(Doc.tmplElement(el, 'add'), 'click', () => {
+ repeatableCounter++
+ if (opt.repeatableDescription) {
+ for (let i = 0; i < opt.repeatableDescription.length; i++) {
+ const o = this.copyRepeatableOpt(opt, i)
+ if (i === 0) this.addOpt(box, o, repeatableCounter)
+ else this.addOpt(box, o, repeatableCounter, true)
+ }
+ }
+ })
+ }
} else el = this.textInputTmpl.cloneNode(true) as HTMLElement
this.configElements.push([opt, el])
const input = el.querySelector('input') as ConfigOptionInput
@@ -533,8 +574,7 @@ export class WalletConfigForm {
label.prepend(logo)
opt.regAsset = this.formOpts.assetID // Signal for map filtering
}
- if (insertAfter) insertAfter.after(el)
- else box.appendChild(el)
+ box.appendChild(el)
if (opt.noecho) {
input.type = 'password'
input.autocomplete = 'off'
@@ -580,7 +620,26 @@ export class WalletConfigForm {
const defaultedOpts = []
for (const opt of this.configOpts) {
if (this.sectionize && opt.default !== null) defaultedOpts.push(opt)
- else this.addOpt(this.dynamicOpts, opt)
+ else if (opt.repeatableDescription) {
+ // Add the repeatable template outer element back to the DOM if
+ // repeatables will be used.
+ //
+ // TODO: This is not correct if a repeatable option is used more than
+ // once in a form. More boxes will need to be created and inserted into
+ // the DOM.
+ const box = this.repeatableTmplOuter
+ this.dynamicOpts.appendChild(box)
+ for (let i = 0; i < opt.repeatableDescription.length; i++) {
+ const o = this.copyRepeatableOpt(opt, i)
+ if (i === 0) this.addOpt(box, o, repeatableCounter)
+ else {
+ repeatableCounter++
+ this.addOpt(box, o, repeatableCounter, true)
+ }
+ }
+ } else {
+ this.addOpt(this.dynamicOpts, opt)
+ }
}
if (defaultedOpts.length) {
for (const opt of defaultedOpts) {
@@ -623,21 +682,37 @@ export class WalletConfigForm {
const [opt, el] = r
const v = cfg[opt.key]
if (v === undefined) continue
- if (opt.repeatable) {
+ if (opt.repeatableDescription) {
+ // Replace all repeatable options with new ones.
+ removes.push(r)
if (handledRepeatables[opt.key]) {
- removes.push(r)
continue
}
handledRepeatables[opt.key] = true
- const vals = v.split(opt.repeatable)
- const firstVal = vals[0]
- finds.push(el)
- Doc.safeSelector(el, 'input').value = firstVal
- for (let i = 1; i < vals.length; i++) {
- repeatableCounter++
- const newEl = this.addOpt(el.parentElement as PageElement, opt, el, repeatableCounter)
- Doc.safeSelector(newEl, 'input').value = vals[i]
- finds.push(newEl)
+ // TODO: This is not correct if a repeatable option is used more than
+ // once in a form. More boxes will need to be created and inserted into
+ // the DOM.
+ const box = this.repeatableTmplOuter
+ let child = box.lastChild
+ while (child) {
+ child.remove()
+ child = box.lastChild
+ }
+ const numVal = opt.repeatableDescription.length
+ // Repeatable option values are stored as an array of array of strings.
+ // The outer array is the number of value sets stored while inner
+ // arrays have the same number of values as descriptions/display names.
+ // There is one new element per inner value.
+ const vals: string[][] = JSON.parse(v)
+ for (let i = 0; i < vals.length; i++) {
+ const valSet = vals[i]
+ for (let j = 0; j < numVal; j++) {
+ repeatableCounter++
+ const o = this.copyRepeatableOpt(opt, j)
+ const newEl = (j === 0) ? this.addOpt(box, o, repeatableCounter) : this.addOpt(box, o, repeatableCounter, true)
+ if (valSet.length > j) Doc.safeSelector(newEl, 'input').value = valSet[j]
+ finds.push(newEl)
+ }
}
continue
}
@@ -647,6 +722,7 @@ export class WalletConfigForm {
else if (opt.isdate) input.valueAsDate = new Date(parseInt(v) * 1000)
else input.value = v
}
+ app().bindTooltips(this.allSettings)
for (const r of removes) {
const i = this.configElements.indexOf(r)
if (i >= 0) this.configElements.splice(i, 1)
@@ -686,9 +762,39 @@ export class WalletConfigForm {
if (date < minDate) date = minDate
else if (date > maxDate) date = maxDate
config[opt.key] = '' + date
+ } else if (opt.repeatableDescription) {
+ // Reapeatables are stored as the json string representation of an array
+ // of an array of strings. The outer array is the number of value sets.
+ // The inner array is a value set of repeatables.
+ const numRep = opt.repeatableDescription.length
+ const vals: string[][] = (config[opt.key]) ? JSON.parse(config[opt.key]) : null
+ if (!vals || vals.length === 0) {
+ if (numRep === 1 && input.value === '') continue
+ config[opt.key] = JSON.stringify([[input.value]])
+ continue
+ }
+ const lastVals = vals[vals.length - 1]
+ if (lastVals.length % numRep === 0) {
+ // New set of values.
+ if (numRep === 1 && input.value === '') continue
+ vals.push([input.value])
+ } else {
+ // Append to the last values and delete them all if all are empty
+ // arrays.
+ lastVals.push(input.value)
+ if (lastVals.length === numRep) {
+ let allEmpty = true
+ lastVals.forEach(val => { if (val !== '') allEmpty = false })
+ if (allEmpty) {
+ if (numRep !== 1) vals.pop()
+ } else {
+ vals[vals.length - 1] = lastVals
+ }
+ }
+ }
+ config[opt.key] = JSON.stringify(vals)
} else if (input.value) {
- if (opt.repeatable && config[opt.key]) config[opt.key] += opt.repeatable + input.value
- else config[opt.key] = input.value
+ config[opt.key] = input.value
}
}
return config
diff --git a/client/webserver/site/src/js/registry.ts b/client/webserver/site/src/js/registry.ts
index 5d9f102627..ae4da6013f 100644
--- a/client/webserver/site/src/js/registry.ts
+++ b/client/webserver/site/src/js/registry.ts
@@ -227,7 +227,8 @@ export interface ConfigOption {
isdate: boolean
disablewhenactive: boolean
isBirthdayConfig: boolean
- repeatable?: string
+ repeatableDescription?: string[]
+ repeatableDisplayName?: string[]
noauth: boolean
regAsset?: number
required?: boolean
diff --git a/dex/networks/eth/common.go b/dex/networks/eth/common.go
index 4bb734189e..7b4b0b9f31 100644
--- a/dex/networks/eth/common.go
+++ b/dex/networks/eth/common.go
@@ -6,9 +6,13 @@
package eth
import (
+ "encoding/hex"
"fmt"
+ "net/http"
+ "strings"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/node"
)
// DecodeCoinID decodes the coin ID into a common.Hash. For eth, there are no
@@ -27,3 +31,15 @@ func DecodeCoinID(coinID []byte) (common.Hash, error) {
// SecretHashSize is the byte-length of the hash of the secret key used in
// swaps.
const SecretHashSize = 32
+
+// JWTHTTPAuthFn returns a function that creates a signed jwt token using the
+// provided secret and inserts it into the passed header.
+func JWTHTTPAuthFn(jwtStr string) (func(h http.Header) error, error) {
+ s, err := hex.DecodeString(strings.TrimPrefix(jwtStr, "0x"))
+ if err != nil {
+ return nil, err
+ }
+ var secret [32]byte
+ copy(secret[:], s)
+ return node.NewJWTAuth(secret), nil
+}
diff --git a/dex/testing/dcrdex/harness.sh b/dex/testing/dcrdex/harness.sh
index ff95ae0591..b1638a8170 100755
--- a/dex/testing/dcrdex/harness.sh
+++ b/dex/testing/dcrdex/harness.sh
@@ -72,6 +72,13 @@ ETH_ON=$?
set -e
+if [ $ETH_ON -eq 0 ]; then
+ cat > "${DCRDEX_DATA_DIR}/geth.conf" < "${NODE_DIR}/jwt.hex" < "${NODE_DIR}/eth.conf" < :",
+ cfgPath: tFilePath,
+ cfg: "addr:ws://1234\njwt=asdf",
+ net: dex.Simnet,
+ wantErr: true,
+ }, {
+ name: "no addr",
+ cfgPath: tFilePath,
+ cfg: "jwt=abcd",
+ net: dex.Simnet,
+ wantErr: true,
+ }, {
+ name: "not ipc but no jwt",
+ cfgPath: tFilePath,
+ cfg: "addr=ws://1234",
+ net: dex.Simnet,
+ wantErr: true,
+ }, {
+ name: "not ipc and bad jwt",
+ cfgPath: tFilePath,
+ cfg: "addr=ws://1234\njwt=saadbeef",
+ net: dex.Simnet,
+ wantErr: true,
+ }}
+ for _, test := range tests {
+ if test.cfg != "" {
+ err := os.WriteFile(test.cfgPath, []byte(test.cfg), 0666)
+ if err != nil {
+ t.Fatal(err)
+ }
+ }
+ _, err := loadConfig(test.cfgPath, test.net, tLogger)
+ if test.wantErr {
+ if err == nil {
+ t.Fatalf("expected error for test %q", test.name)
+ }
+ continue
+ }
+ if err != nil {
+ t.Fatalf("unexpected error for test %q: %v", test.name, err)
+ }
+ }
+}
+
+func TestFindJWTHex(t *testing.T) {
+ tDir := t.TempDir()
+ tFilePath := filepath.Join(tDir, "jwt.hex")
+ tests := []struct {
+ name, jwtFileContents, jwt, wantHex string
+ noPerms bool
+ wantErr bool
+ }{{
+ name: "ok hex",
+ jwt: "baadbeef",
+ wantHex: "baadbeef",
+ }, {
+ name: "ok file",
+ jwt: tFilePath,
+ jwtFileContents: "baadbeef\n",
+ wantHex: "baadbeef",
+ }, {
+ name: "not hex and no file",
+ jwt: tFilePath,
+ wantErr: true,
+ }, {
+ name: "not hex but cant read file",
+ jwt: tFilePath,
+ jwtFileContents: "baadbeef\n",
+ noPerms: true,
+ wantErr: true,
+ }, {
+ name: "not hex and bad hex in file",
+ jwt: tFilePath,
+ jwtFileContents: "saadbeef\n",
+ wantErr: true,
+ }}
+ for _, test := range tests {
+ if test.jwtFileContents != "" {
+ perms := fs.FileMode(0666)
+ if test.noPerms {
+ perms = 0000
+ }
+ err := os.WriteFile(tFilePath, []byte(test.jwtFileContents), perms)
+ if err != nil {
+ t.Fatal(err)
+ }
+ }
+ hex, err := findJWTHex(test.jwt)
+ if test.jwtFileContents != "" {
+ os.Remove(tFilePath)
+ }
+ if test.wantErr {
+ if err == nil {
+ t.Fatalf("expected error for test %q", test.name)
+ }
+ continue
+ }
+ if err != nil {
+ t.Fatalf("unexpected error for test %q: %v", test.name, err)
+ }
+ if hex != test.wantHex {
+ t.Fatalf("wanted jwt %q but got %q for test %q", test.wantHex, hex, test.name)
+ }
+ }
+}
diff --git a/server/asset/eth/rpcclient.go b/server/asset/eth/rpcclient.go
index e9adbd2515..b5f8f2c704 100644
--- a/server/asset/eth/rpcclient.go
+++ b/server/asset/eth/rpcclient.go
@@ -9,6 +9,9 @@ import (
"context"
"fmt"
"math/big"
+ "net/http"
+ "net/url"
+ "strings"
"decred.org/dcrdex/dex"
dexeth "decred.org/dcrdex/dex/networks/eth"
@@ -34,7 +37,7 @@ type ContextCaller interface {
type rpcclient struct {
net dex.Network
- ipc string
+ ep *endpoint
// ec wraps a *rpc.Client with some useful calls.
ec *ethclient.Client
// caller is a client for raw calls not implemented by *ethclient.Client.
@@ -48,21 +51,43 @@ type rpcclient struct {
tokens map[uint32]*tokener
}
-func newRPCClient(net dex.Network, ipc string) *rpcclient {
+func newRPCClient(net dex.Network, ep *endpoint) *rpcclient {
return &rpcclient{
net: net,
tokens: make(map[uint32]*tokener),
- ipc: ipc,
+ ep: ep,
}
}
// connect connects to an ipc socket. It then wraps ethclient's client and
// bundles commands in a form we can easily use.
func (c *rpcclient) connect(ctx context.Context) error {
- client, err := rpc.DialIPC(ctx, c.ipc)
- if err != nil {
- return fmt.Errorf("unable to dial rpc: %v", err)
+ var client *rpc.Client
+ var err error
+ addr := c.ep.addr
+ if strings.HasSuffix(addr, ".ipc") {
+ client, err = rpc.DialIPC(ctx, addr)
+ if err != nil {
+ return err
+ }
+ } else {
+ var wsURL *url.URL
+ wsURL, err = url.Parse(addr)
+ if err != nil {
+ return fmt.Errorf("Failed to parse url %q", addr)
+ }
+ wsURL.Scheme = "ws"
+ var authFn func(h http.Header) error
+ authFn, err = dexeth.JWTHTTPAuthFn(c.ep.jwt)
+ if err != nil {
+ return fmt.Errorf("unable to create auth function: %v", err)
+ }
+ client, err = rpc.DialOptions(ctx, wsURL.String(), rpc.WithHTTPAuth(authFn))
+ if err != nil {
+ return err
+ }
}
+
c.ec = ethclient.NewClient(client)
netAddrs, found := dexeth.ContractAddresses[ethContractVersion]
diff --git a/server/asset/eth/rpcclient_harness_test.go b/server/asset/eth/rpcclient_harness_test.go
index ad800e939d..e3cb0564b5 100644
--- a/server/asset/eth/rpcclient_harness_test.go
+++ b/server/asset/eth/rpcclient_harness_test.go
@@ -40,7 +40,7 @@ func TestMain(m *testing.M) {
run := func() (int, error) {
var cancel context.CancelFunc
ctx, cancel = context.WithCancel(context.Background())
- ethClient = newRPCClient(dex.Simnet, ipc)
+ ethClient = newRPCClient(dex.Simnet, &endpoint{addr: ipc})
defer func() {
cancel()
ethClient.shutdown()
@@ -51,7 +51,6 @@ func TestMain(m *testing.M) {
netToken := dexeth.Tokens[testTokenID].NetTokens[dex.Simnet]
netToken.Address = getContractAddrFromFile(tokenErc20AddrFile)
netToken.SwapContracts[0].Address = getContractAddrFromFile(tokenSwapAddrFile)
- registerToken(testTokenID, 0)
if err := ethClient.connect(ctx); err != nil {
return 1, fmt.Errorf("Connect error: %w", err)
@@ -152,8 +151,9 @@ func testAccountBalance(t *testing.T, assetID uint32) {
t.Fatalf("accountBalance error: %v", err)
}
+ // NOTE: Token transfers use eth for the fee, so token difference is exact.
diff := new(big.Int).Sub(balBefore, balAfter)
- if diff.Cmp(dexeth.GweiToWei(vGwei)) <= 0 {
+ if diff.Cmp(dexeth.GweiToWei(vGwei)) < 0 {
t.Fatalf("account balance changed by %d. expected > %d", dexeth.WeiToGwei(diff), uint64(vGwei))
}
}