@atomiqlabs/chain-starknet 1.0.3 → 1.0.5

package/dist/starknet/StarknetInitializer.d.ts

@@ -3,7 +3,7 @@ import { StarknetFees } from "./base/modules/StarknetFees";
 import { StarknetRetryPolicy } from "./base/StarknetBase";
 import { BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer } from "@atomiqlabs/base";
 import { StarknetChainType } from "./StarknetChainType";
-export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK">;
+export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK" | "WBTC">;
 export declare const StarknetAssets: StarknetAssetsType;
 export type StarknetOptions = {
     rpcUrl: string | Provider;

package/dist/starknet/StarknetInitializer.js

@@ -18,6 +18,10 @@ exports.StarknetAssets = {
         address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
         decimals: 18,
         displayDecimals: 9
+    },
+    WBTC: {
+        address: "0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac",
+        decimals: 8
     }
 };
 function initializeStarknet(options, bitcoinRpc, network) {

package/dist/starknet/btcrelay/StarknetBtcRelay.js

@@ -25,8 +25,8 @@ function serializeBlockHeader(e) {
 const GAS_PER_BLOCKHEADER = 750;
 const GAS_PER_BLOCKHEADER_FORK = 750;
 const btcRelayAddreses = {
-    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x032afcea912ba13f6a1878fe38af23eaec3e6b4c7db31a3571550d3cf80d3e31",
-    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x05cc69b09e8c53520f9e328f6eca72cf02fe46ce290b757d42414e2238001603"
+    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x039840c19fae41675e18c967a2ac13b709657893551eca54e175ee4fdf4b453d",
+    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x057b14a4231b82f1e525ff35a722d893ca3dd2bde0baa6cee97937c5be861dbc"
 };
 function serializeCalldata(headers, storedHeader, span) {
     span.push((0, Utils_1.toHex)(headers.length));

package/dist/starknet/swaps/EscrowManagerAbi.d.ts

@@ -12,33 +12,6 @@ export declare const EscrowManagerAbi: readonly [{
         readonly name: "high";
         readonly type: "core::integer::u128";
     }];
-}, {
-    readonly type: "struct";
-    readonly name: "core::array::Span::<core::felt252>";
-    readonly members: readonly [{
-        readonly name: "snapshot";
-        readonly type: "@core::array::Array::<core::felt252>";
-    }];
-}, {
-    readonly type: "struct";
-    readonly name: "escrow_manager::structs::contract_call::ContractCall";
-    readonly members: readonly [{
-        readonly name: "address";
-        readonly type: "core::starknet::contract_address::ContractAddress";
-    }, {
-        readonly name: "entrypoint";
-        readonly type: "core::felt252";
-    }, {
-        readonly name: "calldata";
-        readonly type: "core::array::Span::<core::felt252>";
-    }];
-}, {
-    readonly type: "struct";
-    readonly name: "core::array::Span::<escrow_manager::structs::contract_call::ContractCall>";
-    readonly members: readonly [{
-        readonly name: "snapshot";
-        readonly type: "@core::array::Array::<escrow_manager::structs::contract_call::ContractCall>";
-    }];
 }, {
     readonly type: "struct";
     readonly name: "escrow_manager::structs::escrow::EscrowData";
@@ -78,9 +51,13 @@ export declare const EscrowManagerAbi: readonly [{
     }, {
         readonly name: "claimer_bounty";
         readonly type: "core::integer::u256";
-    }, {
-        readonly name: "success_action";
-        readonly type: "core::array::Span::<escrow_manager::structs::contract_call::ContractCall>";
+    }];
+}, {
+    readonly type: "struct";
+    readonly name: "core::array::Span::<core::felt252>";
+    readonly members: readonly [{
+        readonly name: "snapshot";
+        readonly type: "@core::array::Array::<core::felt252>";
     }];
 }, {
     readonly type: "interface";
@@ -293,10 +270,6 @@ export declare const EscrowManagerAbi: readonly [{
         }];
         readonly state_mutability: "view";
     }];
-}, {
-    readonly type: "constructor";
-    readonly name: "constructor";
-    readonly inputs: readonly [];
 }, {
     readonly type: "event";
     readonly name: "escrow_manager::components::lp_vault::lp_vault::Event";
@@ -399,15 +372,6 @@ export declare const EscrowManagerAbi: readonly [{
         readonly type: "core::starknet::contract_address::ContractAddress";
         readonly kind: "data";
     }];
-}, {
-    readonly type: "event";
-    readonly name: "escrow_manager::events::SuccessActionExecuteError";
-    readonly kind: "struct";
-    readonly members: readonly [{
-        readonly name: "error";
-        readonly type: "core::array::Span::<core::felt252>";
-        readonly kind: "data";
-    }];
 }, {
     readonly type: "event";
     readonly name: "escrow_manager::EscrowManager::Event";
@@ -436,10 +400,6 @@ export declare const EscrowManagerAbi: readonly [{
         readonly name: "Refund";
         readonly type: "escrow_manager::events::Refund";
         readonly kind: "nested";
-    }, {
-        readonly name: "SuccessActionExecuteError";
-        readonly type: "escrow_manager::events::SuccessActionExecuteError";
-        readonly kind: "nested";
     }];
 }];
 export type EscrowManagerAbiType = typeof EscrowManagerAbi;

