Merge pull request #212 from convergence-rfq/dev

Dev
convergence-rfq · Mar 18, 2024 · 9dbc1a4 · 9dbc1a4
2 parents b7136fb + 48959e8
commit 9dbc1a4
Show file tree

Hide file tree

Showing 46 changed files with 194 additions and 119 deletions.
diff --git a/Anchor.toml b/Anchor.toml
@@ -2,31 +2,31 @@ anchor_version = "0.28.0"
 
 
 [programs.localnet]
-rfq = "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva"
-risk_engine = "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr"
-spot_instrument = "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm"
-psyoptions_european_instrument = "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW"
-psyoptions_american_instrument = "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok"
-hxro_print_trade_provider = "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95"
-vault_operator = "5Qnp9VdXtRvmR9wBcAdvqTRsBHzpZ4jU3ZKtn3BaYWUM"
+rfq = "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo"
+risk_engine = "CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1"
+spot_instrument = "BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v"
+psyoptions_european_instrument = "4KC8MQi2zQGr7LhTCVTMhbKuP4KcpTmdZjxsDBWrTSVf"
+psyoptions_american_instrument = "HpmyVA3t3uNGgdx86AuwZww7gnAWB57vepnk3732vEr9"
+hxro_print_trade_provider = "6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3"
+vault_operator = "DftT8Q74YPqwrtJzy6g97XLzouG2YWaWZfRad6yK2GvA"
 
 [programs.devnet]
-rfq = "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva"
-risk_engine = "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr"
-spot_instrument = "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm"
-psyoptions_european_instrument = "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW"
-psyoptions_american_instrument = "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok"
-hxro_print_trade_provider = "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95"
-vault_operator = "5Qnp9VdXtRvmR9wBcAdvqTRsBHzpZ4jU3ZKtn3BaYWUM"
+rfq = "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo"
+risk_engine = "CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1"
+spot_instrument = "BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v"
+psyoptions_european_instrument = "4KC8MQi2zQGr7LhTCVTMhbKuP4KcpTmdZjxsDBWrTSVf"
+psyoptions_american_instrument = "HpmyVA3t3uNGgdx86AuwZww7gnAWB57vepnk3732vEr9"
+hxro_print_trade_provider = "6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3"
+vault_operator = "DftT8Q74YPqwrtJzy6g97XLzouG2YWaWZfRad6yK2GvA"
 
 [programs.mainnet]
-rfq = "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva"
-risk_engine = "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr"
-spot_instrument = "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm"
-psyoptions_european_instrument = "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW"
-psyoptions_american_instrument = "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok"
-hxro_print_trade_provider = "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95"
-vault_operator = "5Qnp9VdXtRvmR9wBcAdvqTRsBHzpZ4jU3ZKtn3BaYWUM"
+rfq = "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo"
+risk_engine = "CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1"
+spot_instrument = "BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v"
+psyoptions_european_instrument = "4KC8MQi2zQGr7LhTCVTMhbKuP4KcpTmdZjxsDBWrTSVf"
+psyoptions_american_instrument = "HpmyVA3t3uNGgdx86AuwZww7gnAWB57vepnk3732vEr9"
+hxro_print_trade_provider = "6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3"
+vault_operator = "DftT8Q74YPqwrtJzy6g97XLzouG2YWaWZfRad6yK2GvA"
 
 [registry]
 url = "https://anchor.projectserum.com"

diff --git 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: "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95",
+  programId: "6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3",
   idlDir,
   sdkDir,
   binaryInstallDir,

diff --git 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.8.0",
+  "version": "3.9.0",
   "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
@@ -23,7 +23,7 @@ mod errors;
 mod helpers;
 mod state;
 
