feature (dynamic sbts): adopt naming changes

masa-finance · Nov 7, 2023 · 989b5d6 · 989b5d6
1 parent 595153d
commit 989b5d6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/src/contracts/contract-modules/sbt/dynamic/SSSBT/dynamic-sssbt-contract-wrapper.ts b/src/contracts/contract-modules/sbt/dynamic/SSSBT/dynamic-sssbt-contract-wrapper.ts
@@ -1,6 +1,6 @@
 import { LogDescription } from "@ethersproject/abi";
 import { BigNumber } from "@ethersproject/bignumber";
-import { ReferenceSBTDynamicSelfSovereign } from "@masa-finance/masa-contracts-identity";
+import { MasaDynamicSSSBT } from "@masa-finance/masa-contracts-identity";
 import type { TypedDataField } from "ethers";
 import { PayableOverrides, TypedDataDomain } from "ethers";
 
@@ -14,7 +14,7 @@ import {
 import { DynamicSBTContractWrapper } from "../dynamic-sbt-contract-wrapper";
 
 export class DynamicSSSBTContractWrapper<
-  Contract extends ReferenceSBTDynamicSelfSovereign,
+  Contract extends MasaDynamicSSSBT,
 > extends DynamicSBTContractWrapper<Contract> {
   public readonly types: Record<string, Array<TypedDataField>> = {
     SetState: [

diff --git a/src/contracts/contract-modules/sbt/dynamic/SSSBT/dynamic-sssbt-contract.ts b/src/contracts/contract-modules/sbt/dynamic/SSSBT/dynamic-sssbt-contract.ts
@@ -1,5 +1,5 @@
-import type { ReferenceSBTDynamicSelfSovereign } from "@masa-finance/masa-contracts-identity";
-import { ReferenceSBTDynamicSelfSovereign__factory } from "@masa-finance/masa-contracts-identity";
+import type { MasaDynamicSSSBT } from "@masa-finance/masa-contracts-identity";
+import { MasaDynamicSSSBT__factory } from "@masa-finance/masa-contracts-identity";
 
 import type { ContractFactory } from "../../../../../interface/contract-factory";
 import { MasaSBTModuleBase } from "../../masa-sbt-module-base";
@@ -10,7 +10,7 @@ export class DynamicSSSBTContract extends MasaSBTModuleBase {
    *
    * @param contract
    */
-  public attach = <Contract extends ReferenceSBTDynamicSelfSovereign>(
+  public attach = <Contract extends MasaDynamicSSSBT>(
     contract: Contract,
   ): DynamicSSSBTContractWrapper<Contract> => {
     return new DynamicSSSBTContractWrapper(this.masa, this.instances, contract);
@@ -21,9 +21,9 @@ export class DynamicSSSBTContract extends MasaSBTModuleBase {
    * @param address
    * @param factory
    */
-  public connect = async <Contract extends ReferenceSBTDynamicSelfSovereign>(
+  public connect = async <Contract extends MasaDynamicSSSBT>(
     address: string,
-    factory: ContractFactory = ReferenceSBTDynamicSelfSovereign__factory,
+    factory: ContractFactory = MasaDynamicSSSBT__factory,
   ): Promise<DynamicSSSBTContractWrapper<Contract>> => {
     const contract: Contract = await this.loadSBTContract<Contract>(
       address,

diff --git a/src/modules/sbt/dynamic/SSSBT/masa-dynamic-sssbt-wrapper.ts b/src/modules/sbt/dynamic/SSSBT/masa-dynamic-sssbt-wrapper.ts
@@ -1,10 +1,10 @@
-import type { ReferenceSBTDynamicSelfSovereign } from "@masa-finance/masa-contracts-identity";
+import type { MasaDynamicSSSBT } from "@masa-finance/masa-contracts-identity";
 
 import type { PaymentMethod } from "../../../../interface";
 import { MasaDynamicSBTWrapper } from "../masa-dynamic-sbt-wrapper";
 
 export class MasaDynamicSSSBTWrapper<
-  Contract extends ReferenceSBTDynamicSelfSovereign,
+  Contract extends MasaDynamicSSSBT,
 > extends MasaDynamicSBTWrapper<Contract> {
   /**
    *
@@ -16,7 +16,14 @@ export class MasaDynamicSSSBTWrapper<
     receiver: string,
     state: string,
     stateValue: boolean,
-  ) => {
+  ): Promise<
+    | {
+        authorityAddress: string;
+        signatureDate: number;
+        signature: string;
+      }
+    | undefined
+  > => {
     let result:
       | {
           authorityAddress: string;

diff --git a/src/modules/sbt/dynamic/SSSBT/masa-dynamic-sssbt.ts b/src/modules/sbt/dynamic/SSSBT/masa-dynamic-sssbt.ts
@@ -1,5 +1,5 @@
-import type { ReferenceSBTDynamicSelfSovereign } from "@masa-finance/masa-contracts-identity";
-import { ReferenceSBTDynamicSelfSovereign__factory } from "@masa-finance/masa-contracts-identity";
+import type { MasaDynamicSSSBT as MasaDynamicSSSBTContract } from "@masa-finance/masa-contracts-identity";
+import { MasaDynamicSSSBT__factory } from "@masa-finance/masa-contracts-identity";
 
 import type { ContractFactory } from "../../../../interface/contract-factory";
 import { MasaBase } from "../../../../masa-base";
@@ -10,7 +10,7 @@ export class MasaDynamicSSSBT extends MasaBase {
    *
    * @param contract
    */
-  public attach = <Contract extends ReferenceSBTDynamicSelfSovereign>(
+  public attach = <Contract extends MasaDynamicSSSBTContract>(
     contract: Contract,
   ): MasaDynamicSSSBTWrapper<Contract> => {
     return new MasaDynamicSSSBTWrapper<Contract>(this.masa, contract);
@@ -21,9 +21,9 @@ export class MasaDynamicSSSBT extends MasaBase {
    * @param address
    * @param factory
    */
-  public connect = async <Contract extends ReferenceSBTDynamicSelfSovereign>(
+  public connect = async <Contract extends MasaDynamicSSSBTContract>(
     address: string,
-    factory: ContractFactory = ReferenceSBTDynamicSelfSovereign__factory,
+    factory: ContractFactory = MasaDynamicSSSBT__factory,
   ): Promise<MasaDynamicSSSBTWrapper<Contract>> => {
     const { contract } = await this.masa.contracts[
       "dynamic-sssbt"