Fix/events and cep78 extensions

Cargo.toml

@@ -16,19 +16,20 @@ exclude = [ "examples", "modules", "benchmark", "odra-casper/proxy-caller", "tem
 resolver = "2"
 
 [workspace.package]
-version = "0.9.1"
+version = "1.0.0-rc.1"
 authors = ["Jakub Płaskonka <kuba@odra.dev>", "Krzysztof Pobiarżyn <krzysztof@odra.dev>", "Maciej Zieliński <maciej@odra.dev>"]
 license = "MIT"
 homepage = "https://odra.dev/docs"
 repository = "https://github.com/odradev/odra"
 
 [workspace.dependencies]
-odra-core = { path = "core", version = "0.9.1" }
-odra-macros = { path = "odra-macros", version = "0.9.1" }
-odra-casper-test-vm = { path = "odra-casper/test-vm", version = "0.9.1" }
-odra-casper-rpc-client = { path = "odra-casper/rpc-client", version = "0.9.1" }
-odra-vm = { path = "odra-vm", version = "0.9.1" }
-odra-casper-wasm-env = { path = "odra-casper/wasm-env", version = "0.9.1"}
+odra-core = { path = "core", version = "1.0.0-rc.1" }
+odra-macros = { path = "odra-macros", version = "1.0.0-rc.1" }
+odra-casper-test-vm = { path = "odra-casper/test-vm", version = "1.0.0-rc.1" }
+odra-casper-rpc-client = { path = "odra-casper/rpc-client", version = "1.0.0-rc.1" }
+odra-vm = { path = "odra-vm", version = "1.0.0-rc.1" }
+odra-casper-wasm-env = { path = "odra-casper/wasm-env", version = "1.0.0-rc.1"}
+odra-schema = { path = "odra-schema", version = "1.0.0-rc.1" }
 casper-contract = { version = "4.0.0", default-features = false }
 casper-types = { version = "4.0.1", default-features = false }
 casper-execution-engine = "7.0.1"
@@ -39,4 +40,4 @@ env_logger = "0.11.1"
 serde = { version = "1.0.195", default-features = false }
 serde_json = { version = "1.0.113", default-features = false }
 num-traits = { version = "0.2.14", default-features = false }
-mockall = { version = "0.11.4" }
+mockall = { version = "0.12.1" }

README.md

@@ -11,7 +11,7 @@
     </p>
     <p>
         <a href="https://github.com/odradev/odra/actions">
-            <img src="https://img.shields.io/github/actions/workflow/status/odradev/odra/test.yml?branch=release%2F0.9.0" alt="GitHub Workflow Status" />
+            <img src="https://img.shields.io/github/actions/workflow/status/odradev/odra/test.yml?branch=release%2F1.0.0" alt="GitHub Workflow Status" />
         </a>
         <a href="https://codecov.io/gh/odradev/odra">
             <img src="https://codecov.io/gh/odradev/odra/graph/badge.svg?token=8AT1UNOJMS" alt="Code coverage">

core/Cargo.toml

@@ -12,8 +12,6 @@ repository = { workspace = true }
 casper-types = { workspace = true }
 casper-event-standard = { workspace = true }
 num-traits = { workspace = true }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 serde = { workspace = true, default-features = false, features = ["alloc", "derive"] }
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
 

core/src/address.rs

@@ -7,13 +7,11 @@ use casper_types::{
     bytesrepr::{self, FromBytes, ToBytes},
     CLType, CLTyped, ContractPackageHash, Key, PublicKey
 };
+use serde::{Deserialize, Serialize};
 
 /// An enum representing an [`AccountHash`] or a [`ContractPackageHash`].
-#[cfg_attr(
-    not(target_arch = "wasm32"),
-    derive(serde::Serialize, serde::Deserialize)
-)]
-#[derive(PartialOrd, Ord, PartialEq, Eq, Hash, Clone, Copy, Debug)]
+#[derive(PartialOrd, Ord, PartialEq, Eq, Hash, Clone, Copy, Debug, Serialize, Deserialize)]
+// #[serde(untagged)]
 pub enum Address {
     /// Represents an account hash.
     Account(AccountHash),

core/src/call_def.rs

@@ -1,13 +1,10 @@
 use crate::prelude::*;
 use casper_types::bytesrepr::FromBytes;
 use casper_types::{CLTyped, RuntimeArgs, U512};
+use serde::{Deserialize, Serialize};
 
 /// Represents a call definition, which includes the method name, runtime arguments, attached value, and mutability flag.
-#[cfg_attr(
-    not(target_arch = "wasm32"),
-    derive(serde::Serialize, serde::Deserialize)
-)]
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CallDef {
     entry_point: String,
     args: RuntimeArgs,

core/src/contract_def.rs

@@ -6,12 +6,10 @@ use casper_types::{
     bytesrepr::{FromBytes, ToBytes},
     CLType, Key, PublicKey, URef, U128, U256, U512
 };
-#[cfg(not(target_arch = "wasm32"))]
 use serde::{Deserialize, Serialize};
 
 /// Contract's entrypoint.
-#[derive(Debug, Clone)]
-#[cfg_attr(not(target_arch = "wasm32"), derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Entrypoint {
     /// The entrypoint's ident.
     pub name: String,
@@ -28,8 +26,7 @@ pub struct Entrypoint {
 }
 
 /// Defines an argument passed to an entrypoint.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[cfg_attr(not(target_arch = "wasm32"), derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Argument {
     /// The argument's ident.
     pub name: String,
@@ -44,8 +41,7 @@ pub struct Argument {
 }
 
 /// Defines an event.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[cfg_attr(not(target_arch = "wasm32"), derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Event {
     /// The event's ident.
     pub name: String,
@@ -61,8 +57,7 @@ impl Event {
 }
 
 /// Defines an entrypoint type.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(not(target_arch = "wasm32"), derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub enum EntrypointType {
     /// A special entrypoint that can be called just once on the contract initialization.
     Constructor,
@@ -71,8 +66,7 @@ pub enum EntrypointType {
 }
 
 /// Defines an entrypoint attribute.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(not(target_arch = "wasm32"), derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub enum EntrypointAttribute {
     /// A non-reentrant entrypoint.
     NonReentrant,
@@ -99,7 +93,6 @@ pub trait HasEvents {
     fn events() -> Vec<Event>;
 
     /// Returns a map of event schemas used by the contract.
-    #[cfg(target_arch = "wasm32")]
     fn event_schemas() -> crate::prelude::BTreeMap<String, casper_event_standard::Schema> {
         crate::prelude::BTreeMap::new()
     }
@@ -109,8 +102,7 @@ pub trait HasEvents {
 ///
 /// A contract blueprint is a set of events and entrypoints defined in a smart contract.
 /// It is used to generate the contract's ABI.
-#[derive(Debug, Clone)]
-#[cfg_attr(not(target_arch = "wasm32"), derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ContractBlueprint {
     /// The name of the contract.
     pub name: String,
@@ -139,7 +131,6 @@ impl ContractBlueprint {
         }
     }
 
-    #[cfg(not(target_arch = "wasm32"))]
     /// Converts the `ContractBlueprint` instance to a JSON string representation.
     ///
     /// # Returns

core/src/gas_report.rs

@@ -3,16 +3,13 @@ use crate::prelude::*;
 use crate::{Address, CallDef};
 use casper_types::U512;
 use core::fmt::{Debug, Display, Formatter, Result};
+use serde::{Deserialize, Serialize};
 
 /// A Vector of deploy reports makes a full gas report.
 pub type GasReport = Vec<DeployReport>;
 
 /// Represents a deploy report, which includes the gas used and the deploy details.
-#[cfg_attr(
-    not(target_arch = "wasm32"),
-    derive(serde::Serialize, serde::Deserialize)
-)]
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum DeployReport {
     /// Represents a Wasm deploy.
     WasmDeploy {

core/src/module.rs

@@ -62,6 +62,10 @@ impl<M: HasEvents> HasEvents for SubModule<M> {
     fn events() -> Vec<crate::contract_def::Event> {
         M::events()
     }
+
+    fn event_schemas() -> crate::prelude::BTreeMap<String, casper_event_standard::Schema> {
+        M::event_schemas()
+    }
 }
 
 /// Wrapper for a module implementing the `Module` trait.

examples/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "odra-examples"
-version = "0.9.1"
+version = "1.0.0-rc.1"
 edition = "2021"
 
 [dependencies]

examples/resources/casper_contract_schemas/balance_checker_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "BalanceChecker",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/cross_contract_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "CrossContract",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/dog_contract2_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "DogContract2",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/dog_contract3_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "DogContract3",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/dog_contract_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "DogContract",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/host_contract_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "HostContract",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/livenet_contract_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "LivenetContract",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [
     {
       "struct": {

examples/resources/casper_contract_schemas/math_engine_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "MathEngine",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [

examples/resources/casper_contract_schemas/mock_moderated_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "MockModerated",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [
     {
       "struct": {

examples/resources/casper_contract_schemas/modules_contract_schema.json

@@ -1,11 +1,11 @@
 {
   "casper_contract_schema_version": 1,
-  "toolchain": "rustc 1.77.0-nightly (5bd5d214e 2024-01-25)",
+  "toolchain": "rustc 1.78.0-nightly (98aa3624b 2024-02-08)",
   "authors": [],
   "repository": null,
   "homepage": null,
   "contract_name": "ModulesContract",
-  "contract_version": "0.8.1",
+  "contract_version": "1.0.0-rc.1",
   "types": [],
   "errors": [],
   "entry_points": [