-declare_id!("4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95");
+declare_id!("6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3");
 
 #[program]
 pub mod hxro_print_trade_provider {

diff --git a/infra/sync.sh b/infra/sync.sh
@@ -3,5 +3,9 @@
 SCRIPT_PATH=$(readlink -f "$0")
 CPL_PATH=$(dirname $(dirname $SCRIPT_PATH))
 
-rsync -r $CPL_PATH --exclude='.anchor' --exclude='.git' --exclude='node_modules' --exclude='target/bpfel-unknown-unknown' \
-    --exclude='target/release' --exclude='target/debug' [email protected]:/root/
+rsync -r $CPL_PATH --exclude='.anchor' --exclude='.git' --exclude='node_modules' \
+    -e "ssh -i ~/.ssh/id_ed25519_pindaroso" \
+    --exclude='target' \
+    [email protected]:/root
+
+#scp -r -i ~/.ssh/id_ed25519_pindaroso [email protected]:/root/convergence-program-library-v3/target/idl idl
diff --git 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: "HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok",
+  programId: "HpmyVA3t3uNGgdx86AuwZww7gnAWB57vepnk3732vEr9",
   idlDir,
   sdkDir,
   binaryInstallDir,

diff --git 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.8.0",
+  "version": "3.9.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git 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!("HGmSFSRfVAG8RC8Ae4G1JFSHK7Au5GrGskDxncG3JRok");
+declare_id!("HpmyVA3t3uNGgdx86AuwZww7gnAWB57vepnk3732vEr9");
 
 const ESCROW_SEED: &str = "escrow";
 #[program]

diff --git 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: "6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW",
+  programId: "4KC8MQi2zQGr7LhTCVTMhbKuP4KcpTmdZjxsDBWrTSVf",
   idlDir,
   sdkDir,
   binaryInstallDir,

diff --git 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.8.0",
+  "version": "3.9.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git 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!("6B7TdBNAF7tWWz5sZbbBZj8jH1ix7QWAchtkvMHveEuW");
+declare_id!("4KC8MQi2zQGr7LhTCVTMhbKuP4KcpTmdZjxsDBWrTSVf");
 
 const ESCROW_SEED: &str = "escrow";
 

diff --git 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: "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+  programId: "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
   idlDir,
   sdkDir,
   binaryInstallDir,

diff --git a/rfq/js/package.json b/rfq/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@convergence-rfq/rfq",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git a/rfq/program/src/lib.rs b/rfq/program/src/lib.rs
@@ -66,7 +66,7 @@ security_txt! {
     auditors: "None"
 }
 
-declare_id!("EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva");
+declare_id!("FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo");
 
 /// Request for quote (RFQ) protocol module.
 #[program]

diff --git 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: "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr",
+  programId: "CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1",
   idlDir,
   sdkDir,
   binaryInstallDir,

diff --git a/risk-engine/js/package.json b/risk-engine/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@convergence-rfq/risk-engine",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git 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!("F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr");
+declare_id!("CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1");
 
 pub const CONFIG_SEED: &str = "config";
 

diff --git 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: "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm",
+  programId: "BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v",
   idlDir,
   sdkDir,
   binaryInstallDir,

diff --git a/spot-instrument/js/package.json b/spot-instrument/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@convergence-rfq/spot-instrument",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git a/spot-instrument/program/src/lib.rs b/spot-instrument/program/src/lib.rs
@@ -14,7 +14,7 @@ use state::Config;
 mod errors;
 mod state;
 
-declare_id!("4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm");
+declare_id!("BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v");
 
 const ESCROW_SEED: &str = "escrow";
 const CONFIG_SEED: &str = "config";

diff --git 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": "GizbUy6geL8B6jWGrnkH7jYvExBhpSpEzMyvx9hZfaho",
+  "pubkey": "P9Frq2k9Rx1ixDm71eaBcgN5xevWb7NNoPzZJrWWgC3",
   "account": {
     "lamports": 1169280,
     "data": [
       "mwyq4B76zILh05IpcF4Uyf+vsSOCQd79Yzo2cN7taTwXsxHuZE4XXw==",
       "base64"
     ],
-    "owner": "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95",
+    "owner": "6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-base-asset-btc.json b/tests/fixtures/accounts/rfq-base-asset-btc.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "9WJ5B36cb23UVuTGAw3cF3PdkwYcpRd3or9NB2feXob2",
+  "pubkey": "FrQXf9PvuwisbxSaGwXdFipxu8aCEvAXCMRLcPkX64Ct",
   "account": {
     "lamports": 2804880,
     "data": [
-      "A/5kN3P/Bxf+AAABAABujEl3g94AWWT2ktFbxNUQIrF1jMwAhCmERj8Lf9/+nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEJUQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+      "A/5kN3P/Bxf/AAABAABujEl3g94AWWT2ktFbxNUQIrF1jMwAhCmERj8Lf9/+nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEJUQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-base-asset-eth.json b/tests/fixtures/accounts/rfq-base-asset-eth.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "CtUPSK5cXRmsr1wGo5nCjfHQ9Dca6hsg26FBiZcMsTVp",
+  "pubkey": "4U5MABcScyet6DtPRreD6auphbrybn6SJni1kNo2Bbk1",
   "account": {
     "lamports": 2804880,
     "data": [
-      "A/5kN3P/Bxf8AgABAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAn0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEVUSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+      "A/5kN3P/Bxf/AgABAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAn0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAEVUSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-base-asset-sol.json b/tests/fixtures/accounts/rfq-base-asset-sol.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "7RMoZT2GLMvT5LiuXL9gSPcHdwEsS9f8Gi116cQ9ydNv",
+  "pubkey": "4n58twpt2baDXrRoay8Go8kniKBWfEnG1zsenvUUsMyZ",
   "account": {
     "lamports": 2804880,
     "data": [
-      "A/5kN3P/Bxf/AQABAgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAO8Ni2/aLOukHaFdQJXR2jkqDS+O0MbHvA9M+sjCgLVtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAFNPTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+      "A/5kN3P/Bxf8AQABAgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAO8Ni2/aLOukHaFdQJXR2jkqDS+O0MbHvA9M+sjCgLVtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAFNPTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-collateral-info-dao.json b/tests/fixtures/accounts/rfq-collateral-info-dao.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "ADSmGasDML6HXpRxACYjAqWz8icFib4hztZ6YF3vNtH6",
+  "pubkey": "Fr2tKpuV7Jvo51wpBU4so7qv1AmUc4uBh62ZUAy5oevy",
   "account": {
     "lamports": 3062400,
     "data": [
-      "o0RSJdyyEpn9ZJJsMbdIfexWonT9yyqMxu1HHDD0uX9BX7OXjafeIJn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "o0RSJdyyEpn/ZJJsMbdIfexWonT9yyqMxu1HHDD0uX9BX7OXjafeIJn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-collateral-info-maker.json b/tests/fixtures/accounts/rfq-collateral-info-maker.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "48qiMm1RzkdLJ4HT63pwB2LXtUo8Z9idwJouQpeTwhfR",
+  "pubkey": "EiqZBnwa8b7tLvXhXSwTW4zqkcT9UXpZi5ADmsyCKpq4",
   "account": {
     "lamports": 3062400,
     "data": [
-      "o0RSJdyyEpn9RGcv6WZ5nR0SQFCdXFvcEqmvImWuWJkw9t9ogVLKIbf9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "o0RSJdyyEpn6RGcv6WZ5nR0SQFCdXFvcEqmvImWuWJkw9t9ogVLKIbf9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-collateral-info-taker.json b/tests/fixtures/accounts/rfq-collateral-info-taker.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "8k1Pv1RjECRindE1PVzBuoVMUZz8mNFxrGj5oSMFiyiu",
+  "pubkey": "7H6gn5kksiDYRCeMRnyFLd7j8AnaMHrV8UqopTgDucji",
   "account": {
     "lamports": 3062400,
     "data": [
-      "o0RSJdyyEpn/yxkDb26bL0vjVHOsyuI/i4PC7QTivY42lYqpvanXNlf+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "o0RSJdyyEpn/yxkDb26bL0vjVHOsyuI/i4PC7QTivY42lYqpvanXNlf/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-collateral-token-dao.json b/tests/fixtures/accounts/rfq-collateral-token-dao.json
@@ -1,9 +1,9 @@
 {
-  "pubkey": "Bc7HGjyAymBhA1xHPZpnGMnaju6jiYThMvvbo8qWpVE8",
+  "pubkey": "DYj8vXUBpTxrptvRm2j2sCNAo7xPmPDidyp925YKNPZ",
   "account": {
     "lamports": 2039280,
     "data": [
-      "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZumI6UhbtanKC+A8hLXGGONU15fCDohQWp9tIILPO2Z8qQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZunckzU36JNeZ0cuJugU4hoQzl4D+ki3sLko821orBQWngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
       "base64"
     ],
     "owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",

diff --git a/tests/fixtures/accounts/rfq-collateral-token-maker.json b/tests/fixtures/accounts/rfq-collateral-token-maker.json
@@ -1,9 +1,9 @@
 {
-  "pubkey": "Eu5Ckc6jV6MMPtQLkNWMr3g3kd1oTXhfYL5nqTdH8hqy",
+  "pubkey": "HZoNij3PMue4MPar4SUydqENTF6CNDAC7CXN4HaX5gYr",
   "account": {
     "lamports": 2039280,
     "data": [
-      "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZukulTTcGjEatA0bElqKOcJgF7+0QBWQ98HZ9bcSzFhZxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZunL36T6x1fNwTdU5P415pUA2qfI32G+dg9HMfsT+wEqfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
       "base64"
     ],
     "owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",

diff --git a/tests/fixtures/accounts/rfq-collateral-token-taker.json b/tests/fixtures/accounts/rfq-collateral-token-taker.json
@@ -1,9 +1,9 @@
 {
-  "pubkey": "4Ebb8C6qYMYa9Cup7fHsWkdU8J5qxXfXoUoPcgAqYJ8c",
+  "pubkey": "HAWway8wsxpxT4Fds8HvNgS8QGkDLJQubjT9DK1VcdfF",
   "account": {
     "lamports": 2039280,
     "data": [
-      "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZulzBjrf5+5kFb4+wKYfJ3Z82zackn0hmZ6o+dj/AnA8ZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "aRq5Tm95/2xFlF3S5PgBarK9se95mD6qo+5+Z1sAZuldRdft+TMCmnE85e5qnNbYqpofKWjoeC78RHFerxuv2QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
       "base64"
     ],
     "owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",

diff --git a/tests/fixtures/accounts/rfq-mint-info-btc.json b/tests/fixtures/accounts/rfq-mint-info-btc.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "CCGguC4YFVLr17tM317mbqvechmgZvH1To5BcKi43GXX",
+  "pubkey": "Erqa3YWCcmzRRUbimK2WryFyGXW1xmBWDeCvo1tKmd3R",
   "account": {
     "lamports": 2324640,
     "data": [
-      "x3PV3dsdh67/1QdAbyji9GYRbBJEIDGa7a7Ri6BXDdP2m5O+Zgs5buYJAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+      "x3PV3dsdh67+1QdAbyji9GYRbBJEIDGa7a7Ri6BXDdP2m5O+Zgs5buYJAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }

diff --git a/tests/fixtures/accounts/rfq-mint-info-eth.json b/tests/fixtures/accounts/rfq-mint-info-eth.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "F74ZnvhTmF9JRJ9LCQ6kxfkSUXaLfHy9dxMnavpGWkBT",
+  "pubkey": "BKf1HuUftLk5mLX9hHNbJdUPRapGEJaaedZK1NNzewhH",
   "account": {
     "lamports": 2324640,
     "data": [
       "x3PV3dsdh67+KOeZ7XiJHyjoRFaYKs+85ejjnJrjfLSWJ2Uf3N+pjqwJAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
       "base64"
     ],
-    "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva",
+    "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo",
     "executable": false,
     "rentEpoch": 0
   }