adapt changes from the sdk

masa-finance · Mar 15, 2023 · 5f5310f · 5f5310f
1 parent 55f9253
commit 5f5310f
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -51,9 +51,11 @@
       * [`masa green list`](#masa-green-list)
       * [`masa green create <phone-number>`](#masa-green-create-phone-number)
       * [`masa green burn <green-id>`](#masa-green-burn-green-id)
-    * [`masa factory`](#masa-factory)
-      * [`masa factory info <address>`](#masa-factory-info-address)
-      * [`masa factory sign <address> <name> <types> <value>`](#masa-factory-sign-address-name-types-value)
+    * [`masa sbt`](#masa-sbt)
+      * [`masa sbt info <contract-address>`](#masa-sbt-info-contract-address)
+      * [`masa sbt list <contract-address>`](#masa-sbt-list-contract-address)
+      * [`masa sbt sign <contract-address> <name> <types> <value>`](#masa-sbt-sign-contract-address-name-types-value)
+      * [`masa sbt burn <contract-address> <sbt-id>`](#masa-sbt-burn-contract-address-sbt-id)
     * [`masa settings`](#masa-settings)
       * [`masa settings set <key> <value>`](#masa-settings-set-key-value)
       * [`masa settings preset <environment>`](#masa-settings-preset-environment)
@@ -118,9 +120,11 @@ Commands:
   green list [options]                                              Lists your Greens
   green create <phone-number>                                       Creates a Green Token
   green burn <green-id>                                             Burns a green
-  factory                                                           Factory Commands
-  factory info <address>                                            Shows info about an SBT
-  factory sign <address> <name> <types> <value>                     Signs an SBT
+  sbt                                                               SBT Commands
+  sbt info <contract-address>                                       Shows info about an SBT
+  sbt list [options] <contract-address>                             Lists your SBTs
+  sbt sign <contract-address> <name> <types> <value>                Signs an SBT
+  sbt burn <contract-address> <sbt-id>                              Burns an SBT
   settings                                                          Set config settings
   settings set <key> <value>                                        Changes setting <key> to <value>
   settings preset <environment>                                     Changes setting <environment> presets
@@ -389,25 +393,41 @@ Burns a green
 
 - `<green-id> ID of the Green to burn`
 
-### `masa factory`
+### `masa sbt`
 
-Factory Commands
+SBT Commands
 
-#### `masa factory info <address>`
+#### `masa sbt info <contract-address>`
 
-Shows info about Masa Green
+Shows info about an SBT
+
+- `<contract-address> Address of the SBT to sign`
+
+#### `masa sbt list <contract-address>`
 
-- `<address> Address of the SBT to sign`
+Lists your SBTs
+
+- `<contract-address> Address of the SBT contract to list`
+  Options:
+- `-a, --address <address>`
+  Address override
 
-#### `masa factory sign <address> <name> <types> <value>`
+#### `masa sbt sign <contract-address> <name> <types> <value>`
 
 Signs an SBT
 
-- `<address> Address of the SBT to sign`
+- `<contract-address> Address of the SBT to sign`
 - `<name> Name of the contract`
 - `<types> Types structure to sign`
 - `<value> Values of the structure`
 
+#### `masa sbt burn <contract-address> <sbt-id>`
+
+Burns an SBT
+
+- `<contract-address> Address of the SBT to sign`
+- `<sbt-id> ID of the SBT to burn`
+
 ### `masa settings`
 
 Set config settings

diff --git a/src/cli.ts b/src/cli.ts
@@ -27,6 +27,10 @@ import {
   identityShow,
   login,
   logout,
+  sbtBurn,
+  sbtInfo,
+  sbtList,
+  sbtSign,
   settingsPreset,
   settingsSet,
   settingsShow,
@@ -42,7 +46,6 @@ import {
   version,
 } from "./commands";
 import { reloadMasa } from "./helpers";
-import { factoryInfo, factorySign } from "./commands/factory";
 import { BigNumber, TypedDataField } from "ethers";
 
 clear();
@@ -321,28 +324,48 @@ program
 }
 
 {
-  const factory = program.command("factory").description("Factory Commands");
+  const sbt = program.command("sbt").description("SBT Commands");
 
-  factory
+  sbt
     .command("info")
     .description("Shows info about an SBT")
-    .argument("<address>", "Address of the SBT to sign")
-    .action(async (address: string) => await factoryInfo(address));
+    .argument("<contract-address>", "Address of the SBT to sign")
+    .action(async (contractAddress: string) => await sbtInfo(contractAddress));
 
-  factory
+  sbt
+    .command("list")
+    .description("Lists your SBTs")
+    .argument("<contract-address>", "Address of the SBT contract to list")
+    .option("-a, --address <address>", "Address override")
+    .action(
+      async (contractAddress: string, { address }) =>
+        await sbtList(contractAddress, address)
+    );
+
+  sbt
     .command("sign")
     .description("Signs an SBT")
-    .argument("<address>", "Address of the SBT to sign")
+    .argument("<contract-address>", "Address of the SBT to sign")
     .argument("<name>", "Name of the contract")
     .argument("<types>", "Types structure to sign")
     .argument("<value>", "Values of the structure")
     .action(
       async (
-        address: string,
+        contractAddress: string,
         name: string,
         types: Record<string, Array<TypedDataField>>,
         value: Record<string, string | BigNumber | number>
-      ) => await factorySign(address, name, types, value)
+      ) => await sbtSign(contractAddress, name, types, value)
+    );
+
+  sbt
+    .command("burn")
+    .argument("<contract-address>", "Address of the SBT to sign")
+    .argument("<sbt-id>", "ID of the SBT to burn")
+    .description("Burns an SBT")
+    .action(
+      async (contractAddress: string, greenId: string) =>
+        await sbtBurn(contractAddress, greenId)
     );
 }
 

diff --git a/src/commands/factory/index.ts b/src/commands/factory/index.ts
diff --git a/src/commands/green/burn.ts b/src/commands/green/burn.ts
@@ -1,5 +1,6 @@
 import { masa } from "../../helpers";
+import { BigNumber } from "ethers";
 
-export const burn = async (greenId: number) => {
-  await masa.green.burn(greenId);
+export const burn = async (greenId: string) => {
+  await masa.green.burn(BigNumber.from(greenId));
 };
diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -8,3 +8,4 @@ export * from "./identity";
 export * from "./version";
 export * from "./credit-score";
 export * from "./green";
+export * from "./sbt";
diff --git a/src/commands/sbt/burn.ts b/src/commands/sbt/burn.ts
@@ -0,0 +1,7 @@
+import { masa } from "../../helpers";
+import { BigNumber } from "ethers";
+
+export const burn = async (contractAddress: string, SBTId: string) => {
+  const { burn } = await masa.sbt.connect(contractAddress);
+  await burn(BigNumber.from(SBTId));
+};
diff --git a/src/commands/sbt/index.ts b/src/commands/sbt/index.ts
@@ -0,0 +1,4 @@
+export { sign as sbtSign } from "./sign";
+export { info as sbtInfo } from "./info";
+export { list as sbtList } from "./list";
+export { burn as sbtBurn } from "./burn";
diff --git a/src/commands/factory/info.ts → src/commands/sbt/info.ts b/src/commands/factory/info.ts → src/commands/sbt/info.ts
@@ -1,11 +1,12 @@
 import { masa } from "../../helpers";
 
 export const info = async (address: string) => {
-  const { selfSovereignSBT } = await masa.contracts.factory(address);
+  const { selfSovereignSBT } = await masa.contracts.sbt(address);
 
   if (selfSovereignSBT) {
-    console.log("Self Sovereign SBT\n");
+    console.log("Self Sovereign SBT Contract Information:\n");
     console.log(`Contract Name: '${await selfSovereignSBT.name()}'`);
+    console.log(`Contract Symbol: '${await selfSovereignSBT.symbol()}'`);
     console.log(`Contract Address: '${selfSovereignSBT.address}'`);
     console.log(
       `Total SBTs: ${(await selfSovereignSBT.totalSupply()).toNumber()}`

diff --git a/src/commands/sbt/list.ts b/src/commands/sbt/list.ts
@@ -0,0 +1,6 @@
+import { masa } from "../../helpers";
+
+export const list = async (contractAddress: string, address?: string) => {
+  const { list } = await masa.sbt.connect(contractAddress);
+  await list(address);
+};
diff --git a/src/commands/factory/sign.ts → src/commands/sbt/sign.ts b/src/commands/factory/sign.ts → src/commands/sbt/sign.ts
@@ -7,7 +7,7 @@ export const sign = async (
   types: Record<string, Array<TypedDataField>>,
   value: Record<string, string | BigNumber | number>
 ) => {
-  const { sign } = await masa.contracts.factory(address);
+  const { sign } = await masa.contracts.sbt(address);
   const signResult = await sign(name, types, value);
 
   /*