git.delta.rocks / unique-network / refs/commits / 0a7b60da8a0b

difftreelog

feat implement all CE calls in test contract

Yaroslav Bolyukin2021-06-04parent: #0b72135.patch.diff
in: master

4 files changed

modifiedsmart_contracs/transfer/Cargo.tomldiffbeforeafterboth
--- a/smart_contracs/transfer/Cargo.toml
+++ b/smart_contracs/transfer/Cargo.toml
@@ -4,15 +4,17 @@
 authors = ["[Greg Zaitsev] <[your_email]>"]
 edition = "2018"
 
+[workspace]
+
 [dependencies]
-ink_primitives = { git = "https://github.com/usetech-llc/ink", branch = "unique", default-features = false }
-ink_metadata = { git = "https://github.com/usetech-llc/ink", branch = "unique", default-features = false, features = ["derive"], optional = true }
-ink_env = { git = "https://github.com/usetech-llc/ink", branch = "unique", default-features = false }
-ink_storage = { git = "https://github.com/usetech-llc/ink", branch = "unique", default-features = false }
-ink_lang = { git = "https://github.com/usetech-llc/ink", branch = "unique", default-features = false }
+ink_primitives = { default-features = false }
+ink_metadata = { default-features = false, features = ["derive"], optional = true }
+ink_env = { default-features = false }
+ink_storage = { default-features = false }
+ink_lang = { default-features = false }
 
-scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.4.1", default-features = false, features = ["derive"], optional = true }
+scale = { package = "parity-scale-codec", version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "0.6.0", default-features = false, features = ["derive"] }
 
 [lib]
 name = "nft_transfer"
@@ -28,6 +30,7 @@
     "ink_metadata/std",
     "ink_env/std",
     "ink_storage/std",
+    "ink_lang/std",
     "ink_primitives/std",
     "scale/std",
     "scale-info/std",
modifiedsmart_contracs/transfer/lib.rsdiffbeforeafterboth
--- a/smart_contracs/transfer/lib.rs
+++ b/smart_contracs/transfer/lib.rs
@@ -1,4 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
+use alloc::vec::Vec;
 
 use ink_lang as ink;
 use ink_env::{Environment, DefaultEnvironment};
@@ -36,6 +38,24 @@
     }
 }
 
+#[derive(scale::Encode, scale::Decode, scale_info::TypeInfo)]
+pub enum CreateItemData {
+    Nft {
+        const_data: Vec<u8>,
+        variable_data: Vec<u8>,
+    },
+    Fungible {
+        value: u128,
+    },
+    ReFungible {
+        const_data: Vec<u8>,
+        variable_data: Vec<u8>,
+        pieces: u128,
+    },
+}
+
+type DefaultAccountId = <DefaultEnvironment as Environment>::AccountId;
+
 #[ink::chain_extension]
 pub trait NftChainExtension {
     type ErrorCode = NftErrorCode;
@@ -43,11 +63,26 @@
     /// Transfer one NFT token from sender
     ///
     #[ink(extension = 0, returns_result = false)]
-    fn transfer(recipient: <DefaultEnvironment as Environment>::AccountId, collection_id: u32, token_id: u32, amount: u128);
+    fn transfer(recipient: DefaultAccountId, collection_id: u32, token_id: u32, amount: u128);
+    #[ink(extension = 1, returns_result = false)]
+    fn create_item(owner: DefaultAccountId, collection_id: u32, data: CreateItemData);
+    #[ink(extension = 2, returns_result = false)]
+    fn create_multiple_items(owner: DefaultAccountId, collection_id: u32, data: Vec<CreateItemData>);
+    #[ink(extension = 3, returns_result = false)]
+    fn approve(spender: DefaultAccountId, collection_id: u32, item_id: u32, amount: u128);
+    #[ink(extension = 4, returns_result = false)]
+    fn transfer_from(owner: DefaultAccountId, recipient: DefaultAccountId, collection_id: u32, item_id: u32, amount: u128);
+    #[ink(extension = 5, returns_result = false)]
+    fn set_variable_meta_data(collection_id: u32, item_id: u32, data: Vec<u8>);
+    #[ink(extension = 6, returns_result = false)]
+    fn toggle_white_list(collection_id: u32, address: DefaultAccountId, whitelisted: bool);
 }
 
