grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add fallback Full Fleshed Wallet if no library

Browse Source
This commit is contained in:
Nicolas Gotchac 2016-12-09 16:29:57 +01:00
parent efee55ae84
commit caf3a96c19
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/contracts/code/wallet.js
View File

File diff suppressed because one or more lines are too long

8
js/src/modals/CreateWallet/createWalletStore.js
View File

@ -23,7 +23,7 @@ import Contract from '~/api/contract';
import Contracts from '~/contracts'; import Contracts from '~/contracts';
import { wallet as walletAbi } from '~/contracts/abi'; import { wallet as walletAbi } from '~/contracts/abi';
import { wallet as walletCode } from '~/contracts/code'; import { wallet as walletCode } from '~/contracts/code';
import { walletLibraryRegKey } from '~/contracts/code/wallet'; import { walletLibraryRegKey, fullWalletCode } from '~/contracts/code/wallet';
import WalletsUtils from '~/util/wallets'; import WalletsUtils from '~/util/wallets';
@ -167,8 +167,10 @@ export default class CreateWalletStore {
.registry .registry
.lookupAddress(walletLibraryRegKey) .lookupAddress(walletLibraryRegKey)
.then((address) => { .then((address) => {
const walletLibraryAddress = address.replace(/^0x/, '').toLowerCase(); const walletLibraryAddress = (address || '').replace(/^0x/, '').toLowerCase();
const code = walletCode.replace(/(_)+WalletLibrary(_)+/g, walletLibraryAddress); const code = walletLibraryAddress.length && !/^0+$/.test(walletLibraryAddress)
? walletCode.replace(/(_)+WalletLibrary(_)+/g, walletLibraryAddress)
: fullWalletCode;
const options = { const options = {
data: code, data: code,