Feature/multisig config

examples/constants.ts

@@ -6,6 +6,9 @@ export const UPGRADE_CAP_OBJECT_ID = "0xae8c80532528977c531c7ee477d55d9e8618320e
 export const POOL_CREATION_CONFIG_OBJECT_ID = "0xa5e401f7311aa3a58bf0de4a893ef5684e9f994d2400d02eb0ea74c8cd88504c";
 export const TRADING_FEE_CONFIG_OBJECT_ID = "";
 export const LOYALTY_PROGRAM_OBJECT_ID = "";
+export const LOYALTY_ADMIN_CAP_OBJECT_ID = "";
+export const MULTISIG_CONFIG_OBJECT_ID = "";
+export const MULTISIG_ADMIN_CAP_OBJECT_ID = "";
 
 // Coin types
 export const DEEP_COIN_TYPE = "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP";

examples/fee-manager/claim-protocol-unsettled-fee-storage-rebate.ts

@@ -1,7 +1,11 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID, DEEPTRADE_CORE_PACKAGE_ID, TREASURY_OBJECT_ID } from "../constants";
+import {
+  ADMIN_CAP_OBJECT_ID,
+  DEEPTRADE_CORE_PACKAGE_ID,
+  MULTISIG_CONFIG_OBJECT_ID,
+  TREASURY_OBJECT_ID,
+} from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
 
 const FEE_MANAGER_ID = "0x4cef4ff8a75cc0e926fa57c99a3477d92b829b3a26b21cde5ea8b64041b75fba";
 const FEE_COIN_TYPE = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC";
@@ -13,11 +17,10 @@ const FEE_COIN_TYPE = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb84
   tx.moveCall({
     target: `${DEEPTRADE_CORE_PACKAGE_ID}::fee_manager::claim_protocol_unsettled_fee_storage_rebate_admin`,
     arguments: [
+      tx.object(TREASURY_OBJECT_ID),
       tx.object(FEE_MANAGER_ID),
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
       tx.object(ADMIN_CAP_OBJECT_ID),
-      tx.pure.vector("vector<u8>", MULTISIG_CONFIG.publicKeysSuiBytes),
-      tx.pure.vector("u8", MULTISIG_CONFIG.weights),
-      tx.pure.u16(MULTISIG_CONFIG.threshold),
     ],
     typeArguments: [FEE_COIN_TYPE],
   });

examples/fee-manager/claim-user-unsettled-fee-storage-rebate.ts

@@ -1,7 +1,11 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID, DEEPTRADE_CORE_PACKAGE_ID, TREASURY_OBJECT_ID } from "../constants";
+import {
+  ADMIN_CAP_OBJECT_ID,
+  DEEPTRADE_CORE_PACKAGE_ID,
+  MULTISIG_CONFIG_OBJECT_ID,
+  TREASURY_OBJECT_ID,
+} from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
 
 const FEE_MANAGER_ID = "0x4cef4ff8a75cc0e926fa57c99a3477d92b829b3a26b21cde5ea8b64041b75fba";
 const POOL_ID = "0xfacee57bc356dae0d9958c653253893dfb24e24e8871f53e69b7dccb3ffbf945";
@@ -18,16 +22,13 @@ const FEE_COIN_TYPE = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb84
   tx.moveCall({
     target: `${DEEPTRADE_CORE_PACKAGE_ID}::fee_manager::claim_user_unsettled_fee_storage_rebate_admin`,
     arguments: [
-      // TODO: Uncomment, when upgraded to new version of contract
-      // tx.object(TREASURY_OBJECT_ID),
+      tx.object(TREASURY_OBJECT_ID),
       tx.object(FEE_MANAGER_ID),
       tx.object(POOL_ID),
       tx.object(BALANCE_MANAGER_ID),
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
       tx.object(ADMIN_CAP_OBJECT_ID),
       tx.pure.u128(ORDER_ID),
-      tx.pure.vector("vector<u8>", MULTISIG_CONFIG.publicKeysSuiBytes),
-      tx.pure.vector("u8", MULTISIG_CONFIG.weights),
-      tx.pure.u16(MULTISIG_CONFIG.threshold),
     ],
     typeArguments: [BASE_COIN_TYPE, QUOTE_COIN_TYPE, FEE_COIN_TYPE],
   });