-#[ink::contract(env = crate::NftEnvironment)]
+#[ink::contract(env = crate::NftEnvironment, dynamic_storage_allocator = true)]
 mod nft_transfer {
+    use alloc::vec::Vec;
+    // use ink_storage::Vec;
+    use crate::CreateItemData;
 
     #[ink(storage)]
     pub struct NftTransfer {
@@ -69,6 +104,42 @@
                 .extension()
                 .transfer(recipient, collection_id, token_id, amount);
         }
+        #[ink(message)]
+        pub fn create_item(&mut self, recipient: AccountId, collection_id: u32, data: CreateItemData) {
+            let _ = self.env()
+                .extension()
+                .create_item(recipient, collection_id, data);
+        }
+        #[ink(message)]
+        pub fn create_multiple_items(&mut self, owner: AccountId, collection_id: u32, data: Vec<CreateItemData>) {
+            let _ = self.env()
+                .extension()
+                .create_multiple_items(owner, collection_id, data);
+        }
+        #[ink(message)]
+        pub fn approve(&mut self, spender: AccountId, collection_id: u32, item_id: u32, amount: u128) {
+            let _ = self.env()
+                .extension()
+                .approve(spender, collection_id, item_id, amount);
+        }
+        #[ink(message)]
+        pub fn transfer_from(&mut self, owner: AccountId, recipient: AccountId, collection_id: u32, item_id: u32, amount: u128) {
+            let _ = self.env()
+                .extension()
+                .transfer_from(owner, recipient, collection_id, item_id, amount);
+        }
+        #[ink(message)]
+        pub fn set_variable_meta_data(&mut self, collection_id: u32, item_id: u32, data: Vec<u8>) {
+            let _ = self.env()
+                .extension()
+                .set_variable_meta_data(collection_id, item_id, data);
+        }
+        #[ink(message)]
+        pub fn toggle_white_list(&mut self, collection_id: u32, address: AccountId, whitelisted: bool) {
+            let _ = self.env()
+                .extension()
+                .toggle_white_list(collection_id, address, whitelisted);
+        }
 
     }
