Upd price in rust (#248)

* Works

* Comments

* Restore upd_aggregate

* Add all tests

* Good

* Export upd_aggregate

* Comment

* Cleanup

* Better comment

* Oops

* Update error

* Fix compilation

* Rename libs

* Comment

* Latest publisher price

* Reorder

* Format

* Format

Co-authored-by: Guillermo Bescos <guibescos>

Author: guibescos

program/c/makefile

@@ -2,11 +2,11 @@ OUT_DIR := ./target
 SOLANA := ../../../solana
 include $(SOLANA)/sdk/bpf/c/bpf.mk
 
-cpyth:
+cpyth-bpf:
 #   Bundle C code compiled to bpf for use by rust
-	bash -c "ar rcs target/libcpyth.a target/**/*.o"
-cpythtest:
+	bash -c "ar rcs target/libcpyth-bpf.a target/**/*.o"
+cpyth-native:
 #   Compile C code to system architecture for use by rust's cargo test
-	$(CC) -c ./src/oracle/for_cargo_test/cpyth_test.c -o ./target/cpyth_test.o
+	gcc -c ./src/oracle/for_cargo_test/cpyth_test.c -o ./target/cpyth_test.o
 #   Bundle C code compiled to system architecture for use by rust's cargo test
-	ar rcs target/libcpythtest.a ./target/cpyth_test.o
+	ar rcs target/libcpyth-native.a ./target/cpyth_test.o

program/c/src/oracle/test_oracle.c

@@ -19,355 +19,3 @@ Test(oracle, pc_size ) {
       3*sizeof( pc_pub_key_t ) + sizeof( pc_price_info_t ) +
       PC_COMP_SIZE * sizeof( pc_price_comp_t ) );
 }
