mirror of https://github.com/embarklabs/embark.git
conflict in embark js
This commit is contained in:
parent
70f777f0b0
commit
672393a877
|
@ -226,6 +226,29 @@ __embarkENS.lookup = function (address, callback) {
|
|||
});
|
||||
};
|
||||
|
||||
__embarkENS.registerSubDomain = function (name, address, callback) {
|
||||
callback = callback || function () {};
|
||||
|
||||
const resolveAddr = address || '0x0000000000000000000000000000000000000000';
|
||||
const toSend = this.registrar.methods.register(web3.utils.sha3(name), web3.eth.defaultAccount, resolveAddr);
|
||||
|
||||
toSend.estimateGas().then(gasEstimated => {
|
||||
return toSend.send({gas: gasEstimated + 1000}).then(transaction => {
|
||||
if (transaction.status !== "0x1" && transaction.status !== "0x01") {
|
||||
console.warn('Failed transaction', transaction);
|
||||
return callback('Failed to register. Check gas cost.');
|
||||
}
|
||||
callback(null, transaction);
|
||||
}).catch(err => {
|
||||
callback('Failed to register with error: ' + (err.message || err));
|
||||
console.error(err);
|
||||
});
|
||||
}).catch(err => {
|
||||
callback("Register would error. Is it already registered? Do you have token balance? Is Allowance set? " + (err.message || err));
|
||||
console.error(err);
|
||||
});
|
||||
};
|
||||
|
||||
__embarkENS.registerSubDomain = function (name, address, callback) {
|
||||
callback = callback || function () {};
|
||||
|
||||
|
|
Loading…
Reference in New Issue