project-serum
/
stake-v2
mirror of https://github.com/project-serum/stake-v2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to 0.11.1 (#1)

This commit is contained in:
Pierre 2021-07-14 08:38:40 +10:00 committed by GitHub
parent 9dfcf20a64
commit dd4ee92927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 252 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Anchor.toml
View File

@ -1,2 +1,3 @@
[provider]
cluster = "localnet"
wallet = "~/.config/solana/id.json"

287
Cargo.lock generated
View File

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "ahash"
version = "0.4.7"
@ -16,10 +18,16 @@ dependencies = [
]
[[package]]
name = "anchor-attribute-access-control"
version = "0.4.4"
name = "alloc-traits"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bc1dd0644b68afc0d1debbb97ccb7f5f25f54616c705be67d54e434f2d272e0"
checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483"
[[package]]
name = "anchor-attribute-access-control"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea6b882e4408341cdf8f38468c108c293b1935587968d3f6aed5de889e7162e"
dependencies = [
"anchor-syn",
"anyhow",
@ -31,9 +39,9 @@ dependencies = [
[[package]]
name = "anchor-attribute-account"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b758125edf97f9d5ba84b58bbd5a71b242847f049e648b6292887ab3541f8d1"
checksum = "a9380e001ca0d8059838647044266f55438734d7796e0c68a1e8b28c5f9b9e42"
dependencies = [
"anchor-syn",
"anyhow",
@ -44,9 +52,9 @@ dependencies = [
[[package]]
name = "anchor-attribute-error"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "843a945ad0a288f5706090c20708ae910c1515fc103ab5fb1063f64e4be5a3a4"
checksum = "ebeb8b684e600a6e1ca9256368bb0e6fbfc161c211e3dce0e94a4aa88df87684"
dependencies = [
"anchor-syn",
"proc-macro2",
@ -56,9 +64,9 @@ dependencies = [
[[package]]
name = "anchor-attribute-event"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4f823d51a37431cd0a71864550104a1aa62b0f67d62612c90fa2ed0f96d4be1"
checksum = "987c9fbed8d6205fd6877f13f8f2598e780382e7c74893c9bdb67afee674a533"
dependencies = [
"anchor-syn",
"anyhow",
@ -69,9 +77,9 @@ dependencies = [
[[package]]
name = "anchor-attribute-interface"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca690936e1003978c354020da66b430769bbd17f3b31cae1aa5084a53132fc33"
checksum = "63b966059cccd25e0a21fd55e6c10aa36eb45b4a2c9488bd2eb3e5795d2f9c1c"
dependencies = [
"anchor-syn",
"anyhow",
@ -83,9 +91,9 @@ dependencies = [
[[package]]
name = "anchor-attribute-program"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af392df4e4b390d2b0438c7fb1fce1f4878a1acfb79791db29a78d5f41d684f8"
checksum = "9056aad8753761d6bd02b93da27e7457b69da56b574a7507e3555c0faab11dd7"
dependencies = [
"anchor-syn",
"anyhow",
@ -96,9 +104,9 @@ dependencies = [
[[package]]
name = "anchor-attribute-state"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa2b80913fa00d6df180f22e35a536d2d516dc786177198e40a4f8c6dc28f24b"
checksum = "c8eff10500f1c3a311bc3333ba4cde1fcf5f38b6e35787d9447f992cd65d408d"
dependencies = [
"anchor-syn",
"anyhow",
@ -109,9 +117,9 @@ dependencies = [
[[package]]
name = "anchor-derive-accounts"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecb6f8805e1c705525d7c11a6f48d972d9a5d339bc98fa5e8ae24a7f0a8e4802"
checksum = "be4053a28ed669e447dc2eba4c476badfc2d5aa7d0f41f0ee721f0cff6c467cd"
dependencies = [
"anchor-syn",
"anyhow",
@ -122,9 +130,9 @@ dependencies = [
[[package]]
name = "anchor-lang"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b509f2f53910f0462f3acecb15a9d409ca346c1283214293113824f180ef75f8"
checksum = "a6bbcc4043ccfd1c6fbeb128f2a59ecb493a38694194ea2ba1199b3886a49333"
dependencies = [
"anchor-attribute-access-control",
"anchor-attribute-account",
@ -143,25 +151,28 @@ dependencies = [
[[package]]
name = "anchor-spl"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19fb214ae2f64e3e71989b0c6b345a8a6f919af4b5ca76de6de9034d37195a25"
checksum = "60ed4d25c0b4e8ea873411e4ad36a1cfdb937f73187ae0a8454311ed945dfdd8"
dependencies = [
"anchor-lang",
"lazy_static",
"serum_dex",
"solana-program",
"spl-token",
]
[[package]]
name = "anchor-syn"
version = "0.4.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65c19efff3d8def89fe320965d058bcaf05043f389182666859d626675875926"
checksum = "827c52b895bb53bb2b16afb97040dc5aeea32549b0734c63d2a4c73e7ec9af99"
dependencies = [
"anyhow",
"bs58",
"heck",
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
"serde",
"serde_json",
@ -242,14 +253,21 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"block-padding",
"generic-array 0.14.4",
]
[[package]]
name = "borsh"
version = "0.8.2"
name = "block-padding"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09a7111f797cc721407885a323fb071636aee57f750b1a4ddc27397eba168a74"
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "borsh"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fcabb02816fdadf90866dc9a7824491ccb63d69f55375a266dc03509ac68d36"
dependencies = [
"borsh-derive",
"hashbrown",
@ -257,9 +275,9 @@ dependencies = [
[[package]]
name = "borsh-derive"
version = "0.8.2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307f3740906bac2c118a8122fe22681232b244f1369273e45f1156b45c43d2dd"
checksum = "4bd16f0729b89f0a212b0e2e1d19cc6593df63f771161a11863967780e2d033d"
dependencies = [
"borsh-derive-internal",
"borsh-schema-derive-internal",
@ -270,9 +288,9 @@ dependencies = [
[[package]]
name = "borsh-derive-internal"
version = "0.8.2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2104c73179359431cc98e016998f2f23bc7a05bc53e79741bcba705f30047bc"
checksum = "1e321a130a3ac4b88eb59a6d670bde11eec9721a397b77e0f2079060e2a1b785"
dependencies = [
"proc-macro2",
"quote",
@ -281,9 +299,9 @@ dependencies = [
[[package]]
name = "borsh-schema-derive-internal"
version = "0.8.2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae29eb8418fcd46f723f8691a2ac06857d31179d33d2f2d91eb13967de97c728"
checksum = "15151a485164b319cc7a5160fe4316dc469a27993f71b73d7617dc9032ff0fd7"
dependencies = [
"proc-macro2",
"quote",
@ -406,6 +424,26 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "enumflags2"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
dependencies = [
"enumflags2_derive",
]
[[package]]
name = "enumflags2_derive"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "env_logger"
version = "0.8.3"
@ -425,6 +463,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
[[package]]
name = "field-offset"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
dependencies = [
"memoffset",
"rustc_version 0.3.3",
]
[[package]]
name = "generic-array"
version = "0.12.4"
@ -510,6 +558,12 @@ version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "keccak"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "lazy_static"
version = "1.4.0"
@ -524,7 +578,7 @@ checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
[[package]]
name = "lockup"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"anchor-lang",
"anchor-spl",
@ -554,6 +608,15 @@ dependencies = [
"libc",
]
[[package]]
name = "memoffset"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
dependencies = [
"autocfg",
]
[[package]]
name = "num-derive"
version = "0.3.3"
@ -608,6 +671,15 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "pest"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
dependencies = [
"ucd-trie",
]
[[package]]
name = "ppv-lite86"
version = "0.2.10"
@ -632,6 +704,19 @@ dependencies = [
"unicode-xid",
]
[[package]]
name = "proc-macro2-diagnostics"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
dependencies = [
"proc-macro2",
"quote",
"syn",
"version_check",
"yansi",
]
[[package]]
name = "quote"
version = "1.0.9"
@ -702,7 +787,7 @@ checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
[[package]]
name = "registry"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"anchor-lang",
"anchor-spl",
@ -716,7 +801,16 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
dependencies = [
"semver",
"semver 0.9.0",
]
[[package]]
name = "rustc_version"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
dependencies = [
"semver 0.11.0",
]
[[package]]
@ -731,13 +825,28 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "safe-transmute"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8"
[[package]]
name = "semver"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
dependencies = [
"semver-parser",
"semver-parser 0.7.0",
]
[[package]]
name = "semver"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
dependencies = [
"semver-parser 0.10.2",
]
[[package]]
@ -746,6 +855,15 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "semver-parser"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
dependencies = [
"pest",
]
[[package]]
name = "serde"
version = "1.0.125"
@ -786,6 +904,30 @@ dependencies = [
"serde",
]
[[package]]
name = "serum_dex"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dafc59d6c9502642898caafe8879ff7383c811cb0d6ca3a9e9b96feba9955465"
dependencies = [
"arrayref",
"bincode",
"bytemuck",
"byteorder",
"enumflags2",
"field-offset",
"itertools",
"num-traits",
"num_enum",
"safe-transmute",
"serde",
"solana-program",
"spl-token",
"static_assertions",
"thiserror",
"without-alloc",
]
[[package]]
name = "sha2"
version = "0.9.3"
@ -800,17 +942,29 @@ dependencies = [
]
[[package]]
name = "solana-frozen-abi"
version = "1.6.6"
name = "sha3"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10272e9486b3cb41b04e899929c521c5c2a037ba6be1651cff68ad3959f4d1f9"
checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
dependencies = [
"block-buffer",
"digest 0.9.0",
"keccak",
"opaque-debug",
]
[[package]]
name = "solana-frozen-abi"
version = "1.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b1e0d064e18bacd418a20b1d3c1a699bd6df1920fda7dbf1a0f84b764aaa0fb"
dependencies = [
"bs58",
"bv",
"generic-array 0.14.4",
"log",
"memmap2",
"rustc_version",
"rustc_version 0.2.3",
"serde",
"serde_derive",
"sha2",
@ -821,22 +975,21 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.6.6"
version = "1.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82f4b6a34f19cc4b09da1919ff9810c1a499c7e77fc9d26bea022f69dc965edf"
checksum = "adb85ca95ec91b6683e9a414cbdf74fc3d104eded6cb20439b2bb6eea22d3514"
dependencies = [
"lazy_static",
"proc-macro2",
"quote",
"rustc_version",
"rustc_version 0.2.3",
"syn",
]
[[package]]
name = "solana-logger"
version = "1.6.6"
version = "1.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c17fa89f2e5fe988cf95a34df411950db4609f68af8df602371d9b7f83cefa7"
checksum = "7afaad15211575f769c1f5389fca78a10fe9bc676c2fcc7b91b85be978eadca3"
dependencies = [
"env_logger",
"lazy_static",
@ -845,9 +998,9 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.6.6"
version = "1.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "885552ce43e9f2cf13fda274bf2b4ef75c5de6e5e0190f53acb83f84cda739c0"
checksum = "7d494621bfad15d6745a2bde5a5fa112c921011c00fa07987637d34bd544f191"
dependencies = [
"bincode",
"blake3",
@ -863,12 +1016,13 @@ dependencies = [
"num-derive",
"num-traits",
"rand",
"rustc_version",
"rustc_version 0.2.3",
"rustversion",
"serde",
"serde_bytes",
"serde_derive",
"sha2",
"sha3",
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-logger",
@ -878,9 +1032,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.6.6"
version = "1.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8264149655cbbcfa1dccd0dc9f62eb04d6832ec08540fcb81db6f305a21d3b65"
checksum = "3a7afe714e9abb9a93215bf5710ee1e244046f2189574301b3e38afb4a14c8f6"
dependencies = [
"bs58",
"proc-macro2",
@ -891,9 +1045,9 @@ dependencies = [
[[package]]
name = "spl-token"
version = "3.0.1"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9774eebb62ff1ff2f5eca112413e476143925a2f5a43cee98fc5d3a6c0eec5c"
checksum = "fbfa8fd791aeb4d7ad5fedb7872478de9f4e8b4fcb02dfd9e7f2f9ae3f3ddd73"
dependencies = [
"arrayref",
"num-derive",
@ -903,6 +1057,12 @@ dependencies = [
"thiserror",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "subtle"
version = "2.4.0"
@ -973,6 +1133,12 @@ version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
[[package]]
name = "ucd-trie"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
[[package]]
name = "unicode-segmentation"
version = "1.7.1"
@ -1028,6 +1194,21 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "without-alloc"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e34736feff52a0b3e5680927e947a4d8fac1f0b80dc8120b080dd8de24d75e2"
dependencies = [
"alloc-traits",
]
[[package]]
name = "yansi"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
[[package]]
name = "zeroize"
version = "1.2.0"

2
migrations/deploy.js
View File

@ -31,7 +31,7 @@ module.exports = async function (provider) {
});
// Delete the default whitelist entries.
const defaultEntry = { programId: new anchor.web3.PublicKey() };
const defaultEntry = { programId: anchor.web3.PublicKey.default };
await lockup.state.rpc.whitelistDelete(defaultEntry, {
accounts: {
authority: provider.wallet.publicKey,

4
programs/lockup/Cargo.toml
View File

@ -13,5 +13,5 @@ no-entrypoint = []
cpi = ["no-entrypoint"]
[dependencies]
anchor-lang = "0.4.4"
anchor-spl = "0.4.4"
anchor-lang = "0.11.1"
anchor-spl = "0.11.1"

6
programs/registry/Cargo.toml
View File

@ -13,7 +13,7 @@ no-entrypoint = []
cpi = ["no-entrypoint"]
[dependencies]
anchor-lang = "0.4.4"
anchor-spl = "0.4.4"
anchor-lang = "0.11.1"
anchor-spl = "0.11.1"
lockup = { path = "../lockup", features = ["cpi"] }
solana-program = "1.6.6"
solana-program = "1.7.4"

22
programs/registry/src/lib.rs
View File

@ -522,7 +522,7 @@ mod registry {
let mut remaining_accounts: &[AccountInfo] = ctx.remaining_accounts;
let cpi_program = ctx.accounts.lockup_program.clone();
let cpi_accounts =
CreateVesting::try_accounts(ctx.accounts.lockup_program.key, &mut remaining_accounts)?;
CreateVesting::try_accounts(ctx.accounts.lockup_program.key, &mut remaining_accounts, &[])?;
let cpi_ctx = CpiContext::new_with_signer(cpi_program, cpi_accounts, signer);
lockup::cpi::create_vesting(
cpi_ctx,
@ -758,7 +758,7 @@ pub struct DepositLocked<'info> {
// Program specific.
registry: ProgramState<'info, Registry>,
registrar: ProgramAccount<'info, Registrar>,
#[account(belongs_to = registrar, has_one = beneficiary)]
#[account(has_one = registrar, has_one = beneficiary)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
@ -774,7 +774,7 @@ pub struct Stake<'info> {
pool_mint: CpiAccount<'info, Mint>,
// Member.
#[account(mut, has_one = beneficiary, belongs_to = registrar)]
#[account(mut, has_one = beneficiary, has_one = registrar)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
@ -813,7 +813,7 @@ pub struct StartUnstake<'info> {
// Member.
#[account(init)]
pending_withdrawal: ProgramAccount<'info, PendingWithdrawal>,
#[account(has_one = beneficiary, belongs_to = registrar)]
#[account(has_one = beneficiary, has_one = registrar)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
@ -843,11 +843,11 @@ pub struct StartUnstake<'info> {
pub struct EndUnstake<'info> {
registrar: ProgramAccount<'info, Registrar>,
#[account(belongs_to = registrar, has_one = beneficiary)]
#[account(has_one = registrar, has_one = beneficiary)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
#[account(mut, belongs_to = registrar, belongs_to = member, "!pending_withdrawal.burned")]
#[account(mut, has_one = registrar, has_one = member, "!pending_withdrawal.burned")]
pending_withdrawal: ProgramAccount<'info, PendingWithdrawal>,
// If we had ordered maps implementing Accounts we could do a constraint like
@ -878,7 +878,7 @@ pub struct Withdraw<'info> {
// Stake instance.
registrar: ProgramAccount<'info, Registrar>,
// Member.
#[account(belongs_to = registrar, has_one = beneficiary)]
#[account(has_one = registrar, has_one = beneficiary)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
@ -931,7 +931,7 @@ pub struct WithdrawLocked<'info> {
// Program specific.
registry: ProgramState<'info, Registry>,
registrar: ProgramAccount<'info, Registrar>,
#[account(belongs_to = registrar, has_one = beneficiary)]
#[account(has_one = registrar, has_one = beneficiary)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
@ -1003,7 +1003,7 @@ pub struct ClaimRewardCommon<'info> {
// Stake instance.
registrar: ProgramAccount<'info, Registrar>,
// Member.
#[account(mut, belongs_to = registrar, has_one = beneficiary)]
#[account(mut, has_one = registrar, has_one = beneficiary)]
member: ProgramAccount<'info, Member>,
#[account(signer)]
beneficiary: AccountInfo<'info>,
@ -1012,7 +1012,7 @@ pub struct ClaimRewardCommon<'info> {
#[account("BalanceSandbox::from(&balances_locked) == member.balances_locked")]
balances_locked: BalanceSandboxAccounts<'info>,
// Vendor.
#[account(belongs_to = registrar, has_one = vault)]
#[account(has_one = registrar, has_one = vault)]
vendor: ProgramAccount<'info, RewardVendor>,
#[account(mut)]
vault: AccountInfo<'info>,
@ -1035,7 +1035,7 @@ pub struct ExpireReward<'info> {
// Staking instance globals.
registrar: ProgramAccount<'info, Registrar>,
// Vendor.
#[account(mut, belongs_to = registrar, has_one = vault, has_one = expiry_receiver)]
#[account(mut, has_one = registrar, has_one = vault, has_one = expiry_receiver)]
vendor: ProgramAccount<'info, RewardVendor>,
#[account(mut)]
vault: CpiAccount<'info, TokenAccount>,