@atomiqlabs/chain-starknet 5.0.2 → 5.1.1

package/src/starknet/swaps/modules/StarknetSwapInit.ts

@@ -4,7 +4,7 @@ import {Buffer} from "buffer";
 import {StarknetSwapData} from "../StarknetSwapData";
 import {StarknetAction} from "../../chain/StarknetAction";
 import {StarknetSwapModule} from "../StarknetSwapModule";
-import {BigNumberish} from "starknet";
+import {BigNumberish, cairo} from "starknet";
 import {StarknetSigner} from "../../wallet/StarknetSigner";
 import {StarknetFees} from "../../chain/modules/StarknetFees";
 import {StarknetTx} from "../../chain/modules/StarknetTransactions";
@@ -15,14 +15,27 @@ export type StarknetPreFetchVerification = {
 
 const Initialize = [
     { name: 'Swap hash', type: 'felt' },
-    { name: 'Timeout', type: 'timestamp' }
+    { name: 'Offerer', type: 'ContractAddress'},
+    { name: 'Claimer', type: 'ContractAddress'},
+    { name: 'Token amount', type: 'TokenAmount'},
+    { name: 'Pay in', type: 'bool'},
+    { name: 'Pay out', type: 'bool'},
+    { name: 'Tracking reputation', type: 'bool'},
+    { name: 'Claim handler', type: 'ContractAddress'},
+    { name: 'Claim data', type: 'felt'},
+    { name: 'Refund handler', type: 'ContractAddress'},
+    { name: 'Refund data', type: 'felt'},
+    { name: 'Security deposit', type: 'TokenAmount'},
+    { name: 'Claimer bounty', type: 'TokenAmount'},
+    { name: 'Claim action hash', type: 'felt'},
+    { name: 'Deadline', type: 'timestamp' }
 ];
 
 export class StarknetSwapInit extends StarknetSwapModule {
 
     private static readonly GasCosts = {
-        INIT: {l1: 500, l2: 0},
-        INIT_PAY_IN: {l1: 1000, l2: 0},
+        INIT: {l1DataGas: 750, l2Gas: 8_000_000, l1Gas: 0},
+        INIT_PAY_IN: {l1DataGas: 500, l2Gas: 4_800_000, l1Gas: 0},
     };
 
     /**
@@ -82,7 +95,29 @@ export class StarknetSwapInit extends StarknetSwapModule {
 
         const signature = await this.root.Signatures.signTypedMessage(signer, Initialize, "Initialize", {
             "Swap hash": "0x"+swapData.getEscrowHash(),
-            "Timeout": toHex(authTimeout)
+            "Offerer": swapData.offerer,
+            "Claimer": swapData.claimer,
+            "Token amount": {
+                token_address: swapData.token,
+                amount: cairo.uint256(swapData.amount)
+            },
+            "Pay in": swapData.isPayIn(),
+            "Pay out": swapData.isPayOut(),
+            "Tracking reputation": swapData.reputation,
+            "Refund handler": swapData.refundHandler,
+            "Claim handler": swapData.claimHandler,
+            "Claim data": "0x"+swapData.getClaimHash(),
+            "Refund data": swapData.refundData.startsWith("0x") ? swapData.refundData : "0x"+swapData.refundData,
+            "Security deposit": {
+                token_address: swapData.feeToken,
+                amount: cairo.uint256(swapData.securityDeposit)
+            },
+            "Claimer bounty": {
+                token_address: swapData.feeToken,
+                amount: cairo.uint256(swapData.claimerBounty)
+            },
+            "Claim action hash": 0n,
+            "Deadline": toHex(authTimeout)
         });
 
         return {
@@ -129,7 +164,29 @@ export class StarknetSwapInit extends StarknetSwapModule {
 
         const valid = await this.root.Signatures.isValidSignature(signature, signer, Initialize, "Initialize", {
             "Swap hash": "0x"+swapData.getEscrowHash(),
-            "Timeout": toHex(timeoutBN)
+            "Offerer": swapData.offerer,
+            "Claimer": swapData.claimer,
+            "Token amount": {
+                token_address: swapData.token,
+                amount: cairo.uint256(swapData.amount)
+            },
+            "Pay in": swapData.isPayIn(),
+            "Pay out": swapData.isPayOut(),
+            "Tracking reputation": swapData.reputation,
+            "Refund handler": swapData.refundHandler,
+            "Claim handler": swapData.claimHandler,
+            "Claim data": "0x"+swapData.getClaimHash(),
+            "Refund data": swapData.refundData.startsWith("0x") ? swapData.refundData : "0x"+swapData.refundData,
+            "Security deposit": {
+                token_address: swapData.feeToken,
+                amount: cairo.uint256(swapData.securityDeposit)
+            },
+            "Claimer bounty": {
+                token_address: swapData.feeToken,
+                amount: cairo.uint256(swapData.claimerBounty)
+            },
+            "Claim action hash": 0n,
+            "Deadline": toHex(timeoutBN)
         });
 
         if(!valid) throw new SignatureVerificationError("Invalid signature!");
@@ -224,6 +281,6 @@ export class StarknetSwapInit extends StarknetSwapModule {
      */
     async getInitFee(swapData?: StarknetSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.root.Fees.getFeeRate();
-        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN.l1 : StarknetSwapInit.GasCosts.INIT.l1, feeRate);
+        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN : StarknetSwapInit.GasCosts.INIT, feeRate);
     }
 }

