status-im
/
ens-usernames
mirror of https://github.com/status-im/ens-usernames.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add register with approvalAndCall

This commit is contained in:
Barry Gitarts 2018-09-07 17:02:38 -04:00 committed by Barry G
parent 16d84233fc
commit 3f3586e746
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/components/ens/registerSubDomain.js
View File

@ -125,13 +125,7 @@ const InnerForm = ({
wide /> wide />
</Field> </Field>
<div style={{ position: 'relative', left: 0, right: 0, bottom: 0 }}> <div style={{ position: 'relative', left: 0, right: 0, bottom: 0 }}>
{!Number(SNTAllowance) || (Number(domainPrice) && !Number(SNTBalance)) ? <TokenPermissions {!isSubmitting ? <MobileButton type="submit" text={`${editAccount ? 'Save' : 'Register'} with transaction`} style={{ width: '100%' }} /> : <CircularProgress style={{ marginLeft: '45%' }} />}
symbol="SNT"
spender={UsernameRegistrar.address}
methods={TestToken.methods}
mobile
/>
: !isSubmitting ? <MobileButton type="submit" text={`${editAccount ? 'Save' : 'Register'} with transaction`} style={{ width: '100%' }} /> : <CircularProgress style={{ marginLeft: '45%' }} />}
</div> </div>
</Hidden> </Hidden>
</div> </div>
@ -151,8 +145,9 @@ const RegisterSubDomain = withFormik({
async handleSubmit(values, { setSubmitting, props }) { async handleSubmit(values, { setSubmitting, props }) {
const { editAccount, preRegisteredCallback } = props; const { editAccount, preRegisteredCallback } = props;
const { address, statusAddress } = values; const { address, statusAddress } = values;
const { subDomain, domainName, registeredCallbackFn } = props || values; const { subDomain, domainName, domainPrice, registeredCallbackFn } = props || values;
const { methods: { register } } = UsernameRegistrar; const { methods: { register } } = UsernameRegistrar;
const { methods: { approveAndCall } } = TestToken;
const subdomainHash = soliditySha3(subDomain); const subdomainHash = soliditySha3(subDomain);
const domainNameHash = hash(domainName); const domainNameHash = hash(domainName);
const resolveToAddr = address || zeroAddress; const resolveToAddr = address || zeroAddress;
@ -167,16 +162,20 @@ const RegisterSubDomain = withFormik({
points ? points.x : zeroBytes32, points ? points.x : zeroBytes32,
points ? points.y : zeroBytes32, points ? points.y : zeroBytes32,
]; ];
editAccount if (editAccount) funcsToSend.push(setAddr(node, resolveToAddr), setPubkey(node, args[3], args[4]));
? funcsToSend.push(setAddr(node, resolveToAddr), setPubkey(node, args[3], args[4])) else {
: funcsToSend.push(register(...args)); funcsToSend.push(
approveAndCall(UsernameRegistrar.address, Number(domainPrice), register(...args).encodeABI())
);
}
while (funcsToSend.length) { while (funcsToSend.length) {
const toSend = funcsToSend.pop(); const toSend = funcsToSend.pop();
toSend.estimateGas().then((gasEstimated) => { toSend.estimateGas().then((gasEstimated) => {
console.log("Register would work. :D Gas estimated: " + gasEstimated) const gas = editAccount ? gasEstimated + 1000 : gasEstimated * 2;
console.log("Register would work. :D Gas estimated: " + gasEstimated, { gas }, gasEstimated + 1000);
console.log("Trying: register(\"" + subdomainHash + "\",\"" + domainNameHash + "\",\"" + resolveToAddr + "\",\"" + zeroBytes32 + "\",\"" + zeroBytes32 + "\")"); console.log("Trying: register(\"" + subdomainHash + "\",\"" + domainNameHash + "\",\"" + resolveToAddr + "\",\"" + zeroBytes32 + "\",\"" + zeroBytes32 + "\")");
if (preRegisteredCallback) preRegisteredCallback(); if (preRegisteredCallback) preRegisteredCallback();
toSend.send({gas: gasEstimated + 1000 }).then((txId) => { toSend.send({ gas }).then((txId) => {
if (txId.status == "0x1" || txId.status == "0x01"){ if (txId.status == "0x1" || txId.status == "0x01"){
console.log("Register send success. :)"); console.log("Register send success. :)");
} else { } else {