package/dist/starknet/swaps/EscrowManagerAbi.js

@@ -21,44 +21,6 @@ exports.EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "struct",
-        "name": "core::array::Span::<core::felt252>",
-        "members": [
-            {
-                "name": "snapshot",
-                "type": "@core::array::Array::<core::felt252>"
-            }
-        ]
-    },
-    {
-        "type": "struct",
-        "name": "escrow_manager::structs::contract_call::ContractCall",
-        "members": [
-            {
-                "name": "address",
-                "type": "core::starknet::contract_address::ContractAddress"
-            },
-            {
-                "name": "entrypoint",
-                "type": "core::felt252"
-            },
-            {
-                "name": "calldata",
-                "type": "core::array::Span::<core::felt252>"
-            }
-        ]
-    },
-    {
-        "type": "struct",
-        "name": "core::array::Span::<escrow_manager::structs::contract_call::ContractCall>",
-        "members": [
-            {
-                "name": "snapshot",
-                "type": "@core::array::Array::<escrow_manager::structs::contract_call::ContractCall>"
-            }
-        ]
-    },
     {
         "type": "struct",
         "name": "escrow_manager::structs::escrow::EscrowData",
@@ -110,10 +72,16 @@ exports.EscrowManagerAbi = [
             {
                 "name": "claimer_bounty",
                 "type": "core::integer::u256"
-            },
+            }
+        ]
+    },
+    {
+        "type": "struct",
+        "name": "core::array::Span::<core::felt252>",
+        "members": [
             {
-                "name": "success_action",
-                "type": "core::array::Span::<escrow_manager::structs::contract_call::ContractCall>"
+                "name": "snapshot",
+                "type": "@core::array::Array::<core::felt252>"
             }
         ]
     },
@@ -410,11 +378,6 @@ exports.EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "constructor",
-        "name": "constructor",
-        "inputs": []
-    },
     {
         "type": "event",
         "name": "escrow_manager::components::lp_vault::lp_vault::Event",
@@ -544,18 +507,6 @@ exports.EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "event",
-        "name": "escrow_manager::events::SuccessActionExecuteError",
-        "kind": "struct",
-        "members": [
-            {
-                "name": "error",
-                "type": "core::array::Span::<core::felt252>",
-                "kind": "data"
-            }
-        ]
-    },
     {
         "type": "event",
         "name": "escrow_manager::EscrowManager::Event",
@@ -590,11 +541,6 @@ exports.EscrowManagerAbi = [
                 "name": "Refund",
                 "type": "escrow_manager::events::Refund",
                 "kind": "nested"
-            },
-            {
-                "name": "SuccessActionExecuteError",
-                "type": "escrow_manager::events::SuccessActionExecuteError",
-                "kind": "nested"
             }
         ]
     }

package/dist/starknet/swaps/StarknetSwapContract.js

