Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
1aa2e452
Commit
1aa2e452
authored
Jan 31, 2018
by
Eswara Sai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial commit to check for valid address
parent
938d03b6
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
run-tab.js
src/app/tabs/run-tab.js
+7
-0
contracts.js
test-browser/helpers/contracts.js
+7
-1
ballot.js
test-browser/tests/ballot.js
+8
-2
No files found.
src/app/tabs/run-tab.js
View file @
1aa2e452
...
...
@@ -12,6 +12,7 @@ var copyToClipboard = require('../ui/copy-to-clipboard')
var
Recorder
=
require
(
'../../recorder'
)
var
EventManager
=
remixLib
.
EventManager
var
addTooltip
=
require
(
'../ui/tooltip'
)
var
ethJSUtil
=
require
(
'ethereumjs-util'
)
var
csjs
=
require
(
'csjs-inject'
)
var
css
=
require
(
'./styles/run-tab-styles'
)
...
...
@@ -311,6 +312,12 @@ function contractDropdown (events, appAPI, appEvents, instanceContainer) {
noInstancesText
.
style
.
display
=
'none'
var
contractNames
=
document
.
querySelector
(
`.
${
css
.
contractNames
.
classNames
[
0
]}
`
)
var
address
=
atAddressButtonInput
.
value
if
(
!
ethJSUtil
.
isValidAddress
(
address
))
{
return
modalDialogCustom
.
alert
(
'Invalid address.'
)
}
if
(
/
[
a-f
]
/
.
test
(
address
)
&&
/
[
A-F
]
/
.
test
(
address
)
&&
!
ethJSUtil
.
isValidChecksumAddress
(
address
))
{
return
modalDialogCustom
.
alert
(
'Invalid checksum address.'
)
}
if
(
/.
(
.abi
)
$/
.
exec
(
appAPI
.
currentFile
()))
{
modalDialogCustom
.
confirm
(
null
,
'Do you really want to interact with '
+
address
+
' using the current ABI definition ?'
,
()
=>
{
var
abi
...
...
test-browser/helpers/contracts.js
View file @
1aa2e452
'use strict'
var
deepequal
=
require
(
'deep-equal'
)
var
ethJSUtil
=
require
(
'ethereumjs-util'
)
module
.
exports
=
{
getCompiledContracts
:
getCompiledContracts
,
...
...
@@ -161,11 +162,16 @@ function setEditorValue (value, callback) {
return
this
}
function
addInstance
(
browser
,
address
,
callback
)
{
function
addInstance
(
browser
,
address
,
isValidFormat
,
isValidChecksum
,
callback
)
{
browser
.
setValue
(
'.ataddressinput'
,
address
,
function
()
{
browser
.
click
(
'div[class^="atAddress"]'
)
.
perform
((
client
,
done
)
=>
{
browser
.
execute
(
function
()
{
if
(
!
isValidFormat
)
{
browser
.
assert
.
fail
(
document
.
querySelector
(
'div[class^="modalBody"] div'
).
innerHTML
,
'Invalid address.'
,
''
)
}
else
if
(
!
isValidChecksum
)
{
browser
.
assert
.
fail
(
document
.
querySelector
(
'div[class^="modalBody"] div'
).
innerHTML
,
'Invalid checksum address.'
,
''
)
}
document
.
querySelector
(
'#modal-footer-ok'
).
click
()
},
[],
function
(
result
)
{
done
()
...
...
test-browser/tests/ballot.js
View file @
1aa2e452
...
...
@@ -72,8 +72,14 @@ function runTests (browser, testData) {
})
})
.
perform
((
client
,
done
)
=>
{
console
.
log
(
'addInstance 0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
)
contractHelper
.
addInstance
(
browser
,
'0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
,
()
=>
{
console
.
log
(
'addInstance invalid checksum address 0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
)
contractHelper
.
addInstance
(
browser
,
'0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
,
true
,
false
,
()
=>
{
done
()
})
})
.
perform
((
client
,
done
)
=>
{
console
.
log
(
'addInstance 0x692a70D2e424a56D2C6C27aA97D1a86395877b3A'
)
contractHelper
.
addInstance
(
browser
,
'0x692a70D2e424a56D2C6C27aA97D1a86395877b3A'
,
true
,
true
,
()
=>
{
done
()
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment