fix: add integration test and fix various exposed bugs

web3.js/src/config-program.js

@@ -1,6 +0,0 @@
-// @flow
-import {PublicKey} from './publickey';
-
-export const CONFIG_PROGRAM_ID = new PublicKey(
-  'Config1111111111111111111111111111111111111',
-);

web3.js/src/index.js

@@ -2,11 +2,11 @@
 export {Account} from './account';
 export {BpfLoader} from './bpf-loader';
 export {BudgetProgram} from './budget-program';
-export {CONFIG_PROGRAM_ID} from './config-program';
 export {Connection} from './connection';
 export {Loader} from './loader';
 export {PublicKey} from './publickey';
 export {
+  STAKE_CONFIG_ID,
   Authorized,
   Lockup,
   StakeAuthorizationLayout,

web3.js/src/layout.js

@@ -69,7 +69,11 @@ export const authorized = (property: string = 'authorized') => {
  */
 export const lockup = (property: string = 'lockup') => {
   return BufferLayout.struct(
-    [BufferLayout.ns64('epoch'), publicKey('custodian')],
+    [
+      BufferLayout.ns64('unixTimestamp'),
+      BufferLayout.ns64('epoch'),
+      publicKey('custodian'),
+    ],
     property,
   );
 };

web3.js/src/stake-program.js

@@ -3,7 +3,6 @@
 import * as BufferLayout from 'buffer-layout';
 import hasha from 'hasha';
 
-import {CONFIG_PROGRAM_ID} from './config-program';
 import {encodeData} from './instruction';
 import type {InstructionType} from './instruction';
 import * as Layout from './layout';
@@ -18,6 +17,10 @@ import {
 import {Transaction, TransactionInstruction} from './transaction';
 import type {TransactionInstructionCtorFields} from './transaction';
 
+export const STAKE_CONFIG_ID = new PublicKey(
+  'StakeConfig11111111111111111111111111111111',
+);
+
 export class Authorized {
   staker: PublicKey;
   withdrawer: PublicKey;
@@ -32,13 +35,15 @@ export class Authorized {
 }
 
 export class Lockup {
+  unixTimestamp: number;
   epoch: number;
   custodian: PublicKey;
 
   /**
-   * Create a new Authorized object
+   * Create a new Lockup object
    */
-  constructor(epoch: number, custodian: PublicKey) {
+  constructor(unixTimestamp: number, epoch: number, custodian: PublicKey) {
+    this.unixTimestamp = unixTimestamp;
     this.epoch = epoch;
     this.custodian = custodian;
   }
@@ -126,14 +131,14 @@ export const StakeInstructionLayout = Object.freeze({
     index: 4,
     layout: BufferLayout.struct([
       BufferLayout.u32('instruction'),
-      BufferLayout.ns64('amount'),
+      BufferLayout.ns64('lamports'),
     ]),
   },
   Withdraw: {
     index: 5,
     layout: BufferLayout.struct([
       BufferLayout.u32('instruction'),
-      BufferLayout.ns64('amount'),
+      BufferLayout.ns64('lamports'),
     ]),
   },
   Deactivate: {
@@ -197,7 +202,7 @@ export class StakeProgram {
    * Max space of a Stake account
    */
   static get space(): number {
-    return 2000;
+    return 2008;
   }
 
   /**
@@ -215,6 +220,7 @@ export class StakeProgram {
         withdrawer: authorized.withdrawer.toBuffer(),
       },
       lockup: {
+        unixTimestamp: lockup.unixTimestamp,
         epoch: lockup.epoch,
         custodian: lockup.custodian.toBuffer(),
       },
@@ -293,7 +299,7 @@ export class StakeProgram {
         {pubkey: stakeAccount, isSigner: false, isWritable: true},
         {pubkey: votePubkey, isSigner: false, isWritable: false},
         {pubkey: SYSVAR_CLOCK_PUBKEY, isSigner: false, isWritable: false},
-        {pubkey: CONFIG_PROGRAM_ID, isSigner: false, isWritable: false},
+        {pubkey: STAKE_CONFIG_ID, isSigner: false, isWritable: false},
         {pubkey: authorizedPubkey, isSigner: true, isWritable: false},
       ],
       programId: this.programId,