Merge branch 'dev' into feat/epoch-progress-bar-on-landing

iotaledger · Feb 16, 2024 · 53193b8 · 53193b8
2 parents a62aba9 + c4667fb
commit 53193b8
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 49 deletions.
diff --git a/api/src/models/api/nova/IAddressDetails.ts b/api/src/models/api/nova/IAddressDetails.ts
@@ -7,6 +7,5 @@ export interface IAddressDetails {
     hex?: string;
     type?: AddressType;
     label?: string;
-    restricted: boolean;
     capabilities?: number[];
 }
diff --git a/api/src/utils/nova/addressHelper.ts b/api/src/utils/nova/addressHelper.ts
@@ -10,7 +10,6 @@ import {
     AnchorAddress,
     Utils,
     ImplicitAccountCreationAddress,
-    RestrictedAddress,
 } from "@iota/sdk-nova";
 import { plainToInstance } from "class-transformer";
 import { IAddressDetails } from "../../models/api/nova/IAddressDetails";
@@ -59,16 +58,10 @@ export class AddressHelper {
             hex: hex ? HexHelper.addPrefix(hex) : hex,
             type,
             label: AddressHelper.typeLabel(type),
-            restricted: false,
         };
     }
 
-    private static buildAddressFromTypes(
-        address: Address,
-        hrp: string,
-        restricted: boolean = false,
-        capabilities?: number[],
-    ): IAddressDetails {
+    private static buildAddressFromTypes(address: Address, hrp: string, capabilities?: number[]): IAddressDetails {
         let hex: string = "";
         let bech32: string = "";
 
@@ -84,16 +77,6 @@ export class AddressHelper {
             const implicitAccountCreationAddress = plainToInstance(ImplicitAccountCreationAddress, address);
             const innerAddress = implicitAccountCreationAddress.address();
             hex = innerAddress.pubKeyHash;
-        } else if (address.type === AddressType.Restricted) {
-            const restrictedAddress = plainToInstance(RestrictedAddress, address);
-            const innerAddress = restrictedAddress.address;
-
-            return this.buildAddressFromTypes(
-                innerAddress,
-                hrp,
-                true,
-                Array.from(restrictedAddress.getAllowedCapabilities() as ArrayLike<number>),
-            );
         }
 
         bech32 = this.computeBech32FromHexAndType(hex, address.type, hrp);
@@ -103,7 +86,6 @@ export class AddressHelper {
             hex,
             type: address.type,
             label: AddressHelper.typeLabel(address.type),
-            restricted,
             capabilities,
         };
     }

diff --git a/client/src/app/components/nova/Unlocks.tsx b/client/src/app/components/nova/Unlocks.tsx
@@ -2,7 +2,6 @@ import {
     AccountUnlock,
     AnchorUnlock,
     EmptyUnlock,
-    MultiUnlock,
     NftUnlock,
     ReferenceUnlock,
     SignatureUnlock,
@@ -25,7 +24,6 @@ interface UnlockTypeMap {
     [UnlockType.Account]: AccountUnlock;
     [UnlockType.Anchor]: AnchorUnlock;
     [UnlockType.Nft]: NftUnlock;
-    [UnlockType.Multi]: MultiUnlock;
     [UnlockType.Empty]: EmptyUnlock;
 }
 
@@ -80,17 +78,15 @@ const Unlocks: React.FC<IUnlocksProps> = ({ unlocks }) => {
                                     </div>
                                 </div>
                             );
-                        } else if (unlock.type === UnlockType.Multi) {
-                            const multiUnlock = unlock as MultiUnlock;
-
-                            return <Unlocks unlocks={multiUnlock.unlocks} key={idx} />;
                         } else if (unlock.type === UnlockType.Empty) {
                             return (
                                 <div key={idx} className="unlocks-card margin-l-t">
                                     {displayUnlocksTypeAndIndex(unlock.type, idx)}
                                 </div>
                             );
                         } else {
+                            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                            // @ts-ignore
                             const referencedUnlock = unlock as UnlockTypeMap[typeof unlock.type];
 
                             return (

diff --git a/client/src/app/components/nova/address/AddressView.tsx b/client/src/app/components/nova/address/AddressView.tsx
@@ -35,10 +35,8 @@ function getAddressTypeName(type: AddressType): string {
             return "Anchor";
         case AddressType.ImplicitAccountCreation:
             return "ImplicitAccountCreation";
-        case AddressType.Multi:
-            return "Multi";
-        case AddressType.Restricted:
-            return "Restricted";
+        default:
+            return "Unknown";
     }
 }
 

diff --git a/client/src/helpers/nova/addressHelper.ts b/client/src/helpers/nova/addressHelper.ts
@@ -7,7 +7,6 @@ import {
     AnchorAddress,
     Utils,
     ImplicitAccountCreationAddress,
-    RestrictedAddress,
 } from "@iota/sdk-wasm-nova/web";
 import { HexHelper } from "../stardust/hexHelper";
 import { IAddressDetails } from "~models/api/nova/IAddressDetails";
@@ -54,16 +53,10 @@ export class AddressHelper {
             hex: hex ? HexHelper.addPrefix(hex) : hex,
             type,
             label: AddressHelper.typeLabel(type),
-            restricted: false,
         };
     }
 
-    private static buildAddressFromTypes(
-        address: Address,
-        hrp: string,
-        restricted: boolean = false,
-        capabilities?: number[],
-    ): IAddressDetails {
+    private static buildAddressFromTypes(address: Address, hrp: string, capabilities?: number[]): IAddressDetails {
         let hex: string = "";
         let bech32: string = "";
 
@@ -79,11 +72,6 @@ export class AddressHelper {
             const implicitAccountCreationAddress = plainToInstance(ImplicitAccountCreationAddress, address);
             const innerAddress = implicitAccountCreationAddress.address();
             hex = (innerAddress as Ed25519Address).pubKeyHash;
-        } else if (address.type === AddressType.Restricted) {
-            const restrictedAddress = plainToInstance(RestrictedAddress, address);
-            const innerAddress = restrictedAddress.address;
-
-            return this.buildAddressFromTypes(innerAddress, hrp, true, Array.from(restrictedAddress.getAllowedCapabilities()));
         }
 
         bech32 = this.computeBech32FromHexAndType(hex, address.type, hrp);
@@ -93,7 +81,6 @@ export class AddressHelper {
             hex,
             type: address.type,
             label: AddressHelper.typeLabel(address.type),
-            restricted,
             capabilities,
         };
     }

diff --git a/client/src/helpers/nova/nameHelper.ts b/client/src/helpers/nova/nameHelper.ts
@@ -23,9 +23,6 @@ export class NameHelper {
             case UnlockType.Nft: {
                 return "NFT Unlock";
             }
-            case UnlockType.Multi: {
-                return "Multi Unlock";
-            }
             case UnlockType.Empty: {
                 return "Empty Unlock";
             }

diff --git a/client/src/helpers/nova/transactionsHelper.ts b/client/src/helpers/nova/transactionsHelper.ts
@@ -71,7 +71,7 @@ export class TransactionsHelper {
 
                         if (referencedUnlock.type === UnlockType.Signature) {
                             signatureUnlock = referencedUnlock as SignatureUnlock;
-                        } else if (referencedUnlock.type === UnlockType.Multi || referencedUnlock.type === UnlockType.Empty) {
+                        } else if (referencedUnlock.type === UnlockType.Empty) {
                             break;
                         } else {
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any

diff --git a/client/src/models/api/nova/IAddressDetails.ts b/client/src/models/api/nova/IAddressDetails.ts
@@ -5,6 +5,5 @@ export interface IAddressDetails {
     hex?: string;
     type?: AddressType;
     label?: string;
-    restricted?: boolean;
     capabilities?: number[];
 }