@atomiqlabs/chain-starknet 2.0.0-beta.1 → 2.0.0-beta.10

package/dist/starknet/StarknetInitializer.js

@@ -33,11 +33,11 @@ function initializeStarknet(options, bitcoinRpc, network) {
     const provider = typeof (options.rpcUrl) === "string" ?
         new RpcProviderWithRetries_1.RpcProviderWithRetries({ nodeUrl: options.rpcUrl }) :
         options.rpcUrl;
-    const Fees = options.fees ?? new StarknetFees_1.StarknetFees(provider, "ETH");
+    const Fees = options.fees ?? new StarknetFees_1.StarknetFees(provider, "STRK");
     const chainId = options.chainId ??
         (network === base_1.BitcoinNetwork.MAINNET ? starknet_1.constants.StarknetChainId.SN_MAIN : starknet_1.constants.StarknetChainId.SN_SEPOLIA);
     const chainInterface = new StarknetChainInterface_1.StarknetChainInterface(chainId, provider, options.retryPolicy, Fees);
-    const btcRelay = new StarknetBtcRelay_1.StarknetBtcRelay(chainInterface, bitcoinRpc, options.btcRelayContract);
+    const btcRelay = new StarknetBtcRelay_1.StarknetBtcRelay(chainInterface, bitcoinRpc, network, options.btcRelayContract);
     const swapContract = new StarknetSwapContract_1.StarknetSwapContract(chainInterface, btcRelay, options.swapContract);
     const spvVaultContract = new StarknetSpvVaultContract_1.StarknetSpvVaultContract(chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract);
     const chainEvents = new StarknetChainEventsBrowser_1.StarknetChainEventsBrowser(chainInterface, swapContract, spvVaultContract);

package/dist/starknet/btcrelay/StarknetBtcRelay.d.ts

@@ -1,6 +1,6 @@
 import { Buffer } from "buffer";
 import { StarknetBtcHeader } from "./headers/StarknetBtcHeader";
-import { BitcoinRpc, BtcBlock, BtcRelay, RelaySynchronizer } from "@atomiqlabs/base";
+import { BitcoinNetwork, BitcoinRpc, BtcBlock, BtcRelay, RelaySynchronizer } from "@atomiqlabs/base";
 import { StarknetContractBase } from "../contract/StarknetContractBase";
 import { StarknetBtcStoredHeader } from "./headers/StarknetBtcStoredHeader";
 import { StarknetTx } from "../chain/modules/StarknetTransactions";
@@ -16,7 +16,7 @@ export declare class StarknetBtcRelay<B extends BtcBlock> extends StarknetContra
     readonly maxHeadersPerTx: number;
     readonly maxForkHeadersPerTx: number;
     readonly maxShortForkHeadersPerTx: number;
-    constructor(chainInterface: StarknetChainInterface, bitcoinRpc: BitcoinRpc<B>, contractAddress?: string);
+    constructor(chainInterface: StarknetChainInterface, bitcoinRpc: BitcoinRpc<B>, bitcoinNetwork: BitcoinNetwork, contractAddress?: string);
     /**
      * Computes subsequent commited headers as they will appear on the blockchain when transactions
      *  are submitted & confirmed

package/dist/starknet/btcrelay/StarknetBtcRelay.js

@@ -25,8 +25,9 @@ function serializeBlockHeader(e) {
 const GAS_PER_BLOCKHEADER = 850;
 const GAS_PER_BLOCKHEADER_FORK = 1000;
 const btcRelayAddreses = {
-    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x068601c79da2231d21e015ccfd59c243861156fa523a12c9f987ec28eb8dbc8c",
-    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x057b14a4231b82f1e525ff35a722d893ca3dd2bde0baa6cee97937c5be861dbc"
+    [base_1.BitcoinNetwork.TESTNET4]: "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe",
+    [base_1.BitcoinNetwork.TESTNET]: "0x068601c79da2231d21e015ccfd59c243861156fa523a12c9f987ec28eb8dbc8c",
+    [base_1.BitcoinNetwork.MAINNET]: "0x057b14a4231b82f1e525ff35a722d893ca3dd2bde0baa6cee97937c5be861dbc"
 };
 function serializeCalldata(headers, storedHeader, span) {
     span.push((0, Utils_1.toHex)(headers.length));
@@ -59,7 +60,7 @@ class StarknetBtcRelay extends StarknetContractBase_1.StarknetContractBase {
             calldata: serializeCalldata(forkHeaders, storedHeader, [(0, Utils_1.toHex)(forkId)])
         }, { l1: (GAS_PER_BLOCKHEADER * forkHeaders.length) + (GAS_PER_BLOCKHEADER_FORK * totalForkHeaders), l2: 0 });
     }
-    constructor(chainInterface, bitcoinRpc, contractAddress = btcRelayAddreses[chainInterface.starknetChainId]) {
+    constructor(chainInterface, bitcoinRpc, bitcoinNetwork, contractAddress = btcRelayAddreses[bitcoinNetwork]) {
         super(chainInterface, contractAddress, BtcRelayAbi_1.BtcRelayAbi);
         this.maxHeadersPerTx = 100;
         this.maxForkHeadersPerTx = 100;

package/dist/starknet/chain/modules/StarknetFees.js

@@ -4,10 +4,8 @@ exports.StarknetFees = void 0;
 const Utils_1 = require("../../../utils/Utils");
 const StarknetTokens_1 = require("./StarknetTokens");
 const MAX_FEE_AGE = 5000;
-const ERC20_ADDRESS_ETH = "";
-const ERC20_ADDRESS_STRK = "";
 class StarknetFees {
-    constructor(provider, gasToken = "ETH", maxFeeRate = gasToken === "ETH" ? 100000000000 /*100 GWei*/ : 1000000000000000 /*100 * 10000 GWei*/, feeMultiplier = 1.25, da) {
+    constructor(provider, gasToken = "STRK", maxFeeRate = gasToken === "ETH" ? 100000000000 /*100 GWei*/ : 1000000000000000 /*100 * 10000 GWei*/, feeMultiplier = 1.25, da) {
         this.logger = (0, Utils_1.getLogger)("StarknetFees: ");
         this.blockFeeCache = null;
         this.provider = provider;

package/dist/starknet/chain/modules/StarknetTransactions.js

@@ -85,7 +85,7 @@ class StarknetTransactions extends StarknetModule_1.StarknetModule {
     async sendSignedTransaction(tx, onBeforePublish, signer) {
         if (onBeforePublish != null)
             await onBeforePublish(tx.txId, await this.serializeTx(tx));
-        this.logger.debug("sendSignedTransaction(): sending transaction: ", tx);
+        this.logger.debug("sendSignedTransaction(): sending transaction: ", tx.txId);
         if (tx.signed == null) {
             let txHash;
             switch (tx.type) {

package/dist/starknet/events/StarknetChainEventsBrowser.js

@@ -202,14 +202,13 @@ class StarknetChainEventsBrowser {
     async checkEventsEcrowManager(lastTxHash, lastBlockNumber, currentBlock) {
         const currentBlockNumber = currentBlock.block_number;
         lastBlockNumber ?? (lastBlockNumber = currentBlockNumber);
-        const logStartHeight = currentBlockNumber > lastBlockNumber ? lastBlockNumber + 1 : lastBlockNumber;
-        this.logger.debug("checkEvents(EscrowManager): Requesting logs: " + logStartHeight + "...pending");
-        let events = await this.starknetSwapContract.Events.getContractBlockEvents(["escrow_manager::events::Initialize", "escrow_manager::events::Claim", "escrow_manager::events::Refund"], [], logStartHeight, null);
+        // this.logger.debug("checkEvents(EscrowManager): Requesting logs: "+logStartHeight+"...pending");
+        let events = await this.starknetSwapContract.Events.getContractBlockEvents(["escrow_manager::events::Initialize", "escrow_manager::events::Claim", "escrow_manager::events::Refund"], [], lastBlockNumber, null);
         if (lastTxHash != null) {
             const latestProcessedEventIndex = (0, Utils_1.findLastIndex)(events, val => val.txHash === lastTxHash);
             if (latestProcessedEventIndex !== -1) {
                 events.splice(0, latestProcessedEventIndex + 1);
-                this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: " + events.length);
+                // this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
             }
         }
         if (events.length > 0) {
@@ -221,14 +220,13 @@ class StarknetChainEventsBrowser {
     async checkEventsSpvVaults(lastTxHash, lastBlockNumber, currentBlock) {
         const currentBlockNumber = currentBlock.block_number;
         lastBlockNumber ?? (lastBlockNumber = currentBlockNumber);
-        const logStartHeight = currentBlockNumber > lastBlockNumber ? lastBlockNumber + 1 : lastBlockNumber;
-        this.logger.debug("checkEvents(SpvVaults): Requesting logs: " + logStartHeight + "...pending");
-        let events = await this.starknetSpvVaultContract.Events.getContractBlockEvents(["spv_swap_vault::events::Opened", "spv_swap_vault::events::Deposited", "spv_swap_vault::events::Closed", "spv_swap_vault::events::Fronted", "spv_swap_vault::events::Claimed"], [], logStartHeight, null);
+        // this.logger.debug("checkEvents(SpvVaults): Requesting logs: "+logStartHeight+"...pending");
+        let events = await this.starknetSpvVaultContract.Events.getContractBlockEvents(["spv_swap_vault::events::Opened", "spv_swap_vault::events::Deposited", "spv_swap_vault::events::Closed", "spv_swap_vault::events::Fronted", "spv_swap_vault::events::Claimed"], [], lastBlockNumber, null);
         if (lastTxHash != null) {
             const latestProcessedEventIndex = (0, Utils_1.findLastIndex)(events, val => val.txHash === lastTxHash);
             if (latestProcessedEventIndex !== -1) {
                 events.splice(0, latestProcessedEventIndex + 1);
-                this.logger.debug("checkEvents(SpvVaults): Splicing processed events, resulting size: " + events.length);
+                // this.logger.debug("checkEvents(SpvVaults): Splicing processed events, resulting size: "+events.length);
             }
         }
         if (events.length > 0) {

package/dist/starknet/spv_swap/StarknetSpvVaultContract.js

@@ -93,6 +93,8 @@ class StarknetSpvVaultContract extends StarknetContractBase_1.StarknetContractBa
     //Getters
     async getVaultData(owner, vaultId) {
         const struct = await this.contract.get_vault(owner, vaultId);
+        if ((0, Utils_1.toHex)(struct.relay_contract) !== (0, Utils_1.toHex)(this.btcRelay.contract.address))
+            return null;
         return new StarknetSpvVaultData_1.StarknetSpvVaultData(owner, vaultId, struct);
     }
     async getAllVaults(owner) {
@@ -112,7 +114,9 @@ class StarknetSpvVaultContract extends StarknetContractBase_1.StarknetContractBa
         const vaults = [];
         for (let identifier of openedVaults.keys()) {
             const [owner, vaultIdStr] = identifier.split(":");
-            vaults.push(await this.getVaultData(owner, BigInt(vaultIdStr)));
+            const vaultData = await this.getVaultData(owner, BigInt(vaultIdStr));
+            if (vaultData != null)
+                vaults.push(vaultData);
         }
         return vaults;
     }

package/dist/starknet/wallet/StarknetKeypairWallet.d.ts

@@ -3,4 +3,5 @@ export declare class StarknetKeypairWallet extends Account {
     readonly publicKey: string;
     constructor(provider: Provider, privateKey: string);
     getDeploymentData(): DeployAccountContractPayload;
+    static generateRandomPrivateKey(): string;
 }

package/dist/starknet/wallet/StarknetKeypairWallet.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StarknetKeypairWallet = void 0;
 const starknet_1 = require("starknet");
 const Utils_1 = require("../../utils/Utils");
+const buffer_1 = require("buffer");
 const OZaccountClassHash = '0x00261c293c8084cd79086214176b33e5911677cec55104fddc8d25b0b736dcad';
 //Openzeppelin Account wallet
 class StarknetKeypairWallet extends starknet_1.Account {
@@ -22,5 +23,8 @@ class StarknetKeypairWallet extends starknet_1.Account {
             contractAddress: this.address
         };
     }
+    static generateRandomPrivateKey() {
+        return "0x" + buffer_1.Buffer.from(starknet_1.ec.starkCurve.utils.randomPrivateKey()).toString("hex");
+    }
 }
 exports.StarknetKeypairWallet = StarknetKeypairWallet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
   "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": "^9.0.0-beta.0",
+    "@atomiqlabs/base": "^9.0.0-beta.2",
     "@noble/hashes": "^1.7.1",
     "@scure/btc-signer": "1.6.0",
     "abi-wan-kanabi": "2.2.4",

package/src/starknet/StarknetInitializer.ts

@@ -1,4 +1,4 @@
-import {constants, Provider, RpcProvider} from "starknet";
+import {constants, Provider} from "starknet";
 import {StarknetFees} from "./chain/modules/StarknetFees";
 import {StarknetChainInterface, StarknetRetryPolicy} from "./chain/StarknetChainInterface";
 import {StarknetBtcRelay} from "./btcrelay/StarknetBtcRelay";
@@ -51,7 +51,7 @@ export function initializeStarknet(
         new RpcProviderWithRetries({nodeUrl: options.rpcUrl}) :
         options.rpcUrl;
 
-    const Fees = options.fees ?? new StarknetFees(provider, "ETH");
+    const Fees = options.fees ?? new StarknetFees(provider, "STRK");
 
     const chainId = options.chainId ??
         (network===BitcoinNetwork.MAINNET ? constants.StarknetChainId.SN_MAIN : constants.StarknetChainId.SN_SEPOLIA);
@@ -59,7 +59,7 @@ export function initializeStarknet(
     const chainInterface = new StarknetChainInterface(chainId, provider, options.retryPolicy, Fees);
 
     const btcRelay = new StarknetBtcRelay(
-        chainInterface, bitcoinRpc, options.btcRelayContract
+        chainInterface, bitcoinRpc, network, options.btcRelayContract
     );
 
     const swapContract = new StarknetSwapContract(

package/src/starknet/btcrelay/StarknetBtcRelay.ts

@@ -1,6 +1,6 @@
 import {Buffer} from "buffer";
 import {StarknetBtcHeader} from "./headers/StarknetBtcHeader";
-import {BitcoinRpc, BtcBlock, BtcRelay, RelaySynchronizer, StatePredictorUtils} from "@atomiqlabs/base";
+import {BitcoinNetwork, BitcoinRpc, BtcBlock, BtcRelay, RelaySynchronizer, StatePredictorUtils} from "@atomiqlabs/base";
 import {
     bigNumberishToBuffer,
     bufferToU32Array, getLogger,
@@ -12,7 +12,7 @@ import {StarknetBtcStoredHeader} from "./headers/StarknetBtcStoredHeader";
 import {StarknetTx} from "../chain/modules/StarknetTransactions";
 import {StarknetSigner} from "../wallet/StarknetSigner";
 import {BtcRelayAbi} from "./BtcRelayAbi";
-import {BigNumberish, constants, hash} from "starknet";
+import {BigNumberish, hash} from "starknet";
 import {StarknetFees} from "../chain/modules/StarknetFees";
 import {StarknetChainInterface} from "../chain/StarknetChainInterface";
 import {StarknetAction} from "../chain/StarknetAction";
@@ -33,8 +33,9 @@ const GAS_PER_BLOCKHEADER = 850;
 const GAS_PER_BLOCKHEADER_FORK = 1000;
 
 const btcRelayAddreses = {
-    [constants.StarknetChainId.SN_SEPOLIA]: "0x068601c79da2231d21e015ccfd59c243861156fa523a12c9f987ec28eb8dbc8c",
-    [constants.StarknetChainId.SN_MAIN]: "0x057b14a4231b82f1e525ff35a722d893ca3dd2bde0baa6cee97937c5be861dbc"
+    [BitcoinNetwork.TESTNET4]: "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe",
+    [BitcoinNetwork.TESTNET]: "0x068601c79da2231d21e015ccfd59c243861156fa523a12c9f987ec28eb8dbc8c",
+    [BitcoinNetwork.MAINNET]: "0x057b14a4231b82f1e525ff35a722d893ca3dd2bde0baa6cee97937c5be861dbc"
 };
 
 function serializeCalldata(headers: StarknetBtcHeader[], storedHeader: StarknetBtcStoredHeader, span: BigNumberish[]) {
@@ -96,7 +97,8 @@ export class StarknetBtcRelay<B extends BtcBlock>
     constructor(
         chainInterface: StarknetChainInterface,
         bitcoinRpc: BitcoinRpc<B>,
-        contractAddress: string = btcRelayAddreses[chainInterface.starknetChainId],
+        bitcoinNetwork: BitcoinNetwork,
+        contractAddress: string = btcRelayAddreses[bitcoinNetwork],
     ) {
         super(chainInterface, contractAddress, BtcRelayAbi);
         this.bitcoinRpc = bitcoinRpc;

package/src/starknet/chain/modules/StarknetFees.ts

@@ -4,9 +4,6 @@ import {StarknetTokens} from "./StarknetTokens";
 
 const MAX_FEE_AGE = 5000;
 
-const ERC20_ADDRESS_ETH = "";
-const ERC20_ADDRESS_STRK = "";
-
 export class StarknetFees {
 
     private readonly logger = getLogger("StarknetFees: ");
@@ -25,7 +22,7 @@ export class StarknetFees {
 
     constructor(
         provider: Provider,
-        gasToken: "ETH" | "STRK" = "ETH",
+        gasToken: "ETH" | "STRK" = "STRK",
         maxFeeRate: number = gasToken==="ETH" ? 100_000_000_000 /*100 GWei*/ : 1_000_000_000_000_000 /*100 * 10000 GWei*/,
         feeMultiplier: number = 1.25,
         da?: {fee?: "L1" | "L2", nonce?: "L1" | "L2"}

package/src/starknet/chain/modules/StarknetTransactions.ts

@@ -106,7 +106,7 @@ export class StarknetTransactions extends StarknetModule {
         signer?: StarknetSigner
     ): Promise<string> {
         if(onBeforePublish!=null) await onBeforePublish(tx.txId, await this.serializeTx(tx));
-        this.logger.debug("sendSignedTransaction(): sending transaction: ", tx);
+        this.logger.debug("sendSignedTransaction(): sending transaction: ", tx.txId);
 
         if(tx.signed==null) {
             let txHash: string;

package/src/starknet/events/StarknetChainEventsBrowser.ts

@@ -300,19 +300,18 @@ export class StarknetChainEventsBrowser implements ChainEvents<StarknetSwapData>
     protected async checkEventsEcrowManager(lastTxHash: string, lastBlockNumber?: number, currentBlock?: {timestamp: number, block_number: number}): Promise<string> {
         const currentBlockNumber: number = (currentBlock as any).block_number;
         lastBlockNumber ??= currentBlockNumber;
-        const logStartHeight = currentBlockNumber>lastBlockNumber ? lastBlockNumber+1 : lastBlockNumber;
-        this.logger.debug("checkEvents(EscrowManager): Requesting logs: "+logStartHeight+"...pending");
+        // this.logger.debug("checkEvents(EscrowManager): Requesting logs: "+logStartHeight+"...pending");
         let events = await this.starknetSwapContract.Events.getContractBlockEvents(
             ["escrow_manager::events::Initialize", "escrow_manager::events::Claim", "escrow_manager::events::Refund"],
             [],
-            logStartHeight,
+            lastBlockNumber,
             null
         );
         if(lastTxHash!=null) {
             const latestProcessedEventIndex = findLastIndex(events, val => val.txHash===lastTxHash);
             if(latestProcessedEventIndex!==-1) {
                 events.splice(0, latestProcessedEventIndex+1);
-                this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
+                // this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
             }
         }
         if(events.length>0) {
@@ -325,19 +324,18 @@ export class StarknetChainEventsBrowser implements ChainEvents<StarknetSwapData>
     protected async checkEventsSpvVaults(lastTxHash: string, lastBlockNumber?: number, currentBlock?: {timestamp: number, block_number: number}): Promise<string> {
         const currentBlockNumber: number = (currentBlock as any).block_number;
         lastBlockNumber ??= currentBlockNumber;
-        const logStartHeight = currentBlockNumber>lastBlockNumber ? lastBlockNumber+1 : lastBlockNumber;
-        this.logger.debug("checkEvents(SpvVaults): Requesting logs: "+logStartHeight+"...pending");
+        // this.logger.debug("checkEvents(SpvVaults): Requesting logs: "+logStartHeight+"...pending");
         let events = await this.starknetSpvVaultContract.Events.getContractBlockEvents(
             ["spv_swap_vault::events::Opened", "spv_swap_vault::events::Deposited", "spv_swap_vault::events::Closed", "spv_swap_vault::events::Fronted", "spv_swap_vault::events::Claimed"],
             [],
-            logStartHeight,
+            lastBlockNumber,
             null
         );
         if(lastTxHash!=null) {
             const latestProcessedEventIndex = findLastIndex(events, val => val.txHash===lastTxHash);
             if(latestProcessedEventIndex!==-1) {
                 events.splice(0, latestProcessedEventIndex+1);
-                this.logger.debug("checkEvents(SpvVaults): Splicing processed events, resulting size: "+events.length);
+                // this.logger.debug("checkEvents(SpvVaults): Splicing processed events, resulting size: "+events.length);
             }
         }
         if(events.length>0) {

package/src/starknet/spv_swap/StarknetSpvVaultContract.ts

@@ -162,6 +162,7 @@ export class StarknetSpvVaultContract
     //Getters
     async getVaultData(owner: string, vaultId: bigint): Promise<StarknetSpvVaultData> {
         const struct = await this.contract.get_vault(owner, vaultId);
+        if(toHex(struct.relay_contract)!==toHex(this.btcRelay.contract.address)) return null;
         return new StarknetSpvVaultData(owner, vaultId, struct);
     }
 
@@ -185,7 +186,8 @@ export class StarknetSpvVaultContract
         const vaults: StarknetSpvVaultData[] = [];
         for(let identifier of openedVaults.keys()) {
             const [owner, vaultIdStr] = identifier.split(":");
-            vaults.push(await this.getVaultData(owner, BigInt(vaultIdStr)));
+            const vaultData = await this.getVaultData(owner, BigInt(vaultIdStr));
+            if(vaultData!=null) vaults.push(vaultData);
         }
         return vaults;
     }

package/src/starknet/wallet/StarknetKeypairWallet.ts

@@ -1,5 +1,6 @@
 import {Account, CallData, DeployAccountContractPayload, ec, hash, Provider} from "starknet";
 import {toHex} from "../../utils/Utils";
+import {Buffer} from "buffer";
 
 const OZaccountClassHash = '0x00261c293c8084cd79086214176b33e5911677cec55104fddc8d25b0b736dcad';
 
@@ -31,4 +32,8 @@ export class StarknetKeypairWallet extends Account {
         }
     }
 
+    public static generateRandomPrivateKey(): string {
+        return "0x"+Buffer.from(ec.starkCurve.utils.randomPrivateKey()).toString("hex");
+    }
+
 }