LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: improvements in DsProxy execute (#177)

This commit is contained in:
Rohit Narurkar 2021-01-22 16:19:52 +05:30 committed by GitHub
parent 3105431007
commit 311884f076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ethers-middleware/src/transformer/ds_proxy/mod.rs
View File

@ -40,15 +40,15 @@ const DS_PROXY_EXECUTE_CODE: &str =
/// let ds_proxy = DsProxy::new(ds_proxy_addr);
///
/// // execute a transaction via the DsProxy instance.
/// # let target_addr = Address::random();
/// let target = AddressOrBytes::Address(target_addr);
/// let target = Address::random();
/// let calldata: Bytes = vec![0u8; 32].into();
/// let tx_hash = ds_proxy.execute::<HttpWallet, Arc<HttpWallet>>(
/// let contract_call = ds_proxy.execute::<HttpWallet, Arc<HttpWallet>, Address>(
/// Arc::new(client),
/// target,
/// calldata,
/// )
/// .await?;
/// )?;
/// let pending_tx = contract_call.send().await?;
/// let _tx_receipt = pending_tx.await?;
///
/// # Ok(())
/// # }
@ -146,36 +146,31 @@ impl DsProxy {
/// appropriate `execute` method is called, that is, either
/// [execute(address,bytes)](https://github.com/dapphub/ds-proxy/blob/master/src/proxy.sol#L53-L58)
/// or [execute(bytes,bytes)](https://github.com/dapphub/ds-proxy/blob/master/src/proxy.sol#L39-L42).
pub async fn execute<M: Middleware, C: Into<Arc<M>>>(
pub fn execute<M: Middleware, C: Into<Arc<M>>, T: Into<AddressOrBytes>>(
&self,
client: C,
target: AddressOrBytes,
target: T,
data: Bytes,
) -> Result<TxHash, ContractError<M>> {
) -> Result<ContractCall<M, Bytes>, ContractError<M>> {
// construct the full contract using DsProxy's address and the injected client.
let ds_proxy = self
.contract
.clone()
.into_contract(self.address, client.into());
match target {
match target.into() {
// handle the case when the target is an address to a deployed contract.
AddressOrBytes::Address(addr) => {
let selector = id("execute(address,bytes)");
let args = (addr, data);
let call: ContractCall<M, Bytes> = ds_proxy.method_hash(selector, args)?;
let pending_tx = call.send().await?;
Ok(*pending_tx)
Ok(ds_proxy.method_hash(selector, args)?)
}
// handle the case when the target is actually bytecode of a contract to be deployed
// and executed on.
AddressOrBytes::Bytes(code) => {
let selector = id("execute(bytes,bytes)");
let args = (code, data);
let call: ContractCall<M, (Address, Bytes)> =
ds_proxy.method_hash(selector, args)?;
let pending_tx = call.send().await?;
Ok(*pending_tx)
Ok(ds_proxy.method_hash(selector, args)?)
}
}
}

17
ethers-middleware/tests/transformer.rs
View File

@ -7,7 +7,7 @@ use ethers_middleware::{
transformer::{DsProxy, TransformerMiddleware},
SignerMiddleware,
};
use ethers_providers::{Http, Middleware, PendingTransaction, Provider};
use ethers_providers::{Http, Middleware, Provider};
use ethers_signers::LocalWallet;
use rand::Rng;
use std::{convert::TryFrom, sync::Arc, time::Duration};
@ -153,19 +153,16 @@ async fn ds_proxy_code() {
.expect("could not get ABI encoded data");
// execute code via the deployed DsProxy contract.
let tx_hash = ds_proxy
.execute::<HttpWallet, Arc<HttpWallet>>(
ds_proxy
.execute::<HttpWallet, Arc<HttpWallet>, Bytes>(
Arc::clone(&provider),
AddressOrBytes::Bytes(ss.bytecode.clone()),
ss.bytecode.clone(),
calldata,
)
.expect("could not construct DSProxy contract call")
.send()
.await
.expect("could not execute code via DSProxy");
// wait for the tx to be confirmed.
PendingTransaction::new(tx_hash, provider.provider())
.await
.expect("could not confirm pending tx");
.unwrap();
// verify that DsProxy's state was updated.
let last_sender = provider