chore: restructure program files

web3.js/src/index.ts

@@ -1,25 +1,19 @@
 export * from './account';
-export * from './address-lookup-table-program';
 export * from './blockhash';
 export * from './bpf-loader-deprecated';
 export * from './bpf-loader';
-export * from './compute-budget';
 export * from './connection';
 export * from './epoch-schedule';
-export * from './ed25519-program';
 export * from './fee-calculator';
 export * from './keypair';
 export * from './loader';
 export * from './message';
 export * from './nonce-account';
+export * from './programs';
 export * from './publickey';
-export * from './stake-program';
-export * from './system-program';
-export * from './secp256k1-program';
 export * from './transaction';
 export * from './validator-info';
 export * from './vote-account';
-export * from './vote-program';
 export * from './sysvar';
 export * from './errors';
 export * from './util/borsh-schema';

web3.js/src/loader.ts

@@ -8,7 +8,7 @@ import {sendAndConfirmTransaction} from './util/send-and-confirm-transaction';
 import {sleep} from './util/sleep';
 import type {Connection} from './connection';
 import type {Signer} from './keypair';
-import {SystemProgram} from './system-program';
+import {SystemProgram} from './programs/system';
 import {IInstructionInputData} from './instruction';
 
 // Keep program chunks under PACKET_DATA_SIZE, leaving enough room for the

web3.js/src/programs/address-lookup-table.ts

@@ -1,12 +1,12 @@
 import {toBufferLE} from 'bigint-buffer';
 import * as BufferLayout from '@solana/buffer-layout';
 
