-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Remove all dapp permissions related settings #9120
Conversation
there is conflict now in rpc. |
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.
Couple of grumbles
rpc/src/v1/extractors.rs
Outdated
(None, Some(service), _) => Origin::Rpc(service.into()), | ||
(None, _, _) => Origin::Rpc("unknown".into()), | ||
origin: match user_agent { | ||
Some(service) => Origin::Rpc(service.into()), |
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.
I think it might be good to actually use the Origin
as well (if available)
rpc/src/v1/extractors.rs
Outdated
@@ -36,13 +36,11 @@ pub struct RpcExtractor; | |||
impl HttpMetaExtractor for RpcExtractor { | |||
type Metadata = Metadata; | |||
|
|||
fn read_metadata(&self, origin: Option<String>, user_agent: Option<String>, dapps_origin: Option<String>) -> Metadata { | |||
fn read_metadata(&self, _origin: Option<String>, user_agent: Option<String>, _dapps_origin: Option<String>) -> Metadata { |
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.
Should we get rid of _dapps_origin
in the trait?
rpc/src/v1/impls/eth.rs
Outdated
fn author(&self, meta: Metadata) -> Result<RpcH160> { | ||
let dapp = meta.dapp_id(); | ||
|
||
fn author(&self, _meta: Metadata) -> Result<RpcH160> { |
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.
Don't need the Meta
on the trait level I suppose.
rpc/src/v1/impls/eth.rs
Outdated
let dapp = meta.dapp_id(); | ||
|
||
let accounts = self.dapp_accounts(dapp.into())?; | ||
fn accounts(&self, _meta: Metadata) -> Result<Vec<RpcH160>> { |
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.
Same as above
fn accounts_info(&self, dapp: Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>> { | ||
let dapp = dapp.unwrap_or_default(); | ||
|
||
fn accounts_info(&self) -> Result<BTreeMap<H160, AccountInfo>> { |
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.
Should we accept (and ignore) the trailing param for backward compatibility?
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.
The issue is that we removed several methods, so it's already breaking backward compatibility no matter what. Would it still be useful to keep backward compatibility just for this function?
let dapp_accounts = self.accounts | ||
.note_dapp_used(dapp.clone().into()) | ||
.and_then(|_| self.accounts.dapp_addresses(dapp.into())) | ||
fn accounts_info(&self) -> Result<BTreeMap<H160, AccountInfo>> { |
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.
same as with accounts()
rpc/src/v1/impls/parity.rs
Outdated
|
||
Ok(self.accounts | ||
.dapp_default_address(dapp_id.into()) | ||
fn default_account(&self, _meta: Self::Metadata) -> Result<H160> { |
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.
Remove meta
on the trait level
rpc/src/v1/metadata.rs
Outdated
_ => DappId::default(), | ||
} | ||
} | ||
|
||
/// Returns true if the request originates from a Dapp. | ||
pub fn is_dapp(&self) -> bool { |
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.
Maybe just remove completelty?
/// Setting `None` will resets visible account to what's visible for new dapps | ||
/// (does not affect default account though) | ||
#[rpc(name = "parity_setDappAddresses")] | ||
fn set_dapp_addresses(&self, DappId, Option<Vec<H160>>) -> Result<bool>; |
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.
I wonder if we should mark the methods as deprecated first and only remove them in the next version?
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.
cc @5chdn. But I think we have 2.0 so it's okay to break backward compatibility from there? ;)
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.
Let's remove them for 2.0.1 and highlight that in release notes.
rpc/src/v1/types/provenance.rs
Outdated
Origin::Ws { ref session, ref dapp } => write!(f, "{} via WebSocket (session: {})", dapp, session), | ||
Origin::Signer { ref session, ref dapp } => write!(f, "{} via UI (session: {})", dapp, session), | ||
Origin::Ws { ref session } => write!(f, "WebSocket (session: {})", session), | ||
Origin::Signer { ref session } => write!(f, "Signer (session: {})", session), |
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.
Signer
might not be the most descriptive, maybe Secure Session
…-remove-dapp-permissions
@tomusdrw @andresilva please review |
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.
one more tiny little grumble regarding origin
rpc/src/v1/extractors.rs
Outdated
Metadata { | ||
origin: match user_agent { | ||
origin: match user_agent.or(origin) { |
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.
IMHO should be other way around, Origin
provides more info than UserAgent
. Maybe best just do:
let service = format!("{} / {}", origin.unwrap_or("unknown origin"), user_agent.unwrap_or("unknown agent"));
?
…rp_sync_on_light_client * 'master' of https://github.com/paritytech/parity: ethcore: add transition flag for transaction permission contract (openethereum#9275) Remove all dapp permissions related settings (openethereum#9120) Improve return data truncate logic (openethereum#9254) Update wasm-tests hash (openethereum#9295) Implement KIP4: create2 for wasm (openethereum#9277) Fix loop start value (openethereum#9285) Avoid using $HOME if not necessary (openethereum#9273) Fix path to parity.h (openethereum#9274)
The wiki should also be updated: https://wiki.parity.io/JSONRPC-parity_accounts-module |
* Completely remove all dapps struct from rpc * Remove unused pub use * Remove dapp policy/permission func in ethcore * Remove all dapps settings from rpc * Fix rpc tests * Use both origin and user_agent * Address grumbles * Address grumbles * Fix tests
* parity-version: bump beta to 2.0.2 * remove ssl from dockerfiles, closes #8880 (#9195) * snap: remove ssl dependencies from snapcraft definition (#9222) * parity-version: bump beta to 2.0.3 * Remove all dapp permissions related settings (#9120) * Completely remove all dapps struct from rpc * Remove unused pub use * Remove dapp policy/permission func in ethcore * Remove all dapps settings from rpc * Fix rpc tests * Use both origin and user_agent * Address grumbles * Address grumbles * Fix tests * Check if synced when using eth_getWork (#9193) (#9210) * Check if synced when using eth_getWork (#9193) * Don't use fn syncing * Fix identation * Fix typo * Don't check for warping * rpc: avoid calling queue_info twice on eth_getWork * Fix potential as_usize overflow when casting from U256 in miner (#9221) * Allow old blocks from peers with lower difficulty (#9226) Previously we only allow downloading of old blocks if the peer difficulty was greater than our syncing difficulty. This change allows downloading of blocks from peers where the difficulty is greater then the last downloaded old block. * Update Dockerfile (#9242) * Update Dockerfile fix Docker build * fix dockerfile paths: parity -> parity-ethereum (#9248) * Propagate transactions for next 4 blocks. (#9265) Closes #9255 This PR also removes the limit of max 64 transactions per packet, currently we only attempt to prevent the packet size to go over 8MB. This will only be the case for super-large transactions or high-block-gas-limit chains. Patching this is important only for chains that have blocks that can fit more than 4k transactions (over 86M block gas limit) For mainnet, we should actually see a tiny bit faster propagation since instead of computing 4k pending set, we only need `4 * 8M / 21k = 1523` transactions. Running some tests on `dekompile` node right now, to check how it performs in the wild. * Update tobalaba.json (#9313) * Fix load share (#9321) * fix(light_sync): calculate `load_share` properly * refactor(api.rs): extract `light_params` fn, add test * style(api.rs): add trailing commas * ethcore: fix pow difficulty validation (#9328) * ethcore: fix pow difficulty validation * ethcore: validate difficulty is not zero * ethcore: add issue link to regression test * ethcore: fix tests * ethcore: move difficulty_to_boundary to ethash crate * ethcore: reuse difficulty_to_boundary and boundary_to_difficulty * ethcore: fix grumbles in difficulty_to_boundary_aux * Light client `Provide default nonce in transactions when it´s missing` (#9370) * Provide `default_nonce` in tx`s when it´s missing When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead! * Changed http:// to https:// on Yasm link (#9369) Changed http:// to https:// on Yasm link in README.md * Provide `default_nonce` in tx`s when it´s missing When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead! * Address grumbles * ethcore: kovan: delay activation of strict score validation (#9406) * Better support for eth_getLogs in light mode (#9186) * Light client on-demand request for headers range. * Cache headers in HeaderWithAncestors response. Also fulfills request locally if all headers are in cache. * LightFetch::logs fetches missing headers on demand. * LightFetch::logs limit the number of headers requested at a time. * LightFetch::logs refactor header fetching logic. * Enforce limit on header range length in light client logs request. * Fix light request tests after struct change. * Respond to review comments. * Add update docs script to CI (#9219) * Add update docs script to CI Added a script to CI that will use the jsonrpc tool to update rpc documentation then commit and push those to the wiki repo. * fix gitlab ci lint * Only apply jsonrpc docs update on tags * Update gitlab-rpc-docs.sh * Copy correct parity repo to jsonrpc folder Copy correct parity repo to jsonrpc folder before attempting to build docs since the CI runner clones the repo as parity and not parity-ethereum. * Fix JSONRPC docs CI job Update remote config in wiki repo before pushing changes using a github token for authentication. Add message to wiki tag when pushing changes. Use project directory to correctly copy parity code base into the jsonrpc repo for doc generation. * Fix set_remote_wiki function call in CI * Prevent blockchain & miner racing when accessing pending block. (#9310) * Prevent blockchain & miner racing when accessing pending block. * Fix unavailability of pending block during reseal. * Prevent sync restart if import queue full (#9381) * Add POA Networks: Core and Sokol (#9413) * ethcore: add poa network and sokol chainspecs * rpc: simplify chain spec docs * cli: rearrange networks by main/test and size/range * parity: don't blacklist 0x00a328 on sokol testnet * parity: add sokol and poanet to params and clean up a bit, add tests * ethcore: add the poa networks and clean up a bit * ethcore: fix path to poacore chain spec * parity: rename poa networks to poacore and poasokol * parity: fix configuration tests * parity: fix parameter tests * ethcore: rename POA Core and POA Sokol * Update tobalaba.json (#9419) * Update hardcoded sync (#9421) - Update foundation hardcoded header to block 6219777 - Update ropsten hardcoded header to block 3917825 - Update kovan hardcoded header to block 8511489
Should only be merged after #9107. I submit this as a separate PR because this may need more polishing, or I may have removed too many stuff.
Completely remove dapp permission settings from AccountProvider and RPC: