This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Tx permission contract improvement #8400
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| [ { "constant": true, "inputs": [], "name": "contractNameHash", "outputs": [ { "name": "", "type": "bytes32" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "contractName", "outputs": [ { "name": "", "type": "string" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "contractVersion", "outputs": [ { "name": "", "type": "uint256" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [ { "name": "sender", "type": "address" }, { "name": "to", "type": "address" }, { "name": "value", "type": "uint256" } ], "name": "allowedTxTypes", "outputs": [ { "name": "", "type": "uint32" }, { "name": "", "type": "bool" } ], "payable": false, "stateMutability": "view", "type": "function" } ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
|
|
||
| //! Smart contract based transaction filter. | ||
|
|
||
| use ethereum_types::{H256, Address}; | ||
| use lru_cache::LruCache; | ||
|
|
||
| use client::{BlockInfo, CallContract, BlockId}; | ||
|
|
@@ -44,7 +44,7 @@ pub struct TransactionFilter { | |
| contract_deprecated: transact_acl_deprecated::TransactAclDeprecated, | ||
| contract: transact_acl::TransactAcl, | ||
| contract_address: Address, | ||
| permission_cache: Mutex<LruCache<(H256, Address), u32>>, | ||
| } | ||
|
|
||
| impl TransactionFilter { | ||
|
|
@@ -74,7 +74,7 @@ impl TransactionFilter { | |
|
|
||
| let sender = transaction.sender(); | ||
| let value = transaction.value; | ||
| let key = (*parent_hash, sender); | ||
|
|
||
| if let Some(permissions) = cache.get_mut(&key) { | ||
| return *permissions & tx_type != 0; | ||
|
|
@@ -83,24 +83,26 @@ impl TransactionFilter { | |
| let contract_address = self.contract_address; | ||
|
|
||
| // Check permissions in smart contracts | ||
| let (permissions, filter_only_sender) = self.contract.functions() | ||
|
There was a problem hiding this comment. I think we should keep caching for performance reasons, so I came up with an idea to have 2nd return value in the contract function, which will define whether filtering depends on to address and value in ether and if not, sender address will be cached which will increase performance. |
||
| .allowed_tx_types() | ||
| .call(sender, to, value, &|data| client.call_contract(BlockId::Hash(*parent_hash), contract_address, data)) | ||
| .map(|(p, f)| (p.low_u32(), f)) | ||
| .unwrap_or_else(|_e| { | ||
| // If failed, first check deprecated contract | ||
| trace!(target: "tx_filter", "Fallback to the deprecated version of tx permission contract"); | ||
| (self.contract_deprecated.functions() | ||
| .allowed_tx_types() | ||
| .call(sender, &|data| client.call_contract(BlockId::Hash(*parent_hash), contract_address, data)) | ||
| .map(|p| p.low_u32()) | ||
| .unwrap_or_else(|e| { | ||
| error!(target: "tx_filter", "Error calling tx permissions contract: {:?}", e); | ||
| tx_permissions::NONE | ||
| }), true) | ||
| }); | ||
| println!("{:?}, {:?}", permissions, filter_only_sender); | ||
| if filter_only_sender { | ||
| cache.insert((*parent_hash, sender), permissions); | ||
| } | ||
| trace!(target: "tx_filter", | ||
| "Given transaction data: sender: {:?} to: {:?} value: {}. Permissions required: {:X}, got: {:X}", | ||
| sender, to, value, tx_type, permissions | ||
|
|
@@ -122,7 +124,7 @@ mod test { | |
| use transaction::{Transaction, Action}; | ||
| use tempdir::TempDir; | ||
|
|
||
| /// Contract code: https://gist.github.com/VladLupashevskyi/84f18eabb1e4afadf572cf92af3e7e7f | ||
|
There was a problem hiding this comment.
"Caching" also seems a bit too harmless for this for me. We should emphasize that if There was a problem hiding this comment. @tomusdrw I agree the explanation was too confusing. I updated gist where flag description is more clarified. |
||
| #[test] | ||
| fn transaction_filter() { | ||
| let spec_data = r#" | ||
|
There was a problem hiding this comment. We are trying to move such string data into external resources and use in the code via: let spec_data = include_str!("../res/filename.json"); |
||
|
|
@@ -165,7 +167,7 @@ mod test { | |
| "0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }, | ||
| "0000000000000000000000000000000000000005": { | ||
| "balance": "1", | ||
| "constructor": "608060405234801561001057600080fd5b506104eb806100206000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063469ab1e31461006757806375d0c0dc1461009a578063a0a8e4601461012a578063d4b03ee014610155575b600080fd5b34801561007357600080fd5b5061007c6101ed565b60405180826000191660001916815260200191505060405180910390f35b3480156100a657600080fd5b506100af61025e565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100ef5780820151818401526020810190506100d4565b50505050905090810190601f16801561011c5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561013657600080fd5b5061013f61029b565b6040518082815260200191505060405180910390f35b34801561016157600080fd5b506101c0600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506102a4565b604051808363ffffffff1663ffffffff168152602001821515151581526020019250505060405180910390f35b60006101f761025e565b6040518082805190602001908083835b60208310151561022c5780518252602082019150602081019050602083039250610207565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905090565b60606040805190810160405280601681526020017f54585f5045524d495353494f4e5f434f4e545241435400000000000000000000815250905090565b60006002905090565b600080737e5f4552091a69125d5dfcb7b8c2659029395bdf8573ffffffffffffffffffffffffffffffffffffffff1614156102e95763ffffffff6001915091506104b7565b732b5ad5c4795c026514f8317c7a215e218dccd6cf8573ffffffffffffffffffffffffffffffffffffffff16141561032b5760026001176001915091506104b7565b736813eb9362372eef6200f3b1dbc3f819671cba698573ffffffffffffffffffffffffffffffffffffffff16141561036957600180915091506104b7565b73e1ab8145f7e55dc933d51a18c793f901a3a0b2768573ffffffffffffffffffffffffffffffffffffffff161480156103a25750600083145b156103b75763ffffffff6000915091506104b7565b73e57bfe9f44b819898f47bf37e5af72a0783e11418573ffffffffffffffffffffffffffffffffffffffff16148015610419575073d41c057fd1c78805aac12b0a94a405c0461a6fbb8473ffffffffffffffffffffffffffffffffffffffff16145b1561042b5760016000915091506104b7565b73d41c057fd1c78805aac12b0a94a405c0461a6fbb8573ffffffffffffffffffffffffffffffffffffffff1614801561048d575073e57bfe9f44b819898f47bf37e5af72a0783e11418473ffffffffffffffffffffffffffffffffffffffff16145b80156104995750600083145b156104ae5763ffffffff6000915091506104b7565b60006001915091505b9350939150505600a165627a7a723058204982adea2aa10a7b8328ec3829472ee17c62a86957ef6737f2eb729b2c3faf910029" | ||
| } | ||
| } | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we mention here (or somewhere, where it's appropriate), that ABI of the contract with version=2 is used? Ideally is to add explicit check of the version in the code and force the next person, who will modify this code, to rely on contract's version. But perhaps at least some comment will be also helpful. PS. May be the fallback to the deprecated contract in case, when version is not retrieved, also will be looking more logically