Merge remote-tracking branch 'origin/alpha' into PE-6579-add-ant-vali…

…dation
ar-io · Aug 28, 2024 · 4500a39 · 4500a39
2 parents 45df626 + 491ea06
commit 4500a39
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [2.2.0-alpha.2](https://github.com/ar-io/ar-io-sdk/compare/v2.2.0-alpha.1...v2.2.0-alpha.2) (2024-08-27)
+
+
+### Bug Fixes
+
+* **types:** update types for epoch distributions ([5aedf50](https://github.com/ar-io/ar-io-sdk/commit/5aedf5077a68faec8d86281a401ab2f4d6daf142))
+
 # [2.2.0-alpha.1](https://github.com/ar-io/ar-io-sdk/compare/v2.1.0...v2.2.0-alpha.1) (2024-08-22)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ar.io/sdk",
-  "version": "2.2.0-alpha.1",
+  "version": "2.2.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ar-io/ar-io-sdk.git"

diff --git a/src/io.ts b/src/io.ts
@@ -96,11 +96,26 @@ export type AoVaultData = {
   endTimestamp: Timestamp;
 };
 
+export type AoEpochDistributionRewards = {
+  eligible: Record<
+    WalletAddress,
+    {
+      delegateRewards: Record<WalletAddress, number>;
+      operatorReward: number;
+    }
+  >;
+  // TODO: we could create a new type for this
+  distributed?: Record<WalletAddress, number>;
+};
+
 export type AoEpochDistributionData = {
-  rewards: Record<WalletAddress, number>;
-  distributedTimestamp: Timestamp;
-  totalDistributedRewards: number;
+  rewards: AoEpochDistributionRewards;
   totalEligibleRewards: number;
+  totalEligibleObserverReward: number;
+  totalEligibleGatewayReward: number;
+  // TODO: we could create a new type for this
+  distributedTimestamp?: Timestamp; // only set if rewards have been distributed
+  totalDistributedRewards?: number; // only set if rewards have been distributed
 };
 
 export type AoArNSReservedNameData = {

diff --git a/src/version.ts b/src/version.ts
@@ -17,4 +17,4 @@
 
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
 
-export const version = '2.2.0-alpha.1';
+export const version = '2.2.0-alpha.2';