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

Revert "add sendwithapproval method" 

This reverts commit 1ea3b8b149.
This commit is contained in:
Barry Gitarts 2018-08-15 11:14:13 -04:00
parent 1ea3b8b149
commit 516ea30fe6
4 changed files with 98 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,10 +12,10 @@ import { getStatusContactCode, getSNTAllowance } from '../../reducers/accounts';
import FieldGroup from '../standard/FieldGroup';
import LinearProgress from '@material-ui/core/LinearProgress';
import { generateXY } from '../../utils/ecdsa';
import { BigNumber } from '../standard/utils';
console.log(TestToken)
const { soliditySha3, fromWei } = web3.utils;
const unlimitedAllowance = new BigNumber(2).pow(256).sub(1);
const InnerForm = ({
values,
@ -142,33 +142,21 @@ const RegisterSubDomain = withFormik({
handleSubmit(values, { setSubmitting, props }) {
const { address, statusAddress } = values;
const { subDomain, domainName, registeredCallbackFn } = props || values;
const { SNTAllowance } = props;
const { methods: { register } } = ENSSubdomainRegistry;
const subdomainHash = soliditySha3(subDomain);
const domainNameHash = hash(domainName);
const resolveToAddr = address || zeroAddress;
const points = statusAddress ? generateXY(statusAddress) : null;
const registerAbi = ENSSubdomainRegistry.options.jsonInterface.find(x => x.name === 'register');
const encodedRegister = web3.eth.abi.encodeFunctionCall(registerAbi, [
subdomainHash,
domainNameHash,
resolveToAddr,
points ? points.x : zeroBytes32,
points ? points.y : zeroBytes32
]);
const sendWithApproval = TestToken.methods.approveAndCall(ENSSubdomainRegistry._address, unlimitedAllowance, encodedRegister);
const send = register(
const toSend = register(
subdomainHash,
domainNameHash,
resolveToAddr,
points ? points.x : zeroBytes32,
points ? points.y : zeroBytes32
);
const toSend = Number(SNTAllowance) > 0 ? send : sendWithApproval;
toSend.estimateGas({ data: encodedRegister }).then(gasEstimated => {
console.log("Register would work. :D Gas estimated: " + gasEstimated);
toSend.estimateGas().then(gasEstimated => {
console.log("Register would work. :D Gas estimated: "+gasEstimated)
console.log("Trying: register(\""+subdomainHash+"\",\""+domainNameHash+"\",\""+resolveToAddr+"\",\""+zeroBytes32+"\",\""+zeroBytes32+"\")")
toSend.send({gas: gasEstimated+1000}).then(txId => {
if(txId.status == "0x1" || txId.status == "0x01"){

5
contracts/token/ApprovalReceiver.sol Normal file
View File

@ -0,0 +1,5 @@
pragma solidity ^0.4.11;
contract ApprovalReceiver {
function receiveApproval(address from, uint value, address tokenContract, bytes extraData) returns (bool);
}

5
contracts/token/ApproveAndCallFallBack.sol
View File

@ -1,5 +0,0 @@
pragma solidity ^0.4.11;
contract ApproveAndCallFallBack {
function receiveApproval(address from, uint256 _amount, address _token, bytes _data) returns (bool);
}

14
contracts/token/TestToken.sol
View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.23;
import "./StandardToken.sol";
import './ApproveAndCallFallBack.sol';
import './ApprovalReceiver.sol';
/**
* @notice ERC20Token for test scripts, can be minted by anyone.
@ -18,15 +18,9 @@ contract TestToken is StandardToken {
mint(msg.sender, _amount);
}
function approveAndCall(address _spender, uint256 _amount, bytes _extraData) returns (bool success) {
if (!approve(_spender, _amount)) throw;
ApproveAndCallFallBack(_spender).receiveApproval(
msg.sender,
_amount,
this,
_extraData
);
return true;
function approveAndCall(address _spender, uint256 _value, bytes _extraData) returns (bool success) {
assert(approve(_spender, _value));
return ApprovalReceiver(_spender).receiveApproval(msg.sender, _value, this, _extraData);
}
}