diff --git a/core/README.md b/core/README.md index 9cd0ce8..816aaeb 100644 --- a/core/README.md +++ b/core/README.md @@ -11,16 +11,16 @@ - [`Instruction`](api/src/instruction.rs) – Declared instructions and arguments. ## Instructions -- [`Claim`](program/src/processor/claim.rs) – Distributes claimable rewards as tokens from the treasury to a miner. -- [`Close`](program/src/processor/close.rs) – Closes a proof account returns the rent to the owner. -- [`Crown`](program/src/processor/crown.rs) – Flags a proof account as the top staker on the network. -- [`Open`](program/src/processor/open.rs) – Creates a new proof account for a prospective miner. -- [`Mine`](program/src/processor/mine.rs) – Verifies a hash provided by a miner and issues claimable rewards. -- [`Stake`](program/src/processor/stake.rs) – Stakes ORE with a miner to increase their multiplier. -- [`Reset`](program/src/processor/reset.rs) – Resets the program for a new epoch. -- [`Update`](program/src/processor/update.rs) – Updates a proof account's miner authority. -- [`Upgrade`](program/src/processor/upgrade.rs) – Migrates ORE v1 tokens to ORE v2, one-for-one. -- [`Initialize`](program/src/processor/initialize.rs) – Initializes the Ore program, creating the bus, mint, and treasury accounts. +- [`Claim`](program/src/claim.rs) – Distributes claimable rewards as tokens from the treasury to a miner. +- [`Close`](program/src/close.rs) – Closes a proof account returns the rent to the owner. +- [`Crown`](program/src/crown.rs) – Flags a proof account as the top staker on the network. +- [`Open`](program/src/open.rs) – Creates a new proof account for a prospective miner. +- [`Mine`](program/src/mine.rs) – Verifies a hash provided by a miner and issues claimable rewards. +- [`Stake`](program/src/stake.rs) – Stakes ORE with a miner to increase their multiplier. +- [`Reset`](program/src/reset.rs) – Resets the program for a new epoch. +- [`Update`](program/src/update.rs) – Updates a proof account's miner authority. +- [`Upgrade`](program/src/upgrade.rs) – Migrates ORE v1 tokens to ORE v2, one-for-one. +- [`Initialize`](program/src/initialize.rs) – Initializes the Ore program, creating the bus, mint, and treasury accounts. ## State - [`Bus`](api/src/state/bus.rs) - An account (8 total) which tracks and limits the amount ORE mined each epoch. diff --git a/core/program/src/processor/claim.rs b/core/program/src/claim.rs similarity index 100% rename from core/program/src/processor/claim.rs rename to core/program/src/claim.rs diff --git a/core/program/src/processor/close.rs b/core/program/src/close.rs similarity index 100% rename from core/program/src/processor/close.rs rename to core/program/src/close.rs diff --git a/core/program/src/processor/crown.rs b/core/program/src/crown.rs similarity index 100% rename from core/program/src/processor/crown.rs rename to core/program/src/crown.rs diff --git a/core/program/src/processor/initialize.rs b/core/program/src/initialize.rs similarity index 100% rename from core/program/src/processor/initialize.rs rename to core/program/src/initialize.rs diff --git a/core/program/src/lib.rs b/core/program/src/lib.rs index 010e69c..bac4a88 100644 --- a/core/program/src/lib.rs +++ b/core/program/src/lib.rs @@ -1,8 +1,27 @@ +mod claim; +mod close; +mod crown; +mod initialize; mod loaders; -mod processor; +mod mine; +mod open; +mod reset; +mod stake; +mod update; +mod upgrade; + +use claim::*; +use close::*; +use crown::*; +use initialize::*; +use mine::*; +use open::*; +use reset::*; +use stake::*; +use update::*; +use upgrade::*; use ore_api::instruction::*; -use processor::*; use solana_program::{ self, account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError, pubkey::Pubkey, diff --git a/core/program/src/processor/mine.rs b/core/program/src/mine.rs similarity index 100% rename from core/program/src/processor/mine.rs rename to core/program/src/mine.rs diff --git a/core/program/src/processor/open.rs b/core/program/src/open.rs similarity index 100% rename from core/program/src/processor/open.rs rename to core/program/src/open.rs diff --git a/core/program/src/processor/mod.rs b/core/program/src/processor/mod.rs deleted file mode 100644 index e46eafe..0000000 --- a/core/program/src/processor/mod.rs +++ /dev/null @@ -1,21 +0,0 @@ -mod claim; -mod close; -mod crown; -mod initialize; -mod mine; -mod open; -mod reset; -mod stake; -mod update; -mod upgrade; - -pub use claim::*; -pub use close::*; -pub use crown::*; -pub use initialize::*; -pub use mine::*; -pub use open::*; -pub use reset::*; -pub use stake::*; -pub use update::*; -pub use upgrade::*; diff --git a/core/program/src/processor/reset.rs b/core/program/src/reset.rs similarity index 100% rename from core/program/src/processor/reset.rs rename to core/program/src/reset.rs diff --git a/core/program/src/processor/stake.rs b/core/program/src/stake.rs similarity index 100% rename from core/program/src/processor/stake.rs rename to core/program/src/stake.rs diff --git a/core/program/src/processor/update.rs b/core/program/src/update.rs similarity index 100% rename from core/program/src/processor/update.rs rename to core/program/src/update.rs diff --git a/core/program/src/processor/upgrade.rs b/core/program/src/upgrade.rs similarity index 100% rename from core/program/src/processor/upgrade.rs rename to core/program/src/upgrade.rs