Solana: Settler tests refactor #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

GuidoDipietro wants to merge 76 commits into solana/settler from solana/test-refactor

packages/svm/programs/controller/src/types/entity_type.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,9 +3,9 @@ use anchor_lang::prelude::*;
  
    #[repr(u8)]

    #[derive(Copy, Clone, AnchorSerialize, AnchorDeserialize)]

    pub enum EntityType {

        Validator = 1,

        Axia = 2,

        Solver = 3,

        Validator = 0,

        Axia = 1,

        Solver = 2,

    }

    impl anchor_lang::Space for EntityType {

packages/svm/programs/settler/src/instructions/add_axia_sig.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,14 +16,14 @@ pub struct AddAxiaSig<'info> { @@
         pub solver: Signer<'info>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Solver as u8 + 1], solver.key().as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Solver as u8], solver.key().as_ref()],
             bump = solver_registry.bump,
             seeds::program = controller::ID,
         )]
         pub solver_registry: Box<Account<'info, EntityRegistry>>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Axia as u8 + 1], axia_registry.entity_pubkey.as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Axia as u8], axia_registry.entity_pubkey.as_ref()],
             bump = axia_registry.bump,
             seeds::program = controller::ID,
         )]
@@ Expand Down @@

packages/svm/programs/settler/src/instructions/add_validator_sig.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ pub struct AddValidatorSig<'info> { @@
         pub solver: Signer<'info>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Solver as u8 + 1], solver.key().as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Solver as u8], solver.key().as_ref()],
             bump = solver_registry.bump,
             seeds::program = controller::ID,
         )]
@@ Expand All / @@ -38,7 +38,7 @@ pub struct AddValidatorSig<'info> { @@
         pub fulfilled_intent: SystemAccount<'info>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Validator as u8 + 1], validator_registry.entity_pubkey.as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Validator as u8], validator_registry.entity_pubkey.as_ref()],
             bump = validator_registry.bump,
             seeds::program = controller::ID,
         )]
@@ Expand Down @@

packages/svm/programs/settler/src/instructions/create_intent.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ pub struct CreateIntent<'info> { @@
         pub solver: Signer<'info>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Solver as u8 + 1], solver.key().as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Solver as u8], solver.key().as_ref()],
             bump = solver_registry.bump,
             seeds::program = controller::ID
         )]
@@ Expand Down @@

packages/svm/programs/settler/src/instructions/create_proposal.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ pub struct CreateProposal<'info> { @@
         pub solver: Signer<'info>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Solver as u8 + 1], solver.key().as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Solver as u8], solver.key().as_ref()],
             bump = solver_registry.bump,
             seeds::program = controller::ID,
         )]
@@ Expand Down @@

packages/svm/programs/settler/src/instructions/execute_proposal.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ pub struct ExecuteProposal<'info> { @@
         pub solver: Signer<'info>,
         #[account(
-            seeds = [b"entity-registry", &[EntityType::Solver as u8 + 1], solver.key().as_ref()],
+            seeds = [b"entity-registry", &[EntityType::Solver as u8], solver.key().as_ref()],
             bump = solver_registry.bump,
             seeds::program = controller::ID,
         )]
@@ Expand Down @@

packages/svm/sdks/controller/Controller.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,9 +4,9 @@ import * as ControllerIDL from '../../target/idl/controller.json'
  
    import { Controller } from '../../target/types/controller'

    export const EntityType = {

      Validator: 1,

      Axia: 2,

      Solver: 3,

      Validator: 0,

      Axia: 1,

      Solver: 2,

    } as const

    export type EntityType = (typeof EntityType)[keyof typeof EntityType]

