Wip

modules/Odra.toml

@@ -22,10 +22,10 @@ fqn = "odra_modules::Erc20"
 name = "WrappedNativeToken"
 fqn = "odra_modules::wrapped_native::WrappedNativeToken"
 
-#[[contracts]]
-#name = "ownable"
-#fqn = "odra_modules::access::Ownable"
-#
+[[contracts]]
+name = "ownable"
+fqn = "odra_modules::access::Ownable"
+
 #[[contracts]]
 #name = "ownable2_step"
 #fqn = "odra_modules::access::Ownable2Step"

modules/src/access/access_control.rs

@@ -61,7 +61,7 @@ impl AccessControl {
     ///
     /// The caller must have `role`'s admin role.
     pub fn grant_role(&mut self, role: &Role, address: &Address) {
-        self.check_role(&self.get_role_admin(role), &contract_env::caller());
+        self.check_role(&self.get_role_admin(role), self.env().caller());
         self.unchecked_grant_role(role, address);
     }
 
@@ -72,7 +72,7 @@ impl AccessControl {
     ///
     /// The caller must have `role`'s admin role.
     pub fn revoke_role(&mut self, role: &Role, address: &Address) {
-        self.check_role(&self.get_role_admin(role), &contract_env::caller());
+        self.check_role(&self.get_role_admin(role), self.env().caller());
         self.unchecked_revoke_role(role, address);
     }
 
@@ -87,8 +87,8 @@ impl AccessControl {
     ///
     /// Note that only `address` is authorized to call this function.
     pub fn renounce_role(&mut self, role: &Role, address: &Address) {
-        if address != &contract_env::caller() {
-            contract_env::revert(Error::RoleRenounceForAnotherAddress);
+        if address != self.env().caller() {
+            self.env().revert(RoleRenounceForAnotherAddress);
         }
         self.unchecked_revoke_role(role, address);
     }
@@ -98,7 +98,7 @@ impl AccessControl {
     /// Ensures `address` has `role`. If not, reverts with [Error::MissingRole].
     pub fn check_role(&self, role: &Role, address: &Address) {
         if !self.has_role(role, address) {
-            contract_env::revert(Error::MissingRole);
+            self.env().revert(MissingRole);
         }
     }
 

modules/src/access/errors.rs

@@ -1,11 +1,16 @@
-use odra::execution_error;
+use odra::OdraError;
 
-execution_error! {
-    pub enum Error {
-        OwnerNotSet => 20_000,
-        CallerNotTheOwner => 20_001,
-        CallerNotTheNewOwner => 20_002,
-        MissingRole => 20_003,
-        RoleRenounceForAnotherAddress => 20_004,
+pub enum Error {
+        OwnerNotSet = 20_000,
+        CallerNotTheOwner = 20_001,
+        CallerNotTheNewOwner = 20_002,
+        MissingRole = 20_003,
+        RoleRenounceForAnotherAddress = 20_004,
     }
-}
+
+    impl From<Error> for OdraError {
+        fn from(error: Error) -> Self {
+            OdraError::user(error as u16)
+        }
+    }
+

modules/src/access/events.rs

@@ -1,5 +1,5 @@
-use odra::{types::Address, Event};
-
+use casper_event_standard::Event;
+use odra::Address;
 use super::access_control::Role;
 
 #[derive(Event, PartialEq, Eq, Debug)]