From 70d9ebf83c4977b68e13bd2d2b145fb5b9df3739 Mon Sep 17 00:00:00 2001 From: Larry Jarry Date: Wed, 16 Feb 2022 07:31:44 +0800 Subject: [PATCH 1/3] Upgrade to Anchor v0.21.0 --- .yarn/sdks/eslint/package.json | 2 +- .yarn/sdks/typescript/lib/tsserver.js | 11 +- .yarn/sdks/typescript/lib/tsserverlibrary.js | 11 +- Cargo.lock | 254 ++++----- package.json | 30 +- programs/quarry-merge-mine/Cargo.toml | 6 +- programs/quarry-merge-mine/src/lib.rs | 16 +- .../quarry-merge-mine/src/processor/claim.rs | 2 +- .../src/processor/deposit.rs | 4 +- .../quarry-merge-mine/src/processor/init.rs | 10 +- .../src/processor/withdraw.rs | 4 +- programs/quarry-mine/Cargo.toml | 6 +- programs/quarry-mine/src/lib.rs | 24 +- programs/quarry-mint-wrapper/Cargo.toml | 6 +- programs/quarry-mint-wrapper/src/lib.rs | 19 +- programs/quarry-operator/Cargo.toml | 6 +- programs/quarry-operator/src/lib.rs | 7 +- programs/quarry-redeemer/Cargo.toml | 6 +- programs/quarry-redeemer/src/lib.rs | 7 +- programs/quarry-registry/Cargo.toml | 4 +- programs/quarry-registry/src/lib.rs | 11 +- yarn.lock | 514 ++++++++++-------- 22 files changed, 498 insertions(+), 462 deletions(-) diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json index 532b5cf4..227e8e13 100644 --- a/.yarn/sdks/eslint/package.json +++ b/.yarn/sdks/eslint/package.json @@ -1,6 +1,6 @@ { "name": "eslint", - "version": "8.7.0-sdk", + "version": "8.9.0-sdk", "main": "./lib/api.js", "type": "commonjs" } diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js index b4610069..7e0b241e 100644 --- a/.yarn/sdks/typescript/lib/tsserver.js +++ b/.yarn/sdks/typescript/lib/tsserver.js @@ -85,7 +85,7 @@ const moduleWrapper = tsserver => { // everything else is up to neovim case `neovim`: { str = normalize(resolved).replace(/\.zip\//, `.zip::`); - str = `zipfile:${str}`; + str = `zipfile://${str}`; } break; default: { @@ -100,8 +100,7 @@ const moduleWrapper = tsserver => { function fromEditorPath(str) { switch (hostInfo) { - case `coc-nvim`: - case `neovim`: { + case `coc-nvim`: { str = str.replace(/\.zip::/, `.zip/`); // The path for coc-nvim is in format of //zipfile://.yarn/... // So in order to convert it back, we use .* to match all the thing @@ -111,6 +110,12 @@ const moduleWrapper = tsserver => { : str.replace(/^.*zipfile:/, ``); } break; + case `neovim`: { + str = str.replace(/\.zip::/, `.zip/`); + // The path for neovim is in format of zipfile:////.yarn/... + return str.replace(/^zipfile:\/\//, ``); + } break; + case `vscode`: default: { return process.platform === `win32` diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js index 73a02653..f4909c2f 100644 --- a/.yarn/sdks/typescript/lib/tsserverlibrary.js +++ b/.yarn/sdks/typescript/lib/tsserverlibrary.js @@ -85,7 +85,7 @@ const moduleWrapper = tsserver => { // everything else is up to neovim case `neovim`: { str = normalize(resolved).replace(/\.zip\//, `.zip::`); - str = `zipfile:${str}`; + str = `zipfile://${str}`; } break; default: { @@ -100,8 +100,7 @@ const moduleWrapper = tsserver => { function fromEditorPath(str) { switch (hostInfo) { - case `coc-nvim`: - case `neovim`: { + case `coc-nvim`: { str = str.replace(/\.zip::/, `.zip/`); // The path for coc-nvim is in format of //zipfile://.yarn/... // So in order to convert it back, we use .* to match all the thing @@ -111,6 +110,12 @@ const moduleWrapper = tsserver => { : str.replace(/^.*zipfile:/, ``); } break; + case `neovim`: { + str = str.replace(/\.zip::/, `.zip/`); + // The path for neovim is in format of zipfile:////.yarn/... + return str.replace(/^zipfile:\/\//, ``); + } break; + case `vscode`: default: { return process.platform === `win32` diff --git a/Cargo.lock b/Cargo.lock index 7bac05c3..fb475184 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,14 @@ version = 3 [[package]] name = "ahash" -version = "0.4.7" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.4", + "once_cell", + "version_check", +] [[package]] name = "aho-corasick" @@ -19,9 +24,9 @@ dependencies = [ [[package]] name = "anchor-attribute-access-control" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105c443a613f29212755fb6c5f946fa82dcf94a80528f643e0faa9d9faeb626b" +checksum = "8573731461c6e39febd16026fe95cbc99955585b08acddc0baaeefb803da191b" dependencies = [ "anchor-syn", "anyhow", @@ -33,9 +38,9 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdae15851aa41972e9c18c987613c50a916c48c88c97ea3316156a5c772e5faa" +checksum = "537c6e7014f727f3396759f73a847bdbca92379499d918c99ae1c7075d6d32e3" dependencies = [ "anchor-syn", "anyhow", @@ -48,9 +53,9 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6356865217881d0bbea8aa70625937bec6d9952610f1ba2a2452a8e427000687" +checksum = "4fce62e28b84fe3622044d5777e6962cf090049ef45d1bc29d0fbbc027b848d8" dependencies = [ "anchor-syn", "proc-macro2", @@ -59,9 +64,9 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe998ce4e6e0cb0e291d1a1626bd30791cdfdd9d05523111bdf4fd053f08636" +checksum = "2cd2fe5dd4d1e82ff9d0b948170ab4ad3b12fa16ad6f45a3a3ce4dd97e543935" dependencies = [ "anchor-syn", "proc-macro2", @@ -71,9 +76,9 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5810498a20554c20354f5648b6041172f2035e58d09ad40dc051dc0d1501f80" +checksum = "8437fd23a6c92e0d7ee6378aef4e95596976008eb3a0be100ac832b7b3eaf240" dependencies = [ "anchor-syn", "anyhow", @@ -84,9 +89,9 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac83f085b2be8b3a3412989cf96cf7f683561db7d357c5aa4aa11d48bbb22213" +checksum = "8567efb892ec10df7cb479dc0246257f896b2de1406c6901621d5437080fc041" dependencies = [ "anchor-syn", "anyhow", @@ -98,9 +103,9 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c56be575d89abcb192afa29deb87b2cdb3c39033abc02f2d16e6af999b23b7" +checksum = "4b8674fa15f24b311451294595034617b96348faed14c821fe191183d46258af" dependencies = [ "anchor-syn", "anyhow", @@ -111,9 +116,9 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ab002353b01fcb4f72cca256d5d62db39f9ff39b1d072280deee9798f1f524" +checksum = "e3921cd5b29b8fe7ff10368a5dd8398f37b1dabef489d18a01a4befd86ce09d6" dependencies = [ "anchor-syn", "anyhow", @@ -124,9 +129,9 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e653cdb322078d95221384c4a527a403560e509ac7cb2b53d3bd664b23c4d6" +checksum = "5f41be15286b4fc2753cd2dab130ca7c87d81a2817adb7d0af5316715ddf4b46" dependencies = [ "anchor-syn", "anyhow", @@ -137,9 +142,9 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4815ad6334fd2f561f7ddcc3cfbeed87ed3003724171bd80ebe6383d5173ee8f" +checksum = "f4300d151a09cb0c0775cdd63100040c8dba325b406c55ffb4f845f4b78d9e9b" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -153,7 +158,7 @@ dependencies = [ "arrayref", "base64 0.13.0", "bincode", - "borsh 0.9.1", + "borsh 0.9.3", "bytemuck", "solana-program", "thiserror", @@ -161,9 +166,9 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea94b04fc9a0aaae4d4473b0595fb5f55b6c9b38e0d6f596df8c8060f95f096" +checksum = "cc245f1d18992ad44236dc15717a9875e1184a164b931c506ba9dc7a2258804f" dependencies = [ "anchor-lang", "solana-program", @@ -173,9 +178,9 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be7bfb6991d79cce3495fb6ce0892f58a5c75a74c8d1c2fc6f62926066eb9f4" +checksum = "7c8a4e39f655a9e32037c238f51f09b168a7d56ab6a2727777da81849559c77c" dependencies = [ "anyhow", "bs58 0.3.1", @@ -192,9 +197,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "arrayref" @@ -221,9 +226,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -269,16 +274,16 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake3" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882e99e4a0cb2ae6cb6e442102e8e6b7131718d94110e64c3e6a34ea9b106f37" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.1", + "digest 0.10.2", ] [[package]] @@ -293,9 +298,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ "generic-array", ] @@ -317,11 +322,11 @@ dependencies = [ [[package]] name = "borsh" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18dda7dc709193c0d86a1a51050a926dc3df1cf262ec46a23a25dba421ea1924" +checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive 0.9.1", + "borsh-derive 0.9.3", "hashbrown", ] @@ -352,12 +357,12 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264" +checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal 0.9.1", - "borsh-schema-derive-internal 0.9.1", + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", "proc-macro-crate 0.1.5", "proc-macro2", "syn", @@ -387,9 +392,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2102f62f8b6d3edeab871830782285b64cc1830168094db05c8e458f209bc5c3" +checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ "proc-macro2", "quote", @@ -420,9 +425,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196c978c4c9b0b142d446ef3240690bf5a8a33497074a113ff9a337ccb750483" +checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ "proc-macro2", "quote", @@ -538,9 +543,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06" dependencies = [ "generic-array", ] @@ -579,13 +584,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837" dependencies = [ - "block-buffer 0.10.0", + "block-buffer 0.10.2", "crypto-common", - "generic-array", "subtle", ] @@ -610,9 +614,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] @@ -666,9 +670,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ "ahash", ] @@ -744,9 +748,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] @@ -765,9 +769,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.112" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94" [[package]] name = "libsecp256k1" @@ -819,9 +823,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -843,9 +847,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memmap2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3179b85e1fd8b14447cbebadb75e45a1002f541b925f0bfec366d56a81c56d" +checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" dependencies = [ "libc", ] @@ -885,12 +889,18 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.1", "proc-macro2", "quote", "syn", ] +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + [[package]] name = "opaque-debug" version = "0.3.0" @@ -939,9 +949,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "738b5123081e03ec93bdd0229f33e39891e6ee18745b72bfc8fdc04a080d5c38" dependencies = [ "thiserror", "toml", @@ -981,7 +991,7 @@ dependencies = [ "lazy_static", "num-traits", "quick-error 2.0.1", - "rand 0.8.4", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax", @@ -1010,7 +1020,7 @@ dependencies = [ "num-traits", "proptest", "quarry-mint-wrapper", - "rand 0.8.4", + "rand 0.8.5", "spl-math", "vipers", ] @@ -1066,9 +1076,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -1083,19 +1093,18 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -1145,15 +1154,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_xorshift" version = "0.3.0" @@ -1245,15 +1245,15 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7" [[package]] name = "serde" -version = "1.0.133" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -1269,9 +1269,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -1280,9 +1280,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.74" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ "itoa", "ryu", @@ -1322,9 +1322,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "solana-frozen-abi" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89bcde59ac3e8d4dbf7c4d990b0627b8ca0d25394c4ce17896dde7a1452e40c" +checksum = "6d648cd0a1940b787950c88c00b20f682780649e822d57f68025e01dac167f90" dependencies = [ "bs58 0.4.0", "bv", @@ -1342,9 +1342,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a7d630da35993631ecc4dd155f92d0d58000cdde3d5e2764fe9fd49d20a3a8" +checksum = "1de0744b9e08d3ad35cb80fb1f5a133f734befa349411554cc9c37a55f51a4e7" dependencies = [ "proc-macro2", "quote", @@ -1354,9 +1354,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eaf925bb665de46f96fcea2c8a900d0d870a96fd1f50cf2bad16e22a1da71c4" +checksum = "65b3b5d1fa400978cd38e555c1a5a6ecbf1fe95961f3636bb34eeafa03af5c91" dependencies = [ "env_logger", "lazy_static", @@ -1365,16 +1365,16 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc4d7a0baa649a3bda06d6a1cc30bd3d8ac692702a75fa8e76369cf7b3f6329" +checksum = "98fb3b2c513e7bc881c233081135f93ba0cb848a69aa50660643e2b3a7ba47b5" dependencies = [ "base64 0.13.0", "bincode", "bitflags", "blake3", - "borsh 0.9.1", - "borsh-derive 0.9.1", + "borsh 0.9.3", + "borsh-derive 0.9.3", "bs58 0.4.0", "bv", "bytemuck", @@ -1408,9 +1408,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec22a924c73abe3376a2046715a2f6a9ae4094095b8ea08e8e56e8de198264ad" +checksum = "73dfcb574099681c35ab1b9c6bb230737e7d14fd691e1812661c72b44e06eaf3" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -1446,9 +1446,9 @@ dependencies = [ [[package]] name = "spl-token" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bfdd5bd7c869cb565c7d7635c4fafe189b988a0bdef81063cd9585c6b8dc01" +checksum = "0cc67166ef99d10c18cb5e9c208901e6d8255c6513bb1f877977eba48e6cc4fb" dependencies = [ "arrayref", "num-derive", @@ -1472,9 +1472,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -1553,9 +1553,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-xid" @@ -1571,9 +1571,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vipers" -version = "1.5.9" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8c839e2a15777b45909d05ab3eeaaa3035b43241b404345c9cd999ed30df09" +checksum = "a9a8dc4892bbdf8c166bc77882e459324209a1f1d315f336a9622605da340450" dependencies = [ "anchor-lang", "anchor-spl", @@ -1603,9 +1603,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1613,9 +1613,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -1628,9 +1628,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1638,9 +1638,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -1651,15 +1651,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", @@ -1704,6 +1704,6 @@ checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" [[package]] name = "zeroize" -version = "1.4.3" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" +checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006" diff --git a/package.json b/package.json index 86d2adef..57837f39 100644 --- a/package.json +++ b/package.json @@ -30,31 +30,31 @@ "prepare": "husky install" }, "devDependencies": { - "@project-serum/anchor": "^0.20.1", + "@project-serum/anchor": "^0.21.0", "@rushstack/eslint-patch": "^1.1.0", - "@saberhq/anchor-contrib": "^1.12.32", - "@saberhq/chai-solana": "^1.12.32", - "@saberhq/eslint-config": "^1.12.32", - "@saberhq/solana-contrib": "^1.12.32", - "@saberhq/token-utils": "^1.12.32", - "@saberhq/tsconfig": "^1.12.32", - "@solana/web3.js": "^1.31.0", + "@saberhq/anchor-contrib": "^1.12.44", + "@saberhq/chai-solana": "^1.12.44", + "@saberhq/eslint-config": "^1.12.44", + "@saberhq/solana-contrib": "^1.12.44", + "@saberhq/token-utils": "^1.12.44", + "@saberhq/tsconfig": "^1.12.44", + "@solana/web3.js": "^1.34.0", "@types/bn.js": "^5.1.0", "@types/chai": "^4.3.0", "@types/mocha": "^9.1.0", - "@types/node": "^17.0.10", - "@types/prettier": "^2.4.3", + "@types/node": "^17.0.18", + "@types/prettier": "^2.4.4", "bn.js": "^5.2.0", - "chai": "^4.3.4", - "eslint": "^8.7.0", + "chai": "=4.3.4", + "eslint": "^8.9.0", "eslint-import-resolver-node": "^0.3.6", "eslint-plugin-import": "^2.25.4", "husky": "^7.0.4", "jsbi": "^4.1.0", - "lint-staged": "^12.2.2", - "mocha": "^9.1.4", + "lint-staged": "^12.3.4", + "mocha": "^9.2.0", "prettier": "^2.5.1", - "ts-node": "^10.4.0", + "ts-node": "^10.5.0", "typedoc": "^0.22.11", "typescript": "^4.5.5" }, diff --git a/programs/quarry-merge-mine/Cargo.toml b/programs/quarry-merge-mine/Cargo.toml index b52b6558..0fecaddc 100644 --- a/programs/quarry-merge-mine/Cargo.toml +++ b/programs/quarry-merge-mine/Cargo.toml @@ -20,11 +20,11 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = ">=0.17.0" -anchor-spl = ">=0.17.0" +anchor-lang = ">=0.21" +anchor-spl = ">=0.21" quarry-mine = { path = "../quarry-mine", features = ["cpi"], version = "^1.11" } quarry-mint-wrapper = { path = "../quarry-mint-wrapper", features = [ "cpi" ], version = "^1.11" } num-traits = "0.2" -vipers = "1.5.9" +vipers = "^1.6" diff --git a/programs/quarry-merge-mine/src/lib.rs b/programs/quarry-merge-mine/src/lib.rs index 975374c7..1be4f0f5 100644 --- a/programs/quarry-merge-mine/src/lib.rs +++ b/programs/quarry-merge-mine/src/lib.rs @@ -31,15 +31,15 @@ pub mod quarry_merge_mine { /// Creates a new [MergePool]. /// Anyone can call this. #[access_control(ctx.accounts.validate())] - pub fn new_pool(ctx: Context, bump: u8, _mint_bump: u8) -> ProgramResult { - processor::init::new_pool(ctx, bump) + pub fn new_pool(ctx: Context, _bump: u8, _mint_bump: u8) -> ProgramResult { + processor::init::new_pool(ctx) } /// Creates a new [MergeMiner]. /// Anyone can call this. #[access_control(ctx.accounts.validate())] - pub fn init_merge_miner(ctx: Context, bump: u8) -> ProgramResult { - processor::init::init_merge_miner(ctx, bump) + pub fn init_merge_miner(ctx: Context, _bump: u8) -> ProgramResult { + processor::init::init_merge_miner(ctx) } /// Initializes a [quarry_mine::Miner] owned by the [MergeMiner]. @@ -107,7 +107,6 @@ pub mod quarry_merge_mine { /// [quarry_merge_mine::new_pool] accounts #[derive(Accounts)] -#[instruction(bump: u8, mint_bump: u8)] pub struct NewPool<'info> { /// [MergePool]. #[account( @@ -116,7 +115,7 @@ pub struct NewPool<'info> { b"MergePool", primary_mint.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub pool: Account<'info, MergePool>, @@ -133,7 +132,7 @@ pub struct NewPool<'info> { ], mint::decimals = primary_mint.decimals, mint::authority = pool, - bump = mint_bump, + bump, payer = payer, space = Mint::LEN )] @@ -155,7 +154,6 @@ pub struct NewPool<'info> { /// [quarry_merge_mine::init_merge_miner] accounts #[derive(Accounts)] -#[instruction(bump: u8)] pub struct InitMergeMiner<'info> { /// [MergePool] of the underlying LP token. pub pool: Account<'info, MergePool>, @@ -171,7 +169,7 @@ pub struct InitMergeMiner<'info> { pool.key().to_bytes().as_ref(), owner.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub mm: Account<'info, MergeMiner>, diff --git a/programs/quarry-merge-mine/src/processor/claim.rs b/programs/quarry-merge-mine/src/processor/claim.rs index bf3fb0cf..a21adf1f 100644 --- a/programs/quarry-merge-mine/src/processor/claim.rs +++ b/programs/quarry-merge-mine/src/processor/claim.rs @@ -16,7 +16,7 @@ pub fn claim_rewards(ctx: Context) -> ProgramResult { let amount = unwrap_int!(end_balance.checked_sub(initial_balance)); emit!(ClaimEvent { - pool: mm.pool.key(), + pool: mm.pool, mm: mm.key(), mint: ctx.accounts.rewards_token_account.mint, amount, diff --git a/programs/quarry-merge-mine/src/processor/deposit.rs b/programs/quarry-merge-mine/src/processor/deposit.rs index af67df6f..8cb5e47e 100644 --- a/programs/quarry-merge-mine/src/processor/deposit.rs +++ b/programs/quarry-merge-mine/src/processor/deposit.rs @@ -27,7 +27,7 @@ pub fn stake_primary_miner(ctx: Context) -> ProgramResult { pool: pool.key(), mm: mm.key(), miner: ctx.accounts.stake.miner.key(), - owner: mm.owner.key(), + owner: mm.owner, amount, }); @@ -66,7 +66,7 @@ pub fn stake_replica_miner(ctx: Context) -> ProgramResult { pool: pool.key(), mm: mm.key(), miner: ctx.accounts.stake.miner.key(), - owner: mm.owner.key(), + owner: mm.owner, amount: stake_amount, }); diff --git a/programs/quarry-merge-mine/src/processor/init.rs b/programs/quarry-merge-mine/src/processor/init.rs index abae761e..5e7c7789 100644 --- a/programs/quarry-merge-mine/src/processor/init.rs +++ b/programs/quarry-merge-mine/src/processor/init.rs @@ -2,14 +2,14 @@ use crate::{events::*, InitMergeMiner, InitMiner, NewPool}; use anchor_lang::prelude::*; -use vipers::*; +use vipers::prelude::*; /// Creates a new [MergePool]. /// Anyone can call this. -pub fn new_pool(ctx: Context, bump: u8) -> ProgramResult { +pub fn new_pool(ctx: Context) -> ProgramResult { let pool = &mut ctx.accounts.pool; pool.primary_mint = ctx.accounts.primary_mint.key(); - pool.bump = bump; + pool.bump = *unwrap_int!(ctx.bumps.get("pool")); pool.replica_mint = ctx.accounts.replica_mint.key(); @@ -28,12 +28,12 @@ pub fn new_pool(ctx: Context, bump: u8) -> ProgramResult { /// Creates a new [MergeMiner]. /// Anyone can call this. -pub fn init_merge_miner(ctx: Context, bump: u8) -> ProgramResult { +pub fn init_merge_miner(ctx: Context) -> ProgramResult { let mm = &mut ctx.accounts.mm; mm.pool = ctx.accounts.pool.key(); mm.owner = ctx.accounts.owner.key(); - mm.bump = bump; + mm.bump = *unwrap_int!(ctx.bumps.get("mm")); // Track total number of pools. let pool = &mut ctx.accounts.pool; diff --git a/programs/quarry-merge-mine/src/processor/withdraw.rs b/programs/quarry-merge-mine/src/processor/withdraw.rs index 67a39232..6e848ff5 100644 --- a/programs/quarry-merge-mine/src/processor/withdraw.rs +++ b/programs/quarry-merge-mine/src/processor/withdraw.rs @@ -35,7 +35,7 @@ pub fn unstake_primary_miner(ctx: Context, amount: u64) -> P pool: pool.key(), mm: mm.key(), miner: ctx.accounts.stake.miner.key(), - owner: mm.owner.key(), + owner: mm.owner, amount, }); @@ -67,7 +67,7 @@ pub fn unstake_all_replica_miner(ctx: Context) -> ProgramRes pool: pool.key(), mm: mm.key(), miner: ctx.accounts.stake.miner.key(), - owner: mm.owner.key(), + owner: mm.owner, amount, }); diff --git a/programs/quarry-mine/Cargo.toml b/programs/quarry-mine/Cargo.toml index c7d2833b..8f404ad1 100644 --- a/programs/quarry-mine/Cargo.toml +++ b/programs/quarry-mine/Cargo.toml @@ -20,14 +20,14 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = ">=0.17.0" -anchor-spl = ">=0.17.0" +anchor-lang = ">=0.21" +anchor-spl = ">=0.21" num-traits = "0.2.14" quarry-mint-wrapper = { path = "../quarry-mint-wrapper", features = [ "cpi" ], version = "^1.11" } spl-math = { version = "0.1.0", features = ["no-entrypoint"] } -vipers = "1.5.9" +vipers = "^1.6" [dev-dependencies] proptest = { version = "1.0" } diff --git a/programs/quarry-mine/src/lib.rs b/programs/quarry-mine/src/lib.rs index 1ed71d89..5cd64f0a 100644 --- a/programs/quarry-mine/src/lib.rs +++ b/programs/quarry-mine/src/lib.rs @@ -18,8 +18,7 @@ use anchor_spl::token::Token; use anchor_spl::token::{self, Mint, TokenAccount, Transfer}; use payroll::Payroll; use std::cmp; -use vipers::unwrap_int; -use vipers::validate::Validate; +use vipers::prelude::*; pub mod account_validators; pub mod addresses; @@ -55,11 +54,11 @@ pub mod quarry_mine { /// Creates a new [Rewarder]. #[access_control(ctx.accounts.validate())] - pub fn new_rewarder(ctx: Context, bump: u8) -> ProgramResult { + pub fn new_rewarder(ctx: Context, _bump: u8) -> ProgramResult { let rewarder = &mut ctx.accounts.rewarder; rewarder.base = ctx.accounts.base.key(); - rewarder.bump = bump; + rewarder.bump = *unwrap_int!(ctx.bumps.get("rewarder")); rewarder.authority = ctx.accounts.authority.key(); rewarder.pending_authority = Pubkey::default(); @@ -159,14 +158,14 @@ pub mod quarry_mine { /// Creates a new [Quarry]. /// This may only be called by the [Rewarder]::authority. #[access_control(ctx.accounts.validate())] - pub fn create_quarry(ctx: Context, bump: u8) -> ProgramResult { + pub fn create_quarry(ctx: Context, _bump: u8) -> ProgramResult { let rewarder = &mut ctx.accounts.auth.rewarder; // Update rewarder's quarry stats let index = rewarder.num_quarries; rewarder.num_quarries = unwrap_int!(rewarder.num_quarries.checked_add(1)); let quarry = &mut ctx.accounts.quarry; - quarry.bump = bump; + quarry.bump = *unwrap_int!(ctx.bumps.get("quarry")); // Set quarry params quarry.index = index; @@ -248,14 +247,14 @@ pub mod quarry_mine { /// /// Anyone can call this; this is an associated account. #[access_control(ctx.accounts.validate())] - pub fn create_miner(ctx: Context, bump: u8) -> ProgramResult { + pub fn create_miner(ctx: Context, _bump: u8) -> ProgramResult { let quarry = &mut ctx.accounts.quarry; let index = quarry.num_miners; quarry.num_miners = unwrap_int!(quarry.num_miners.checked_add(1)); let miner = &mut ctx.accounts.miner; miner.authority = ctx.accounts.authority.key(); - miner.bump = bump; + miner.bump = *unwrap_int!(ctx.bumps.get("miner")); miner.quarry_key = ctx.accounts.quarry.key(); miner.token_vault_key = ctx.accounts.miner_vault.key(); miner.rewards_earned = 0; @@ -527,7 +526,6 @@ pub struct Miner { /// Accounts for [quarry_mine::new_rewarder]. #[derive(Accounts)] -#[instruction(bump: u8)] pub struct NewRewarder<'info> { /// Base. Arbitrary key. pub base: Signer<'info>, @@ -539,7 +537,7 @@ pub struct NewRewarder<'info> { b"Rewarder".as_ref(), base.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub rewarder: Account<'info, Rewarder>, @@ -631,7 +629,6 @@ pub struct SetAnnualRewards<'info> { /// Accounts for [quarry_mine::create_quarry]. #[derive(Accounts)] -#[instruction(bump: u8)] pub struct CreateQuarry<'info> { /// [Quarry]. #[account( @@ -641,7 +638,7 @@ pub struct CreateQuarry<'info> { auth.rewarder.key().to_bytes().as_ref(), token_mint.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub quarry: Account<'info, Quarry>, @@ -700,7 +697,6 @@ pub struct UpdateQuarryRewards<'info> { /// Accounts for [quarry_mine::create_miner]. #[derive(Accounts)] -#[instruction(bump: u8)] pub struct CreateMiner<'info> { /// Authority of the [Miner]. pub authority: Signer<'info>, @@ -713,7 +709,7 @@ pub struct CreateMiner<'info> { quarry.key().to_bytes().as_ref(), authority.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub miner: Account<'info, Miner>, diff --git a/programs/quarry-mint-wrapper/Cargo.toml b/programs/quarry-mint-wrapper/Cargo.toml index 92927cf4..c00b53b9 100644 --- a/programs/quarry-mint-wrapper/Cargo.toml +++ b/programs/quarry-mint-wrapper/Cargo.toml @@ -20,6 +20,6 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = ">=0.17.0" -anchor-spl = ">=0.17.0" -vipers = "1.5.9" +anchor-lang = ">=0.21" +anchor-spl = ">=0.21" +vipers = "^1.6" diff --git a/programs/quarry-mint-wrapper/src/lib.rs b/programs/quarry-mint-wrapper/src/lib.rs index b44afa7d..01135b8d 100644 --- a/programs/quarry-mint-wrapper/src/lib.rs +++ b/programs/quarry-mint-wrapper/src/lib.rs @@ -8,8 +8,7 @@ mod macros; use anchor_lang::prelude::*; use anchor_spl::token::Token; use anchor_spl::token::{self, Mint, TokenAccount}; -use vipers::unwrap_int; -use vipers::validate::Validate; +use vipers::prelude::*; mod account_validators; @@ -17,8 +16,6 @@ declare_id!("QMWoBmAyJLAsA1Lh9ugMTw2gciTihncciphzdNzdZYV"); #[program] pub mod quarry_mint_wrapper { - use vipers::invariant; - use super::*; /// -------------------------------- @@ -27,10 +24,10 @@ pub mod quarry_mint_wrapper { /// Creates a new [MintWrapper]. #[access_control(ctx.accounts.validate())] - pub fn new_wrapper(ctx: Context, bump: u8, hard_cap: u64) -> ProgramResult { + pub fn new_wrapper(ctx: Context, _bump: u8, hard_cap: u64) -> ProgramResult { let mint_wrapper = &mut ctx.accounts.mint_wrapper; mint_wrapper.base = ctx.accounts.base.key(); - mint_wrapper.bump = bump; + mint_wrapper.bump = *unwrap_int!(ctx.bumps.get("mint_wrapper")); mint_wrapper.hard_cap = hard_cap; mint_wrapper.admin = ctx.accounts.admin.key(); mint_wrapper.pending_admin = Pubkey::default(); @@ -86,12 +83,12 @@ pub mod quarry_mint_wrapper { /// Creates a new [Minter]. #[access_control(ctx.accounts.validate())] - pub fn new_minter(ctx: Context, bump: u8) -> ProgramResult { + pub fn new_minter(ctx: Context, _bump: u8) -> ProgramResult { let minter = &mut ctx.accounts.minter; minter.mint_wrapper = ctx.accounts.auth.mint_wrapper.key(); minter.minter_authority = ctx.accounts.minter_authority.key(); - minter.bump = bump; + minter.bump = *unwrap_int!(ctx.bumps.get("minter")); let index = ctx.accounts.auth.mint_wrapper.num_minters; minter.index = index; @@ -184,7 +181,6 @@ pub mod quarry_mint_wrapper { /// -------------------------------- #[derive(Accounts)] -#[instruction(bump: u8)] pub struct NewWrapper<'info> { /// Base account. pub base: Signer<'info>, @@ -195,7 +191,7 @@ pub struct NewWrapper<'info> { b"MintWrapper", base.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub mint_wrapper: Account<'info, MintWrapper>, @@ -219,7 +215,6 @@ pub struct NewWrapper<'info> { /// Adds a minter. #[derive(Accounts)] -#[instruction(bump: u8)] pub struct NewMinter<'info> { /// Owner of the [MintWrapper]. pub auth: OnlyAdmin<'info>, @@ -235,7 +230,7 @@ pub struct NewMinter<'info> { auth.mint_wrapper.key().to_bytes().as_ref(), minter_authority.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub minter: Account<'info, Minter>, diff --git a/programs/quarry-operator/Cargo.toml b/programs/quarry-operator/Cargo.toml index 32a661cc..2de4cbdf 100644 --- a/programs/quarry-operator/Cargo.toml +++ b/programs/quarry-operator/Cargo.toml @@ -20,7 +20,7 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = ">=0.17.0" -anchor-spl = ">=0.17.0" +anchor-lang = ">=0.21" +anchor-spl = ">=0.21" quarry-mine = { path = "../quarry-mine", version = "^1.11", features = ["cpi"] } -vipers = "1.5.9" +vipers = "^1.6" diff --git a/programs/quarry-operator/src/lib.rs b/programs/quarry-operator/src/lib.rs index f7b00893..a9083826 100644 --- a/programs/quarry-operator/src/lib.rs +++ b/programs/quarry-operator/src/lib.rs @@ -19,10 +19,10 @@ pub mod quarry_operator { /// Creates a new [Operator]. #[access_control(ctx.accounts.validate())] - pub fn create_operator(ctx: Context, bump: u8) -> ProgramResult { + pub fn create_operator(ctx: Context, _bump: u8) -> ProgramResult { let operator = &mut ctx.accounts.operator; operator.base = ctx.accounts.base.key(); - operator.bump = bump; + operator.bump = *unwrap_int!(ctx.bumps.get("operator")); operator.rewarder = ctx.accounts.rewarder.key(); operator.admin = ctx.accounts.admin.key(); @@ -225,7 +225,6 @@ pub struct Operator { /// Accounts for [crate::quarry_operator::create_operator]. #[derive(Accounts)] -#[instruction(bump: u8)] pub struct CreateOperator<'info> { /// Base key used to create the [Operator]. pub base: Signer<'info>, @@ -236,7 +235,7 @@ pub struct CreateOperator<'info> { b"Operator".as_ref(), base.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer )] pub operator: Account<'info, Operator>, diff --git a/programs/quarry-redeemer/Cargo.toml b/programs/quarry-redeemer/Cargo.toml index fe383683..713e2ecf 100644 --- a/programs/quarry-redeemer/Cargo.toml +++ b/programs/quarry-redeemer/Cargo.toml @@ -20,6 +20,6 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = ">=0.17.0" -anchor-spl = ">=0.17.0" -vipers = "1.5.9" +anchor-lang = ">=0.21" +anchor-spl = ">=0.21" +vipers = "^1.6" diff --git a/programs/quarry-redeemer/src/lib.rs b/programs/quarry-redeemer/src/lib.rs index 5504c2e3..0edceca0 100644 --- a/programs/quarry-redeemer/src/lib.rs +++ b/programs/quarry-redeemer/src/lib.rs @@ -22,11 +22,11 @@ pub mod quarry_redeemer { /// Creates a new [Redeemer]. #[access_control(ctx.accounts.validate())] - pub fn create_redeemer(ctx: Context, bump: u8) -> ProgramResult { + pub fn create_redeemer(ctx: Context, _bump: u8) -> ProgramResult { let redeemer = &mut ctx.accounts.redeemer; redeemer.iou_mint = ctx.accounts.iou_mint.key(); redeemer.redemption_mint = ctx.accounts.redemption_mint.key(); - redeemer.bump = bump; + redeemer.bump = *unwrap_int!(ctx.bumps.get("redeemer")); redeemer.total_tokens_redeemed = 0; Ok(()) @@ -94,7 +94,6 @@ pub struct Redeemer { // -------------------------------- #[derive(Accounts)] -#[instruction(bump: u8)] pub struct CreateRedeemer<'info> { /// Redeemer PDA. #[account( @@ -104,7 +103,7 @@ pub struct CreateRedeemer<'info> { iou_mint.to_account_info().key.as_ref(), redemption_mint.to_account_info().key.as_ref() ], - bump = bump, + bump, payer = payer )] pub redeemer: Account<'info, Redeemer>, diff --git a/programs/quarry-registry/Cargo.toml b/programs/quarry-registry/Cargo.toml index e7ba5d72..e11d15a6 100644 --- a/programs/quarry-registry/Cargo.toml +++ b/programs/quarry-registry/Cargo.toml @@ -20,6 +20,6 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = ">=0.17.0" +anchor-lang = ">=0.21" quarry-mine = { version = "^1.11", path = "../quarry-mine", features = ["cpi"] } -vipers = "1.5.9" +vipers = "^1.6" diff --git a/programs/quarry-registry/src/lib.rs b/programs/quarry-registry/src/lib.rs index 31dbb1e9..11139061 100644 --- a/programs/quarry-registry/src/lib.rs +++ b/programs/quarry-registry/src/lib.rs @@ -5,14 +5,15 @@ use anchor_lang::prelude::*; use quarry_mine::Quarry; use quarry_mine::Rewarder; +use vipers::prelude::*; mod account_validators; declare_id!("QREGBnEj9Sa5uR91AV8u3FxThgP5ZCvdZUW2bHAkfNc"); +/// Registry to help frontends quickly locate all active quarries. #[program] pub mod quarry_registry { - use vipers::validate::Validate; use super::*; @@ -22,10 +23,10 @@ pub mod quarry_registry { /// /// * `max_quarries` - The maximum number of quarries that can be held in the registry. /// * `bump` - Bump seed. - pub fn new_registry(ctx: Context, max_quarries: u16, bump: u8) -> ProgramResult { + pub fn new_registry(ctx: Context, max_quarries: u16, _bump: u8) -> ProgramResult { ctx.accounts.validate()?; let registry = &mut ctx.accounts.registry; - registry.bump = bump; + registry.bump = *unwrap_int!(ctx.bumps.get("registry")); registry.rewarder = ctx.accounts.rewarder.key(); registry .tokens @@ -45,7 +46,7 @@ pub mod quarry_registry { /// Accounts for [quarry_registry::new_registry]. #[derive(Accounts)] -#[instruction(max_quarries: u16, bump: u8)] +#[instruction(max_quarries: u16)] pub struct NewRegistry<'info> { /// [Rewarder]. pub rewarder: Account<'info, Rewarder>, @@ -57,7 +58,7 @@ pub struct NewRegistry<'info> { b"QuarryRegistry".as_ref(), rewarder.key().to_bytes().as_ref() ], - bump = bump, + bump, payer = payer, space = (8 + 1 + 32 + 32 * max_quarries + 100) as usize )] diff --git a/yarn.lock b/yarn.lock index ddb1b88b..54ba36ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,20 +30,20 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.0.5": - version: 1.0.5 - resolution: "@eslint/eslintrc@npm:1.0.5" +"@eslint/eslintrc@npm:^1.1.0": + version: 1.1.0 + resolution: "@eslint/eslintrc@npm:1.1.0" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.2.0 + espree: ^9.3.1 globals: ^13.9.0 ignore: ^4.0.6 import-fresh: ^3.2.1 js-yaml: ^4.1.0 minimatch: ^3.0.4 strip-json-comments: ^3.1.1 - checksum: b35b50d7b65bd8acd92a05b6fb15ac62c0cefa40dfef0324ca5bf8632bf3679bab6e173c53b3ad1e1d837701cecdbd9c144b35f46588cdf4e046a9caa272488d + checksum: 784aa2157e2808b52bbbaf1d1cfca9a6ba0b2faaa3696eb7a1229d4b357400fbd8a6aa09a16e7ae0868ea075d3a8f365cf5928b6d05a1df47f40a1167423a4fa languageName: node linkType: hard @@ -146,17 +146,18 @@ __metadata: languageName: node linkType: hard -"@project-serum/anchor@npm:^0.20.1": - version: 0.20.1 - resolution: "@project-serum/anchor@npm:0.20.1" +"@project-serum/anchor@npm:^0.21.0": + version: 0.21.0 + resolution: "@project-serum/anchor@npm:0.21.0" dependencies: - "@project-serum/borsh": ^0.2.2 + "@project-serum/borsh": ^0.2.4 "@solana/web3.js": ^1.17.0 base64-js: ^1.5.1 bn.js: ^5.1.2 bs58: ^4.0.1 buffer-layout: ^1.2.2 camelcase: ^5.3.1 + cross-fetch: ^3.1.5 crypto-hash: ^1.3.0 eventemitter3: ^4.0.7 find: ^0.3.0 @@ -164,19 +165,19 @@ __metadata: pako: ^2.0.3 snake-case: ^3.0.4 toml: ^3.0.0 - checksum: b5468690df330d72e4cc5461faf3afd43c0383da004d8dda46ba11dbb092c1c754a694e8dd3d9094617040417d38ec1cb486113cfeb4465ce8ff3f184202238f + checksum: f7071ada1920c1e9c3e7c0e58c578e299f5de54d7de192977fdc83002a1089d8193ef6391eeca991575276a487367ae215587fd1638043fb9b996ceae12b4073 languageName: node linkType: hard -"@project-serum/borsh@npm:^0.2.2": - version: 0.2.2 - resolution: "@project-serum/borsh@npm:0.2.2" +"@project-serum/borsh@npm:^0.2.4": + version: 0.2.5 + resolution: "@project-serum/borsh@npm:0.2.5" dependencies: bn.js: ^5.1.2 buffer-layout: ^1.2.0 peerDependencies: "@solana/web3.js": ^1.2.0 - checksum: f6ffd5f21cad0cb8a84901dcf21342af73a4b48e2121ba9fd3e1f84b400e66eacb3a7e80ae350a0592f728dea99604c50084ab1455ddf4f3a9d28c8a38bbc188 + checksum: 7bdc25e8d6cca13166869c8f09db2fabf103e8dc4861f09f277bb0080dfaaed9f50d4b5e2579bc2c975db263faaa92539d5ddb84a2f4d8cf09f3c6e6bddf79e1 languageName: node linkType: hard @@ -184,32 +185,32 @@ __metadata: version: 0.0.0-use.local resolution: "@quarryprotocol/quarry-sdk@workspace:." dependencies: - "@project-serum/anchor": ^0.20.1 + "@project-serum/anchor": ^0.21.0 "@rushstack/eslint-patch": ^1.1.0 - "@saberhq/anchor-contrib": ^1.12.32 - "@saberhq/chai-solana": ^1.12.32 - "@saberhq/eslint-config": ^1.12.32 - "@saberhq/solana-contrib": ^1.12.32 - "@saberhq/token-utils": ^1.12.32 - "@saberhq/tsconfig": ^1.12.32 - "@solana/web3.js": ^1.31.0 + "@saberhq/anchor-contrib": ^1.12.44 + "@saberhq/chai-solana": ^1.12.44 + "@saberhq/eslint-config": ^1.12.44 + "@saberhq/solana-contrib": ^1.12.44 + "@saberhq/token-utils": ^1.12.44 + "@saberhq/tsconfig": ^1.12.44 + "@solana/web3.js": ^1.34.0 "@types/bn.js": ^5.1.0 "@types/chai": ^4.3.0 "@types/mocha": ^9.1.0 - "@types/node": ^17.0.10 - "@types/prettier": ^2.4.3 + "@types/node": ^17.0.18 + "@types/prettier": ^2.4.4 bn.js: ^5.2.0 - chai: ^4.3.4 - eslint: ^8.7.0 + chai: =4.3.4 + eslint: ^8.9.0 eslint-import-resolver-node: ^0.3.6 eslint-plugin-import: ^2.25.4 husky: ^7.0.4 jsbi: ^4.1.0 - lint-staged: ^12.2.2 - mocha: ^9.1.4 + lint-staged: ^12.3.4 + mocha: ^9.2.0 prettier: ^2.5.1 tiny-invariant: ^1.2.0 - ts-node: ^10.4.0 + ts-node: ^10.5.0 tslib: ^2.3.1 typedoc: ^0.22.11 typescript: ^4.5.5 @@ -231,53 +232,53 @@ __metadata: languageName: node linkType: hard -"@saberhq/anchor-contrib@npm:^1.12.32": - version: 1.12.32 - resolution: "@saberhq/anchor-contrib@npm:1.12.32" +"@saberhq/anchor-contrib@npm:^1.12.44": + version: 1.12.44 + resolution: "@saberhq/anchor-contrib@npm:1.12.44" dependencies: - "@saberhq/solana-contrib": ^1.12.32 + "@saberhq/solana-contrib": ^1.12.44 eventemitter3: ^4.0.7 lodash.camelcase: ^4.3.0 lodash.mapvalues: ^4.6.0 tslib: ^2.3.1 peerDependencies: - "@project-serum/anchor": ^0.17 || ^0.18 || ^0.19 || ^0.20 + "@project-serum/anchor": ^0.21 "@solana/web3.js": ">=1.29.2" bn.js: ^4 || ^5 - checksum: 41b2a1f7a817c2dde68e5a0301fb5bdb5ffca9b154d0e8897c39052aef778e55ede4cda7d6dbbfe762d43d59f461f76a1ad0b4819cf33d7dfeec91c671dc9c12 + checksum: b340988f2b7af27572fed1c66aabf758062bc05d668865bd19a560b776ed275a40f56179847d1036701ab3a56f67f617e8d57a2c24a044b9067e103db91754b7 languageName: node linkType: hard -"@saberhq/chai-solana@npm:^1.12.32": - version: 1.12.32 - resolution: "@saberhq/chai-solana@npm:1.12.32" +"@saberhq/chai-solana@npm:^1.12.44": + version: 1.12.44 + resolution: "@saberhq/chai-solana@npm:1.12.44" dependencies: - "@saberhq/anchor-contrib": ^1.12.32 - "@saberhq/solana-contrib": ^1.12.32 - "@saberhq/token-utils": ^1.12.32 + "@saberhq/anchor-contrib": ^1.12.44 + "@saberhq/solana-contrib": ^1.12.44 + "@saberhq/token-utils": ^1.12.44 "@types/chai": ^4.3.0 - "@types/chai-as-promised": ^7.1.4 + "@types/chai-as-promised": ^7.1.5 "@types/promise-retry": ^1.1.3 - chai: ^4.3.4 + chai: =4.3.4 chai-as-promised: ^7.1.1 - chai-bn: ^0.3.0 + chai-bn: ^0.3.1 colors: ^1.4.0 tslib: ^2.3.1 peerDependencies: - "@project-serum/anchor": ^0.17 || ^0.18 || ^0.19 + "@project-serum/anchor": ">=0.17" "@solana/web3.js": ^1.29.2 bn.js: ^5.2.0 jsbi: "*" - checksum: 16967ca1c1345ab376e9a868fcccc33ecff3eca117e23267ebe5aec4a4496ab5671dca5ff78ab9e0f3db44cecb86c8246f893486b633302aa8e2f0aaf476e978 + checksum: dbdbfa863723bcc787ba3b49527887c1de29441279b8e6c506efd4c55bfc7e3dedf906ef0177605b3fcbb614823347bd4572c66481526a4792ffcd70907d9037 languageName: node linkType: hard -"@saberhq/eslint-config@npm:^1.12.32": - version: 1.12.32 - resolution: "@saberhq/eslint-config@npm:1.12.32" +"@saberhq/eslint-config@npm:^1.12.44": + version: 1.12.44 + resolution: "@saberhq/eslint-config@npm:1.12.44" dependencies: - "@typescript-eslint/eslint-plugin": ^5.10.0 - "@typescript-eslint/parser": ^5.10.0 + "@typescript-eslint/eslint-plugin": ^5.11.0 + "@typescript-eslint/parser": ^5.11.0 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.6 eslint-plugin-import: ^2.25.4 @@ -287,13 +288,13 @@ __metadata: prettier: ^2.5.1 peerDependencies: eslint: ">=7" - checksum: 352b44fd56680ac8ad190fd1bfbed9d90fd832b700586559ace054b78e6b7d84510debd179cae1493fd5ac868a14cb7fac291e43935dc775788c9fb611794e77 + checksum: 4baf70a6116a9f914dc42a8928bb42848f1c2748fd5cce5464aa34c18c2b427c5209d2e81fd25c98656ca048adafd8a9d4d3093ed33fbd3050685d0d7ac080ce languageName: node linkType: hard -"@saberhq/solana-contrib@npm:^1.12.32": - version: 1.12.32 - resolution: "@saberhq/solana-contrib@npm:1.12.32" +"@saberhq/solana-contrib@npm:^1.12.44": + version: 1.12.44 + resolution: "@saberhq/solana-contrib@npm:1.12.44" dependencies: "@types/promise-retry": ^1.1.3 "@types/retry": ^0.12.1 @@ -304,15 +305,15 @@ __metadata: peerDependencies: "@solana/web3.js": ^1.29.2 bn.js: ^4 || ^5 - checksum: 7960a9d375aa10d1577b5065ac1c95da364beb62d0898627243063bc40b597fa4bdf6d58b014614dfff93bd2a1b942b95f854e757b9b22ef441f70a39d509288 + checksum: c8e8d5c594b24d22e98203c8c96df710f00c35716a486759a6162cfc86f09aebd104952acff3fce85588cee6d306d2c679acf648d570f26ca58f1e3eeff9def5 languageName: node linkType: hard -"@saberhq/token-utils@npm:^1.12.32": - version: 1.12.32 - resolution: "@saberhq/token-utils@npm:1.12.32" +"@saberhq/token-utils@npm:^1.12.44": + version: 1.12.44 + resolution: "@saberhq/token-utils@npm:1.12.44" dependencies: - "@saberhq/solana-contrib": ^1.12.32 + "@saberhq/solana-contrib": ^1.12.44 "@solana/buffer-layout": ^4.0.0 "@solana/spl-token": ^0.1.8 "@ubeswap/token-math": ^4.4.1 @@ -322,14 +323,14 @@ __metadata: "@solana/web3.js": ^1.29.2 bn.js: ^4 || ^5 jsbi: ^3 || ^4 - checksum: ff2515ff85b4e831a032e661e12078d009f16aa4bb31af501ca4767db65fe579f3a2faf02d0814af1143bf28b6206d86f3ee421f7611f7458e8ff054b3808ec5 + checksum: 9e26fe4005890c77fcee9c7f78601fff49d308800e266ac73c7d9135dd8fb93502cb5a4edaa3f8ca9f8cb277f415e27644183cfdca9f7328b75438c934173289 languageName: node linkType: hard -"@saberhq/tsconfig@npm:^1.12.32": - version: 1.12.32 - resolution: "@saberhq/tsconfig@npm:1.12.32" - checksum: 3fa275ea95fb3b7102d77d7812ae88f3d1622d6e4c68e8b629d1cc5383c6468606d032cdf99d556669d68e4028f77d589de878bd60d716a1f48acbeaebe559e2 +"@saberhq/tsconfig@npm:^1.12.44": + version: 1.12.44 + resolution: "@saberhq/tsconfig@npm:1.12.44" + checksum: 33d83dd0afd7d27e1daf3d80364ac65c00088ea91d5edac9e0458ef897ae9dce43f440c272a20e8b98fe856a2697f897db2f2b880395770927d3880f6b71d6ab languageName: node linkType: hard @@ -387,9 +388,9 @@ __metadata: languageName: node linkType: hard -"@solana/web3.js@npm:^1.31.0": - version: 1.31.0 - resolution: "@solana/web3.js@npm:1.31.0" +"@solana/web3.js@npm:^1.34.0": + version: 1.34.0 + resolution: "@solana/web3.js@npm:1.34.0" dependencies: "@babel/runtime": ^7.12.5 "@ethersproject/sha2": ^5.5.0 @@ -405,7 +406,7 @@ __metadata: secp256k1: ^4.0.2 superstruct: ^0.14.2 tweetnacl: ^1.0.0 - checksum: 471cd682772a056e155cc209de2d34cec8552da8cba02ccb9f80d840a39aad3877d549b512f29a91fea5d5d09c56f3cf4d8af5029a0e2dfeea82f705e08a4244 + checksum: b0dce23c4de13e72e16d58e374dab025bf03d8c9b1180edcf56b93e730ea3fb190acbeea97558446586905e5a811d20ef7841979692864f195f69034a6428b57 languageName: node linkType: hard @@ -453,12 +454,12 @@ __metadata: languageName: node linkType: hard -"@types/chai-as-promised@npm:^7.1.4": - version: 7.1.4 - resolution: "@types/chai-as-promised@npm:7.1.4" +"@types/chai-as-promised@npm:^7.1.5": + version: 7.1.5 + resolution: "@types/chai-as-promised@npm:7.1.5" dependencies: "@types/chai": "*" - checksum: bb974e77e0357fcc9a01f4b46eb1d3d6a40621a479654fa17539890cd59635faf9b860b8c3851f638d1e239404b1dc8e7ab1305f26dec43e19cce6796e01fe48 + checksum: 7c1345c6e32513d52d8e562ec173c23161648d6b792046525f18803a9932d7b3ad3dca8f0181e3c529ec42b106099f174e34edeb184d61dc93e32c98b5132fd4 languageName: node linkType: hard @@ -538,17 +539,17 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^17.0.10": - version: 17.0.10 - resolution: "@types/node@npm:17.0.10" - checksum: 979e83d642a2b4f18fa1a4233f884822c05abc7acd0836024aa964187f8446432b21f7913e72fe2b3927c4a811c27a0b6cd60ac7c4ac6a6762cfbab70782aa6a +"@types/node@npm:^17.0.18": + version: 17.0.18 + resolution: "@types/node@npm:17.0.18" + checksum: 6c4edfc2b3ba2342a9c3d56e934c5245948ab752f4dc04bd6790b9603e6ebc53bc4f5befc3662e207f7dba2ddd17ccf657f915e319ea7cdd4f77b851079d1611 languageName: node linkType: hard -"@types/prettier@npm:^2.4.3": - version: 2.4.3 - resolution: "@types/prettier@npm:2.4.3" - checksum: b240434daabac54700c862b0bb52a83fec396e0e9c847447119ba41fd8404d79aadfa174e6306fb094b29efadac586344b7606c3a71c286b71755ab2579d54df +"@types/prettier@npm:^2.4.4": + version: 2.4.4 + resolution: "@types/prettier@npm:2.4.4" + checksum: 2c2cc57efd49c7d8907415a72f96c84a6dd8696dd3bf8aa4ca3a667427bebf71cbfbc912673624bdfc935d272d1c008c639cf155f6449315990a4dc110f0d216 languageName: node linkType: hard @@ -591,13 +592,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.10.0" +"@typescript-eslint/eslint-plugin@npm:^5.11.0": + version: 5.12.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.12.0" dependencies: - "@typescript-eslint/scope-manager": 5.10.0 - "@typescript-eslint/type-utils": 5.10.0 - "@typescript-eslint/utils": 5.10.0 + "@typescript-eslint/scope-manager": 5.12.0 + "@typescript-eslint/type-utils": 5.12.0 + "@typescript-eslint/utils": 5.12.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -610,42 +611,42 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 675b79c519e5287a184720317d309c55e308c19eb52f1f062e3851168a9b6e4768363bd31bdcbf897c080f1c21cb39736cd522408620818dd9ce483d1573bf89 + checksum: ac7074b51456748ef8770d82f5b4e691e1b93bb1353b448bb1b43db5b5a9722a6a012dc1dc0a3b35ab0c0ca7c1b5412f535ad992115132ed84ed6f4179778d37 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/parser@npm:5.10.0" +"@typescript-eslint/parser@npm:^5.11.0": + version: 5.12.0 + resolution: "@typescript-eslint/parser@npm:5.12.0" dependencies: - "@typescript-eslint/scope-manager": 5.10.0 - "@typescript-eslint/types": 5.10.0 - "@typescript-eslint/typescript-estree": 5.10.0 + "@typescript-eslint/scope-manager": 5.12.0 + "@typescript-eslint/types": 5.12.0 + "@typescript-eslint/typescript-estree": 5.12.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 127aaa807659bbd4b2b274263d1ef821b8d0746f0a18ae55466718d070ba43c94e5575849954271f0d6582d2114c96a0ff6645189015a6522c4d8682d4d20a1b + checksum: 0453c14d967ebba4ebe0d763882b7a1258f23a710d127f53196d360b78722d880cc8c0299feb52ecc4e10600834c22559bf543211249d878efad864f7ec856bc languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/scope-manager@npm:5.10.0" +"@typescript-eslint/scope-manager@npm:5.12.0": + version: 5.12.0 + resolution: "@typescript-eslint/scope-manager@npm:5.12.0" dependencies: - "@typescript-eslint/types": 5.10.0 - "@typescript-eslint/visitor-keys": 5.10.0 - checksum: 934cbb4a03d383537fda05b926eeba0597d63ef1c65328d55abe20a060b6559ba2017825e167dc2093a23d675c37aaa2056dec1747b17f0fbca419fba68f8d0f + "@typescript-eslint/types": 5.12.0 + "@typescript-eslint/visitor-keys": 5.12.0 + checksum: 87cc4e8ab3b495293e51685566cafca6f217c7328fc1210e4a9c3a89e864c5e3a04ddde11708e07820185fd158cb448980607a93fd658fa2089c152f27a847d0 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/type-utils@npm:5.10.0" +"@typescript-eslint/type-utils@npm:5.12.0": + version: 5.12.0 + resolution: "@typescript-eslint/type-utils@npm:5.12.0" dependencies: - "@typescript-eslint/utils": 5.10.0 + "@typescript-eslint/utils": 5.12.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -653,23 +654,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: aa6bf7fcac7aa956ccf938b8d93d1ecd8956ea1f5690046967fe69f0bd2592cd8e29a992f5a252990b8e13c1e09c3f9efb6375d0551f4b4c08c69cd662be2e73 + checksum: 90390603319441493b62611730db78f8a732e32a5d9097d1e9c6581da6caeb71cc08a3ed6c716f2fc490b153f956c9a2471d9fbe97c22214ca86f58511c7581a languageName: node linkType: hard -"@typescript-eslint/types@npm:5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/types@npm:5.10.0" - checksum: 269988cbb1772616ade3af5f70a3c4d7871c90fa04fbc4ed8b1148ec0a6853f2d51609fe51aa797486bfe9b704a4c4a3410e6225470db18850d3469a7db5a63b +"@typescript-eslint/types@npm:5.12.0": + version: 5.12.0 + resolution: "@typescript-eslint/types@npm:5.12.0" + checksum: f5e7f8270cb0f9f18886bf00f8f1fd589b793f4c05dc2de53cc826beb969161e19ffc10f51237402fb9f3d24f5aaf3bb41b1d8da70e115ec3ff11e79b3471988 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.10.0" +"@typescript-eslint/typescript-estree@npm:5.12.0": + version: 5.12.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.12.0" dependencies: - "@typescript-eslint/types": 5.10.0 - "@typescript-eslint/visitor-keys": 5.10.0 + "@typescript-eslint/types": 5.12.0 + "@typescript-eslint/visitor-keys": 5.12.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -678,33 +679,33 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 1097fd5a96857a285020a2c5ee7abb7e5984771ac44b61b5d500724dc3ff88030e4e5340fcd872779b1307fbb224240d6543babb901559675efcab20a2dc70dc + checksum: 6a8e852c210b20370eb564f3beb245c425e65a4de3e78a1e2f278a241b6acf72ba43b10767df18fc1654b529453529f721fa673569406ace4011712c9c837900 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/utils@npm:5.10.0" +"@typescript-eslint/utils@npm:5.12.0": + version: 5.12.0 + resolution: "@typescript-eslint/utils@npm:5.12.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.10.0 - "@typescript-eslint/types": 5.10.0 - "@typescript-eslint/typescript-estree": 5.10.0 + "@typescript-eslint/scope-manager": 5.12.0 + "@typescript-eslint/types": 5.12.0 + "@typescript-eslint/typescript-estree": 5.12.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 9c53b0e47b922210c5dc0c7ac045206062ad4f21f9bf03ef091894d3fcfe9fde7e72c70a97b5073a54a42b7628943dd8dcef00bd3285ebd63039909888dea84a + checksum: 34c394db0510be78c5cbb8928c9eb81405a117dd9e5903a149e4f3c20218dcda89a29e5012984d07c8ce9e5c7f5d7c38f5c3061558028f3f518ac98bbeb9a006 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.10.0": - version: 5.10.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.10.0" +"@typescript-eslint/visitor-keys@npm:5.12.0": + version: 5.12.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.12.0" dependencies: - "@typescript-eslint/types": 5.10.0 + "@typescript-eslint/types": 5.12.0 eslint-visitor-keys: ^3.0.0 - checksum: 9b99c6be709c59be6a1705f0244aad732a5e523af8b8eb87e5dd6a3d27a027329bf2617aa6f15a36f79bce4215ac09277e144737a0d8d674e93b073b36fd963e + checksum: c3774f542aae801926edf86fe6cab534c4cdac914b035730912443ed53fcc701b0f0e7b1a0d5fc959484637c55f63409fc43df5508c334e202d66d4654484d11 languageName: node linkType: hard @@ -766,7 +767,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.6.0": +"acorn@npm:^8.4.1": version: 8.6.0 resolution: "acorn@npm:8.6.0" bin: @@ -1175,17 +1176,17 @@ __metadata: languageName: node linkType: hard -"chai-bn@npm:^0.3.0": - version: 0.3.0 - resolution: "chai-bn@npm:0.3.0" +"chai-bn@npm:^0.3.1": + version: 0.3.1 + resolution: "chai-bn@npm:0.3.1" peerDependencies: bn.js: ^5.0.0 chai: ^4.0.0 - checksum: 2a5f3d48e1f068c1e8a1cbd8f64e7f9183a490ea62347f1ea73949cca0f556c499945bfd74f5a82ba9e93d144fca422200adabc0acd83392fbf46de3b652f2f2 + checksum: 316a82b98df2a1e66edeee0e835fd7b418c3b5e1794b69264eb76be65d1ecea1f3a9ce2f1f94ec7f0f6964c579c2986999d7bcab98d30f9160ec753b4fdfd692 languageName: node linkType: hard -"chai@npm:^4.3.4": +"chai@npm:=4.3.4": version: 4.3.4 resolution: "chai@npm:4.3.4" dependencies: @@ -1216,9 +1217,9 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:3.5.2": - version: 3.5.2 - resolution: "chokidar@npm:3.5.2" +"chokidar@npm:3.5.3": + version: 3.5.3 + resolution: "chokidar@npm:3.5.3" dependencies: anymatch: ~3.1.2 braces: ~3.0.2 @@ -1231,7 +1232,7 @@ __metadata: dependenciesMeta: fsevents: optional: true - checksum: d1fda32fcd67d9f6170a8468ad2630a3c6194949c9db3f6a91b16478c328b2800f433fb5d2592511b6cb145a47c013ea1cce60b432b1a001ae3ee978a8bffc2d + checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c languageName: node linkType: hard @@ -1384,6 +1385,15 @@ __metadata: languageName: node linkType: hard +"cross-fetch@npm:^3.1.5": + version: 3.1.5 + resolution: "cross-fetch@npm:3.1.5" + dependencies: + node-fetch: 2.6.7 + checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb + languageName: node + linkType: hard + "cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" @@ -1402,7 +1412,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:4.3.2, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2": version: 4.3.2 resolution: "debug@npm:4.3.2" dependencies: @@ -1414,6 +1424,18 @@ __metadata: languageName: node linkType: hard +"debug@npm:4.3.3, debug@npm:^4.3.3": + version: 4.3.3 + resolution: "debug@npm:4.3.3" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 14472d56fe4a94dbcfaa6dbed2dd3849f1d72ba78104a1a328047bb564643ca49df0224c3a17fa63533fd11dd3d4c8636cd861191232a2c6735af00cc2d4de16 + languageName: node + linkType: hard + "debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" @@ -1432,18 +1454,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.3.3": - version: 4.3.3 - resolution: "debug@npm:4.3.3" - dependencies: - ms: 2.1.2 - peerDependenciesMeta: - supports-color: - optional: true - checksum: 14472d56fe4a94dbcfaa6dbed2dd3849f1d72ba78104a1a328047bb564643ca49df0224c3a17fa63533fd11dd3d4c8636cd861191232a2c6735af00cc2d4de16 - languageName: node - linkType: hard - "decamelize@npm:^4.0.0": version: 4.0.0 resolution: "decamelize@npm:4.0.0" @@ -1793,13 +1803,13 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^7.1.0": - version: 7.1.0 - resolution: "eslint-scope@npm:7.1.0" +"eslint-scope@npm:^7.1.1": + version: 7.1.1 + resolution: "eslint-scope@npm:7.1.1" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: 2070470a0725438ed47075b2574a4c03cf59aa32648da8cff9e3548c84f6b0079cfdb9ee1dd7ab0bfe97011f64b2af5bfd4b69cf14a1292130dec661eec7914a + checksum: 9f6e974ab2db641ca8ab13508c405b7b859e72afe9f254e8131ff154d2f40c99ad4545ce326fd9fde3212ff29707102562a4834f1c48617b35d98c71a97fbf3e languageName: node linkType: hard @@ -1821,25 +1831,25 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.1.0": +"eslint-visitor-keys@npm:^3.0.0": version: 3.1.0 resolution: "eslint-visitor-keys@npm:3.1.0" checksum: fd2d613bb315bc549068ca97771d868437fb60c8f13ef8d6d54669773ff53f814b759fa9e57966f15e4c50a5f5e11c6ba47060b8f201f9776311f6c5d5c11b70 languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.2.0": - version: 3.2.0 - resolution: "eslint-visitor-keys@npm:3.2.0" - checksum: fdadbb26f9e6417d3db7ad4f00bb0d573b6031c32fa72e8cdae32d038223faaeddff2ee443c90cb489bf774e75bff765c00912b8f9106d65e4f202ccd78c1b18 +"eslint-visitor-keys@npm:^3.3.0": + version: 3.3.0 + resolution: "eslint-visitor-keys@npm:3.3.0" + checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808 languageName: node linkType: hard -"eslint@npm:^8.7.0": - version: 8.7.0 - resolution: "eslint@npm:8.7.0" +"eslint@npm:^8.9.0": + version: 8.9.0 + resolution: "eslint@npm:8.9.0" dependencies: - "@eslint/eslintrc": ^1.0.5 + "@eslint/eslintrc": ^1.1.0 "@humanwhocodes/config-array": ^0.9.2 ajv: ^6.10.0 chalk: ^4.0.0 @@ -1847,10 +1857,10 @@ __metadata: debug: ^4.3.2 doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 - eslint-scope: ^7.1.0 + eslint-scope: ^7.1.1 eslint-utils: ^3.0.0 - eslint-visitor-keys: ^3.2.0 - espree: ^9.3.0 + eslint-visitor-keys: ^3.3.0 + espree: ^9.3.1 esquery: ^1.4.0 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -1876,29 +1886,18 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 1c80375a48b0fe3ccae3c6354323e4f0e92e970f23abc5b9705b90b7aef514b69ebd0a63e74962d30789986c91fa41c0e25cd2f98f19e9e2a2d36aafdfc9ccc9 - languageName: node - linkType: hard - -"espree@npm:^9.2.0": - version: 9.2.0 - resolution: "espree@npm:9.2.0" - dependencies: - acorn: ^8.6.0 - acorn-jsx: ^5.3.1 - eslint-visitor-keys: ^3.1.0 - checksum: ae533a058036e3efeeac43a0ee39c74ab347e2a73bbe2946fba33cc0d84aca657e675bc317ed9afd95338f79d5d5a862afec2f717d2539ae13fa9f1638371761 + checksum: 8efecdb9752ee6cb4d2787a14e00cbeab29562ed95dd71c6f3f8ac410426a067d5aa659416d2290e46ca44bc5607e6a6e6c62f814694d8639f80666f522022a7 languageName: node linkType: hard -"espree@npm:^9.3.0": - version: 9.3.0 - resolution: "espree@npm:9.3.0" +"espree@npm:^9.3.1": + version: 9.3.1 + resolution: "espree@npm:9.3.1" dependencies: acorn: ^8.7.0 acorn-jsx: ^5.3.1 - eslint-visitor-keys: ^3.1.0 - checksum: c0f1885c4eab652f9be08eb9228cea0df046b559b29d4aed8d6590ea9bd60177d4cb245d204a6f737a79a096861bb4ab8e480aeb8c1dbafef5beec1157353ce4 + eslint-visitor-keys: ^3.3.0 + checksum: d7161db30b65427e0799383699ac4c441533a38faee005153694b68b933ba7a24666680edfc490fa77e3a84a22dbd955768034a6f811af5049774eead83063a5 languageName: node linkType: hard @@ -2219,9 +2218,9 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.7, glob@npm:^7.1.3": - version: 7.1.7 - resolution: "glob@npm:7.1.7" +"glob@npm:7.2.0, glob@npm:^7.1.4, glob@npm:^7.2.0": + version: 7.2.0 + resolution: "glob@npm:7.2.0" dependencies: fs.realpath: ^1.0.0 inflight: ^1.0.4 @@ -2229,13 +2228,13 @@ __metadata: minimatch: ^3.0.4 once: ^1.3.0 path-is-absolute: ^1.0.0 - checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 + checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134 languageName: node linkType: hard -"glob@npm:^7.1.4, glob@npm:^7.2.0": - version: 7.2.0 - resolution: "glob@npm:7.2.0" +"glob@npm:^7.1.3": + version: 7.1.7 + resolution: "glob@npm:7.1.7" dependencies: fs.realpath: ^1.0.0 inflight: ^1.0.4 @@ -2243,7 +2242,7 @@ __metadata: minimatch: ^3.0.4 once: ^1.3.0 path-is-absolute: ^1.0.0 - checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134 + checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 languageName: node linkType: hard @@ -2871,9 +2870,9 @@ __metadata: languageName: node linkType: hard -"lint-staged@npm:^12.2.2": - version: 12.2.2 - resolution: "lint-staged@npm:12.2.2" +"lint-staged@npm:^12.3.4": + version: 12.3.4 + resolution: "lint-staged@npm:12.3.4" dependencies: cli-truncate: ^3.1.0 colorette: ^2.0.16 @@ -2881,29 +2880,29 @@ __metadata: debug: ^4.3.3 execa: ^5.1.1 lilconfig: 2.0.4 - listr2: ^3.13.5 + listr2: ^4.0.1 micromatch: ^4.0.4 normalize-path: ^3.0.0 - object-inspect: ^1.11.1 + object-inspect: ^1.12.0 string-argv: ^0.3.1 supports-color: ^9.2.1 yaml: ^1.10.2 bin: lint-staged: bin/lint-staged.js - checksum: 27db9c9e88d2c0835c16679de9a98a0909ea09b90f5be3179c7d0ae21e85547e7776349df9654e61c71833d18a0162833cd726df3a70022ba10708ccec08b17d + checksum: 4e0b4b9da4183a0daeab35d41e4d243fb1270a39db997efa0c3745fa148a7a4b8b723a51cb757595fc8bb118796ca1465e67aede72f25e9ea48165aec36cec3b languageName: node linkType: hard -"listr2@npm:^3.13.5": - version: 3.13.5 - resolution: "listr2@npm:3.13.5" +"listr2@npm:^4.0.1": + version: 4.0.4 + resolution: "listr2@npm:4.0.4" dependencies: cli-truncate: ^2.1.0 colorette: ^2.0.16 log-update: ^4.0.0 p-map: ^4.0.0 rfdc: ^1.3.0 - rxjs: ^7.4.0 + rxjs: ^7.5.4 through: ^2.3.8 wrap-ansi: ^7.0.0 peerDependencies: @@ -2911,7 +2910,7 @@ __metadata: peerDependenciesMeta: enquirer: optional: true - checksum: c20203060b2deb441d547d753b63fec53d7fe1455f2bce60926ce941a730413455178038abe37f2cdbf490002778d284585d247c39a30cc3c5b08b7151d85386 + checksum: 1e6e44a3a0337f47d0a1bc90712b0001129d3ca3fae56dc5b834da556b634862a211d8c638528600daf1c1899a3f2366f822ecb03dba5327ff2c017578815e61 languageName: node linkType: hard @@ -3188,38 +3187,38 @@ __metadata: languageName: node linkType: hard -"mocha@npm:^9.1.4": - version: 9.1.4 - resolution: "mocha@npm:9.1.4" +"mocha@npm:^9.2.0": + version: 9.2.0 + resolution: "mocha@npm:9.2.0" dependencies: "@ungap/promise-all-settled": 1.1.2 ansi-colors: 4.1.1 browser-stdout: 1.3.1 - chokidar: 3.5.2 - debug: 4.3.2 + chokidar: 3.5.3 + debug: 4.3.3 diff: 5.0.0 escape-string-regexp: 4.0.0 find-up: 5.0.0 - glob: 7.1.7 + glob: 7.2.0 growl: 1.10.5 he: 1.2.0 js-yaml: 4.1.0 log-symbols: 4.1.0 minimatch: 3.0.4 ms: 2.1.3 - nanoid: 3.1.25 + nanoid: 3.2.0 serialize-javascript: 6.0.0 strip-json-comments: 3.1.1 supports-color: 8.1.1 which: 2.0.2 - workerpool: 6.1.5 + workerpool: 6.2.0 yargs: 16.2.0 yargs-parser: 20.2.4 yargs-unparser: 2.0.0 bin: _mocha: bin/_mocha mocha: bin/mocha - checksum: 8b3cc4333d03dd42e6d3b78e5cfdfb980b287a734e6a543564af95a6977d69c1c0dff203fab55d54caeaf5b9c1b966612e2f2fd29f4b9f1436a5924d6f80aa39 + checksum: 49efc4724cf17087c7e107bc8f6890db24525e6dcc153b801da58de3c2a2f940e22f7600ef195b8ac62a0dfd7baee5cf289fc4641a6b1fdf8bc9c819efc1a8ba languageName: node linkType: hard @@ -3244,12 +3243,12 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:3.1.25": - version: 3.1.25 - resolution: "nanoid@npm:3.1.25" +"nanoid@npm:3.2.0": + version: 3.2.0 + resolution: "nanoid@npm:3.2.0" bin: nanoid: bin/nanoid.cjs - checksum: e2353828c7d8fde65265e9c981380102e2021f292038a93fd27288bad390339833286e8cbc7531abe1cb2c6b317e55f38b895dcb775151637bb487388558e0ff + checksum: 3d1d5a69fea84e538057cf64106e713931c4ef32af344068ecff153ff91252f39b0f2b472e09b0dfff43ac3cf520c92938d90e6455121fe93976e23660f4fccc languageName: node linkType: hard @@ -3286,6 +3285,20 @@ __metadata: languageName: node linkType: hard +"node-fetch@npm:2.6.7": + version: 2.6.7 + resolution: "node-fetch@npm:2.6.7" + dependencies: + whatwg-url: ^5.0.0 + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b + languageName: node + linkType: hard + "node-gyp-build@npm:^4.2.0": version: 4.3.0 resolution: "node-gyp-build@npm:4.3.0" @@ -3377,7 +3390,7 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.11.1": +"object-inspect@npm:^1.12.0": version: 1.12.0 resolution: "object-inspect@npm:1.12.0" checksum: 2b36d4001a9c921c6b342e2965734519c9c58c355822243c3207fbf0aac271f8d44d30d2d570d450b2cc6f0f00b72bcdba515c37827d2560e5f22b1899a31cf4 @@ -3792,12 +3805,12 @@ resolve@^1.20.0: languageName: node linkType: hard -"rxjs@npm:^7.4.0": - version: 7.4.0 - resolution: "rxjs@npm:7.4.0" +"rxjs@npm:^7.5.4": + version: 7.5.4 + resolution: "rxjs@npm:7.5.4" dependencies: - tslib: ~2.1.0 - checksum: 6b33172a760dcad6882fdc836ee8cf1ebe160dd7eaad95c45a12338ffdaa96eb41e48e6c25bbd3d1fdf45075949ff447954bc17a9d01c688558a67967d09c114 + tslib: ^2.1.0 + checksum: 6f55f835f2543bc8214900f9e28b6320e6adc95875011fbca63e80a66eb18c9ff7cfdccb23b2180cbb6412762b98ed158c89fd51cb020799d127c66ea38c3c0e languageName: node linkType: hard @@ -4241,6 +4254,13 @@ resolve@^1.20.0: languageName: node linkType: hard +"tr46@npm:~0.0.3": + version: 0.0.3 + resolution: "tr46@npm:0.0.3" + checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3 + languageName: node + linkType: hard + "traverse-chain@npm:~0.1.0": version: 0.1.0 resolution: "traverse-chain@npm:0.1.0" @@ -4248,9 +4268,9 @@ resolve@^1.20.0: languageName: node linkType: hard -"ts-node@npm:^10.4.0": - version: 10.4.0 - resolution: "ts-node@npm:10.4.0" +"ts-node@npm:^10.5.0": + version: 10.5.0 + resolution: "ts-node@npm:10.5.0" dependencies: "@cspotcode/source-map-support": 0.7.0 "@tsconfig/node10": ^1.0.7 @@ -4263,6 +4283,7 @@ resolve@^1.20.0: create-require: ^1.1.0 diff: ^4.0.1 make-error: ^1.1.1 + v8-compile-cache-lib: ^3.0.0 yn: 3.1.1 peerDependencies: "@swc/core": ">=1.2.50" @@ -4280,7 +4301,7 @@ resolve@^1.20.0: ts-node-script: dist/bin-script.js ts-node-transpile-only: dist/bin-transpile.js ts-script: dist/bin-script-deprecated.js - checksum: 3933ac0a937d33c45e04a6750fcdd3e765eb2897d1da1307cd97ac52af093bcfb632ec0453a75000a65c8b5b7bdb32b1077050a186dcc556e62657cb592e6d49 + checksum: d51ac8a9b3582ce3705cef8d35f3372e40caa277dbd7c7baeb651961538f13d2f11f22402614348f78d9b10501bd1cb5f05ec4f2ec9a74bd0e288de769c32335 languageName: node linkType: hard @@ -4303,20 +4324,13 @@ resolve@^1.20.0: languageName: node linkType: hard -"tslib@npm:^2.0.3, tslib@npm:^2.3.1": +"tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1": version: 2.3.1 resolution: "tslib@npm:2.3.1" checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9 languageName: node linkType: hard -"tslib@npm:~2.1.0": - version: 2.1.0 - resolution: "tslib@npm:2.1.0" - checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78 - languageName: node - linkType: hard - "tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0" @@ -4476,6 +4490,13 @@ resolve@^1.20.0: languageName: node linkType: hard +"v8-compile-cache-lib@npm:^3.0.0": + version: 3.0.0 + resolution: "v8-compile-cache-lib@npm:3.0.0" + checksum: 674e312bbca796584b61dc915f33c7e7dc4e06d196e0048cb772c8964493a1ec723f1dd014d9419fd55c24a6eae148f60769da23f622e05cd13268063fa1ed6b + languageName: node + linkType: hard + "v8-compile-cache@npm:^2.0.3": version: 2.3.0 resolution: "v8-compile-cache@npm:2.3.0" @@ -4497,6 +4518,23 @@ resolve@^1.20.0: languageName: node linkType: hard +"webidl-conversions@npm:^3.0.0": + version: 3.0.1 + resolution: "webidl-conversions@npm:3.0.1" + checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c + languageName: node + linkType: hard + +"whatwg-url@npm:^5.0.0": + version: 5.0.0 + resolution: "whatwg-url@npm:5.0.0" + dependencies: + tr46: ~0.0.3 + webidl-conversions: ^3.0.0 + checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c + languageName: node + linkType: hard + "which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2" @@ -4537,10 +4575,10 @@ resolve@^1.20.0: languageName: node linkType: hard -"workerpool@npm:6.1.5": - version: 6.1.5 - resolution: "workerpool@npm:6.1.5" - checksum: 5defea1fd3e36b4f83c2bb184cade4a71e27030d46ee5efe704e90e19baf3a5c7146fddef010cbd0b7df3edbfca1e9e851bd35d8da8c99ec6d8bbfe121d8c0b0 +"workerpool@npm:6.2.0": + version: 6.2.0 + resolution: "workerpool@npm:6.2.0" + checksum: 3493b4f0ef979a23d2c1583d7ef85f62fc9463cc02f82829d3e7e663b517f8ae9707da0249b382e46ac58986deb0ca2232ee1081713741211bda9254b429c9bb languageName: node linkType: hard From 654aed656cd1a30a32624af3c0a7a77e33014fd3 Mon Sep 17 00:00:00 2001 From: Larry Jarry Date: Wed, 16 Feb 2022 07:40:44 +0800 Subject: [PATCH 2/3] clean up imports --- .../quarry-merge-mine/src/account_validators.rs | 14 ++++++-------- programs/quarry-merge-mine/src/lib.rs | 2 +- programs/quarry-merge-mine/src/mm_cpi.rs | 3 +-- programs/quarry-merge-mine/src/processor/claim.rs | 2 +- .../quarry-merge-mine/src/processor/deposit.rs | 2 +- .../quarry-merge-mine/src/processor/withdraw.rs | 2 +- programs/quarry-mine/src/account_validators.rs | 5 +---- programs/quarry-mine/src/lib.rs | 3 --- programs/quarry-mine/src/payroll.rs | 2 +- programs/quarry-mine/src/quarry.rs | 2 +- programs/quarry-mine/src/rewarder.rs | 11 +++-------- .../quarry-mint-wrapper/src/account_validators.rs | 5 +++-- programs/quarry-operator/src/account_validators.rs | 4 +++- programs/quarry-operator/src/lib.rs | 3 +-- programs/quarry-redeemer/src/account_validators.rs | 3 +-- programs/quarry-redeemer/src/lib.rs | 7 ++----- programs/quarry-registry/src/account_validators.rs | 2 +- programs/quarry-registry/src/lib.rs | 3 +-- 18 files changed, 29 insertions(+), 46 deletions(-) diff --git a/programs/quarry-merge-mine/src/account_validators.rs b/programs/quarry-merge-mine/src/account_validators.rs index 424aeb03..cb80d8c7 100644 --- a/programs/quarry-merge-mine/src/account_validators.rs +++ b/programs/quarry-merge-mine/src/account_validators.rs @@ -1,14 +1,12 @@ //! Account validators use anchor_lang::prelude::*; -use vipers::validate::Validate; -use vipers::{assert_keys_eq, assert_keys_neq, invariant}; - -use crate::ClaimRewards; -use crate::WithdrawTokens; -use crate::{InitMergeMiner, QuarryStakePrimary}; -use crate::{InitMiner, QuarryStake}; -use crate::{NewPool, QuarryStakeReplica}; +use vipers::prelude::*; + +use crate::{ + ClaimRewards, InitMergeMiner, InitMiner, NewPool, QuarryStake, QuarryStakePrimary, + QuarryStakeReplica, WithdrawTokens, +}; use anchor_lang::Key; // -------------------------------- diff --git a/programs/quarry-merge-mine/src/lib.rs b/programs/quarry-merge-mine/src/lib.rs index 1be4f0f5..5435df1c 100644 --- a/programs/quarry-merge-mine/src/lib.rs +++ b/programs/quarry-merge-mine/src/lib.rs @@ -16,7 +16,7 @@ pub mod state; use anchor_lang::prelude::*; use anchor_spl::token::{Mint, Token, TokenAccount}; -use vipers::validate::Validate; +use vipers::prelude::*; use state::*; diff --git a/programs/quarry-merge-mine/src/mm_cpi.rs b/programs/quarry-merge-mine/src/mm_cpi.rs index 76029123..96815952 100644 --- a/programs/quarry-merge-mine/src/mm_cpi.rs +++ b/programs/quarry-merge-mine/src/mm_cpi.rs @@ -6,9 +6,8 @@ use crate::{ ClaimRewards, InitMiner, MergeMiner, QuarryStakePrimary, QuarryStakeReplica, WithdrawTokens, }; use anchor_lang::prelude::*; -use anchor_lang::Key; use anchor_spl::token; -use vipers::{invariant, unwrap_int}; +use vipers::prelude::*; impl MergeMiner { /// Initializes a [quarry_mine::Miner] for the [MergeMiner]. diff --git a/programs/quarry-merge-mine/src/processor/claim.rs b/programs/quarry-merge-mine/src/processor/claim.rs index a21adf1f..7dfda612 100644 --- a/programs/quarry-merge-mine/src/processor/claim.rs +++ b/programs/quarry-merge-mine/src/processor/claim.rs @@ -2,7 +2,7 @@ use crate::{events::*, ClaimRewards}; use anchor_lang::prelude::*; -use vipers::*; +use vipers::prelude::*; /// Claims [quarry_mine] rewards on behalf of the [MergeMiner]. pub fn claim_rewards(ctx: Context) -> ProgramResult { diff --git a/programs/quarry-merge-mine/src/processor/deposit.rs b/programs/quarry-merge-mine/src/processor/deposit.rs index 8cb5e47e..b8f30c25 100644 --- a/programs/quarry-merge-mine/src/processor/deposit.rs +++ b/programs/quarry-merge-mine/src/processor/deposit.rs @@ -2,7 +2,7 @@ use crate::{events::*, QuarryStakePrimary, QuarryStakeReplica}; use anchor_lang::prelude::*; -use vipers::*; +use vipers::prelude::*; /// Deposits tokens into the [MergeMiner]. /// Before calling this, the owner should call the [token::transfer] instruction diff --git a/programs/quarry-merge-mine/src/processor/withdraw.rs b/programs/quarry-merge-mine/src/processor/withdraw.rs index 6e848ff5..2bdc74b5 100644 --- a/programs/quarry-merge-mine/src/processor/withdraw.rs +++ b/programs/quarry-merge-mine/src/processor/withdraw.rs @@ -2,7 +2,7 @@ use crate::{events::*, QuarryStakePrimary, QuarryStakeReplica, WithdrawTokens}; use anchor_lang::prelude::*; -use vipers::*; +use vipers::prelude::*; /// Withdraws tokens from the [MergeMiner]. pub fn unstake_primary_miner(ctx: Context, amount: u64) -> ProgramResult { diff --git a/programs/quarry-mine/src/account_validators.rs b/programs/quarry-mine/src/account_validators.rs index c9f68a76..ffc087d4 100644 --- a/programs/quarry-mine/src/account_validators.rs +++ b/programs/quarry-mine/src/account_validators.rs @@ -1,10 +1,7 @@ //! Validations for various accounts. use anchor_lang::prelude::*; -use anchor_lang::Key; -use vipers::assert_keys_eq; -use vipers::invariant; -use vipers::validate::Validate; +use vipers::prelude::*; use crate::addresses; use crate::{ diff --git a/programs/quarry-mine/src/lib.rs b/programs/quarry-mine/src/lib.rs index 5cd64f0a..0f88bc5f 100644 --- a/programs/quarry-mine/src/lib.rs +++ b/programs/quarry-mine/src/lib.rs @@ -43,9 +43,6 @@ pub const MAX_BPS: u64 = 10_000; /// Program for [quarry_mine]. #[program] pub mod quarry_mine { - - use vipers::invariant; - use super::*; /// -------------------------------- diff --git a/programs/quarry-mine/src/payroll.rs b/programs/quarry-mine/src/payroll.rs index a8575c70..f867460c 100644 --- a/programs/quarry-mine/src/payroll.rs +++ b/programs/quarry-mine/src/payroll.rs @@ -4,7 +4,7 @@ use crate::{Miner, Quarry}; use anchor_lang::prelude::{msg, ProgramError, ProgramResult}; use spl_math::uint::U192; use std::cmp; -use vipers::{invariant, unwrap_int}; +use vipers::prelude::*; /// Number of seconds in a year. pub const SECONDS_PER_YEAR: u128 = 86_400 * 365; diff --git a/programs/quarry-mine/src/quarry.rs b/programs/quarry-mine/src/quarry.rs index 6615227a..ca4ce2b6 100644 --- a/programs/quarry-mine/src/quarry.rs +++ b/programs/quarry-mine/src/quarry.rs @@ -1,7 +1,7 @@ //! Quarry-related math and helpers. use anchor_lang::prelude::*; -use vipers::unwrap_int; +use vipers::prelude::*; use crate::{payroll::Payroll, Miner, Quarry, Rewarder}; use num_traits::cast::ToPrimitive; diff --git a/programs/quarry-mine/src/rewarder.rs b/programs/quarry-mine/src/rewarder.rs index e301ae0d..9aa85d9b 100644 --- a/programs/quarry-mine/src/rewarder.rs +++ b/programs/quarry-mine/src/rewarder.rs @@ -4,14 +4,9 @@ use anchor_lang::prelude::*; use anchor_spl::token::TokenAccount; use num_traits::ToPrimitive; use spl_math::uint::U192; -use vipers::invariant; -use vipers::unwrap_int; - -use crate::ClaimEvent; -use crate::ClaimRewards; -use crate::Rewarder; -use crate::DEFAULT_CLAIM_FEE_MILLIBPS; -use crate::MAX_BPS; +use vipers::prelude::*; + +use crate::{ClaimEvent, ClaimRewards, Rewarder, DEFAULT_CLAIM_FEE_MILLIBPS, MAX_BPS}; impl Rewarder { /// Computes the amount of rewards a [crate::Quarry] should receive, annualized. diff --git a/programs/quarry-mint-wrapper/src/account_validators.rs b/programs/quarry-mint-wrapper/src/account_validators.rs index 7153df62..c6a15b3d 100644 --- a/programs/quarry-mint-wrapper/src/account_validators.rs +++ b/programs/quarry-mint-wrapper/src/account_validators.rs @@ -1,6 +1,7 @@ +//! Validators for mint wrapper accounts. + use anchor_lang::prelude::*; -use vipers::validate::Validate; -use vipers::{assert_keys_eq, assert_keys_neq, invariant}; +use vipers::prelude::*; use crate::AcceptAdmin; use crate::MinterUpdate; diff --git a/programs/quarry-operator/src/account_validators.rs b/programs/quarry-operator/src/account_validators.rs index 16cbd5de..90c93297 100644 --- a/programs/quarry-operator/src/account_validators.rs +++ b/programs/quarry-operator/src/account_validators.rs @@ -1,9 +1,11 @@ +//! Validators for Quarry operator accounts. + use crate::{ CreateOperator, DelegateCreateQuarry, DelegateSetAnnualRewards, DelegateSetFamine, DelegateSetRewardsShare, SetRole, WithDelegate, }; use anchor_lang::prelude::*; -use vipers::{assert_keys_eq, validate::Validate}; +use vipers::prelude::*; impl<'info> Validate<'info> for CreateOperator<'info> { fn validate(&self) -> ProgramResult { diff --git a/programs/quarry-operator/src/lib.rs b/programs/quarry-operator/src/lib.rs index a9083826..74741634 100644 --- a/programs/quarry-operator/src/lib.rs +++ b/programs/quarry-operator/src/lib.rs @@ -4,8 +4,7 @@ use anchor_lang::prelude::*; use quarry_mine::{Quarry, Rewarder}; -use vipers::unwrap_int; -use vipers::validate::Validate; +use vipers::prelude::*; mod account_validators; mod macros; diff --git a/programs/quarry-redeemer/src/account_validators.rs b/programs/quarry-redeemer/src/account_validators.rs index dd22806e..c2bf56a2 100644 --- a/programs/quarry-redeemer/src/account_validators.rs +++ b/programs/quarry-redeemer/src/account_validators.rs @@ -1,7 +1,6 @@ use crate::{CreateRedeemer, RedeemTokens}; use anchor_lang::prelude::*; -use vipers::validate::Validate; -use vipers::{assert_keys_eq, invariant}; +use vipers::prelude::*; impl<'info> Validate<'info> for CreateRedeemer<'info> { fn validate(&self) -> ProgramResult { diff --git a/programs/quarry-redeemer/src/lib.rs b/programs/quarry-redeemer/src/lib.rs index 0edceca0..d7e60f62 100644 --- a/programs/quarry-redeemer/src/lib.rs +++ b/programs/quarry-redeemer/src/lib.rs @@ -3,11 +3,8 @@ #![allow(rustdoc::missing_doc_code_examples)] use anchor_lang::prelude::*; -use anchor_spl::token::Token; -use anchor_spl::token::{Mint, TokenAccount}; -use vipers::invariant; -use vipers::unwrap_int; -use vipers::validate::Validate; +use anchor_spl::token::{Mint, Token, TokenAccount}; +use vipers::prelude::*; mod account_validators; mod macros; diff --git a/programs/quarry-registry/src/account_validators.rs b/programs/quarry-registry/src/account_validators.rs index 5a4e0dc8..d76c5415 100644 --- a/programs/quarry-registry/src/account_validators.rs +++ b/programs/quarry-registry/src/account_validators.rs @@ -1,7 +1,7 @@ //! Validations for various accounts. use anchor_lang::prelude::*; -use vipers::{assert_keys_eq, validate::Validate}; +use vipers::prelude::*; use crate::{NewRegistry, SyncQuarry}; diff --git a/programs/quarry-registry/src/lib.rs b/programs/quarry-registry/src/lib.rs index 11139061..2cce3bc9 100644 --- a/programs/quarry-registry/src/lib.rs +++ b/programs/quarry-registry/src/lib.rs @@ -3,8 +3,7 @@ #![allow(rustdoc::missing_doc_code_examples)] use anchor_lang::prelude::*; -use quarry_mine::Quarry; -use quarry_mine::Rewarder; +use quarry_mine::{Quarry, Rewarder}; use vipers::prelude::*; mod account_validators; From a6efb45a346dbca5a751ae7c0c5a6a9994e4e4ae Mon Sep 17 00:00:00 2001 From: Larry Jarry Date: Wed, 16 Feb 2022 07:44:04 +0800 Subject: [PATCH 3/3] fix CI --- .github/workflows/programs-e2e.yml | 10 ---------- .github/workflows/release.yml | 20 -------------------- 2 files changed, 30 deletions(-) diff --git a/.github/workflows/programs-e2e.yml b/.github/workflows/programs-e2e.yml index db9a93da..2eb0fa30 100644 --- a/.github/workflows/programs-e2e.yml +++ b/.github/workflows/programs-e2e.yml @@ -19,11 +19,6 @@ jobs: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: @@ -59,11 +54,6 @@ jobs: # Install Cachix - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 203c4678..f288b573 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,11 +19,6 @@ jobs: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: @@ -58,11 +53,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: @@ -86,11 +76,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: @@ -114,11 +99,6 @@ jobs: uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install - install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" - extra_nix_config: | - experimental-features = nix-command flakes - name: Setup Cachix uses: cachix/cachix-action@v10 with: