feat(scripts): transfer names to owners in init (#713)

* feat(scripts): transfer names to owners in init

* remove log

* fix tests

* fmt

* fixes to the length checking

---------

Co-authored-by: Chloe Martin <chloedaughterofmars@gmail.com>

Author: thibault-martinez

packages/iota-names/sources/admin.move

@@ -7,7 +7,6 @@
 module iota_names::admin;
 
 use iota::clock::Clock;
-use iota::tx_context::sender;
 use iota_names::core_config::CoreConfig;
 use iota_names::name::{Self, Name};
 use iota_names::iota_names::{Self, AdminCap, IotaNames};
@@ -18,6 +17,8 @@ use iota_names::deny_list;
 
 #[error]
 const ENoNamesProvided: vector<u8> = b"No names provided";
+#[error]
+const ENamesRecipientsMismatch: vector<u8> = b"Names and recipients length mismatch";
 
 /// Authorization witness to call protected functions of `iota_names`.
 public struct AdminAuth has drop {}
@@ -43,27 +44,30 @@ entry fun register_names(
     _: &AdminCap,
     iota_names: &mut IotaNames,
     names: vector<String>,
+    mut recipients: vector<address>,
     no_years: u8,
     clock: &Clock,
     ctx: &mut TxContext,
 ) {
     assert!(!names.is_empty(), ENoNamesProvided);
-    let sender = sender(ctx);
+    assert!(names.length() == recipients.length(), ENamesRecipientsMismatch);
     let config = *iota_names.get_config<CoreConfig>();
     let mut name_structs = vector::empty<Name>();
     let mut tmp_names = names;
     while (!tmp_names.is_empty()) {
         let n = name::new(tmp_names.pop_back());
         name_structs.push_back(n);
     };
+    recipients.reverse();
     deny_list::remove_reserved_labels_for_names(iota_names, &name_structs);
     // Add records
     let registry = iota_names::auth_registry_mut<AdminAuth, Registry>(AdminAuth {}, iota_names);
     while (!name_structs.is_empty()) {
         let name = name_structs.pop_back();
+        let recipient = recipients.pop_back();
         config.assert_is_valid_for_sale(&name);
         let nft = registry.add_record(name, no_years, clock, ctx);
-        iota::transfer::public_transfer(nft, sender);
+        iota::transfer::public_transfer(nft, recipient);
     };
 }
 

packages/iota-names/tests/unit/admin_tests.move

@@ -121,6 +121,10 @@ fun register_names_from_deny_list() {
         utf8(b"one.iota"),
         utf8(b"two.iota"),
     ];
+    let recipients = vector[
+        ctx.sender(),
+        ctx.sender(),
+    ];
 
     {
         scenario.next_tx(ctx.sender());
@@ -143,6 +147,7 @@ fun register_names_from_deny_list() {
             &admin_cap,
             &mut iota_names,
             copy names,
+            recipients,
             1,
             &clock,
             scenario.ctx()
@@ -185,6 +190,12 @@ fun register_multiple() {
         utf8(b"name3.iota"),
         utf8(b"name4.iota")
     ];
+    let recipients = vector[
+        ctx.sender(),
+        ctx.sender(),
+        ctx.sender(),
+        ctx.sender(),
+    ];
 
     {
         scenario.next_tx(ctx.sender());
@@ -201,6 +212,7 @@ fun register_multiple() {
             &admin_cap,
             &mut iota_names,
             copy names,
+            recipients,
             1,
             &clock,
             scenario.ctx()
@@ -242,6 +254,11 @@ fun test_admin_remove_existing_records() {
         utf8(b"name2.iota"),
         utf8(b"name3.iota"),
     ];
+    let recipients = vector[
+        ctx.sender(),
+        ctx.sender(),
+        ctx.sender(),
+    ];
 
     // Register the names first
     {
@@ -259,6 +276,7 @@ fun test_admin_remove_existing_records() {
             &admin_cap,
             &mut iota_names,
             copy names_to_register,
+            recipients,
             1,
             &clock,
             scenario.ctx()
@@ -335,6 +353,10 @@ fun test_admin_remove_mixed_records() {
         utf8(b"existing1.iota"),
         utf8(b"existing2.iota"),
     ];
+    let recipients = vector[
+        ctx.sender(),
+        ctx.sender()
+    ];
 
     let mixed_names = vector[
         utf8(b"existing1.iota"),
@@ -358,6 +380,7 @@ fun test_admin_remove_mixed_records() {
             &admin_cap,
             &mut iota_names,
             copy existing_names,
+            recipients,
             1,
             &clock,
             scenario.ctx()
@@ -445,6 +468,7 @@ fun test_register_names_empty_list_fails() {
             &admin_cap,
             &mut iota_names,
             vector::empty<std::string::String>(),
+            vector::empty<address>(),
             1,
             &clock,
             scenario.ctx()

scripts/init/init.ts

@@ -62,7 +62,13 @@ export const init = async (
     // Register names
     let namesToRegisterFile = './init/names-to-register.csv';
     if (fs.existsSync(namesToRegisterFile)) {
-        await processNamesFileBatched(namesToRegisterFile, packageInfo, network, client);
+        await processNamesFileBatched(
+            namesToRegisterFile,
+            packageInfo,
+            network,
+            client,
+            newOwner || packageInfo.adminAddress,
+        );
     }
 
     if (!newOwner) {

scripts/reserved-names/register-names.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import fs from 'fs';
+import { bcs } from '@iota/iota-sdk/bcs';
 import { Transaction } from '@iota/iota-sdk/transactions';
 import { IOTA_CLOCK_OBJECT_ID, isValidIotaAddress } from '@iota/iota-sdk/utils';
 
@@ -43,17 +44,21 @@ export const parseCsvFile = (filePath: string): Record<string, string | undefine
 
 export const registerNames = (
     txb: Transaction,
-    names: string[],
+    batch: Record<string, string>,
     iotaNamesPackageId: string,
     adminCap: string,
     iotaNamesObjectId: string,
 ) => {
-    return txb.moveCall({
+    var names = Object.keys(batch);
+    var recipients = names.map((name) => batch[name]);
+
+    txb.moveCall({
         target: `${iotaNamesPackageId}::admin::register_names`,
         arguments: [
             txb.object(adminCap),
             txb.object(iotaNamesObjectId),
             txb.pure.vector('string', names),
+            txb.pure(bcs.vector(bcs.Address).serialize(recipients)),
             txb.pure.u8(YEARS_TO_RESERVE),
             txb.object(IOTA_CLOCK_OBJECT_ID),
         ],
@@ -73,34 +78,42 @@ export async function processNamesFileBatched(
     },
     network: string,
     client: any,
+    adminAddress: string,
 ) {
     const nameAddressPairs = parseCsvFile(filePath);
-    const allNames = Object.keys(nameAddressPairs);
-    let batch: string[] = [];
-    let batchLen = 0;
-    for (const name of allNames) {
-        const nameLen = name.length + (batch.length > 0 ? 1 : 0);
-        if (batchLen + nameLen > PURE_ARG_SIZE_LIMIT) {
+    let batch: Record<string, string> = {};
+    let batchNameLen = 0;
+    let batchRecipientLen = 0;
+    for (const [name, address] of Object.entries(nameAddressPairs)) {
+        var recipient = address || adminAddress;
+        const nameLen = bcs.String.serializedSize(name)!;
+        const recipientLen = bcs.Address.serializedSize(recipient)!;
+        if (
+            batchNameLen + nameLen > PURE_ARG_SIZE_LIMIT ||
+            batchRecipientLen + recipientLen > PURE_ARG_SIZE_LIMIT
+        ) {
             await sendNamesBatchTransaction(batch, packageInfo, network, client);
-            batch = [];
-            batchLen = 0;
+            batch = {};
+            batchNameLen = 0;
+            batchRecipientLen = 0;
         }
-        batch.push(name);
-        batchLen += nameLen;
+        batch[name] = recipient;
+        batchNameLen += nameLen;
+        batchRecipientLen += recipientLen;
     }
-    if (batch.length > 0) {
+    if (Object.keys(batch).length > 0) {
         await sendNamesBatchTransaction(batch, packageInfo, network, client);
     }
 }
 
 async function sendNamesBatchTransaction(
-    batch: string[],
+    batch: Record<string, string>,
     packageInfo: { packageId: string; adminCap: string; iotaNamesObjectId: string },
     network: string,
     client: any,
 ) {
     const tx = new Transaction();
-    console.log(`Registering ${batch.length} names`);
+    console.log(`Registering ${Object.keys(batch).length} names`);
     registerNames(
         tx,
         batch,