@ercworldio/blockchain-shared 1.0.5-dev.7-PROJ-1469.1 → 1.0.5-dev.7.PROJ-1464.0

package/build/services/solana/escrow/idl/escrow.json

@@ -1,5 +1,5 @@
 {
-    "address": "AAuFzrm6H4Vv7UyJi8R5Gsm4ixtR2yVmqzLmuyUTS5cu",
+    "address": "Cr1fJwtExaPdYG8huC5axiW2m2knSoTumLzYBj9rMjCd",
     "metadata": {
         "name": "escrow",
         "version": "0.1.0",
@@ -392,170 +392,6 @@
                 }
             ]
         },
-        {
-            "name": "add_treasury_executive",
-            "discriminator": [
-                189,
-                35,
-                102,
-                15,
-                239,
-                52,
-                121,
-                33
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "pubkey",
-                    "type": "pubkey"
-                }
-            ]
-        },
-        {
-            "name": "add_treasury_manager",
-            "discriminator": [
-                154,
-                51,
-                204,
-                205,
-                2,
-                57,
-                52,
-                21
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "pubkey",
-                    "type": "pubkey"
-                }
-            ]
-        },
         {
             "name": "admin_deposit_sol",
             "docs": [
@@ -985,91 +821,6 @@
                 }
             ]
         },
-        {
-            "name": "cancel_withdrawal",
-            "discriminator": [
-                183,
-                104,
-                181,
-                250,
-                28,
-                128,
-                210,
-                70
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "commitment",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
-                                    114,
-                                    97,
-                                    119,
-                                    97,
-                                    108
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "request_id"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "request_id",
-                    "type": "u64"
-                }
-            ]
-        },
         {
             "name": "deposit_sol",
             "discriminator": [
@@ -1419,75 +1170,77 @@
             ]
         },
         {
-            "name": "execute_withdrawal_sol",
+            "name": "get_nonce",
             "discriminator": [
-                56,
-                220,
-                82,
-                197,
-                255,
-                165,
-                245,
-                186
+                132,
+                129,
+                238,
+                76,
+                118,
+                10,
+                212,
+                7
             ],
             "accounts": [
                 {
-                    "name": "escrow_config",
+                    "name": "nonce_account",
+                    "writable": true,
                     "pda": {
                         "seeds": [
                             {
                                 "kind": "const",
                                 "value": [
-                                    101,
-                                    115,
-                                    99,
+                                    119,
+                                    105,
+                                    116,
+                                    104,
+                                    100,
                                     114,
-                                    111,
+                                    97,
                                     119,
                                     45,
-                                    99,
+                                    110,
                                     111,
                                     110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
+                                    99,
+                                    101
                                 ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "user"
                             }
                         ]
                     }
                 },
                 {
-                    "name": "commitment",
+                    "name": "user",
                     "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
-                                    114,
-                                    97,
-                                    119,
-                                    97,
-                                    108
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "request_id"
-                            }
-                        ]
-                    }
+                    "signer": true
                 },
                 {
-                    "name": "vault_authority",
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [],
+            "returns": "u64"
+        },
+        {
+            "name": "initialize_escrow_config",
+            "discriminator": [
+                59,
+                6,
+                201,
+                67,
+                235,
+                49,
+                169,
+                95
+            ],
+            "accounts": [
+                {
+                    "name": "escrow_config",
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -1499,18 +1252,24 @@
                                     99,
                                     114,
                                     111,
-                                    119
+                                    119,
+                                    45,
+                                    99,
+                                    111,
+                                    110,
+                                    102,
+                                    105,
+                                    103,
+                                    45,
+                                    118,
+                                    50
                                 ]
                             }
                         ]
                     }
                 },
                 {
-                    "name": "recipient",
-                    "writable": true
-                },
-                {
-                    "name": "caller",
+                    "name": "admin",
                     "writable": true,
                     "signer": true
                 },
@@ -1521,22 +1280,26 @@
             ],
             "args": [
                 {
-                    "name": "request_id",
-                    "type": "u64"
+                    "name": "signer_pubkey",
+                    "type": "pubkey"
+                },
+                {
+                    "name": "funding_pubkey",
+                    "type": "pubkey"
                 }
             ]
         },
         {
-            "name": "execute_withdrawal_spl",
+            "name": "is_admin_pubkey",
             "discriminator": [
-                61,
-                63,
-                171,
-                104,
-                233,
-                62,
-                148,
-                55
+                121,
+                139,
+                38,
+                24,
+                170,
+                99,
+                139,
+                243
             ],
             "accounts": [
                 {
@@ -1566,39 +1329,81 @@
                             }
                         ]
                     }
