embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-10 22:05:55 +00:00
Code Issues Projects Releases Wiki Activity

refactor(@embark/utils): move addressUtils to embark-utils

Browse Source
This commit is contained in:
Jonathan Rainville 2019-04-26 15:37:58 -04:00 committed by Pascal Precht
parent 7eb85f0fbe
commit 8506778384
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
packages/embark/src/lib/utils/addressUtils.ts → packages/embark-utils/src/addressUtils.ts
View File

3
packages/embark-utils/src/index.js
View File

@ -112,7 +112,8 @@ const Utils = {
runCmd,
escapeHtml: logUtils.escapeHtml,
normalizeInput: logUtils.normalizeInput,
LogHandler: require('./logHandler')
LogHandler: require('./logHandler'),
AddressUtils: require('./addressUtils')
};
module.exports = Utils;

4
packages/embark/src/lib/core/config.js
View File

@ -5,9 +5,9 @@ const path = require('path');
const deepEqual = require('deep-equal');
const web3 = require('web3');
const constants = require('../constants');
import {canonicalHost, defaultHost, recursiveMerge} from 'embark-utils';
import {canonicalHost, defaultHost, recursiveMerge, AddressUtils} from 'embark-utils';
const cloneDeep = require('lodash.clonedeep');
import { replaceZeroAddressShorthand } from '../utils/addressUtils';
const { replaceZeroAddressShorthand } = AddressUtils;
import { unitRegex } from "../utils/regexConstants";
import * as utilsContractsConfig from "../utils/contractsConfig";
import { File, Types } from "./file";

3
packages/embark/src/lib/modules/deployment/contract_deployer.js
View File

@ -1,7 +1,8 @@
let async = require('async');
//require("../utils/debug_util.js")(__filename, async);
let utils = require('../../utils/utils.js');
import { ZERO_ADDRESS } from '../../utils/addressUtils';
import {AddressUtils} from 'embark-utils';
const {ZERO_ADDRESS} = AddressUtils;
// Check out definition 97 of the yellow paper: https://ethereum.github.io/yellowpaper/paper.pdf
const MAX_CONTRACT_BYTECODE_LENGTH = 24576;

9
packages/embark/src/lib/modules/ens/index.js
View File

@ -1,14 +1,13 @@
import {joinPath, hashTo32ByteHexString, soliditySha3, recursiveMerge} from 'embark-utils';
import {joinPath, hashTo32ByteHexString, soliditySha3, recursiveMerge, AddressUtils} from 'embark-utils';
const namehash = require('eth-ens-namehash');
const async = require('async');
const embarkJsUtils = require('embarkjs').Utils;
const reverseAddrSuffix = '.addr.reverse';
const ENSFunctions = require('./ENSFunctions');
const secureSend = embarkJsUtils.secureSend;
import {ZERO_ADDRESS} from '../../utils/addressUtils';
import {ens} from '../../constants';
import EmbarkJS from 'embarkjs';
import EmbarkJS, {Utils as embarkJsUtils} from 'embarkjs';
const secureSend = embarkJsUtils.secureSend;
const {ZERO_ADDRESS} = AddressUtils;
const ENS_WHITELIST = ens.whitelist;
const NOT_REGISTERED_ERROR = 'Name not yet registered';

3
packages/embark/src/lib/utils/contractsConfig.ts
View File

@ -1,6 +1,7 @@
import { extendZeroAddressShorthand, replaceZeroAddressShorthand } from "./addressUtils";
import AddressUtils from 'embark-utils';
import { unitRegex } from "./regexConstants";
const { extendZeroAddressShorthand, replaceZeroAddressShorthand } = AddressUtils;
const web3 = require("web3");
const utils = require("./utils.js");