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

package/dist/starknet/StarknetInitializer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StarknetInitializer = exports.initializeStarknet = exports.StarknetAssets = void 0;
+exports.StarknetInitializer = exports.StarknetAssets = void 0;
+exports.initializeStarknet = initializeStarknet;
 const starknet_1 = require("starknet");
 const StarknetFees_1 = require("./chain/modules/StarknetFees");
 const StarknetChainInterface_1 = require("./chain/StarknetChainInterface");
@@ -58,7 +59,6 @@ function initializeStarknet(options, bitcoinRpc, network) {
         spvVaultWithdrawalDataConstructor: StarknetSpvWithdrawalData_1.StarknetSpvWithdrawalData
     };
 }
-exports.initializeStarknet = initializeStarknet;
 ;
 exports.StarknetInitializer = {
     chainId: "STARKNET",

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

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StarknetFees = exports.starknetGasAdd = exports.starknetGasMul = void 0;
+exports.StarknetFees = void 0;
+exports.starknetGasMul = starknetGasMul;
+exports.starknetGasAdd = starknetGasAdd;
 const Utils_1 = require("../../../utils/Utils");
 const StarknetTokens_1 = require("./StarknetTokens");
 const MAX_FEE_AGE = 5000;
 function starknetGasMul(gas, scalar) {
     return { l1Gas: gas.l1Gas * scalar, l2Gas: gas.l2Gas * scalar, l1DataGas: gas.l1DataGas * scalar };
 }
-exports.starknetGasMul = starknetGasMul;
 function starknetGasAdd(a, b) {
     return { l1Gas: a.l1Gas + b.l1Gas, l2Gas: a.l2Gas + b.l2Gas, l1DataGas: a.l1DataGas + b.l1DataGas };
 }
-exports.starknetGasAdd = starknetGasAdd;
 class StarknetFees {
     constructor(provider, maxFeeRate = { l1GasCost: 1000000000000000n, l2GasCost: 1000000000000000n, l1DataGasCost: 1000000000000000n } /*100 * 10000 GWei*/, feeMultiplier = 1.25, da) {
         this.logger = (0, Utils_1.getLogger)("StarknetFees: ");
@@ -100,9 +100,9 @@ class StarknetFees {
         return {
             version: "0x3",
             resourceBounds: {
-                l1_gas: { max_amount: (0, Utils_1.toHex)(gas.l1Gas, 16), max_price_per_unit: (0, Utils_1.toHex)((0, Utils_1.toBigInt)(l1GasCostStr), 16) },
-                l2_gas: { max_amount: (0, Utils_1.toHex)(gas.l2Gas, 16), max_price_per_unit: (0, Utils_1.toHex)((0, Utils_1.toBigInt)(l2GasCostStr), 16) },
-                l1_data_gas: { max_amount: (0, Utils_1.toHex)(gas.l1DataGas, 16), max_price_per_unit: (0, Utils_1.toHex)((0, Utils_1.toBigInt)(l1DataGasCostStr), 16) }
+                l1_gas: { max_amount: (0, Utils_1.toHex)(gas.l1Gas, 16), max_price_per_unit: (0, Utils_1.toHex)(BigInt(l1GasCostStr), 16) },
+                l2_gas: { max_amount: (0, Utils_1.toHex)(gas.l2Gas, 16), max_price_per_unit: (0, Utils_1.toHex)(BigInt(l2GasCostStr), 16) },
+                l1_data_gas: { max_amount: (0, Utils_1.toHex)(gas.l1DataGas, 16), max_price_per_unit: (0, Utils_1.toHex)(BigInt(l1DataGasCostStr), 16) }
             },
             tip: "0x0",
             paymasterData: [],

package/dist/starknet/swaps/EscrowManagerAbi.d.ts

@@ -16,9 +16,6 @@ export declare const EscrowManagerAbi: readonly [{
     readonly type: "struct";
     readonly name: "escrow_manager::structs::escrow::EscrowExecution";
     readonly members: readonly [{
-        readonly name: "contract";
-        readonly type: "core::starknet::contract_address::ContractAddress";
-    }, {
         readonly name: "hash";
         readonly type: "core::felt252";
     }, {

package/dist/starknet/swaps/EscrowManagerAbi.js

@@ -25,10 +25,6 @@ exports.EscrowManagerAbi = [
         "type": "struct",
         "name": "escrow_manager::structs::escrow::EscrowExecution",
         "members": [
-            {
-                "name": "contract",
-                "type": "core::starknet::contract_address::ContractAddress"
-            },
             {
                 "name": "hash",
                 "type": "core::felt252"

package/dist/utils/Utils.js

@@ -1,6 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findLastIndex = exports.parseInitFunctionCalldata = exports.poseidonHashRange = exports.bufferToByteArray = exports.bufferToBytes31Span = exports.bytes31SpanToBuffer = exports.toBigInt = exports.bigNumberishToBuffer = exports.u32ReverseEndianness = exports.bufferToU32Array = exports.u32ArrayToBuffer = exports.calculateHash = exports.toHex = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = exports.isUint256 = void 0;
+exports.isUint256 = isUint256;
+exports.timeoutPromise = timeoutPromise;
+exports.onceAsync = onceAsync;
+exports.getLogger = getLogger;
+exports.tryWithRetries = tryWithRetries;
+exports.toHex = toHex;
+exports.calculateHash = calculateHash;
+exports.u32ArrayToBuffer = u32ArrayToBuffer;
+exports.bufferToU32Array = bufferToU32Array;
+exports.u32ReverseEndianness = u32ReverseEndianness;
+exports.bigNumberishToBuffer = bigNumberishToBuffer;
+exports.toBigInt = toBigInt;
+exports.bytes31SpanToBuffer = bytes31SpanToBuffer;
+exports.bufferToBytes31Span = bufferToBytes31Span;
+exports.bufferToByteArray = bufferToByteArray;
+exports.poseidonHashRange = poseidonHashRange;
+exports.parseInitFunctionCalldata = parseInitFunctionCalldata;
+exports.findLastIndex = findLastIndex;
 const starknet_types_08_1 = require("@starknet-io/starknet-types-08");
 const starknet_1 = require("starknet");
 const buffer_1 = require("buffer");
@@ -8,7 +25,6 @@ const StarknetSwapData_1 = require("../starknet/swaps/StarknetSwapData");
 function isUint256(val) {
     return val.low != null && val.high != null;
 }
-exports.isUint256 = isUint256;
 function timeoutPromise(timeoutMillis, abortSignal) {
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(resolve, timeoutMillis);
@@ -19,7 +35,6 @@ function timeoutPromise(timeoutMillis, abortSignal) {
             });
     });
 }
-exports.timeoutPromise = timeoutPromise;
 function onceAsync(executor) {
     let promise;
     return () => {
@@ -32,7 +47,6 @@ function onceAsync(executor) {
         }
     };
 }
-exports.onceAsync = onceAsync;
 function getLogger(prefix) {
     return {
         // @ts-ignore
@@ -45,7 +59,6 @@ function getLogger(prefix) {
         error: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 0) && console.error(prefix + msg, ...args)
     };
 }
-exports.getLogger = getLogger;
 const logger = getLogger("Utils: ");
 async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal) {
     retryPolicy = retryPolicy || {};
@@ -72,7 +85,6 @@ async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal) {
     }
     throw err;
 }
-exports.tryWithRetries = tryWithRetries;
 function toHex(value, length = 64) {
     if (value == null)
         return null;
@@ -90,7 +102,6 @@ function toHex(value, length = 64) {
     }
     return "0x" + value.toString("hex").padStart(length, "0");
 }
-exports.toHex = toHex;
 function calculateHash(tx) {
     const commonData = {
         version: tx.details.version,
@@ -126,7 +137,6 @@ function calculateHash(tx) {
             throw new Error("Unsupported tx type!");
     }
 }
-exports.calculateHash = calculateHash;
 function u32ArrayToBuffer(arr) {
     const buffer = buffer_1.Buffer.alloc(4 * arr.length);
     for (let i = 0; i < arr.length; i++) {
@@ -134,7 +144,6 @@ function u32ArrayToBuffer(arr) {
     }
     return buffer;
 }
-exports.u32ArrayToBuffer = u32ArrayToBuffer;
 function bufferToU32Array(buffer) {
     const result = [];
     for (let i = 0; i < buffer.length; i += 4) {
@@ -142,7 +151,6 @@ function bufferToU32Array(buffer) {
     }
     return result;
 }
-exports.bufferToU32Array = bufferToU32Array;
 function u32ReverseEndianness(value) {
     const valueBN = BigInt(value);
     return Number(((valueBN & 0xffn) << 24n) |
@@ -150,7 +158,6 @@ function u32ReverseEndianness(value) {
         ((valueBN >> 8n) & 0xff00n) |
         ((valueBN >> 24n) & 0xffn));
 }
-exports.u32ReverseEndianness = u32ReverseEndianness;
 function bigNumberishToBuffer(value, length) {
     if (isUint256(value)) {
         return buffer_1.Buffer.concat([bigNumberishToBuffer(value.high, 16), bigNumberishToBuffer(value.low, 16)]);
@@ -173,7 +180,6 @@ function bigNumberishToBuffer(value, length) {
         return buff.slice(buff.length - length);
     return buff;
 }
-exports.bigNumberishToBuffer = bigNumberishToBuffer;
 function toBigInt(value) {
     if (value == null)
         return null;
@@ -190,7 +196,6 @@ function toBigInt(value) {
     }
     return BigInt(value);
 }
-exports.toBigInt = toBigInt;
 function bytes31SpanToBuffer(span, length) {
     const buffers = [];
     const numFullBytes31 = Math.floor(length / 31);
@@ -206,7 +211,6 @@ function bytes31SpanToBuffer(span, length) {
         buffers.push(bigNumberishToBuffer(span[i], additionalBytes));
     return buffer_1.Buffer.concat(buffers);
 }
-exports.bytes31SpanToBuffer = bytes31SpanToBuffer;
 function bufferToBytes31Span(buffer, startIndex = 0, endIndex = buffer.length) {
     const values = [];
     for (let i = startIndex + 31; i < endIndex; i += 31) {
@@ -216,7 +220,6 @@ function bufferToBytes31Span(buffer, startIndex = 0, endIndex = buffer.length) {
         values.push(BigInt("0x" + buffer.slice(startIndex + (values.length * 31), endIndex).toString("hex")));
     return values;
 }
-exports.bufferToBytes31Span = bufferToBytes31Span;
 function bufferToByteArray(buffer, startIndex = 0, endIndex = buffer.length) {
     const values = [];
     for (let i = startIndex + 31; i < endIndex; i += 31) {
@@ -234,11 +237,9 @@ function bufferToByteArray(buffer, startIndex = 0, endIndex = buffer.length) {
         pendingWordLen
     ];
 }
-exports.bufferToByteArray = bufferToByteArray;
 function poseidonHashRange(buffer, startIndex = 0, endIndex = buffer.length) {
     return starknet_1.hash.computePoseidonHashOnElements(bufferToBytes31Span(buffer, startIndex, endIndex));
 }
-exports.poseidonHashRange = poseidonHashRange;
 function parseInitFunctionCalldata(calldata, claimHandler) {
     const escrow = StarknetSwapData_1.StarknetSwapData.fromSerializedFeltArray(calldata, claimHandler);
     const signatureLen = Number(toBigInt(calldata.shift()));
@@ -250,7 +251,6 @@ function parseInitFunctionCalldata(calldata, claimHandler) {
         throw new Error("Calldata not read fully!");
     return { escrow, signature, timeout, extraData };
 }
-exports.parseInitFunctionCalldata = parseInitFunctionCalldata;
 function findLastIndex(array, callback) {
     for (let i = array.length - 1; i >= 0; i--) {
         if (callback(array[i], i))
@@ -258,4 +258,3 @@ function findLastIndex(array, callback) {
     }
     return -1;
 }
-exports.findLastIndex = findLastIndex;

package/package.json

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

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

@@ -141,9 +141,9 @@ export class StarknetFees {
         return {
             version: "0x3" as const,
             resourceBounds: {
-                l1_gas: {max_amount: toHex(gas.l1Gas, 16), max_price_per_unit: toHex(toBigInt(l1GasCostStr), 16)},
-                l2_gas: {max_amount: toHex(gas.l2Gas, 16), max_price_per_unit: toHex(toBigInt(l2GasCostStr), 16)},
-                l1_data_gas: {max_amount: toHex(gas.l1DataGas, 16), max_price_per_unit: toHex(toBigInt(l1DataGasCostStr), 16)}
+                l1_gas: {max_amount: toHex(gas.l1Gas, 16), max_price_per_unit: toHex(BigInt(l1GasCostStr), 16)},
+                l2_gas: {max_amount: toHex(gas.l2Gas, 16), max_price_per_unit: toHex(BigInt(l2GasCostStr), 16)},
+                l1_data_gas: {max_amount: toHex(gas.l1DataGas, 16), max_price_per_unit: toHex(BigInt(l1DataGasCostStr), 16)}
             },
             tip: "0x0",
             paymasterData: [],

package/src/starknet/swaps/EscrowManagerAbi.ts

@@ -22,10 +22,6 @@ export const EscrowManagerAbi = [
         "type": "struct",
         "name": "escrow_manager::structs::escrow::EscrowExecution",
         "members": [
-            {
-                "name": "contract",
-                "type": "core::starknet::contract_address::ContractAddress"
-            },
             {
                 "name": "hash",
                 "type": "core::felt252"