Merge pull request #34 from Concordium/revert-29-delegation

Revert "Add delegation functionality"

CHANGELOG.md

@@ -1,19 +1,11 @@
 # Changelog
 
-## 0.7.0 2022-03-09
+## 0.7.1 2022-03-09
 
 ### Added
 
-- Support for getting baker list from node.
-- Support for getting status of Baker-/L-pool (required node to have protocol version 4 or later)
-- Helper functions for determining the version of `BlockSummary` and nested types. 
 - Support for initiating and updating contracts with parameters.
 
-### Changed
-
-- Updated `BlockSummary` type to include new version, effective from protocol version 4.
-- Updated `AccountInfo` type to include new fields related to delegation introduced with protocol version 4.
-
 ## 0.6.0 2022-02-02
 
 ### Added

README.md

@@ -542,26 +542,6 @@ const peersList = peerListResponse.getPeersList();
 ...
 ```
 
-## getBakerList
-Retrieves the list of ID's for registered bakers on the network at a specific block.
-```js
-const blockHash = "7f7409679e53875567e2ae812c9fcefe90ced8961d08554756f42bf268a42749";
-const bakerIds = await client.getBakerList(blockHash);
-...
-```
-
-## getPoolStatus
-Retrieves the status of a pool (either L-Pool or specific baker) at a specific block.
-If a baker ID is specified, the status of that baker is returned. To get the status of the L-Pool, a baker ID should be left undefined.
-```js
-const blockHash = "7f7409679e53875567e2ae812c9fcefe90ced8961d08554756f42bf268a42749";
-const bakerId = BigInt(1);
-
-const bakerStatus = await client.getPoolStatus(blockHash, bakerId);
-const lPoolStatus = await client.getPoolStatus(blockHash); 
-...
-```
-
 ## Check block for transfers with memo
 The following example demonstrates how to check and parse a block 
 for transfers with a memo.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@concordium/node-sdk",
-    "version": "0.7.0",
+    "version": "0.7.1",
     "description": "Helpers for interacting with the Concordium node",
     "repository": {
         "type": "git",

src/client.ts

@@ -8,7 +8,6 @@ import {
     BlockHeight,
     Empty,
     GetAddressInfoRequest,
-    GetPoolStatusRequest,
     GetModuleSourceRequest,
     PeerListResponse,
     PeersRequest,
@@ -27,10 +26,11 @@ import {
     AccountTransaction,
     AccountTransactionSignature,
     ArInfo,
-    ReduceStakePendingChange,
-    RemovalPendingChange,
+    BakerReduceStakePendingChange,
+    BakerRemovalPendingChange,
     BlockInfo,
     BlockSummary,
+    ChainParameters,
     ConsensusStatus,
     ContractAddress,
     CredentialDeploymentTransaction,
@@ -49,24 +49,9 @@ import {
     Versioned,
     InstanceInfo,
     InstanceInfoSerialized,
-    BakerId,
-    ChainParametersV0,
-    ChainParametersV1,
-    PoolStatus,
-    BakerPoolStatusDetails,
-    CurrentPaydayBakerPoolStatus,
-    LPoolStatusDetails,
-    KeysMatching,
-    BakerPoolPendingChangeReduceBakerCapitalDetails,
-    LPoolStatus,
-    BakerPoolStatus,
-    RewardStatusV0,
-    RewardStatus,
-    RewardStatusV1,
 } from './types';
 import {
     buildJsonResponseReviver,
-    intListToStringList,
     intToStringTransformer,
     isValidHash,
     unwrapBoolResponse,
@@ -75,7 +60,6 @@ import {
 import { GtuAmount } from './types/gtuAmount';
 import { ModuleReference } from './types/moduleReference';
 import { Buffer as BufferFormater } from 'buffer/';
-
 /**
  * A concordium-node specific gRPC client wrapper.
  *
@@ -227,8 +211,8 @@ export default class ConcordiumNodeClient {
             | keyof AccountReleaseSchedule
             | keyof ReleaseSchedule
             | keyof AccountBakerDetails
-            | keyof ReduceStakePendingChange
-            | keyof RemovalPendingChange
+            | keyof BakerReduceStakePendingChange
+            | keyof BakerRemovalPendingChange
         )[] = [
             'accountAmount',
             'accountNonce',
@@ -334,7 +318,7 @@ export default class ConcordiumNodeClient {
             | keyof PartyInfo
             | keyof FinalizationData
             | keyof TransactionSummary
-            | keyof (ChainParametersV0 & ChainParametersV1)
+            | keyof ChainParameters
             | keyof ExchangeRate
             | keyof UpdateQueue
             | keyof KeysWithThreshold
@@ -348,23 +332,15 @@ export default class ConcordiumNodeClient {
             'cost',
             'energyCost',
             'index',
+            'bakerCooldownEpochs',
+            'minimumThresholdForBaking',
             'foundationAccountIndex',
             'numerator',
             'denominator',
             'nextSequenceNumber',
             'amount',
             'index',
             'subindex',
-
-            // v0 keys
-            'bakerCooldownEpochs',
-            'minimumThresholdForBaking',
-
-            // v1 keys
-            'rewardPeriodLength',
-            'minimumEquityCapital',
-            'poolOwnerCooldown',
-            'delegatorCooldown',
         ];
 
         return unwrapJsonResponse<BlockSummary>(
@@ -625,140 +601,6 @@ export default class ConcordiumNodeClient {
         }
     }
 
-    async getRewardStatus(
-        blockHash: string
-    ): Promise<RewardStatus | undefined> {
-        if (!isValidHash(blockHash)) {
-            throw new Error('The input was not a valid hash: ' + blockHash);
-        }
-
-        type DateKey = KeysMatching<RewardStatusV1, Date>;
-        type BigIntKey = KeysMatching<RewardStatusV0 & RewardStatusV1, bigint>;
-
-        const dates: DateKey[] = ['nextPaydayTime'];
-        const bigInts: BigIntKey[] = [
-            'protocolVersion',
-            'gasAccount',
-            'totalAmount',
-            'totalStakedCapital',
-            'bakingRewardAccount',
-            'totalEncryptedAmount',
-            'finalizationRewardAccount',
-            'foundationTransactionRewards',
-        ];
-
-        const bh = new BlockHash();
-        bh.setBlockHash(blockHash);
-
-        const response = await this.sendRequest(
-            this.client.getRewardStatus,
-            bh
-        );
-
-        return unwrapJsonResponse<RewardStatus>(
-            response,
-            buildJsonResponseReviver(dates, bigInts),
-            intToStringTransformer(bigInts)
-        );
-    }
-
-    /**
-     * Retrieve list of bakers on the network.
-     * @param blockHash the block hash to get the smart contact instances at
-     * @returns A JSON list of baker IDs
-     */
-    async getBakerList(blockHash: string): Promise<BakerId[] | undefined> {
-        if (!isValidHash(blockHash)) {
-            throw new Error('The input was not a valid hash: ' + blockHash);
-        }
-
-        const bh = new BlockHash();
-        bh.setBlockHash(blockHash);
-
-        const response = await this.sendRequest(this.client.getBakerList, bh);
-
-        return unwrapJsonResponse<BakerId[]>(
-            response,
-            undefined,
-            intListToStringList
-        )?.map((v) => BigInt(v));
-    }
-
-    /**
-     * Gets the status the L-pool.
-     * @param blockHash the block hash the status at
-     * @returns The status of the L-pool.
-     */
-    async getPoolStatus(blockHash: string): Promise<LPoolStatus | undefined>;
-    /**
-     * Gets the status a baker.
-     * @param blockHash the block hash the status at
-     * @param bakerId the ID of the baker to get the status for.
-     * @returns The status of the corresponding baker pool.
-     */
-    async getPoolStatus(
-        blockHash: string,
-        bakerId: BakerId
-    ): Promise<BakerPoolStatus | undefined>;
-    /**
-     * Gets the status of either a baker, if a baker ID is supplied, or the L-pool if left undefined.
-     * @param blockHash the block hash the status at
-     * @param [bakerId] the ID of the baker to get the status for. If left undefined, the status of the L-pool is returned.
-     * @returns The status of the corresponding pool.
-     */
-    async getPoolStatus(
-        blockHash: string,
-        bakerId?: BakerId
-    ): Promise<PoolStatus | undefined>;
-    async getPoolStatus(
-        blockHash: string,
-        bakerId?: BakerId
-    ): Promise<PoolStatus | undefined> {
-        if (!isValidHash(blockHash)) {
-            throw new Error('The input was not a valid hash: ' + blockHash);
-        }
-
-        const req = new GetPoolStatusRequest();
-        req.setBlockHash(blockHash);
-        req.setLPool(bakerId === undefined);
-
-        if (bakerId !== undefined) {
-            req.setBakerId(bakerId.toString());
-        }
-
-        type DateKey = KeysMatching<
-            BakerPoolPendingChangeReduceBakerCapitalDetails,
-            Date
-        >;
-        type BigIntKey = KeysMatching<
-            BakerPoolStatusDetails &
-                LPoolStatusDetails &
-                CurrentPaydayBakerPoolStatus,
-            bigint
-        >;
-
-        const dates: DateKey[] = ['effectiveTime'];
-        const bigInts: BigIntKey[] = [
-            'bakerId',
-            'bakerEquityCapital',
-            'delegatedCapital',
-            'delegatedCapitalCap',
-            'currentPaydayTransactionFeesEarned',
-            'currentPaydayDelegatedCapital',
-            'blocksBaked',
-            'transactionFeesEarned',
-            'effectiveStake',
-        ];
-
-        const response = await this.sendRequest(this.client.getPoolStatus, req);
-
-        return unwrapJsonResponse<PoolStatus>(
-            response,
-            buildJsonResponseReviver(dates, bigInts),
-            intToStringTransformer(bigInts)
-        );
-    }
-
     async getModuleSource(
         blockHash: string,
         moduleReference: ModuleReference

src/index.ts

@@ -40,4 +40,3 @@ export {
 } from './credentialDeploymentTransactions';
 export { isAlias, getAlias } from './alias';
 export { deserializeContractState } from './deserialization';
-export * from './blockSummaryHelpers';