diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index e32b72b24..6cafbfb8a 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,16 @@ # @convergence-rfq/cli +## 6.3.0 + +### Minor Changes + +- Update program ids and add vault operator program + +### Patch Changes + +- Updated dependencies + - @convergence-rfq/sdk@6.3.0 + ## 6.2.1 ### Patch Changes diff --git a/packages/cli/package.json b/packages/cli/package.json index 580d824f2..fd62d1879 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@convergence-rfq/cli", "description": "Official Convergence CLI", - "version": "6.2.1", + "version": "6.3.0", "license": "MIT", "publishConfig": { "access": "public" @@ -47,7 +47,7 @@ "cli": "ts-node src/index.ts" }, "dependencies": { - "@convergence-rfq/sdk": "6.2.1", + "@convergence-rfq/sdk": "6.3.0", "@solana/web3.js": "^1.87.6", "@types/cookie": "^0.5.1", "commander": "^10.0.0" diff --git a/packages/js/CHANGELOG.md b/packages/js/CHANGELOG.md index 5e2203240..2a435541c 100644 --- a/packages/js/CHANGELOG.md +++ b/packages/js/CHANGELOG.md @@ -1,5 +1,11 @@ # @convergence-rfq/sdk +## 6.3.0 + +### Minor Changes + +- Update program ids and add vault operator program + ## 6.2.1 ### Patch Changes diff --git a/packages/js/package.json b/packages/js/package.json index c89036d8b..e33715f88 100644 --- a/packages/js/package.json +++ b/packages/js/package.json @@ -1,7 +1,7 @@ { "name": "@convergence-rfq/sdk", "description": "Official Convergence RFQ SDK", - "version": "6.2.1", + "version": "6.3.0", "license": "MIT", "publishConfig": { "access": "public" @@ -52,12 +52,13 @@ "@bundlr-network/client": "^0.8.8", "@convergence-rfq/beet": "0.7.10", "@convergence-rfq/beet-solana": "0.4.11", - "@convergence-rfq/hxro-print-trade-provider": "3.8.0", - "@convergence-rfq/psyoptions-american-instrument": "3.8.0", - "@convergence-rfq/psyoptions-european-instrument": "3.8.0", - "@convergence-rfq/rfq": "3.8.0", - "@convergence-rfq/risk-engine": "3.8.0", - "@convergence-rfq/spot-instrument": "3.8.0", + "@convergence-rfq/hxro-print-trade-provider": "3.9.0", + "@convergence-rfq/psyoptions-american-instrument": "3.9.0", + "@convergence-rfq/psyoptions-european-instrument": "3.9.0", + "@convergence-rfq/rfq": "3.9.0", + "@convergence-rfq/risk-engine": "3.9.0", + "@convergence-rfq/spot-instrument": "3.9.0", + "@convergence-rfq/vault-operator": "^3.9.0", "@coral-xyz/anchor": "^0.28.0", "@coral-xyz/borsh": "^0.28.0", "@hxronetwork/dexterity-ts": "1.6.16", diff --git a/packages/validator/fixtures/accounts/hxro-print-trade-provider-config.json b/packages/validator/fixtures/accounts/hxro-print-trade-provider-config.json index 2de1c4e92..984d99e94 100644 --- a/packages/validator/fixtures/accounts/hxro-print-trade-provider-config.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-base-asset-btc.json b/packages/validator/fixtures/accounts/rfq-base-asset-btc.json index ad6e19d7f..55de34580 100644 --- a/packages/validator/fixtures/accounts/rfq-base-asset-btc.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-base-asset-eth.json b/packages/validator/fixtures/accounts/rfq-base-asset-eth.json index 895db8962..ae1dacff6 100644 --- a/packages/validator/fixtures/accounts/rfq-base-asset-eth.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-base-asset-sol.json b/packages/validator/fixtures/accounts/rfq-base-asset-sol.json index 0426f9e1d..2b72b9b1d 100644 --- a/packages/validator/fixtures/accounts/rfq-base-asset-sol.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-collateral-info-dao.json b/packages/validator/fixtures/accounts/rfq-collateral-info-dao.json index 7299a5457..b4dd69524 100644 --- a/packages/validator/fixtures/accounts/rfq-collateral-info-dao.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-collateral-info-maker.json b/packages/validator/fixtures/accounts/rfq-collateral-info-maker.json index 7790bd8cc..0db4781b3 100644 --- a/packages/validator/fixtures/accounts/rfq-collateral-info-maker.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-collateral-info-taker.json b/packages/validator/fixtures/accounts/rfq-collateral-info-taker.json index f8b04e5a8..f4e0c6ca7 100644 --- a/packages/validator/fixtures/accounts/rfq-collateral-info-taker.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-collateral-token-dao.json b/packages/validator/fixtures/accounts/rfq-collateral-token-dao.json index 8d507d16d..bcab8f2bb 100644 --- a/packages/validator/fixtures/accounts/rfq-collateral-token-dao.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-collateral-token-maker.json b/packages/validator/fixtures/accounts/rfq-collateral-token-maker.json index 0ab4cc3f4..448a2d668 100644 --- a/packages/validator/fixtures/accounts/rfq-collateral-token-maker.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-collateral-token-taker.json b/packages/validator/fixtures/accounts/rfq-collateral-token-taker.json index 926239dd0..1fbf32253 100644 --- a/packages/validator/fixtures/accounts/rfq-collateral-token-taker.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-mint-info-btc.json b/packages/validator/fixtures/accounts/rfq-mint-info-btc.json index b2b8db099..671d27f0f 100644 --- a/packages/validator/fixtures/accounts/rfq-mint-info-btc.json +++ b/packages/validator/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/packages/validator/fixtures/accounts/rfq-mint-info-eth.json b/packages/validator/fixtures/accounts/rfq-mint-info-eth.json index 0a1081111..17a3d96b4 100644 --- a/packages/validator/fixtures/accounts/rfq-mint-info-eth.json +++ b/packages/validator/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 } diff --git a/packages/validator/fixtures/accounts/rfq-mint-info-sol.json b/packages/validator/fixtures/accounts/rfq-mint-info-sol.json index 4ecc6e389..392e19161 100644 --- a/packages/validator/fixtures/accounts/rfq-mint-info-sol.json +++ b/packages/validator/fixtures/accounts/rfq-mint-info-sol.json @@ -1,12 +1,12 @@ { - "pubkey": "4foY3PJTrLUt4nPJuuQy7WuRKz6kJXCuLBwxXdmSYgP2", + "pubkey": "7kuX93pjSAfd3nraBqdCHzrzwW3L1JM9no8SjEwuzYYt", "account": { "lamports": 2324640, "data": [ - "x3PV3dsdh67+KOWejuQHeNYncgTtjfJmQZMafgdeEmJ0ZWn5c9DFHpsJAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "x3PV3dsdh67/KOWejuQHeNYncgTtjfJmQZMafgdeEmJ0ZWn5c9DFHpsJAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", + "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo", "executable": false, "rentEpoch": 0 } diff --git a/packages/validator/fixtures/accounts/rfq-mint-info-usd-quote.json b/packages/validator/fixtures/accounts/rfq-mint-info-usd-quote.json index d12db6387..0a6326c5c 100644 --- a/packages/validator/fixtures/accounts/rfq-mint-info-usd-quote.json +++ b/packages/validator/fixtures/accounts/rfq-mint-info-usd-quote.json @@ -1,12 +1,12 @@ { - "pubkey": "3UV85jwjPmdL71q2kXiPZQbnz8N9CiYbvKadzaNhxX6W", + "pubkey": "5Atpbyw3tBjjc8EYrbjE1a4FNqyLUszFGsNo3R5bR3y8", "account": { "lamports": 2324640, "data": [ "x3PV3dsdh67/e2UTGuRioXUH1thtTs+0Qj7hdyxRnoHwm55RQpy8WkYJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "base64" ], - "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", + "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo", "executable": false, "rentEpoch": 0 } diff --git a/packages/validator/fixtures/accounts/rfq-protocol.json b/packages/validator/fixtures/accounts/rfq-protocol.json index a7af7d43d..a95d5ff3b 100644 --- a/packages/validator/fixtures/accounts/rfq-protocol.json +++ b/packages/validator/fixtures/accounts/rfq-protocol.json @@ -1,12 +1,12 @@ { - "pubkey": "GjDjkE8YnpE4ugQGg2E7qbDnFn1eb6DP9FEWbT22UPxy", + "pubkey": "AinWDnZWiEkWrNGH9jbvS2JXaBFZwnRE5ssNGyop882L", "account": { "lamports": 35245440, "data": [ - "ITOthiOMw/hkkmwxt0h97FaidP3LKozG7UccMPS5f0Ffs5eNp94gmf8BAC0xAQAAAACAlpgAAAAAAADh9QUAAAAAAGXNHQAAAADQutL19LeRkX2pDq//ZKenRFnb6euxETuTU5Jt1XnnzWkauU5vef9sRZRd0uT4AWqyvbHveZg+qqPufmdbAGbpAQAAADQn6ZFuvjtDiVsOoxh64YjkrChPKmO+L68J8EWlRROEAgEDAAAALuq50RD25+XaanAnJ+aMkEeElLwt95Vm39LCpn1oGNYBAQEHBQMEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABM4YvEy7sm/n6dRhS0YyinN5+xEyNX+eTyt9D/sMg3UQEAAgcDAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPHE8jZWWx+0DKPG8mlku8p0YsMeTFUt2dJYH3yGio9fAQADBwMDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ITOthiOMw/hkkmwxt0h97FaidP3LKozG7UccMPS5f0Ffs5eNp94gmf8BAC0xAQAAAACAlpgAAAAAAADh9QUAAAAAAGXNHQAAAACwrKo0HjaL9oUZ0AwE1p+JHVKTcs55/kDE/lmUTMVgNmkauU5vef9sRZRd0uT4AWqyvbHveZg+qqPufmdbAGbpAQAAAFkkdOYAxksuBzNIiEuhu5wGIxiDQ20QOBuM8uqkVCV4AgEDAAAAmdb7REiKg21M9/FtGIfsOSsD/K7ESsZyfHJz4tbXUJEBAQEHBQMEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxPBiuESphc/9eTxK0v5lWq0Fhl+Dq4uMncfvyoe62wgEAAgcDAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPn4JBeNNnKrn93HANn5Iinun1iYe6VXbwyivBDfV0QOAQADBwMDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "base64" ], - "owner": "EMFRxsc7FSavsUVKuwNiywXixYthe2Mo5GUNaUvnvBva", + "owner": "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo", "executable": false, "rentEpoch": 0 } diff --git a/packages/validator/fixtures/accounts/risk-engine-config.json b/packages/validator/fixtures/accounts/risk-engine-config.json index fa8083902..43d8a2ca9 100644 --- a/packages/validator/fixtures/accounts/risk-engine-config.json +++ b/packages/validator/fixtures/accounts/risk-engine-config.json @@ -1,12 +1,12 @@ { - "pubkey": "66TqCm7S1tEjC96TEggh2EpcYdmAppZy3qHLapP3peX", + "pubkey": "63zhouVc9DsAWsvp9CaJ7EY12CDK984Yt7heVbTsJxcN", "account": { "lamports": 9744000, "data": [ "mwyq4B76zIIAAAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPMEgAAAAB7FK5H4XqEPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "base64" ], - "owner": "F3o2hWqv61TavHuZYuStvW2Zd3M1JnoqBmmgGU77LRTr", + "owner": "CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1", "executable": false, "rentEpoch": 0 } diff --git a/packages/validator/fixtures/accounts/spot-instrument-config.json b/packages/validator/fixtures/accounts/spot-instrument-config.json index c527ef432..c9514238c 100644 --- a/packages/validator/fixtures/accounts/spot-instrument-config.json +++ b/packages/validator/fixtures/accounts/spot-instrument-config.json @@ -1,12 +1,12 @@ { - "pubkey": "ETU5oAWiE1pembP8LGvtB3Jung9XnMNc5B9Qjiasqign", + "pubkey": "7J21igTMpQa18YueGJGNmp54m1VxsBHz4LEjiV6P28DJ", "account": { "lamports": 1002240, "data": [ "mwyq4B76zIKAlpgAAAAAAA==", "base64" ], - "owner": "4A9M7iojGDPc4n4YDGnTmsYsNKUohG1zM1nrAqVMMmrm", + "owner": "BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v", "executable": false, "rentEpoch": 0 } diff --git a/packages/validator/fixtures/programs/hxro_print_trade_provider.so b/packages/validator/fixtures/programs/hxro_print_trade_provider.so index 80ddc8995..a708cb408 100755 Binary files a/packages/validator/fixtures/programs/hxro_print_trade_provider.so and b/packages/validator/fixtures/programs/hxro_print_trade_provider.so differ diff --git a/packages/validator/fixtures/programs/psyoptions_american_instrument.so b/packages/validator/fixtures/programs/psyoptions_american_instrument.so index 45ef0b640..a2d95051c 100755 Binary files a/packages/validator/fixtures/programs/psyoptions_american_instrument.so and b/packages/validator/fixtures/programs/psyoptions_american_instrument.so differ diff --git a/packages/validator/fixtures/programs/psyoptions_european_instrument.so b/packages/validator/fixtures/programs/psyoptions_european_instrument.so index 9e7addc23..c13c48648 100755 Binary files a/packages/validator/fixtures/programs/psyoptions_european_instrument.so and b/packages/validator/fixtures/programs/psyoptions_european_instrument.so differ diff --git a/packages/validator/fixtures/programs/rfq.so b/packages/validator/fixtures/programs/rfq.so index 089d185e3..68b36c582 100755 Binary files a/packages/validator/fixtures/programs/rfq.so and b/packages/validator/fixtures/programs/rfq.so differ diff --git a/packages/validator/fixtures/programs/risk_engine.so b/packages/validator/fixtures/programs/risk_engine.so index b8c0adc38..fdcf8783c 100755 Binary files a/packages/validator/fixtures/programs/risk_engine.so and b/packages/validator/fixtures/programs/risk_engine.so differ diff --git a/packages/validator/fixtures/programs/spot_instrument.so b/packages/validator/fixtures/programs/spot_instrument.so index f47227c03..184086191 100755 Binary files a/packages/validator/fixtures/programs/spot_instrument.so and b/packages/validator/fixtures/programs/spot_instrument.so differ diff --git a/packages/validator/fixtures/programs/vault_operator.so b/packages/validator/fixtures/programs/vault_operator.so new file mode 100755 index 000000000..03bd1db72 Binary files /dev/null and b/packages/validator/fixtures/programs/vault_operator.so differ diff --git a/packages/validator/fixtures/pubkey-naming.json b/packages/validator/fixtures/pubkey-naming.json index 12a500710..c99662183 100644 --- a/packages/validator/fixtures/pubkey-naming.json +++ b/packages/validator/fixtures/pubkey-naming.json @@ -2,33 +2,34 @@ "7mbGUAWCyC2NRpx9LsGNyAQbcp9VdRunZrjVvFQUYMNY": "account-dao", "5c1yzmnQg2bL8bdbUeBdgZ2RB5CAcjWN1yz6P1B8ccf8": "account-maker", "EfotJvuqAdsPx4RFTNsnEABBuAyACNnjEKKR5zyE4HVx": "account-taker", - "4WbVwc5Edfo3oB1n16bVC9qrghYHSNh1qAECbSCyiT95": "hxro-print-trade-provider", - "GizbUy6geL8B6jWGrnkH7jYvExBhpSpEzMyvx9hZfaho": "hxro-print-trade-provider-config", + "6zyXbd44vYHhpC1gxZr2BhM6m7jThqsBphn2GD36bUi3": "hxro-print-trade-provider", + "P9Frq2k9Rx1ixDm71eaBcgN5xevWb7NNoPzZJrWWgC3": "hxro-print-trade-provider-config", "FLaFgJ3Qa3bSGxUhiPCF3cgU1XhpTZKaSev7RUMbFYJZ": "mint-btc", "3kg8xjMx3EWdAuGcm6gqgXFXbgQKk5b88N6AeAo26CbM": "mint-eth", "3kePJGX9JBSMqqmLMBYZaJh6XksemDQA5EV2D1HR5w9L": "mint-sol", "85HShAwuaknk3srchNcfmg4SZU9PsNzPvECnaqH62PDa": "mint-usd-collateral", "9JgYBxL6w11XJ4xtvEicRhXGse6A1akPgZJaKjM1JnZB": "mint-usd-quote", - "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", + "HpmyVA3t3uNGgdx86AuwZww7gnAWB57vepnk3732vEr9": "psyoptions-american-instrument", + "4KC8MQi2zQGr7LhTCVTMhbKuP4KcpTmdZjxsDBWrTSVf": "psyoptions-european-instrument", + "FqAhTZg86EKEzeWMLtutVDRXJuLWrey7oDHr3Au6RFdo": "rfq", + "FrQXf9PvuwisbxSaGwXdFipxu8aCEvAXCMRLcPkX64Ct": "rfq-base-asset-btc", + "4U5MABcScyet6DtPRreD6auphbrybn6SJni1kNo2Bbk1": "rfq-base-asset-eth", + "4n58twpt2baDXrRoay8Go8kniKBWfEnG1zsenvUUsMyZ": "rfq-base-asset-sol", + "Fr2tKpuV7Jvo51wpBU4so7qv1AmUc4uBh62ZUAy5oevy": "rfq-collateral-info-dao", + "EiqZBnwa8b7tLvXhXSwTW4zqkcT9UXpZi5ADmsyCKpq4": "rfq-collateral-info-maker", + "7H6gn5kksiDYRCeMRnyFLd7j8AnaMHrV8UqopTgDucji": "rfq-collateral-info-taker", + "DYj8vXUBpTxrptvRm2j2sCNAo7xPmPDidyp925YKNPZ": "rfq-collateral-token-dao", + "HZoNij3PMue4MPar4SUydqENTF6CNDAC7CXN4HaX5gYr": "rfq-collateral-token-maker", + "HAWway8wsxpxT4Fds8HvNgS8QGkDLJQubjT9DK1VcdfF": "rfq-collateral-token-taker", + "Erqa3YWCcmzRRUbimK2WryFyGXW1xmBWDeCvo1tKmd3R": "rfq-mint-info-btc", + "BKf1HuUftLk5mLX9hHNbJdUPRapGEJaaedZK1NNzewhH": "rfq-mint-info-eth", + "7kuX93pjSAfd3nraBqdCHzrzwW3L1JM9no8SjEwuzYYt": "rfq-mint-info-sol", + "5Atpbyw3tBjjc8EYrbjE1a4FNqyLUszFGsNo3R5bR3y8": "rfq-mint-info-usd-quote", + "AinWDnZWiEkWrNGH9jbvS2JXaBFZwnRE5ssNGyop882L": "rfq-protocol", + "CtfTi4TstqJaxEh8giQ7kK8CKXsJyF9CuwdcVoqGrEi1": "risk-engine", + "63zhouVc9DsAWsvp9CaJ7EY12CDK984Yt7heVbTsJxcN": "risk-engine-config", + "BMXWVaYPVJ4G8g2MMJt51CDgjHHuoirPMvsTUadv3s3v": "spot-instrument", + "7J21igTMpQa18YueGJGNmp54m1VxsBHz4LEjiV6P28DJ": "spot-instrument-config", "CBVMytnrNLSMZR4kRBwpp87iNeuexMehJFMTcizW86Yy": "token-account-btc-dao", "24z1PN6o4swFd1ztLevjSbM6hnLd96wd65BVv3QkeCrU": "token-account-btc-maker", "EB25yJhPe4X4ZWkDoeTm8HRpKgtqZGWKZAS58ifBkmGV": "token-account-btc-taker", @@ -43,5 +44,6 @@ "7DTftDbxGPfDi6fA7ooGgEW4ELcmZDfrjXXJHbcKgpbt": "token-account-usd-collateral-taker", "7t4TQvMCkpJj23t2XVWhcJZu5kPoyMvvTR4dDVPQ8WsA": "token-account-usd-quote-dao", "G47NrfrvTpdiUc3m9jZn6x98qQYkuD6nYy98tmUMMuvn": "token-account-usd-quote-maker", - "7Q4CtjBBJJwXbuFstgsjpPKcupaRahgoAVPuDy6MjgQF": "token-account-usd-quote-taker" + "7Q4CtjBBJJwXbuFstgsjpPKcupaRahgoAVPuDy6MjgQF": "token-account-usd-quote-taker", + "DftT8Q74YPqwrtJzy6g97XLzouG2YWaWZfRad6yK2GvA": "vault-operator" } \ No newline at end of file diff --git a/packages/validator/helpers.ts b/packages/validator/helpers.ts index 7407a2157..fa4cb4d29 100644 --- a/packages/validator/helpers.ts +++ b/packages/validator/helpers.ts @@ -9,6 +9,7 @@ import * as spotInstrument from '@convergence-rfq/spot-instrument'; import * as psyoptionsEuropeanInstrument from '@convergence-rfq/psyoptions-european-instrument'; import * as psyoptionsAmericanInstrument from '@convergence-rfq/psyoptions-american-instrument'; import * as hxroPrintTradeProvider from '@convergence-rfq/hxro-print-trade-provider'; +import * as vaultOperator from '@convergence-rfq/vault-operator'; export type ChildProccess = ChildProcessWithoutNullStreams; @@ -91,6 +92,9 @@ const getBaseArgs = () => [ '--bpf-program', hxroPrintTradeProvider.PROGRAM_ADDRESS, path.join(FIXTURES, 'programs/hxro_print_trade_provider.so'), + '--bpf-program', + vaultOperator.PROGRAM_ADDRESS, + path.join(FIXTURES, 'programs/vault_operator.so'), '--account-dir', path.join(FIXTURES, 'accounts'), diff --git a/yarn.lock b/yarn.lock index 241f72ee4..4faaed11e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1281,10 +1281,21 @@ bn.js "^5.2.0" debug "^4.3.3" -"@convergence-rfq/hxro-print-trade-provider@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@convergence-rfq/hxro-print-trade-provider/-/hxro-print-trade-provider-3.8.0.tgz#fbde20acc78cd67dd7320b319a5b43d31d9a8f2b" - integrity sha512-rTPysSD38HPJp1rOkm1Pu2kjSK4Q9FRYkSRcuNmnZpj9h+goqzHrqVCS7jVOWS7D2lj0DqEXidFl/TSkraTopw== +"@convergence-rfq/hxro-print-trade-provider@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/hxro-print-trade-provider/-/hxro-print-trade-provider-3.9.0.tgz#69ff37b155c10ec04db685ec07b85cc4fc7679a1" + integrity sha512-taK9TCm42h9BcH/IrrQ0lYa9Q6MqsyIiUWAMJNIcwRlNc93X/eNLRFtr+KcvXqt8WWPhtxCU81xgicSGf19DHQ== + dependencies: + "@convergence-rfq/beet" "^0.7.10" + "@convergence-rfq/beet-solana" "^0.4.11" + "@solana/spl-token" "^0.3.5" + "@solana/web3.js" "^1.56.2" + bn.js "^5.2.0" + +"@convergence-rfq/psyoptions-american-instrument@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/psyoptions-american-instrument/-/psyoptions-american-instrument-3.9.0.tgz#36539c537269785cd77c4fa4129d3b370c9e0b41" + integrity sha512-WHK/hnx2pduaK3DxNpf8Y7oiwVBQ6jzKerwRkQveAU3QQZR4I7FsPE79Z7uJuW8XbRyPG2Zs1J+MB4YcNxDkdw== dependencies: "@convergence-rfq/beet" "^0.7.10" "@convergence-rfq/beet-solana" "^0.4.11" @@ -1292,10 +1303,10 @@ "@solana/web3.js" "^1.56.2" bn.js "^5.2.0" -"@convergence-rfq/psyoptions-american-instrument@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@convergence-rfq/psyoptions-american-instrument/-/psyoptions-american-instrument-3.8.0.tgz#4f762d39c786ca06a4138df9f03b8cb1d2fef1fa" - integrity sha512-rfyiJb+Am86BUQaeEMGXiNtw7AI13S5jL7OabMd80XpQ0hY6ylnzGyZFNByq4foDrYXPlHo3O6TpBBIbGiJMmQ== +"@convergence-rfq/psyoptions-european-instrument@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/psyoptions-european-instrument/-/psyoptions-european-instrument-3.9.0.tgz#dc0c9555534db280be9c9a2b492e293755916767" + integrity sha512-U7Lk1hLAu0A4y60LPNTjH0i7AB4qq59gKUZ+i5Yf+yh6QzVQ3rP2lRL8LVBV/dMi+4CEOonIWFCwv4hdKE3uzg== dependencies: "@convergence-rfq/beet" "^0.7.10" "@convergence-rfq/beet-solana" "^0.4.11" @@ -1303,10 +1314,10 @@ "@solana/web3.js" "^1.56.2" bn.js "^5.2.0" -"@convergence-rfq/psyoptions-european-instrument@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@convergence-rfq/psyoptions-european-instrument/-/psyoptions-european-instrument-3.8.0.tgz#25b097016f57d2fa59264a61ac1a866f5294bc5f" - integrity sha512-AtqrOMFmeBdg4rYZE7ISKdjzTmZczHSrECKmkGud42C5sZkS9+dNI7I7k0UMThDhBGEu9CwbXEWsQXfJw9e+aw== +"@convergence-rfq/rfq@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/rfq/-/rfq-3.9.0.tgz#a3b380c8017d2a6ae699ccda41498381217e8e24" + integrity sha512-/+3zEMnRUkVEHneVwxdDN3yzrzXE24O+2WRBmd6ILZeGPiS6s7RnecEudQuc2l1Ss18gCC6UwPqkvAt+8lCm4w== dependencies: "@convergence-rfq/beet" "^0.7.10" "@convergence-rfq/beet-solana" "^0.4.11" @@ -1314,10 +1325,10 @@ "@solana/web3.js" "^1.56.2" bn.js "^5.2.0" -"@convergence-rfq/rfq@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@convergence-rfq/rfq/-/rfq-3.8.0.tgz#545a39766832f5bd1050acecbe93a4fd1ef4d6a1" - integrity sha512-oKaJ0xsHZhxIf2jCPzYE0yDSOqbdZzWqwL5IGVVZkPac6IWsQwfa11PiaSE2Xt5R+gJH1VyKFUranwCE+DQBEg== +"@convergence-rfq/risk-engine@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/risk-engine/-/risk-engine-3.9.0.tgz#4254d1f9ed4b9d6dbb04342fdea223515608e0cb" + integrity sha512-brir10dX3vWsQodlBm8jFY+1RbGrYZwIAjAvxND/PjC2P7xZ32VLxIZVAEnfcc9JZgGEwWoWUOPjfsAnAVkqhg== dependencies: "@convergence-rfq/beet" "^0.7.10" "@convergence-rfq/beet-solana" "^0.4.11" @@ -1325,10 +1336,10 @@ "@solana/web3.js" "^1.56.2" bn.js "^5.2.0" -"@convergence-rfq/risk-engine@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@convergence-rfq/risk-engine/-/risk-engine-3.8.0.tgz#05df6a6bdef2ddbd18ba4d55df1b5329a85b8222" - integrity sha512-b/WimuZR31HP6aW09xnzjlmZc/hZ3mi+7Wxz1OxcUiFUbtfKJbEFzw0+MAMI9lOulk+VFxb4yd7UBP8Y3AJVAw== +"@convergence-rfq/spot-instrument@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/spot-instrument/-/spot-instrument-3.9.0.tgz#f5fbe3c29db66192622fcf22c66161c4aca80453" + integrity sha512-odOtMFQ4/hpQAyxXokaJ5ZVBx+zfG7htr/IfRVX63QbPSuB4aLUisWb2cqmC+0Nj4mzlXU6rs+gWkdaBuV7Nyg== dependencies: "@convergence-rfq/beet" "^0.7.10" "@convergence-rfq/beet-solana" "^0.4.11" @@ -1336,10 +1347,10 @@ "@solana/web3.js" "^1.56.2" bn.js "^5.2.0" -"@convergence-rfq/spot-instrument@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@convergence-rfq/spot-instrument/-/spot-instrument-3.8.0.tgz#5e1a5f294a667b96ba9fffa2542c9c336765067e" - integrity sha512-+va2znXJQZRMr4WsUPUsrLPXTajSuQBtE61c5IfABbrbCokyYUJy3pSDTNY9HuGjErs+M2TiyTlUSSmgK4B2xQ== +"@convergence-rfq/vault-operator@^3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@convergence-rfq/vault-operator/-/vault-operator-3.9.0.tgz#bea35581df1bd22cf75cb1aab34933613294a70c" + integrity sha512-0E5gYdD+haVz5Cd++GcZ6UJ0ucgvakb3maviELtD6rv8mBDBy5D6nER6c135xgF84PFEt2p2V0d2sz0awa5rWw== dependencies: "@convergence-rfq/beet" "^0.7.10" "@convergence-rfq/beet-solana" "^0.4.11"