examples/loyalty/add-loyalty-level.ts

@@ -1,7 +1,11 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID, LOYALTY_PROGRAM_OBJECT_ID, DEEPTRADE_CORE_PACKAGE_ID } from "../constants";
+import {
+  ADMIN_CAP_OBJECT_ID,
+  DEEPTRADE_CORE_PACKAGE_ID,
+  LOYALTY_PROGRAM_OBJECT_ID,
+  MULTISIG_CONFIG_OBJECT_ID,
+} from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
 import { percentageInBillionths } from "../utils";
 
 const LEVEL = 1; // Level ID to create
@@ -16,12 +20,10 @@ const FEE_DISCOUNT_RATE = percentageInBillionths(FEE_DISCOUNT_PERCENTAGE);
     target: `${DEEPTRADE_CORE_PACKAGE_ID}::loyalty::add_loyalty_level`,
     arguments: [
       tx.object(LOYALTY_PROGRAM_OBJECT_ID),
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
       tx.object(ADMIN_CAP_OBJECT_ID),
       tx.pure.u8(LEVEL),
       tx.pure.u64(FEE_DISCOUNT_RATE),
-      tx.pure.vector("vector<u8>", MULTISIG_CONFIG.publicKeysSuiBytes),
-      tx.pure.vector("u8", MULTISIG_CONFIG.weights),
-      tx.pure.u16(MULTISIG_CONFIG.threshold),
     ],
   });
 

examples/loyalty/grant-multiple-users-level.ts

@@ -1,5 +1,5 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
+import { keypair, provider } from "../common";
 import { grantUserLevelTx } from "./utils";
 
 const USER_ADDRESSES: string[] = []; // Addresses of the users to grant the level to
@@ -13,7 +13,10 @@ const LEVEL = 1; // Level to grant to the users
     grantUserLevelTx(userAddress, LEVEL, tx);
   });
 
-  console.warn(`Building transaction to grant users ${USER_ADDRESSES} loyalty level ${LEVEL}`);
+  console.warn(`Executing transaction to grant users ${USER_ADDRESSES} loyalty level ${LEVEL}`);
 
-  await buildAndLogMultisigTransaction(tx);
+  // const res = await provider.devInspectTransactionBlock({ transactionBlock: tx, sender: user });
+  const res = await provider.signAndExecuteTransaction({ transaction: tx, signer: keypair });
+
+  console.log("res:", JSON.stringify(res, null, 2));
 })();

examples/loyalty/grant-user-level.ts

@@ -1,5 +1,5 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
+import { keypair, provider } from "../common";
 import { grantUserLevelTx } from "./utils";
 
 const USER_ADDRESS = ""; // Address of the user to grant the level to
@@ -11,7 +11,10 @@ const LEVEL = 1; // Level to grant to the user
 
   grantUserLevelTx(USER_ADDRESS, LEVEL, tx);
 
-  console.warn(`Building transaction to grant user ${USER_ADDRESS} loyalty level ${LEVEL}`);
+  console.warn(`Executing transaction to grant user ${USER_ADDRESS} loyalty level ${LEVEL}`);
 
-  await buildAndLogMultisigTransaction(tx);
+  // const res = await provider.devInspectTransactionBlock({ transactionBlock: tx, sender: user });
+  const res = await provider.signAndExecuteTransaction({ transaction: tx, signer: keypair });
+
+  console.log("res:", JSON.stringify(res, null, 2));
 })();

examples/loyalty/remove-loyalty-level.ts

@@ -1,7 +1,11 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID, DEEPTRADE_CORE_PACKAGE_ID, LOYALTY_PROGRAM_OBJECT_ID } from "../constants";
+import {
+  ADMIN_CAP_OBJECT_ID,
+  DEEPTRADE_CORE_PACKAGE_ID,
+  LOYALTY_PROGRAM_OBJECT_ID,
+  MULTISIG_CONFIG_OBJECT_ID,
+} from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
 
 const LEVEL = 2; // Level ID to remove (must have no members)
 
