aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/AssetProxyOwner
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-09-01 06:20:58 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-09-04 22:57:47 +0800
commitada5563b1fd2024ef310786eb8b1f32f3ecee4f0 (patch)
tree664cacf59d65fc4c9b130a405a8c5d275dbd43d7 /packages/contracts/src/2.0.0/protocol/AssetProxyOwner
parent78d4fc59a5ea5e2c3da9c221967dc792445419ae (diff)
downloaddexon-0x-contracts-ada5563b1fd2024ef310786eb8b1f32f3ecee4f0.tar.gz
dexon-0x-contracts-ada5563b1fd2024ef310786eb8b1f32f3ecee4f0.tar.zst
dexon-0x-contracts-ada5563b1fd2024ef310786eb8b1f32f3ecee4f0.zip
Update to most recent multisig
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/AssetProxyOwner')
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol15
1 files changed, 7 insertions, 8 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol b/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol
index 5f69198e9..6ec710f25 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol
@@ -38,13 +38,13 @@ contract AssetProxyOwner is
/// @dev Function will revert if the transaction does not call `removeAuthorizedAddressAtIndex`
/// on an approved AssetProxy contract.
modifier validRemoveAuthorizedAddressAtIndexTx(uint256 transactionId) {
- Transaction storage tx = transactions[transactionId];
+ Transaction storage txn = transactions[transactionId];
require(
- isAssetProxyRegistered[tx.destination],
+ isAssetProxyRegistered[txn.destination],
"UNREGISTERED_ASSET_PROXY"
);
require(
- tx.data.readBytes4(0) == REMOVE_AUTHORIZED_ADDRESS_AT_INDEX_SELECTOR,
+ txn.data.readBytes4(0) == REMOVE_AUTHORIZED_ADDRESS_AT_INDEX_SELECTOR,
"INVALID_FUNCTION_SELECTOR"
);
_;
@@ -96,14 +96,13 @@ contract AssetProxyOwner is
fullyConfirmed(transactionId)
validRemoveAuthorizedAddressAtIndexTx(transactionId)
{
- Transaction storage tx = transactions[transactionId];
- tx.executed = true;
- // solhint-disable-next-line avoid-call-value
- if (tx.destination.call.value(tx.value)(tx.data))
+ Transaction storage txn = transactions[transactionId];
+ txn.executed = true;
+ if (external_call(txn.destination, txn.value, txn.data.length, txn.data))
emit Execution(transactionId);
else {
emit ExecutionFailure(transactionId);
- tx.executed = false;
+ txn.executed = false;
}
}
}