@@ -22,8 +22,8 @@ const ESCROW_STATE_COMMITTED = 1;
 const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
 const swapContractAddreses = {
-    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x035e9a06faa09ee78d7c8f4722687e4f3c8d8094860cc5092704b26a50f8a43f",
-    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x00b30f3bf0702d2570036c786a4b329816f99eecf36368cf74da0c0dfd67634d"
+    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x06874044dae5bbe712775cdb576d6aef45fc87a22ce629f2b101a7d591d4e7ca",
+    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x04fb26d02d2cf612566cd86cab299716d926272e9f49514670233952ecaf8f0c"
 };
 const defaultClaimAddresses = {
     [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: {
@@ -33,18 +33,18 @@ const defaultClaimAddresses = {
         [base_1.ChainSwapType.CHAIN_NONCED]: "0x050e50eacd16da414f2c3a7c3570fd5e248974c6fe757d41acbf72d2836fa0a1"
     },
     [starknet_1.constants.StarknetChainId.SN_MAIN]: {
-        [base_1.ChainSwapType.HTLC]: "0x0421c59a5442ccc430288c71ae606f2ca94dda7c8cd7c101f0865fa264853989",
-        [base_1.ChainSwapType.CHAIN_TXID]: "0x03aad3b184fa6484e3f8dde6a45a2c2512460a3fb4893112694b68645b50ce2e",
-        [base_1.ChainSwapType.CHAIN]: "0x012a938e57af955a4c96c49900731f572670bf1b7e120f99a7fe7d1f5d75cb8a",
-        [base_1.ChainSwapType.CHAIN_NONCED]: "0x04a0cad6b9d9ed790ce3eb95bddc22663168f0d50d24adaf7495b344609874a7"
+        [base_1.ChainSwapType.HTLC]: "0x07b74b50a883ebee262b6db0e3c0c697670c6f30e3d610e75faf33a89c46aa2a",
+        [base_1.ChainSwapType.CHAIN_TXID]: "0x016c2db2b03f39cf4fd7f871035000f66b62307d9983056e33a38315da8a44dc",
+        [base_1.ChainSwapType.CHAIN]: "0x02c45a81c4a48d0645a0a199e620061e8a55dcc9c2b5946d050eaeeddba64e9a",
+        [base_1.ChainSwapType.CHAIN_NONCED]: "0x0019b5480dd7ed8ded10a09437b0a7a30b8997b4ef139deb24ff8c86f995d84f"
     }
 };
 const defaultRefundAddresses = {
     [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: {
-        timelock: "0x0726415752e78da4549e09da7824ae20b45539ca1fca71c93b349887cc0cac0d"
+        timelock: "0x034b8f28b3ca979036cb2849cfa3af7f67207459224b6ca5ce2474aa398ec3e7"
     },
     [starknet_1.constants.StarknetChainId.SN_MAIN]: {
-        timelock: "0x014ceb49916bb9228d8179db0c480147fab2dab71e17cfd7eca9c214eeb427e2"
+        timelock: "0x06a59659990c2aefbf7239f6d911617b3ae60b79cb3364f3bd242a6ca8f4f4f7"
     }
 };
 class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
@@ -275,7 +275,7 @@ class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
     //// Swap data initializer
     createSwapData(type, offerer, claimer, token, amount, paymentHash, sequence, expiry, payIn, payOut, securityDeposit, claimerBounty, depositToken = this.Tokens.getNativeCurrencyAddress()) {
         return Promise.resolve(new StarknetSwapData_1.StarknetSwapData(offerer, claimer, token, this.timelockRefundHandler.address, this.claimHandlersBySwapType?.[type]?.address, payOut, payIn, payIn, //For now track reputation for all payIn swaps
-        sequence, "0x" + paymentHash, (0, Utils_1.toHex)(expiry), amount, depositToken, securityDeposit, claimerBounty, type, null, []));
+        sequence, "0x" + paymentHash, (0, Utils_1.toHex)(expiry), amount, depositToken, securityDeposit, claimerBounty, type, null));
     }
     ////////////////////////////////////////////
     //// Utils

package/dist/starknet/swaps/StarknetSwapData.d.ts

@@ -4,11 +4,6 @@ import { StringToPrimitiveType } from "abi-wan-kanabi/dist/kanabi";
 import { EscrowManagerAbi } from "./EscrowManagerAbi";
 import { IClaimHandler } from "./handlers/claim/ClaimHandlers";
 export type StarknetSwapDataType = StringToPrimitiveType<typeof EscrowManagerAbi, "escrow_manager::structs::escrow::EscrowData">;
-type SerializedContractCall = {
-    address: string;
-    entrypoint: string;
-    calldata: string[];
-};
 export declare class StarknetSwapData extends SwapData {
     static toFlags(value: number | bigint | string): {
         payOut: boolean;
@@ -32,10 +27,9 @@ export declare class StarknetSwapData extends SwapData {
     feeToken: string;
     securityDeposit: bigint;
     claimerBounty: bigint;
-    successAction: SerializedContractCall[];
     extraData: string;
     kind: ChainSwapType;
-    constructor(offerer: string, claimer: string, token: string, refundHandler: string, claimHandler: string, payOut: boolean, payIn: boolean, reputation: boolean, sequence: bigint, claimData: string, refundData: string, amount: bigint, feeToken: string, securityDeposit: bigint, claimerBounty: bigint, kind: ChainSwapType, extraData: string, successAction: SerializedContractCall[]);
+    constructor(offerer: string, claimer: string, token: string, refundHandler: string, claimHandler: string, payOut: boolean, payIn: boolean, reputation: boolean, sequence: bigint, claimData: string, refundData: string, amount: bigint, feeToken: string, securityDeposit: bigint, claimerBounty: bigint, kind: ChainSwapType, extraData: string);
     constructor(data: any);
     getOfferer(): string;
     setOfferer(newOfferer: string): void;
@@ -71,4 +65,3 @@ export declare class StarknetSwapData extends SwapData {
     toEscrowStruct(): StarknetSwapDataType;
     static fromSerializedFeltArray(span: BigNumberish[], claimHandlerImpl: IClaimHandler<any, any>): StarknetSwapData;
 }
-export {};

package/dist/starknet/swaps/StarknetSwapData.js

@@ -8,32 +8,6 @@ const Utils_1 = require("../../utils/Utils");
 const FLAG_PAY_OUT = 0x01n;
 const FLAG_PAY_IN = 0x02n;
 const FLAG_REPUTATION = 0x04n;
-function deserializeContractCalls(span) {
-    const successActionsLen = Number((0, Utils_1.toBigInt)(span.shift()));
-    const successActions = [];
-    for (let i = 0; i < successActionsLen; i++) {
-        const address = (0, Utils_1.toHex)(span.shift());
-        const entrypoint = (0, Utils_1.toHex)(span.shift());
-        const calldataLen = Number((0, Utils_1.toBigInt)(span.shift()));
-        const calldata = span.splice(0, calldataLen).map(Utils_1.toHex);
-        successActions.push({
-            address,
-            entrypoint,
-            calldata
-        });
-    }
-    return successActions;
-}
-function serializeContractCalls(calls, span) {
-    span.push((0, Utils_1.toHex)(calls.length));
-    calls.forEach((call) => {
-        span.push(call.address);
-        span.push(call.entrypoint);
-        span.push((0, Utils_1.toHex)(call.calldata.length));
-        span.push(...call.calldata);
-    });
-    return span;
-}
 class StarknetSwapData extends base_1.SwapData {
     static toFlags(value) {
         const val = (0, Utils_1.toBigInt)(value);
@@ -50,7 +24,7 @@ class StarknetSwapData extends base_1.SwapData {
             (this.payIn ? FLAG_PAY_IN : 0n) +
             (this.reputation ? FLAG_REPUTATION : 0n);
     }
-    constructor(offererOrData, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, kind, extraData, successAction) {
+    constructor(offererOrData, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, kind, extraData) {
         super();
         if (claimer != null || token != null || refundHandler != null || claimHandler != null ||
             payOut != null || payIn != null || reputation != null || sequence != null || claimData != null || refundData != null ||
@@ -72,7 +46,6 @@ class StarknetSwapData extends base_1.SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
-            this.successAction = successAction;
         }
         else {
             this.offerer = offererOrData.offerer;
@@ -92,11 +65,7 @@ class StarknetSwapData extends base_1.SwapData {
             this.claimerBounty = offererOrData.claimerBounty == null ? null : BigInt(offererOrData.claimerBounty);
             this.kind = offererOrData.kind;
             this.extraData = offererOrData.extraData;
-            this.successAction = offererOrData.successAction;
         }
-        //For now we disallow usage of success actions
-        if (this.successAction.length > 0)
-            throw new Error("Success actions are not supported yet!");
     }
     getOfferer() {
         return this.offerer;
@@ -133,8 +102,7 @@ class StarknetSwapData extends base_1.SwapData {
             securityDeposit: this.securityDeposit == null ? null : this.securityDeposit.toString(10),
             claimerBounty: this.claimerBounty == null ? null : this.claimerBounty.toString(10),
             kind: this.kind,
-            extraData: this.extraData,
-            successAction: this.successAction
+            extraData: this.extraData
         };
     }
     getAmount() {
@@ -177,8 +145,7 @@ class StarknetSwapData extends base_1.SwapData {
             securityDepositValue.low,
             securityDepositValue.high,
             claimerBountyValue.low,
-            claimerBountyValue.high,
-            ...serializeContractCalls(this.successAction, []).slice(1) //Remove length prefix
+            claimerBountyValue.high
         ]);
         if (escrowHash.startsWith("0x"))
             escrowHash = escrowHash.slice(2);
@@ -291,8 +258,7 @@ class StarknetSwapData extends base_1.SwapData {
             amount: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.amount)),
             fee_token: this.feeToken,
             security_deposit: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.securityDeposit)),
-            claimer_bounty: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.claimerBounty)),
-            success_action: this.successAction
+            claimer_bounty: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.claimerBounty))
         };
     }
     static fromSerializedFeltArray(span, claimHandlerImpl) {
@@ -308,8 +274,7 @@ class StarknetSwapData extends base_1.SwapData {
         const feeToken = (0, Utils_1.toHex)(span.shift());
         const securityDeposit = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });
         const claimerBounty = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });
