@atomiqlabs/chain-starknet 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/starknet/swaps/StarknetSwapContract.js

@@ -75,7 +75,7 @@ class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
         handlerAddresses.claim = { ...defaultClaimAddresses[chainInterface.starknetChainId], ...handlerAddresses.claim };
         ClaimHandlers_1.claimHandlersList.forEach(handlerCtor => {
             const handler = new handlerCtor(handlerAddresses.claim[handlerCtor.type]);
-            this.claimHandlersByAddress[handler.address] = handler;
+            this.claimHandlersByAddress[(0, Utils_1.toHex)(handler.address)] = handler;
             this.claimHandlersBySwapType[handlerCtor.type] = handler;
         });
         this.timelockRefundHandler = new TimelockRefundHandler_1.TimelockRefundHandler(handlerAddresses.refund.timelock);

package/dist/starknet/swaps/StarknetSwapData.js

@@ -277,7 +277,6 @@ class StarknetSwapData extends base_1.SwapData {
         const claimerBounty = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });
         const hasSuccessAction = (0, Utils_1.toBigInt)(span.shift()) === 0n;
         if (hasSuccessAction) {
-            const executionContract = (0, Utils_1.toHex)(span.shift());
             const executionHash = (0, Utils_1.toHex)(span.shift());
             const executionExpiry = (0, Utils_1.toBigInt)(span.shift());
             const executionFee = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });

package/dist/starknet/swaps/modules/StarknetSwapClaim.js

@@ -36,7 +36,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
         if (checkExpiry && await this.contract.isExpired(swapData.claimer.toString(), swapData)) {
             throw new base_1.SwapDataVerificationError("Not enough time to reliably pay the invoice");
         }
-        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
         if (claimHandler == null)
             throw new base_1.SwapDataVerificationError("Unknown claim handler!");
         if (claimHandler.getType() !== base_1.ChainSwapType.HTLC)
@@ -61,7 +61,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
      * @param feeRate fee rate to be used for the transactions
      */
     async txsClaimWithTxData(signer, swapData, tx, requiredConfirmations, vout, commitedHeader, synchronizer, feeRate) {
-        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
         if (claimHandler == null)
             throw new base_1.SwapDataVerificationError("Unknown claim handler!");
         if (claimHandler.getType() !== base_1.ChainSwapType.CHAIN_NONCED &&
@@ -87,7 +87,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
     async getClaimFee(swapData, feeRate) {
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
         let gasRequired = swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM;
-        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
         if (claimHandler != null)
             gasRequired = (0, StarknetFees_1.starknetGasAdd)(gasRequired, claimHandler.getGas(swapData));
         return StarknetFees_1.StarknetFees.getGasFee(gasRequired, feeRate);

package/dist/utils/Utils.js

@@ -79,7 +79,7 @@ function toHex(value, length = 64) {
     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");

package/package.json

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

package/src/starknet/swaps/StarknetSwapContract.ts

@@ -131,7 +131,7 @@ export class StarknetSwapContract
 
         claimHandlersList.forEach(handlerCtor => {
             const handler = new handlerCtor(handlerAddresses.claim[handlerCtor.type]);
-            this.claimHandlersByAddress[handler.address] = handler;
+            this.claimHandlersByAddress[toHex(handler.address)] = handler;
             this.claimHandlersBySwapType[handlerCtor.type] = handler;
         });
 

package/src/starknet/swaps/StarknetSwapData.ts

@@ -370,7 +370,6 @@ export class StarknetSwapData extends SwapData {
         const claimerBounty = toBigInt({low: span.shift(), high: span.shift()});
         const hasSuccessAction = toBigInt(span.shift()) === 0n;
         if(hasSuccessAction) {
-            const executionContract = toHex(span.shift());
             const executionHash = toHex(span.shift());
             const executionExpiry = toBigInt(span.shift());
             const executionFee = toBigInt({low: span.shift(), high: span.shift()});

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

@@ -64,7 +64,7 @@ export class StarknetSwapClaim extends StarknetSwapModule {
             throw new SwapDataVerificationError("Not enough time to reliably pay the invoice");
         }
 
-        const claimHandler: IClaimHandler<Buffer, string> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler: IClaimHandler<Buffer, string> = this.contract.claimHandlersByAddress[toHex(swapData.claimHandler)];
         if(claimHandler==null) throw new SwapDataVerificationError("Unknown claim handler!");
         if(claimHandler.getType()!==ChainSwapType.HTLC) throw new SwapDataVerificationError("Invalid claim handler!");
 
@@ -101,7 +101,7 @@ export class StarknetSwapClaim extends StarknetSwapModule {
         synchronizer?: RelaySynchronizer<StarknetBtcStoredHeader, StarknetTx, any>,
         feeRate?: string
     ): Promise<StarknetTx[] | null> {
-        const claimHandler: IClaimHandler<any, BitcoinOutputWitnessData | BitcoinWitnessData> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler: IClaimHandler<any, BitcoinOutputWitnessData | BitcoinWitnessData> = this.contract.claimHandlersByAddress[toHex(swapData.claimHandler)];
         if(claimHandler==null) throw new SwapDataVerificationError("Unknown claim handler!");
         if(
             claimHandler.getType()!==ChainSwapType.CHAIN_NONCED &&
@@ -133,7 +133,7 @@ export class StarknetSwapClaim extends StarknetSwapModule {
 
         let gasRequired = swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM;
 
-        const claimHandler: IClaimHandler<any, any> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler: IClaimHandler<any, any> = this.contract.claimHandlersByAddress[toHex(swapData.claimHandler)];
         if(claimHandler!=null) gasRequired = starknetGasAdd(gasRequired, claimHandler.getGas(swapData));
 
         return StarknetFees.getGasFee(gasRequired, feeRate);

package/src/utils/Utils.ts

@@ -83,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");
             }