Sync with master

.env.example

@@ -0,0 +1,17 @@
+# Path to the secret key of the account that will be used
+# to deploy the contracts.
+# We're using .keys folder so we don't accidentally commit
+# the secret key to the repository.
+ODRA_CASPER_LIVENET_SECRET_KEY_PATH=./net-1/faucet/secret_key.pem
+
+# RPC address of the node that will be used to deploy the contracts.
+ODRA_CASPER_LIVENET_NODE_ADDRESS=http://localhost:11101
+
+# Chain name of the network. Known values:
+# - integration-test
+ODRA_CASPER_LIVENET_CHAIN_NAME=casper-net-1
+
+# Paths to the secret keys of the additional accounts.
+# Main secret key will be 0th account.
+ODRA_CASPER_LIVENET_KEY_1=./net-1/faucet/secret_key.pem
+ODRA_CASPER_LIVENET_KEY_2=./net-1/faucet/secret_key.pem

.github/workflows/update-plantuml-pngs.yaml

@@ -13,14 +13,15 @@ jobs:
     name: plantuml
     steps:
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - name: plantuml
-        id: plantuml
-        uses: grassedge/generate-plantuml-action@v1.5
+
+      - name: Generate UML diagrams
+        run: |
+          docker run --rm -v ${{ github.workspace }}/docs/sequence-diagrams/puml:/workspace plantuml/plantuml -tpng /workspace/*.puml
+
       - name: Update Repo
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Render PlantUML files"
-

.gitignore

@@ -6,4 +6,9 @@ Cargo.lock
 .builder*
 /wasm
 .env
-.DS_Store
+.env15
+.env20
+.DS_Store
+/.idea
+casper-name-contracts/wasm
+net-1

Cargo.toml

@@ -1,53 +1,19 @@
-[package]
-name = "casper-name"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-odra = { path = "../odra3/odra", features = [], default-features = false }
-odra-modules = { path = "../odra3/modules", features = [], default-features = false }
-hex = { version = "0.4.3", default-features = false }
-odra-casper-livenet-env = { path = "../odra3/odra-casper/livenet-env", optional = true }
-serde = { version = "1.0.80", default-features = false }
-serde_json = { version = "1.0.99", default-features = false }
-serde-json-wasm = { version = "1.0.1", default-features = false }
-
-[dev-dependencies]
-odra-test = { path = "../odra3/odra-test", features = [], default-features = false }
-blake2 = "0.10.6"
-hex = "0.4.3"
-
-[build-dependencies]
-odra-build = { path = "../odra3/odra-build", features = [], default-features = false }
-
-[features]
-default = []
-livenet = ["odra-casper-livenet-env"]
-
-[[bin]]
-name = "casper_name_build_contract"
-path = "bin/build_contract.rs"
-test = false
-
-[[bin]]
-name = "casper_name_build_schema"
-path = "bin/build_schema.rs"
-test = false
-
-[[bin]]
-name = "deploy-example"
-path = "bin/deploy_example.rs"
-required-features = ["livenet"]
-test = false
-
-[[bin]]
-name = "test-schema"
-path = "bin/test_schema.rs"
-test = false
-
-[[test]]
-name = "test_register"
-path = "tests/test_register.rs"
+[workspace]
+members = [
+    "casper-name-cli",
+    "casper-name-contracts",
+]
+
+resolver = "2"
+
+[workspace.dependencies]
+odra = { version = "2.1.0" }
+odra-cli = { version = "2.1.0" }
+odra-modules = { version = "2.1.0" }
+odra-test = { version = "2.1.0" }
+odra-build = { version = "2.1.0" }
+odra-bdd = { version = "2.1.0" }
+odra-casper-livenet-env = { version = "2.1.0" }
 
 [profile.release]
 codegen-units = 1

Odra.toml

@@ -1,2 +1,17 @@
 [[contracts]]
-fqn = "casper_name::register::Register"
+fqn = "casper_name_contracts::contracts::registrar::Registrar"
+
+[[contracts]]
+fqn = "casper_name_contracts::contracts::name_token::NameToken"
+
+[[contracts]]
+fqn = "casper_name_contracts::contracts::controller::Controller"
+
+[[contracts]]
+fqn = "casper_name_contracts::contracts::resolver::DefaultResolver"
+
+[[contracts]]
+fqn = "casper_name_contracts::contracts::marketplace::SecondaryMarket"
+
+[[contracts]]
+fqn = "casper_name_contracts::contracts::reverse_resolver::ReverseResolver"

README.md

@@ -4,6 +4,25 @@
 It's recommended to install 
 [cargo-odra](https://github.com/odradev/cargo-odra) first.
 
+### Prerequisites
+
+Install wasm-opt tool (it is needed for building contracts)
+```
+$ cargo install wasm-opt --locked
+```
+
+if you run casper node localy (nctl), you need to copy files to have access to the accounts keys from the host
+```
+$ docker run --rm -it --name mynctl -d -p 11101:11101 -p 14101:14101 -p 18101:18101 makesoftware/casper-nctl
+
+$ docker cp mynctl:/home/casper/casper-node/utils/nctl/assets/net-1 .
+```
+
+Copy example env file and make appropriate adjustments (default values work with nctl)
+```
+$ cp .env.example .env
+```
+
 ### Build
 
 ```
@@ -16,6 +35,12 @@ The result files will be placed in `${project-root}/wasm` directory.
 $ cargo odra build -b casper
 ```
 
+### Deploy
+
+```
+$ cargo run -p casper-name-cli deploy
+```
+
 ### Test
 To run test on your local machine, you can basically execute the command:
 

casper-name-cli/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "casper-name-cli"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+odra = { workspace = true }
+odra-casper-livenet-env = { workspace = true }
+odra-cli = { workspace = true }
+odra-modules = { workspace = true }
+casper-name-contracts = { path = "../casper-name-contracts" }
+clap = { version = "4.5.4", features = ["derive"] }
+prettycli = "0.1.1"
+chrono = { version = "0.4", features = ["serde"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_derive = { version = "1.0", features = ["default"] }
+serde_json = "1.0"
+toml = "0.8.13"
+blake2 = "0.10.6"
+hex = "0.4.3"
+
+[[bin]]
+name = "casper-name-cli"
+path = "bin/main.rs"

casper-name-cli/bin/main.rs

@@ -0,0 +1,3 @@
+pub fn main() {
+    casper_name_cli::odra_cli::cli();
+}

casper-name-cli/src/lib.rs

@@ -0,0 +1 @@
+pub mod odra_cli;

casper-name-cli/src/odra_cli.rs

@@ -0,0 +1,28 @@
+use casper_name_contracts::contracts::{
+    controller::Controller, marketplace::SecondaryMarket, name_token::NameToken,
+    registrar::Registrar, resolver::DefaultResolver, reverse_resolver::ReverseResolver,
+};
+use deploy::DeployScript;
+use odra_cli::OdraCli;
+use scenario::{CalculateSignature, CalculateTokenHash, RegisterTokenScenario, SetConfigScript};
+
+mod deploy;
+mod scenario;
+
+pub fn cli() {
+    OdraCli::new()
+        .about("Casper Name Service CLI")
+        .deploy(DeployScript)
+        .contract::<DefaultResolver>()
+        .contract::<Controller>()
+        .contract::<Registrar>()
+        .contract::<NameToken>()
+        .contract::<SecondaryMarket>()
+        .contract::<ReverseResolver>()
+        .scenario(SetConfigScript)
+        .scenario(RegisterTokenScenario)
+        .scenario(CalculateTokenHash)
+        .scenario(CalculateSignature)
+        .build()
+        .run();
+}