Merge branch 'aip-61-adex-v5' into sentry-tls

Author: elpiel

Cargo.lock

@@ -21,7 +21,6 @@ primitives = { path = "../primitives" }
 # For Ethereum client
 web3 = { version = "0.18", features = ["http-tls", "signing"] }
 ethsign = "0.8"
-create2 = "0.0.2"
 
 # For Dummy client
 dashmap = "5"

adapter/Cargo.toml

@@ -25,9 +25,6 @@ pub static DUMMY_CHAIN: Lazy<Chain> = Lazy::new(|| Chain {
     outpace: "0x0000000000000000000000000000000000000000"
         .parse()
         .unwrap(),
-    sweeper: "0x0000000000000000000000000000000000000000"
-        .parse()
-        .unwrap(),
 });
 
 /// Dummy adapter implementation intended for testing.
@@ -212,7 +209,7 @@ mod test {
         let channel_context = ChainOf {
             context: channel,
             token: TokenInfo {
-                min_token_units_for_deposit: 1_u64.into(),
+                min_campaign_budget: 1_u64.into(),
                 min_validator_fee: 1_u64.into(),
                 precision: NonZeroU8::new(UnifiedNum::PRECISION).expect("Non zero u8"),
                 address: channel.token,
@@ -234,15 +231,14 @@ mod test {
             assert!(result.is_err());
         }
 
-        let get_deposit = |total: u64, create2: u64| Deposit {
+        let get_deposit = |total: u64| Deposit {
             total: BigNum::from(total),
-            still_on_create2: BigNum::from(create2),
         };
 
         // add two deposit and call 3 times
         // also check if different address does not have access to these calls
         {
-            let deposits = [get_deposit(6969, 69), get_deposit(1000, 0)];
+            let deposits = [get_deposit(6969), get_deposit(1000)];
             dummy_client.add_deposit_call(channel.id(), address, deposits[0].clone());
             dummy_client.add_deposit_call(channel.id(), address, deposits[1].clone());
 

adapter/src/dummy.rs

@@ -8,7 +8,7 @@ use web3::signing::keccak256;
 use crate::{Adapter, LockedState, UnlockedState};
 
 pub use {
-    client::{get_counterfactual_address, Ethereum, Options},
+    client::{Ethereum, Options},
     error::Error,
 };
 
@@ -46,12 +46,6 @@ pub static SWEEPER_ABI: Lazy<&'static [u8]> =
 pub static IDENTITY_ABI: Lazy<&'static [u8]> =
     Lazy::new(|| include_bytes!("../../lib/protocol-eth/abi/Identity5.2.json"));
 
-/// Ready to use init code (i.e. decoded) for calculating the create2 address
-pub static DEPOSITOR_BYTECODE_DECODED: Lazy<Vec<u8>> = Lazy::new(|| {
-    let bytecode = include_str!("../../lib/protocol-eth/resources/bytecode/Depositor.bin");
-    hex::decode(bytecode).expect("Decoded properly")
-});
-
 /// Hashes the passed message with the format of `Signed Data Standard`
 /// See https://eips.ethereum.org/EIPS/eip-191
 fn to_ethereum_signed(message: &[u8]) -> [u8; 32] {