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

ensure new giver profile owner is msg.sender

This commit is contained in:
Barry Gitarts 2019-11-26 14:07:45 -05:00 committed by Barry G
parent 58117bf5e8
commit b5dcf2e121
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/SwapProxy.sol
View File

@ -108,7 +108,8 @@ contract SwapProxy is Pausable, SafeToken {
uint amount = kyberProxy.trade.value(msg.value)(ETH, msg.value, token, address(this), maxDestinationAmount, slippageRate, vault); uint amount = kyberProxy.trade.value(msg.value)(ETH, msg.value, token, address(this), maxDestinationAmount, slippageRate, vault);
require(amount > 0); require(amount > 0);
require(EIP20Interface(token).approve(address(liquidPledging), amount)); require(EIP20Interface(token).approve(address(liquidPledging), amount));
liquidPledging.addGiverAndDonate(idReceiver, token, amount); liquidPledging.addGiverAndDonate(idReceiver, msg.sender, token, amount);
Swap(msg.sender, ETH, token, msg.value, amount); Swap(msg.sender, ETH, token, msg.value, amount);
} }
@ -137,7 +138,7 @@ contract SwapProxy is Pausable, SafeToken {
uint receiverAmount = kyberProxy.trade(token, amount, receiverToken, address(this), maxDestinationAmount, slippageRate, vault); uint receiverAmount = kyberProxy.trade(token, amount, receiverToken, address(this), maxDestinationAmount, slippageRate, vault);
require(receiverAmount > 0); require(receiverAmount > 0);
require(EIP20Interface(token).approve(address(liquidPledging), receiverAmount)); require(EIP20Interface(token).approve(address(liquidPledging), receiverAmount));
liquidPledging.addGiverAndDonate(idReceiver, receiverToken, receiverAmount); liquidPledging.addGiverAndDonate(idReceiver, msg.sender, receiverToken, receiverAmount);
Swap(msg.sender, token, receiverToken, amount, receiverAmount); Swap(msg.sender, token, receiverToken, amount, receiverAmount);
} }

2
embarkConfig/contracts.js
View File

@ -184,7 +184,7 @@ module.exports = {
address: "0x8aA3672a99C489E5Dc5dfDb40e607bE49970cbF7" address: "0x8aA3672a99C489E5Dc5dfDb40e607bE49970cbF7"
}, },
SwapProxy: { SwapProxy: {
address: "0x1B468F2a4CDaC05E5B2f432DA24F049201B74Aa2", address: "0x73d3731F9c21e21785Ec5677CC39AB4880CAaFe9",
args: [ args: [
'$LiquidPledging', '$LiquidPledging',
"0x818E6FECD516Ecc3849DAf6845e3EC868087B755", "0x818E6FECD516Ecc3849DAf6845e3EC868087B755",

16
ropsten.chains.json
View File

@ -17,25 +17,13 @@
"name": "SNT", "name": "SNT",
"address": "0x8aA3672a99C489E5Dc5dfDb40e607bE49970cbF7" "address": "0x8aA3672a99C489E5Dc5dfDb40e607bE49970cbF7"
}, },
"0xb573e81b6da869674bb2d8448581ed758b9dbf7e72b0879087d49620167778d4": {
"name": "SwapProxy",
"address": "0x46A30Bf6D0E438E7EeaabD6c4B5fEBf481267722"
},
"0xd9d749fb529af69819711faec78815efe4334ea74c7785ece18e3f276d845934": { "0xd9d749fb529af69819711faec78815efe4334ea74c7785ece18e3f276d845934": {
"name": "DAI", "name": "DAI",
"address": "0xaD6D458402F60fD3Bd25163575031ACDce07538D" "address": "0xaD6D458402F60fD3Bd25163575031ACDce07538D"
}, },
"0xafe7338679d28b8279653439aa74f34791475ba797295e37336eecf436127480": { "0x865e8f15b33ce8aef72c3bd4b22521aafce49bdbe57b4bed9eeea949e729c59d": {
"name": "SwapProxy", "name": "SwapProxy",
"address": "0x2B45165e26f5d32fB75abE2fc7f8E7e5D506223b" "address": "0x73d3731F9c21e21785Ec5677CC39AB4880CAaFe9"
},
"0x2c4bdca5cbf721642f976ca0e83a902c8b88d9e7fd49f721263f145b908d08ef": {
"name": "SwapProxy",
"address": "0x2B45165e26f5d32fB75abE2fc7f8E7e5D506223b"
},
"0x17446ffed738afc7e8cab4b9f8b44f8fcabe07029419220d52b9fe9318f37b95": {
"name": "SwapProxy",
"address": "0x1B468F2a4CDaC05E5B2f432DA24F049201B74Aa2"
} }
} }
} }