Merge branch 'development' of github.com:gnosis/safe-react into feature/txsCollectibles
This commit is contained in:
Mati Dastugue
commit
678d7ed5a4
|
|
@ -170,6 +170,7 @@
|
|||
"electron-settings": "^4.0.0",
|
||||
"electron-updater": "4.3.1",
|
||||
"eth-sig-util": "^2.5.3",
|
||||
"ethereum-blockies-base64": "^1.0.2",
|
||||
"express": "^4.17.1",
|
||||
"final-form": "^4.20.0",
|
||||
"final-form-calculate": "^1.3.1",
|
||||
|
|
|
|||
|
|
@ -1,358 +0,0 @@
|
|||
/**
|
||||
* A handy class to calculate color values.
|
||||
*
|
||||
* @version 1.0
|
||||
* @author Robert Eisele <robert@xarg.org>
|
||||
* @copyright Copyright (c) 2010, Robert Eisele
|
||||
* @link http://www.xarg.org/2010/03/generate-client-side-png-files-using-javascript/
|
||||
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
|
||||
*
|
||||
*/
|
||||
|
||||
// helper functions for that ctx
|
||||
function write(buffer, offs, ...rest) {
|
||||
for (let i = 0; i < rest.length; i++) {
|
||||
for (let j = 0; j < rest[i].length; j++) {
|
||||
buffer[offs++] = rest[i].charAt(j)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function byte2(w) {
|
||||
return String.fromCharCode((w >> 8) & 255, w & 255)
|
||||
}
|
||||
|
||||
function byte4(w) {
|
||||
return String.fromCharCode((w >> 24) & 255, (w >> 16) & 255, (w >> 8) & 255, w & 255)
|
||||
}
|
||||
|
||||
function byte2lsb(w) {
|
||||
return String.fromCharCode(w & 255, (w >> 8) & 255)
|
||||
}
|
||||
|
||||
const PNG = function (width, height, depth) {
|
||||
this.width = width
|
||||
this.height = height
|
||||
this.depth = depth
|
||||
|
||||
// pixel data and row filter identifier size
|
||||
this.pix_size = height * (width + 1)
|
||||
|
||||
// deflate header, pix_size, block headers, adler32 checksum
|
||||
this.data_size = 2 + this.pix_size + 5 * Math.floor((0xfffe + this.pix_size) / 0xffff) + 4
|
||||
|
||||
// offsets and sizes of Png chunks
|
||||
this.ihdr_offs = 0 // IHDR offset and size
|
||||
this.ihdr_size = 4 + 4 + 13 + 4
|
||||
this.plte_offs = this.ihdr_offs + this.ihdr_size // PLTE offset and size
|
||||
this.plte_size = 4 + 4 + 3 * depth + 4
|
||||
this.trns_offs = this.plte_offs + this.plte_size // tRNS offset and size
|
||||
this.trns_size = 4 + 4 + depth + 4
|
||||
this.idat_offs = this.trns_offs + this.trns_size // IDAT offset and size
|
||||
this.idat_size = 4 + 4 + this.data_size + 4
|
||||
this.iend_offs = this.idat_offs + this.idat_size // IEND offset and size
|
||||
this.iend_size = 4 + 4 + 4
|
||||
this.buffer_size = this.iend_offs + this.iend_size // total PNG size
|
||||
|
||||
this.buffer = []
|
||||
this.palette = {}
|
||||
this.pindex = 0
|
||||
|
||||
const _crc32 = []
|
||||
|
||||
// initialize buffer with zero bytes
|
||||
for (let i = 0; i < this.buffer_size; i++) {
|
||||
this.buffer[i] = '\x00'
|
||||
}
|
||||
|
||||
// initialize non-zero elements
|
||||
write(this.buffer, this.ihdr_offs, byte4(this.ihdr_size - 12), 'IHDR', byte4(width), byte4(height), '\x08\x03')
|
||||
write(this.buffer, this.plte_offs, byte4(this.plte_size - 12), 'PLTE')
|
||||
write(this.buffer, this.trns_offs, byte4(this.trns_size - 12), 'tRNS')
|
||||
write(this.buffer, this.idat_offs, byte4(this.idat_size - 12), 'IDAT')
|
||||
write(this.buffer, this.iend_offs, byte4(this.iend_size - 12), 'IEND')
|
||||
|
||||
// initialize deflate header
|
||||
let header = ((8 + (7 << 4)) << 8) | (3 << 6)
|
||||
header += 31 - (header % 31)
|
||||
|
||||
write(this.buffer, this.idat_offs + 8, byte2(header))
|
||||
|
||||
// initialize deflate block headers
|
||||
for (let i = 0; (i << 16) - 1 < this.pix_size; i++) {
|
||||
let size, bits
|
||||
if (i + 0xffff < this.pix_size) {
|
||||
size = 0xffff
|
||||
bits = '\x00'
|
||||
} else {
|
||||
size = this.pix_size - (i << 16) - i
|
||||
bits = '\x01'
|
||||
}
|
||||
write(this.buffer, this.idat_offs + 8 + 2 + (i << 16) + (i << 2), bits, byte2lsb(size), byte2lsb(~size))
|
||||
}
|
||||
|
||||
/* Create crc32 lookup table */
|
||||
for (let i = 0; i < 256; i++) {
|
||||
let c = i
|
||||
for (let j = 0; j < 8; j++) {
|
||||
if (c & 1) {
|
||||
c = -306674912 ^ ((c >> 1) & 0x7fffffff)
|
||||
} else {
|
||||
c = (c >> 1) & 0x7fffffff
|
||||
}
|
||||
}
|
||||
_crc32[i] = c
|
||||
}
|
||||
|
||||
// compute the index into a png for a given pixel
|
||||
this.index = function (x, y) {
|
||||
const i = y * (this.width + 1) + x + 1
|
||||
const j = this.idat_offs + 8 + 2 + 5 * Math.floor(i / 0xffff + 1) + i
|
||||
return j
|
||||
}
|
||||
|
||||
// convert a color and build up the palette
|
||||
this.color = function (red, green, blue, alpha) {
|
||||
alpha = alpha >= 0 ? alpha : 255
|
||||
const color = (((((alpha << 8) | red) << 8) | green) << 8) | blue
|
||||
|
||||
if (typeof this.palette[color] === 'undefined') {
|
||||
if (this.pindex === this.depth) return '\x00'
|
||||
|
||||
const ndx = this.plte_offs + 8 + 3 * this.pindex
|
||||
|
||||
this.buffer[ndx + 0] = String.fromCharCode(red)
|
||||
this.buffer[ndx + 1] = String.fromCharCode(green)
|
||||
this.buffer[ndx + 2] = String.fromCharCode(blue)
|
||||
this.buffer[this.trns_offs + 8 + this.pindex] = String.fromCharCode(alpha)
|
||||
|
||||
this.palette[color] = String.fromCharCode(this.pindex++)
|
||||
}
|
||||
return this.palette[color]
|
||||
}
|
||||
|
||||
// output a PNG string, Base64 encoded
|
||||
this.getBase64 = function () {
|
||||
const s = this.getDump()
|
||||
|
||||
const ch = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
|
||||
let c1, c2, c3, e1, e2, e3, e4
|
||||
const l = s.length
|
||||
let i = 0
|
||||
let r = ''
|
||||
|
||||
do {
|
||||
c1 = s.charCodeAt(i)
|
||||
e1 = c1 >> 2
|
||||
c2 = s.charCodeAt(i + 1)
|
||||
e2 = ((c1 & 3) << 4) | (c2 >> 4)
|
||||
c3 = s.charCodeAt(i + 2)
|
||||
if (l < i + 2) {
|
||||
e3 = 64
|
||||
} else {
|
||||
e3 = ((c2 & 0xf) << 2) | (c3 >> 6)
|
||||
}
|
||||
if (l < i + 3) {
|
||||
e4 = 64
|
||||
} else {
|
||||
e4 = c3 & 0x3f
|
||||
}
|
||||
r += ch.charAt(e1) + ch.charAt(e2) + ch.charAt(e3) + ch.charAt(e4)
|
||||
} while ((i += 3) < l)
|
||||
return r
|
||||
}
|
||||
|
||||
// output a PNG string
|
||||
this.getDump = function () {
|
||||
// compute adler32 of output pixels + row filter bytes
|
||||
const BASE = 65521 /* largest prime smaller than 65536 */
|
||||
const NMAX = 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
|
||||
let s1 = 1
|
||||
let s2 = 0
|
||||
let n = NMAX
|
||||
|
||||
for (let y = 0; y < this.height; y++) {
|
||||
for (let x = -1; x < this.width; x++) {
|
||||
s1 += this.buffer[this.index(x, y)].charCodeAt(0)
|
||||
s2 += s1
|
||||
if ((n -= 1) === 0) {
|
||||
s1 %= BASE
|
||||
s2 %= BASE
|
||||
n = NMAX
|
||||
}
|
||||
}
|
||||
}
|
||||
s1 %= BASE
|
||||
s2 %= BASE
|
||||
write(this.buffer, this.idat_offs + this.idat_size - 8, byte4((s2 << 16) | s1))
|
||||
|
||||
// compute crc32 of the PNG chunks
|
||||
function crc32(png, offs, size) {
|
||||
let crc = -1
|
||||
for (let i = 4; i < size - 4; i += 1) {
|
||||
crc = _crc32[(crc ^ png[offs + i].charCodeAt(0)) & 0xff] ^ ((crc >> 8) & 0x00ffffff)
|
||||
}
|
||||
write(png, offs + size - 4, byte4(crc ^ -1))
|
||||
}
|
||||
|
||||
crc32(this.buffer, this.ihdr_offs, this.ihdr_size)
|
||||
crc32(this.buffer, this.plte_offs, this.plte_size)
|
||||
crc32(this.buffer, this.trns_offs, this.trns_size)
|
||||
crc32(this.buffer, this.idat_offs, this.idat_size)
|
||||
crc32(this.buffer, this.iend_offs, this.iend_size)
|
||||
|
||||
// convert PNG to string
|
||||
return '\x89PNG\r\n\x1A\n' + this.buffer.join('')
|
||||
}
|
||||
|
||||
this.fillRect = function (x, y, w, h, color) {
|
||||
for (let i = 0; i < w; i++) {
|
||||
for (let j = 0; j < h; j++) {
|
||||
this.buffer[this.index(x + i, y + j)] = color
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// https://stackoverflow.com/questions/2353211/hsl-to-rgb-color-conversion
|
||||
/**
|
||||
* Converts an HSL color value to RGB. Conversion formula
|
||||
* adapted from http://en.wikipedia.org/wiki/HSL_color_space.
|
||||
* Assumes h, s, and l are contained in the set [0, 1] and
|
||||
* returns r, g, and b in the set [0, 255].
|
||||
*
|
||||
* @param {number} h The hue
|
||||
* @param {number} s The saturation
|
||||
* @param {number} l The lightness
|
||||
* @return {Array} The RGB representation
|
||||
*/
|
||||
|
||||
function hue2rgb(p, q, t) {
|
||||
if (t < 0) t += 1
|
||||
if (t > 1) t -= 1
|
||||
if (t < 1 / 6) return p + (q - p) * 6 * t
|
||||
if (t < 1 / 2) return q
|
||||
if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6
|
||||
return p
|
||||
}
|
||||
|
||||
function hsl2rgb(h?: any, s?: any, l?: any) {
|
||||
let r, g, b
|
||||
|
||||
if (s === 0) {
|
||||
r = g = b = l // achromatic
|
||||
} else {
|
||||
const q = l < 0.5 ? l * (1 + s) : l + s - l * s
|
||||
const p = 2 * l - q
|
||||
r = hue2rgb(p, q, h + 1 / 3)
|
||||
g = hue2rgb(p, q, h)
|
||||
b = hue2rgb(p, q, h - 1 / 3)
|
||||
}
|
||||
|
||||
return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255), 255]
|
||||
}
|
||||
|
||||
// The random number is a js implementation of the Xorshift PRNG
|
||||
const randseed = new Array(4) // Xorshift: [x, y, z, w] 32 bit values
|
||||
|
||||
function seedrand(seed) {
|
||||
for (let i = 0; i < randseed.length; i++) {
|
||||
randseed[i] = 0
|
||||
}
|
||||
for (let i = 0; i < seed.length; i++) {
|
||||
randseed[i % 4] = (randseed[i % 4] << 5) - randseed[i % 4] + seed.charCodeAt(i)
|
||||
}
|
||||
}
|
||||
|
||||
function rand() {
|
||||
// based on Java's String.hashCode(), expanded to 4 32bit values
|
||||
const t = randseed[0] ^ (randseed[0] << 11)
|
||||
|
||||
randseed[0] = randseed[1]
|
||||
randseed[1] = randseed[2]
|
||||
randseed[2] = randseed[3]
|
||||
randseed[3] = randseed[3] ^ (randseed[3] >> 19) ^ t ^ (t >> 8)
|
||||
|
||||
return (randseed[3] >>> 0) / ((1 << 31) >>> 0)
|
||||
}
|
||||
|
||||
function createColor() {
|
||||
//saturation is the whole color spectrum
|
||||
const h = Math.floor(rand() * 360)
|
||||
//saturation goes from 40 to 100, it avoids greyish colors
|
||||
const s = rand() * 60 + 40
|
||||
//lightness can be anything from 0 to 100, but probabilities are a bell curve around 50%
|
||||
const l = (rand() + rand() + rand() + rand()) * 25
|
||||
|
||||
return [h / 360, s / 100, l / 100]
|
||||
}
|
||||
|
||||
function createImageData(size) {
|
||||
const width = size // Only support square icons for now
|
||||
const height = size
|
||||
|
||||
const dataWidth = Math.ceil(width / 2)
|
||||
const mirrorWidth = width - dataWidth
|
||||
|
||||
const data = []
|
||||
for (let y = 0; y < height; y++) {
|
||||
let row = []
|
||||
for (let x = 0; x < dataWidth; x++) {
|
||||
// this makes foreground and background color to have a 43% (1/2.3) probability
|
||||
// spot color has 13% chance
|
||||
row[x] = Math.floor(rand() * 2.3)
|
||||
}
|
||||
const r = row.slice(0, mirrorWidth)
|
||||
r.reverse()
|
||||
row = row.concat(r)
|
||||
|
||||
for (let i = 0; i < row.length; i++) {
|
||||
data.push(row[i])
|
||||
}
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
function buildOpts(opts) {
|
||||
if (!opts.seed) {
|
||||
throw new Error('No seed provided')
|
||||
}
|
||||
|
||||
seedrand(opts.seed)
|
||||
|
||||
return {
|
||||
size: 8,
|
||||
scale: 16,
|
||||
color: createColor(),
|
||||
bgcolor: createColor(),
|
||||
spotcolor: createColor(),
|
||||
...opts,
|
||||
}
|
||||
}
|
||||
|
||||
function toDataUrl(address: string) {
|
||||
const opts = buildOpts({ seed: address.toLowerCase() })
|
||||
|
||||
const imageData = createImageData(opts.size)
|
||||
const width = Math.sqrt(imageData.length)
|
||||
|
||||
const p = new PNG(opts.size * opts.scale, opts.size * opts.scale, 3)
|
||||
|
||||
const color = p.color(...hsl2rgb(...opts.color))
|
||||
const spotcolor = p.color(...hsl2rgb(...opts.spotcolor))
|
||||
|
||||
for (let i = 0; i < imageData.length; i++) {
|
||||
const row = Math.floor(i / width)
|
||||
const col = i % width
|
||||
// if data is 0, leave the background
|
||||
if (imageData[i]) {
|
||||
// if data is 2, choose spot color, if 1 choose foreground
|
||||
const pngColor = imageData[i] === 1 ? color : spotcolor
|
||||
p.fillRect(col * opts.scale, row * opts.scale, opts.scale, opts.scale, pngColor)
|
||||
}
|
||||
}
|
||||
return `data:image/png;base64,${p.getBase64()}`
|
||||
}
|
||||
|
||||
export { toDataUrl }
|
||||
|
|
@ -1,64 +1,24 @@
|
|||
import * as React from 'react'
|
||||
import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
|
||||
|
||||
import { toDataUrl } from './blockies'
|
||||
import makeBlockie from 'ethereum-blockies-base64'
|
||||
import styled from 'styled-components'
|
||||
|
||||
export default class Identicon extends React.PureComponent<any> {
|
||||
private identicon: React.RefObject<HTMLImageElement>
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
type Props = {
|
||||
address: string
|
||||
diameter: number
|
||||
className?: string
|
||||
}
|
||||
|
||||
constructor(props) {
|
||||
super(props)
|
||||
const StyledImg = styled.img<{ diameter: number }>`
|
||||
height: ${({ diameter }) => diameter}px;
|
||||
width: ${({ diameter }) => diameter}px;
|
||||
border-radius: 50%;
|
||||
`
|
||||
|
||||
this.identicon = React.createRef<HTMLImageElement>()
|
||||
const Identicon: React.FC<Props> = ({ diameter = 32, address, className }) => {
|
||||
const iconSrc = React.useMemo(() => makeBlockie(address), [address])
|
||||
|
||||
return <StyledImg src={iconSrc} diameter={diameter} className={className} />
|
||||
}
|
||||
|
||||
componentDidMount = () => {
|
||||
const { address, diameter } = this.props
|
||||
const image = this.generateBlockieIdenticon(address, diameter)
|
||||
if (this.identicon.current) {
|
||||
this.identicon.current.appendChild(image)
|
||||
}
|
||||
}
|
||||
|
||||
componentDidUpdate = () => {
|
||||
const { address, diameter } = this.props
|
||||
const image = this.generateBlockieIdenticon(address, diameter)
|
||||
|
||||
if (!this.identicon.current) {
|
||||
return
|
||||
}
|
||||
|
||||
const { children } = this.identicon.current
|
||||
for (let i = 0; i < children.length; i += 1) {
|
||||
this.identicon.current.removeChild(children[i])
|
||||
}
|
||||
|
||||
this.identicon.current.appendChild(image)
|
||||
}
|
||||
|
||||
getStyleFrom = (diameter) => ({
|
||||
width: diameter,
|
||||
height: diameter,
|
||||
})
|
||||
|
||||
generateBlockieIdenticon = (address, diameter) => {
|
||||
const image = new window.Image()
|
||||
image.src = toDataUrl(address || ZERO_ADDRESS)
|
||||
image.height = diameter
|
||||
image.width = diameter
|
||||
image.style.borderRadius = `${diameter / 2}px`
|
||||
|
||||
return image
|
||||
}
|
||||
|
||||
render() {
|
||||
const { className, diameter } = this.props
|
||||
const style = this.getStyleFrom(diameter)
|
||||
|
||||
return <div className={className} ref={this.identicon} style={style} />
|
||||
}
|
||||
}
|
||||
export default Identicon
|
||||
|
|
|
|||
13
yarn.lock
13
yarn.lock
|
|
@ -7126,6 +7126,13 @@ eth-tx-summary@^3.1.2:
|
|||
ethereumjs-vm "^2.6.0"
|
||||
through2 "^2.0.3"
|
||||
|
||||
ethereum-blockies-base64@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/ethereum-blockies-base64/-/ethereum-blockies-base64-1.0.2.tgz#4aebca52142bf4d16a3144e6e2b59303e39ed2b3"
|
||||
integrity sha512-Vg2HTm7slcWNKaRhCUl/L3b4KrB8ohQXdd5Pu3OI897EcR6tVRvUqdTwAyx+dnmoDzj8e2bwBLDQ50ByFmcz6w==
|
||||
dependencies:
|
||||
pnglib "0.0.1"
|
||||
|
||||
ethereum-bloom-filters@^1.0.6:
|
||||
version "1.0.7"
|
||||
resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz#b7b80735e385dbb7f944ce6b4533e24511306060"
|
||||
|
|
@ -12860,6 +12867,11 @@ pn@^1.1.0:
|
|||
resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
|
||||
integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
|
||||
|
||||
pnglib@0.0.1:
|
||||
version "0.0.1"
|
||||
resolved "https://registry.yarnpkg.com/pnglib/-/pnglib-0.0.1.tgz#f9ab6f9c688f4a9d579ad8be28878a716e30c096"
|
||||
integrity sha1-+atvnGiPSp1Xmti+KIeKcW4wwJY=
|
||||
|
||||
pnp-webpack-plugin@1.6.4:
|
||||
version "1.6.4"
|
||||
resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
|
||||
|
|
@ -18075,7 +18087,6 @@ websocket-extensions@>=0.1.1:
|
|||
dependencies:
|
||||
debug "^2.2.0"
|
||||
es5-ext "^0.10.50"
|
||||
gulp "^4.0.2"
|
||||
nan "^2.14.0"
|
||||
typedarray-to-buffer "^3.1.5"
|
||||
yaeti "^0.0.6"
|
||||
|
|
|
|||
Loading…
Reference in New Issue