From 5c5c6aaa7a95cbf4fdcaa94ea159e66d66788a37 Mon Sep 17 00:00:00 2001 From: Yaroslav Khodakovskij Date: Wed, 13 Dec 2023 19:20:57 +0200 Subject: [PATCH] Update program ids and bunp package versions --- Anchor.toml | 26 +++++------ hxro-print-trade-provider/js/.solitarc.js | 2 +- hxro-print-trade-provider/js/package.json | 2 +- hxro-print-trade-provider/program/src/lib.rs | 2 +- .../js/.solitarc.js | 2 +- .../js/package.json | 2 +- .../program/src/lib.rs | 2 +- .../js/.solitarc.js | 2 +- .../js/package.json | 2 +- .../program/src/lib.rs | 2 +- rfq/js/.solitarc.js | 2 +- rfq/js/package.json | 2 +- rfq/program/src/lib.rs | 2 +- risk-engine/js/.solitarc.js | 2 +- risk-engine/js/package.json | 2 +- risk-engine/program/src/lib.rs | 2 +- spot-instrument/js/.solitarc.js | 2 +- spot-instrument/js/package.json | 2 +- spot-instrument/program/src/lib.rs | 2 +- .../hxro-print-trade-provider-config.json | 4 +- .../fixtures/accounts/rfq-base-asset-btc.json | 6 +-- .../fixtures/accounts/rfq-base-asset-eth.json | 4 +- .../fixtures/accounts/rfq-base-asset-sol.json | 4 +- .../accounts/rfq-collateral-info-dao.json | 6 +-- .../accounts/rfq-collateral-info-maker.json | 6 +-- .../accounts/rfq-collateral-info-taker.json | 4 +- .../accounts/rfq-collateral-token-dao.json | 4 +- .../accounts/rfq-collateral-token-maker.json | 4 +- .../accounts/rfq-collateral-token-taker.json | 4 +- .../fixtures/accounts/rfq-mint-info-btc.json | 4 +- .../fixtures/accounts/rfq-mint-info-eth.json | 6 +-- .../fixtures/accounts/rfq-mint-info-sol.json | 6 +-- .../accounts/rfq-mint-info-usd-quote.json | 4 +- tests/fixtures/accounts/rfq-protocol.json | 6 +-- .../fixtures/accounts/risk-engine-config.json | 4 +- tests/fixtures/pubkey-naming.json | 44 +++++++++---------- 36 files changed, 91 insertions(+), 91 deletions(-) diff --git a/Anchor.toml b/Anchor.toml index f6ce2cdf..aeee4c91 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,20 +1,20 @@ anchor_version = "0.28.0" [programs.localnet] -rfq = "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP" -risk_engine = "GL6ezn1mYExqgbFQs85NjfBUi1k4uYkdjGf2pvSKktz8" -spot_instrument = "2LmfeVxwy5CqF5ufqfa6PVGRGjxJizEawQF1SngACufT" -psyoptions_european_instrument = "3cPrWr9jp8bHcVhH1dy6AKTyPS1yo6jQRoNmgPCcP2MM" -psyoptions_american_instrument = "8MvpZsBa4fRjRLR717CDQHzGEkvXr3anpQLpm9zDHY1G" -hxro_print_trade_provider = "GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ" +rfq = "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva" +risk_engine = "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr" +spot_instrument = "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm" +psyoptions_european_instrument = "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW" +psyoptions_american_instrument = "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok" +hxro_print_trade_provider = "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95" [programs.devnet] -rfq = "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP" -risk_engine = "GL6ezn1mYExqgbFQs85NjfBUi1k4uYkdjGf2pvSKktz8" -spot_instrument = "2LmfeVxwy5CqF5ufqfa6PVGRGjxJizEawQF1SngACufT" -psyoptions_european_instrument = "3cPrWr9jp8bHcVhH1dy6AKTyPS1yo6jQRoNmgPCcP2MM" -psyoptions_american_instrument = "8MvpZsBa4fRjRLR717CDQHzGEkvXr3anpQLpm9zDHY1G" -hxro_print_trade_provider = "GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ" +rfq = "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva" +risk_engine = "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr" +spot_instrument = "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm" +psyoptions_european_instrument = "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW" +psyoptions_american_instrument = "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok" +hxro_print_trade_provider = "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95" [programs.mainnet] rfq = "CeYwCe6YwBvRE9CpRU2Zgc5oQP7r2ThNqicyKN37Unn4" @@ -22,7 +22,7 @@ risk_engine = "7WBoFuPnWttNyxzL9tPtQJrNaAZTG6VquYy4dZZkj84F" spot_instrument = "HxWk421wJzJPzzRrAa4tPatRtMqY1hqPKV7XenBxsBpH" psyoptions_european_instrument = "4cEEKadSe3p73rCQmbLaAgzBtdnzWaBJtjr2RBaQ5DgB" psyoptions_american_instrument = "8jc8D8H1jkzJZvHmR6xXvxKwCCo4L2fg6gxoBYam1em9" -hxro_print_trade_provider = "GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ" +hxro_print_trade_provider = "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95" [registry] url = "https://anchor.projectserum.com" diff --git a/hxro-print-trade-provider/js/.solitarc.js b/hxro-print-trade-provider/js/.solitarc.js index e2ff6d2b..bec8a1c9 100644 --- a/hxro-print-trade-provider/js/.solitarc.js +++ b/hxro-print-trade-provider/js/.solitarc.js @@ -8,7 +8,7 @@ const binaryInstallDir = path.join(__dirname, ".crates"); module.exports = { idlGenerator: "anchor", programName: "hxro_print_trade_provider", - programId: "GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ", + programId: "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95", idlDir, sdkDir, binaryInstallDir, diff --git a/hxro-print-trade-provider/js/package.json b/hxro-print-trade-provider/js/package.json index ae94420b..f8965b14 100644 --- a/hxro-print-trade-provider/js/package.json +++ b/hxro-print-trade-provider/js/package.json @@ -1,6 +1,6 @@ { "name": "@convergence-rfq/hxro-print-trade-provider", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "MIT", "publishConfig": { "access": "public", diff --git a/hxro-print-trade-provider/program/src/lib.rs b/hxro-print-trade-provider/program/src/lib.rs index e6e81065..9b6977f0 100644 --- a/hxro-print-trade-provider/program/src/lib.rs +++ b/hxro-print-trade-provider/program/src/lib.rs @@ -21,7 +21,7 @@ mod errors; mod helpers; mod state; -declare_id!("GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ"); +declare_id!("4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95"); #[program] pub mod hxro_print_trade_provider { diff --git a/psyoptions-american-instrument/js/.solitarc.js b/psyoptions-american-instrument/js/.solitarc.js index 7553c0d4..91e395c8 100644 --- a/psyoptions-american-instrument/js/.solitarc.js +++ b/psyoptions-american-instrument/js/.solitarc.js @@ -8,7 +8,7 @@ const binaryInstallDir = path.join(__dirname, ".crates"); module.exports = { idlGenerator: "anchor", programName: "psyoptions_american_instrument", - programId: "8MvpZsBa4fRjRLR717CDQHzGEkvXr3anpQLpm9zDHY1G", + programId: "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok", idlDir, sdkDir, binaryInstallDir, diff --git a/psyoptions-american-instrument/js/package.json b/psyoptions-american-instrument/js/package.json index dc2857a6..ed193f06 100644 --- a/psyoptions-american-instrument/js/package.json +++ b/psyoptions-american-instrument/js/package.json @@ -1,6 +1,6 @@ { "name": "@convergence-rfq/psyoptions-american-instrument", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "MIT", "publishConfig": { "access": "public", diff --git a/psyoptions-american-instrument/program/src/lib.rs b/psyoptions-american-instrument/program/src/lib.rs index 365ed7e2..deed50cd 100644 --- a/psyoptions-american-instrument/program/src/lib.rs +++ b/psyoptions-american-instrument/program/src/lib.rs @@ -14,7 +14,7 @@ mod errors; mod instructions; mod state; -declare_id!("8MvpZsBa4fRjRLR717CDQHzGEkvXr3anpQLpm9zDHY1G"); +declare_id!("HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok"); const ESCROW_SEED: &str = "escrow"; #[program] diff --git a/psyoptions-european-instrument/js/.solitarc.js b/psyoptions-european-instrument/js/.solitarc.js index 570da018..247d4f72 100644 --- a/psyoptions-european-instrument/js/.solitarc.js +++ b/psyoptions-european-instrument/js/.solitarc.js @@ -8,7 +8,7 @@ const binaryInstallDir = path.join(__dirname, ".crates"); module.exports = { idlGenerator: "anchor", programName: "psyoptions_european_instrument", - programId: "3cPrWr9jp8bHcVhH1dy6AKTyPS1yo6jQRoNmgPCcP2MM", + programId: "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW", idlDir, sdkDir, binaryInstallDir, diff --git a/psyoptions-european-instrument/js/package.json b/psyoptions-european-instrument/js/package.json index e01cfc40..8ddfc228 100644 --- a/psyoptions-european-instrument/js/package.json +++ b/psyoptions-european-instrument/js/package.json @@ -1,6 +1,6 @@ { "name": "@convergence-rfq/psyoptions-european-instrument", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "MIT", "publishConfig": { "access": "public", diff --git a/psyoptions-european-instrument/program/src/lib.rs b/psyoptions-european-instrument/program/src/lib.rs index fb3635bf..c08969dc 100644 --- a/psyoptions-european-instrument/program/src/lib.rs +++ b/psyoptions-european-instrument/program/src/lib.rs @@ -15,7 +15,7 @@ mod errors; mod euro_options; mod state; -declare_id!("3cPrWr9jp8bHcVhH1dy6AKTyPS1yo6jQRoNmgPCcP2MM"); +declare_id!("6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW"); const ESCROW_SEED: &str = "escrow"; diff --git a/rfq/js/.solitarc.js b/rfq/js/.solitarc.js index a91f400b..0b06f1f8 100644 --- a/rfq/js/.solitarc.js +++ b/rfq/js/.solitarc.js @@ -8,7 +8,7 @@ const binaryInstallDir = path.join(__dirname, ".crates"); module.exports = { idlGenerator: "anchor", programName: "rfq", - programId: "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + programId: "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", idlDir, sdkDir, binaryInstallDir, diff --git a/rfq/js/package.json b/rfq/js/package.json index 1d786a5c..d81a6106 100644 --- a/rfq/js/package.json +++ b/rfq/js/package.json @@ -1,6 +1,6 @@ { "name": "@convergence-rfq/rfq", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "MIT", "publishConfig": { "access": "public", diff --git a/rfq/program/src/lib.rs b/rfq/program/src/lib.rs index 28f8fb2c..f1ccacb1 100644 --- a/rfq/program/src/lib.rs +++ b/rfq/program/src/lib.rs @@ -63,7 +63,7 @@ security_txt! { auditors: "None" } -declare_id!("CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP"); +declare_id!("EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva"); /// Request for quote (RFQ) protocol module. #[program] diff --git a/risk-engine/js/.solitarc.js b/risk-engine/js/.solitarc.js index 5521f42d..1ed3aae5 100644 --- a/risk-engine/js/.solitarc.js +++ b/risk-engine/js/.solitarc.js @@ -8,7 +8,7 @@ const binaryInstallDir = path.join(__dirname, ".crates"); module.exports = { idlGenerator: "anchor", programName: "risk_engine", - programId: "GL6ezn1mYExqgbFQs85NjfBUi1k4uYkdjGf2pvSKktz8", + programId: "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr", idlDir, sdkDir, binaryInstallDir, diff --git a/risk-engine/js/package.json b/risk-engine/js/package.json index 3b4f71fe..53b33f35 100644 --- a/risk-engine/js/package.json +++ b/risk-engine/js/package.json @@ -1,6 +1,6 @@ { "name": "@convergence-rfq/risk-engine", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "MIT", "publishConfig": { "access": "public", diff --git a/risk-engine/program/src/lib.rs b/risk-engine/program/src/lib.rs index a85164a1..6514076b 100644 --- a/risk-engine/program/src/lib.rs +++ b/risk-engine/program/src/lib.rs @@ -23,7 +23,7 @@ pub mod scenarios; pub mod state; pub mod utils; -declare_id!("GL6ezn1mYExqgbFQs85NjfBUi1k4uYkdjGf2pvSKktz8"); +declare_id!("F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr"); pub const CONFIG_SEED: &str = "config"; diff --git a/spot-instrument/js/.solitarc.js b/spot-instrument/js/.solitarc.js index d1633744..a850e703 100644 --- a/spot-instrument/js/.solitarc.js +++ b/spot-instrument/js/.solitarc.js @@ -8,7 +8,7 @@ const binaryInstallDir = path.join(__dirname, ".crates"); module.exports = { idlGenerator: "anchor", programName: "spot_instrument", - programId: "2LmfeVxwy5CqF5ufqfa6PVGRGjxJizEawQF1SngACufT", + programId: "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm", idlDir, sdkDir, binaryInstallDir, diff --git a/spot-instrument/js/package.json b/spot-instrument/js/package.json index 6d85899a..1b52197f 100644 --- a/spot-instrument/js/package.json +++ b/spot-instrument/js/package.json @@ -1,6 +1,6 @@ { "name": "@convergence-rfq/spot-instrument", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "MIT", "publishConfig": { "access": "public", diff --git a/spot-instrument/program/src/lib.rs b/spot-instrument/program/src/lib.rs index 66c4b3a8..fe0e57e5 100644 --- a/spot-instrument/program/src/lib.rs +++ b/spot-instrument/program/src/lib.rs @@ -11,7 +11,7 @@ use rfq::state::{ mod errors; -declare_id!("2LmfeVxwy5CqF5ufqfa6PVGRGjxJizEawQF1SngACufT"); +declare_id!("4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm"); const ESCROW_SEED: &str = "escrow"; diff --git a/tests/fixtures/accounts/hxro-print-trade-provider-config.json b/tests/fixtures/accounts/hxro-print-trade-provider-config.json index 116611d2..2de1c4e9 100644 --- a/tests/fixtures/accounts/hxro-print-trade-provider-config.json +++ b/tests/fixtures/accounts/hxro-print-trade-provider-config.json @@ -1,12 +1,12 @@ { - "pubkey": "4eHDjtwX6E2Ti48XBMesatZaY64SjqzEHhnt5m4r41rj", + "pubkey": "GizbUy6geL8B6jWGrnkH7jYvExBhpSpEzMyvx9hZfaho", "account": { "lamports": 1169280, "data": [ "mwyq4B76zILh05IpcF4Uyf+vsSOCQd79Yzo2cN7taTwXsxHuZE4XXw==", "base64" ], - "owner": "GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ", + "owner": "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-base-asset-btc.json b/tests/fixtures/accounts/rfq-base-asset-btc.json index 443a9350..ad6e19d7 100644 --- a/tests/fixtures/accounts/rfq-base-asset-btc.json +++ b/tests/fixtures/accounts/rfq-base-asset-btc.json @@ -1,12 +1,12 @@ { - "pubkey": "D1e7sTnMKQrCXXGJVX4PQaNTWB1wAKovkoWX6p35aEtW", + "pubkey": "9WJ5B36cb23UVuTGAw3cF3PdkwYcpRd3or9NB2feXob2", "account": { "lamports": 2804880, "data": [ - "A/5kN3P/Bxf/AAABAABujEl3g94AWWT2ktFbxNUQIrF1jMwAhCmERj8Lf9/+nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEJUQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "A/5kN3P/Bxf+AAABAABujEl3g94AWWT2ktFbxNUQIrF1jMwAhCmERj8Lf9/+nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEJUQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-base-asset-eth.json b/tests/fixtures/accounts/rfq-base-asset-eth.json index e1cd255c..895db896 100644 --- a/tests/fixtures/accounts/rfq-base-asset-eth.json +++ b/tests/fixtures/accounts/rfq-base-asset-eth.json @@ -1,12 +1,12 @@ { - "pubkey": "9aAzokkMZqXkgcZ3f7e5ZBb5thmv9ccPzGZqGNHeVMRx", + "pubkey": "CtUPSK5cXRmsr1wGo5nCjfHQ9Dca6hsg26FBiZcMsTVp", "account": { "lamports": 2804880, "data": [ "A/5kN3P/Bxf8AgABAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAn0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEVUSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-base-asset-sol.json b/tests/fixtures/accounts/rfq-base-asset-sol.json index 397fc8a1..0426f9e1 100644 --- a/tests/fixtures/accounts/rfq-base-asset-sol.json +++ b/tests/fixtures/accounts/rfq-base-asset-sol.json @@ -1,12 +1,12 @@ { - "pubkey": "93NAcFycZkkUc9SLEtj4At6xdHEJzYQLPEFtWA9R7dXx", + "pubkey": "7RMoZT2GLMvT5LiuXL9gSPcHdwEsS9f8Gi116cQ9ydNv", "account": { "lamports": 2804880, "data": [ "A/5kN3P/Bxf/AQABAgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAO8Ni2/aLOukHaFdQJXR2jkqDS+O0MbHvA9M+sjCgLVtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAFNPTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-collateral-info-dao.json b/tests/fixtures/accounts/rfq-collateral-info-dao.json index 5641388d..7299a545 100644 --- a/tests/fixtures/accounts/rfq-collateral-info-dao.json +++ b/tests/fixtures/accounts/rfq-collateral-info-dao.json @@ -1,12 +1,12 @@ { - "pubkey": "DV7GQ6GfNo8ZuPCz5VTuLBaEvyMNM5bBpo3ebretMNsM", + "pubkey": "ADSmGasDML6HXpRxACYjAqWz8icFib4hztZ6YF3vNtH6", "account": { "lamports": 3062400, "data": [ - "o0RSJdyyEpn/ZJJsMbdIfexWonT9yyqMxu1HHDD0uX9BX7OXjafeIJn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "o0RSJdyyEpn9ZJJsMbdIfexWonT9yyqMxu1HHDD0uX9BX7OXjafeIJn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-collateral-info-maker.json b/tests/fixtures/accounts/rfq-collateral-info-maker.json index 8b4c035f..7790bd8c 100644 --- a/tests/fixtures/accounts/rfq-collateral-info-maker.json +++ b/tests/fixtures/accounts/rfq-collateral-info-maker.json @@ -1,12 +1,12 @@ { - "pubkey": "64tXP5vYmakU5FYhXM6i4tXMpbts9E4mtmFYk8E7A9xX", + "pubkey": "48qiMm1RzkdLJ4HT63pwB2LXtUo8Z9idwJouQpeTwhfR", "account": { "lamports": 3062400, "data": [ - "o0RSJdyyEpn/RGcv6WZ5nR0SQFCdXFvcEqmvImWuWJkw9t9ogVLKIbf/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "o0RSJdyyEpn9RGcv6WZ5nR0SQFCdXFvcEqmvImWuWJkw9t9ogVLKIbf9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-collateral-info-taker.json b/tests/fixtures/accounts/rfq-collateral-info-taker.json index 6f520e16..f8b04e5a 100644 --- a/tests/fixtures/accounts/rfq-collateral-info-taker.json +++ b/tests/fixtures/accounts/rfq-collateral-info-taker.json @@ -1,12 +1,12 @@ { - "pubkey": "E3kn9kLUd72MyVPJGRL1472Bk1h8sexa3qV4DqGQkFkS", + "pubkey": "8k1Pv1RjECRindE1PVzBuoVMUZz8mNFxrGj5oSMFiyiu", "account": { "lamports": 3062400, "data": [ "o0RSJdyyEpn/yxkDb26bL0vjVHOsyuI/i4PC7QTivY42lYqpvanXNlf+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-collateral-token-dao.json b/tests/fixtures/accounts/rfq-collateral-token-dao.json index 515d79c4..8d507d16 100644 --- a/tests/fixtures/accounts/rfq-collateral-token-dao.json +++ b/tests/fixtures/accounts/rfq-collateral-token-dao.json @@ -1,9 +1,9 @@ { - "pubkey": "HdzEgFgXkmnzy2biLQrGCgx1Pbimi1SfvJAJ4tuVTmPY", + "pubkey": "Bc7HGjyAymBhA1xHPZpnGMnaju6jiYThMvvbo8qWpVE8", "account": { "lamports": 2039280, "data": [ - "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZum5f5cVz+i3dw8F9zfqoGNJisGykvwhBdSFK9oo23XFDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZumI6UhbtanKC+A8hLXGGONU15fCDohQWp9tIILPO2Z8qQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], "owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA", diff --git a/tests/fixtures/accounts/rfq-collateral-token-maker.json b/tests/fixtures/accounts/rfq-collateral-token-maker.json index d7c1b7fe..c90f74be 100644 --- a/tests/fixtures/accounts/rfq-collateral-token-maker.json +++ b/tests/fixtures/accounts/rfq-collateral-token-maker.json @@ -1,9 +1,9 @@ { - "pubkey": "5iUfJUswpi15A5mh1uLaFShDmZmmVBzeG71oRMk1nznG", + "pubkey": "Eu5Ckc6jV6MMPtQLkNWMr3g3kd1oTXhfYL5nqTdH8hqy", "account": { "lamports": 2039280, "data": [ - "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZulLSW9qGOPgbA+LlthuqXhanhYbCyeCJqR99f+j1/rq3ACAxqR+jQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZukulTTcGjEatA0bElqKOcJgF7+0QBWQ98HZ9bcSzFhZxACAxqR+jQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], "owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA", diff --git a/tests/fixtures/accounts/rfq-collateral-token-taker.json b/tests/fixtures/accounts/rfq-collateral-token-taker.json index 0f5d2d94..629c8dc5 100644 --- a/tests/fixtures/accounts/rfq-collateral-token-taker.json +++ b/tests/fixtures/accounts/rfq-collateral-token-taker.json @@ -1,9 +1,9 @@ { - "pubkey": "4tmZroj4WfQrGuYm3Z6xPtkrD2rt5Txr9eAJzB1v43DT", + "pubkey": "4Ebb8C6qYMYa9Cup7fHsWkdU8J5qxXfXoUoPcgAqYJ8c", "account": { "lamports": 2039280, "data": [ - "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZunB3JeVj3eEbza7zqCGhKepPtHd9gn26neVJMO1IxucVwCAxqR+jQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZulzBjrf5+5kFb4+wKYfJ3Z82zackn0hmZ6o+dj/AnA8ZgCAxqR+jQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], "owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA", diff --git a/tests/fixtures/accounts/rfq-mint-info-btc.json b/tests/fixtures/accounts/rfq-mint-info-btc.json index b56f05ac..b2b8db09 100644 --- a/tests/fixtures/accounts/rfq-mint-info-btc.json +++ b/tests/fixtures/accounts/rfq-mint-info-btc.json @@ -1,12 +1,12 @@ { - "pubkey": "7SNLxyT3ihccQmraRBgZ6YU9LytUnQACLoy1hfWYbh9B", + "pubkey": "CCGguC4YFVLr17tM317mbqvechmgZvH1To5BcKi43GXX", "account": { "lamports": 2324640, "data": [ "x3PV3dsdh67/1QdAbyji9GYRbBJEIDGa7a7Ri6BXDdP2m5O+Zgs5buYJAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-mint-info-eth.json b/tests/fixtures/accounts/rfq-mint-info-eth.json index e36d9ff8..0a108111 100644 --- a/tests/fixtures/accounts/rfq-mint-info-eth.json +++ b/tests/fixtures/accounts/rfq-mint-info-eth.json @@ -1,12 +1,12 @@ { - "pubkey": "G7fsFC78FRvoPQd8Yi7ojgPcJGw5QZpk6cys8a9uPegj", + "pubkey": "F74ZnvhTmF9JRJ9LCQ6kxfkSUXaLfHy9dxMnavpGWkBT", "account": { "lamports": 2324640, "data": [ - "x3PV3dsdh679KOeZ7XiJHyjoRFaYKs+85ejjnJrjfLSWJ2Uf3N+pjqwJAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "x3PV3dsdh67+KOeZ7XiJHyjoRFaYKs+85ejjnJrjfLSWJ2Uf3N+pjqwJAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-mint-info-sol.json b/tests/fixtures/accounts/rfq-mint-info-sol.json index e990ce9f..4ecc6e38 100644 --- a/tests/fixtures/accounts/rfq-mint-info-sol.json +++ b/tests/fixtures/accounts/rfq-mint-info-sol.json @@ -1,12 +1,12 @@ { - "pubkey": "9A9u2WdsJuvsRQgd19rrGUC49yjnWpkKs5qK5UVVe36X", + "pubkey": "4foY3PJTrLUt4nPJuuQy7WuRKz6kJXCuLBwxXdmSYgP2", "account": { "lamports": 2324640, "data": [ - "x3PV3dsdh67/KOWejuQHeNYncgTtjfJmQZMafgdeEmJ0ZWn5c9DFHpsJAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "x3PV3dsdh67+KOWejuQHeNYncgTtjfJmQZMafgdeEmJ0ZWn5c9DFHpsJAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-mint-info-usd-quote.json b/tests/fixtures/accounts/rfq-mint-info-usd-quote.json index d15b6884..d12db638 100644 --- a/tests/fixtures/accounts/rfq-mint-info-usd-quote.json +++ b/tests/fixtures/accounts/rfq-mint-info-usd-quote.json @@ -1,12 +1,12 @@ { - "pubkey": "AivMagYKHehhnsF1Pb1ziQhHrYcdjgDqzasR8eUoZy4W", + "pubkey": "3UV85jwjPmdL71q2kXiPZQbnz8N9CiYbvKadzaNhxX6W", "account": { "lamports": 2324640, "data": [ "x3PV3dsdh67/e2UTGuRioXUH1thtTs+0Qj7hdyxRnoHwm55RQpy8WkYJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/rfq-protocol.json b/tests/fixtures/accounts/rfq-protocol.json index 8d023100..ff9ec14b 100644 --- a/tests/fixtures/accounts/rfq-protocol.json +++ b/tests/fixtures/accounts/rfq-protocol.json @@ -1,12 +1,12 @@ { - "pubkey": "E2fphDySsxqySvb9ryfxFH7cVGK5QU7Adjjj9Tvu9eGk", + "pubkey": "GjDjkE8YnpE4ugQGg2E7qbDnFn1eb6DP9FEWbT22UPxy", "account": { "lamports": 35245440, "data": [ - "ITOthiOMw/hkkmwxt0h97FaidP3LKozG7UccMPS5f0Ffs5eNp94gmf8BAC0xAQAAAACAlpgAAAAAAADh9QUAAAAAAGXNHQAAAADjw7vHuSatVnKrKBsP6NGGz8vB11U90T15K+Cm9M0ZVWkauU5vef9sRZRd0uT4AWqyvbHveZg+qqPufmdbAGbpAQAAAO1TiKNSKAfielkTb0j/aEKAx0E3wEQwPjl++Xg9N3vtAgEDAAAAE+w6BuC1Bf5zHJBGTDUiZPnFl3s1DXuLcVVj1SoY3G4BAQEHAwMEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmyIr9j0RMRIhC7reJDxmP20yMmXCNuFvMdkgKM3+hQAEAAgcDAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1eR33PPoOx/3D8EFgM5zDpLMDh0KXsr6ktVAEQsehLAQADBwMDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ITOthiOMw/hkkmwxt0h97FaidP3LKozG7UccMPS5f0Ffs5eNp94gmf8BAC0xAQAAAACAlpgAAAAAAADh9QUAAAAAAGXNHQAAAADQutL19LeRkX2pDq//ZKenRFnb6euxETuTU5Jt1XnnzWkauU5vef9sRZRd0uT4AWqyvbHveZg+qqPufmdbAGbpAQAAADQn6ZFuvjtDiVsOoxh64YjkrChPKmO+L68J8EWlRROEAgEDAAAALuq50RD25+XaanAnJ+aMkEeElLwt95Vm39LCpn1oGNYBAQEHAwMEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABM4YvEy7sm/n6dRhS0YyinN5+xEyNX+eTyt9D/sMg3UQEAAgcDAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPHE8jZWWx+0DKPG8mlku8p0YsMeTFUt2dJYH3yGio9fAQADBwMDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "base64" ], - "owner": "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP", + "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/accounts/risk-engine-config.json b/tests/fixtures/accounts/risk-engine-config.json index 894ce389..e9ce9178 100644 --- a/tests/fixtures/accounts/risk-engine-config.json +++ b/tests/fixtures/accounts/risk-engine-config.json @@ -1,12 +1,12 @@ { - "pubkey": "DXoNRZwKE59uE6wUMA5EAnepJbdG5eYJSDZVxjxKYU2z", + "pubkey": "66TqCm7S1tEjC96TEggh2EpcYdmAppZy3qHLapP3peX", "account": { "lamports": 9744000, "data": [ "mwyq4B76zIIAypo7AAAAAACUNXcAAAAACQAAAAAAAAB7FK5H4XqEP5qZmZmZmbk/AAPMEgAAAAB7FK5H4XqEPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACamZmZmZmpPwAAAAAAAOA/exSuR+F6lD+amZmZmZnJP3sUrkfheqQ/MzMzMzMz0z97FK5H4Xq0P5qZmZmZmdk/uB6F61G4vj8AAAAAAADgP5qZmZmZmck/MzMzMzMz4z8zMzMzMzPTP2ZmZmZmZuY/mpmZmZmZqT+amZmZmZnpP3sUrkfheqQ/mpmZmZmZ2T97FK5H4Xq0PzMzMzMzM+M/exSuR+F6xD+amZmZmZnpP7gehetRuM4/AAAAAAAA8D+amZmZmZnZPzMzMzMzM/M/MzMzMzMz4z9mZmZmZmb2P5qZmZmZmak/MzMzMzMz8z+4HoXrUbiuPzMzMzMzM+M/uB6F61G4vj/NzMzMzMzsP7gehetRuM4/MzMzMzMz8z8K16NwPQrXPwAAAAAAAPg/MzMzMzMz4z/NzMzMzMz8P83MzMzMzOw/zczMzMzMAECamZmZmZmpPzMzMzMzMwNAexSuR+F6tD+amZmZmZnpP3sUrkfhesQ/MzMzMzMz8z97FK5H4XrUP5qZmZmZmfk/uB6F61G43j8AAAAAAAAAQJqZmZmZmek/MzMzMzMzA0AzMzMzMzPzP2ZmZmZmZgZAmpmZmZmZqT8AAAAAAAAUQJqZmZmZmbk/AAAAAAAA8D+amZmZmZnJPwAAAAAAAPg/mpmZmZmZ2T8AAAAAAAAAQDMzMzMzM+M/AAAAAAAABEAAAAAAAADwPwAAAAAAAAhAAAAAAAAA+D8AAAAAAAAMQJqZmZmZmak/AAAAAAAAJECamZmZmZnJPwAAAAAAAOA/MzMzMzMz0z8AAAAAAADgP5qZmZmZmdk/AAAAAAAA4D8AAAAAAADgPwAAAAAAAOA/MzMzMzMz4z8AAAAAAADgP2ZmZmZmZuY/AAAAAAAA4D+amZmZmZmpPwAAAAAAAC5AmpmZmZmZyT8AAAAAAADgPzMzMzMzM9M/AAAAAAAA4D+amZmZmZnZPwAAAAAAAOA/AAAAAAAA4D8AAAAAAADgPzMzMzMzM+M/AAAAAAAA4D9mZmZmZmbmPwAAAAAAAOA/mpmZmZmZqT8AAAAAAAA0QJqZmZmZmck/AAAAAAAA4D8zMzMzMzPTPwAAAAAAAOA/mpmZmZmZ2T8AAAAAAADgPwAAAAAAAOA/AAAAAAAA4D8zMzMzMzPjPwAAAAAAAOA/ZmZmZmZm5j8AAAAAAADgPwECAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], - "owner": "GL6ezn1mYExqgbFQs85NjfBUi1k4uYkdjGf2pvSKktz8", + "owner": "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr", "executable": false, "rentEpoch": 0 } diff --git a/tests/fixtures/pubkey-naming.json b/tests/fixtures/pubkey-naming.json index f51ec7f9..12a50071 100644 --- a/tests/fixtures/pubkey-naming.json +++ b/tests/fixtures/pubkey-naming.json @@ -2,33 +2,33 @@ "7mbGUAWCyC2NRpx9LsGNyAQbcp9VdRunZrjVvFQUYMNY": "account-dao", "5c1yzmnQg2bL8bdbUeBdgZ2RB5CAcjWN1yz6P1B8ccf8": "account-maker", "EfotJvuqAdsPx4RFTNsnEABBuAyACNnjEKKR5zyE4HVx": "account-taker", - "GyRW7qvzx6UTVW9DkQGMy5f1rp9XK2x53FvWSjUUF7BJ": "hxro-print-trade-provider", - "4eHDjtwX6E2Ti48XBMesatZaY64SjqzEHhnt5m4r41rj": "hxro-print-trade-provider-config", + "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95": "hxro-print-trade-provider", + "GizbUy6geL8B6jWGrnkH7jYvExBhpSpEzMyvx9hZfaho": "hxro-print-trade-provider-config", "FLaFgJ3Qa3bSGxUhiPCF3cgU1XhpTZKaSev7RUMbFYJZ": "mint-btc", "3kg8xjMx3EWdAuGcm6gqgXFXbgQKk5b88N6AeAo26CbM": "mint-eth", "3kePJGX9JBSMqqmLMBYZaJh6XksemDQA5EV2D1HR5w9L": "mint-sol", "85HShAwuaknk3srchNcfmg4SZU9PsNzPvECnaqH62PDa": "mint-usd-collateral", "9JgYBxL6w11XJ4xtvEicRhXGse6A1akPgZJaKjM1JnZB": "mint-usd-quote", - "8MvpZsBa4fRjRLR717CDQHzGEkvXr3anpQLpm9zDHY1G": "psyoptions-american-instrument", - "3cPrWr9jp8bHcVhH1dy6AKTyPS1yo6jQRoNmgPCcP2MM": "psyoptions-european-instrument", - "CdvjLpJGpYTdpdanPpfUe1zPERYvpvP4VALUz62eRrGP": "rfq", - "D1e7sTnMKQrCXXGJVX4PQaNTWB1wAKovkoWX6p35aEtW": "rfq-base-asset-btc", - "9aAzokkMZqXkgcZ3f7e5ZBb5thmv9ccPzGZqGNHeVMRx": "rfq-base-asset-eth", - "93NAcFycZkkUc9SLEtj4At6xdHEJzYQLPEFtWA9R7dXx": "rfq-base-asset-sol", - "DV7GQ6GfNo8ZuPCz5VTuLBaEvyMNM5bBpo3ebretMNsM": "rfq-collateral-info-dao", - "64tXP5vYmakU5FYhXM6i4tXMpbts9E4mtmFYk8E7A9xX": "rfq-collateral-info-maker", - "E3kn9kLUd72MyVPJGRL1472Bk1h8sexa3qV4DqGQkFkS": "rfq-collateral-info-taker", - "HdzEgFgXkmnzy2biLQrGCgx1Pbimi1SfvJAJ4tuVTmPY": "rfq-collateral-token-dao", - "5iUfJUswpi15A5mh1uLaFShDmZmmVBzeG71oRMk1nznG": "rfq-collateral-token-maker", - "4tmZroj4WfQrGuYm3Z6xPtkrD2rt5Txr9eAJzB1v43DT": "rfq-collateral-token-taker", - "7SNLxyT3ihccQmraRBgZ6YU9LytUnQACLoy1hfWYbh9B": "rfq-mint-info-btc", - "G7fsFC78FRvoPQd8Yi7ojgPcJGw5QZpk6cys8a9uPegj": "rfq-mint-info-eth", - "9A9u2WdsJuvsRQgd19rrGUC49yjnWpkKs5qK5UVVe36X": "rfq-mint-info-sol", - "AivMagYKHehhnsF1Pb1ziQhHrYcdjgDqzasR8eUoZy4W": "rfq-mint-info-usd-quote", - "E2fphDySsxqySvb9ryfxFH7cVGK5QU7Adjjj9Tvu9eGk": "rfq-protocol", - "GL6ezn1mYExqgbFQs85NjfBUi1k4uYkdjGf2pvSKktz8": "risk-engine", - "DXoNRZwKE59uE6wUMA5EAnepJbdG5eYJSDZVxjxKYU2z": "risk-engine-config", - "2LmfeVxwy5CqF5ufqfa6PVGRGjxJizEawQF1SngACufT": "spot-instrument", + "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok": "psyoptions-american-instrument", + "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW": "psyoptions-european-instrument", + "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva": "rfq", + "9WJ5B36cb23UVuTGAw3cF3PdkwYcpRd3or9NB2feXob2": "rfq-base-asset-btc", + "CtUPSK5cXRmsr1wGo5nCjfHQ9Dca6hsg26FBiZcMsTVp": "rfq-base-asset-eth", + "7RMoZT2GLMvT5LiuXL9gSPcHdwEsS9f8Gi116cQ9ydNv": "rfq-base-asset-sol", + "ADSmGasDML6HXpRxACYjAqWz8icFib4hztZ6YF3vNtH6": "rfq-collateral-info-dao", + "48qiMm1RzkdLJ4HT63pwB2LXtUo8Z9idwJouQpeTwhfR": "rfq-collateral-info-maker", + "8k1Pv1RjECRindE1PVzBuoVMUZz8mNFxrGj5oSMFiyiu": "rfq-collateral-info-taker", + "Bc7HGjyAymBhA1xHPZpnGMnaju6jiYThMvvbo8qWpVE8": "rfq-collateral-token-dao", + "Eu5Ckc6jV6MMPtQLkNWMr3g3kd1oTXhfYL5nqTdH8hqy": "rfq-collateral-token-maker", + "4Ebb8C6qYMYa9Cup7fHsWkdU8J5qxXfXoUoPcgAqYJ8c": "rfq-collateral-token-taker", + "CCGguC4YFVLr17tM317mbqvechmgZvH1To5BcKi43GXX": "rfq-mint-info-btc", + "F74ZnvhTmF9JRJ9LCQ6kxfkSUXaLfHy9dxMnavpGWkBT": "rfq-mint-info-eth", + "4foY3PJTrLUt4nPJuuQy7WuRKz6kJXCuLBwxXdmSYgP2": "rfq-mint-info-sol", + "3UV85jwjPmdL71q2kXiPZQbnz8N9CiYbvKadzaNhxX6W": "rfq-mint-info-usd-quote", + "GjDjkE8YnpE4ugQGg2E7qbDnFn1eb6DP9FEWbT22UPxy": "rfq-protocol", + "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr": "risk-engine", + "66TqCm7S1tEjC96TEggh2EpcYdmAppZy3qHLapP3peX": "risk-engine-config", + "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm": "spot-instrument", "CBVMytnrNLSMZR4kRBwpp87iNeuexMehJFMTcizW86Yy": "token-account-btc-dao", "24z1PN6o4swFd1ztLevjSbM6hnLd96wd65BVv3QkeCrU": "token-account-btc-maker", "EB25yJhPe4X4ZWkDoeTm8HRpKgtqZGWKZAS58ifBkmGV": "token-account-btc-taker",