@@ -13,11 +17,9 @@ const LEVEL = 2; // Level ID to remove (must have no members)
     target: `${DEEPTRADE_CORE_PACKAGE_ID}::loyalty::remove_loyalty_level`,
     arguments: [
       tx.object(LOYALTY_PROGRAM_OBJECT_ID),
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
       tx.object(ADMIN_CAP_OBJECT_ID),
       tx.pure.u8(LEVEL),
-      tx.pure.vector("vector<u8>", MULTISIG_CONFIG.publicKeysSuiBytes),
-      tx.pure.vector("u8", MULTISIG_CONFIG.weights),
-      tx.pure.u16(MULTISIG_CONFIG.threshold),
     ],
   });
 

examples/loyalty/revoke-user-level.ts

@@ -1,7 +1,6 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID, DEEPTRADE_CORE_PACKAGE_ID, LOYALTY_PROGRAM_OBJECT_ID } from "../constants";
-import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
+import { keypair, provider } from "../common";
+import { DEEPTRADE_CORE_PACKAGE_ID, LOYALTY_ADMIN_CAP_OBJECT_ID, LOYALTY_PROGRAM_OBJECT_ID } from "../constants";
 
 const USER_ADDRESS = ""; // Address of the user to revoke the level from
 
@@ -13,15 +12,15 @@ const USER_ADDRESS = ""; // Address of the user to revoke the level from
     target: `${DEEPTRADE_CORE_PACKAGE_ID}::loyalty::revoke_user_level`,
     arguments: [
       tx.object(LOYALTY_PROGRAM_OBJECT_ID),
-      tx.object(ADMIN_CAP_OBJECT_ID),
+      tx.object(LOYALTY_ADMIN_CAP_OBJECT_ID),
       tx.pure.address(USER_ADDRESS),
-      tx.pure.vector("vector<u8>", MULTISIG_CONFIG.publicKeysSuiBytes),
-      tx.pure.vector("u8", MULTISIG_CONFIG.weights),
-      tx.pure.u16(MULTISIG_CONFIG.threshold),
     ],
   });
 
-  console.warn(`Building transaction to revoke loyalty level from user ${USER_ADDRESS}`);
+  console.warn(`Executing transaction to revoke loyalty level from user ${USER_ADDRESS}`);
 
-  await buildAndLogMultisigTransaction(tx);
+  // const res = await provider.devInspectTransactionBlock({ transactionBlock: tx, sender: user });
+  const res = await provider.signAndExecuteTransaction({ transaction: tx, signer: keypair });
+
+  console.log("res:", JSON.stringify(res, null, 2));
 })();

examples/loyalty/update-loyalty-admin-cap-owner.ts

@@ -0,0 +1,29 @@
+import { Transaction } from "@mysten/sui/transactions";
+import {
+  ADMIN_CAP_OBJECT_ID,
+  DEEPTRADE_CORE_PACKAGE_ID,
+  LOYALTY_ADMIN_CAP_OBJECT_ID,
+  MULTISIG_CONFIG_OBJECT_ID,
+} from "../constants";
+import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
+
+const NEW_OWNER = ""; // New owner of the loyalty admin cap
+
+// Usage: yarn ts-node examples/loyalty/update-loyalty-admin-cap-owner.ts > update-loyalty-admin-cap-owner.log 2>&1
+(async () => {
+  const tx = new Transaction();
+
+  tx.moveCall({
+    target: `${DEEPTRADE_CORE_PACKAGE_ID}::loyalty::update_loyalty_admin_cap_owner`,
+    arguments: [
+      tx.object(LOYALTY_ADMIN_CAP_OBJECT_ID),
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
+      tx.object(ADMIN_CAP_OBJECT_ID),
+      tx.pure.address(NEW_OWNER),
+    ],
+  });
+
+  console.warn(`Building transaction to update loyalty admin cap owner to ${NEW_OWNER}`);
+
+  await buildAndLogMultisigTransaction(tx);
+})();

examples/loyalty/utils.ts