-
-Test( oracle, upd_price ) {
-  cmd_upd_price_t idata = {
-    .ver_    = PC_VERSION,
-    .cmd_    = e_cmd_upd_price,
-    .status_ = PC_STATUS_TRADING,
-    .price_  = 42L,
-    .conf_   = 2L,
-    .pub_slot_ = 1
-  };
-  SolPubkey p_id  = {.x = { 0xff, }};
-  SolPubkey pkey = {.x = { 1, }};
-  SolPubkey skey = {.x = { 3, }};
-  sysvar_clock_t cvar = {
-    .slot_ = 1
-  };
-  uint64_t pqty = 100, sqty = 200;
-  pc_price_t sptr[1];
-  sol_memset( sptr, 0, sizeof( pc_price_t ) );
-  sptr->magic_ = PC_MAGIC;
-  sptr->ver_   = PC_VERSION;
-  sptr->ptype_ = PC_PTYPE_PRICE;
-  sptr->type_  = PC_ACCTYPE_PRICE;
-  sptr->num_   = 1;
-  pc_pub_key_assign( &sptr->comp_[0].pub_, (pc_pub_key_t*)&pkey );
-  SolAccountInfo acc[] = {{
-      .key         = &pkey,
-      .lamports    = &pqty,
-      .data_len    = 0,
-      .data        = NULL,
-      .owner       = NULL,
-      .rent_epoch  = 0,
-      .is_signer   = true,
-      .is_writable = true,
-      .executable  = false
-  },{
-      .key         = &skey,
-      .lamports    = &PRICE_ACCOUNT_LAMPORTS,
-      .data_len    = sizeof( pc_price_t ),
-      .data        = (uint8_t*)sptr,
-      .owner       = &p_id,
-      .rent_epoch  = 0,
-      .is_signer   = false,
-      .is_writable = true,
-      .executable  = false
-  },{
-      .key         = (SolPubkey*)sysvar_clock,
-      .lamports    = &sqty,
-      .data_len    = sizeof( sysvar_clock_t ),
-      .data        = (uint8_t*)&cvar,
-      .owner       = &p_id,
-      .rent_epoch  = 0,
-      .is_signer   = false,
-      .is_writable = false,
-      .executable  = false
-  }};
-  SolParameters prm = {
-    .ka         = acc,
-    .ka_num     = 3,
-    .data       = (const uint8_t*)&idata,
-    .data_len   = sizeof( idata ),
-    .program_id = &p_id
-  };
-  cr_assert( SUCCESS == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 42L );
-  cr_assert( sptr->comp_[0].latest_.conf_ == 2L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 1 );
-  cr_assert( sptr->agg_.pub_slot_ == 1 );
-  cr_assert( sptr->valid_slot_ == 0 );
-
-  // add some prices for current slot - get rejected
-  idata.price_ = 43;
-  cr_assert( ERROR_INVALID_ARGUMENT == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 42L );
-  cr_assert( sptr->comp_[0].agg_.price_ == 0 );
-
-  // add next price in new slot triggering snapshot and aggregate calc
-  idata.price_ = 81;
-  idata.pub_slot_ = 2;
-  cvar.slot_ = 3;
-  cr_assert( SUCCESSFULLY_UPDATED_AGGREGATE == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 81L );
-  cr_assert( sptr->comp_[0].agg_.price_ == 42L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 2 );
-  cr_assert( sptr->agg_.pub_slot_ == 3 );
-  cr_assert( sptr->valid_slot_ == 1 );
-
-  // next price doesnt change but slot does
-  cvar.slot_ = 4;
-  idata.pub_slot_ = 3;
-  cr_assert( SUCCESSFULLY_UPDATED_AGGREGATE == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 81L );
-  cr_assert( sptr->comp_[0].agg_.price_ == 81L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 3 );
-  cr_assert( sptr->agg_.pub_slot_ == 4 );
-  cr_assert( sptr->valid_slot_ == 3 );
-
-  // next price doesnt change and neither does aggregate but slot does
-  idata.pub_slot_ = 4;
-  cvar.slot_ = 5;
-  cr_assert( SUCCESSFULLY_UPDATED_AGGREGATE == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 81L );
-  cr_assert( sptr->comp_[0].agg_.price_ == 81L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 4 );
-  cr_assert( sptr->agg_.pub_slot_ == 5 );
-  cr_assert( sptr->valid_slot_ == 4 );
-
-  // try to publish back-in-time
-  idata.pub_slot_ = 1;
-  cr_assert( ERROR_INVALID_ARGUMENT == dispatch( &prm, acc ) );
-
-
-  // Publishing a wide CI results in a status of unknown.
-
-  // check that someone doesn't accidentally break the test.
-  cr_assert(sptr->comp_[0].latest_.status_ == PC_STATUS_TRADING);
-  idata.pub_slot_ = 5;
-  cvar.slot_ = 6;
-  idata.price_ = 50;
-  idata.conf_ = 6;
-  cr_assert( SUCCESSFULLY_UPDATED_AGGREGATE == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 50L );
-  cr_assert( sptr->comp_[0].latest_.conf_ == 6L );
-  cr_assert( sptr->comp_[0].latest_.status_ == PC_STATUS_UNKNOWN );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 5 );
-  cr_assert( sptr->agg_.pub_slot_ == 6 );
-  // Aggregate is still trading because it uses price from previous slot
-  cr_assert( sptr->agg_.status_ == PC_STATUS_TRADING );
-
-  // Crank one more time and aggregate should be unknown
-  idata.pub_slot_ = 6;
-  cvar.slot_ = 7;
-  cr_assert( SUCCESS == dispatch( &prm, acc ) );
-  cr_assert( sptr->agg_.status_ == PC_STATUS_UNKNOWN );
-}
-
-Test( oracle, upd_price_no_fail_on_error ) {
-  cmd_upd_price_t idata = {
-    .ver_    = PC_VERSION,
-    .cmd_    = e_cmd_upd_price_no_fail_on_error,
-    .status_ = PC_STATUS_TRADING,
-    .price_  = 42L,
-    .conf_   = 9L,
-    .pub_slot_ = 1
-  };
-  SolPubkey p_id  = {.x = { 0xff, }};
-  SolPubkey pkey = {.x = { 1, }};
-  SolPubkey skey = {.x = { 3, }};
-  sysvar_clock_t cvar = {
-    .slot_ = 1
-  };
-  uint64_t pqty = 100, sqty = 200;
-  pc_price_t sptr[1];
-  sol_memset( sptr, 0, sizeof( pc_price_t ) );
-  sptr->magic_ = PC_MAGIC;
-  sptr->ver_   = PC_VERSION;
-  sptr->ptype_ = PC_PTYPE_PRICE;
-  sptr->type_  = PC_ACCTYPE_PRICE;
-  sptr->num_   = 1;
-
-  SolAccountInfo acc[] = {{
-      .key         = &pkey,
-      .lamports    = &pqty,
-      .data_len    = 0,
-      .data        = NULL,
-      .owner       = NULL,
-      .rent_epoch  = 0,
-      .is_signer   = true,
-      .is_writable = true,
-      .executable  = false
-  },{
-      .key         = &skey,
-      .lamports    = &PRICE_ACCOUNT_LAMPORTS,
-      .data_len    = sizeof( pc_price_t ),
-      .data        = (uint8_t*)sptr,
-      .owner       = &p_id,
-      .rent_epoch  = 0,
-      .is_signer   = false,
-      .is_writable = true,
-      .executable  = false
-  },{
-      .key         = (SolPubkey*)sysvar_clock,
-      .lamports    = &sqty,
-      .data_len    = sizeof( sysvar_clock_t ),
-      .data        = (uint8_t*)&cvar,
-      .owner       = &p_id,
-      .rent_epoch  = 0,
-      .is_signer   = false,
-      .is_writable = false,
-      .executable  = false
-  }};
-  SolParameters prm = {
-    .ka         = acc,
-    .ka_num     = 3,
-    .data       = (const uint8_t*)&idata,
-    .data_len   = sizeof( idata ),
-    .program_id = &p_id
-  };
-
-  // We haven't permissioned the publish account for the price account
-  // yet, so any update should fail silently and have no effect. The
-  // transaction should "succeed".
-  cr_assert( SUCCESS == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 0L );
-  cr_assert( sptr->comp_[0].latest_.conf_ == 0L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 0 );
-  cr_assert( sptr->agg_.pub_slot_ == 0 );
-  cr_assert( sptr->valid_slot_ == 0 );
-
-  // Now permission the publish account for the price account.
-  pc_pub_key_assign( &sptr->comp_[0].pub_, (pc_pub_key_t*)&pkey );
-
-  // The update should now succeed, and have an effect.
-  cr_assert( SUCCESS == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 42L );
-  cr_assert( sptr->comp_[0].latest_.conf_ == 9L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 1 );
-  cr_assert( sptr->agg_.pub_slot_ == 1 );
-  cr_assert( sptr->valid_slot_ == 0 );
-
-  // Invalid updates, such as publishing an update for the current slot,
-  // should still fail silently and have no effect.
-  idata.price_ = 55L;
-  idata.conf_ = 22L;
-  idata.pub_slot_ = 1;
-  cr_assert( SUCCESS == dispatch( &prm, acc ) );
-  cr_assert( sptr->comp_[0].latest_.price_ == 42L );
-  cr_assert( sptr->comp_[0].latest_.conf_ == 9L );
-  cr_assert( sptr->comp_[0].latest_.pub_slot_ == 1 );
-  cr_assert( sptr->agg_.pub_slot_ == 1 );
-  cr_assert( sptr->valid_slot_ == 0 );
-}
-
-Test( oracle, upd_aggregate ) {
-  pc_price_t px[1];
-  sol_memset( px, 0, sizeof( pc_price_t ) );
-  pc_price_info_t p1 = { .price_=100, .conf_=10,
-    .status_ = PC_STATUS_TRADING, .corp_act_status_= 0, .pub_slot_ = 1000 };
-  pc_price_info_t p2 = { .price_=200, .conf_=20,
-    .status_ = PC_STATUS_TRADING, .corp_act_status_= 0, .pub_slot_ = 1000 };
-  pc_price_info_t p3 = { .price_=300, .conf_=30,
-    .status_ = PC_STATUS_TRADING, .corp_act_status_= 0, .pub_slot_ = 1000 };
-  pc_price_info_t p4 = { .price_=400, .conf_=40,
-    .status_ = PC_STATUS_TRADING, .corp_act_status_= 0, .pub_slot_ = 1000 };
-
-  // single publisher
-  px->num_ = 1;
-  px->last_slot_ = 1000;
-  px->agg_.pub_slot_ = 1000;
-  px->comp_[0].latest_ = p1;
-  upd_aggregate( px, 1001, 1 );
-  cr_assert( px->agg_.price_ == 100 );
-  cr_assert( px->agg_.conf_ == 10 );
-  cr_assert( px->twap_.val_ == 100 );
-  cr_assert( px->twac_.val_ == 10 );
-  cr_assert( px->num_qt_ == 1 );
-  cr_assert( px->timestamp_ == 1 );
-  cr_assert( px->prev_slot_ == 0 );
-  cr_assert( px->prev_price_ == 0 );
-  cr_assert( px->prev_conf_ == 0 );
-  cr_assert( px->prev_timestamp_ == 0 );
-
-  // two publishers
-  px->num_ = 0;
-  px->last_slot_ = 1000;
-  px->agg_.pub_slot_ = 1000;
-  px->comp_[px->num_++].latest_ = p2;
-  px->comp_[px->num_++].latest_ = p1;
-  upd_aggregate( px, 1001, 2 );
-  cr_assert( px->agg_.price_ == 145 );
-  cr_assert( px->agg_.conf_ == 55 );
-  cr_assert( px->twap_.val_ == 106 );
-  cr_assert( px->twac_.val_ == 16 );
-  cr_assert( px->num_qt_ == 2 );
-  cr_assert( px->timestamp_ == 2 );
-  cr_assert( px->prev_slot_ == 1000 );
-  cr_assert( px->prev_price_ == 100 );
-  cr_assert( px->prev_conf_ == 10 );
-  cr_assert( px->prev_timestamp_ == 1 );
-
-  // three publishers
-  px->num_ = 0;
-  px->last_slot_ = 1000;
-  px->agg_.pub_slot_ = 1000;
-  px->comp_[px->num_++].latest_ = p2;
-  px->comp_[px->num_++].latest_ = p1;
-  px->comp_[px->num_++].latest_ = p3;
-  upd_aggregate( px, 1001, 3 );
-  cr_assert( px->agg_.price_ == 200 );
-  cr_assert( px->agg_.conf_ == 90 );
-  cr_assert( px->twap_.val_ == 114 );
-  cr_assert( px->twac_.val_ == 23 );
-  cr_assert( px->num_qt_ == 3 );
-  cr_assert( px->timestamp_ == 3 );
-  cr_assert( px->prev_slot_ == 1000 );
-  cr_assert( px->prev_price_ == 145 );
-  cr_assert( px->prev_conf_ == 55 );
-  cr_assert( px->prev_timestamp_ == 2 );
-
-  // four publishers
-  px->num_ = 0;
-  px->last_slot_ = 1000;
-  px->agg_.pub_slot_ = 1000;
-  px->comp_[px->num_++].latest_ = p3;
-  px->comp_[px->num_++].latest_ = p1;
-  px->comp_[px->num_++].latest_ = p4;
-  px->comp_[px->num_++].latest_ = p2;
-  upd_aggregate( px, 1001, 4 );
-  cr_assert( px->agg_.price_ == 245 );
-  cr_assert( px->agg_.conf_ == 85 );
-  cr_assert( px->twap_.val_ == 125 );
-  cr_assert( px->twac_.val_ == 28 );
-  cr_assert( px->last_slot_ == 1001 );
-  cr_assert( px->num_qt_ == 4 );
-  cr_assert( px->timestamp_ == 4 );
-  cr_assert( px->prev_slot_ == 1000 );
-  cr_assert( px->prev_price_ == 200 );
-  cr_assert( px->prev_conf_ == 90 );
-  cr_assert( px->prev_timestamp_ == 3 );
-
-  upd_aggregate( px, 1025, 5 );
-  cr_assert( px->agg_.status_ == PC_STATUS_TRADING );
-  cr_assert( px->last_slot_ == 1025 );
-  cr_assert( px->num_qt_ == 4 );
-  cr_assert( px->timestamp_ == 5 );
-  cr_assert( px->prev_slot_ == 1001 );
-  cr_assert( px->prev_price_ == 245 );
-  cr_assert( px->prev_conf_ == 85 );
-  cr_assert( px->prev_timestamp_ == 4 );
-
-  // check what happens when nothing publishes for a while
-  upd_aggregate( px, 1026, 10 );
-  cr_assert( px->agg_.status_ == PC_STATUS_UNKNOWN );
-  cr_assert( px->last_slot_ == 1025 );
-  cr_assert( px->num_qt_ == 0 );
-  cr_assert( px->timestamp_ == 10 );
-  cr_assert( px->prev_slot_ == 1025 );
-  cr_assert( px->prev_timestamp_ == 5 );
-
-  // Check that the prev_* fields don't update if the aggregate status is UNKNOWN
-  uint64_t prev_slot_ = px->prev_slot_;
-  int64_t prev_price_ = px->prev_price_;
-  uint64_t prev_conf_ = px->prev_conf_;
-  int64_t prev_timestamp_ = px->prev_timestamp_;
-  upd_aggregate( px, 1028, 12 );
-  cr_assert( px->agg_.status_ == PC_STATUS_UNKNOWN );
-  cr_assert( px->timestamp_ == 12 );
-  cr_assert( px->prev_slot_ == prev_slot_ );
-  cr_assert( px->prev_price_ == prev_price_ );
-  cr_assert( px->prev_conf_ == prev_conf_ );
-  cr_assert( px->prev_timestamp_ == prev_timestamp_ );
-}

program/rust/src/error.rs

@@ -28,7 +28,7 @@ pub enum OracleError {
     InvalidSystemAccount    = 606,
     #[error("InvalidWritableAccount")]
     InvalidWritableAccount  = 607,
-    #[error("InvalidWritableAccount")]
+    #[error("InvalidFreshAccount")]
     InvalidFreshAccount     = 608,
 }