V2

.github/workflows/tests.yaml

@@ -149,7 +149,7 @@ jobs:
  - tests/voter-stake-registry.ts
  - tests/fanout.ts
  - tests/sus.ts
- - tests/dc-conversion-escrow.ts
+ - tests/conversion-escrow.ts
  steps:
  - uses: actions/checkout@v3
  - uses: ./.github/actions/build-anchor/

Anchor.toml

@@ -17,7 +17,7 @@ fanout = "fanqeMu3fw8R4LwKNbahPtYXJsyLL6NXyfe2BqzhfB6"
 mobile_entity_manager = "memMa1HG4odAFmUbGWfPwS1WWfK95k99F2YTkGvyxZr"
 hexboosting = "hexbnKYoA2GercNNhHUCCfrTRWrHjT6ujKPXTa5NPqJ"
 no_emit = "noEmmgLmQdk6DLiPV8CSwQv3qQDyGEhz9m5A4zhtByv"
-dc_conversion_escrow = "dce4jeLBpfaFsNAKMAmVt5Py4E1R4mZcrVvMB5ejvGu"
+conversion_escrow = "dce4jeLBpfaFsNAKMAmVt5Py4E1R4mZcrVvMB5ejvGu"
 
 [workspace]
 members = [
@@ -35,7 +35,7 @@ members = [
  "programs/mobile-entity-manager",
  "programs/hexboosting",
  "programs/no-emit",
- "programs/dc-conversion-escrow",
+ "programs/conversion-escrow",
 ]
 
 [registry]

packages/dc-conversion-escrow-sdk/package.json → packages/conversion-escrow-sdk/package.json

@@ -1,12 +1,12 @@
 {
- "name": "@helium/dc-conversion-escrow-sdk",
+ "name": "@helium/conversion-escrow-sdk",
  "publishConfig": {
  "access": "public",
  "registry": "https://registry.npmjs.org/"
  },
  "license": "Apache-2.0",
  "version": "0.6.41",
- "description": "Interface to the dc-conversion-escrow smart contract",
+ "description": "Interface to the conversion-escrow smart contract",
  "repository": {
  "type": "git",
  "url": "https://github.com/helium/helium-program-libary"

packages/dc-conversion-escrow-sdk/src/index.ts → packages/conversion-escrow-sdk/src/index.ts

@@ -1,8 +1,8 @@
-import { DcConversionEscrow } from "@helium/idls/lib/types/dc_conversion_escrow";
+import { ConversionEscrow } from "@helium/idls/lib/types/conversion_escrow";
 import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { PROGRAM_ID } from "./constants";
-import { dcConversionEscrowResolvers } from "./resolvers";
+import { conversionEscrowResolvers } from "./resolvers";
 
 
 export * from "./constants";
@@ -12,18 +12,18 @@ export async function init(
  provider: AnchorProvider,
  programId: PublicKey = PROGRAM_ID,
  idl?: Idl | null
-): Promise<Program<DcConversionEscrow>> {
+): Promise<Program<ConversionEscrow>> {
  if (!idl) {
  idl = await Program.fetchIdl(programId, provider);
  }
 
- const dcConversionEscrow = new Program<DcConversionEscrow>(
- idl as DcConversionEscrow,
+ const conversionEscrow = new Program<ConversionEscrow>(
+ idl as ConversionEscrow,
  programId,
  provider,
  undefined,
- () => dcConversionEscrowResolvers
- ) as Program<DcConversionEscrow>;
+ () => conversionEscrowResolvers
+ ) as Program<ConversionEscrow>;
 
- return dcConversionEscrow;
+ return conversionEscrow;
 }

packages/dc-conversion-escrow-sdk/src/resolvers.ts → packages/conversion-escrow-sdk/src/resolvers.ts

@@ -4,7 +4,7 @@ import {
  heliumCommonResolver
 } from "@helium/anchor-resolvers";
 
-export const dcConversionEscrowResolvers = combineResolvers(
+export const conversionEscrowResolvers = combineResolvers(
  heliumCommonResolver,
  ataResolver({
  instruction: "initializeEscrowV0",

packages/dc-conversion-escrow-sdk/yarn.deploy.lock → packages/conversion-escrow-sdk/yarn.deploy.lock

@@ -72,9 +72,9 @@ __metadata:
  languageName: unknown
  linkType: soft
 
-"@helium/dc-conversion-escrow-sdk@workspace:.":
+"@helium/conversion-escrow-sdk@workspace:.":
  version: 0.0.0-use.local
- resolution: "@helium/dc-conversion-escrow-sdk@workspace:."
+ resolution: "@helium/conversion-escrow-sdk@workspace:."
  dependencies:
  "@coral-xyz/anchor": ^0.28.0
  "@helium/anchor-resolvers": ^0.6.41

programs/dc-conversion-escrow/Cargo.toml → programs/conversion-escrow/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "dc-conversion-escrow"
+name = "conversion-escrow"
 version = "0.0.1"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "dc_conversion_escrow"
+name = "conversion_escrow"
 
 [features]
 devnet = []
@@ -23,8 +23,8 @@ overflow-checks = true
 [dependencies]
 anchor-lang = { workspace = true }
 anchor-spl = { workspace = true }
+spl-token = "3.5.0"
 shared-utils = { workspace = true }
 solana-security-txt = { workspace = true }
-data-credits = { path = "../data-credits", features = ["cpi"] }
 default-env = { workspace = true }
 pyth-sdk-solana = { version = "0.8.0" }

programs/dc-conversion-escrow/src/instructions/initialize_escrow_v0.rs → programs/conversion-escrow/src/instructions/initialize_escrow_v0.rs

@@ -1,32 +1,39 @@
-use crate::errors::ErrorCode;
+use crate::ConversionTargetV0;
 use anchor_lang::prelude::*;
 use anchor_spl::{
  associated_token::AssociatedToken,
  token::{Mint, Token, TokenAccount},
 };
-use data_credits::DataCreditsV0;
-use pyth_sdk_solana::load_price_feed_from_account_info;
 
 use crate::ConversionEscrowV0;
 
 #[derive(AnchorSerialize, AnchorDeserialize, Clone, Default)]
 pub struct InitializeEscrowArgsV0 {
+ pub oracle: Pubkey,
+ pub targets: Vec<ConversionTargetArgV0>,
+}
+
+#[derive(AnchorSerialize, AnchorDeserialize, Clone, Default)]
+pub struct ConversionTargetArgV0 {
+ pub mint: Pubkey,
+ pub oracle: Pubkey,
+ /// How much slippage to allow from the oracle price
  pub slippage_bps: u16,
 }
 
 #[derive(Accounts)]
+#[instruction(args: InitializeEscrowArgsV0)]
 pub struct InitializeEscrowV0<'info> {
- pub data_credits: Box<Account<'info, DataCreditsV0>>,
  #[account(mut)]
  pub payer: Signer<'info>,
  /// CHECK: The owner of this account. Can fully withdraw
  pub owner: Signer<'info>,
  #[account(
  init,
  payer = payer,
- seeds = [b"conversion_escrow", data_credits.key().as_ref(), mint.key().as_ref(), owner.key().as_ref()],
+ seeds = [b"conversion_escrow", mint.key().as_ref(), owner.key().as_ref()],
  bump,
- space = ConversionEscrowV0::INIT_SPACE + 60,
+ space = std::mem::size_of::<ConversionEscrowV0>() + 60 + std::mem::size_of::<ConversionTargetV0>() * args.targets.len(),
  )]
  pub conversion_escrow: Box<Account<'info, ConversionEscrowV0>>,
  pub mint: Box<Account<'info, Mint>>,
@@ -39,27 +46,28 @@ pub struct InitializeEscrowV0<'info> {
  pub escrow: Box<Account<'info, TokenAccount>>,
  pub system_program: Program<'info, System>,
  pub associated_token_program: Program<'info, AssociatedToken>,
- /// CHECK: Checked with load_price_feed_from_account_info
- pub oracle: AccountInfo<'info>,
  pub token_program: Program<'info, Token>,
 }
 
 pub fn handler(ctx: Context<InitializeEscrowV0>, args: InitializeEscrowArgsV0) -> Result<()> {
- load_price_feed_from_account_info(&ctx.accounts.oracle).map_err(|e| {
- msg!("Pyth error {}", e);
- error!(ErrorCode::PythError)
- })?;
-
  ctx
  .accounts
  .conversion_escrow
  .set_inner(ConversionEscrowV0 {
- oracle: ctx.accounts.oracle.key(),
+ oracle: args.oracle,
  escrow: ctx.accounts.escrow.key(),
  mint: ctx.accounts.mint.key(),
- slipage_bps: args.slippage_bps,
+ targets: args
+ .targets
+ .iter()
+ .map(|t| ConversionTargetV0 {
+ reserverd: [0; 8],
+ mint: t.mint,
+ oracle: t.oracle,
+ slipage_bps: t.slippage_bps,
+ })
+ .collect(),
  owner: ctx.accounts.owner.key(),
- data_credits: ctx.accounts.data_credits.key(),
  bump_seed: ctx.bumps["conversion_escrow"],
  });