@@ -1,6 +1,5 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { DEEPTRADE_CORE_PACKAGE_ID, LOYALTY_PROGRAM_OBJECT_ID, ADMIN_CAP_OBJECT_ID } from "../constants";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
+import { DEEPTRADE_CORE_PACKAGE_ID, LOYALTY_ADMIN_CAP_OBJECT_ID, LOYALTY_PROGRAM_OBJECT_ID } from "../constants";
 
 export function grantUserLevelTx(userAddress: string, level: number, transaction?: Transaction) {
   const tx = transaction ?? new Transaction();
@@ -9,12 +8,9 @@ export function grantUserLevelTx(userAddress: string, level: number, transaction
     target: `${DEEPTRADE_CORE_PACKAGE_ID}::loyalty::grant_user_level`,
     arguments: [
       tx.object(LOYALTY_PROGRAM_OBJECT_ID),
-      tx.object(ADMIN_CAP_OBJECT_ID),
+      tx.object(LOYALTY_ADMIN_CAP_OBJECT_ID),
       tx.pure.address(userAddress),
       tx.pure.u8(level),
-      tx.pure.vector("vector<u8>", MULTISIG_CONFIG.publicKeysSuiBytes),
-      tx.pure.vector("u8", MULTISIG_CONFIG.weights),
-      tx.pure.u16(MULTISIG_CONFIG.threshold),
     ],
   });
 

examples/multisig-config/initialize-multisig-config.ts

@@ -0,0 +1,31 @@
+import { Transaction } from "@mysten/sui/transactions";
+import { keypair, provider } from "../common";
+import { DEEPTRADE_CORE_PACKAGE_ID, MULTISIG_ADMIN_CAP_OBJECT_ID, MULTISIG_CONFIG_OBJECT_ID } from "../constants";
+import { MultisigConfig } from "../multisig/types";
+
+const NEW_PUBLIC_KEYS: MultisigConfig["publicKeysSuiBytes"] = [];
+const NEW_WEIGHTS: MultisigConfig["weights"] = [];
+const NEW_THRESHOLD: MultisigConfig["threshold"] = 0;
+
+// yarn ts-node examples/multisig-config/initialize-multisig-config.ts > initialize-multisig-config.log 2>&1
+(async () => {
+  const tx = new Transaction();
+
+  tx.moveCall({
+    target: `${DEEPTRADE_CORE_PACKAGE_ID}::multisig_config::initialize_multisig_config`,
+    arguments: [
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
+      tx.object(MULTISIG_ADMIN_CAP_OBJECT_ID),
+      tx.pure.vector("vector<u8>", NEW_PUBLIC_KEYS),
+      tx.pure.vector("u8", NEW_WEIGHTS),
+      tx.pure.u16(NEW_THRESHOLD),
+    ],
+  });
+
+  console.warn(`Executing transaction to initialize multisig config`);
+
+  // const res = await provider.devInspectTransactionBlock({ transactionBlock: tx, sender: user });
+  const res = await provider.signAndExecuteTransaction({ transaction: tx, signer: keypair });
+
+  console.log("res:", JSON.stringify(res, null, 2));
+})();

examples/multisig-config/update-multisig-config.ts

@@ -0,0 +1,31 @@
+import { Transaction } from "@mysten/sui/transactions";
+import { keypair, provider } from "../common";
+import { DEEPTRADE_CORE_PACKAGE_ID, MULTISIG_ADMIN_CAP_OBJECT_ID, MULTISIG_CONFIG_OBJECT_ID } from "../constants";
+import { MultisigConfig } from "../multisig/types";
+
+const NEW_PUBLIC_KEYS: MultisigConfig["publicKeysSuiBytes"] = [];
+const NEW_WEIGHTS: MultisigConfig["weights"] = [];
+const NEW_THRESHOLD: MultisigConfig["threshold"] = 0;
+
+// yarn ts-node examples/multisig-config/update-multisig-config.ts > update-multisig-config.log 2>&1
+(async () => {
+  const tx = new Transaction();
+
+  tx.moveCall({
+    target: `${DEEPTRADE_CORE_PACKAGE_ID}::multisig_config::update_multisig_config`,
+    arguments: [
+      tx.object(MULTISIG_CONFIG_OBJECT_ID),
+      tx.object(MULTISIG_ADMIN_CAP_OBJECT_ID),
+      tx.pure.vector("vector<u8>", NEW_PUBLIC_KEYS),
+      tx.pure.vector("u8", NEW_WEIGHTS),
+      tx.pure.u16(NEW_THRESHOLD),
+    ],
+  });
+
+  console.warn(`Executing transaction to update multisig config`);
+
+  // const res = await provider.devInspectTransactionBlock({ transactionBlock: tx, sender: user });
+  const res = await provider.signAndExecuteTransaction({ transaction: tx, signer: keypair });
+
+  console.log("res:", JSON.stringify(res, null, 2));
+})();

