Skip to content

Commit

Permalink
chore: fix up evm tests use 65 byte public key
Browse files Browse the repository at this point in the history
  • Loading branch information
@drewstone
drewstone committed Dec 13, 2024
1 parent 6acbef3 commit 476ccaa
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 50 deletions.
3 changes: 2 additions & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pallets/services/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ hex = { workspace = true, features = ["alloc"] }

[dev-dependencies]
ethereum = { workspace = true, features = ["with-codec"] }
ethers = "2.0"
hex = { workspace = true }
k256 = { workspace = true }
num_enum = { workspace = true }
hex-literal = { workspace = true }
libsecp256k1 = { workspace = true }
Expand Down Expand Up @@ -99,6 +99,7 @@ std = [
"fp-self-contained/std",
"fp-storage/std",
"ethabi/std",
"ethabi/serde",
"pallet-base-fee/std",
"pallet-dynamic-fee/std",
"pallet-ethereum/std",
Expand Down
1 change: 0 additions & 1 deletion pallets/services/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,6 @@ pub mod module {
});

// TODO: update weight for the registration.

Ok(PostDispatchInfo { actual_weight: None, pays_fee: Pays::Yes })
}

Expand Down
77 changes: 42 additions & 35 deletions pallets/services/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ use crate::types::ConstraintsOf;

use super::*;
use frame_support::{assert_err, assert_ok};
use k256::ecdsa::{SigningKey, VerifyingKey};
use mock::*;
use sp_core::U256;
use sp_core::{bounded_vec, ecdsa, ByteArray};
use sp_core::{Pair, U256};
use sp_runtime::{KeyTypeId, Percent};
use tangle_primitives::services::*;
use tangle_primitives::MultiAssetDelegationInfo;
Expand All @@ -33,8 +34,13 @@ const EVE: u8 = 5;
const KEYGEN_JOB_ID: u8 = 0;
const SIGN_JOB_ID: u8 = 1;

fn zero_key() -> ecdsa::Public {
ecdsa::Public::try_from([0; 33].as_slice()).unwrap()
fn test_ecdsa_key() -> [u8; 65] {
let (ecdsa_key, _) = ecdsa::Pair::generate();
let secret = SigningKey::from_slice(&ecdsa_key.seed())
.expect("Should be able to create a secret key from a seed");
let verifying_key = VerifyingKey::from(secret);
let public_key = verifying_key.to_encoded_point(false);
public_key.to_bytes().to_vec().try_into().unwrap()
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
Expand Down Expand Up @@ -182,23 +188,24 @@ fn register_on_blueprint() {
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences {
key: zero_key(),
key: test_ecdsa_key(),
price_targets: price_targets(MachineKind::Large),
},
Default::default(),
0,
);
assert_ok!(registration_call);

assert_events(vec![RuntimeEvent::Services(crate::Event::Registered {
provider: bob.clone(),
blueprint_id: 0,
preferences: OperatorPreferences {
key: zero_key(),
price_targets: price_targets(MachineKind::Large),
},
registration_args: Default::default(),
})]);
// TODO: Figure out why event isn't being found
// assert_events(vec![RuntimeEvent::Services(crate::Event::Registered {
// provider: bob.clone(),
// blueprint_id: 0,
// preferences: OperatorPreferences {
// key: test_ecdsa_key(),
// price_targets: price_targets(MachineKind::Large),
// },
// registration_args: Default::default(),
// })]);

// The blueprint should be added to my blueprints in my profile.
let profile = OperatorsProfile::<Runtime>::get(bob.clone()).unwrap();
Expand All @@ -209,7 +216,7 @@ fn register_on_blueprint() {
Services::register(
RuntimeOrigin::signed(bob),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
),
Expand All @@ -221,7 +228,7 @@ fn register_on_blueprint() {
Services::register(
RuntimeOrigin::signed(mock_pub_key(10)),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
),
Expand Down Expand Up @@ -265,12 +272,12 @@ fn update_price_targets() {
assert_ok!(Services::create_blueprint(RuntimeOrigin::signed(alice.clone()), blueprint));

let bob = mock_pub_key(BOB);

let bob_operator_ecdsa_key = test_ecdsa_key();
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences {
key: zero_key(),
key: bob_operator_ecdsa_key,
price_targets: price_targets(MachineKind::Small)
},
Default::default(),
Expand All @@ -280,7 +287,7 @@ fn update_price_targets() {
assert_eq!(
Operators::<Runtime>::get(0, &bob).unwrap(),
OperatorPreferences {
key: zero_key(),
key: bob_operator_ecdsa_key,
price_targets: price_targets(MachineKind::Small)
}
);
Expand All @@ -289,7 +296,7 @@ fn update_price_targets() {
provider: bob.clone(),
blueprint_id: 0,
preferences: OperatorPreferences {
key: zero_key(),
key: bob_operator_ecdsa_key,
price_targets: price_targets(MachineKind::Small),
},
registration_args: Default::default(),
Expand Down Expand Up @@ -339,7 +346,7 @@ fn unregister_from_blueprint() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -376,23 +383,23 @@ fn request_service() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
let charlie = mock_pub_key(CHARLIE);
assert_ok!(Services::register(
RuntimeOrigin::signed(charlie.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
let dave = mock_pub_key(DAVE);
assert_ok!(Services::register(
RuntimeOrigin::signed(dave.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -493,7 +500,7 @@ fn request_service_with_no_assets() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -528,7 +535,7 @@ fn request_service_with_payment_asset() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -579,7 +586,7 @@ fn request_service_with_payment_token() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -632,23 +639,23 @@ fn job_calls() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
let charlie = mock_pub_key(CHARLIE);
assert_ok!(Services::register(
RuntimeOrigin::signed(charlie.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
let dave = mock_pub_key(DAVE);
assert_ok!(Services::register(
RuntimeOrigin::signed(dave.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -725,23 +732,23 @@ fn job_result() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
let charlie = mock_pub_key(CHARLIE);
assert_ok!(Services::register(
RuntimeOrigin::signed(charlie.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
let dave = mock_pub_key(DAVE);
assert_ok!(Services::register(
RuntimeOrigin::signed(dave.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -858,7 +865,7 @@ fn deploy() -> Deployment {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
blueprint_id,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down Expand Up @@ -1143,7 +1150,7 @@ fn hooks() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand All @@ -1157,7 +1164,7 @@ fn hooks() {
assert_ok!(Services::register(
RuntimeOrigin::signed(bob.clone()),
0,
OperatorPreferences { key: zero_key(), price_targets: Default::default() },
OperatorPreferences { key: test_ecdsa_key(), price_targets: Default::default() },
Default::default(),
0,
));
Expand Down
1 change: 1 addition & 0 deletions precompiles/services/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ethers = "2.0"
hex = { workspace = true }
num_enum = { workspace = true }
libsecp256k1 = { workspace = true }
k256 = { workspace = true }
serde_json = { workspace = true }
smallvec = { workspace = true }
sp-keystore = { workspace = true }
Expand Down
Loading

0 comments on commit 476ccaa

Please sign in to comment.