From d2d1a0c54aaa89336a689f2b55b5ab118036ef91 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:19:41 -0500 Subject: [PATCH 01/29] Update Indexer.d.ts --- lib.esm/indexer/Indexer.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/indexer/Indexer.d.ts b/lib.esm/indexer/Indexer.d.ts index 62a8d1c..2064690 100644 --- a/lib.esm/indexer/Indexer.d.ts +++ b/lib.esm/indexer/Indexer.d.ts @@ -5,7 +5,8 @@ import { UploadOption, Uploader } from '../transfer/index.js'; import { StorageNode } from '../node/index.js'; import { RetryOpts } from '../types.js'; import { AbstractFile } from '../file/AbstractFile.js'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; export declare class Indexer extends HttpProvider { constructor(url: string); getShardedNodes(): Promise; @@ -16,4 +17,4 @@ export declare class Indexer extends HttpProvider { upload(file: AbstractFile, blockchain_rpc: string, signer: ethers.Wallet, opts?: UploadOption, retryOpts?: RetryOpts): Promise<[string, Error | null]>; download(rootHash: string, filePath: string, proof: boolean): Promise; } -//# sourceMappingURL=Indexer.d.ts.map \ No newline at end of file +//# sourceMappingURL=Indexer.d.ts.map From 668e9eacb595da7cf8ec874be6bdfca84823ab1c Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:20:17 -0500 Subject: [PATCH 02/29] Update types.js --- lib.esm/kv/types.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/kv/types.js b/lib.esm/kv/types.js index 4dc6e94..04d9d3e 100644 --- a/lib.esm/kv/types.js +++ b/lib.esm/kv/types.js @@ -1,4 +1,5 @@ -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; var AccessControlType; (function (AccessControlType) { AccessControlType[AccessControlType["GrantAdminRole"] = 0] = "GrantAdminRole"; @@ -131,4 +132,4 @@ export class StreamData { return encoded; } } -//# sourceMappingURL=types.js.map \ No newline at end of file +//# sourceMappingURL=types.js.map From 0e10485f2c537b8286fe0c50960983190f73b513 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:20:42 -0500 Subject: [PATCH 03/29] Update builder.js --- lib.esm/kv/builder.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/kv/builder.js b/lib.esm/kv/builder.js index efddf08..af9c309 100644 --- a/lib.esm/kv/builder.js +++ b/lib.esm/kv/builder.js @@ -1,4 +1,5 @@ -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; import { MAX_KEY_SIZE, MAX_SET_SIZE, STREAM_DOMAIN } from './constants.js'; import { StreamData } from './types.js'; export class StreamDataBuilder { @@ -128,4 +129,4 @@ export class StreamDataBuilder { return this.controls; } } -//# sourceMappingURL=builder.js.map \ No newline at end of file +//# sourceMappingURL=builder.js.map From 57052aff2daf0df2b765f86639dd4fafa567d56c Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:21:10 -0500 Subject: [PATCH 04/29] Update AbstractFile.d.ts --- lib.esm/file/AbstractFile.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/file/AbstractFile.d.ts b/lib.esm/file/AbstractFile.d.ts index 71eee6e..87f3f46 100644 --- a/lib.esm/file/AbstractFile.d.ts +++ b/lib.esm/file/AbstractFile.d.ts @@ -1,4 +1,5 @@ -import { BytesLike } from 'ethers'; +import pkg from 'ethers'; +const { BytesLike } = pkg; import { MerkleTree } from './MerkleTree.js'; import { SubmissionNodeStruct, SubmissionStruct } from '../contracts/flow/FixedPriceFlow.js'; import { Iterator } from './Iterator/index.js'; @@ -16,4 +17,4 @@ export declare abstract class AbstractFile { createNode(offset: number, chunks: number): Promise<[SubmissionNodeStruct | null, Error | null]>; createSegmentNode(offset: number, batch: number, size: number): Promise<[SubmissionNodeStruct | null, Error | null]>; } -//# sourceMappingURL=AbstractFile.d.ts.map \ No newline at end of file +//# sourceMappingURL=AbstractFile.d.ts.map From ee4a3434267d8b62aa19a3b4e016dbebd954ddbb Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:21:37 -0500 Subject: [PATCH 05/29] Update Downloader.js --- lib.esm/transfer/Downloader.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/transfer/Downloader.js b/lib.esm/transfer/Downloader.js index ec35a33..267a082 100644 --- a/lib.esm/transfer/Downloader.js +++ b/lib.esm/transfer/Downloader.js @@ -1,7 +1,8 @@ import fs from 'fs'; import { DEFAULT_SEGMENT_MAX_CHUNKS, DEFAULT_CHUNK_SIZE } from '../constant.js'; import { GetSplitNum, checkExist } from '../utils.js'; -import { decodeBase64 } from 'ethers'; +import pkg from 'ethers'; +const { decodeBase64 } = pkg; import { getShardConfigs } from './utils.js'; export class Downloader { nodes; @@ -106,4 +107,4 @@ export class Downloader { return null; } } -//# sourceMappingURL=Downloader.js.map \ No newline at end of file +//# sourceMappingURL=Downloader.js.map From cc5b9bcbd02b0892eb4b45b8429f0d30cd33a433 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:22:08 -0500 Subject: [PATCH 06/29] Update Uploader.js --- lib.esm/transfer/Uploader.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/transfer/Uploader.js b/lib.esm/transfer/Uploader.js index ba96879..fc9ec93 100644 --- a/lib.esm/transfer/Uploader.js +++ b/lib.esm/transfer/Uploader.js @@ -1,7 +1,8 @@ import { DEFAULT_SEGMENT_SIZE, DEFAULT_SEGMENT_MAX_CHUNKS, DEFAULT_CHUNK_SIZE, } from '../constant.js'; import { delay, getMarketContract } from '../utils.js'; import { numSplits } from '../file/index.js'; -import { encodeBase64, ethers } from 'ethers'; +import pkg from 'ethers'; +const { encodeBase64, ethers } = pkg; import { calculatePrice, getShardConfigs } from './utils.js'; import { checkReplica } from '../common/index.js'; export class Uploader { @@ -248,4 +249,4 @@ export class Uploader { return res; } } -//# sourceMappingURL=Uploader.js.map \ No newline at end of file +//# sourceMappingURL=Uploader.js.map From 6dae02bb9a9852b17d67bca2ac725430e0ff050a Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:22:28 -0500 Subject: [PATCH 07/29] Update types.d.ts --- lib.esm/transfer/types.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/transfer/types.d.ts b/lib.esm/transfer/types.d.ts index 7afa393..5d69bc6 100644 --- a/lib.esm/transfer/types.d.ts +++ b/lib.esm/transfer/types.d.ts @@ -1,4 +1,5 @@ -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; export interface UploadTask { clientIndex: number; taskSize: number; @@ -15,4 +16,4 @@ export interface UploadOption { fee: bigint; } export declare var defaultUploadOption: UploadOption; -//# sourceMappingURL=types.d.ts.map \ No newline at end of file +//# sourceMappingURL=types.d.ts.map From 8afe9e92c20ff156dce16b38192af95e1e23f5d5 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:22:49 -0500 Subject: [PATCH 08/29] Update Uploader.d.ts --- lib.esm/transfer/Uploader.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.esm/transfer/Uploader.d.ts b/lib.esm/transfer/Uploader.d.ts index ba93f59..5072321 100644 --- a/lib.esm/transfer/Uploader.d.ts +++ b/lib.esm/transfer/Uploader.d.ts @@ -2,7 +2,8 @@ import { StorageNode, SegmentWithProof, FileInfo } from '../node/index.js'; import { FixedPriceFlow } from '../contracts/flow/FixedPriceFlow.js'; import { RetryOpts } from '../types.js'; import { MerkleTree } from '../file/index.js'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; import { UploadOption, UploadTask } from './types.js'; import { AbstractFile } from '../file/AbstractFile.js'; export declare class Uploader { @@ -21,4 +22,4 @@ export declare class Uploader { getSegment(file: AbstractFile, tree: MerkleTree, segIndex: number): Promise<[boolean, SegmentWithProof | null, Error | null]>; uploadTask(file: AbstractFile, tree: MerkleTree, uploadTask: UploadTask): Promise; } -//# sourceMappingURL=Uploader.d.ts.map \ No newline at end of file +//# sourceMappingURL=Uploader.d.ts.map From c14540654b906cbdc2561dba11e3f6cef2a8d404 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:23:56 -0500 Subject: [PATCH 09/29] Update utils.d.ts --- lib.esm/utils.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib.esm/utils.d.ts b/lib.esm/utils.d.ts index 1e8a841..18edb85 100644 --- a/lib.esm/utils.d.ts +++ b/lib.esm/utils.d.ts @@ -1,8 +1,8 @@ -import { Signer } from 'ethers'; -import { ContractRunner } from 'ethers'; +import pkg from 'ethers'; +const { Signer, ContractRunner } = pkg; export declare function getFlowContract(address: string, signer: Signer): import("./contracts/flow/FixedPriceFlow.js").FixedPriceFlow; export declare function getMarketContract(address: string, runner: ContractRunner): import("./contracts/market/FixedPrice.js").FixedPrice; export declare function checkExist(inputPath: string): boolean; export declare function GetSplitNum(total: number, unit: number): number; export declare const delay: (ms: number) => Promise; -//# sourceMappingURL=utils.d.ts.map \ No newline at end of file +//# sourceMappingURL=utils.d.ts.map From 38c411ad8fb405c394e71f4bac846fc68f0af602 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:24:47 -0500 Subject: [PATCH 10/29] Update Indexer.d.ts From 423095f5a41751a1f62851df90fa5b1c71471321 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:26:59 -0500 Subject: [PATCH 11/29] Update Indexer.d.ts --- types/indexer/Indexer.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/types/indexer/Indexer.d.ts b/types/indexer/Indexer.d.ts index 62a8d1c..2064690 100644 --- a/types/indexer/Indexer.d.ts +++ b/types/indexer/Indexer.d.ts @@ -5,7 +5,8 @@ import { UploadOption, Uploader } from '../transfer/index.js'; import { StorageNode } from '../node/index.js'; import { RetryOpts } from '../types.js'; import { AbstractFile } from '../file/AbstractFile.js'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; export declare class Indexer extends HttpProvider { constructor(url: string); getShardedNodes(): Promise; @@ -16,4 +17,4 @@ export declare class Indexer extends HttpProvider { upload(file: AbstractFile, blockchain_rpc: string, signer: ethers.Wallet, opts?: UploadOption, retryOpts?: RetryOpts): Promise<[string, Error | null]>; download(rootHash: string, filePath: string, proof: boolean): Promise; } -//# sourceMappingURL=Indexer.d.ts.map \ No newline at end of file +//# sourceMappingURL=Indexer.d.ts.map From d4097ccbc8549148fea260652442da1840dcdb4c Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:27:54 -0500 Subject: [PATCH 12/29] Update AbstractFile.d.ts --- types/file/AbstractFile.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/types/file/AbstractFile.d.ts b/types/file/AbstractFile.d.ts index 71eee6e..87f3f46 100644 --- a/types/file/AbstractFile.d.ts +++ b/types/file/AbstractFile.d.ts @@ -1,4 +1,5 @@ -import { BytesLike } from 'ethers'; +import pkg from 'ethers'; +const { BytesLike } = pkg; import { MerkleTree } from './MerkleTree.js'; import { SubmissionNodeStruct, SubmissionStruct } from '../contracts/flow/FixedPriceFlow.js'; import { Iterator } from './Iterator/index.js'; @@ -16,4 +17,4 @@ export declare abstract class AbstractFile { createNode(offset: number, chunks: number): Promise<[SubmissionNodeStruct | null, Error | null]>; createSegmentNode(offset: number, batch: number, size: number): Promise<[SubmissionNodeStruct | null, Error | null]>; } -//# sourceMappingURL=AbstractFile.d.ts.map \ No newline at end of file +//# sourceMappingURL=AbstractFile.d.ts.map From 5fc316f107eadf16b33819098bb047fcebe6f13d Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:28:18 -0500 Subject: [PATCH 13/29] Update types.d.ts --- types/transfer/types.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/types/transfer/types.d.ts b/types/transfer/types.d.ts index 7afa393..5d69bc6 100644 --- a/types/transfer/types.d.ts +++ b/types/transfer/types.d.ts @@ -1,4 +1,5 @@ -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; export interface UploadTask { clientIndex: number; taskSize: number; @@ -15,4 +16,4 @@ export interface UploadOption { fee: bigint; } export declare var defaultUploadOption: UploadOption; -//# sourceMappingURL=types.d.ts.map \ No newline at end of file +//# sourceMappingURL=types.d.ts.map From 8a4e084b589c0b28f4617d530e789f5e765cd8ee Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:28:49 -0500 Subject: [PATCH 14/29] Update Uploader.d.ts --- types/transfer/Uploader.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/types/transfer/Uploader.d.ts b/types/transfer/Uploader.d.ts index ba93f59..5072321 100644 --- a/types/transfer/Uploader.d.ts +++ b/types/transfer/Uploader.d.ts @@ -2,7 +2,8 @@ import { StorageNode, SegmentWithProof, FileInfo } from '../node/index.js'; import { FixedPriceFlow } from '../contracts/flow/FixedPriceFlow.js'; import { RetryOpts } from '../types.js'; import { MerkleTree } from '../file/index.js'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; import { UploadOption, UploadTask } from './types.js'; import { AbstractFile } from '../file/AbstractFile.js'; export declare class Uploader { @@ -21,4 +22,4 @@ export declare class Uploader { getSegment(file: AbstractFile, tree: MerkleTree, segIndex: number): Promise<[boolean, SegmentWithProof | null, Error | null]>; uploadTask(file: AbstractFile, tree: MerkleTree, uploadTask: UploadTask): Promise; } -//# sourceMappingURL=Uploader.d.ts.map \ No newline at end of file +//# sourceMappingURL=Uploader.d.ts.map From 0f1889617776eb05a9566f6de163ad6cbb256da8 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:29:13 -0500 Subject: [PATCH 15/29] Update utils.d.ts --- types/utils.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/utils.d.ts b/types/utils.d.ts index 1e8a841..18edb85 100644 --- a/types/utils.d.ts +++ b/types/utils.d.ts @@ -1,8 +1,8 @@ -import { Signer } from 'ethers'; -import { ContractRunner } from 'ethers'; +import pkg from 'ethers'; +const { Signer, ContractRunner } = pkg; export declare function getFlowContract(address: string, signer: Signer): import("./contracts/flow/FixedPriceFlow.js").FixedPriceFlow; export declare function getMarketContract(address: string, runner: ContractRunner): import("./contracts/market/FixedPrice.js").FixedPrice; export declare function checkExist(inputPath: string): boolean; export declare function GetSplitNum(total: number, unit: number): number; export declare const delay: (ms: number) => Promise; -//# sourceMappingURL=utils.d.ts.map \ No newline at end of file +//# sourceMappingURL=utils.d.ts.map From 566c6fda2ac75507d4d890e4b87542c5ba435dc3 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:30:30 -0500 Subject: [PATCH 16/29] Update Indexer.ts --- src.ts/indexer/Indexer.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src.ts/indexer/Indexer.ts b/src.ts/indexer/Indexer.ts index 5190bff..9c465ef 100644 --- a/src.ts/indexer/Indexer.ts +++ b/src.ts/indexer/Indexer.ts @@ -5,7 +5,8 @@ import { UploadOption, Uploader, Downloader } from '../transfer/index.js' import { StorageNode } from '../node/index.js' import { RetryOpts } from '../types.js' import { AbstractFile } from '../file/AbstractFile.js' -import { ethers } from 'ethers' +import pkg from 'ethers'; +const { ethers } = pkg; import { getFlowContract } from '../utils.js' export class Indexer extends HttpProvider { From d2c07ea84c845ec3b4b59e43ab83389bf05aa3e4 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:30:59 -0500 Subject: [PATCH 17/29] Update utils.ts --- src.ts/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src.ts/utils.ts b/src.ts/utils.ts index d6b65ee..a8de865 100644 --- a/src.ts/utils.ts +++ b/src.ts/utils.ts @@ -1,9 +1,9 @@ -import { Signer } from 'ethers' import { FixedPriceFlow__factory } from './contracts/flow/index.js' import { FixedPrice__factory } from './contracts/market/index.js' import fs from 'fs' import path from 'path' -import { ContractRunner } from 'ethers' +import pkg from 'ethers'; +const { Signer, ContractRunner } = pkg; export function getFlowContract(address: string, signer: Signer) { return FixedPriceFlow__factory.connect(address, signer) From 6c5825cfe9832d7c4c03f0bfabb1a360f4dae7ae Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:31:28 -0500 Subject: [PATCH 18/29] Update builder.ts --- src.ts/kv/builder.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src.ts/kv/builder.ts b/src.ts/kv/builder.ts index cba7368..0dc8bbb 100644 --- a/src.ts/kv/builder.ts +++ b/src.ts/kv/builder.ts @@ -1,4 +1,5 @@ -import { ethers } from 'ethers' +import pkg from 'ethers'; +const { ethers } = pkg; import { MAX_KEY_SIZE, MAX_SET_SIZE, STREAM_DOMAIN } from './constants.js' import { AccessControl, StreamData } from './types.js' import { Bytes } from '@ethersproject/bytes' From a9278ae8f04db86ebf2cec4dd94b49d7495f943c Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:31:56 -0500 Subject: [PATCH 19/29] Update types.ts --- src.ts/kv/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src.ts/kv/types.ts b/src.ts/kv/types.ts index 686e88a..e9c975f 100644 --- a/src.ts/kv/types.ts +++ b/src.ts/kv/types.ts @@ -1,5 +1,5 @@ -import { ethers } from 'ethers' - +import pkg from 'ethers'; +const { ethers } = pkg; // Assuming common.Hash and common.Address are hex strings type Hash = string type Address = string From 8e7aa2ae6d88561cf8c08139d3c81db88b70ad77 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:32:52 -0500 Subject: [PATCH 20/29] Update AbstractFile.ts --- src.ts/file/AbstractFile.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src.ts/file/AbstractFile.ts b/src.ts/file/AbstractFile.ts index b31d387..e73f23e 100644 --- a/src.ts/file/AbstractFile.ts +++ b/src.ts/file/AbstractFile.ts @@ -1,4 +1,5 @@ -import { BytesLike } from 'ethers' +import pkg from 'ethers'; +const { BytesLike } = pkg; import { MerkleTree } from './MerkleTree.js' import { SubmissionNodeStruct, From 9f2708f819ba9ed29d9a809a857b7274aa539e50 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:33:23 -0500 Subject: [PATCH 21/29] Update Downloader.ts --- src.ts/transfer/Downloader.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src.ts/transfer/Downloader.ts b/src.ts/transfer/Downloader.ts index e9d5be1..62fe7bb 100644 --- a/src.ts/transfer/Downloader.ts +++ b/src.ts/transfer/Downloader.ts @@ -2,7 +2,8 @@ import fs from 'fs' import { DEFAULT_SEGMENT_MAX_CHUNKS, DEFAULT_CHUNK_SIZE } from '../constant.js' import { GetSplitNum, checkExist } from '../utils.js' import { StorageNode, Segment, FileInfo } from '../node/index.js' -import { decodeBase64 } from 'ethers' +import pkg from 'ethers'; +const { decodeBase64 } = pkg; import { Hash } from '../types.js' import { getShardConfigs } from './utils.js' import { ShardConfig } from '../common/index.js' From f8205973ac6fad26ec6e348cc0cc5d6a37663101 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:33:46 -0500 Subject: [PATCH 22/29] Update Uploader.ts --- src.ts/transfer/Uploader.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src.ts/transfer/Uploader.ts b/src.ts/transfer/Uploader.ts index 40101d4..a492373 100644 --- a/src.ts/transfer/Uploader.ts +++ b/src.ts/transfer/Uploader.ts @@ -8,7 +8,8 @@ import { FixedPriceFlow } from '../contracts/flow/FixedPriceFlow.js' import { delay, getMarketContract } from '../utils.js' import { RetryOpts } from '../types.js' import { MerkleTree, numSplits } from '../file/index.js' -import { encodeBase64, ethers } from 'ethers' +import pkg from 'ethers'; +const { encodeBase64, ethers } = pkg; import { calculatePrice, getShardConfigs } from './utils.js' import { UploadOption, UploadTask } from './types.js' import { AbstractFile } from '../file/AbstractFile.js' From c527c93c3d004ecf4d4659e4de39560ef3d1632c Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:34:03 -0500 Subject: [PATCH 23/29] Update types.ts --- src.ts/transfer/types.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src.ts/transfer/types.ts b/src.ts/transfer/types.ts index 52ed857..8341b24 100644 --- a/src.ts/transfer/types.ts +++ b/src.ts/transfer/types.ts @@ -1,4 +1,5 @@ -import { ethers } from 'ethers' +import pkg from 'ethers'; +const { ethers } = pkg; export interface UploadTask { clientIndex: number From 1634dd811c523a2165f389354a07e530f529abe5 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:35:00 -0500 Subject: [PATCH 24/29] Update Indexer.d.ts --- lib.commonjs/indexer/Indexer.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.commonjs/indexer/Indexer.d.ts b/lib.commonjs/indexer/Indexer.d.ts index 62a8d1c..2064690 100644 --- a/lib.commonjs/indexer/Indexer.d.ts +++ b/lib.commonjs/indexer/Indexer.d.ts @@ -5,7 +5,8 @@ import { UploadOption, Uploader } from '../transfer/index.js'; import { StorageNode } from '../node/index.js'; import { RetryOpts } from '../types.js'; import { AbstractFile } from '../file/AbstractFile.js'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; export declare class Indexer extends HttpProvider { constructor(url: string); getShardedNodes(): Promise; @@ -16,4 +17,4 @@ export declare class Indexer extends HttpProvider { upload(file: AbstractFile, blockchain_rpc: string, signer: ethers.Wallet, opts?: UploadOption, retryOpts?: RetryOpts): Promise<[string, Error | null]>; download(rootHash: string, filePath: string, proof: boolean): Promise; } -//# sourceMappingURL=Indexer.d.ts.map \ No newline at end of file +//# sourceMappingURL=Indexer.d.ts.map From 202a5b5e93b16b3ca75111503168a96e719b1b60 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:35:43 -0500 Subject: [PATCH 25/29] Update AbstractFile.d.ts --- lib.commonjs/file/AbstractFile.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.commonjs/file/AbstractFile.d.ts b/lib.commonjs/file/AbstractFile.d.ts index 71eee6e..87f3f46 100644 --- a/lib.commonjs/file/AbstractFile.d.ts +++ b/lib.commonjs/file/AbstractFile.d.ts @@ -1,4 +1,5 @@ -import { BytesLike } from 'ethers'; +import pkg from 'ethers'; +const { BytesLike } = pkg; import { MerkleTree } from './MerkleTree.js'; import { SubmissionNodeStruct, SubmissionStruct } from '../contracts/flow/FixedPriceFlow.js'; import { Iterator } from './Iterator/index.js'; @@ -16,4 +17,4 @@ export declare abstract class AbstractFile { createNode(offset: number, chunks: number): Promise<[SubmissionNodeStruct | null, Error | null]>; createSegmentNode(offset: number, batch: number, size: number): Promise<[SubmissionNodeStruct | null, Error | null]>; } -//# sourceMappingURL=AbstractFile.d.ts.map \ No newline at end of file +//# sourceMappingURL=AbstractFile.d.ts.map From f86e0baf3bbcc0ddcda12324d7e24ed7e70a7ac4 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:36:12 -0500 Subject: [PATCH 26/29] Update types.d.ts --- lib.commonjs/transfer/types.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.commonjs/transfer/types.d.ts b/lib.commonjs/transfer/types.d.ts index 7afa393..5d69bc6 100644 --- a/lib.commonjs/transfer/types.d.ts +++ b/lib.commonjs/transfer/types.d.ts @@ -1,4 +1,5 @@ -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; export interface UploadTask { clientIndex: number; taskSize: number; @@ -15,4 +16,4 @@ export interface UploadOption { fee: bigint; } export declare var defaultUploadOption: UploadOption; -//# sourceMappingURL=types.d.ts.map \ No newline at end of file +//# sourceMappingURL=types.d.ts.map From 6ef3c8d8731213d9b0ef2d78b0b60fc2f8053455 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:37:13 -0500 Subject: [PATCH 27/29] Update Uploader.d.ts --- lib.commonjs/transfer/Uploader.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib.commonjs/transfer/Uploader.d.ts b/lib.commonjs/transfer/Uploader.d.ts index ba93f59..5072321 100644 --- a/lib.commonjs/transfer/Uploader.d.ts +++ b/lib.commonjs/transfer/Uploader.d.ts @@ -2,7 +2,8 @@ import { StorageNode, SegmentWithProof, FileInfo } from '../node/index.js'; import { FixedPriceFlow } from '../contracts/flow/FixedPriceFlow.js'; import { RetryOpts } from '../types.js'; import { MerkleTree } from '../file/index.js'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers } = pkg; import { UploadOption, UploadTask } from './types.js'; import { AbstractFile } from '../file/AbstractFile.js'; export declare class Uploader { @@ -21,4 +22,4 @@ export declare class Uploader { getSegment(file: AbstractFile, tree: MerkleTree, segIndex: number): Promise<[boolean, SegmentWithProof | null, Error | null]>; uploadTask(file: AbstractFile, tree: MerkleTree, uploadTask: UploadTask): Promise; } -//# sourceMappingURL=Uploader.d.ts.map \ No newline at end of file +//# sourceMappingURL=Uploader.d.ts.map From 134ffa039bfccf66b7d1639b9369f67fde86158e Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:37:39 -0500 Subject: [PATCH 28/29] Update utils.d.ts --- lib.commonjs/utils.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib.commonjs/utils.d.ts b/lib.commonjs/utils.d.ts index 1e8a841..18edb85 100644 --- a/lib.commonjs/utils.d.ts +++ b/lib.commonjs/utils.d.ts @@ -1,8 +1,8 @@ -import { Signer } from 'ethers'; -import { ContractRunner } from 'ethers'; +import pkg from 'ethers'; +const { Signer, ContractRunner } = pkg; export declare function getFlowContract(address: string, signer: Signer): import("./contracts/flow/FixedPriceFlow.js").FixedPriceFlow; export declare function getMarketContract(address: string, runner: ContractRunner): import("./contracts/market/FixedPrice.js").FixedPrice; export declare function checkExist(inputPath: string): boolean; export declare function GetSplitNum(total: number, unit: number): number; export declare const delay: (ms: number) => Promise; -//# sourceMappingURL=utils.d.ts.map \ No newline at end of file +//# sourceMappingURL=utils.d.ts.map From 612c6293ec6a4c739de0106beb4219f75c5890a3 Mon Sep 17 00:00:00 2001 From: Robert Mads Christensen <61755754+madschristensen99@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:38:40 -0500 Subject: [PATCH 29/29] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 37b5210..085d741 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@ Use `ZgFile` to create a file object, then call `merkleTree` method to get the m ```js import { Indexer, ZgFile } from '@0glabs/0g-ts-sdk'; -import { ethers } from 'ethers'; +import pkg from 'ethers'; +const { ethers, BrowserProvider } = pkg; import { exit } from 'process'; const file = await ZgFile.fromFilePath();