packages/svm/sdks/settler/Settler.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,6 +6,7 @@ import { Settler } from '../../target/types/settler'
  
    import { EntityType } from '../controller/Controller'

    import {

      CreateIntentParams,

      CreateProposalParams,

      ExtendIntentParams,

      IntentEvent,

      OpType,

    @@ -111,18 +112,13 @@ export default class SettlerSDK {
  
        return ix

      }

      async createProposalIx(

        intentHashHex: string,

        instructions: ProposalInstruction[],

        fees: TokenFee[],

        deadline: number,

        isFinal = true

      ): Promise<web3.TransactionInstruction> {

      async createProposalIx(intentHashHex: string, params: CreateProposalParams): Promise<web3.TransactionInstruction> {

        const { instructions, fees, deadline, isFinal } = params

        const parsedInstructions = this.parseProposalInstructions(instructions)

        const parsedFees = this.parseTokenFees(fees)

        const ix = await this.program.methods

          .createProposal(parsedInstructions, parsedFees, new BN(deadline), isFinal)

          .createProposal(parsedInstructions, parsedFees, new BN(deadline), isFinal ?? false)

          .accountsPartial({

            solver: this.getSignerKey(),

            solverRegistry: this.getEntityRegistryPubkey(EntityType.Solver, this.getSignerKey()),

    @@ -225,15 +221,13 @@ export default class SettlerSDK {
  
      }

      getIntentKey(intentHashHex: string): web3.PublicKey {

        const intentHash = Buffer.from(intentHashHex, 'hex')

        if (intentHash.length != 32) throw new Error(`Intent hash must be 32 bytes: ${intentHashHex}`)

        const intentHash = Buffer.from(this.parseIntentHashHex(intentHashHex))

        return web3.PublicKey.findProgramAddressSync([Buffer.from('intent'), intentHash], this.program.programId)[0]

      }

      getFulfilledIntentKey(intentHashHex: string): web3.PublicKey {

        const intentHash = Buffer.from(intentHashHex, 'hex')

        if (intentHash.length != 32) throw new Error(`Intent hash must be 32 bytes: ${intentHashHex}`)

        const intentHash = Buffer.from(this.parseIntentHashHex(intentHashHex))

        return web3.PublicKey.findProgramAddressSync(

          [Buffer.from('fulfilled-intent'), intentHash],

    @@ -242,8 +236,7 @@ export default class SettlerSDK {
  
      }

      getProposalKey(intentHashHex: string, solverPubkey?: web3.PublicKey): web3.PublicKey {

        const intentHash = Buffer.from(intentHashHex, 'hex')

        if (intentHash.length != 32) throw new Error(`Intent hash must be 32 bytes: ${intentHashHex}`)

        this.parseIntentHashHex(intentHashHex)

        const intentKey = this.getIntentKey(intentHashHex)

        const solver = solverPubkey || this.getSignerKey()

    @@ -275,13 +268,13 @@ export default class SettlerSDK {
  
      }

      private parseIntentHashHex(intentHashHex: string): number[] {

        const intentHash = Buffer.from(intentHashHex, 'hex')

        const intentHash = Buffer.from(intentHashHex.slice(2), 'hex')

        if (intentHash.length != 32) throw new Error(`Intent hash must be 32 bytes: ${intentHashHex}`)

        return Array.from(intentHash)

      }

      private parseIntentNonceHex(nonceHex: string): number[] {

        const nonce = Buffer.from(nonceHex, 'hex')

        const nonce = Buffer.from(nonceHex.slice(2), 'hex')

        if (nonce.length != 32) throw new Error(`Nonce must be 32 bytes: ${nonceHex}`)

        return Array.from(nonce)

      }

packages/svm/sdks/settler/types.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,13 @@ export type ExtendIntentParams = { @@
       moreEventsHex?: IntentEvent[]
     }
+    export type CreateProposalParams = {
+      instructions: ProposalInstruction[]
+      fees: TokenFee[]
+      deadline: number
+      isFinal?: boolean
+    }
     export type ProposalInstructionAccountMeta = {
       pubkey: web3.PublicKey
       isSigner: boolean
@@ Expand Down @@

packages/svm/tests/controller.test.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ import path from 'path' @@
     import ControllerSDK, { EntityType } from '../sdks/controller/Controller'
     import * as ControllerIDL from '../target/idl/controller.json'
     import { Controller } from '../target/types/controller'
-    import { expectTransactionError, randomKeypair, randomPubkey, toLamports } from './helpers/helpers'
+    import { expectTransactionError, randomKeypair, randomPubkey, toLamports } from './helpers'
     import { makeTxSignAndSend, warpSeconds } from './utils'
     describe('Controller', () => {
@@ Expand Down @@

packages/svm/tests/helpers/constants.ts

-Original file line number
+Diff line change
@@ Expand Up @@
     // Test constants for data
     export const DEFAULT_DATA_HEX = '010203'
-    export const DEFAULT_TOPIC_HEX = Buffer.from(Array(32).fill(1)).toString('hex')
+    export const DEFAULT_TOPIC_HEX = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
     export const DEFAULT_EVENT_DATA_HEX = '040506'
     export const EMPTY_DATA_HEX = ''
     export const TEST_DATA_HEX_1 = '070809'
@@ Expand Down @@

packages/svm/tests/helpers/controller.ts

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    import { Keypair } from '@solana/web3.js'
+    import { LiteSVMProvider } from 'anchor-litesvm'
+    import ControllerSDK, { EntityType } from '../../sdks/controller/Controller'
+    import { makeTxSignAndSend } from '../utils'
+    /**
+     * Creates an allowlisted entity (validator, axia, or solver)
+     */
+    export async function createAllowlistedEntity(
+      controllerSdk: ControllerSDK,
+      provider: LiteSVMProvider,
+      entityType: EntityType,
+      entityKeypair?: Keypair
+    ): Promise<Keypair> {
+      const entity = entityKeypair || Keypair.generate()
+      const allowlistIx = await controllerSdk.setAllowedEntityIx(entityType, entity.publicKey)
+      await makeTxSignAndSend(provider, allowlistIx)
+      return entity
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Solana: Settler tests refactor #53

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Solana: Settler tests refactor #53

Are you sure you want to change the base?

Uh oh!

Solana: Settler tests refactor #53

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!