@dignetwork/dig-sdk 0.0.1-alpha.24 → 0.0.1-alpha.25

package/dist/blockchain/ServerCoin.d.ts

@@ -12,12 +12,18 @@ export declare class ServerCoin {
     getActiveEpochPeers(blacklist?: string[]): Promise<string[]>;
     sampleCurrentEpoch(sampleSize?: number, blacklist?: string[]): Promise<string[]>;
     sampleServerCoinsByEpoch(epoch: number, sampleSize?: number, blacklist?: string[]): Promise<string[]>;
-    static getCurrentEpoch(): number;
+    static getCurrentEpoch(): {
+        epoch: number;
+        round: number;
+    };
     ensureServerCoinExists(peerIp: string): Promise<void>;
     meltOutdatedEpochs(peerIp: string): Promise<void>;
     static meltUntrackedStoreCoins(): Promise<void>;
     private getServerCoinsForStore;
     hasEpochCoinBeenCreated(currentEpoch: number, peerIp: string): Promise<boolean>;
-    static calculateEpoch(currentTimestampUTC: Date): number;
+    static calculateEpochAndRound(currentTimestampUTC: Date): {
+        epoch: number;
+        round: number;
+    };
 }
 //# sourceMappingURL=ServerCoin.d.ts.map

package/dist/blockchain/ServerCoin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAMrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAqBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoCP,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAMN,eAAe,IAAI,MAAM;IAK1B,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,cAAc,CAAC,mBAAmB,EAAE,IAAI,GAAG,MAAM;CAiBhE"}
+{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAMrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAqBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoCP,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAMN,eAAe,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKpD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,sBAAsB,CAAC,mBAAmB,EAAE,IAAI,GAAG;QAC/D,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA2BF"}

package/dist/blockchain/ServerCoin.js

@@ -23,7 +23,7 @@ class ServerCoin {
             const wallet = await Wallet_1.Wallet.load("default");
             const publicSyntheticKey = await wallet.getPublicSyntheticKey();
             const serverCoinCreationCoins = await (0, coins_1.selectUnspentCoins)(peer, BigInt(serverCoinCollateral), BigInt(1000000));
-            const currentEpoch = ServerCoin.getCurrentEpoch();
+            const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             const epochBasedHint = (0, datalayer_driver_1.morphLauncherId)(Buffer.from(this.storeId, "hex"), BigInt(currentEpoch));
             const newServerCoin = (0, datalayer_driver_1.createServerCoin)(publicSyntheticKey, serverCoinCreationCoins, epochBasedHint, [peerIp], BigInt(serverCoinCollateral), BigInt(1000000));
             const combinedCoinSpends = [...newServerCoin.coinSpends];
@@ -115,12 +115,12 @@ class ServerCoin {
         return Array.from(serverCoinPeers);
     }
     async getActiveEpochPeers(blacklist = []) {
-        const epoch = ServerCoin.getCurrentEpoch();
+        const { epoch } = ServerCoin.getCurrentEpoch();
         return this.getAllEpochPeers(epoch, blacklist);
     }
     // Sample server coins for the current epoch
     async sampleCurrentEpoch(sampleSize = 5, blacklist = []) {
-        const epoch = ServerCoin.getCurrentEpoch();
+        const { epoch } = ServerCoin.getCurrentEpoch();
         return this.sampleServerCoinsByEpoch(epoch, sampleSize, blacklist);
     }
     // Sample server coins by epoch
@@ -130,13 +130,13 @@ class ServerCoin {
     }
     // Get the current epoch based on the current timestamp
     static getCurrentEpoch() {
-        return ServerCoin.calculateEpoch(new Date());
+        return ServerCoin.calculateEpochAndRound(new Date());
     }
     // Ensure server coin exists for the current epoch
     async ensureServerCoinExists(peerIp) {
         try {
             console.log(`Ensuring server coin exists for store ${this.storeId}...`);
-            const currentEpoch = ServerCoin.getCurrentEpoch();
+            const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             const serverCoins = await this.getServerCoinsForStore(peerIp);
             // Check if a server coin already exists for the current epoch
             const existingCoin = serverCoins.find((coin) => coin.epoch === currentEpoch);
@@ -167,7 +167,7 @@ class ServerCoin {
     // Melt outdated server coins
     async meltOutdatedEpochs(peerIp) {
         try {
-            const currentEpoch = ServerCoin.getCurrentEpoch();
+            const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             let serverCoins = await this.getServerCoinsForStore(peerIp);
             // Filter out coins that are not in the current epoch
             const outdatedCoins = serverCoins.filter((coin) => coin.epoch < currentEpoch);
@@ -251,17 +251,23 @@ class ServerCoin {
         }
     }
     // Static method to calculate the current epoch
-    static calculateEpoch(currentTimestampUTC) {
+    static calculateEpochAndRound(currentTimestampUTC) {
         const firstEpochStart = new Date(Date.UTC(2024, 8, 3, 0, 0)); // Sept 3, 2024, 00:00 UTC
         // Convert the current timestamp to milliseconds
         const currentTimestampMillis = currentTimestampUTC.getTime();
         // Calculate the number of milliseconds in one epoch (7 days)
-        const millisecondsInEpoch = 7 * 24 * 60 * 60 * 1000;
+        const millisecondsInEpoch = 7 * 24 * 60 * 60 * 1000; // 7 days in milliseconds
         // Calculate the difference in milliseconds between the current timestamp and the first epoch start
         const differenceMillis = currentTimestampMillis - firstEpochStart.getTime();
         // Calculate the current epoch number
         const epochNumber = Math.floor(differenceMillis / millisecondsInEpoch) + 1;
-        return epochNumber;
+        // Calculate the milliseconds elapsed since the start of the current epoch
+        const elapsedMillisInCurrentEpoch = differenceMillis % millisecondsInEpoch;
+        // Calculate the number of milliseconds in a round (10 minutes)
+        const millisecondsInRound = 10 * 60 * 1000; // 10 minutes in milliseconds
+        // Calculate the current round number
+        const roundNumber = Math.floor(elapsedMillisInCurrentEpoch / millisecondsInRound) + 1;
+        return { epoch: epochNumber, round: roundNumber };
     }
 }
 exports.ServerCoin = ServerCoin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.24",
+  "version": "0.0.1-alpha.25",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",