-                },
+                }
+            ],
+            "args": [
                 {
-                    "name": "commitment",
-                    "writable": true,
+                    "name": "account",
+                    "type": "pubkey"
+                }
+            ],
+            "returns": "bool"
+        },
+        {
+            "name": "is_funding_pubkey",
+            "discriminator": [
+                252,
+                56,
+                255,
+                21,
+                13,
+                63,
+                211,
+                163
+            ],
+            "accounts": [
+                {
+                    "name": "escrow_config",
                     "pda": {
                         "seeds": [
                             {
                                 "kind": "const",
                                 "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
+                                    101,
+                                    115,
+                                    99,
                                     114,
-                                    97,
+                                    111,
                                     119,
-                                    97,
-                                    108
+                                    45,
+                                    99,
+                                    111,
+                                    110,
+                                    102,
+                                    105,
+                                    103,
+                                    45,
+                                    118,
+                                    50
                                 ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "request_id"
                             }
                         ]
                     }
-                },
+                }
+            ],
+            "args": [
                 {
-                    "name": "mint"
-                },
+                    "name": "account",
+                    "type": "pubkey"
+                }
+            ],
+            "returns": "bool"
+        },
+        {
+            "name": "is_initialized_config",
+            "discriminator": [
+                113,
+                162,
+                133,
+                92,
+                161,
+                73,
+                200,
+                232
+            ],
+            "accounts": [
                 {
-                    "name": "vault_authority",
+                    "name": "escrow_config",
                     "pda": {
                         "seeds": [
                             {
@@ -1609,288 +1414,123 @@
                                     99,
                                     114,
                                     111,
-                                    119
+                                    119,
+                                    45,
+                                    99,
+                                    111,
+                                    110,
+                                    102,
+                                    105,
+                                    103,
+                                    45,
+                                    118,
+                                    50
                                 ]
                             }
                         ]
                     }
-                },
+                }
+            ],
+            "args": [],
+            "returns": "bool"
+        },
+        {
+            "name": "is_payment_token",
+            "discriminator": [
+                103,
+                61,
+                217,
+                183,
+                71,
+                112,
+                38,
+                108
+            ],
+            "accounts": [
                 {
-                    "name": "vault_token_account",
-                    "writable": true,
+                    "name": "escrow_config",
                     "pda": {
                         "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "vault_authority"
-                            },
                             {
                                 "kind": "const",
                                 "value": [
-                                    6,
-                                    221,
-                                    246,
-                                    225,
-                                    215,
                                     101,
-                                    161,
-                                    147,
-                                    217,
-                                    203,
-                                    225,
-                                    70,
-                                    206,
-                                    235,
-                                    121,
-                                    172,
-                                    28,
-                                    180,
-                                    133,
-                                    237,
-                                    95,
-                                    91,
-                                    55,
-                                    145,
-                                    58,
-                                    140,
-                                    245,
-                                    133,
-                                    126,
-                                    255,
-                                    0,
-                                    169
+                                    115,
+                                    99,
+                                    114,
+                                    111,
+                                    119,
+                                    45,
+                                    99,
+                                    111,
+                                    110,
+                                    102,
+                                    105,
+                                    103,
+                                    45,
+                                    118,
+                                    50
                                 ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "mint"
                             }
-                        ],
-                        "program": {
-                            "kind": "const",
-                            "value": [
-                                140,
-                                151,
-                                37,
-                                143,
-                                78,
-                                36,
-                                137,
-                                241,
-                                187,
-                                61,
-                                16,
-                                41,
-                                20,
-                                142,
-                                13,
-                                131,
-                                11,
-                                90,
-                                19,
-                                153,
-                                218,
-                                255,
-                                16,
-                                132,
-                                4,
-                                142,
-                                123,
-                                216,
-                                219,
-                                233,
-                                248,
-                                89
-                            ]
-                        }
-                    }
-                },
-                {
-                    "name": "recipient"
-                },
-                {
-                    "name": "recipient_token_account",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "recipient"
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    6,
-                                    221,
-                                    246,
-                                    225,
-                                    215,
-                                    101,
-                                    161,
-                                    147,
-                                    217,
-                                    203,
-                                    225,
-                                    70,
-                                    206,
-                                    235,
-                                    121,
-                                    172,
-                                    28,
-                                    180,
-                                    133,
-                                    237,
-                                    95,
-                                    91,
-                                    55,
-                                    145,
-                                    58,
-                                    140,
-                                    245,
-                                    133,
-                                    126,
-                                    255,
-                                    0,
-                                    169
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "mint"
-                            }
-                        ],
-                        "program": {
-                            "kind": "const",
-                            "value": [
-                                140,
-                                151,
-                                37,
-                                143,
-                                78,
-                                36,
-                                137,
-                                241,
-                                187,
-                                61,
-                                16,
-                                41,
-                                20,
-                                142,
-                                13,
-                                131,
-                                11,
-                                90,
-                                19,
-                                153,
-                                218,
-                                255,
-                                16,
-                                132,
-                                4,
-                                142,
-                                123,
-                                216,
-                                219,
-                                233,
-                                248,
-                                89
-                            ]
-                        }
+                        ]
                     }
