Misc Fixes (#108)

* disallow t addresses

* restrict ccr drafts to current user
This commit is contained in:
Danny Skubak 2019-12-10 15:22:40 -05:00 committed by Daniel Ternyak
parent 59ebf8e971
commit 33411f105d
4 changed files with 6 additions and 2 deletions

View File

@ -48,6 +48,7 @@ def make_ccr_draft():
def get_ccr_drafts(): def get_ccr_drafts():
ccrs = ( ccrs = (
CCR.query CCR.query
.filter_by(user_id=g.current_user.id)
.filter(or_( .filter(or_(
CCR.status == CCRStatus.DRAFT, CCR.status == CCRStatus.DRAFT,
CCR.status == CCRStatus.REJECTED, CCR.status == CCRStatus.REJECTED,

View File

@ -30,6 +30,9 @@ def blockchain_get(path, params=None):
def validate_blockchain_get(path, params=None): def validate_blockchain_get(path, params=None):
if path == '/validate/address' and params and params['address'] and params['address'][0] == 't':
raise ValidationException('T addresses are not allowed')
try: try:
res = blockchain_get(path, params) res = blockchain_get(path, params)
except Exception: except Exception:

View File

@ -65,7 +65,7 @@ export default class RefundAddress extends React.Component<Props, State> {
<Form.Item label="Refund address" validateStatus={status} help={help}> <Form.Item label="Refund address" validateStatus={status} help={help}>
<Input <Input
value={refundAddress || ''} value={refundAddress || ''}
placeholder="Z or T address" placeholder="Z address"
onChange={this.handleChange} onChange={this.handleChange}
disabled={isFetching || isSaving || errorFetching} disabled={isFetching || isSaving || errorFetching}
/> />

View File

@ -78,5 +78,5 @@ export function isValidSaplingAddress(address: string): boolean {
} }
export function isValidAddress(a: string): boolean { export function isValidAddress(a: string): boolean {
return isValidTAddress(a) || isValidSproutAddress(a) || isValidSaplingAddress(a); return isValidSproutAddress(a) || isValidSaplingAddress(a);
} }