@atomiqlabs/chain-starknet 1.0.8 → 2.0.0-beta.0

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StarknetLpVault = void 0;
 const Utils_1 = require("../../../utils/Utils");
 const StarknetSwapModule_1 = require("../StarknetSwapModule");
-const StarknetAction_1 = require("../../base/StarknetAction");
+const StarknetAction_1 = require("../../chain/StarknetAction");
 const starknet_1 = require("starknet");
 class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
     /**
@@ -16,7 +16,7 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Withdraw(signer, token, amount) {
-        return new StarknetAction_1.StarknetAction(signer, this.root, this.contract.populateTransaction.withdraw(token, starknet_1.cairo.uint256(amount), signer), StarknetLpVault.GasCosts.WITHDRAW);
+        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.withdraw(token, starknet_1.cairo.uint256(amount), signer), StarknetLpVault.GasCosts.WITHDRAW);
     }
     /**
      * Action for depositing funds to the LP vault
@@ -28,7 +28,7 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Deposit(signer, token, amount) {
-        return new StarknetAction_1.StarknetAction(signer, this.root, this.contract.populateTransaction.deposit(token, starknet_1.cairo.uint256(amount)), StarknetLpVault.GasCosts.WITHDRAW);
+        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.deposit(token, starknet_1.cairo.uint256(amount)), StarknetLpVault.GasCosts.WITHDRAW);
     }
     /**
      * Returns intermediary's reputation & vault balance for a specific token
@@ -50,14 +50,14 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
      * @param token
      */
     async getIntermediaryReputation(address, token) {
-        const filter = Object.keys(this.root.claimHandlersByAddress).map(claimHandler => starknet_1.cairo.tuple(address, token, claimHandler));
-        const rawReputation = await this.provider.callContract(this.contract.populateTransaction.get_reputation(filter));
+        const filter = Object.keys(this.contract.claimHandlersByAddress).map(claimHandler => starknet_1.cairo.tuple(address, token, claimHandler));
+        const rawReputation = await this.provider.callContract(this.swapContract.populateTransaction.get_reputation(filter));
         const length = (0, Utils_1.toBigInt)(rawReputation.shift());
         if (Number(length) !== filter.length)
             throw new Error("getIntermediaryReputation(): Invalid response length");
         const result = {};
-        Object.keys(this.root.claimHandlersByAddress).forEach((address) => {
-            const handler = this.root.claimHandlersByAddress[address];
+        Object.keys(this.contract.claimHandlersByAddress).forEach((address) => {
+            const handler = this.contract.claimHandlersByAddress[address];
             result[handler.getType()] = {
                 successVolume: (0, Utils_1.toBigInt)({ low: rawReputation.shift(), high: rawReputation.shift() }),
                 successCount: (0, Utils_1.toBigInt)(rawReputation.shift()),
@@ -76,7 +76,7 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
      * @param token
      */
     async getIntermediaryBalance(address, token) {
-        const balance = (0, Utils_1.toBigInt)((await this.contract.get_balance([starknet_1.cairo.tuple(address, token)]))[0]);
+        const balance = (0, Utils_1.toBigInt)((await this.swapContract.get_balance([starknet_1.cairo.tuple(address, token)]))[0]);
         this.logger.debug("getIntermediaryBalance(): token LP balance fetched, token: " + token.toString() +
             " address: " + address + " amount: " + (balance == null ? "null" : balance.toString()));
         return balance;
@@ -107,7 +107,7 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
      */
     async txsDeposit(signer, token, amount, feeRate) {
         //Approve first
-        const action = await this.root.Tokens.Approve(signer, this.contract.address, token, amount);
+        const action = await this.root.Tokens.Approve(signer, this.swapContract.address, token, amount);
         action.add(this.Deposit(signer, token, amount));
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
         this.logger.debug("txsDeposit(): deposit TX created, token: " + token.toString() +

package/dist/starknet/swaps/modules/StarknetSwapClaim.d.ts

@@ -1,7 +1,7 @@
 import { RelaySynchronizer } from "@atomiqlabs/base";
 import { StarknetSwapModule } from "../StarknetSwapModule";
 import { StarknetSwapData } from "../StarknetSwapData";
-import { StarknetTx } from "../../base/modules/StarknetTransactions";
+import { StarknetTx } from "../../chain/modules/StarknetTransactions";
 import { StarknetBtcStoredHeader } from "../../btcrelay/headers/StarknetBtcStoredHeader";
 export declare class StarknetSwapClaim extends StarknetSwapModule {
     private static readonly GasCosts;

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

@@ -4,8 +4,8 @@ exports.StarknetSwapClaim = void 0;
 const base_1 = require("@atomiqlabs/base");
 const Utils_1 = require("../../../utils/Utils");
 const StarknetSwapModule_1 = require("../StarknetSwapModule");
-const StarknetAction_1 = require("../../base/StarknetAction");
-const StarknetFees_1 = require("../../base/modules/StarknetFees");
+const StarknetAction_1 = require("../../chain/StarknetAction");
+const StarknetFees_1 = require("../../chain/modules/StarknetFees");
 class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
     /**
      * Claim action which uses the provided witness for claiming the swap
@@ -18,7 +18,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Claim(signer, swapData, witness, claimHandlerGas) {
-        return new StarknetAction_1.StarknetAction(signer, this.root, this.contract.populateTransaction.claim(swapData.toEscrowStruct(), witness), (0, StarknetAction_1.sumStarknetGas)(swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM, claimHandlerGas));
+        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.claim(swapData.toEscrowStruct(), witness), (0, StarknetAction_1.sumStarknetGas)(swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM, claimHandlerGas));
     }
     /**
      * Creates transactions claiming the swap using a secret (for HTLC swaps)
@@ -33,10 +33,10 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
     async txsClaimWithSecret(signer, swapData, secret, checkExpiry, feeRate) {
         //We need to be sure that this transaction confirms in time, otherwise we reveal the secret to the counterparty
         // and won't claim the funds
-        if (checkExpiry && await this.root.isExpired(swapData.claimer.toString(), swapData)) {
+        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.root.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         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.root.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         if (claimHandler == null)
             throw new base_1.SwapDataVerificationError("Unknown claim handler!");
         if (claimHandler.getType() !== base_1.ChainSwapType.CHAIN_NONCED &&
@@ -74,7 +74,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
             vout,
             requiredConfirmations,
             commitedHeader,
-            btcRelay: this.root.btcRelay,
+            btcRelay: this.contract.btcRelay,
             synchronizer,
         }, feeRate);
         const action = this.Claim(signer, swapData, witness, claimHandler.getGas(swapData));
@@ -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.root.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         if (claimHandler != null)
             gasRequired = (0, StarknetAction_1.sumStarknetGas)(gasRequired, claimHandler.getGas(swapData));
         return StarknetFees_1.StarknetFees.getGasFee(gasRequired.l1, feeRate);

package/dist/starknet/swaps/modules/StarknetSwapInit.d.ts

@@ -1,7 +1,7 @@
 import { StarknetSwapData } from "../StarknetSwapData";
 import { StarknetSwapModule } from "../StarknetSwapModule";
 import { StarknetSigner } from "../../wallet/StarknetSigner";
-import { StarknetTx } from "../../base/modules/StarknetTransactions";
+import { StarknetTx } from "../../chain/modules/StarknetTransactions";
 export type StarknetPreFetchVerification = {
     pendingBlockTime?: number;
 };

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

@@ -4,9 +4,9 @@ exports.StarknetSwapInit = void 0;
 const base_1 = require("@atomiqlabs/base");
 const Utils_1 = require("../../../utils/Utils");
 const buffer_1 = require("buffer");
-const StarknetAction_1 = require("../../base/StarknetAction");
+const StarknetAction_1 = require("../../chain/StarknetAction");
 const StarknetSwapModule_1 = require("../StarknetSwapModule");
-const StarknetFees_1 = require("../../base/modules/StarknetFees");
+const StarknetFees_1 = require("../../chain/modules/StarknetFees");
 const Initialize = [
     { name: 'Swap hash', type: 'felt' },
     { name: 'Timeout', type: 'timestamp' }
@@ -21,7 +21,7 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Init(swapData, timeout, signature) {
-        return new StarknetAction_1.StarknetAction(swapData.payIn ? swapData.offerer : swapData.claimer, this.root, this.contract.populateTransaction.initialize(swapData.toEscrowStruct(), signature, timeout, swapData.extraData == null || swapData.extraData === "" ? [] : (0, Utils_1.bufferToBytes31Span)(buffer_1.Buffer.from(swapData.extraData, "hex")).map(Utils_1.toHex)), swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN : StarknetSwapInit.GasCosts.INIT);
+        return new StarknetAction_1.StarknetAction(swapData.payIn ? swapData.offerer : swapData.claimer, this.root, this.swapContract.populateTransaction.initialize(swapData.toEscrowStruct(), signature, timeout, swapData.extraData == null || swapData.extraData === "" ? [] : (0, Utils_1.bufferToBytes31Span)(buffer_1.Buffer.from(swapData.extraData, "hex")).map(Utils_1.toHex)), swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN : StarknetSwapInit.GasCosts.INIT);
     }
     /**
      * Returns auth prefix to be used with a specific swap, payIn=true & payIn=false use different prefixes (these
@@ -72,14 +72,14 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
     async isSignatureValid(swapData, timeout, prefix, signature, preFetchData) {
         const sender = swapData.isPayIn() ? swapData.offerer : swapData.claimer;
         const signer = swapData.isPayIn() ? swapData.claimer : swapData.offerer;
-        if (!swapData.isPayIn() && await this.root.isExpired(sender.toString(), swapData)) {
+        if (!swapData.isPayIn() && await this.contract.isExpired(sender.toString(), swapData)) {
             throw new base_1.SignatureVerificationError("Swap will expire too soon!");
         }
         if (prefix !== this.getAuthPrefix(swapData))
             throw new base_1.SignatureVerificationError("Invalid prefix");
         const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
         const timeoutBN = BigInt(timeout);
-        const isExpired = (timeoutBN - currentTimestamp) < BigInt(this.root.authGracePeriod);
+        const isExpired = (timeoutBN - currentTimestamp) < BigInt(this.contract.authGracePeriod);
         if (isExpired)
             throw new base_1.SignatureVerificationError("Authorization expired!");
         if (await this.isSignatureExpired(timeout, preFetchData))
@@ -100,7 +100,7 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
      */
     async getSignatureExpiry(timeout) {
         const now = Date.now();
-        const timeoutExpiryTime = (parseInt(timeout) - this.root.authGracePeriod) * 1000;
+        const timeoutExpiryTime = (parseInt(timeout) - this.contract.authGracePeriod) * 1000;
         if (timeoutExpiryTime < now)
             return 0;
         return timeoutExpiryTime;
@@ -133,7 +133,7 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
         if (!skipChecks) {
             const [_, payStatus] = await Promise.all([
                 (0, Utils_1.tryWithRetries)(() => this.isSignatureValid(swapData, timeout, prefix, signature), this.retryPolicy, (e) => e instanceof base_1.SignatureVerificationError),
-                (0, Utils_1.tryWithRetries)(() => this.root.getCommitStatus(sender, swapData), this.retryPolicy)
+                (0, Utils_1.tryWithRetries)(() => this.contract.getCommitStatus(sender, swapData), this.retryPolicy)
             ]);
             if (payStatus !== base_1.SwapCommitStatus.NOT_COMMITED)
                 throw new base_1.SwapDataVerificationError("Invoice already being paid for or paid");
@@ -141,9 +141,9 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
         const initAction = this.Init(swapData, BigInt(timeout), JSON.parse(signature));
         if (swapData.payIn)
-            initAction.addAction(this.root.Tokens.Approve(sender, this.contract.address, swapData.token, swapData.amount), 0); //Add erc20 approve
+            initAction.addAction(this.root.Tokens.Approve(sender, this.swapContract.address, swapData.token, swapData.amount), 0); //Add erc20 approve
         if (swapData.getTotalDeposit() !== 0n)
-            initAction.addAction(this.root.Tokens.Approve(sender, this.contract.address, swapData.feeToken, swapData.getTotalDeposit()), 0); //Add deposit erc20 approve
+            initAction.addAction(this.root.Tokens.Approve(sender, this.swapContract.address, swapData.feeToken, swapData.getTotalDeposit()), 0); //Add deposit erc20 approve
         this.logger.debug("txsInitPayIn(): create swap init TX, swap: " + swapData.getClaimHash() +
             " feerate: " + feeRate);
         return [await initAction.tx(feeRate)];

package/dist/starknet/swaps/modules/StarknetSwapRefund.d.ts

@@ -1,7 +1,6 @@
 import { StarknetSwapModule } from "../StarknetSwapModule";
 import { StarknetSwapData } from "../StarknetSwapData";
-import { StarknetSwapContract } from "../StarknetSwapContract";
-import { StarknetTx } from "../../base/modules/StarknetTransactions";
+import { StarknetTx } from "../../chain/modules/StarknetTransactions";
 import { StarknetSigner } from "../../wallet/StarknetSigner";
 export declare class StarknetSwapRefund extends StarknetSwapModule {
     private static readonly GasCosts;
@@ -27,7 +26,6 @@ export declare class StarknetSwapRefund extends StarknetSwapModule {
      * @private
      */
     private RefundWithSignature;
-    constructor(root: StarknetSwapContract);
     signSwapRefund(signer: StarknetSigner, swapData: StarknetSwapData, authorizationTimeout: number): Promise<{
         prefix: string;
         timeout: string;

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

@@ -4,8 +4,8 @@ exports.StarknetSwapRefund = void 0;
 const base_1 = require("@atomiqlabs/base");
 const Utils_1 = require("../../../utils/Utils");
 const StarknetSwapModule_1 = require("../StarknetSwapModule");
-const StarknetAction_1 = require("../../base/StarknetAction");
-const StarknetFees_1 = require("../../base/modules/StarknetFees");
+const StarknetAction_1 = require("../../chain/StarknetAction");
+const StarknetFees_1 = require("../../chain/modules/StarknetFees");
 const Refund = [
     { name: 'Swap hash', type: 'felt' },
     { name: 'Timeout', type: 'timestamp' }
@@ -22,7 +22,7 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Refund(signer, swapData, witness, handlerGas) {
-        return new StarknetAction_1.StarknetAction(signer, this.root, this.contract.populateTransaction.refund(swapData.toEscrowStruct(), witness), (0, StarknetAction_1.sumStarknetGas)(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas));
+        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.refund(swapData.toEscrowStruct(), witness), (0, StarknetAction_1.sumStarknetGas)(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas));
     }
     /**
      * Action for cooperative refunding with signature
@@ -35,10 +35,7 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     RefundWithSignature(sender, swapData, timeout, signature) {
-        return new StarknetAction_1.StarknetAction(sender, this.root, this.contract.populateTransaction.cooperative_refund(swapData.toEscrowStruct(), signature, BigInt(timeout)), swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND);
-    }
-    constructor(root) {
-        super(root);
+        return new StarknetAction_1.StarknetAction(sender, this.root, this.swapContract.populateTransaction.cooperative_refund(swapData.toEscrowStruct(), signature, BigInt(timeout)), swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND);
     }
     async signSwapRefund(signer, swapData, authorizationTimeout) {
         const authPrefix = "refund";
@@ -58,7 +55,7 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
             throw new base_1.SignatureVerificationError("Invalid prefix");
         const expiryTimestamp = BigInt(timeout);
         const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
-        const isExpired = (expiryTimestamp - currentTimestamp) < BigInt(this.root.authGracePeriod);
+        const isExpired = (expiryTimestamp - currentTimestamp) < BigInt(this.contract.authGracePeriod);
         if (isExpired)
             throw new base_1.SignatureVerificationError("Authorization expired!");
         const valid = await this.root.Signatures.isValidSignature(signature, swapData.claimer, Refund, "Refund", {
@@ -80,10 +77,10 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
      * @param witnessData
      */
     async txsRefund(signer, swapData, check, feeRate, witnessData) {
-        const refundHandler = this.root.refundHandlersByAddress[swapData.refundHandler.toLowerCase()];
+        const refundHandler = this.contract.refundHandlersByAddress[swapData.refundHandler.toLowerCase()];
         if (refundHandler == null)
             throw new Error("Invalid refund handler");
-        if (check && !await (0, Utils_1.tryWithRetries)(() => this.root.isRequestRefundable(swapData.offerer.toString(), swapData), this.retryPolicy)) {
+        if (check && !await (0, Utils_1.tryWithRetries)(() => this.contract.isRequestRefundable(swapData.offerer.toString(), swapData), this.retryPolicy)) {
             throw new base_1.SwapDataVerificationError("Not refundable yet!");
         }
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
@@ -105,7 +102,7 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
      * @param feeRate fee rate to be used for the transactions
      */
     async txsRefundWithAuthorization(signer, swapData, timeout, prefix, signature, check, feeRate) {
-        if (check && !await (0, Utils_1.tryWithRetries)(() => this.root.isCommited(swapData), this.retryPolicy)) {
+        if (check && !await (0, Utils_1.tryWithRetries)(() => this.contract.isCommited(swapData), this.retryPolicy)) {
             throw new base_1.SwapDataVerificationError("Not correctly committed");
         }
         await (0, Utils_1.tryWithRetries)(() => this.isSignatureValid(swapData, timeout, prefix, signature), this.retryPolicy, (e) => e instanceof base_1.SignatureVerificationError);

package/dist/starknet/wallet/StarknetSigner.js

@@ -19,7 +19,7 @@ class StarknetSigner {
     //TODO: Introduce proper nonce management!
     async getNonce() {
         try {
-            return BigInt(await this.account.getNonceForAddress(this.getAddress()));
+            return BigInt(await this.account.getNonceForAddress(this.getAddress(), "pending"));
         }
         catch (e) {
             if (e.message != null && e.message.includes("20: Contract not found")) {

package/dist/utils/Utils.d.ts

@@ -1,5 +1,5 @@
 import { BigNumberish, Uint256 } from "starknet";
-import { StarknetTx } from "../starknet/base/modules/StarknetTransactions";
+import { StarknetTx } from "../starknet/chain/modules/StarknetTransactions";
 import { Buffer } from "buffer";
 import { StarknetSwapData } from "../starknet/swaps/StarknetSwapData";
 import { IClaimHandler } from "../starknet/swaps/handlers/claim/ClaimHandlers";
@@ -22,7 +22,7 @@ export declare function calculateHash(tx: StarknetTx): string;
 export declare function u32ArrayToBuffer(arr: BigNumberish[]): Buffer;
 export declare function bufferToU32Array(buffer: Buffer): number[];
 export declare function u32ReverseEndianness(value: number): number;
-export declare function bigNumberishToBuffer(value: BigNumberish | Uint256, length: number): Buffer;
+export declare function bigNumberishToBuffer(value: BigNumberish | Uint256, length?: number): Buffer;
 export declare function toBigInt(value: BigNumberish | Uint256): bigint;
 export declare function bytes31SpanToBuffer(span: BigNumberish[], length: number): Buffer;
 export declare function bufferToBytes31Span(buffer: Buffer, startIndex?: number, endIndex?: number): BigNumberish[];

package/dist/utils/Utils.js

@@ -162,7 +162,9 @@ function bigNumberishToBuffer(value, length) {
     else {
         value = value.toString(16);
     }
-    const buff = buffer_1.Buffer.from(value.padStart(length * 2, "0"), "hex");
+    if (length != null)
+        value = value.padStart(length * 2, "0");
+    const buff = buffer_1.Buffer.from(value, "hex");
     if (buff.length > length)
         return buff.slice(buff.length - length);
     return buff;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "1.0.8",
+  "version": "2.0.0-beta.0",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^8.0.0",
+    "@atomiqlabs/base": "^9.0.0-beta.0",
     "@noble/hashes": "^1.7.1",
     "@scure/btc-signer": "1.6.0",
     "abi-wan-kanabi": "2.2.4",

package/src/index.ts

@@ -1,13 +1,13 @@
-export * from "./starknet/base/StarknetAction";
-export * from "./starknet/base/StarknetBase";
-export * from "./starknet/base/StarknetModule";
+export * from "./starknet/chain/StarknetAction";
+export * from "./starknet/chain/StarknetChainInterface";
+export * from "./starknet/chain/StarknetModule";
 
-export * from "./starknet/base/modules/StarknetFees";
-export * from "./starknet/base/modules/StarknetEvents";
-export * from "./starknet/base/modules/StarknetTokens";
-export * from "./starknet/base/modules/StarknetAddresses";
-export * from "./starknet/base/modules/StarknetTransactions";
-export * from "./starknet/base/modules/StarknetSignatures";
+export * from "./starknet/chain/modules/StarknetFees";
+export * from "./starknet/chain/modules/StarknetEvents";
+export * from "./starknet/chain/modules/StarknetTokens";
+export * from "./starknet/chain/modules/StarknetAddresses";
+export * from "./starknet/chain/modules/StarknetTransactions";
+export * from "./starknet/chain/modules/StarknetSignatures";
 
 export * from "./starknet/btcrelay/headers/StarknetBtcStoredHeader";
 export * from "./starknet/btcrelay/headers/StarknetBtcHeader";
@@ -39,3 +39,9 @@ export * from "./starknet/wallet/StarknetKeypairWallet";
 
 export * from "./starknet/StarknetChainType";
 export * from "./starknet/StarknetInitializer";
+
+export * from "./starknet/spv_swap/StarknetSpvVaultContract";
+export * from "./starknet/spv_swap/StarknetSpvVaultData";
+export * from "./starknet/spv_swap/StarknetSpvWithdrawalData";
+
+export * from "./starknet/provider/RpcProviderWithRetries";

package/src/starknet/StarknetChainType.ts

@@ -1,11 +1,15 @@
 import {ChainType} from "@atomiqlabs/base";
-import {StarknetTx} from "./base/modules/StarknetTransactions";
+import {StarknetTx} from "./chain/modules/StarknetTransactions";
 import {StarknetSigner} from "./wallet/StarknetSigner";
 import {StarknetSwapData} from "./swaps/StarknetSwapData";
 import {StarknetSwapContract} from "./swaps/StarknetSwapContract";
 import {StarknetChainEventsBrowser} from "./events/StarknetChainEventsBrowser";
 import {StarknetBtcRelay} from "./btcrelay/StarknetBtcRelay";
 import {StarknetPreFetchVerification} from "./swaps/modules/StarknetSwapInit";
+import {StarknetChainInterface} from "./chain/StarknetChainInterface";
+import {StarknetSpvVaultData} from "./spv_swap/StarknetSpvVaultData";
+import {StarknetSpvWithdrawalData} from "./spv_swap/StarknetSpvWithdrawalData";
+import {StarknetSpvVaultContract} from "./spv_swap/StarknetSpvVaultContract";
 
 export type StarknetChainType = ChainType<
     "STARKNET",
@@ -15,6 +19,10 @@ export type StarknetChainType = ChainType<
     StarknetSigner,
     StarknetSwapData,
     StarknetSwapContract,
+    StarknetChainInterface,
     StarknetChainEventsBrowser,
-    StarknetBtcRelay<any>
+    StarknetBtcRelay<any>,
+    StarknetSpvVaultData,
+    StarknetSpvWithdrawalData,
+    StarknetSpvVaultContract
 >;

package/src/starknet/StarknetInitializer.ts

@@ -1,12 +1,16 @@
 import {constants, Provider, RpcProvider} from "starknet";
-import {StarknetFees} from "./base/modules/StarknetFees";
-import {StarknetRetryPolicy} from "./base/StarknetBase";
+import {StarknetFees} from "./chain/modules/StarknetFees";
+import {StarknetChainInterface, StarknetRetryPolicy} from "./chain/StarknetChainInterface";
 import {StarknetBtcRelay} from "./btcrelay/StarknetBtcRelay";
 import {StarknetSwapContract} from "./swaps/StarknetSwapContract";
 import {StarknetChainEventsBrowser} from "./events/StarknetChainEventsBrowser";
 import {BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer} from "@atomiqlabs/base";
 import {StarknetChainType} from "./StarknetChainType";
 import {StarknetSwapData} from "./swaps/StarknetSwapData";
+import {StarknetSpvVaultContract} from "./spv_swap/StarknetSpvVaultContract";
+import {StarknetSpvVaultData} from "./spv_swap/StarknetSpvVaultData";
+import {StarknetSpvWithdrawalData} from "./spv_swap/StarknetSpvWithdrawalData";
+import {RpcProviderWithRetries} from "./provider/RpcProviderWithRetries";
 
 export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK" | "WBTC">;
 export const StarknetAssets: StarknetAssetsType = {
@@ -33,6 +37,7 @@ export type StarknetOptions = {
 
     swapContract?: string,
     btcRelayContract?: string,
+    spvVaultContract?: string,
 
     fees?: StarknetFees
 }
@@ -43,7 +48,7 @@ export function initializeStarknet(
     network: BitcoinNetwork
 ): ChainData<StarknetChainType> {
     const provider = typeof(options.rpcUrl)==="string" ?
-        new RpcProvider({nodeUrl: options.rpcUrl}) :
+        new RpcProviderWithRetries({nodeUrl: options.rpcUrl}) :
         options.rpcUrl;
 
     const Fees = options.fees ?? new StarknetFees(provider, "ETH");
@@ -51,21 +56,32 @@ export function initializeStarknet(
     const chainId = options.chainId ??
         (network===BitcoinNetwork.MAINNET ? constants.StarknetChainId.SN_MAIN : constants.StarknetChainId.SN_SEPOLIA);
 
+    const chainInterface = new StarknetChainInterface(chainId, provider, options.retryPolicy, Fees);
+
     const btcRelay = new StarknetBtcRelay(
-        chainId, provider, bitcoinRpc, options.btcRelayContract, options.retryPolicy, Fees
+        chainInterface, bitcoinRpc, options.btcRelayContract
     );
 
     const swapContract = new StarknetSwapContract(
-        chainId, provider, btcRelay, options.swapContract, options.retryPolicy, Fees
+        chainInterface, btcRelay, options.swapContract
     );
-    const chainEvents = new StarknetChainEventsBrowser(swapContract);
+
+    const spvVaultContract = new StarknetSpvVaultContract(
+        chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract
+    )
+
+    const chainEvents = new StarknetChainEventsBrowser(chainInterface, swapContract, spvVaultContract);
 
     return {
         chainId: "STARKNET",
         btcRelay,
+        chainInterface,
         swapContract,
         chainEvents,
-        swapDataConstructor: StarknetSwapData
+        swapDataConstructor: StarknetSwapData,
+        spvVaultContract,
+        spvVaultDataConstructor: StarknetSpvVaultData,
+        spvVaultWithdrawalDataConstructor: StarknetSpvWithdrawalData
     }
 };