-                },
-                {
-                    "name": "caller",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "token_program",
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
                 }
             ],
             "args": [
                 {
-                    "name": "request_id",
-                    "type": "u64"
+                    "name": "token",
+                    "type": "pubkey"
                 }
-            ]
+            ],
+            "returns": "bool"
         },
         {
-            "name": "get_nonce",
+            "name": "migrate_escrow_config",
             "discriminator": [
-                132,
-                129,
-                238,
-                76,
-                118,
+                221,
+                224,
+                135,
+                120,
+                28,
                 10,
-                212,
-                7
+                75,
+                20
             ],
             "accounts": [
                 {
-                    "name": "nonce_account",
+                    "name": "escrow_config",
+                    "docs": [
+                        "Old account (smaller)"
+                    ],
                     "writable": true,
                     "pda": {
                         "seeds": [
                             {
                                 "kind": "const",
                                 "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
+                                    101,
+                                    115,
+                                    99,
                                     114,
-                                    97,
+                                    111,
                                     119,
                                     45,
-                                    110,
+                                    99,
                                     111,
                                     110,
-                                    99,
-                                    101
+                                    102,
+                                    105,
+                                    103
                                 ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "user"
                             }
                         ]
                     }
                 },
                 {
-                    "name": "user",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [],
-            "returns": "u64"
-        },
-        {
-            "name": "initialize_escrow_config",
-            "discriminator": [
-                59,
-                6,
-                201,
-                67,
-                235,
-                49,
-                169,
-                95
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
+                    "name": "new_escrow_config",
+                    "docs": [
+                        "New account with more space"
+                    ],
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -1930,30 +1570,39 @@
             ],
             "args": [
                 {
-                    "name": "signer_pubkey",
-                    "type": "pubkey"
+                    "name": "admins",
+                    "type": {
+                        "vec": "pubkey"
+                    }
                 },
                 {
-                    "name": "funding_pubkey",
+                    "name": "payment_tokens",
+                    "type": {
+                        "vec": "pubkey"
+                    }
+                },
+                {
+                    "name": "funding_wallet",
                     "type": "pubkey"
                 }
             ]
         },
         {
-            "name": "initialize_treasury_config",
+            "name": "pause_program",
             "discriminator": [
-                42,
-                221,
-                143,
-                37,
-                13,
-                169,
-                92,
-                98
+                91,
+                86,
+                253,
+                175,
+                66,
+                236,
+                172,
+                124
             ],
             "accounts": [
                 {
                     "name": "escrow_config",
+                    "writable": true,
                     "pda": {
                         "seeds": [
                             {
@@ -1981,35 +1630,7 @@
                     }
                 },
                 {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
+                    "name": "admin",
                     "writable": true,
                     "signer": true
                 },
@@ -2020,30 +1641,27 @@
             ],
             "args": [
                 {
-                    "name": "manager_threshold",
-                    "type": "u8"
-                },
-                {
-                    "name": "executive_threshold",
-                    "type": "u8"
+                    "name": "target_state",
+                    "type": "bool"
                 }
             ]
         },
         {
-            "name": "is_admin_pubkey",
+            "name": "remove_admin",
             "discriminator": [
-                121,
-                139,
-                38,
-                24,
-                170,
-                99,
-                139,
-                243
+                74,
+                202,
+                71,
+                106,
+                252,
+                31,
+                72,
+                183
             ],
             "accounts": [
                 {
                     "name": "escrow_config",
+                    "writable": true,
                     "pda": {
                         "seeds": [
                             {
@@ -2069,6 +1687,11 @@
                             }
                         ]
                     }
+                },
+                {
+                    "name": "admin",
+                    "writable": true,
+                    "signer": true
                 }
             ],
             "args": [
@@ -2076,24 +1699,24 @@
                     "name": "account",
                     "type": "pubkey"
                 }
-            ],
-            "returns": "bool"
+            ]
         },
         {
-            "name": "is_funding_pubkey",
+            "name": "remove_payment_token",
             "discriminator": [
-                252,
-                56,
-                255,
-                21,
-                13,
-                63,
-                211,
-                163
+                119,
+                18,
+                240,
+                223,
+                126,
+                168,
+                165,
+                117
             ],
             "accounts": [
                 {
                     "name": "escrow_config",
+                    "writable": true,
                     "pda": {
                         "seeds": [
                             {
@@ -2119,72 +1742,34 @@
                             }
                         ]
                     }
+                },
+                {
+                    "name": "admin",
+                    "writable": true,
+                    "signer": true
                 }
             ],
             "args": [
                 {
-                    "name": "account",
+                    "name": "token_mint",
                     "type": "pubkey"
                 }
-            ],
-            "returns": "bool"
+            ]
         },
         {
-            "name": "is_initialized_config",
-            "discriminator": [
-                113,
-                162,
-                133,
-                92,
-                161,
-                73,
-                200,
-                232
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                }
+            "name": "remove_token_from_escrow",
+            "docs": [
+                "Admin Withdraw SPL tokens"
             ],
-            "args": [],
-            "returns": "bool"
-        },
-        {
-            "name": "is_payment_token",
             "discriminator": [
-                103,
+                42,
+                189,
+                194,
                 61,
-                217,
-                183,
-                71,
-                112,
-                38,
-                108
+                110,
+                149,
+                83,
+                126
             ],
             "accounts": [
                 {
@@ -2214,34 +1799,17 @@
                             }
                         ]
                     }
-                }
-            ],
-            "args": [
+                },
                 {
-                    "name": "token",
-                    "type": "pubkey"
-                }
-            ],
-            "returns": "bool"
-        },
-        {
-            "name": "migrate_escrow_config",
-            "discriminator": [
-                221,
-                224,
-                135,
-                120,
-                28,
-                10,
-                75,
-                20
-            ],
-            "accounts": [
+                    "name": "mint"
+                },
                 {
-                    "name": "escrow_config",
-                    "docs": [
-                        "Old account (smaller)"
-                    ],
+                    "name": "admin",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "vault_authority",
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -2253,150 +1821,215 @@
                                     99,
                                     114,
                                     111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
+                                    119
                                 ]
                             }
                         ]
                     }
                 },
                 {
-                    "name": "new_escrow_config",
-                    "docs": [
-                        "New account with more space"
-                    ],
+                    "name": "vault_token_account",
                     "writable": true,
                     "pda": {
                         "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "vault_authority"
+                            },
                             {
                                 "kind": "const",
                                 "value": [
+                                    6,
+                                    221,
+                                    246,
+                                    225,
+                                    215,
                                     101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
+                                    161,
+                                    147,
+                                    217,
+                                    203,
+                                    225,
+                                    70,
+                                    206,
+                                    235,
+                                    121,
+                                    172,
+                                    28,
+                                    180,
+                                    133,
+                                    237,
+                                    95,
+                                    91,
+                                    55,
+                                    145,
+                                    58,
+                                    140,
+                                    245,
+                                    133,
+                                    126,
+                                    255,
+                                    0,
+                                    169
                                 ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
                             }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "admins",
-                    "type": {
-                        "vec": "pubkey"
-                    }
-                },
-                {
-                    "name": "payment_tokens",
-                    "type": {
-                        "vec": "pubkey"
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ]
+                        }
                     }
                 },
                 {
-                    "name": "funding_wallet",
-                    "type": "pubkey"
-                }
-            ]
-        },
-        {
-            "name": "pause_program",
-            "discriminator": [
-                91,
-                86,
-                253,
-                175,
-                66,
-                236,
-                172,
-                124
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
+                    "name": "destination_token_account",
                     "writable": true,
                     "pda": {
                         "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "admin"
+                            },
                             {
                                 "kind": "const",
                                 "value": [
+                                    6,
+                                    221,
+                                    246,
+                                    225,
+                                    215,
                                     101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
+                                    161,
+                                    147,
+                                    217,
+                                    203,
+                                    225,
+                                    70,
+                                    206,
+                                    235,
+                                    121,
+                                    172,
+                                    28,
+                                    180,
+                                    133,
+                                    237,
+                                    95,
+                                    91,
+                                    55,
+                                    145,
+                                    58,
+                                    140,
+                                    245,
+                                    133,
+                                    126,
+                                    255,
+                                    0,
+                                    169
                                 ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
                             }
-                        ]
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ]
+                        }
                     }
                 },
                 {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
                 }
             ],
             "args": [
                 {
-                    "name": "target_state",
-                    "type": "bool"
+                    "name": "amount",
+                    "type": "u64"
                 }
             ]
         },
         {
-            "name": "remove_admin",
+            "name": "set_admin",
             "discriminator": [
-                74,
-                202,
-                71,
-                106,
-                252,
-                31,
-                72,
-                183
+                251,
+                163,
+                0,
+                52,
+                91,
+                194,
+                187,
+                92
             ],
             "accounts": [
                 {
@@ -2430,28 +2063,27 @@
                 },
                 {
                     "name": "admin",
-                    "writable": true,
                     "signer": true
                 }
             ],
             "args": [
                 {
-                    "name": "account",
+                    "name": "new_admin",
                     "type": "pubkey"
                 }
             ]
         },
         {
-            "name": "remove_payment_token",
+            "name": "set_funding_wallet",
             "discriminator": [
-                119,
-                18,
-                240,
-                223,
-                126,
-                168,
-                165,
-                117
+                134,
+                34,
+                203,
+                88,
+                248,
+                13,
+                78,
+                30
             ],
             "accounts": [
                 {
@@ -2491,25 +2123,22 @@
             ],
             "args": [
                 {
-                    "name": "token_mint",
+                    "name": "new_funding_wallet",
                     "type": "pubkey"
                 }
             ]
         },
         {
-            "name": "remove_token_from_escrow",
-            "docs": [
-                "Admin Withdraw SPL tokens"
-            ],
+            "name": "withdraw_sol_with_sig",
             "discriminator": [
-                42,
-                189,
-                194,
-                61,
-                110,
-                149,
-                83,
-                126
+                127,
+                123,
+                63,
+                232,
+                4,
+                153,
+                33,
+                13
             ],
             "accounts": [
                 {
@@ -2541,10 +2170,7 @@
                     }
                 },
                 {
-                    "name": "mint"
-                },
-                {
-                    "name": "admin",
+                    "name": "user",
                     "writable": true,
                     "signer": true
                 },
@@ -2568,21 +2194,151 @@
                     }
                 },
                 {
-                    "name": "vault_token_account",
+                    "name": "withdraw_nonce",
                     "writable": true,
                     "pda": {
                         "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "vault_authority"
-                            },
                             {
                                 "kind": "const",
                                 "value": [
-                                    6,
-                                    221,
-                                    246,
-                                    225,
+                                    119,
+                                    105,
+                                    116,
+                                    104,
+                                    100,
+                                    114,
+                                    97,
+                                    119,
+                                    45,
+                                    110,
+                                    111,
+                                    110,
+                                    99,
+                                    101
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "user"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "recipient",
+                    "writable": true
+                },
+                {
+                    "name": "token_address"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                },
+                {
+                    "name": "instructions",
+                    "address": "Sysvar1nstructions1111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "amount",
+                    "type": "u64"
+                },
+                {
+                    "name": "chain_id",
+                    "type": "u64"
+                },
+                {
+                    "name": "request_id",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "withdraw_spl_with_sig",
+            "discriminator": [
+                97,
+                26,
+                53,
+                97,
+                35,
+                183,
+                69,
+                237
+            ],
+            "accounts": [
+                {
+                    "name": "escrow_config",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    101,
+                                    115,
+                                    99,
+                                    114,
+                                    111,
+                                    119,
+                                    45,
+                                    99,
+                                    111,
+                                    110,
+                                    102,
+                                    105,
+                                    103,
+                                    45,
+                                    118,
+                                    50
+                                ]
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "mint"
+                },
+                {
+                    "name": "user",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "vault_authority",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    101,
+                                    115,
+                                    99,
+                                    114,
+                                    111,
+                                    119
+                                ]
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "vault_token_account",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "vault_authority"
+                            },
+                            {
+                                "kind": "const",
+                                "value": [
+                                    6,
+                                    221,
+                                    246,
+                                    225,
                                     215,
                                     101,
                                     161,
@@ -2658,13 +2414,20 @@
                     }
                 },
                 {
-                    "name": "destination_token_account",
+                    "name": "withdraw_nonce"
+                },
+                {
+                    "name": "recipient",
+                    "writable": true
+                },
+                {
+                    "name": "user_token_account",
                     "writable": true,
                     "pda": {
                         "seeds": [
                             {
                                 "kind": "account",
-                                "path": "admin"
+                                "path": "user"
                             },
                             {
                                 "kind": "const",
@@ -2750,1558 +2513,59 @@
                 {
                     "name": "token_program",
                     "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                },
+                {
+                    "name": "instructions",
+                    "address": "Sysvar1nstructions1111111111111111111111111"
                 }
             ],
             "args": [
                 {
                     "name": "amount",
                     "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "remove_treasury_executive",
-            "discriminator": [
-                147,
-                53,
-                215,
-                158,
-                215,
-                195,
-                139,
-                26
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
                 },
                 {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
+                    "name": "chain_id",
+                    "type": "u64"
                 },
                 {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "pubkey",
-                    "type": "pubkey"
+                    "name": "request_id",
+                    "type": "u64"
                 }
             ]
+        }
+    ],
+    "accounts": [
+        {
+            "name": "EscrowConfig",
+            "discriminator": [
+                138,
+                174,
+                227,
+                187,
+                239,
+                148,
+                1,
+                44
+            ]
         },
         {
-            "name": "remove_treasury_manager",
+            "name": "EscrowConfiguration",
             "discriminator": [
-                82,
-                21,
-                184,
-                234,
-                157,
-                232,
-                48,
-                70
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "pubkey",
-                    "type": "pubkey"
-                }
-            ]
-        },
-        {
-            "name": "schedule_withdrawal_sol",
-            "discriminator": [
-                41,
-                253,
-                139,
-                251,
-                39,
-                160,
-                13,
-                135
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "commitment",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
-                                    114,
-                                    97,
-                                    119,
-                                    97,
-                                    108
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "request_id"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "timelock_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    105,
-                                    109,
-                                    101,
-                                    108,
-                                    111,
-                                    99,
-                                    107,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "receiver_timelock_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    114,
-                                    101,
-                                    99,
-                                    101,
-                                    105,
-                                    118,
-                                    101,
-                                    114,
-                                    45,
-                                    116,
-                                    105,
-                                    109,
-                                    101,
-                                    108,
-                                    111,
-                                    99,
-                                    107
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "recipient"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "recipient"
-                },
-                {
-                    "name": "caller",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                },
-                {
-                    "name": "instructions",
-                    "address": "Sysvar1nstructions1111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "request_id",
-                    "type": "u64"
-                },
-                {
-                    "name": "committed_amount",
-                    "type": "u64"
-                },
-                {
-                    "name": "net_amount",
-                    "type": "u64"
-                },
-                {
-                    "name": "chain_id",
-                    "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "schedule_withdrawal_spl",
-            "discriminator": [
-                95,
-                68,
-                202,
-                149,
-                66,
-                113,
-                28,
-                201
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "commitment",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
-                                    114,
-                                    97,
-                                    119,
-                                    97,
-                                    108
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "request_id"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "timelock_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    105,
-                                    109,
-                                    101,
-                                    108,
-                                    111,
-                                    99,
-                                    107,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "receiver_timelock_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    114,
-                                    101,
-                                    99,
-                                    101,
-                                    105,
-                                    118,
-                                    101,
-                                    114,
-                                    45,
-                                    116,
-                                    105,
-                                    109,
-                                    101,
-                                    108,
-                                    111,
-                                    99,
-                                    107
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "recipient"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "mint",
-                    "docs": [
-                        "The SPL token mint — determines which token is being withdrawn"
-                    ]
-                },
-                {
-                    "name": "recipient"
-                },
-                {
-                    "name": "caller",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                },
-                {
-                    "name": "instructions",
-                    "address": "Sysvar1nstructions1111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "request_id",
-                    "type": "u64"
-                },
-                {
-                    "name": "committed_amount",
-                    "type": "u64"
-                },
-                {
-                    "name": "net_amount",
-                    "type": "u64"
-                },
-                {
-                    "name": "chain_id",
-                    "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "set_admin",
-            "discriminator": [
-                251,
-                163,
-                0,
-                52,
-                91,
-                194,
-                187,
-                92
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "new_admin",
-                    "type": "pubkey"
-                }
-            ]
-        },
-        {
-            "name": "set_funding_wallet",
-            "discriminator": [
-                134,
-                34,
-                203,
-                88,
-                248,
-                13,
-                78,
-                30
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "new_funding_wallet",
-                    "type": "pubkey"
-                }
-            ]
-        },
-        {
-            "name": "set_max_fee_delta",
-            "discriminator": [
-                184,
-                66,
-                78,
-                162,
-                85,
-                237,
-                83,
-                148
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "amount",
-                    "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "set_receiver_timelock_config",
-            "discriminator": [
-                179,
-                116,
-                158,
-                165,
-                236,
-                240,
-                203,
-                78
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "receiver_timelock_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    114,
-                                    101,
-                                    99,
-                                    101,
-                                    105,
-                                    118,
-                                    101,
-                                    114,
-                                    45,
-                                    116,
-                                    105,
-                                    109,
-                                    101,
-                                    108,
-                                    111,
-                                    99,
-                                    107
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "receiver"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "receiver",
-                    "type": "pubkey"
-                },
-                {
-                    "name": "delay_seconds",
-                    "type": "i64"
-                }
-            ]
-        },
-        {
-            "name": "set_signature_wallet",
-            "discriminator": [
-                218,
-                131,
-                78,
-                197,
-                72,
-                225,
-                0,
-                90
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "new_signature_wallet",
-                    "type": "pubkey"
-                }
-            ]
-        },
-        {
-            "name": "set_timelock_config",
-            "discriminator": [
-                176,
-                167,
-                10,
-                233,
-                251,
-                255,
-                15,
-                254
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "timelock_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    105,
-                                    109,
-                                    101,
-                                    108,
-                                    111,
-                                    99,
-                                    107,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "delay_seconds",
-                    "type": "i64"
-                }
-            ]
-        },
-        {
-            "name": "set_withdrawal_thresholds",
-            "discriminator": [
-                210,
-                174,
-                130,
-                94,
-                94,
-                180,
-                181,
-                165
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "treasury_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116,
-                                    114,
-                                    101,
-                                    97,
-                                    115,
-                                    117,
-                                    114,
-                                    121,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "manager_threshold",
-                    "type": "u8"
-                },
-                {
-                    "name": "executive_threshold",
-                    "type": "u8"
-                }
-            ]
-        },
-        {
-            "name": "withdraw_sol_with_sig",
-            "discriminator": [
-                127,
-                123,
-                63,
-                232,
-                4,
-                153,
-                33,
-                13
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "user",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "vault_authority",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "withdraw_nonce",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    119,
-                                    105,
-                                    116,
-                                    104,
-                                    100,
-                                    114,
-                                    97,
-                                    119,
-                                    45,
-                                    110,
-                                    111,
-                                    110,
-                                    99,
-                                    101
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "user"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "recipient",
-                    "writable": true
-                },
-                {
-                    "name": "token_address"
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                },
-                {
-                    "name": "instructions",
-                    "address": "Sysvar1nstructions1111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "amount",
-                    "type": "u64"
-                },
-                {
-                    "name": "chain_id",
-                    "type": "u64"
-                },
-                {
-                    "name": "request_id",
-                    "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "withdraw_spl_with_sig",
-            "discriminator": [
-                97,
-                26,
-                53,
-                97,
-                35,
-                183,
-                69,
-                237
-            ],
-            "accounts": [
-                {
-                    "name": "escrow_config",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119,
-                                    45,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103,
-                                    45,
-                                    118,
-                                    50
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "mint"
-                },
-                {
-                    "name": "user",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "vault_authority",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    101,
-                                    115,
-                                    99,
-                                    114,
-                                    111,
-                                    119
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "vault_token_account",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "vault_authority"
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    6,
-                                    221,
-                                    246,
-                                    225,
-                                    215,
-                                    101,
-                                    161,
-                                    147,
-                                    217,
-                                    203,
-                                    225,
-                                    70,
-                                    206,
-                                    235,
-                                    121,
-                                    172,
-                                    28,
-                                    180,
-                                    133,
-                                    237,
-                                    95,
-                                    91,
-                                    55,
-                                    145,
-                                    58,
-                                    140,
-                                    245,
-                                    133,
-                                    126,
-                                    255,
-                                    0,
-                                    169
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "mint"
-                            }
-                        ],
-                        "program": {
-                            "kind": "const",
-                            "value": [
-                                140,
-                                151,
-                                37,
-                                143,
-                                78,
-                                36,
-                                137,
-                                241,
-                                187,
-                                61,
-                                16,
-                                41,
-                                20,
-                                142,
-                                13,
-                                131,
-                                11,
-                                90,
-                                19,
-                                153,
-                                218,
-                                255,
-                                16,
-                                132,
-                                4,
-                                142,
-                                123,
-                                216,
-                                219,
-                                233,
-                                248,
-                                89
-                            ]
-                        }
-                    }
-                },
-                {
-                    "name": "withdraw_nonce"
-                },
-                {
-                    "name": "recipient",
-                    "writable": true
-                },
-                {
-                    "name": "user_token_account",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "user"
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    6,
-                                    221,
-                                    246,
-                                    225,
-                                    215,
-                                    101,
-                                    161,
-                                    147,
-                                    217,
-                                    203,
-                                    225,
-                                    70,
-                                    206,
-                                    235,
-                                    121,
-                                    172,
-                                    28,
-                                    180,
-                                    133,
-                                    237,
-                                    95,
-                                    91,
-                                    55,
-                                    145,
-                                    58,
-                                    140,
-                                    245,
-                                    133,
-                                    126,
-                                    255,
-                                    0,
-                                    169
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "mint"
-                            }
-                        ],
-                        "program": {
-                            "kind": "const",
-                            "value": [
-                                140,
-                                151,
-                                37,
-                                143,
-                                78,
-                                36,
-                                137,
-                                241,
-                                187,
-                                61,
-                                16,
-                                41,
-                                20,
-                                142,
-                                13,
-                                131,
-                                11,
-                                90,
-                                19,
-                                153,
-                                218,
-                                255,
-                                16,
-                                132,
-                                4,
-                                142,
-                                123,
-                                216,
-                                219,
-                                233,
-                                248,
-                                89
-                            ]
-                        }
-                    }
-                },
-                {
-                    "name": "token_program",
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                },
-                {
-                    "name": "instructions",
-                    "address": "Sysvar1nstructions1111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "amount",
-                    "type": "u64"
-                },
-                {
-                    "name": "chain_id",
-                    "type": "u64"
-                },
-                {
-                    "name": "request_id",
-                    "type": "u64"
-                }
-            ]
-        }
-    ],
-    "accounts": [
-        {
-            "name": "EscrowConfig",
-            "discriminator": [
-                138,
-                174,
-                227,
-                187,
-                239,
-                148,
-                1,
-                44
-            ]
-        },
-        {
-            "name": "EscrowConfiguration",
-            "discriminator": [
-                105,
-                131,
-                219,
-                218,
-                63,
+                105,
+                131,
+                219,
+                218,
+                63,
                 157,
                 131,
                 34
             ]
         },
-        {
-            "name": "ReceiverTimelockConfig",
-            "discriminator": [
-                155,
-                62,
-                82,
-                53,
-                244,
-                149,
-                35,
-                69
-            ]
-        },
-        {
-            "name": "TimelockConfig",
-            "discriminator": [
-                189,
-                87,
-                27,
-                18,
-                189,
-                173,
-                47,
-                197
-            ]
-        },
-        {
-            "name": "TreasuryConfig",
-            "discriminator": [
-                124,
-                54,
-                212,
-                227,
-                213,
-                189,
-                168,
-                41
-            ]
-        },
         {
             "name": "WithdrawNonce",
             "discriminator": [
@@ -4314,19 +2578,6 @@
                 45,
                 160
             ]
-        },
-        {
-            "name": "WithdrawalCommitment",
-            "discriminator": [
-                129,
-                131,
-                178,
-                154,
-                169,
-                202,
-                148,
-                141
-            ]
         }
     ],
     "events": [
@@ -4382,84 +2633,6 @@
                 23
             ]
         },