modifiedtests/src/transfer_contract/metadata.jsondiffbeforeafterboth
1{1{
2  "metadataVersion": "0.1.0",2  "metadataVersion": "0.1.0",
3  "source": {3  "source": {
4    "hash": "0xfbbc0729acefed9d99f93f6cbb751d12e317958fd0fe183f5781329b37f1bf6e",4    "hash": "0xc6c3f47adeafe86d1674ed72c7179605787842f2f05a2d7da0dbabf3c4fa1aa8",
5    "language": "ink! 3.0.0-rc2",5    "language": "ink! 3.0.0-rc3",
6    "compiler": "rustc 1.51.0-nightly"6    "compiler": "rustc 1.52.0-nightly"
7  },7  },
8  "contract": {8  "contract": {
9    "name": "nft_transfer",9    "name": "nft_transfer",
24        "name": [24        "name": [
25          "default"25          "default"
26        ],26        ],
27        "selector": "0x6a3712e2"27        "selector": "0xed4b9d1b"
28      }28      }
29    ],29    ],
30    "docs": [],30    "docs": [],
78        ],78        ],
79        "payable": false,79        "payable": false,
80        "returnType": null,80        "returnType": null,
81        "selector": "0xfae3a09d"81        "selector": "0x84a15da1"
82      }82      },
83      {
84        "args": [
85          {
86            "name": "recipient",
87            "type": {
88              "displayName": [
89                "AccountId"
90              ],
91              "type": 1
92            }
93          },
94          {
95            "name": "collection_id",
96            "type": {
97              "displayName": [
98                "u32"
99              ],
100              "type": 4
101            }
102          },
103          {
104            "name": "data",
105            "type": {
106              "displayName": [
107                "CreateItemData"
108              ],
109              "type": 6
110            }
111          }
112        ],
113        "docs": [],
114        "mutates": true,
115        "name": [
116          "create_item"
117        ],
118        "payable": false,
119        "returnType": null,
120        "selector": "0xd7c3f083"
121      },
122      {
123        "args": [
124          {
125            "name": "owner",
126            "type": {
127              "displayName": [
128                "AccountId"
129              ],
130              "type": 1
131            }
132          },
133          {
134            "name": "collection_id",
135            "type": {
136              "displayName": [
137                "u32"
138              ],
139              "type": 4
140            }
141          },
142          {
143            "name": "data",
144            "type": {
145              "displayName": [
146                "Vec"
147              ],
148              "type": 8
149            }
150          }
151        ],
152        "docs": [],
153        "mutates": true,
154        "name": [
155          "create_multiple_items"
156        ],
157        "payable": false,
158        "returnType": null,
159        "selector": "0x15f9a1eb"
160      },
161      {
162        "args": [
163          {
164            "name": "spender",
165            "type": {
166              "displayName": [
167                "AccountId"
168              ],
169              "type": 1
170            }
171          },
172          {
173            "name": "collection_id",
174            "type": {
175              "displayName": [
176                "u32"
177              ],
178              "type": 4
179            }
180          },
181          {
182            "name": "item_id",
183            "type": {
184              "displayName": [
185                "u32"
186              ],
187              "type": 4
188            }
189          },
190          {
191            "name": "amount",
192            "type": {
193              "displayName": [
194                "u128"
195              ],
196              "type": 5
197            }
198          }
199        ],
200        "docs": [],
201        "mutates": true,
202        "name": [
203          "approve"
204        ],
205        "payable": false,
206        "returnType": null,
207        "selector": "0x681266a0"
208      },
209      {
210        "args": [
211          {
212            "name": "owner",
213            "type": {
214              "displayName": [
215                "AccountId"
216              ],
217              "type": 1
218            }
219          },
220          {
221            "name": "recipient",
222            "type": {
223              "displayName": [
224                "AccountId"
225              ],
226              "type": 1
227            }
228          },
229          {
230            "name": "collection_id",
231            "type": {
232              "displayName": [
233                "u32"
234              ],
235              "type": 4
236            }
237          },
238          {
239            "name": "item_id",
240            "type": {
241              "displayName": [
242                "u32"
243              ],
244              "type": 4
245            }
246          },
247          {
248            "name": "amount",
249            "type": {
250              "displayName": [
251                "u128"
252              ],
253              "type": 5
254            }
255          }
256        ],
257        "docs": [],
258        "mutates": true,
259        "name": [
260          "transfer_from"
261        ],
262        "payable": false,
263        "returnType": null,
264        "selector": "0x0b396f18"
265      },
266      {
267        "args": [
268          {
269            "name": "collection_id",
270            "type": {
271              "displayName": [
272                "u32"
273              ],
274              "type": 4
275            }
276          },
277          {
278            "name": "item_id",
279            "type": {
280              "displayName": [
281                "u32"
282              ],
283              "type": 4
284            }
285          },
286          {
287            "name": "data",
288            "type": {
289              "displayName": [
290                "Vec"
291              ],
292              "type": 7
293            }
294          }
295        ],
296        "docs": [],
297        "mutates": true,
298        "name": [
299          "set_variable_meta_data"
300        ],
301        "payable": false,
302        "returnType": null,
303        "selector": "0xb0b26da2"
304      },
305      {
306        "args": [
307          {
308            "name": "collection_id",
309            "type": {
310              "displayName": [
311                "u32"
312              ],
313              "type": 4
314            }
315          },
316          {
317            "name": "address",
318            "type": {
319              "displayName": [
320                "AccountId"
321              ],
322              "type": 1
323            }
324          },
325          {
326            "name": "whitelisted",
327            "type": {
328              "displayName": [
329                "bool"
330              ],
331              "type": 9
332            }
333          }
334        ],
335        "docs": [],
336        "mutates": true,
337        "name": [
338          "toggle_white_list"
339        ],
340        "payable": false,
341        "returnType": null,
342        "selector": "0x98574dac"
343      }
83    ]344    ]
84  },345  },
85  "storage": {346  "storage": {
93        "composite": {354        "composite": {
94          "fields": [355          "fields": [
95            {356            {
96              "type": 2357              "type": 2,
358              "typeName": "[u8; 32]"
97            }359            }
98          ]360          ]
99        }361        }
126      "def": {388      "def": {
127        "primitive": "u128"389        "primitive": "u128"
128      }390      }
129    }391    },
392    {
393      "def": {
394        "variant": {
395          "variants": [
396            {
397              "fields": [
398                {
399                  "name": "const_data",
400                  "type": 7,
401                  "typeName": "Vec<u8>"
402                },
403                {
404                  "name": "variable_data",
405                  "type": 7,
406                  "typeName": "Vec<u8>"
407                }
408              ],
409              "name": "Nft"
410            },
411            {
412              "fields": [
413                {
414                  "name": "value",
415                  "type": 5,
416                  "typeName": "u128"
417                }
418              ],
419              "name": "Fungible"
420            },
421            {
422              "fields": [
423                {
424                  "name": "const_data",
425                  "type": 7,
426                  "typeName": "Vec<u8>"
427                },
428                {
429                  "name": "variable_data",
430                  "type": 7,
431                  "typeName": "Vec<u8>"
432                },
433                {
434                  "name": "pieces",
435                  "type": 5,
436                  "typeName": "u128"
437                }
438              ],
439              "name": "ReFungible"
440            }
441          ]
442        }
443      },
444      "path": [
445        "nft_transfer",
446        "CreateItemData"
447      ]
448    },
449    {
450      "def": {
451        "sequence": {
452          "type": 3
453        }
454      }
455    },
456    {
457      "def": {
458        "sequence": {
459          "type": 6
460        }
461      }
462    },
463    {
464      "def": {
465        "primitive": "bool"
466      }
467    }
130  ]468  ]
131}469}
modifiedtests/src/transfer_contract/nft_transfer.wasmdiffbeforeafterboth

binary blob — no preview