Skip to content

/ ethereum-remote-client

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.

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

V7.7.5 Upstream Changes #124

Merged
merged 12 commits into from Feb 25, 2020
+285 −87
Merged

V7.7.5 Upstream Changes #124

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
06e78ed
Update data on Approve screen after updating custom spend limit (#7918)
Gudahtt Jan 28, 2020
aa00b6e
Allow editing max spend limit (#7919)
Gudahtt Jan 29, 2020
1a61f15
Validate custom spend limit (#7920)
Gudahtt Jan 29, 2020
14db519
Only resolve ENS on mainnet (#7944)
Gudahtt Jan 30, 2020
2b1a9ae
Update ENS registry addresses (#7954)
whymarrh Jan 30, 2020
f3db446
Update ethereum-ens-network-map in lockfile (#7959)
whymarrh Jan 30, 2020
a86d3f6
Inline the source text not the binary encoding for inpage script (#8053)
danfinlay Feb 14, 2020
385b2ba
Add warning to watchAsset API when editing a known token (#8049)
danfinlay Feb 14, 2020
8c2ab4b
Update Wyre ETH purchase url (#8051)
Gudahtt Feb 14, 2020
ba0f7fe
Update packages to address security advisory (#8061)
Gudahtt Feb 18, 2020
617faa4
Attempt ENS resolution on any valid domain name (#8059)
Gudahtt Feb 18, 2020
a6203f2
Update dependencies to resolve security advisories (#8064)
whymarrh Feb 18, 2020
File filter...
Filter file types
Clear filters
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Inline the source text not the binary encoding for inpage script (#8053)

  • Loading branch information
@danfinlay @ryanml
danfinlay authored and ryanml committed Feb 14, 2020
commit a86d3f6436e35964a56763a99b42715778ca4361
2 app/scripts/contentscript.js
View file
Open in desktop
@@ -9,7 +9,7 @@ const ObjectMultiplex = require('obj-multiplex')
const extension = require('extensionizer')
const PortStream = require('extension-port-stream')

const inpageContent = fs.readFileSync(path.join(__dirname, '..', '..', 'dist', 'chrome', 'inpage.js')).toString()
const inpageContent = fs.readFileSync(path.join(__dirname, '..', '..', 'dist', 'chrome', 'inpage.js'), 'utf8')
const inpageSuffix = '//# sourceURL=' + extension.runtime.getURL('inpage.js') + '\n'
const inpageBundle = inpageContent + inpageSuffix

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.