-        {
-            "name": "MaxFeeDeltaConfiguredEvent",
-            "discriminator": [
-                22,
-                138,
-                194,
-                64,
-                245,
-                136,
-                168,
-                16
-            ]
-        },
-        {
-            "name": "ReceiverTimelockConfiguredEvent",
-            "discriminator": [
-                133,
-                139,
-                55,
-                62,
-                207,
-                76,
-                16,
-                95
-            ]
-        },
-        {
-            "name": "RoleGranted",
-            "discriminator": [
-                220,
-                183,
-                89,
-                228,
-                143,
-                63,
-                246,
-                58
-            ]
-        },
-        {
-            "name": "RoleRevoked",
-            "discriminator": [
-                167,
-                183,
-                52,
-                229,
-                126,
-                206,
-                62,
-                61
-            ]
-        },
-        {
-            "name": "TimelockConfiguredEvent",
-            "discriminator": [
-                95,
-                91,
-                67,
-                84,
-                32,
-                210,
-                3,
-                116
-            ]
-        },
-        {
-            "name": "TreasuryConfigInitializedEvent",
-            "discriminator": [
-                170,
-                202,
-                243,
-                194,
-                90,
-                143,
-                28,
-                119
-            ]
-        },
         {
             "name": "WithdrawSolEvent",
             "discriminator": [
@@ -4485,58 +2658,6 @@
                 53,
                 85
             ]
-        },
-        {
-            "name": "WithdrawalCancelledEvent",
-            "discriminator": [
-                40,
-                218,
-                165,
-                230,
-                31,
-                49,
-                238,
-                127
-            ]
-        },
-        {
-            "name": "WithdrawalExecutedEvent",
-            "discriminator": [
-                60,
-                185,
-                83,
-                2,
-                206,
-                217,
-                44,
-                53
-            ]
-        },
-        {
-            "name": "WithdrawalScheduledEvent",
-            "discriminator": [
-                74,
-                43,
-                199,
-                56,
-                129,
-                1,
-                247,
-                68
-            ]
-        },
-        {
-            "name": "WithdrawalThresholdsConfiguredEvent",
-            "discriminator": [
-                233,
-                231,
-                110,
-                102,
-                162,
-                86,
-                78,
-                118
-            ]
         }
     ],
     "errors": [
@@ -4583,516 +2704,90 @@
         {
             "code": 6008,
             "name": "UnexpectedMessage",
-            "msg": "Unexpected Message"
-        },
-        {
-            "code": 6009,
-            "name": "PubKeyOutOfBounds",
-            "msg": "Public Key out of bounds"
-        },
-        {
-            "code": 6010,
-            "name": "InvalidSigner",
-            "msg": "Invalid signer publickey"
-        },
-        {
-            "code": 6011,
-            "name": "AlreadyExists",
-            "msg": "Account already exists in the list"
-        },
-        {
-            "code": 6012,
-            "name": "NotFound",
-            "msg": "Account not found in the list"
-        },
-        {
-            "code": 6013,
-            "name": "InvalidPaymenToken",
-            "msg": "Invalid payment token."
-        },
-        {
-            "code": 6014,
-            "name": "InsufficientSPLReserves",
-            "msg": "Insufficient SPL reserve balance."
-        },
-        {
-            "code": 6015,
-            "name": "InsufficientSOLReserves",
-            "msg": "Insufficient SOL reserve balance."
-        },
-        {
-            "code": 6016,
-            "name": "Paused",
-            "msg": "Program is paused"
-        },
-        {
-            "code": 6017,
-            "name": "SameState",
-            "msg": "Program is already in this state"
-        },
-        {
-            "code": 6018,
-            "name": "MaxPaymentTokenCount",
-            "msg": "Max payment tokens count reached"
-        },
-        {
-            "code": 6019,
-            "name": "MaxAdminCount",
-            "msg": "Max admin count reached"
-        },
-        {
-            "code": 6020,
-            "name": "NotInitialized",
-            "msg": "Treasury config not initialized"
-        },
-        {
-            "code": 6021,
-            "name": "UnauthorizedSigner",
-            "msg": "Signer is not a treasury manager or executive"
-        },
-        {
-            "code": 6022,
-            "name": "InsufficientManagerSigs",
-            "msg": "Insufficient treasury manager signatures"
-        },
-        {
-            "code": 6023,
-            "name": "InsufficientExecutiveSigs",
-            "msg": "Insufficient treasury executive signatures"
-        },
-        {
-            "code": 6024,
-            "name": "MaxRoleCount",
-            "msg": "Max role member count reached"
-        },
-        {
-            "code": 6025,
-            "name": "InvalidNetAmount",
-            "msg": "net_amount exceeds committed_amount"
-        },
-        {
-            "code": 6026,
-            "name": "FeeDeltaExceedsCap",
-            "msg": "Fee delta exceeds max allowed cap"
-        },
-        {
-            "code": 6027,
-            "name": "TimelockNotExpired",
-            "msg": "Timelock has not expired yet"
-        },
-        {
-            "code": 6028,
-            "name": "InvalidRequestId",
-            "msg": "Request ID does not match commitment"
-        }
-    ],
-    "types": [
-        {
-            "name": "AdminDeposit",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "caller",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "depositor",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "recipient",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "token",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
+            "msg": "Unexpected Message"
         },
         {
-            "name": "AdminWithdraw",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "caller",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "recipient",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "token",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
+            "code": 6009,
+            "name": "PubKeyOutOfBounds",
+            "msg": "Public Key out of bounds"
         },
         {
-            "name": "DepositSolEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "caller",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "depositor",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "vault_authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "bonus_code",
-                        "type": "string"
-                    },
-                    {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
+            "code": 6010,
+            "name": "InvalidSigner",
+            "msg": "Invalid signer publickey"
         },
         {
-            "name": "DepositSplEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "caller",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "depositor",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "vault_token_account",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "mint",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "bonus_code",
-                        "type": "string"
-                    },
-                    {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
+            "code": 6011,
+            "name": "AlreadyExists",
+            "msg": "Account already exists in the list"
         },
         {
-            "name": "EscrowConfig",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "admin",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "signer",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "is_initialized",
-                        "type": "bool"
-                    }
-                ]
-            }
+            "code": 6012,
+            "name": "NotFound",
+            "msg": "Account not found in the list"
         },
         {
-            "name": "EscrowConfiguration",
-            "docs": [
-                "Config account holding"
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "admins",
-                        "type": {
-                            "vec": "pubkey"
-                        }
-                    },
-                    {
-                        "name": "payment_tokens",
-                        "type": {
-                            "vec": "pubkey"
-                        }
-                    },
-                    {
-                        "name": "signer",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "funding_wallet",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "is_initialized",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "is_paused",
-                        "type": "bool"
-                    }
-                ]
-            }
+            "code": 6013,
+            "name": "InvalidPaymenToken",
+            "msg": "Invalid payment token."
         },
         {
-            "name": "MaxFeeDeltaConfiguredEvent",
-            "docs": [
-                "Emitted when the max fee delta (committed - net cap) is updated. 0 = disabled."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "sender",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
+            "code": 6014,
+            "name": "InsufficientSPLReserves",
+            "msg": "Insufficient SPL reserve balance."
         },
         {
-            "name": "ReceiverTimelockConfig",
-            "docs": [
-                "Per-receiver timelock override. delay_seconds = 0 means trusted (immediate execution)."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "delay_seconds",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "is_set",
-                        "type": "bool"
-                    }
-                ]
-            }
+            "code": 6015,
+            "name": "InsufficientSOLReserves",
+            "msg": "Insufficient SOL reserve balance."
         },
         {
-            "name": "ReceiverTimelockConfiguredEvent",
-            "docs": [
-                "Emitted when a per-receiver (granular) timelock override is set."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "receiver",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "delay_seconds",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "sender",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
+            "code": 6016,
+            "name": "Paused",
+            "msg": "Program is paused"
         },
         {
-            "name": "Role",
-            "docs": [
-                "Role assigned to a membership set on the escrow (mirrors EVM AccessControl semantics)."
-            ],
-            "type": {
-                "kind": "enum",
-                "variants": [
-                    {
-                        "name": "Admin"
-                    },
-                    {
-                        "name": "TreasuryManager"
-                    },
-                    {
-                        "name": "TreasuryExecutive"
-                    }
-                ]
-            }
+            "code": 6017,
+            "name": "SameState",
+            "msg": "Program is already in this state"
+        },
+        {
+            "code": 6018,
+            "name": "MaxPaymentTokenCount",
+            "msg": "Max payment tokens count reached"
         },
         {
-            "name": "RoleGranted",
-            "docs": [
-                "Emitted when an account is added to a role membership set (add_admin, add_treasury_manager,",
-                "add_treasury_executive). `account` is the granted key; `sender` is the admin that authorized it."
-            ],
+            "code": 6019,
+            "name": "MaxAdminCount",
+            "msg": "Max admin count reached"
+        }
+    ],
+    "types": [
+        {
+            "name": "AdminDeposit",
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "role",
-                        "type": {
-                            "defined": {
-                                "name": "Role"
-                            }
-                        }
-                    },
-                    {
-                        "name": "account",
+                        "name": "caller",
                         "type": "pubkey"
                     },
                     {
-                        "name": "sender",
+                        "name": "depositor",
                         "type": "pubkey"
                     },
                     {
-                        "name": "slot",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "RoleRevoked",
-            "docs": [
-                "Emitted when an account is removed from a role membership set."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "role",
-                        "type": {
-                            "defined": {
-                                "name": "Role"
-                            }
-                        }
-                    },
-                    {
-                        "name": "account",
+                        "name": "recipient",
                         "type": "pubkey"
                     },
                     {
-                        "name": "sender",
+                        "name": "token",
                         "type": "pubkey"
                     },
                     {
-                        "name": "slot",
+                        "name": "amount",
                         "type": "u64"
                     },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "TimelockConfig",
-            "docs": [
-                "Global timelock delay applied to all withdrawals unless overridden per-receiver."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "delay_seconds",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "is_set",
-                        "type": "bool"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "TimelockConfiguredEvent",
-            "docs": [
-                "Emitted when the global timelock delay is set."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "delay_seconds",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "sender",
-                        "type": "pubkey"
-                    },
                     {
                         "name": "slot",
                         "type": "u64"
@@ -5105,64 +2800,26 @@
             }
         },
         {
-            "name": "TreasuryConfig",
+            "name": "AdminWithdraw",
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "treasury_managers",
-                        "type": {
-                            "vec": "pubkey"
-                        }
-                    },
-                    {
-                        "name": "treasury_executives",
-                        "type": {
-                            "vec": "pubkey"
-                        }
+                        "name": "caller",
+                        "type": "pubkey"
                     },
                     {
-                        "name": "manager_threshold",
-                        "type": "u8"
+                        "name": "recipient",
+                        "type": "pubkey"
                     },
                     {
-                        "name": "executive_threshold",
-                        "type": "u8"
+                        "name": "token",
+                        "type": "pubkey"
                     },
                     {
-                        "name": "max_fee_delta",
-                        "docs": [
-                            "Maximum allowable deduction between committed_amount and net_amount (0 = disabled)"
-                        ],
+                        "name": "amount",
                         "type": "u64"
                     },
-                    {
-                        "name": "is_initialized",
-                        "type": "bool"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "TreasuryConfigInitializedEvent",
-            "docs": [
-                "Emitted when the treasury config is first initialized."
-            ],
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "manager_threshold",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "executive_threshold",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "sender",
-                        "type": "pubkey"
-                    },
                     {
                         "name": "slot",
                         "type": "u64"
@@ -5175,19 +2832,7 @@
             }
         },
         {
-            "name": "WithdrawNonce",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "nonce",
-                        "type": "u64"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "WithdrawSolEvent",
+            "name": "DepositSolEvent",
             "type": {
                 "kind": "struct",
                 "fields": [
@@ -5196,7 +2841,11 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "recipient",
+                        "name": "depositor",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "vault_authority",
                         "type": "pubkey"
                     },
                     {
@@ -5204,8 +2853,8 @@
                         "type": "u64"
                     },
                     {
-                        "name": "request_id",
-                        "type": "u64"
+                        "name": "bonus_code",
+                        "type": "string"
                     },
                     {
                         "name": "slot",
@@ -5219,7 +2868,7 @@
             }
         },
         {
-            "name": "WithdrawSplEvent",
+            "name": "DepositSplEvent",
             "type": {
                 "kind": "struct",
                 "fields": [
@@ -5228,7 +2877,11 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "recipient",
+                        "name": "depositor",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "vault_token_account",
                         "type": "pubkey"
                     },
                     {
@@ -5240,8 +2893,8 @@
                         "type": "u64"
                     },
                     {
-                        "name": "request_id",
-                        "type": "u64"
+                        "name": "bonus_code",
+                        "type": "string"
                     },
                     {
                         "name": "slot",
@@ -5255,145 +2908,97 @@
             }
         },
         {
-            "name": "WithdrawalCancelledEvent",
+            "name": "EscrowConfig",
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "request_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "cancelled_by",
+                        "name": "admin",
                         "type": "pubkey"
                     },
                     {
-                        "name": "slot",
-                        "type": "u64"
+                        "name": "signer",
+                        "type": "pubkey"
                     },
                     {
-                        "name": "timestamp",
-                        "type": "i64"
+                        "name": "is_initialized",
+                        "type": "bool"
                     }
                 ]
             }
         },
         {
-            "name": "WithdrawalCommitment",
+            "name": "EscrowConfiguration",
+            "docs": [
+                "Config account holding"
+            ],
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "request_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "committed_amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "net_amount",
-                        "type": "u64"
+                        "name": "admins",
+                        "type": {
+                            "vec": "pubkey"
+                        }
                     },
                     {
-                        "name": "recipient",
-                        "type": "pubkey"
+                        "name": "payment_tokens",
+                        "type": {
+                            "vec": "pubkey"
+                        }
                     },
                     {
-                        "name": "token_mint",
-                        "docs": [
-                            "For SOL withdrawals this is the System Program pubkey."
-                        ],
+                        "name": "signer",
                         "type": "pubkey"
                     },
                     {
-                        "name": "execute_at",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "creator",
+                        "name": "funding_wallet",
                         "type": "pubkey"
                     },
                     {
-                        "name": "is_sol",
+                        "name": "is_initialized",
                         "type": "bool"
                     },
                     {
-                        "name": "chain_id",
-                        "type": "u64"
+                        "name": "is_paused",
+                        "type": "bool"
                     }
                 ]
             }
         },
         {
-            "name": "WithdrawalExecutedEvent",
+            "name": "WithdrawNonce",
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "request_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "recipient",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "net_amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "token_mint",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "is_sol",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "slot",
+                        "name": "nonce",
                         "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
                     }
                 ]
             }
         },
         {
-            "name": "WithdrawalScheduledEvent",
+            "name": "WithdrawSolEvent",
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "request_id",
-                        "type": "u64"
+                        "name": "caller",
+                        "type": "pubkey"
                     },
                     {
                         "name": "recipient",
                         "type": "pubkey"
                     },
                     {
-                        "name": "committed_amount",
+                        "name": "amount",
                         "type": "u64"
                     },
                     {
-                        "name": "net_amount",
+                        "name": "request_id",
                         "type": "u64"
                     },
-                    {
-                        "name": "token_mint",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "execute_at",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "is_sol",
-                        "type": "bool"
-                    },
                     {
                         "name": "slot",
                         "type": "u64"
@@ -5406,25 +3011,30 @@
             }
         },
         {
-            "name": "WithdrawalThresholdsConfiguredEvent",
-            "docs": [
-                "Emitted when the manager/executive withdrawal thresholds are updated."
-            ],
+            "name": "WithdrawSplEvent",
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "manager_threshold",
-                        "type": "u8"
+                        "name": "caller",
+                        "type": "pubkey"
                     },
                     {
-                        "name": "executive_threshold",
-                        "type": "u8"
+                        "name": "recipient",
+                        "type": "pubkey"
                     },
                     {
-                        "name": "sender",
+                        "name": "mint",
                         "type": "pubkey"
                     },
+                    {
+                        "name": "amount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "request_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "slot",
                         "type": "u64"