feat(tooling-sdk): Sync json/graphql rpc schema changes to TS SDK (#3637

) * feat(tooling-sdk): Sync json/graphql rpc schema changes to TS SDK * fix: replace protocolPubKey with authorityPubKey --------- Co-authored-by: Begoña Alvarez <[email protected]>
iotaledger · Oct 24, 2024 · 3dd596f · 3dd596f
1 parent 4db2c12
commit 3dd596f
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 77 deletions.
diff --git a/sdk/graphql-transport/src/generated/queries.ts b/sdk/graphql-transport/src/generated/queries.ts
diff --git a/sdk/graphql-transport/src/mappers/validator.ts b/sdk/graphql-transport/src/mappers/validator.ts
@@ -26,10 +26,9 @@ export function mapGraphQlValidatorToRpcValidator(
         nextEpochP2pAddress: validator.nextEpochCredentials?.p2PAddress,
         nextEpochPrimaryAddress: validator.nextEpochCredentials?.primaryAddress,
         nextEpochProofOfPossession: validator.nextEpochCredentials?.proofOfPossession,
-        nextEpochProtocolPubkeyBytes: validator.nextEpochCredentials?.protocolPubKey,
+        nextEpochAuthorityPubkeyBytes: validator.nextEpochCredentials?.authorityPubKey,
         nextEpochStake: validator.nextEpochStake!,
-        nextEpochWorkerAddress: validator.nextEpochCredentials?.workerAddress,
-        nextEpochWorkerPubkeyBytes: validator.nextEpochCredentials?.workerPubKey,
+        nextEpochProtocolPubkeyBytes: validator.nextEpochCredentials?.protocolPubKey,
         operationCapId: validator.operationCap?.address!,
         p2pAddress: validator.credentials?.p2PAddress!,
         pendingTotalIotaWithdraw: validator.pendingTotalIotaWithdraw,
@@ -39,14 +38,13 @@ export function mapGraphQlValidatorToRpcValidator(
         primaryAddress: validator.credentials?.primaryAddress!,
         projectUrl: validator.projectUrl!,
         proofOfPossessionBytes: validator.credentials?.proofOfPossession,
+        authorityPubkeyBytes: validator.credentials?.authorityPubKey,
         protocolPubkeyBytes: validator.credentials?.protocolPubKey,
         rewardsPool: validator.rewardsPool,
         stakingPoolId: validator.stakingPool?.address!,
         stakingPoolActivationEpoch: validator.stakingPoolActivationEpoch?.toString(),
         stakingPoolIotaBalance: validator.stakingPoolIotaBalance,
         iotaAddress: validator.address.address,
         votingPower: validator.votingPower?.toString()!,
-        workerAddress: validator.credentials?.workerAddress!,
-        workerPubkeyBytes: validator.credentials?.workerPubKey,
     };
 }
diff --git a/sdk/graphql-transport/src/methods.ts b/sdk/graphql-transport/src/methods.ts
@@ -1235,7 +1235,7 @@ export const RPC_METHODS: {
         return {
             epoch: epochId.toString(),
             validators: validatorSet?.activeValidators?.nodes.map((val) => [
-                val.credentials?.protocolPubKey!,
+                val.credentials?.authorityPubKey!,
                 String(val.votingPower),
             ])!,
         };

diff --git a/sdk/graphql-transport/src/queries/getCommitteeInfo.graphql b/sdk/graphql-transport/src/queries/getCommitteeInfo.graphql
@@ -13,7 +13,7 @@ query getCommitteeInfo($epochId: UInt53, $after: String) {
                 }
                 nodes {
                     credentials {
-                        protocolPubKey
+                        authorityPubKey
                     }
                     votingPower
                 }

diff --git a/sdk/graphql-transport/src/queries/getCurrentEpoch.graphql b/sdk/graphql-transport/src/queries/getCurrentEpoch.graphql
@@ -93,8 +93,7 @@ fragment RPC_CREDENTIAL_FIELDS on ValidatorCredentials {
     networkPubKey
     p2PAddress
     primaryAddress
-    workerPubKey
-    workerAddress
+    authorityPubKey
     proofOfPossession
     protocolPubKey
 }
diff --git a/sdk/move-bytecode-template/Cargo.lock b/sdk/move-bytecode-template/Cargo.lock
diff --git a/sdk/typescript/package.json b/sdk/typescript/package.json
@@ -102,9 +102,8 @@
         "eslint:fix": "pnpm run eslint:check --fix",
         "lint": "pnpm run eslint:check && pnpm run prettier:check",
         "lint:fix": "pnpm run eslint:fix && pnpm run prettier:fix",
-        "update-graphql-schema": "pnpm run generate-schema -c src/graphql/generated/2024.10/tsconfig.tada.json",
         "update-graphql-schemas": "pnpm tsx scripts/update-graphql-schemas.ts",
-        "update-open-rpc-schema": "pnpm tsx scripts/generate.ts",
+        "update-open-rpc-client-types": "pnpm tsx scripts/generate.ts",
         "generate-schema": "gql.tada generate-output"
     },
     "bugs": {

diff --git a/sdk/typescript/src/client/types/generated.ts b/sdk/typescript/src/client/types/generated.ts
@@ -800,6 +800,7 @@ export type IotaTransactionBlockBuilderMode = 'Commit' | 'DevInspect';
  * fields so that they are decoupled from the internal definitions.
  */
 export interface IotaValidatorSummary {
+    authorityPubkeyBytes: string;
     commissionRate: string;
     description: string;
     /** ID of the exchange rate table object. */
@@ -812,6 +813,7 @@ export interface IotaValidatorSummary {
     name: string;
     netAddress: string;
     networkPubkeyBytes: string;
+    nextEpochAuthorityPubkeyBytes?: string | null;
     nextEpochCommissionRate: string;
     nextEpochGasPrice: string;
     nextEpochNetAddress?: string | null;
@@ -821,8 +823,6 @@ export interface IotaValidatorSummary {
     nextEpochProofOfPossession?: string | null;
     nextEpochProtocolPubkeyBytes?: string | null;
     nextEpochStake: string;
-    nextEpochWorkerAddress?: string | null;
-    nextEpochWorkerPubkeyBytes?: string | null;
     operationCapId: string;
     p2pAddress: string;
     /** Pending pool token withdrawn during the current epoch, emptied at epoch boundaries. */
@@ -848,8 +848,6 @@ export interface IotaValidatorSummary {
     /** The total number of IOTA tokens in this pool. */
     stakingPoolIotaBalance: string;
     votingPower: string;
-    workerAddress: string;
-    workerPubkeyBytes: string;
 }
 export interface MoveCallMetrics {
     /** The count of calls of each function in the last 30 days. */
@@ -1114,7 +1112,7 @@ export type ObjectResponseError =
           code: 'unknown';
       }
     | {
-          code: 'displayError';
+          code: 'display';
           error: string;
       };
 export interface IotaObjectResponseQuery {

diff --git a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql