Skip to content

Commit 12e0f7a

Browse files
committed
Update program IDs
1 parent 04e217d commit 12e0f7a

5 files changed

Lines changed: 8 additions & 20 deletions

File tree

Anchor.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ seeds = false
33
skip-lint = false
44

55
[programs.localnet]
6-
autocrat_v0 = "GLmTsw5A8DLCThjNgtMBKVDAG8EZYDVMic1pcjhGLiM1"
7-
conditional_vault = "4nCk4qKJSJf8pzJadMnr9LubA6Y7Zw3EacsVqH1TwVXH"
8-
clob = "8BnUecJAvKB7zCcwqhMiVWoqKWcw5S6PDCxWWEM2oxWA"
6+
autocrat_v0 = "meta3cxKzFBmWYgCVozmvCQAS3y9b3fGxrG9HkHL7Wi"
7+
conditional_vault = "vaU1tVLj8RFk7mNj1BxqgAsMKKaL8UvEUHvU3tdbZPe"
98

109
[[test.genesis]]
1110
address = "opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb"

programs/autocrat_v0/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ security_txt! {
2424
acknowledgements: "DCF = (CF1 / (1 + r)^1) + (CF2 / (1 + r)^2) + ... (CFn / (1 + r)^n)"
2525
}
2626

27-
declare_id!("GLmTsw5A8DLCThjNgtMBKVDAG8EZYDVMic1pcjhGLiM1");
27+
declare_id!("meta3cxKzFBmWYgCVozmvCQAS3y9b3fGxrG9HkHL7Wi");
2828

2929
// by default, the pass price needs to be 5% higher than the fail price
3030
pub const DEFAULT_PASS_THRESHOLD_BPS: u16 = 500;
@@ -124,8 +124,6 @@ pub mod autocrat_v0 {
124124
let openbook_pass_market = ctx.accounts.openbook_pass_market.load()?;
125125
let openbook_fail_market = ctx.accounts.openbook_fail_market.load()?;
126126

127-
let openbook_twap_fail_market = &ctx.accounts.openbook_twap_fail_market;
128-
129127
require!(
130128
openbook_pass_market.base_mint
131129
== ctx.accounts.base_vault.conditional_on_finalize_token_mint,

programs/conditional_vault/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ security_txt! {
1818
acknowledgements: "DCF = (CF1 / (1 + r)^1) + (CF2 / (1 + r)^2) + ... (CFn / (1 + r)^n)"
1919
}
2020

21-
declare_id!("4nCk4qKJSJf8pzJadMnr9LubA6Y7Zw3EacsVqH1TwVXH");
21+
declare_id!("vaU1tVLj8RFk7mNj1BxqgAsMKKaL8UvEUHvU3tdbZPe");
2222

2323
#[derive(AnchorSerialize, AnchorDeserialize, Clone, Copy, PartialEq, Eq)]
2424
pub enum VaultStatus {

tests/autocratV0.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ import { open } from "fs";
6666

6767
// this test file isn't 'clean' or DRY or whatever; sorry!
6868
const AUTOCRAT_PROGRAM_ID = new PublicKey(
69-
"GLmTsw5A8DLCThjNgtMBKVDAG8EZYDVMic1pcjhGLiM1"
69+
"meta3cxKzFBmWYgCVozmvCQAS3y9b3fGxrG9HkHL7Wi"
7070
);
7171

7272
const CONDITIONAL_VAULT_PROGRAM_ID = new PublicKey(
73-
"4nCk4qKJSJf8pzJadMnr9LubA6Y7Zw3EacsVqH1TwVXH"
73+
"vaU1tVLj8RFk7mNj1BxqgAsMKKaL8UvEUHvU3tdbZPe"
7474
);
7575

7676
const OPENBOOK_TWAP_PROGRAM_ID = new PublicKey(
@@ -126,7 +126,6 @@ describe("autocrat_v0", async function () {
126126
OPENBOOK_TWAP_PROGRAM_ID,
127127
provider
128128
);
129-
//console.log(openbookTwap);
130129

131130
vaultProgram = new Program<ConditionalVault>(
132131
ConditionalVaultIDL,
@@ -230,7 +229,6 @@ describe("autocrat_v0", async function () {
230229

231230
// two days, so proposer should burn 30 SOL
232231
assert(balanceAfter < balanceBefore - 1_000_000_000n * 30n);
233-
console.log(balanceAfter);
234232

235233
assert(balanceAfter > balanceBefore - 1_000_000_000n * 35n);
236234
});
@@ -596,9 +594,6 @@ describe("autocrat_v0", async function () {
596594
limit: 255,
597595
};
598596

599-
console.log(await getAccount(banksClient, storedPassMarket.marketBaseVault));
600-
console.log(OPENBOOK_PROGRAM_ID)
601-
602597
await openbookTwap.methods
603598
.placeTakeOrder(takeBuyArgs)
604599
.accountsStrict({
@@ -936,9 +931,6 @@ describe("autocrat_v0", async function () {
936931
limit: 255,
937932
};
938933

939-
console.log(await getAccount(banksClient, storedPassMarket.marketBaseVault));
940-
console.log(OPENBOOK_PROGRAM_ID)
941-
942934
await openbookTwap.methods
943935
.placeTakeOrder(takeBuyArgs)
944936
.accountsStrict({

tests/conditionalVault.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export type Signer = anchor.web3.Signer;
2828
export type Keypair = anchor.web3.Keypair;
2929

3030
const CONDITIONAL_VAULT_PROGRAM_ID = new PublicKey(
31-
"4nCk4qKJSJf8pzJadMnr9LubA6Y7Zw3EacsVqH1TwVXH"
31+
"vaU1tVLj8RFk7mNj1BxqgAsMKKaL8UvEUHvU3tdbZPe"
3232
);
3333

3434
export enum VaultStatus {
@@ -54,8 +54,7 @@ describe("conditional_vault", async function () {
5454
vault,
5555
vaultUnderlyingTokenAccount,
5656
conditionalOnFinalizeMint,
57-
conditionalOnRevertMint,
58-
depositSlip;
57+
conditionalOnRevertMint;
5958

6059
before(async function () {
6160
context = await startAnchor("./", [], []);

0 commit comments

Comments
 (0)