-        const successActions = deserializeContractCalls(span);
-        return new StarknetSwapData(offerer, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, claimHandlerImpl.getType(), null, successActions);
+        return new StarknetSwapData(offerer, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, claimHandlerImpl.getType(), null);
     }
 }
 exports.StarknetSwapData = StarknetSwapData;

package/dist/starknet/wallet/StarknetKeypairWallet.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StarknetKeypairWallet = void 0;
 const starknet_1 = require("starknet");
 const Utils_1 = require("../../utils/Utils");
-const OZaccountClassHash = '0x061dac032f228abef9c6626f995015233097ae253a7f72d68552db02f2971b8f';
+const OZaccountClassHash = '0x06e3042fbc368d30508ae7f51a7632f0fcf14a662c60f00f5e438839abcb53ee';
 //Openzeppelin Account wallet
 class StarknetKeypairWallet extends starknet_1.Account {
     constructor(provider, privateKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/starknet/StarknetInitializer.ts

@@ -8,7 +8,7 @@ import {BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer}
 import {StarknetChainType} from "./StarknetChainType";
 import {StarknetSwapData} from "./swaps/StarknetSwapData";
 
-export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK">;
+export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK" | "WBTC">;
 export const StarknetAssets: StarknetAssetsType = {
     ETH: {
         address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
@@ -19,6 +19,10 @@ export const StarknetAssets: StarknetAssetsType = {
         address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
         decimals: 18,
         displayDecimals: 9
+    },
+    WBTC: {
+        address: "0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac",
+        decimals: 8
     }
 } as const;
 

package/src/starknet/btcrelay/StarknetBtcRelay.ts

@@ -33,8 +33,8 @@ const GAS_PER_BLOCKHEADER = 750;
 const GAS_PER_BLOCKHEADER_FORK = 750;
 
 const btcRelayAddreses = {
-    [constants.StarknetChainId.SN_SEPOLIA]: "0x032afcea912ba13f6a1878fe38af23eaec3e6b4c7db31a3571550d3cf80d3e31",
-    [constants.StarknetChainId.SN_MAIN]: "0x05cc69b09e8c53520f9e328f6eca72cf02fe46ce290b757d42414e2238001603"
+    [constants.StarknetChainId.SN_SEPOLIA]: "0x039840c19fae41675e18c967a2ac13b709657893551eca54e175ee4fdf4b453d",
+    [constants.StarknetChainId.SN_MAIN]: "0x057b14a4231b82f1e525ff35a722d893ca3dd2bde0baa6cee97937c5be861dbc"
 };
 
 function serializeCalldata(headers: StarknetBtcHeader[], storedHeader: StarknetBtcStoredHeader, span: BigNumberish[]) {

package/src/starknet/swaps/EscrowManagerAbi.ts

@@ -18,44 +18,6 @@ export const EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "struct",
-        "name": "core::array::Span::<core::felt252>",
-        "members": [
-            {
-                "name": "snapshot",
-                "type": "@core::array::Array::<core::felt252>"
-            }
-        ]
-    },
-    {
-        "type": "struct",
-        "name": "escrow_manager::structs::contract_call::ContractCall",
-        "members": [
-            {
-                "name": "address",
-                "type": "core::starknet::contract_address::ContractAddress"
-            },
-            {
-                "name": "entrypoint",
-                "type": "core::felt252"
-            },
-            {
-                "name": "calldata",
-                "type": "core::array::Span::<core::felt252>"
-            }
-        ]
-    },
-    {
-        "type": "struct",
-        "name": "core::array::Span::<escrow_manager::structs::contract_call::ContractCall>",
-        "members": [
-            {
-                "name": "snapshot",
-                "type": "@core::array::Array::<escrow_manager::structs::contract_call::ContractCall>"
-            }
-        ]
-    },
     {
         "type": "struct",
         "name": "escrow_manager::structs::escrow::EscrowData",
@@ -107,10 +69,16 @@ export const EscrowManagerAbi = [
             {
                 "name": "claimer_bounty",
                 "type": "core::integer::u256"
-            },
+            }
+        ]
+    },
+    {
+        "type": "struct",
+        "name": "core::array::Span::<core::felt252>",
+        "members": [
             {
-                "name": "success_action",
-                "type": "core::array::Span::<escrow_manager::structs::contract_call::ContractCall>"
+                "name": "snapshot",
+                "type": "@core::array::Array::<core::felt252>"
             }
         ]
     },
@@ -407,11 +375,6 @@ export const EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "constructor",
-        "name": "constructor",
-        "inputs": []
-    },
     {
         "type": "event",
         "name": "escrow_manager::components::lp_vault::lp_vault::Event",
@@ -541,18 +504,6 @@ export const EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "event",
-        "name": "escrow_manager::events::SuccessActionExecuteError",
-        "kind": "struct",
-        "members": [
-            {
-                "name": "error",
-                "type": "core::array::Span::<core::felt252>",
-                "kind": "data"
-            }
-        ]
-    },
     {
         "type": "event",
         "name": "escrow_manager::EscrowManager::Event",
@@ -587,11 +538,6 @@ export const EscrowManagerAbi = [
                 "name": "Refund",
                 "type": "escrow_manager::events::Refund",
                 "kind": "nested"
-            },
-            {
-                "name": "SuccessActionExecuteError",
-                "type": "escrow_manager::events::SuccessActionExecuteError",
-                "kind": "nested"
             }
         ]
     }

