@msafe/sui3-sdk 0.0.76 → 0.0.78

package/src/simulate/simulator.ts

@@ -5,50 +5,17 @@ import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { MSafeGlobals } from '@/globals/MSafeGlobals';
 import { SimulationResult } from '@/types';
 
-// Gas price option can be either a multiplier or a fixed amount
-export type GasPriceOption = MultiplierOption | FixedValueOption;
-
-// Gas budget option can be either a multiplier or a fixed amount
-export type GasBudgetOption = MultiplierOption | FixedValueOption;
-
-export interface MultiplierOption {
-  multiplier: {
-    numerator: bigint;
-    denominator: bigint;
-  };
-}
-
-export interface FixedValueOption {
-  fixedVal: bigint;
-}
-
 const GAS_SAFE_OVERHEAD = 1000n;
-// Default to 120% of the reference gas price
-export const DEF_GAS_PRICE_NUM = 120n;
-export const DEF_GAS_PRICE_DEN = 100n;
-
-export const DEF_GAS_PRICE_OPTION: GasPriceOption = {
-  multiplier: {
-    numerator: DEF_GAS_PRICE_NUM,
-    denominator: DEF_GAS_PRICE_DEN,
-  },
-};
 
 export class Simulator {
   constructor(private globals: MSafeGlobals) {}
 
-  public async simulate(
-    input: {
-      txb: TransactionBlock;
-      sender: string;
-    },
-    gasOption: GasPriceOption = DEF_GAS_PRICE_OPTION,
-  ): Promise<SimulationResult> {
+  public async simulate(input: { txb: TransactionBlock; sender: string }): Promise<SimulationResult> {
     const tx = this.copyTransactionBlock(input.txb);
 
     const { suiClient } = this.globals;
 
-    const gasPrice = await this.getGasPrice(gasOption);
+    const gasPrice = await this.getGasPrice();
 
     tx.setGasPrice(gasPrice);
 
@@ -77,14 +44,8 @@ export class Simulator {
     };
   }
 
-  private async getGasPrice(option: GasPriceOption) {
-    if (this.isFixedValue(option)) {
-      return option.fixedVal;
-    }
-
-    const refGasPrice = await this.globals.suiClient.getReferenceGasPrice();
-
-    return this.applyGasOption(refGasPrice, option);
+  private async getGasPrice() {
+    return this.globals.suiClient.getReferenceGasPrice();
   }
 
   private toGasBudget(gasUsed: GasCostSummary, gasPrice: bigint) {
@@ -100,25 +61,6 @@ export class Simulator {
     return gasBudget > baseComputationCostWithOverhead ? gasBudget : baseComputationCostWithOverhead;
   }
 
-  private isFixedValue(option: GasPriceOption | GasBudgetOption): option is FixedValueOption {
-    return 'fixedVal' in option;
-  }
-
-  private isMultiplier(option: GasPriceOption | GasBudgetOption): option is MultiplierOption {
-    return 'multiplier' in option;
-  }
-
-  private applyGasOption(val: bigint, option: GasPriceOption) {
-    if (this.isFixedValue(option)) {
-      return option.fixedVal;
-    }
-    if (this.isMultiplier(option)) {
-      const { multiplier } = option;
-      return (val * multiplier.numerator) / multiplier.denominator;
-    }
-    throw new Error('Sanity: Unknown gas price option');
-  }
-
   private copyTransactionBlock(tx: TransactionBlock): TransactionBlock {
     return TransactionBlock.from(tx.serialize());
   }

package/src/utils/sui.ts

@@ -50,13 +50,7 @@ function getAddressFromSignatures(serializedSig: SerializedSignature, targetAddr
       }
       return undefined;
     }
-    case 'ZkLogin': {
-      if (Formatter.isSuiAddressEqual(decoded.zkLogin.address, targetAddress)) {
-        throw new Error('ZkLogin wallet cannot be owner');
-      }
-      return undefined;
-    }
-
+    case 'ZkLogin':
     case 'ED25519':
     case 'Secp256k1':
     case 'Secp256r1': {