-import * as Layout from './layout';
-import {PublicKey} from './publickey';
-import * as bigintLayout from './util/bigint';
-import {SystemProgram} from './system-program';
-import {TransactionInstruction} from './transaction';
-import {decodeData, encodeData, IInstructionInputData} from './instruction';
+import * as Layout from '../layout';
+import {PublicKey} from '../publickey';
+import * as bigintLayout from '../util/bigint';
+import {SystemProgram} from './system';
+import {TransactionInstruction} from '../transaction';
+import {decodeData, encodeData, IInstructionInputData} from '../instruction';
 
 export type CreateLookupTableParams = {
   /** Account used to derive and control the new address lookup table. */

web3.js/src/programs/compute-budget.ts

@@ -5,10 +5,10 @@ import {
   decodeData,
   InstructionType,
   IInstructionInputData,
-} from './instruction';
-import {PublicKey} from './publickey';
-import {TransactionInstruction} from './transaction';
-import {u64} from './util/bigint';
+} from '../instruction';
+import {PublicKey} from '../publickey';
+import {TransactionInstruction} from '../transaction';
+import {u64} from '../util/bigint';
 
 /**
  * Compute Budget Instruction class

web3.js/src/programs/ed25519.ts

@@ -2,10 +2,10 @@ import {Buffer} from 'buffer';
 import * as BufferLayout from '@solana/buffer-layout';
 import nacl from 'tweetnacl';
 
-import {Keypair} from './keypair';
-import {PublicKey} from './publickey';
-import {TransactionInstruction} from './transaction';
-import assert from './util/assert';
+import {Keypair} from '../keypair';
+import {PublicKey} from '../publickey';
+import {TransactionInstruction} from '../transaction';
+import assert from '../util/assert';
 
 const PRIVATE_KEY_BYTES = 64;
 const PUBLIC_KEY_BYTES = 32;

web3.js/src/programs/index.ts

@@ -0,0 +1,7 @@
+export * from './address-lookup-table';
+export * from './compute-budget';
+export * from './ed25519';
+export * from './secp256k1';
+export * from './stake';
+export * from './system';
+export * from './vote';

web3.js/src/programs/secp256k1.ts

@@ -3,10 +3,10 @@ import * as BufferLayout from '@solana/buffer-layout';
 import secp256k1 from 'secp256k1';
 import sha3 from 'js-sha3';
 
-import {PublicKey} from './publickey';
-import {TransactionInstruction} from './transaction';
-import assert from './util/assert';
-import {toBuffer} from './util/to-buffer';
+import {PublicKey} from '../publickey';
+import {TransactionInstruction} from '../transaction';
+import assert from '../util/assert';
+import {toBuffer} from '../util/to-buffer';
 
 const {publicKeyCreate, ecdsaSign} = secp256k1;
 

web3.js/src/programs/stake.ts

@@ -5,17 +5,17 @@ import {
   decodeData,
   InstructionType,
   IInstructionInputData,
-} from './instruction';
-import * as Layout from './layout';
-import {PublicKey} from './publickey';
-import {SystemProgram} from './system-program';
+} from '../instruction';
+import * as Layout from '../layout';
+import {PublicKey} from '../publickey';
+import {SystemProgram} from './system';
 import {
   SYSVAR_CLOCK_PUBKEY,
   SYSVAR_RENT_PUBKEY,
   SYSVAR_STAKE_HISTORY_PUBKEY,
-} from './sysvar';
-import {Transaction, TransactionInstruction} from './transaction';
-import {toBuffer} from './util/to-buffer';
+} from '../sysvar';
+import {Transaction, TransactionInstruction} from '../transaction';
+import {toBuffer} from '../util/to-buffer';
 
 /**
  * Address of the stake config account which configures the rate

web3.js/src/programs/system.ts

@@ -5,14 +5,14 @@ import {
   decodeData,
   InstructionType,
   IInstructionInputData,
-} from './instruction';
-import * as Layout from './layout';
-import {NONCE_ACCOUNT_LENGTH} from './nonce-account';
-import {PublicKey} from './publickey';
-import {SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY} from './sysvar';
-import {Transaction, TransactionInstruction} from './transaction';
-import {toBuffer} from './util/to-buffer';
-import {u64} from './util/bigint';
+} from '../instruction';
+import * as Layout from '../layout';
+import {NONCE_ACCOUNT_LENGTH} from '../nonce-account';
+import {PublicKey} from '../publickey';
+import {SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY} from '../sysvar';
+import {Transaction, TransactionInstruction} from '../transaction';
+import {toBuffer} from '../util/to-buffer';
+import {u64} from '../util/bigint';
 
 /**
  * Create account system transaction params

web3.js/src/programs/vote.ts

@@ -5,13 +5,13 @@ import {
   decodeData,
   InstructionType,
   IInstructionInputData,
-} from './instruction';
-import * as Layout from './layout';
-import {PublicKey} from './publickey';
-import {SystemProgram} from './system-program';
-import {SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY} from './sysvar';
-import {Transaction, TransactionInstruction} from './transaction';
-import {toBuffer} from './util/to-buffer';
+} from '../instruction';
+import * as Layout from '../layout';
+import {PublicKey} from '../publickey';
+import {SystemProgram} from './system';
+import {SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY} from '../sysvar';
+import {Transaction, TransactionInstruction} from '../transaction';
+import {toBuffer} from '../util/to-buffer';
 
 /**
  * Vote account info

web3.js/test/program-tests/address-lookup-table.test.ts

@@ -8,10 +8,10 @@ import {
   AddressLookupTableInstruction,
   Connection,
   sendAndConfirmTransaction,
-} from '../src';
-import {sleep} from '../src/util/sleep';
-import {helpers} from './mocks/rpc-http';
-import {url} from './url';
+} from '../../src';
+import {sleep} from '../../src/util/sleep';
+import {helpers} from '../mocks/rpc-http';
+import {url} from '../url';
 
 use(chaiAsPromised);
 

web3.js/test/program-tests/compute-budget.test.ts

@@ -9,9 +9,9 @@ import {
   ComputeBudgetProgram,
   ComputeBudgetInstruction,
   sendAndConfirmTransaction,
-} from '../src';
-import {helpers} from './mocks/rpc-http';
-import {url} from './url';
+} from '../../src';
+import {helpers} from '../mocks/rpc-http';
+import {url} from '../url';
 
 use(chaiAsPromised);
 

web3.js/test/program-tests/ed25519.test.ts

@@ -8,8 +8,8 @@ import {
   LAMPORTS_PER_SOL,
   Transaction,
   Ed25519Program,
-} from '../src';
-import {url} from './url';
+} from '../../src';
+import {url} from '../url';
 
 if (process.env.TEST_LIVE) {
   describe('ed25519', () => {

web3.js/test/program-tests/secp256k1.test.ts

@@ -9,8 +9,8 @@ import {
   LAMPORTS_PER_SOL,
   Transaction,
   Secp256k1Program,
-} from '../src';
-import {url} from './url';
+} from '../../src';
+import {url} from '../url';
 
 const randomPrivateKey = () => {
   let privateKey;

web3.js/test/program-tests/stake.test.ts

@@ -14,9 +14,9 @@ import {
   StakeProgram,
   SystemInstruction,
   Transaction,
-} from '../src';
-import {helpers} from './mocks/rpc-http';
-import {url} from './url';
+} from '../../src';
+import {helpers} from '../mocks/rpc-http';
+import {url} from '../url';
 
 use(chaiAsPromised);
 

web3.js/test/program-tests/system.test.ts

@@ -12,11 +12,11 @@ import {
   TransactionInstruction,
   sendAndConfirmTransaction,
   LAMPORTS_PER_SOL,
-} from '../src';
-import {NONCE_ACCOUNT_LENGTH} from '../src/nonce-account';
-import {sleep} from '../src/util/sleep';
-import {helpers} from './mocks/rpc-http';
-import {url} from './url';
+} from '../../src';
+import {NONCE_ACCOUNT_LENGTH} from '../../src/nonce-account';
+import {sleep} from '../../src/util/sleep';
+import {helpers} from '../mocks/rpc-http';
+import {url} from '../url';
 
 describe('SystemProgram', () => {
   it('createAccount', () => {

web3.js/test/program-tests/vote.test.ts

@@ -11,9 +11,9 @@ import {
   sendAndConfirmTransaction,
   SystemInstruction,
   Connection,
-} from '../src';
-import {helpers} from './mocks/rpc-http';
-import {url} from './url';
+} from '../../src';
+import {helpers} from '../mocks/rpc-http';
+import {url} from '../url';
 
 use(chaiAsPromised);
 

web3.js/test/transaction.test.ts

@@ -7,8 +7,7 @@ import {Connection} from '../src/connection';
 import {Keypair} from '../src/keypair';
 import {PublicKey} from '../src/publickey';
 import {Transaction, TransactionInstruction} from '../src/transaction';
-import {StakeProgram} from '../src/stake-program';
-import {SystemProgram} from '../src/system-program';
+import {StakeProgram, SystemProgram} from '../src/programs';
 import {Message} from '../src/message';
 import invariant from '../src/util/assert';
 import {toBuffer} from '../src/util/to-buffer';