package/src/starknet/swaps/StarknetSwapContract.ts

@@ -35,8 +35,8 @@ const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
 
 const swapContractAddreses = {
-    [constants.StarknetChainId.SN_SEPOLIA]: "0x035e9a06faa09ee78d7c8f4722687e4f3c8d8094860cc5092704b26a50f8a43f",
-    [constants.StarknetChainId.SN_MAIN]: "0x00b30f3bf0702d2570036c786a4b329816f99eecf36368cf74da0c0dfd67634d"
+    [constants.StarknetChainId.SN_SEPOLIA]: "0x06874044dae5bbe712775cdb576d6aef45fc87a22ce629f2b101a7d591d4e7ca",
+    [constants.StarknetChainId.SN_MAIN]: "0x04fb26d02d2cf612566cd86cab299716d926272e9f49514670233952ecaf8f0c"
 };
 
 const defaultClaimAddresses = {
@@ -47,19 +47,19 @@ const defaultClaimAddresses = {
         [ChainSwapType.CHAIN_NONCED]: "0x050e50eacd16da414f2c3a7c3570fd5e248974c6fe757d41acbf72d2836fa0a1"
     },
     [constants.StarknetChainId.SN_MAIN]: {
-        [ChainSwapType.HTLC]: "0x0421c59a5442ccc430288c71ae606f2ca94dda7c8cd7c101f0865fa264853989",
-        [ChainSwapType.CHAIN_TXID]: "0x03aad3b184fa6484e3f8dde6a45a2c2512460a3fb4893112694b68645b50ce2e",
-        [ChainSwapType.CHAIN]: "0x012a938e57af955a4c96c49900731f572670bf1b7e120f99a7fe7d1f5d75cb8a",
-        [ChainSwapType.CHAIN_NONCED]: "0x04a0cad6b9d9ed790ce3eb95bddc22663168f0d50d24adaf7495b344609874a7"
+        [ChainSwapType.HTLC]: "0x07b74b50a883ebee262b6db0e3c0c697670c6f30e3d610e75faf33a89c46aa2a",
+        [ChainSwapType.CHAIN_TXID]: "0x016c2db2b03f39cf4fd7f871035000f66b62307d9983056e33a38315da8a44dc",
+        [ChainSwapType.CHAIN]: "0x02c45a81c4a48d0645a0a199e620061e8a55dcc9c2b5946d050eaeeddba64e9a",
+        [ChainSwapType.CHAIN_NONCED]: "0x0019b5480dd7ed8ded10a09437b0a7a30b8997b4ef139deb24ff8c86f995d84f"
     }
 }
 
 const defaultRefundAddresses = {
     [constants.StarknetChainId.SN_SEPOLIA]: {
-        timelock: "0x0726415752e78da4549e09da7824ae20b45539ca1fca71c93b349887cc0cac0d"
+        timelock: "0x034b8f28b3ca979036cb2849cfa3af7f67207459224b6ca5ce2474aa398ec3e7"
     },
     [constants.StarknetChainId.SN_MAIN]: {
-        timelock: "0x014ceb49916bb9228d8179db0c480147fab2dab71e17cfd7eca9c214eeb427e2"
+        timelock: "0x06a59659990c2aefbf7239f6d911617b3ae60b79cb3364f3bd242a6ca8f4f4f7"
     }
 }
 
