@atomiqlabs/chain-evm 1.0.0-dev.33 → 1.0.0-dev.35

package/dist/evm/swaps/EVMSwapData.d.ts

@@ -25,8 +25,9 @@ export declare class EVMSwapData extends SwapData {
     securityDeposit: bigint;
     claimerBounty: bigint;
     extraData: string;
+    successActionCommitment: 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, depositToken: string, securityDeposit: bigint, claimerBounty: bigint, kind: ChainSwapType, extraData: string);
+    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, depositToken: string, securityDeposit: bigint, claimerBounty: bigint, kind: ChainSwapType, extraData: string, successActionCommitment?: string);
     constructor(data: any);
     getOfferer(): string;
     setOfferer(newOfferer: string): void;
@@ -60,5 +61,6 @@ export declare class EVMSwapData extends SwapData {
     isClaimData(data: string): boolean;
     equals(other: EVMSwapData): boolean;
     toEscrowStruct(): EscrowDataStruct;
+    hasSuccessAction(): boolean;
     static deserializeFromStruct(struct: EscrowDataStruct, claimHandlerImpl: IClaimHandler<any, any>): EVMSwapData;
 }

package/dist/evm/swaps/EVMSwapData.js

@@ -22,7 +22,7 @@ class EVMSwapData 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, depositToken, securityDeposit, claimerBounty, kind, extraData) {
+    constructor(offererOrData, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, depositToken, securityDeposit, claimerBounty, kind, extraData, successActionCommitment) {
         super();
         if (claimer != null || token != null || refundHandler != null || claimHandler != null ||
             payOut != null || payIn != null || reputation != null || sequence != null || claimData != null || refundData != null ||
@@ -44,6 +44,7 @@ class EVMSwapData extends base_1.SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
+            this.successActionCommitment = successActionCommitment ?? ethers_1.ZeroHash;
         }
         else {
             this.offerer = offererOrData.offerer;
@@ -63,6 +64,7 @@ class EVMSwapData extends base_1.SwapData {
             this.claimerBounty = offererOrData.claimerBounty == null ? null : BigInt(offererOrData.claimerBounty);
             this.kind = offererOrData.kind;
             this.extraData = offererOrData.extraData;
+            this.successActionCommitment = offererOrData.successActionCommitment ?? ethers_1.ZeroHash;
         }
     }
     getOfferer() {
@@ -100,7 +102,8 @@ class EVMSwapData 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
+            extraData: this.extraData,
+            successActionCommitment: this.successActionCommitment
         };
     }
     getAmount() {
@@ -128,7 +131,7 @@ class EVMSwapData extends base_1.SwapData {
         const encoded = ethers_1.AbiCoder.defaultAbiCoder().encode(["address", "address", "uint256", "address", "uint256", "address", "bytes32", "address", "bytes32", "uint256", "uint256", "address", "bytes32"], [
             this.offerer, this.claimer, this.amount, this.token, this.getFlags(),
             this.claimHandler, this.claimData, this.refundHandler, this.refundData,
-            this.securityDeposit, this.claimerBounty, this.depositToken, ethers_1.ZeroHash
+            this.securityDeposit, this.claimerBounty, this.depositToken, this.successActionCommitment
         ]);
         let escrowHash = (0, ethers_1.keccak256)(encoded);
         return escrowHash.slice(2); //Strip `0x`
@@ -220,12 +223,13 @@ class EVMSwapData extends base_1.SwapData {
             other.payIn === this.payIn &&
             other.payOut === this.payOut &&
             other.reputation === this.reputation &&
-            this.sequence === other.sequence &&
+            other.sequence === this.sequence &&
             other.claimData.toLowerCase() === this.claimData.toLowerCase() &&
             other.refundData.toLowerCase() === this.refundData.toLowerCase() &&
             other.amount === this.amount &&
             other.securityDeposit === this.securityDeposit &&
-            other.claimerBounty === this.claimerBounty;
+            other.claimerBounty === this.claimerBounty &&
+            other.successActionCommitment.toLowerCase() === this.successActionCommitment.toLowerCase();
     }
     toEscrowStruct() {
         return {
@@ -241,13 +245,15 @@ class EVMSwapData extends base_1.SwapData {
             depositToken: this.depositToken,
             securityDeposit: this.securityDeposit,
             claimerBounty: this.claimerBounty,
-            successActionCommitment: ethers_1.ZeroHash //For now enforce no success action
+            successActionCommitment: this.successActionCommitment
         };
     }
+    hasSuccessAction() {
+        return this.successActionCommitment !== ethers_1.ZeroHash;
+    }
     static deserializeFromStruct(struct, claimHandlerImpl) {
         const { payOut, payIn, reputation, sequence } = EVMSwapData.toFlags(BigInt(struct.flags));
-        // if(struct.successActionCommitment !== ZeroHash) throw new Error("Success action not allowed!");
-        return new EVMSwapData(struct.offerer, struct.claimer, struct.token, struct.refundHandler, struct.claimHandler, payOut, payIn, reputation, sequence, (0, ethers_1.hexlify)(struct.claimData), (0, ethers_1.hexlify)(struct.refundData), BigInt(struct.amount), struct.depositToken, BigInt(struct.securityDeposit), BigInt(struct.claimerBounty), claimHandlerImpl.getType(), null);
+        return new EVMSwapData(struct.offerer, struct.claimer, struct.token, struct.refundHandler, struct.claimHandler, payOut, payIn, reputation, sequence, (0, ethers_1.hexlify)(struct.claimData), (0, ethers_1.hexlify)(struct.refundData), BigInt(struct.amount), struct.depositToken, BigInt(struct.securityDeposit), BigInt(struct.claimerBounty), claimHandlerImpl.getType(), null, struct.successActionCommitment);
     }
 }
 exports.EVMSwapData = EVMSwapData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.33",
+  "version": "1.0.0-dev.35",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.7",
+    "@atomiqlabs/base": "^10.0.0-dev.8",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "1.6.0",
     "buffer": "6.0.3"

package/src/evm/swaps/EVMSwapData.ts

@@ -50,6 +50,8 @@ export class EVMSwapData extends SwapData {
 
     extraData: string;
 
+    successActionCommitment: string;
+
     kind: ChainSwapType;
 
     constructor(
@@ -69,7 +71,8 @@ export class EVMSwapData extends SwapData {
         securityDeposit: bigint,
         claimerBounty: bigint,
         kind: ChainSwapType,
-        extraData: string
+        extraData: string,
+        successActionCommitment?: string
     );
 
     constructor(data: any);
@@ -91,7 +94,8 @@ export class EVMSwapData extends SwapData {
         securityDeposit?: bigint,
         claimerBounty?: bigint,
         kind?: ChainSwapType,
-        extraData?: string
+        extraData?: string,
+        successActionCommitment?: string
     ) {
         super();
         if(claimer!=null || token!=null || refundHandler!=null || claimHandler!=null ||
@@ -114,6 +118,7 @@ export class EVMSwapData extends SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
+            this.successActionCommitment = successActionCommitment ?? ZeroHash;
         } else {
             this.offerer = offererOrData.offerer;
             this.claimer = offererOrData.claimer;
@@ -132,6 +137,7 @@ export class EVMSwapData extends SwapData {
             this.claimerBounty = offererOrData.claimerBounty==null ? null : BigInt(offererOrData.claimerBounty);
             this.kind = offererOrData.kind;
             this.extraData = offererOrData.extraData;
+            this.successActionCommitment = offererOrData.successActionCommitment ?? ZeroHash;
         }
     }
 
@@ -174,7 +180,8 @@ export class EVMSwapData 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
+            extraData: this.extraData,
+            successActionCommitment: this.successActionCommitment
         }
     }
 
@@ -212,7 +219,7 @@ export class EVMSwapData extends SwapData {
             [
                 this.offerer, this.claimer, this.amount, this.token, this.getFlags(),
                 this.claimHandler, this.claimData, this.refundHandler, this.refundData,
-                this.securityDeposit, this.claimerBounty, this.depositToken, ZeroHash
+                this.securityDeposit, this.claimerBounty, this.depositToken, this.successActionCommitment
             ]
         )
         let escrowHash = keccak256(encoded);
@@ -310,12 +317,13 @@ export class EVMSwapData extends SwapData {
             other.payIn===this.payIn &&
             other.payOut===this.payOut &&
             other.reputation===this.reputation &&
-            this.sequence === other.sequence &&
+            other.sequence === this.sequence &&
             other.claimData.toLowerCase()===this.claimData.toLowerCase() &&
             other.refundData.toLowerCase()===this.refundData.toLowerCase() &&
             other.amount === this.amount &&
             other.securityDeposit === this.securityDeposit &&
-            other.claimerBounty === this.claimerBounty
+            other.claimerBounty === this.claimerBounty &&
+            other.successActionCommitment.toLowerCase() === this.successActionCommitment.toLowerCase()
     }
 
     toEscrowStruct(): EscrowDataStruct {
@@ -332,15 +340,17 @@ export class EVMSwapData extends SwapData {
             depositToken: this.depositToken,
             securityDeposit: this.securityDeposit,
             claimerBounty: this.claimerBounty,
-            successActionCommitment: ZeroHash //For now enforce no success action
+            successActionCommitment: this.successActionCommitment
         }
     }
 
+    hasSuccessAction(): boolean {
+        return this.successActionCommitment !== ZeroHash;
+    }
+
     static deserializeFromStruct(struct: EscrowDataStruct, claimHandlerImpl: IClaimHandler<any, any>): EVMSwapData {
         const {payOut, payIn, reputation, sequence} = EVMSwapData.toFlags(BigInt(struct.flags));
 
-        // if(struct.successActionCommitment !== ZeroHash) throw new Error("Success action not allowed!");
-
         return new EVMSwapData(
             struct.offerer as string,
             struct.claimer as string,
@@ -358,7 +368,8 @@ export class EVMSwapData extends SwapData {
             BigInt(struct.securityDeposit),
             BigInt(struct.claimerBounty),
             claimHandlerImpl.getType(),
-            null
+            null,
+            struct.successActionCommitment as string
         );
     }