@atomiqlabs/chain-starknet 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/starknet/StarknetInitializer.js

@@ -37,7 +37,7 @@ function initializeStarknet(options, bitcoinRpc, network) {
     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 ?? (network === base_1.BitcoinNetwork.TESTNET4 ? "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe" : undefined));
+    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/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/package.json

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

package/src/starknet/StarknetInitializer.ts

@@ -59,7 +59,7 @@ export function initializeStarknet(
     const chainInterface = new StarknetChainInterface(chainId, provider, options.retryPolicy, Fees);
 
     const btcRelay = new StarknetBtcRelay(
-        chainInterface, bitcoinRpc, options.btcRelayContract ?? (network===BitcoinNetwork.TESTNET4 ? "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe" : undefined)
+        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/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;
     }