fix: conflicts

Author: aoikurokawa

clients/js/jito_tip_router/accounts/ballotBox.ts

@@ -13,10 +13,14 @@ import {
   decodeAccount,
   fetchEncodedAccount,
   fetchEncodedAccounts,
+  fixDecoderSize,
+  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
   getArrayDecoder,
   getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU64Decoder,
@@ -33,6 +37,7 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
+  type ReadonlyUint8Array,
 } from '@solana/web3.js';
 import {
   getBallotDecoder,
@@ -56,7 +61,7 @@ export type BallotBox = {
   bump: number;
   slotCreated: bigint;
   slotConsensusReached: bigint;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
   operatorsVoted: bigint;
   uniqueBallots: bigint;
   winningBallot: Ballot;
@@ -71,7 +76,7 @@ export type BallotBoxArgs = {
   bump: number;
   slotCreated: number | bigint;
   slotConsensusReached: number | bigint;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
   operatorsVoted: number | bigint;
   uniqueBallots: number | bigint;
   winningBallot: BallotArgs;
@@ -87,7 +92,7 @@ export function getBallotBoxEncoder(): Encoder<BallotBoxArgs> {
     ['bump', getU8Encoder()],
     ['slotCreated', getU64Encoder()],
     ['slotConsensusReached', getU64Encoder()],
-    ['reserved', getArrayEncoder(getU8Encoder(), { size: 128 })],
+    ['reserved', fixEncoderSize(getBytesEncoder(), 128)],
     ['operatorsVoted', getU64Encoder()],
     ['uniqueBallots', getU64Encoder()],
     ['winningBallot', getBallotEncoder()],
@@ -104,7 +109,7 @@ export function getBallotBoxDecoder(): Decoder<BallotBox> {
     ['bump', getU8Decoder()],
     ['slotCreated', getU64Decoder()],
     ['slotConsensusReached', getU64Decoder()],
-    ['reserved', getArrayDecoder(getU8Decoder(), { size: 128 })],
+    ['reserved', fixDecoderSize(getBytesDecoder(), 128)],
     ['operatorsVoted', getU64Decoder()],
     ['uniqueBallots', getU64Decoder()],
     ['winningBallot', getBallotDecoder()],

clients/js/jito_tip_router/accounts/baseRewardRouter.ts

@@ -13,10 +13,14 @@ import {
   decodeAccount,
   fetchEncodedAccount,
   fetchEncodedAccounts,
+  fixDecoderSize,
+  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
   getArrayDecoder,
   getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU16Decoder,
@@ -35,6 +39,7 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
+  type ReadonlyUint8Array,
 } from '@solana/web3.js';
 import {
   getBaseRewardRouterRewardsDecoder,
@@ -56,7 +61,7 @@ export type BaseRewardRouter = {
   totalRewards: bigint;
   rewardPool: bigint;
   rewardsProcessed: bigint;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
   lastNcnGroupIndex: number;
   lastVoteIndex: number;
   lastRewardsToProcess: bigint;
@@ -74,7 +79,7 @@ export type BaseRewardRouterArgs = {
   totalRewards: number | bigint;
   rewardPool: number | bigint;
   rewardsProcessed: number | bigint;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
   lastNcnGroupIndex: number;
   lastVoteIndex: number;
   lastRewardsToProcess: number | bigint;
@@ -93,7 +98,7 @@ export function getBaseRewardRouterEncoder(): Encoder<BaseRewardRouterArgs> {
     ['totalRewards', getU64Encoder()],
     ['rewardPool', getU64Encoder()],
     ['rewardsProcessed', getU64Encoder()],
-    ['reserved', getArrayEncoder(getU8Encoder(), { size: 128 })],
+    ['reserved', fixEncoderSize(getBytesEncoder(), 128)],
     ['lastNcnGroupIndex', getU8Encoder()],
     ['lastVoteIndex', getU16Encoder()],
     ['lastRewardsToProcess', getU64Encoder()],
@@ -122,7 +127,7 @@ export function getBaseRewardRouterDecoder(): Decoder<BaseRewardRouter> {
     ['totalRewards', getU64Decoder()],
     ['rewardPool', getU64Decoder()],
     ['rewardsProcessed', getU64Decoder()],
-    ['reserved', getArrayDecoder(getU8Decoder(), { size: 128 })],
+    ['reserved', fixDecoderSize(getBytesDecoder(), 128)],
     ['lastNcnGroupIndex', getU8Decoder()],
     ['lastVoteIndex', getU16Decoder()],
     ['lastRewardsToProcess', getU64Decoder()],

clients/js/jito_tip_router/accounts/config.ts

@@ -13,10 +13,12 @@ import {
   decodeAccount,
   fetchEncodedAccount,
   fetchEncodedAccounts,
+  fixDecoderSize,
+  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
-  getArrayDecoder,
-  getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU64Decoder,
@@ -33,6 +35,7 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
+  type ReadonlyUint8Array,
 } from '@solana/web3.js';
 import {
   getFeeConfigDecoder,
@@ -50,7 +53,7 @@ export type Config = {
   epochsBeforeStall: bigint;
   feeConfig: FeeConfig;
   bump: number;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
 };
 
 export type ConfigArgs = {
@@ -62,7 +65,7 @@ export type ConfigArgs = {
   epochsBeforeStall: number | bigint;
   feeConfig: FeeConfigArgs;
   bump: number;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
 };
 
 export function getConfigEncoder(): Encoder<ConfigArgs> {
@@ -75,7 +78,7 @@ export function getConfigEncoder(): Encoder<ConfigArgs> {
     ['epochsBeforeStall', getU64Encoder()],
     ['feeConfig', getFeeConfigEncoder()],
     ['bump', getU8Encoder()],
-    ['reserved', getArrayEncoder(getU8Encoder(), { size: 127 })],
+    ['reserved', fixEncoderSize(getBytesEncoder(), 127)],
   ]);
 }
 
@@ -89,7 +92,7 @@ export function getConfigDecoder(): Decoder<Config> {
     ['epochsBeforeStall', getU64Decoder()],
     ['feeConfig', getFeeConfigDecoder()],
     ['bump', getU8Decoder()],
-    ['reserved', getArrayDecoder(getU8Decoder(), { size: 127 })],
+    ['reserved', fixDecoderSize(getBytesDecoder(), 127)],
   ]);
 }
 

clients/js/jito_tip_router/accounts/epochSnapshot.ts

@@ -13,10 +13,12 @@ import {
   decodeAccount,
   fetchEncodedAccount,
   fetchEncodedAccounts,
+  fixDecoderSize,
+  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
-  getArrayDecoder,
-  getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU64Decoder,
@@ -33,6 +35,7 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
+  type ReadonlyUint8Array,
 } from '@solana/web3.js';
 import {
   getFeesDecoder,
@@ -58,7 +61,7 @@ export type EpochSnapshot = {
   operatorsRegistered: bigint;
   validOperatorVaultDelegations: bigint;
   stakeWeights: StakeWeights;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
 };
 
 export type EpochSnapshotArgs = {
@@ -74,7 +77,7 @@ export type EpochSnapshotArgs = {
   operatorsRegistered: number | bigint;
   validOperatorVaultDelegations: number | bigint;
   stakeWeights: StakeWeightsArgs;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
 };
 
 export function getEpochSnapshotEncoder(): Encoder<EpochSnapshotArgs> {
@@ -91,7 +94,7 @@ export function getEpochSnapshotEncoder(): Encoder<EpochSnapshotArgs> {
     ['operatorsRegistered', getU64Encoder()],
     ['validOperatorVaultDelegations', getU64Encoder()],
     ['stakeWeights', getStakeWeightsEncoder()],
-    ['reserved', getArrayEncoder(getU8Encoder(), { size: 128 })],
+    ['reserved', fixEncoderSize(getBytesEncoder(), 128)],
   ]);
 }
 
@@ -109,7 +112,7 @@ export function getEpochSnapshotDecoder(): Decoder<EpochSnapshot> {
     ['operatorsRegistered', getU64Decoder()],
     ['validOperatorVaultDelegations', getU64Decoder()],
     ['stakeWeights', getStakeWeightsDecoder()],
-    ['reserved', getArrayDecoder(getU8Decoder(), { size: 128 })],
+    ['reserved', fixDecoderSize(getBytesDecoder(), 128)],
   ]);
 }
 

clients/js/jito_tip_router/accounts/epochState.ts

@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 import {
@@ -13,10 +13,14 @@ import {
   decodeAccount,
   fetchEncodedAccount,
   fetchEncodedAccounts,
+  fixDecoderSize,
+  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
   getArrayDecoder,
   getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU64Decoder,
@@ -33,6 +37,7 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
+  type ReadonlyUint8Array,
 } from '@solana/web3.js';
 import {
   getEpochAccountStatusDecoder,
@@ -63,7 +68,7 @@ export type EpochState = {
   totalDistributionProgress: Progress;
   baseDistributionProgress: Progress;
   ncnDistributionProgress: Array<Progress>;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
 };
 
 export type EpochStateArgs = {
@@ -84,7 +89,7 @@ export type EpochStateArgs = {
   totalDistributionProgress: ProgressArgs;
   baseDistributionProgress: ProgressArgs;
   ncnDistributionProgress: Array<ProgressArgs>;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
 };
 
 export function getEpochStateEncoder(): Encoder<EpochStateArgs> {
@@ -112,7 +117,7 @@ export function getEpochStateEncoder(): Encoder<EpochStateArgs> {
       'ncnDistributionProgress',
       getArrayEncoder(getProgressEncoder(), { size: 2048 }),
     ],
-    ['reserved', getArrayEncoder(getU8Encoder(), { size: 1024 })],
+    ['reserved', fixEncoderSize(getBytesEncoder(), 1024)],
   ]);
 }
 
@@ -141,7 +146,7 @@ export function getEpochStateDecoder(): Decoder<EpochState> {
       'ncnDistributionProgress',
       getArrayDecoder(getProgressDecoder(), { size: 2048 }),
     ],
-    ['reserved', getArrayDecoder(getU8Decoder(), { size: 1024 })],
+    ['reserved', fixDecoderSize(getBytesDecoder(), 1024)],
   ]);
 }
 

clients/js/jito_tip_router/accounts/ncnRewardRouter.ts

@@ -13,10 +13,14 @@ import {
   decodeAccount,
   fetchEncodedAccount,
   fetchEncodedAccounts,
+  fixDecoderSize,
+  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
   getArrayDecoder,
   getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU16Decoder,
@@ -35,6 +39,7 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
+  type ReadonlyUint8Array,
 } from '@solana/web3.js';
 import {
   getNcnFeeGroupDecoder,
@@ -59,7 +64,7 @@ export type NcnRewardRouter = {
   rewardPool: bigint;
   rewardsProcessed: bigint;
   operatorRewards: bigint;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
   lastRewardsToProcess: bigint;
   lastVaultOperatorDelegationIndex: number;
   vaultRewardRoutes: Array<VaultRewardRoute>;
@@ -77,7 +82,7 @@ export type NcnRewardRouterArgs = {
   rewardPool: number | bigint;
   rewardsProcessed: number | bigint;
   operatorRewards: number | bigint;
-  reserved: Array<number>;
+  reserved: ReadonlyUint8Array;
   lastRewardsToProcess: number | bigint;
   lastVaultOperatorDelegationIndex: number;
   vaultRewardRoutes: Array<VaultRewardRouteArgs>;
@@ -96,7 +101,7 @@ export function getNcnRewardRouterEncoder(): Encoder<NcnRewardRouterArgs> {
     ['rewardPool', getU64Encoder()],
     ['rewardsProcessed', getU64Encoder()],
     ['operatorRewards', getU64Encoder()],
-    ['reserved', getArrayEncoder(getU8Encoder(), { size: 128 })],
+    ['reserved', fixEncoderSize(getBytesEncoder(), 128)],
     ['lastRewardsToProcess', getU64Encoder()],
     ['lastVaultOperatorDelegationIndex', getU16Encoder()],
     [
@@ -119,7 +124,7 @@ export function getNcnRewardRouterDecoder(): Decoder<NcnRewardRouter> {
     ['rewardPool', getU64Decoder()],
     ['rewardsProcessed', getU64Decoder()],
     ['operatorRewards', getU64Decoder()],
-    ['reserved', getArrayDecoder(getU8Decoder(), { size: 128 })],
+    ['reserved', fixDecoderSize(getBytesDecoder(), 128)],
     ['lastRewardsToProcess', getU64Decoder()],
     ['lastVaultOperatorDelegationIndex', getU16Decoder()],
     [