@@ -377,8 +377,7 @@ export class StarknetSwapContract
             securityDeposit,
             claimerBounty,
             type,
-            null,
-            []
+            null
         ));
     }
 

package/src/starknet/swaps/StarknetSwapData.ts

@@ -14,40 +14,6 @@ const FLAG_REPUTATION: bigint = 0x04n;
 
 export type StarknetSwapDataType = StringToPrimitiveType<typeof EscrowManagerAbi, "escrow_manager::structs::escrow::EscrowData">;
 
-type SerializedContractCall = {
-    address: string,
-    entrypoint: string,
-    calldata: string[]
-};
-
-function deserializeContractCalls(span: BigNumberish[]): SerializedContractCall[] {
-    const successActionsLen = Number(toBigInt(span.shift()));
-    const successActions: SerializedContractCall[] = [];
-    for(let i=0; i<successActionsLen; i++) {
-        const address = toHex(span.shift());
-        const entrypoint = toHex(span.shift());
-        const calldataLen = Number(toBigInt(span.shift()));
-        const calldata = span.splice(0, calldataLen).map(toHex);
-        successActions.push({
-            address,
-            entrypoint,
-            calldata
-        });
-    }
-    return successActions;
-}
-
-function serializeContractCalls(calls: SerializedContractCall[], span: BigNumberish[]): BigNumberish[] {
-    span.push(toHex(calls.length));
-    calls.forEach((call) => {
-        span.push(call.address);
-        span.push(call.entrypoint);
-        span.push(toHex(call.calldata.length));
-        span.push(...call.calldata);
-    });
-    return span;
-}
-
 export class StarknetSwapData extends SwapData {
 
     static toFlags(value: number | bigint | string): {payOut: boolean, payIn: boolean, reputation: boolean, sequence: bigint} {
@@ -89,8 +55,6 @@ export class StarknetSwapData extends SwapData {
     securityDeposit: bigint;
     claimerBounty: bigint;
 
-    successAction: SerializedContractCall[];
-
     extraData: string;
 
     kind: ChainSwapType;
@@ -112,8 +76,7 @@ export class StarknetSwapData extends SwapData {
         securityDeposit: bigint,
         claimerBounty: bigint,
         kind: ChainSwapType,
-        extraData: string,
-        successAction: SerializedContractCall[]
+        extraData: string
     );
 
     constructor(data: any);
@@ -135,8 +98,7 @@ export class StarknetSwapData extends SwapData {
         securityDeposit?: bigint,
         claimerBounty?: bigint,
         kind?: ChainSwapType,
-        extraData?: string,
-        successAction?: SerializedContractCall[]
+        extraData?: string
     ) {
         super();
         if(claimer!=null || token!=null || refundHandler!=null || claimHandler!=null ||
@@ -159,7 +121,6 @@ export class StarknetSwapData extends SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
-            this.successAction = successAction;
         } else {
             this.offerer = offererOrData.offerer;
             this.claimer = offererOrData.claimer;
@@ -178,10 +139,7 @@ export class StarknetSwapData extends SwapData {
             this.claimerBounty = offererOrData.claimerBounty==null ? null : BigInt(offererOrData.claimerBounty);
             this.kind = offererOrData.kind;
             this.extraData = offererOrData.extraData;
-            this.successAction = offererOrData.successAction;
         }
-        //For now we disallow usage of success actions
-        if(this.successAction.length>0) throw new Error("Success actions are not supported yet!");
     }
 
     getOfferer(): string {
@@ -223,8 +181,7 @@ export class StarknetSwapData extends SwapData {
             securityDeposit: this.securityDeposit==null ? null : this.securityDeposit.toString(10),
             claimerBounty: this.claimerBounty==null ? null : this.claimerBounty.toString(10),
             kind: this.kind,
-            extraData: this.extraData,
-            successAction: this.successAction
+            extraData: this.extraData
         }
     }
 
@@ -275,8 +232,7 @@ export class StarknetSwapData extends SwapData {
             securityDepositValue.low,
             securityDepositValue.high,
             claimerBountyValue.low,
-            claimerBountyValue.high,
-            ...serializeContractCalls(this.successAction, []).slice(1) //Remove length prefix
+            claimerBountyValue.high
         ]);
         if(escrowHash.startsWith("0x")) escrowHash = escrowHash.slice(2);
         return escrowHash.padStart(64, "0");
@@ -394,8 +350,7 @@ export class StarknetSwapData extends SwapData {
             amount: cairo.uint256(toBigInt(this.amount)),
             fee_token: this.feeToken,
             security_deposit: cairo.uint256(toBigInt(this.securityDeposit)),
-            claimer_bounty: cairo.uint256(toBigInt(this.claimerBounty)),
-            success_action: this.successAction
+            claimer_bounty: cairo.uint256(toBigInt(this.claimerBounty))
         }
     }
 
@@ -412,7 +367,6 @@ export class StarknetSwapData extends SwapData {
         const feeToken = toHex(span.shift());
         const securityDeposit = toBigInt({low: span.shift(), high: span.shift()});
         const claimerBounty = toBigInt({low: span.shift(), high: span.shift()});
-        const successActions: SerializedContractCall[] = deserializeContractCalls(span)
 
         return new StarknetSwapData(
             offerer,
@@ -431,8 +385,7 @@ export class StarknetSwapData extends SwapData {
             securityDeposit,
             claimerBounty,
             claimHandlerImpl.getType(),
-            null,
-            successActions
+            null
         );
     }
 

package/src/starknet/wallet/StarknetKeypairWallet.ts

@@ -1,7 +1,7 @@
 import {Account, CallData, DeployAccountContractPayload, ec, hash, Provider} from "starknet";
 import {toHex} from "../../utils/Utils";
 
-const OZaccountClassHash = '0x061dac032f228abef9c6626f995015233097ae253a7f72d68552db02f2971b8f';
+const OZaccountClassHash = '0x06e3042fbc368d30508ae7f51a7632f0fcf14a662c60f00f5e438839abcb53ee';
 
 //Openzeppelin Account wallet
 export class StarknetKeypairWallet extends Account {