examples/ticket/create-multiple-tickets-withdraw-protocol-fees.ts

@@ -1,10 +1,9 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID } from "../constants";
+import { ADMIN_CAP_OBJECT_ID, MULTISIG_CONFIG_OBJECT_ID } from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
-import { createTicketTx, TicketType } from "./utils/createTicketTx";
 import { getTreasuryBags } from "../treasury/utils/getTreasuryBags";
 import { processFeesBag } from "../treasury/utils/processFeeBag";
+import { createTicketTx, TicketType } from "./utils/createTicketTx";
 
 // yarn ts-node examples/ticket/create-multiple-tickets-withdraw-protocol-fees.ts > create-multiple-tickets-withdraw-protocol-fees.log 2>&1
 (async () => {
@@ -25,9 +24,7 @@ import { processFeesBag } from "../treasury/utils/processFeeBag";
       transaction: tx,
       ticketType,
       adminCapId: ADMIN_CAP_OBJECT_ID,
-      pks: MULTISIG_CONFIG.publicKeysSuiBytes,
-      weights: MULTISIG_CONFIG.weights,
-      threshold: MULTISIG_CONFIG.threshold,
+      multisigConfigId: MULTISIG_CONFIG_OBJECT_ID,
     });
   }
 

examples/ticket/create-multiple-tickets.ts

@@ -1,7 +1,6 @@
 import { Transaction } from "@mysten/sui/transactions";
-import { ADMIN_CAP_OBJECT_ID } from "../constants";
+import { ADMIN_CAP_OBJECT_ID, MULTISIG_CONFIG_OBJECT_ID } from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
 import { createTicketTx, TicketType } from "./utils/createTicketTx";
 
 // yarn ts-node examples/ticket/create-multiple-tickets.ts > create-multiple-tickets.log 2>&1
@@ -24,9 +23,7 @@ import { createTicketTx, TicketType } from "./utils/createTicketTx";
       transaction: tx,
       ticketType,
       adminCapId: ADMIN_CAP_OBJECT_ID,
-      pks: MULTISIG_CONFIG.publicKeysSuiBytes,
-      weights: MULTISIG_CONFIG.weights,
-      threshold: MULTISIG_CONFIG.threshold,
+      multisigConfigId: MULTISIG_CONFIG_OBJECT_ID,
     });
   }
 

examples/ticket/create-ticket.ts

@@ -1,6 +1,5 @@
-import { ADMIN_CAP_OBJECT_ID } from "../constants";
+import { ADMIN_CAP_OBJECT_ID, MULTISIG_CONFIG_OBJECT_ID } from "../constants";
 import { buildAndLogMultisigTransaction } from "../multisig/buildAndLogMultisigTransaction";
-import { MULTISIG_CONFIG } from "../multisig/multisig";
 import { createTicketTx, TicketType } from "./utils/createTicketTx";
 
 // yarn ts-node examples/ticket/create-ticket.ts > create-ticket.log 2>&1
@@ -12,9 +11,7 @@ import { createTicketTx, TicketType } from "./utils/createTicketTx";
   const { tx, ticket } = createTicketTx({
     ticketType,
     adminCapId: ADMIN_CAP_OBJECT_ID,
-    pks: MULTISIG_CONFIG.publicKeysSuiBytes,
-    weights: MULTISIG_CONFIG.weights,
-    threshold: MULTISIG_CONFIG.threshold,
+    multisigConfigId: MULTISIG_CONFIG_OBJECT_ID,
   });
 
   await buildAndLogMultisigTransaction(tx);