From 1d10ec6561dd625eebbe04237d68fbfa77751700 Mon Sep 17 00:00:00 2001
From: kylin lv <lvxing_ood@163.com>
Date: Wed, 20 Mar 2024 15:13:15 +0800
Subject: [PATCH] finish tasks

---
 student_no.txt          |  1 +
 task1/sources/main.move |  2 ++
 task2/sources/main.move | 16 +++++++++++-----
 task3/sources/m1.move   |  6 +++---
 task4/sources/main.move |  8 ++++++++
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/student_no.txt b/student_no.txt
index 2a6816f..088d968 100644
--- a/student_no.txt
+++ b/student_no.txt
@@ -1 +1,2 @@
 # Please enter your 9-digit student number below.
+100243117
\ No newline at end of file
diff --git a/task1/sources/main.move b/task1/sources/main.move
index 2507060..ef26019 100644
--- a/task1/sources/main.move
+++ b/task1/sources/main.move
@@ -6,12 +6,14 @@ module 0x42::Task1 {
     // Define a struct called Wallet with a single field called balance of type u64.
     struct Wallet has drop {
         // ...
+        balance: u64
     }
 
     // TODO
     // Define a function called myWallet that returns a Wallet with a balance of 1000.
     fun myWallet(): Wallet {
         // ...
+        Wallet {balance:1000}
     }
 
     #[test]
diff --git a/task2/sources/main.move b/task2/sources/main.move
index d6746d8..c31b565 100644
--- a/task2/sources/main.move
+++ b/task2/sources/main.move
@@ -4,14 +4,17 @@ module 0x42::Task2{
 
     // TODO
     // Define a struct Foo with two fields: u: u64, b: bool with ability to drop
-    struct Foo {
+    struct Foo has drop {
        // ...
+       u: u64,
+       b: bool
     }
 
     // TODO
     // Define a function gen_Fool that takes two arguments: u: u64, b: bool and returns a Foo
     fun gen_Fool(u:u64, b:bool): Foo {
         // ...
+        Foo {u,b}
     }
 
     #[test]
@@ -32,14 +35,16 @@ module 0x42::Task2{
 
     // TODO
     // Define a struct Soo with two fields: x: u64, y: u64 with ability to copy
-    struct Soo {
+    struct Soo has copy,drop {
         // ...
+        x: u64, y: u64
     }
 
     // TODO
     // Define a function gen_Soo that takes two arguments: x: u64, y: u64 and returns a Soo
     fun gen_Soo(x:u64, y:u64): Soo {
         // ...
+        Soo{x,y}
     }
 
     #[test]
@@ -56,13 +61,13 @@ module 0x42::Task2{
 
     // TODO
     // Define a struct Koo with a field: s: Moo with ability
-    struct Koo {
+    struct Koo has key{
         s: Moo
     }
 
     // TODO
     // Define a struct Moo with a field: x: u64 with ability
-    struct Moo {
+    struct Moo has store {
         x: u64
     }
 
@@ -71,12 +76,13 @@ module 0x42::Task2{
     // Define a function gen_Moo that takes an argument: x: u64 and returns a Moo
     fun gen_Moo(x:u64): Moo {
         // ...
+        Moo{x}
     }
 
     #[test]
     fun test4(){
         let s = gen_Moo(42);
-        let k = Koo{s: s};
+        let k = Koo{s };
         assert!(k.s.x == 42,0);
         let Koo { s: Moo { x: _ } } = k;
     }
diff --git a/task3/sources/m1.move b/task3/sources/m1.move
index e3542c4..b8b6492 100644
--- a/task3/sources/m1.move
+++ b/task3/sources/m1.move
@@ -6,17 +6,17 @@ module 0x42::M1{
 
     // TODO
     // Define a module friend M2
-    friend       ;
+    friend  0x42::M2;
     
     // TODO
     // Define a function num that returns 66 with choose public or friend visibility
-    fun num():u64 {
+    public fun num():u64 {
         66
     }
 
     // TODO
     // Define a function num2 that returns 88 with choose public or friend visibility
-    fun num2():u64 {
+    public(friend) fun num2():u64 {
         88
     }
 }
\ No newline at end of file
diff --git a/task4/sources/main.move b/task4/sources/main.move
index daa4423..3f96a70 100644
--- a/task4/sources/main.move
+++ b/task4/sources/main.move
@@ -13,18 +13,26 @@ module 0x42::Task4 {
     // 1. create a deleteable object
     public fun createDeleteableObject(caller: &signer):ConstructorRef {
         // ...
+        let addr = signer::address_of(caller);
+        let obj = object::create_object(addr);
+        obj
     }
 
     // TODO
     // 2. create a named object
     public fun createNamedObject(caller: &signer):ConstructorRef {
         // ...
+        let obj = object::create_named_object(caller,NAME);
+        obj
     }
 
     // TODO
     // 3. create a sticky object
     public fun createStickyObject(caller: &signer):ConstructorRef {
         // ...
+        let addr = signer::address_of(caller);
+        let obj = object::create_sticky_object(addr);
+        obj
     }
 
     #[test(caller = @0x88)]