package/src/starknet/swaps/modules/StarknetSwapRefund.ts

@@ -2,13 +2,12 @@ import {SignatureVerificationError, SwapDataVerificationError} from "@atomiqlabs
 import {toHex, tryWithRetries} from "../../../utils/Utils";
 import {StarknetSwapModule} from "../StarknetSwapModule";
 import {StarknetSwapData} from "../StarknetSwapData";
-import {StarknetAction, StarknetGas, sumStarknetGas} from "../../chain/StarknetAction";
-import {StarknetSwapContract} from "../StarknetSwapContract";
+import {StarknetAction} from "../../chain/StarknetAction";
 import {IHandler} from "../handlers/IHandler";
 import {BigNumberish} from "starknet";
 import {StarknetTx} from "../../chain/modules/StarknetTransactions";
 import {StarknetSigner} from "../../wallet/StarknetSigner";
-import {StarknetFees} from "../../chain/modules/StarknetFees";
+import {StarknetFees, StarknetGas, starknetGasAdd} from "../../chain/modules/StarknetFees";
 
 const Refund = [
     { name: 'Swap hash', type: 'felt' },
@@ -18,8 +17,8 @@ const Refund = [
 export class StarknetSwapRefund extends StarknetSwapModule {
 
     private static readonly GasCosts = {
-        REFUND: {l1: 750, l2: 0},
-        REFUND_PAY_OUT: {l1: 1250, l2: 0}
+        REFUND: {l1DataGas: 750, l2Gas: 4_000_000, l1Gas: 0},
+        REFUND_PAY_OUT: {l1DataGas: 900, l2Gas: 6_000_000, l1Gas: 0}
     };
 
     /**
@@ -40,7 +39,7 @@ export class StarknetSwapRefund extends StarknetSwapModule {
     ): StarknetAction {
         return new StarknetAction(signer, this.root,
             this.swapContract.populateTransaction.refund(swapData.toEscrowStruct(), witness),
-            sumStarknetGas(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas)
+            starknetGasAdd(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas)
         );
     }
 
@@ -192,7 +191,7 @@ export class StarknetSwapRefund extends StarknetSwapModule {
      */
     async getRefundFee(swapData: StarknetSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.root.Fees.getFeeRate();
-        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT.l1 : StarknetSwapRefund.GasCosts.REFUND.l1, feeRate);
+        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, feeRate);
     }
 
 }

package/src/utils/Utils.ts

@@ -1,4 +1,4 @@
-import {EDAMode} from "starknet-types-07";
+import {EDAMode} from "@starknet-io/starknet-types-08";
 import {BigNumberish, CallData, hash, Uint256} from "starknet";
 import {StarknetTx} from "../starknet/chain/modules/StarknetTransactions";
 import {Buffer} from "buffer";
@@ -34,10 +34,14 @@ export function onceAsync<T>(executor: () => Promise<T>): () => Promise<T> {
 
 export function getLogger(prefix: string) {
     return {
-        debug: (msg, ...args) => console.debug(prefix+msg, ...args),
-        info: (msg, ...args) => console.info(prefix+msg, ...args),
-        warn: (msg, ...args) => console.warn(prefix+msg, ...args),
-        error: (msg, ...args) => console.error(prefix+msg, ...args)
+        // @ts-ignore
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix+msg, ...args),
+        // @ts-ignore
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix+msg, ...args),
+        // @ts-ignore
+        warn: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 1) && console.warn(prefix+msg, ...args),
+        // @ts-ignore
+        error: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 0) && console.error(prefix+msg, ...args)
     };
 }
 
@@ -79,7 +83,7 @@ export function toHex(value: number | bigint | string | Buffer, length: number =
     switch(typeof(value)) {
         case "string":
             if(value.startsWith("0x")) {
-                return "0x"+value.slice(2).padStart(length, "0");
+                return "0x"+value.slice(2).padStart(length, "0").toLowerCase();
             } else {
                 return "0x"+BigInt(value).toString(16).padStart(length, "0");
             }