Skip to content

Commit

Permalink
Merge branch 'develop' into feat/settings-page-add-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
matteoscurati authored Oct 23, 2024
2 parents 6690033 + 5668333 commit 5ea420d
Show file tree
Hide file tree
Showing 13 changed files with 100 additions and 328 deletions.
84 changes: 14 additions & 70 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@
"@ethereumjs/tx": true,
"@keystonehq/bc-ur-registry-eth": true,
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true,
"@keystonehq/metamask-airgapped-keyring>rlp": true,
"@metamask/obs-store": true,
"browserify>buffer": true,
"ethereumjs-util>rlp": true,
"uuid": true,
"webpack>events": true
}
Expand All @@ -382,65 +382,18 @@
"@ethereumjs/tx": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"@keystonehq/bc-ur-registry-eth": true,
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
"@metamask/eth-trezor-keyring>hdkey": true,
"browserify>buffer": true,
"eth-lattice-keyring>rlp": true,
"uuid": true
}
},
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
"globals": {
"TextEncoder": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>@metamask/safe-event-emitter": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
"stream-browserify": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>@metamask/safe-event-emitter": {
"globals": {
"setTimeout": true
},
"packages": {
"webpack>events": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream": true,
"browserify>util": true,
"process": true,
"watchify>xtend": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>isarray": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>safe-buffer": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>string_decoder": true,
"browserify>browser-resolve": true,
"browserify>timers-browserify": true,
"process": true,
"pumpify>inherits": true,
"readable-stream-2>core-util-is": true,
"readable-stream-2>process-nextick-args": true,
"readable-stream>util-deprecate": true,
"webpack>events": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>safe-buffer": {
"@keystonehq/metamask-airgapped-keyring>rlp": {
"packages": {
"bn.js": true,
"browserify>buffer": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>string_decoder": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>safe-buffer": true
}
},
"@lavamoat/lavadome-react": {
"globals": {
"Document.prototype": true,
Expand Down Expand Up @@ -1409,12 +1362,18 @@
"@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
"packages": {
"@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
"@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
"bn.js": true,
"browserify>assert": true,
"browserify>buffer": true,
"browserify>insert-module-globals>is-buffer": true,
"ethereumjs-util>create-hash": true,
"ethereumjs-util>rlp": true
"ethereumjs-util>create-hash": true
}
},
"@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
"packages": {
"bn.js": true,
"browserify>buffer": true
}
},
"@metamask/logging-controller": {
Expand Down Expand Up @@ -4087,9 +4046,9 @@
"eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
"eth-lattice-keyring>gridplus-sdk>bitwise": true,
"eth-lattice-keyring>gridplus-sdk>borc": true,
"eth-lattice-keyring>gridplus-sdk>rlp": true,
"eth-lattice-keyring>gridplus-sdk>secp256k1": true,
"eth-lattice-keyring>gridplus-sdk>uuid": true,
"eth-lattice-keyring>rlp": true,
"ethereumjs-util>ethereum-cryptography>bs58check": true,
"ethers>@ethersproject/sha2>hash.js": true,
"lodash": true
Expand Down Expand Up @@ -4143,11 +4102,6 @@
"location": true
}
},
"eth-lattice-keyring>gridplus-sdk>rlp": {
"globals": {
"TextEncoder": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1": {
"packages": {
"@metamask/ppom-validator>elliptic": true
Expand Down Expand Up @@ -5362,16 +5316,6 @@
"webpack>events": true
}
},
"readable-stream-2>core-util-is": {
"packages": {
"browserify>insert-module-globals>is-buffer": true
}
},
"readable-stream-2>process-nextick-args": {
"packages": {
"process": true
}
},
"readable-stream>util-deprecate": {
"globals": {
"console.trace": true,
Expand Down
84 changes: 14 additions & 70 deletions lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@
"@ethereumjs/tx": true,
"@keystonehq/bc-ur-registry-eth": true,
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true,
"@keystonehq/metamask-airgapped-keyring>rlp": true,
"@metamask/obs-store": true,
"browserify>buffer": true,
"ethereumjs-util>rlp": true,
"uuid": true,
"webpack>events": true
}
Expand All @@ -382,65 +382,18 @@
"@ethereumjs/tx": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"@keystonehq/bc-ur-registry-eth": true,
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
"@metamask/eth-trezor-keyring>hdkey": true,
"browserify>buffer": true,
"eth-lattice-keyring>rlp": true,
"uuid": true
}
},
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
"globals": {
"TextEncoder": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>@metamask/safe-event-emitter": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
"stream-browserify": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>@metamask/safe-event-emitter": {
"globals": {
"setTimeout": true
},
"packages": {
"webpack>events": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream": true,
"browserify>util": true,
"process": true,
"watchify>xtend": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>isarray": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>safe-buffer": true,
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>string_decoder": true,
"browserify>browser-resolve": true,
"browserify>timers-browserify": true,
"process": true,
"pumpify>inherits": true,
"readable-stream-2>core-util-is": true,
"readable-stream-2>process-nextick-args": true,
"readable-stream>util-deprecate": true,
"webpack>events": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>safe-buffer": {
"@keystonehq/metamask-airgapped-keyring>rlp": {
"packages": {
"bn.js": true,
"browserify>buffer": true
}
},
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>string_decoder": {
"packages": {
"@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2>readable-stream>safe-buffer": true
}
},
"@lavamoat/lavadome-react": {
"globals": {
"Document.prototype": true,
Expand Down Expand Up @@ -1409,12 +1362,18 @@
"@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
"packages": {
"@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
"@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
"bn.js": true,
"browserify>assert": true,
"browserify>buffer": true,
"browserify>insert-module-globals>is-buffer": true,
"ethereumjs-util>create-hash": true,
"ethereumjs-util>rlp": true
"ethereumjs-util>create-hash": true
}
},
"@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
"packages": {
"bn.js": true,
"browserify>buffer": true
}
},
"@metamask/logging-controller": {
Expand Down Expand Up @@ -4087,9 +4046,9 @@
"eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
"eth-lattice-keyring>gridplus-sdk>bitwise": true,
"eth-lattice-keyring>gridplus-sdk>borc": true,
"eth-lattice-keyring>gridplus-sdk>rlp": true,
"eth-lattice-keyring>gridplus-sdk>secp256k1": true,
"eth-lattice-keyring>gridplus-sdk>uuid": true,
"eth-lattice-keyring>rlp": true,
"ethereumjs-util>ethereum-cryptography>bs58check": true,
"ethers>@ethersproject/sha2>hash.js": true,
"lodash": true
Expand Down Expand Up @@ -4143,11 +4102,6 @@
"location": true
}
},
"eth-lattice-keyring>gridplus-sdk>rlp": {
"globals": {
"TextEncoder": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1": {
"packages": {
"@metamask/ppom-validator>elliptic": true
Expand Down Expand Up @@ -5362,16 +5316,6 @@
"webpack>events": true
}
},
"readable-stream-2>core-util-is": {
"packages": {
"browserify>insert-module-globals>is-buffer": true
}
},
"readable-stream-2>process-nextick-args": {
"packages": {
"process": true
}
},
"readable-stream>util-deprecate": {
"globals": {
"console.trace": true,
Expand Down
Loading

0 comments on commit 5ea420d

Please sign in to comment.