@atomiqlabs/chain-evm 2.2.0 → 2.3.0

package/dist/evm/chain/modules/EVMTransactions.js

@@ -335,7 +335,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
         const tx = ethers_1.Transaction.from({
             ...unsignedTx,
             to: unsignedTx.to == null ? null : await (0, ethers_1.resolveAddress)(unsignedTx.to),
-            from: unsignedTx.from == null ? null : await (0, ethers_1.resolveAddress)(unsignedTx.from),
+            from: null,
             authorizationList: unsignedTx.authorizationList == null ? null : unsignedTx.authorizationList.map(val => ({
                 ...val,
                 nonce: BigInt(val.nonce),
@@ -343,7 +343,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
                 signature: ethers_1.Signature.from(val.signature)
             }))
         });
-        return this.serializeSignedTx(tx);
+        return tx.unsignedSerialized;
     }
     /**
      * Serializes the signed EVM transaction

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

@@ -178,4 +178,8 @@ export declare class EVMSwapData extends SwapData {
      * @param claimHandlerImpl Claim handler implementation used to resolve swap type
      */
     static deserializeFromStruct(struct: EscrowDataStruct, claimHandlerImpl: IClaimHandler<any, any>): EVMSwapData;
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct(): any;
 }

package/dist/evm/swaps/EVMSwapData.js

@@ -4,6 +4,7 @@ exports.EVMSwapData = void 0;
 const base_1 = require("@atomiqlabs/base");
 const ethers_1 = require("ethers");
 const TimelockRefundHandler_1 = require("./handlers/refund/TimelockRefundHandler");
+const Utils_1 = require("../../utils/Utils");
 const FLAG_PAY_OUT = 0x01n;
 const FLAG_PAY_IN = 0x02n;
 const FLAG_REPUTATION = 0x04n;
@@ -413,6 +414,12 @@ class EVMSwapData extends base_1.SwapData {
         const { payOut, payIn, reputation, sequence } = EVMSwapData.toFlags(BigInt(struct.flags));
         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(), undefined, struct.successActionCommitment);
     }
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct() {
+        return (0, Utils_1.replaceBigInts)(this.toEscrowStruct());
+    }
 }
 exports.EVMSwapData = EVMSwapData;
 base_1.SwapData.deserializers["evm"] = EVMSwapData;

package/dist/utils/Utils.d.ts

@@ -1,3 +1,6 @@
+export type ReplaceBigInt<T> = T extends bigint ? string : T extends (infer U)[] ? ReplaceBigInt<U>[] : T extends readonly (infer U)[] ? readonly ReplaceBigInt<U>[] : T extends object ? {
+    [K in keyof T]: ReplaceBigInt<T[K]>;
+} : T;
 /**
  * Logger interface used across EVM modules.
  *
@@ -67,3 +70,4 @@ export declare const allowedEthersErrorNumbers: Set<number>;
  * @category Internal/Utils
  */
 export declare const allowedEthersErrorMessages: Set<string>;
+export declare function replaceBigInts<T>(obj: T): ReplaceBigInt<T>;

package/dist/utils/Utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowedEthersErrorMessages = exports.allowedEthersErrorNumbers = exports.allowedEthersErrorCodes = exports.bigIntMax = exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
+exports.replaceBigInts = exports.allowedEthersErrorMessages = exports.allowedEthersErrorNumbers = exports.allowedEthersErrorCodes = exports.bigIntMax = exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
 /**
  * Returns a promise that resolves after `timeoutMillis` unless aborted first.
  *
@@ -142,3 +142,21 @@ exports.allowedEthersErrorNumbers = new Set([
 exports.allowedEthersErrorMessages = new Set([
     "already known"
 ]);
+function replaceBigInts(obj) {
+    const replace = (value) => {
+        if (typeof (value) === "bigint")
+            return "0x" + value.toString(16);
+        if (value == null || typeof (value) !== "object")
+            return value;
+        if (Array.isArray(value)) {
+            return value.map(replace);
+        }
+        const mapped = {};
+        for (const key of Object.keys(value)) {
+            mapped[key] = replace(value[key]);
+        }
+        return mapped;
+    };
+    return replace(obj);
+}
+exports.replaceBigInts = replaceBigInts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -27,7 +27,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^13.2.0",
+    "@atomiqlabs/base": "^13.3.0",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.6.0",
     "buffer": "6.0.3",

package/src/evm/chain/modules/EVMTransactions.ts

@@ -399,7 +399,7 @@ export class EVMTransactions extends EVMModule<any> {
         const tx = Transaction.from({
             ...unsignedTx,
             to: unsignedTx.to==null ? null : await resolveAddress(unsignedTx.to),
-            from: unsignedTx.from==null ? null : await resolveAddress(unsignedTx.from),
+            from: null, // Unsigned transaction cannot have its `from` field populated
             authorizationList: unsignedTx.authorizationList==null ? null : unsignedTx.authorizationList.map(val => ({
                 ...val,
                 nonce: BigInt(val.nonce),
@@ -407,7 +407,7 @@ export class EVMTransactions extends EVMModule<any> {
                 signature: Signature.from(val.signature)
             }))
         });
-        return this.serializeSignedTx(tx);
+        return tx.unsignedSerialized;
     }
 
     /**

package/src/evm/swaps/EVMSwapData.ts

@@ -3,6 +3,7 @@ import {AbiCoder, hexlify, keccak256, ZeroHash} from "ethers";
 import {EscrowDataStruct, EscrowDataStructOutput} from "./EscrowManagerTypechain";
 import {IClaimHandler} from "./handlers/claim/ClaimHandlers";
 import {TimelockRefundHandler} from "./handlers/refund/TimelockRefundHandler";
+import {replaceBigInts} from "../../utils/Utils";
 
 const FLAG_PAY_OUT: bigint = 0x01n;
 const FLAG_PAY_IN: bigint = 0x02n;
@@ -513,6 +514,13 @@ export class EVMSwapData extends SwapData {
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct(): any {
+        return replaceBigInts(this.toEscrowStruct());
+    }
+
 }
 
 SwapData.deserializers["evm"] = EVMSwapData;

package/src/utils/Utils.ts

@@ -1,4 +1,16 @@
 
+
+export type ReplaceBigInt<T> =
+    T extends bigint
+        ? string
+        : T extends (infer U)[]
+            ? ReplaceBigInt<U>[]
+            : T extends readonly (infer U)[]
+                ? readonly ReplaceBigInt<U>[]
+                : T extends object
+                    ? { [K in keyof T]: ReplaceBigInt<T[K]> }
+                    : T;
+
 /**
  * Logger interface used across EVM modules.
  *
@@ -159,3 +171,23 @@ export const allowedEthersErrorNumbers: Set<number> = new Set([
 export const allowedEthersErrorMessages: Set<string> = new Set([
     "already known"
 ]);
+
+export function replaceBigInts<T>(obj: T): ReplaceBigInt<T> {
+    const replace = (value: any): any => {
+        if(typeof(value)==="bigint") return "0x"+value.toString(16);
+        if(value==null || typeof(value)!=="object") return value;
+
+        if(Array.isArray(value)) {
+            return value.map(replace);
+        }
+
+        const mapped: any = {};
+        for(const key of Object.keys(value)) {
+            mapped[key] = replace(value[key]);
+        }
+        return mapped;
+    };
+
+    return replace(obj);
+}
+