From 1233b094d7be95c468af94ea68124ea909679c32 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Fri, 12 Jul 2024 12:56:40 +0530 Subject: [PATCH 01/23] refactor --- AMM/AMM-contract/Cargo.toml | 4 +- AMM/Cargo.toml | 10 - AMM/Forc.lock | 4 +- AMM/atomic-add-liquidity/Cargo.toml | 4 +- AMM/exchange-contract/Cargo.toml | 4 +- AMM/fuel-toolchain.toml | 6 - AMM/swap-exact-input/Cargo.toml | 4 +- AMM/swap-exact-output/Cargo.toml | 4 +- AMM/test-utils/Cargo.toml | 2 +- AMM/test-utils/src/interface.rs | 10 +- .../.docs/multi-signature-logo-dark-theme.png | Bin .../multi-signature-logo-light-theme.png | Bin .../multisig-wallet-sequence-diagram.png | Bin .../multisig-wallet}/.gitignore | 0 .../multisig-wallet}/Cargo.lock | 0 .../multisig-wallet}/Cargo.toml | 0 .../multisig-wallet}/Forc.lock | 0 .../multisig-wallet}/Forc.toml | 0 .../multisig-wallet}/README.md | 0 .../multisig-wallet}/SPECIFICATION.md | 0 .../multisig-wallet}/fuel-toolchain.toml | 0 .../multisig-contract/Cargo.toml | 0 .../multisig-contract/Forc.toml | 0 .../multisig-contract/src/data_structures.sw | 0 .../src/data_structures/hashing.sw | 0 .../src/data_structures/signatures.sw | 0 .../src/data_structures/user.sw | 0 .../multisig-contract/src/errors.sw | 0 .../multisig-contract/src/events.sw | 0 .../multisig-contract/src/interface.sw | 0 .../multisig-contract/src/main.sw | 0 .../multisig-contract/src/utils.sw | 0 .../tests/functions/core/constructor.rs | 0 .../functions/core/execute_transaction.rs | 0 .../tests/functions/core/mod.rs | 0 .../tests/functions/core/set_threshold.rs | 0 .../tests/functions/core/set_weight.rs | 0 .../tests/functions/info/approval_weight.rs | 0 .../tests/functions/info/balance.rs | 0 .../tests/functions/info/compute_hash.rs | 0 .../tests/functions/info/mod.rs | 0 .../tests/functions/info/nonce.rs | 0 .../tests/functions/info/threshold.rs | 0 .../multisig-contract/tests/functions/mod.rs | 0 .../multisig-contract/tests/harness.rs | 0 .../tests/utils/interface/core.rs | 0 .../tests/utils/interface/info.rs | 0 .../tests/utils/interface/mod.rs | 0 .../tests/utils/interface/target_contract.rs | 0 .../multisig-contract/tests/utils/mod.rs | 0 .../multisig-contract/tests/utils/setup.rs | 0 .../test-artifacts/target-contract/Forc.toml | 0 .../target-contract/src/main.sw | 0 airdrop/Cargo.lock => Cargo.lock | 1701 ++++++++++------- Cargo.toml | 45 + DAO/Cargo.toml | 5 - DAO/DAO-contract/Cargo.toml | 4 +- DAO/DAO-contract/tests/utils/setup.rs | 2 +- DAO/Forc.lock | 4 +- DAO/fuel-toolchain.toml | 6 - NFT/Cargo.toml | 5 - NFT/Forc.lock | 4 +- NFT/NFT-contract/Cargo.toml | 6 +- NFT/NFT-contract/tests/utils/setup.rs | 2 +- NFT/fuel-toolchain.toml | 6 - OTC-swap-predicate/Cargo.toml | 5 - OTC-swap-predicate/Forc.lock | 4 +- OTC-swap-predicate/fuel-toolchain.toml | 6 - OTC-swap-predicate/swap-predicate/Cargo.toml | 6 +- OTC-swap-predicate/swap-predicate/src/main.sw | 2 +- .../swap-predicate/tests/utils/mod.rs | 2 +- README.md | 5 +- TicTacToe/Cargo.toml | 5 - TicTacToe/Forc.lock | 4 +- TicTacToe/fuel-toolchain.toml | 6 - TicTacToe/tictactoe-contract/Cargo.toml | 6 +- .../tictactoe-contract/tests/utils/setup.rs | 2 +- airdrop/Cargo.toml | 5 - airdrop/Forc.lock | 4 +- airdrop/airdrop-contract/Cargo.toml | 6 +- airdrop/airdrop-contract/tests/utils/setup.rs | 2 +- airdrop/fuel-toolchain.toml | 6 - counter-script/Cargo.toml | 5 - counter-script/Forc.lock | 4 +- counter-script/fuel-toolchain.toml | 6 - counter-script/interaction_script/Cargo.toml | 5 +- .../interaction_script/tests/harness.rs | 4 +- english-auction/Cargo.toml | 3 - english-auction/Forc.lock | 4 +- english-auction/auction-contract/Cargo.toml | 6 +- .../auction-contract/tests/utils/setup.rs | 2 +- english-auction/fuel-toolchain.toml | 6 - escrow/Cargo.toml | 5 - escrow/escrow-contract/Cargo.toml | 6 +- escrow/escrow-contract/tests/utils/setup.rs | 2 +- escrow/fuel-toolchain.toml | 4 +- fractional-NFT/Cargo.toml | 5 - fractional-NFT/Forc.lock | 4 +- fractional-NFT/f-NFT-contract/Cargo.toml | 6 +- .../f-NFT-contract/tests/utils/setup.rs | 4 +- fractional-NFT/fuel-toolchain.toml | 6 - fuel-toolchain.toml | 6 + fundraiser/Cargo.toml | 5 - fundraiser/Forc.lock | 4 +- fundraiser/fuel-toolchain.toml | 6 - fundraiser/fundraiser-contract/Cargo.toml | 6 +- .../fundraiser-contract/tests/utils/setup.rs | 2 +- name-registry/Cargo.toml | 5 - name-registry/Forc.lock | 4 +- name-registry/fuel-toolchain.toml | 6 - name-registry/registry-contract/Cargo.toml | 6 +- .../registry-contract/tests/utils/setup.rs | 2 +- native-asset/Cargo.toml | 5 - native-asset/Forc.lock | 4 +- native-asset/fuel-toolchain.toml | 6 - native-asset/native-asset-contract/Cargo.toml | 6 +- .../tests/utils/setup.rs | 2 +- oracle/Cargo.toml | 7 - oracle/Forc.lock | 4 +- oracle/fuel-toolchain.toml | 6 - oracle/oracle-contract/Cargo.toml | 6 +- oracle/oracle-node/Cargo.toml | 6 +- oracle/utils/Cargo.toml | 4 +- oracle/utils/src/lib.rs | 2 +- timelock/Cargo.toml | 5 - timelock/Forc.lock | 4 +- timelock/fuel-toolchain.toml | 6 - timelock/timelock-contract/Cargo.toml | 6 +- .../timelock-contract/tests/utils/setup.rs | 2 +- 129 files changed, 1173 insertions(+), 965 deletions(-) delete mode 100644 AMM/Cargo.toml delete mode 100644 AMM/fuel-toolchain.toml rename {multisig-wallet => Archive/multisig-wallet}/.docs/multi-signature-logo-dark-theme.png (100%) rename {multisig-wallet => Archive/multisig-wallet}/.docs/multi-signature-logo-light-theme.png (100%) rename {multisig-wallet => Archive/multisig-wallet}/.docs/multisig-wallet-sequence-diagram.png (100%) rename {multisig-wallet => Archive/multisig-wallet}/.gitignore (100%) rename {multisig-wallet => Archive/multisig-wallet}/Cargo.lock (100%) rename {multisig-wallet => Archive/multisig-wallet}/Cargo.toml (100%) rename {multisig-wallet => Archive/multisig-wallet}/Forc.lock (100%) rename {multisig-wallet => Archive/multisig-wallet}/Forc.toml (100%) rename {multisig-wallet => Archive/multisig-wallet}/README.md (100%) rename {multisig-wallet => Archive/multisig-wallet}/SPECIFICATION.md (100%) rename {multisig-wallet => Archive/multisig-wallet}/fuel-toolchain.toml (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/Cargo.toml (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/Forc.toml (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/data_structures.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/data_structures/hashing.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/data_structures/signatures.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/data_structures/user.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/errors.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/events.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/interface.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/main.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/src/utils.sw (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/core/constructor.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/core/execute_transaction.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/core/mod.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/core/set_threshold.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/core/set_weight.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/info/approval_weight.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/info/balance.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/info/compute_hash.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/info/mod.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/info/nonce.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/info/threshold.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/functions/mod.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/harness.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/utils/interface/core.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/utils/interface/info.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/utils/interface/mod.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/utils/interface/target_contract.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/utils/mod.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/multisig-contract/tests/utils/setup.rs (100%) rename {multisig-wallet => Archive/multisig-wallet}/test-artifacts/target-contract/Forc.toml (100%) rename {multisig-wallet => Archive/multisig-wallet}/test-artifacts/target-contract/src/main.sw (100%) rename airdrop/Cargo.lock => Cargo.lock (81%) create mode 100644 Cargo.toml delete mode 100644 DAO/Cargo.toml delete mode 100644 DAO/fuel-toolchain.toml delete mode 100644 NFT/Cargo.toml delete mode 100644 NFT/fuel-toolchain.toml delete mode 100644 OTC-swap-predicate/Cargo.toml delete mode 100644 OTC-swap-predicate/fuel-toolchain.toml delete mode 100644 TicTacToe/Cargo.toml delete mode 100644 TicTacToe/fuel-toolchain.toml delete mode 100644 airdrop/Cargo.toml delete mode 100644 airdrop/fuel-toolchain.toml delete mode 100644 counter-script/Cargo.toml delete mode 100644 counter-script/fuel-toolchain.toml delete mode 100644 english-auction/Cargo.toml delete mode 100644 english-auction/fuel-toolchain.toml delete mode 100644 escrow/Cargo.toml delete mode 100644 fractional-NFT/Cargo.toml delete mode 100644 fractional-NFT/fuel-toolchain.toml create mode 100644 fuel-toolchain.toml delete mode 100644 fundraiser/Cargo.toml delete mode 100644 fundraiser/fuel-toolchain.toml delete mode 100644 name-registry/Cargo.toml delete mode 100644 name-registry/fuel-toolchain.toml delete mode 100644 native-asset/Cargo.toml delete mode 100644 native-asset/fuel-toolchain.toml delete mode 100644 oracle/Cargo.toml delete mode 100644 oracle/fuel-toolchain.toml delete mode 100644 timelock/Cargo.toml delete mode 100644 timelock/fuel-toolchain.toml diff --git a/AMM/AMM-contract/Cargo.toml b/AMM/AMM-contract/Cargo.toml index c852add7c..ee16eee35 100644 --- a/AMM/AMM-contract/Cargo.toml +++ b/AMM/AMM-contract/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } test-utils = { path = "../test-utils" } -tokio = { version = "1.21.0", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/AMM/Cargo.toml b/AMM/Cargo.toml deleted file mode 100644 index ab6cef391..000000000 --- a/AMM/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./AMM-contract", - "./exchange-contract", - "./atomic-add-liquidity", - "./swap-exact-input", - "./swap-exact-output", - "./test-utils", -] diff --git a/AMM/Forc.lock b/AMM/Forc.lock index 6fb341c21..70826981c 100644 --- a/AMM/Forc.lock +++ b/AMM/Forc.lock @@ -16,7 +16,7 @@ dependencies = [ [[package]] name = "core" -source = "path+from-root-841ED074400F52FC" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "exchange-contract" @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?rev#4fe6f1ed5134914f1133bb7032e9fe7165255cc6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/AMM/atomic-add-liquidity/Cargo.toml b/AMM/atomic-add-liquidity/Cargo.toml index 17d30bc16..d49fc931d 100644 --- a/AMM/atomic-add-liquidity/Cargo.toml +++ b/AMM/atomic-add-liquidity/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dev-dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } test-utils = { path = "../test-utils" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/AMM/exchange-contract/Cargo.toml b/AMM/exchange-contract/Cargo.toml index 76a83eaed..198ac15ab 100644 --- a/AMM/exchange-contract/Cargo.toml +++ b/AMM/exchange-contract/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } test-utils = { path = "../test-utils" } -tokio = { version = "1.21.0", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/AMM/fuel-toolchain.toml b/AMM/fuel-toolchain.toml deleted file mode 100644 index 0ba44eded..000000000 --- a/AMM/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0+nightly.20240528.4fe6f1ed51" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/AMM/swap-exact-input/Cargo.toml b/AMM/swap-exact-input/Cargo.toml index e94d985f1..c2986bf19 100644 --- a/AMM/swap-exact-input/Cargo.toml +++ b/AMM/swap-exact-input/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dev-dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } test-utils = { path = "../test-utils" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/AMM/swap-exact-output/Cargo.toml b/AMM/swap-exact-output/Cargo.toml index 71dd0485e..44caa2334 100644 --- a/AMM/swap-exact-output/Cargo.toml +++ b/AMM/swap-exact-output/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dev-dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } test-utils = { path = "../test-utils" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/AMM/test-utils/Cargo.toml b/AMM/test-utils/Cargo.toml index f33ce1fd8..b8e88976c 100644 --- a/AMM/test-utils/Cargo.toml +++ b/AMM/test-utils/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } [lib] doctest = false diff --git a/AMM/test-utils/src/interface.rs b/AMM/test-utils/src/interface.rs index bb19ce431..b5a0940ed 100644 --- a/AMM/test-utils/src/interface.rs +++ b/AMM/test-utils/src/interface.rs @@ -6,23 +6,23 @@ use fuels::{ abigen!( Contract( name = "AMM", - abi = "./AMM-contract/out/debug/AMM-contract-abi.json" + abi = "./AMM/AMM-contract/out/debug/AMM-contract-abi.json" ), Contract( name = "Exchange", - abi = "./exchange-contract/out/debug/exchange-contract-abi.json" + abi = "./AMM/exchange-contract/out/debug/exchange-contract-abi.json" ), Script( name = "AtomicAddLiquidityScript", - abi = "./atomic-add-liquidity/out/debug/atomic-add-liquidity-abi.json" + abi = "./AMM/atomic-add-liquidity/out/debug/atomic-add-liquidity-abi.json" ), Script( name = "SwapExactInputScript", - abi = "./swap-exact-input/out/debug/swap-exact-input-abi.json" + abi = "./AMM/swap-exact-input/out/debug/swap-exact-input-abi.json" ), Script( name = "SwapExactOutputScript", - abi = "./swap-exact-output/out/debug/swap-exact-output-abi.json" + abi = "./AMM/swap-exact-output/out/debug/swap-exact-output-abi.json" ) ); diff --git a/multisig-wallet/.docs/multi-signature-logo-dark-theme.png b/Archive/multisig-wallet/.docs/multi-signature-logo-dark-theme.png similarity index 100% rename from multisig-wallet/.docs/multi-signature-logo-dark-theme.png rename to Archive/multisig-wallet/.docs/multi-signature-logo-dark-theme.png diff --git a/multisig-wallet/.docs/multi-signature-logo-light-theme.png b/Archive/multisig-wallet/.docs/multi-signature-logo-light-theme.png similarity index 100% rename from multisig-wallet/.docs/multi-signature-logo-light-theme.png rename to Archive/multisig-wallet/.docs/multi-signature-logo-light-theme.png diff --git a/multisig-wallet/.docs/multisig-wallet-sequence-diagram.png b/Archive/multisig-wallet/.docs/multisig-wallet-sequence-diagram.png similarity index 100% rename from multisig-wallet/.docs/multisig-wallet-sequence-diagram.png rename to Archive/multisig-wallet/.docs/multisig-wallet-sequence-diagram.png diff --git a/multisig-wallet/.gitignore b/Archive/multisig-wallet/.gitignore similarity index 100% rename from multisig-wallet/.gitignore rename to Archive/multisig-wallet/.gitignore diff --git a/multisig-wallet/Cargo.lock b/Archive/multisig-wallet/Cargo.lock similarity index 100% rename from multisig-wallet/Cargo.lock rename to Archive/multisig-wallet/Cargo.lock diff --git a/multisig-wallet/Cargo.toml b/Archive/multisig-wallet/Cargo.toml similarity index 100% rename from multisig-wallet/Cargo.toml rename to Archive/multisig-wallet/Cargo.toml diff --git a/multisig-wallet/Forc.lock b/Archive/multisig-wallet/Forc.lock similarity index 100% rename from multisig-wallet/Forc.lock rename to Archive/multisig-wallet/Forc.lock diff --git a/multisig-wallet/Forc.toml b/Archive/multisig-wallet/Forc.toml similarity index 100% rename from multisig-wallet/Forc.toml rename to Archive/multisig-wallet/Forc.toml diff --git a/multisig-wallet/README.md b/Archive/multisig-wallet/README.md similarity index 100% rename from multisig-wallet/README.md rename to Archive/multisig-wallet/README.md diff --git a/multisig-wallet/SPECIFICATION.md b/Archive/multisig-wallet/SPECIFICATION.md similarity index 100% rename from multisig-wallet/SPECIFICATION.md rename to Archive/multisig-wallet/SPECIFICATION.md diff --git a/multisig-wallet/fuel-toolchain.toml b/Archive/multisig-wallet/fuel-toolchain.toml similarity index 100% rename from multisig-wallet/fuel-toolchain.toml rename to Archive/multisig-wallet/fuel-toolchain.toml diff --git a/multisig-wallet/multisig-contract/Cargo.toml b/Archive/multisig-wallet/multisig-contract/Cargo.toml similarity index 100% rename from multisig-wallet/multisig-contract/Cargo.toml rename to Archive/multisig-wallet/multisig-contract/Cargo.toml diff --git a/multisig-wallet/multisig-contract/Forc.toml b/Archive/multisig-wallet/multisig-contract/Forc.toml similarity index 100% rename from multisig-wallet/multisig-contract/Forc.toml rename to Archive/multisig-wallet/multisig-contract/Forc.toml diff --git a/multisig-wallet/multisig-contract/src/data_structures.sw b/Archive/multisig-wallet/multisig-contract/src/data_structures.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/data_structures.sw rename to Archive/multisig-wallet/multisig-contract/src/data_structures.sw diff --git a/multisig-wallet/multisig-contract/src/data_structures/hashing.sw b/Archive/multisig-wallet/multisig-contract/src/data_structures/hashing.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/data_structures/hashing.sw rename to Archive/multisig-wallet/multisig-contract/src/data_structures/hashing.sw diff --git a/multisig-wallet/multisig-contract/src/data_structures/signatures.sw b/Archive/multisig-wallet/multisig-contract/src/data_structures/signatures.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/data_structures/signatures.sw rename to Archive/multisig-wallet/multisig-contract/src/data_structures/signatures.sw diff --git a/multisig-wallet/multisig-contract/src/data_structures/user.sw b/Archive/multisig-wallet/multisig-contract/src/data_structures/user.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/data_structures/user.sw rename to Archive/multisig-wallet/multisig-contract/src/data_structures/user.sw diff --git a/multisig-wallet/multisig-contract/src/errors.sw b/Archive/multisig-wallet/multisig-contract/src/errors.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/errors.sw rename to Archive/multisig-wallet/multisig-contract/src/errors.sw diff --git a/multisig-wallet/multisig-contract/src/events.sw b/Archive/multisig-wallet/multisig-contract/src/events.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/events.sw rename to Archive/multisig-wallet/multisig-contract/src/events.sw diff --git a/multisig-wallet/multisig-contract/src/interface.sw b/Archive/multisig-wallet/multisig-contract/src/interface.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/interface.sw rename to Archive/multisig-wallet/multisig-contract/src/interface.sw diff --git a/multisig-wallet/multisig-contract/src/main.sw b/Archive/multisig-wallet/multisig-contract/src/main.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/main.sw rename to Archive/multisig-wallet/multisig-contract/src/main.sw diff --git a/multisig-wallet/multisig-contract/src/utils.sw b/Archive/multisig-wallet/multisig-contract/src/utils.sw similarity index 100% rename from multisig-wallet/multisig-contract/src/utils.sw rename to Archive/multisig-wallet/multisig-contract/src/utils.sw diff --git a/multisig-wallet/multisig-contract/tests/functions/core/constructor.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/core/constructor.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/core/constructor.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/core/constructor.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/core/execute_transaction.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/core/execute_transaction.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/core/execute_transaction.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/core/execute_transaction.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/core/mod.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/core/mod.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/core/mod.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/core/mod.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/core/set_threshold.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/core/set_threshold.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/core/set_threshold.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/core/set_threshold.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/core/set_weight.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/core/set_weight.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/core/set_weight.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/core/set_weight.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/info/approval_weight.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/info/approval_weight.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/info/approval_weight.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/info/approval_weight.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/info/balance.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/info/balance.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/info/balance.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/info/balance.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/info/compute_hash.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/info/compute_hash.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/info/compute_hash.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/info/compute_hash.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/info/mod.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/info/mod.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/info/mod.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/info/mod.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/info/nonce.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/info/nonce.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/info/nonce.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/info/nonce.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/info/threshold.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/info/threshold.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/info/threshold.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/info/threshold.rs diff --git a/multisig-wallet/multisig-contract/tests/functions/mod.rs b/Archive/multisig-wallet/multisig-contract/tests/functions/mod.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/functions/mod.rs rename to Archive/multisig-wallet/multisig-contract/tests/functions/mod.rs diff --git a/multisig-wallet/multisig-contract/tests/harness.rs b/Archive/multisig-wallet/multisig-contract/tests/harness.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/harness.rs rename to Archive/multisig-wallet/multisig-contract/tests/harness.rs diff --git a/multisig-wallet/multisig-contract/tests/utils/interface/core.rs b/Archive/multisig-wallet/multisig-contract/tests/utils/interface/core.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/utils/interface/core.rs rename to Archive/multisig-wallet/multisig-contract/tests/utils/interface/core.rs diff --git a/multisig-wallet/multisig-contract/tests/utils/interface/info.rs b/Archive/multisig-wallet/multisig-contract/tests/utils/interface/info.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/utils/interface/info.rs rename to Archive/multisig-wallet/multisig-contract/tests/utils/interface/info.rs diff --git a/multisig-wallet/multisig-contract/tests/utils/interface/mod.rs b/Archive/multisig-wallet/multisig-contract/tests/utils/interface/mod.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/utils/interface/mod.rs rename to Archive/multisig-wallet/multisig-contract/tests/utils/interface/mod.rs diff --git a/multisig-wallet/multisig-contract/tests/utils/interface/target_contract.rs b/Archive/multisig-wallet/multisig-contract/tests/utils/interface/target_contract.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/utils/interface/target_contract.rs rename to Archive/multisig-wallet/multisig-contract/tests/utils/interface/target_contract.rs diff --git a/multisig-wallet/multisig-contract/tests/utils/mod.rs b/Archive/multisig-wallet/multisig-contract/tests/utils/mod.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/utils/mod.rs rename to Archive/multisig-wallet/multisig-contract/tests/utils/mod.rs diff --git a/multisig-wallet/multisig-contract/tests/utils/setup.rs b/Archive/multisig-wallet/multisig-contract/tests/utils/setup.rs similarity index 100% rename from multisig-wallet/multisig-contract/tests/utils/setup.rs rename to Archive/multisig-wallet/multisig-contract/tests/utils/setup.rs diff --git a/multisig-wallet/test-artifacts/target-contract/Forc.toml b/Archive/multisig-wallet/test-artifacts/target-contract/Forc.toml similarity index 100% rename from multisig-wallet/test-artifacts/target-contract/Forc.toml rename to Archive/multisig-wallet/test-artifacts/target-contract/Forc.toml diff --git a/multisig-wallet/test-artifacts/target-contract/src/main.sw b/Archive/multisig-wallet/test-artifacts/target-contract/src/main.sw similarity index 100% rename from multisig-wallet/test-artifacts/target-contract/src/main.sw rename to Archive/multisig-wallet/test-artifacts/target-contract/src/main.sw diff --git a/airdrop/Cargo.lock b/Cargo.lock similarity index 81% rename from airdrop/Cargo.lock rename to Cargo.lock index f7579c642..0a9e42977 100644 --- a/airdrop/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,23 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "AMM-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "test-utils", + "tokio", +] + +[[package]] +name = "DAO-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "Inflector" version = "0.11.4" @@ -12,11 +29,20 @@ dependencies = [ "regex", ] +[[package]] +name = "NFT-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "sha2 0.10.8", + "tokio", +] + [[package]] name = "addr2line" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -39,9 +65,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -64,29 +90,30 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -105,47 +132,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -153,9 +181,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayref" @@ -177,9 +205,9 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "asn1-rs" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -193,25 +221,25 @@ dependencies = [ [[package]] name = "asn1-rs-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure 0.12.6", + "syn 2.0.70", + "synstructure", ] [[package]] name = "asn1-rs-impl" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.70", ] [[package]] @@ -262,7 +290,7 @@ dependencies = [ "Inflector", "async-graphql-parser", "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -295,9 +323,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock", "cfg-if", @@ -314,9 +342,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ "event-listener", "event-listener-strategy", @@ -342,18 +370,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -382,11 +410,20 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atomic-add-liquidity" +version = "0.0.0" +dependencies = [ + "fuels", + "test-utils", + "tokio", +] + [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -402,11 +439,19 @@ dependencies = [ "url", ] +[[package]] +name = "auction-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -457,9 +502,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -497,9 +542,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -507,27 +552,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bech32" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1" - [[package]] name = "bech32" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -536,21 +566,23 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] [[package]] name = "bitvec" -version = "0.17.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "either", + "funty", "radium", + "tap", + "wyz", ] [[package]] @@ -580,29 +612,21 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -dependencies = [ - "sha2 0.9.9", -] - [[package]] name = "bs58" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ + "sha2 0.10.8", "tinyvec", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -612,18 +636,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.95" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "907d8581360765417f8f2e0e7d602733bbed60156b4465b7617243689ef9b83d" [[package]] name = "cfg-if" @@ -657,9 +681,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -667,7 +691,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -683,9 +707,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -693,9 +717,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -705,21 +729,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "cobs" @@ -729,18 +753,15 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "coins-bip32" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30a84aab436fcb256a2ab3c80663d8aec686e6bae12827bb05fef3e1e439c9f" +checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3" dependencies = [ - "bincode", - "bs58 0.4.0", + "bs58", "coins-core", "digest 0.10.7", - "getrandom", "hmac 0.12.1", "k256", - "lazy_static", "serde", "sha2 0.10.8", "thiserror", @@ -748,13 +769,12 @@ dependencies = [ [[package]] name = "coins-bip39" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f4d04ee18e58356accd644896aeb2094ddeafb6a713e056cef0c0a8e468c15" +checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" dependencies = [ "bitvec", "coins-bip32", - "getrandom", "hmac 0.12.1", "once_cell", "pbkdf2 0.12.2", @@ -765,13 +785,13 @@ dependencies = [ [[package]] name = "coins-core" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b949a1c63fb7eb591eb7ba438746326aedf0ae843e51ec92ba6bec5bb382c4f" +checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" dependencies = [ "base64 0.21.7", - "bech32 0.7.3", - "bs58 0.4.0", + "bech32", + "bs58", "digest 0.10.7", "generic-array", "hex", @@ -785,9 +805,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -826,9 +846,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "convert_case" @@ -838,9 +858,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -849,12 +869,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -866,9 +886,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -876,9 +896,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -900,61 +920,43 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -964,9 +966,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core", @@ -1015,16 +1017,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -1038,7 +1039,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -1103,12 +1104,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1141,16 +1142,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.39", + "strsim 0.11.1", + "syn 2.0.70", ] [[package]] @@ -1177,13 +1178,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.10", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -1214,9 +1215,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -1224,9 +1225,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.2.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ "asn1-rs", "displaydoc", @@ -1236,6 +1237,16 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1249,15 +1260,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.70", ] [[package]] @@ -1289,13 +1300,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -1308,6 +1319,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + [[package]] name = "downcast" version = "0.11.0" @@ -1322,9 +1339,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", @@ -1346,9 +1363,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1361,9 +1378,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1384,6 +1401,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encode_unicode" version = "0.3.6" @@ -1392,9 +1415,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1408,27 +1431,27 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] name = "enum-iterator" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -1439,14 +1462,22 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "escrow-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "eth-keystore" version = "0.5.0" @@ -1477,9 +1508,9 @@ checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1488,9 +1519,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener", "pin-project-lite", @@ -1511,11 +1542,29 @@ dependencies = [ "tokio", ] +[[package]] +name = "exchange-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "test-utils", + "tokio", +] + +[[package]] +name = "f-NFT-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "sha2 0.10.8", + "tokio", +] + [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "ff" @@ -1529,9 +1578,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fixed-hash" @@ -1557,11 +1606,26 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1585,7 +1649,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.39", + "syn 2.0.70", "thiserror", ] @@ -1595,7 +1659,7 @@ version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42df651415e443094f86102473b7f9fa23633ab6c3c98dd3f713adde251acf0f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "fuel-types", "serde", "strum 0.24.1", @@ -1632,7 +1696,7 @@ dependencies = [ "hex", "hyper", "indicatif", - "itertools 0.12.0", + "itertools 0.12.1", "rand", "serde", "serde_json", @@ -1644,7 +1708,7 @@ dependencies = [ "tokio-util", "tower-http", "tracing", - "uuid 1.6.1", + "uuid 1.10.0", ] [[package]] @@ -1654,11 +1718,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d202fe1dfeb98882bdc5a0206a58e469d76fd09d952c4050bb979102bd690398" dependencies = [ "anyhow", - "bech32 0.9.1", + "bech32", "derivative", "fuel-core-storage", "fuel-core-types", - "itertools 0.12.0", + "itertools 0.12.1", "postcard", "rand", "serde", @@ -1680,8 +1744,8 @@ dependencies = [ "fuel-core-types", "futures", "hex", - "hyper-rustls 0.24.1", - "itertools 0.12.0", + "hyper-rustls 0.24.2", + "itertools 0.12.1", "reqwest", "schemafy_lib", "serde", @@ -1853,7 +1917,7 @@ dependencies = [ "fuel-core-types", "fuel-vm", "impl-tools", - "itertools 0.12.0", + "itertools 0.12.1", "mockall", "num_enum", "paste", @@ -1893,7 +1957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf038dd8df8d3aa665a13295c9ef888ba8118600cccdf8fb4587410e0e102fdf" dependencies = [ "anyhow", - "bs58 0.5.1", + "bs58", "derivative", "derive_more", "fuel-vm", @@ -1945,8 +2009,8 @@ checksum = "2b85e8e508b26d088262075fcfe9921b7009c931fef1cc55fe1dafb116c99884" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", - "synstructure 0.13.0", + "syn 2.0.70", + "synstructure", ] [[package]] @@ -1996,14 +2060,14 @@ version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e4b4ea79ffe711af7bbf363b25f383fc6e481e652cf55a5ef8b5a458fcf4ef9" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "derivative", "derive_more", "fuel-asm", "fuel-crypto", "fuel-merkle 0.49.0", "fuel-types", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "itertools 0.10.5", "postcard", "rand", @@ -2034,7 +2098,7 @@ dependencies = [ "anyhow", "async-trait", "backtrace", - "bitflags 2.4.1", + "bitflags 2.6.0", "derivative", "derive_more", "ethnum", @@ -2044,7 +2108,7 @@ dependencies = [ "fuel-storage 0.49.0", "fuel-tx", "fuel-types", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "itertools 0.10.5", "libm", "paste", @@ -2108,12 +2172,12 @@ checksum = "8db288a46989c20bc48dee787008959a2a7c17061fe78cf4ae4c1263c80692e1" dependencies = [ "Inflector", "fuel-abi-types", - "itertools 0.12.0", + "itertools 0.12.1", "proc-macro2", "quote", "regex", "serde_json", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -2123,7 +2187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63d0abdc7230e4adb619a3735c237af545dcfdf86f4096b9d1daaf315838987e" dependencies = [ "async-trait", - "bech32 0.9.1", + "bech32", "chrono", "fuel-abi-types", "fuel-asm", @@ -2136,7 +2200,7 @@ dependencies = [ "fuel-vm", "fuels-macros", "hex", - "itertools 0.12.0", + "itertools 0.12.1", "serde", "serde_json", "thiserror", @@ -2150,11 +2214,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e137a52541dbd0345bf000301091b5266644fd4de04bb8238457c5c70b9ac4e" dependencies = [ "fuels-code-gen", - "itertools 0.12.0", + "itertools 0.12.1", "proc-macro2", "quote", "rand", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -2170,7 +2234,7 @@ dependencies = [ "fuel-types", "fuels-accounts", "fuels-core", - "itertools 0.12.0", + "itertools 0.12.1", "rand", "serde_json", "tokio", @@ -2200,6 +2264,20 @@ dependencies = [ "which", ] +[[package]] +name = "fundraiser-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.3.30" @@ -2217,9 +2295,9 @@ dependencies = [ [[package]] name = "futures-bounded" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173" +checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e" dependencies = [ "futures-timer", "futures-util", @@ -2277,7 +2355,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -2290,6 +2368,17 @@ dependencies = [ "rustls 0.21.12", ] +[[package]] +name = "futures-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" +dependencies = [ + "futures-io", + "rustls 0.23.11", + "rustls-pki-types", +] + [[package]] name = "futures-sink" version = "0.3.30" @@ -2350,15 +2439,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -2373,9 +2460,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "graphql-parser" @@ -2400,9 +2487,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2410,7 +2497,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2443,9 +2530,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -2454,9 +2541,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -2484,6 +2571,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -2516,7 +2609,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.5", + "socket2", "thiserror", "tinyvec", "tokio", @@ -2606,9 +2699,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -2617,9 +2710,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2634,21 +2727,21 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -2661,7 +2754,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2682,14 +2775,14 @@ dependencies = [ "rustls-native-certs 0.5.0", "tokio", "tokio-rustls 0.22.0", - "webpki 0.21.4", + "webpki", ] [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -2699,7 +2792,7 @@ dependencies = [ "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", - "webpki-roots 0.23.1", + "webpki-roots", ] [[package]] @@ -2714,18 +2807,31 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] @@ -2745,20 +2851,19 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2766,9 +2871,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2800,7 +2905,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.51.1", + "windows", ] [[package]] @@ -2831,7 +2936,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -2843,7 +2948,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -2859,12 +2964,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "serde", ] @@ -2892,9 +2997,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2911,17 +3016,23 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -2934,33 +3045,42 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] -name = "itoa" -version = "1.0.9" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] [[package]] -name = "js-sys" -version = "0.3.64" +name = "itoa" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "k256" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -2972,24 +3092,24 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -3059,15 +3179,14 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.41.2" +version = "0.41.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05" +checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f" dependencies = [ "either", "fnv", "futures", "futures-timer", - "instant", "libp2p-identity", "multiaddr", "multihash", @@ -3083,6 +3202,7 @@ dependencies = [ "tracing", "unsigned-varint 0.8.0", "void", + "web-time", ] [[package]] @@ -3134,9 +3254,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.44.1" +version = "0.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20499a945d2f0221fdc6269b3848892c0f370d2ee3e19c7f65a29d8f860f6126" +checksum = "b5d635ebea5ca0c3c3e77d414ae9b67eccf2a822be06091b9c1a0d13029a1e2f" dependencies = [ "asynchronous-codec 0.7.0", "either", @@ -3157,12 +3277,12 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" dependencies = [ "asn1_der", - "bs58 0.5.1", + "bs58", "ed25519-dalek", "hkdf", "libsecp256k1", @@ -3219,7 +3339,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.5", + "socket2", "tokio", "tracing", "void", @@ -3290,9 +3410,9 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0375cdfee57b47b313ef1f0fdb625b78aed770d33a40cf1c294a371ff5e6666" +checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" dependencies = [ "bytes", "futures", @@ -3304,9 +3424,9 @@ dependencies = [ "parking_lot", "quinn", "rand", - "ring 0.16.20", - "rustls 0.21.12", - "socket2 0.5.5", + "ring 0.17.8", + "rustls 0.23.11", + "socket2", "thiserror", "tokio", "tracing", @@ -3314,9 +3434,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12823250fe0c45bdddea6eefa2be9a609aff1283ff4e1d8a294fdbb89572f6f" +checksum = "c314fe28368da5e3a262553fb0ad575c1c8934c461e10de10265551478163836" dependencies = [ "async-trait", "futures", @@ -3334,9 +3454,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.44.1" +version = "0.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92532fc3c4fb292ae30c371815c9b10103718777726ea5497abc268a4761866" +checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e" dependencies = [ "either", "fnv", @@ -3346,6 +3466,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", + "lru", "multistream-select", "once_cell", "rand", @@ -3357,14 +3478,14 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b644268b4acfdaa6a6100b31226ee7a36d96ab4c43287d113bfd2308607d8b6f" +checksum = "5daceb9dd908417b6dfcfe8e94098bc4aac54500c282e78120b885dadc09b999" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -3379,24 +3500,24 @@ dependencies = [ "libc", "libp2p-core", "libp2p-identity", - "socket2 0.5.5", + "socket2", "tokio", "tracing", ] [[package]] name = "libp2p-tls" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ce7e3c2e7569d685d08ec795157981722ff96e9e9f9eae75df3c29d02b07a5" +checksum = "251b17aebdd29df7e8f80e4d94b782fae42e934c49086e1a81ba23b60a8314f2" dependencies = [ "futures", - "futures-rustls", + "futures-rustls 0.26.0", "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.16.20", - "rustls 0.21.12", + "ring 0.17.8", + "rustls 0.23.11", "rustls-webpki 0.101.7", "thiserror", "x509-parser", @@ -3405,9 +3526,9 @@ dependencies = [ [[package]] name = "libp2p-upnp" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49cc89949bf0e06869297cd4fe2c132358c23fe93e76ad43950453df4da3d35" +checksum = "cccf04b0e3ff3de52d07d5fd6c3b061d0e7f908ffc683c32d9638caedce86fc8" dependencies = [ "futures", "futures-timer", @@ -3427,7 +3548,7 @@ checksum = "f4846d51afd08180e164291c3754ba30dd4fbac6fac65571be56403c16431a5e" dependencies = [ "either", "futures", - "futures-rustls", + "futures-rustls 0.24.0", "libp2p-core", "libp2p-identity", "parking_lot", @@ -3436,7 +3557,7 @@ dependencies = [ "soketto", "tracing", "url", - "webpki-roots 0.25.4", + "webpki-roots", ] [[package]] @@ -3451,7 +3572,7 @@ dependencies = [ "thiserror", "tracing", "yamux 0.12.1", - "yamux 0.13.1", + "yamux 0.13.3", ] [[package]] @@ -3510,15 +3631,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3526,9 +3647,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" @@ -3536,7 +3657,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.5", ] [[package]] @@ -3554,12 +3675,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.5.0" @@ -3568,18 +3683,9 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" [[package]] name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -3595,18 +3701,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -3712,6 +3818,32 @@ dependencies = [ "unsigned-varint 0.7.2", ] +[[package]] +name = "native-asset-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "sha2 0.10.8", + "tokio", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "netlink-packet-core" version = "0.4.2" @@ -3813,15 +3945,20 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.46" @@ -3833,9 +3970,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -3846,7 +3983,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -3865,10 +4002,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -3879,33 +4016,59 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.31.1" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" dependencies = [ "asn1-rs", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.70", +] [[package]] name = "openssl-probe" @@ -3913,6 +4076,43 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "oracle-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", + "utils", +] + +[[package]] +name = "oracle-node" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "dotenv", + "fuels", + "futures", + "itertools 0.11.0", + "reqwest", + "serde", + "tokio", + "utils", +] + [[package]] name = "p256" version = "0.13.2" @@ -3933,9 +4133,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3943,22 +4143,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -3985,22 +4185,23 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "serde", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.1" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] @@ -4022,14 +4223,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4048,20 +4249,20 @@ dependencies = [ ] [[package]] -name = "platforms" -version = "3.2.0" +name = "pkg-config" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -4108,15 +4309,22 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", + "embedded-io", "heapless", "serde", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4164,9 +4372,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "uint", @@ -4179,7 +4387,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -4207,9 +4424,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4228,13 +4445,13 @@ dependencies = [ [[package]] name = "prometheus-client-derive-encode" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" +checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.70", ] [[package]] @@ -4283,9 +4500,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" dependencies = [ "bytes", "futures-io", @@ -4293,7 +4510,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.21.12", + "rustls 0.23.11", "thiserror", "tokio", "tracing", @@ -4301,15 +4518,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" dependencies = [ "bytes", "rand", - "ring 0.16.20", + "ring 0.17.8", "rustc-hash", - "rustls 0.21.12", + "rustls 0.23.11", "slab", "thiserror", "tinyvec", @@ -4318,31 +4535,31 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" dependencies = [ - "bytes", "libc", - "socket2 0.5.5", + "once_cell", + "socket2", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.3.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -4376,9 +4593,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4386,14 +4603,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -4410,27 +4625,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -4440,9 +4646,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -4451,15 +4657,23 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "registry-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -4472,11 +4686,13 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls 0.24.2", + "hyper-tls", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -4485,15 +4701,18 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.6", - "winreg 0.10.1", + "webpki-roots", + "winreg", ] [[package]] @@ -4572,9 +4791,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4606,7 +4825,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -4623,7 +4842,7 @@ dependencies = [ "log", "ring 0.16.20", "sct 0.6.1", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -4635,7 +4854,21 @@ dependencies = [ "log", "ring 0.17.8", "rustls-webpki 0.101.7", - "sct 0.7.0", + "sct 0.7.1", +] + +[[package]] +name = "rustls" +version = "0.23.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.5", + "subtle", + "zeroize", ] [[package]] @@ -4664,38 +4897,45 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring 0.17.8", + "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rw-stream-sink" @@ -4710,9 +4950,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -4725,11 +4965,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4788,12 +5028,12 @@ dependencies = [ [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -4840,11 +5080,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -4853,9 +5093,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -4863,35 +5103,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -4912,15 +5152,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -4930,14 +5170,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ - "darling 0.20.8", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -4989,18 +5229,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core", @@ -5008,9 +5248,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -5040,22 +5280,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5090,9 +5320,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -5163,14 +5393,40 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "swap-exact-input" +version = "0.0.0" +dependencies = [ + "fuels", + "test-utils", + "tokio", +] + +[[package]] +name = "swap-exact-output" +version = "0.0.0" +dependencies = [ + "fuels", + "test-utils", + "tokio", +] + +[[package]] +name = "swap-predicate" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] [[package]] name = "syn" @@ -5185,9 +5441,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -5202,26 +5458,13 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", - "unicode-xid", + "syn 2.0.70", ] [[package]] @@ -5254,17 +5497,22 @@ dependencies = [ "serde", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5273,33 +5521,59 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +[[package]] +name = "test-utils" +version = "0.0.0" +dependencies = [ + "fuels", +] + +[[package]] +name = "tests" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", +] + +[[package]] +name = "tictactoe-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", ] [[package]] name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -5307,24 +5581,33 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] +[[package]] +name = "timelock-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5337,9 +5620,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -5349,7 +5632,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -5366,13 +5649,23 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", ] [[package]] @@ -5393,7 +5686,7 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", "tokio", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -5408,9 +5701,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5420,31 +5713,41 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -5518,7 +5821,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] [[package]] @@ -5544,15 +5847,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -5574,36 +5877,30 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" - -[[package]] -name = "unicode-xid" -version = "0.2.4" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "universal-hash" @@ -5654,20 +5951,27 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utils" +version = "0.0.0" +dependencies = [ + "fuels", +] [[package]] name = "uuid" @@ -5681,13 +5985,19 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" @@ -5717,9 +6027,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5727,24 +6037,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -5754,9 +6064,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5764,71 +6074,53 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.21.4" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "js-sys", + "wasm-bindgen", ] [[package]] name = "webpki" -version = "0.22.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ "ring 0.16.20", "untrusted 0.7.1", ] -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki 0.22.0", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.1", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -5877,30 +6169,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ + "windows-core 0.51.1", "windows-targets 0.48.5", ] [[package]] -name = "windows" +name = "windows-core" version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-core", "windows-targets 0.48.5", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -5918,7 +6210,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -5938,17 +6230,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5959,9 +6252,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5971,9 +6264,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5983,9 +6276,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5995,9 +6294,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6007,9 +6306,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6019,9 +6318,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6031,28 +6330,19 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - [[package]] name = "winreg" version = "0.50.0" @@ -6069,6 +6359,15 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "x25519-dalek" version = "2.0.1" @@ -6083,9 +6382,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ "asn1-rs", "data-encoding", @@ -6130,18 +6429,18 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1d0148b89300047e72994bee99ecdabd15a9166a7b70c8b8c37c314dcc9002" +checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" dependencies = [ "futures", - "instant", "log", "nohash-hasher", "parking_lot", "pin-project", "rand", "static_assertions", + "web-time", ] [[package]] @@ -6153,11 +6452,31 @@ dependencies = [ "time", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.70", +] + [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -6170,5 +6489,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.70", ] diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 000000000..7bc63b3ee --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,45 @@ +[workspace] +resolver = "2" +members = [ + # airdrop + "./airdrop/airdrop-contract", + # AMM + "./AMM/AMM-contract", + "./AMM/exchange-contract", + "./AMM/atomic-add-liquidity", + "./AMM/swap-exact-input", + "./AMM/swap-exact-output", + "./AMM/test-utils", + # counter-script + "./counter-script/interaction_script", + # DAO + "./DAO/DAO-contract", + # english-auction + "./english-auction/auction-contract", + # escrow + "./escrow/escrow-contract", + # fractional-NFT + "./fractional-NFT/f-NFT-contract", + # fundraiser + "./fundraiser/fundraiser-contract", + # name-registry + "./name-registry/registry-contract", + # native-asset + "./native-asset/native-asset-contract", + # NFT + "./NFT/NFT-contract", + # oracle + "./oracle/oracle-contract", + "./oracle/oracle-node", + "./oracle/utils", + # OTC-swap-predicate + "./OTC-swap-predicate/swap-predicate", + # TicTacToe + "./TicTacToe/tictactoe-contract", + # timelock + "./timelock/timelock-contract", +] + +[workspace.dependencies] +fuels = { version= "0.62.0", features = ["fuel-core-lib"] } +tokio = { version = "1.12", features = ["rt", "macros"] } \ No newline at end of file diff --git a/DAO/Cargo.toml b/DAO/Cargo.toml deleted file mode 100644 index fddc6607d..000000000 --- a/DAO/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./DAO-contract", -] diff --git a/DAO/DAO-contract/Cargo.toml b/DAO/DAO-contract/Cargo.toml index f2672d55f..d2301ad39 100644 --- a/DAO/DAO-contract/Cargo.toml +++ b/DAO/DAO-contract/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/DAO/DAO-contract/tests/utils/setup.rs b/DAO/DAO-contract/tests/utils/setup.rs index 0dc71dc11..f958b5855 100644 --- a/DAO/DAO-contract/tests/utils/setup.rs +++ b/DAO/DAO-contract/tests/utils/setup.rs @@ -8,7 +8,7 @@ use fuels::{ abigen!(Contract( name = "DaoVoting", - abi = "./DAO-contract/out/debug/DAO-contract-abi.json" + abi = "./DAO/DAO-contract/out/debug/DAO-contract-abi.json" ),); pub(crate) struct Metadata { diff --git a/DAO/Forc.lock b/DAO/Forc.lock index 2df07d427..df38562c4 100644 --- a/DAO/Forc.lock +++ b/DAO/Forc.lock @@ -5,9 +5,9 @@ dependencies = ["std"] [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] diff --git a/DAO/fuel-toolchain.toml b/DAO/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/DAO/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/NFT/Cargo.toml b/NFT/Cargo.toml deleted file mode 100644 index 49ee90540..000000000 --- a/NFT/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./NFT-contract", -] diff --git a/NFT/Forc.lock b/NFT/Forc.lock index 71bc95c23..3040922f1 100644 --- a/NFT/Forc.lock +++ b/NFT/Forc.lock @@ -9,7 +9,7 @@ dependencies = [ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "standards" @@ -18,7 +18,7 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/NFT/NFT-contract/Cargo.toml b/NFT/NFT-contract/Cargo.toml index 95e4ee760..26ef4db5d 100644 --- a/NFT/NFT-contract/Cargo.toml +++ b/NFT/NFT-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "NFT-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } sha2 = { version = "0.10.7" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/NFT/NFT-contract/tests/utils/setup.rs b/NFT/NFT-contract/tests/utils/setup.rs index 82760dd43..2b67c63eb 100644 --- a/NFT/NFT-contract/tests/utils/setup.rs +++ b/NFT/NFT-contract/tests/utils/setup.rs @@ -10,7 +10,7 @@ use sha2::{Digest, Sha256}; abigen!(Contract( name = "NFT", - abi = "./NFT-contract/out/debug/NFT-contract-abi.json" + abi = "./NFT/NFT-contract/out/debug/NFT-contract-abi.json" ),); const NFT_CONTRACT_BINARY_PATH: &str = "./out/debug/NFT-contract.bin"; diff --git a/NFT/fuel-toolchain.toml b/NFT/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/NFT/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/OTC-swap-predicate/Cargo.toml b/OTC-swap-predicate/Cargo.toml deleted file mode 100644 index f9920f456..000000000 --- a/OTC-swap-predicate/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./swap-predicate", -] diff --git a/OTC-swap-predicate/Forc.lock b/OTC-swap-predicate/Forc.lock index bc5e1e83d..79165bb69 100644 --- a/OTC-swap-predicate/Forc.lock +++ b/OTC-swap-predicate/Forc.lock @@ -1,10 +1,10 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/OTC-swap-predicate/fuel-toolchain.toml b/OTC-swap-predicate/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/OTC-swap-predicate/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/OTC-swap-predicate/swap-predicate/Cargo.toml b/OTC-swap-predicate/swap-predicate/Cargo.toml index f8c173815..97583f288 100644 --- a/OTC-swap-predicate/swap-predicate/Cargo.toml +++ b/OTC-swap-predicate/swap-predicate/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "swap-predicate" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/OTC-swap-predicate/swap-predicate/src/main.sw b/OTC-swap-predicate/swap-predicate/src/main.sw index 3cf95775a..19f4e1af9 100644 --- a/OTC-swap-predicate/swap-predicate/src/main.sw +++ b/OTC-swap-predicate/swap-predicate/src/main.sw @@ -37,7 +37,7 @@ fn main() -> bool { // The spending transaction must have an output that sends `ask_amount` of `ask_asset` to `receiver` // Check if the transaction contains a single input coin from the receiver, to cancel their own order (in addition to this predicate) - if input_count() == 2u8 { + if input_count() == 2u16 { match (input_coin_owner(0), input_coin_owner(1)) { (Some(owner1), Some(owner2)) => { if owner1 == RECEIVER || owner2 == RECEIVER { diff --git a/OTC-swap-predicate/swap-predicate/tests/utils/mod.rs b/OTC-swap-predicate/swap-predicate/tests/utils/mod.rs index f55a3e90c..eb655c58d 100644 --- a/OTC-swap-predicate/swap-predicate/tests/utils/mod.rs +++ b/OTC-swap-predicate/swap-predicate/tests/utils/mod.rs @@ -15,7 +15,7 @@ use fuels::{ abigen!(Predicate( name = "SwapPredicate", - abi = "./swap-predicate/out/debug/swap-predicate-abi.json" + abi = "./OTC-swap-predicate/swap-predicate/out/debug/swap-predicate-abi.json" )); // The fee-paying base asset diff --git a/README.md b/README.md index 61d8c1156..9998eb2cd 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,6 @@ sway-applications/ #### Governance - [Decentralized Autonomous Organization (DAO)](./DAO) is an organization where users get to vote on governance proposals using governance assets. -- [Multi-Signature Wallet](./multisig-wallet) is a wallet that requires multiple signatures to execute a transaction. #### Other @@ -83,6 +82,10 @@ sway-applications/ The below apps are updated to the latest version, but may have broken tests or broken functionality. Use at your own discretion. - [Automated Market Maker (AMM)](./AMM) is a decentralized exchange protocol that manages liquidity pools supplied by its users and determines prices algorithmically while exchanging assets. +#### Archive +The below apps are not updated to the latest version and are not currently maintained. Use at your own discretion. +- [Multi-Signature Wallet](./multisig-wallet) is a wallet that requires multiple signatures to execute a transaction. + ## Running a project If you wish to run any of the projects then clone this repository and go through the general [installation](https://fuellabs.github.io/sway/) steps required to use our tools. diff --git a/TicTacToe/Cargo.toml b/TicTacToe/Cargo.toml deleted file mode 100644 index 3fa4cda22..000000000 --- a/TicTacToe/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./tictactoe-contract", -] diff --git a/TicTacToe/Forc.lock b/TicTacToe/Forc.lock index 35122ea72..0bdfd1fff 100644 --- a/TicTacToe/Forc.lock +++ b/TicTacToe/Forc.lock @@ -1,10 +1,10 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/TicTacToe/fuel-toolchain.toml b/TicTacToe/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/TicTacToe/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/TicTacToe/tictactoe-contract/Cargo.toml b/TicTacToe/tictactoe-contract/Cargo.toml index e02cc47ff..34ce83fdc 100644 --- a/TicTacToe/tictactoe-contract/Cargo.toml +++ b/TicTacToe/tictactoe-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "tictactoe-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/TicTacToe/tictactoe-contract/tests/utils/setup.rs b/TicTacToe/tictactoe-contract/tests/utils/setup.rs index b46f91bfa..57ecb681f 100644 --- a/TicTacToe/tictactoe-contract/tests/utils/setup.rs +++ b/TicTacToe/tictactoe-contract/tests/utils/setup.rs @@ -9,7 +9,7 @@ use fuels::{ abigen!(Contract( name = "TicTacToe", - abi = "./tictactoe-contract/out/debug/tictactoe-contract-abi.json" + abi = "./TicTacToe/tictactoe-contract/out/debug/tictactoe-contract-abi.json" )); const TICTACTOE_CONTRACT_BINARY_PATH: &str = "./out/debug/tictactoe-contract.bin"; diff --git a/airdrop/Cargo.toml b/airdrop/Cargo.toml deleted file mode 100644 index 8f1c05940..000000000 --- a/airdrop/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./airdrop-contract", -] diff --git a/airdrop/Forc.lock b/airdrop/Forc.lock index 01a2f1632..c2f5a5340 100644 --- a/airdrop/Forc.lock +++ b/airdrop/Forc.lock @@ -8,7 +8,7 @@ dependencies = [ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "standards" @@ -17,7 +17,7 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/airdrop/airdrop-contract/Cargo.toml b/airdrop/airdrop-contract/Cargo.toml index 42a820da6..0a4fe1f18 100644 --- a/airdrop/airdrop-contract/Cargo.toml +++ b/airdrop/airdrop-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "distributor-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -7,9 +7,9 @@ license = "Apache-2.0" [dependencies] fuel-merkle = { version = "0.33.0" } -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } sha2 = { version = "0.10.7" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/airdrop/airdrop-contract/tests/utils/setup.rs b/airdrop/airdrop-contract/tests/utils/setup.rs index bc3286b71..3f8c465e0 100644 --- a/airdrop/airdrop-contract/tests/utils/setup.rs +++ b/airdrop/airdrop-contract/tests/utils/setup.rs @@ -17,7 +17,7 @@ pub const LEAF: u8 = 0x00; abigen!(Contract( name = "AirdropDistributor", - abi = "./airdrop-contract/out/debug/airdrop-contract-abi.json" + abi = "./airdrop/airdrop-contract/out/debug/airdrop-contract-abi.json" ),); pub(crate) struct Metadata { diff --git a/airdrop/fuel-toolchain.toml b/airdrop/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/airdrop/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/counter-script/Cargo.toml b/counter-script/Cargo.toml deleted file mode 100644 index 18b4782c7..000000000 --- a/counter-script/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./interaction_script", -] diff --git a/counter-script/Forc.lock b/counter-script/Forc.lock index 6eeb19f59..72b9ef0f6 100644 --- a/counter-script/Forc.lock +++ b/counter-script/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "counter_contract" @@ -25,5 +25,5 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] diff --git a/counter-script/fuel-toolchain.toml b/counter-script/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/counter-script/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/counter-script/interaction_script/Cargo.toml b/counter-script/interaction_script/Cargo.toml index 9b3a2c4fd..65dd795ba 100644 --- a/counter-script/interaction_script/Cargo.toml +++ b/counter-script/interaction_script/Cargo.toml @@ -3,10 +3,9 @@ name = "tests" version = "0.0.0" edition = "2021" - [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/counter-script/interaction_script/tests/harness.rs b/counter-script/interaction_script/tests/harness.rs index 0cd4ad2a6..b1e36eaa5 100644 --- a/counter-script/interaction_script/tests/harness.rs +++ b/counter-script/interaction_script/tests/harness.rs @@ -11,11 +11,11 @@ use fuels::{ abigen!( Contract( name = "CounterContract", - abi = "./counter/out/debug/counter_contract-abi.json" + abi = "./counter-script/counter/out/debug/counter_contract-abi.json" ), Script( name = "InteractionScript", - abi = "./interaction_script/out/debug/interaction_script-abi.json" + abi = "./counter-script/interaction_script/out/debug/interaction_script-abi.json" ) ); diff --git a/english-auction/Cargo.toml b/english-auction/Cargo.toml deleted file mode 100644 index 119b724b4..000000000 --- a/english-auction/Cargo.toml +++ /dev/null @@ -1,3 +0,0 @@ -[workspace] -resolver = "2" -members = ["./auction-contract"] diff --git a/english-auction/Forc.lock b/english-auction/Forc.lock index e036b1e26..b6533e723 100644 --- a/english-auction/Forc.lock +++ b/english-auction/Forc.lock @@ -5,9 +5,9 @@ dependencies = ["std"] [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] diff --git a/english-auction/auction-contract/Cargo.toml b/english-auction/auction-contract/Cargo.toml index f86e4ec39..168e2d04a 100644 --- a/english-auction/auction-contract/Cargo.toml +++ b/english-auction/auction-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "auction-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/english-auction/auction-contract/tests/utils/setup.rs b/english-auction/auction-contract/tests/utils/setup.rs index 8fb1ee5da..032d3d556 100644 --- a/english-auction/auction-contract/tests/utils/setup.rs +++ b/english-auction/auction-contract/tests/utils/setup.rs @@ -9,7 +9,7 @@ use fuels::{ abigen!(Contract( name = "EnglishAuction", - abi = "./auction-contract/out/debug/auction-contract-abi.json" + abi = "./english-auction/auction-contract/out/debug/auction-contract-abi.json" ),); const AUCTION_CONTRACT_BINARY_PATH: &str = "./out/debug/auction-contract.bin"; diff --git a/english-auction/fuel-toolchain.toml b/english-auction/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/english-auction/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/escrow/Cargo.toml b/escrow/Cargo.toml deleted file mode 100644 index 56308df89..000000000 --- a/escrow/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./escrow-contract", -] diff --git a/escrow/escrow-contract/Cargo.toml b/escrow/escrow-contract/Cargo.toml index 39f8b958b..eebee3edb 100644 --- a/escrow/escrow-contract/Cargo.toml +++ b/escrow/escrow-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "escrow-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/escrow/escrow-contract/tests/utils/setup.rs b/escrow/escrow-contract/tests/utils/setup.rs index 4a13eaed4..a1d0709fd 100644 --- a/escrow/escrow-contract/tests/utils/setup.rs +++ b/escrow/escrow-contract/tests/utils/setup.rs @@ -11,7 +11,7 @@ use fuels::{ abigen!(Contract( name = "Escrow", - abi = "./escrow-contract/out/debug/escrow-contract-abi.json" + abi = "./escrow/escrow-contract/out/debug/escrow-contract-abi.json" ),); const ESCROW_CONTRACT_BINARY_PATH: &str = "./out/debug/escrow-contract.bin"; diff --git a/escrow/fuel-toolchain.toml b/escrow/fuel-toolchain.toml index 4ad9c62ba..8c5957ba3 100644 --- a/escrow/fuel-toolchain.toml +++ b/escrow/fuel-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] -channel = "nightly-2024-05-28" +channel = "nightly-2024-07-12" [components] forc = "0.59.0" -fuel-core = "0.26.0" \ No newline at end of file +fuel-core = "0.31.0" \ No newline at end of file diff --git a/fractional-NFT/Cargo.toml b/fractional-NFT/Cargo.toml deleted file mode 100644 index 872171e25..000000000 --- a/fractional-NFT/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./f-NFT-contract", -] diff --git a/fractional-NFT/Forc.lock b/fractional-NFT/Forc.lock index b7282783e..171d0d3ff 100644 --- a/fractional-NFT/Forc.lock +++ b/fractional-NFT/Forc.lock @@ -9,7 +9,7 @@ dependencies = [ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "f-NFT-contract" @@ -31,7 +31,7 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/fractional-NFT/f-NFT-contract/Cargo.toml b/fractional-NFT/f-NFT-contract/Cargo.toml index fb7c5e1b7..8da5a6824 100644 --- a/fractional-NFT/f-NFT-contract/Cargo.toml +++ b/fractional-NFT/f-NFT-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "f-NFT-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } sha2 = { version = "0.10.7" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/fractional-NFT/f-NFT-contract/tests/utils/setup.rs b/fractional-NFT/f-NFT-contract/tests/utils/setup.rs index 0aa201bd0..5be413e55 100644 --- a/fractional-NFT/f-NFT-contract/tests/utils/setup.rs +++ b/fractional-NFT/f-NFT-contract/tests/utils/setup.rs @@ -12,11 +12,11 @@ use sha2::{Digest, Sha256}; abigen!( Contract( name = "F_NFT", - abi = "./f-NFT-contract/out/debug/f-NFT-contract-abi.json" + abi = "./fractional-NFT/f-NFT-contract/out/debug/f-NFT-contract-abi.json" ), Contract( name = "NFT", - abi = "./test-artifacts/out/debug/NFT-contract-abi.json" + abi = "./fractional-NFT/test-artifacts/out/debug/NFT-contract-abi.json" ), ); diff --git a/fractional-NFT/fuel-toolchain.toml b/fractional-NFT/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/fractional-NFT/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/fuel-toolchain.toml b/fuel-toolchain.toml new file mode 100644 index 000000000..5caab38bc --- /dev/null +++ b/fuel-toolchain.toml @@ -0,0 +1,6 @@ +[toolchain] +channel = "nightly-2024-07-12" + +[components] +forc = "0.61.2" +fuel-core = "0.31.0" \ No newline at end of file diff --git a/fundraiser/Cargo.toml b/fundraiser/Cargo.toml deleted file mode 100644 index e5a4cf113..000000000 --- a/fundraiser/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./fundraiser-contract", -] diff --git a/fundraiser/Forc.lock b/fundraiser/Forc.lock index 1ac0dd38e..c097a3b73 100644 --- a/fundraiser/Forc.lock +++ b/fundraiser/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "fundraiser-contract" @@ -9,5 +9,5 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] diff --git a/fundraiser/fuel-toolchain.toml b/fundraiser/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/fundraiser/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/fundraiser/fundraiser-contract/Cargo.toml b/fundraiser/fundraiser-contract/Cargo.toml index fa4140f70..c79b5ba19 100644 --- a/fundraiser/fundraiser-contract/Cargo.toml +++ b/fundraiser/fundraiser-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "fundraiser-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/fundraiser/fundraiser-contract/tests/utils/setup.rs b/fundraiser/fundraiser-contract/tests/utils/setup.rs index 4c79a1ac8..42abe3c6b 100644 --- a/fundraiser/fundraiser-contract/tests/utils/setup.rs +++ b/fundraiser/fundraiser-contract/tests/utils/setup.rs @@ -9,7 +9,7 @@ use fuels::{ abigen!(Contract( name = "Fundraiser", - abi = "./fundraiser-contract/out/debug/fundraiser-contract-abi.json" + abi = "./fundraiser/fundraiser-contract/out/debug/fundraiser-contract-abi.json" ),); const FUNDRAISER_CONTRACT_BINARY_PATH: &str = "./out/debug/fundraiser-contract.bin"; diff --git a/name-registry/Cargo.toml b/name-registry/Cargo.toml deleted file mode 100644 index c026e5b0b..000000000 --- a/name-registry/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./registry-contract", -] diff --git a/name-registry/Forc.lock b/name-registry/Forc.lock index 3289c29d5..87f438a21 100644 --- a/name-registry/Forc.lock +++ b/name-registry/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "registry-contract" @@ -9,5 +9,5 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] diff --git a/name-registry/fuel-toolchain.toml b/name-registry/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/name-registry/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/name-registry/registry-contract/Cargo.toml b/name-registry/registry-contract/Cargo.toml index c0fe0e61f..ff3b2b383 100644 --- a/name-registry/registry-contract/Cargo.toml +++ b/name-registry/registry-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "registry-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/name-registry/registry-contract/tests/utils/setup.rs b/name-registry/registry-contract/tests/utils/setup.rs index d0ad96ff7..5cd7d7fd8 100644 --- a/name-registry/registry-contract/tests/utils/setup.rs +++ b/name-registry/registry-contract/tests/utils/setup.rs @@ -15,7 +15,7 @@ use fuels::{ abigen!(Contract( name = "NameRegistry", - abi = "./registry-contract/out/debug/registry-contract-abi.json" + abi = "./name-registry/registry-contract/out/debug/registry-contract-abi.json" )); pub(crate) const REGISTER_DURATION: u64 = 10000; diff --git a/native-asset/Cargo.toml b/native-asset/Cargo.toml deleted file mode 100644 index 21f1fcb75..000000000 --- a/native-asset/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./native-asset-contract", -] diff --git a/native-asset/Forc.lock b/native-asset/Forc.lock index 03ddef3e3..2cead703b 100644 --- a/native-asset/Forc.lock +++ b/native-asset/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "native-asset-contract" @@ -18,7 +18,7 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/native-asset/fuel-toolchain.toml b/native-asset/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/native-asset/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/native-asset/native-asset-contract/Cargo.toml b/native-asset/native-asset-contract/Cargo.toml index 8c4d7a8b9..78df5ec19 100644 --- a/native-asset/native-asset-contract/Cargo.toml +++ b/native-asset/native-asset-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "native-asset-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } sha2 = { version = "0.10.7" } -tokio = { version = "1.12", features = ["rt", "macros"] } +tokio = { workspace = true } [[test]] harness = true diff --git a/native-asset/native-asset-contract/tests/utils/setup.rs b/native-asset/native-asset-contract/tests/utils/setup.rs index 41751beef..88c45d7f1 100644 --- a/native-asset/native-asset-contract/tests/utils/setup.rs +++ b/native-asset/native-asset-contract/tests/utils/setup.rs @@ -10,7 +10,7 @@ use sha2::{Digest, Sha256}; abigen!(Contract( name = "NativeAsset", - abi = "./native-asset-contract/out/debug/native-asset-contract-abi.json" + abi = "./native-asset/native-asset-contract/out/debug/native-asset-contract-abi.json" ),); const NATIVE_ASSET_CONTRACT_BINARY_PATH: &str = "./out/debug/native-asset-contract.bin"; diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml deleted file mode 100644 index 0d39e57d2..000000000 --- a/oracle/Cargo.toml +++ /dev/null @@ -1,7 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./oracle-contract", - "./oracle-node", - "./utils", -] diff --git a/oracle/Forc.lock b/oracle/Forc.lock index b08f44cf2..9960f3879 100644 --- a/oracle/Forc.lock +++ b/oracle/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "oracle-contract" @@ -9,5 +9,5 @@ dependencies = ["std"] [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] diff --git a/oracle/fuel-toolchain.toml b/oracle/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/oracle/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/oracle/oracle-contract/Cargo.toml b/oracle/oracle-contract/Cargo.toml index 17440dc45..f82238a69 100644 --- a/oracle/oracle-contract/Cargo.toml +++ b/oracle/oracle-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "oracle-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["full"] } +fuels = { workspace = true } +tokio = { workspace = true } utils = { path = "../utils" } [[test]] diff --git a/oracle/oracle-node/Cargo.toml b/oracle/oracle-node/Cargo.toml index b30c7dc51..064248d20 100644 --- a/oracle/oracle-node/Cargo.toml +++ b/oracle/oracle-node/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "oracle-node" version = "0.0.0" authors = ["Fuel Labs "] @@ -9,12 +9,12 @@ license = "Apache-2.0" anyhow = "1.0.71" async-trait = "0.1.71" dotenv = "0.15.0" -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } futures = "0.3" itertools = "0.11" reqwest = { version = "0.11.18", features = ["json"] } serde = { version = "1.0", features = ["derive"] } -tokio = { version = "1.12", features = ["full"] } +tokio = { workspace = true } utils = { path = "../utils" } [[test]] diff --git a/oracle/utils/Cargo.toml b/oracle/utils/Cargo.toml index 2695d9f97..e4ddd3ee3 100644 --- a/oracle/utils/Cargo.toml +++ b/oracle/utils/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "utils" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } +fuels = { workspace = true } [lib] test = false diff --git a/oracle/utils/src/lib.rs b/oracle/utils/src/lib.rs index f7fbf57c9..1dcf8c2e5 100644 --- a/oracle/utils/src/lib.rs +++ b/oracle/utils/src/lib.rs @@ -10,7 +10,7 @@ use fuels::{ abigen!(Contract( name = "Oracle", - abi = "./oracle-contract/out/debug/oracle-contract-abi.json" + abi = "./oracle/oracle-contract/out/debug/oracle-contract-abi.json" )); pub struct Metadata { diff --git a/timelock/Cargo.toml b/timelock/Cargo.toml deleted file mode 100644 index e1801b2dd..000000000 --- a/timelock/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./timelock-contract", -] diff --git a/timelock/Forc.lock b/timelock/Forc.lock index 726b5fb42..eaa9acfd5 100644 --- a/timelock/Forc.lock +++ b/timelock/Forc.lock @@ -1,10 +1,10 @@ [[package]] name = "core" -source = "path+from-root-E19CE48B3E858B72" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/timelock/fuel-toolchain.toml b/timelock/fuel-toolchain.toml deleted file mode 100644 index a2a9da035..000000000 --- a/timelock/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-05-28" - -[components] -forc = "0.60.0" -fuel-core = "0.26.0" \ No newline at end of file diff --git a/timelock/timelock-contract/Cargo.toml b/timelock/timelock-contract/Cargo.toml index 4301043ec..16822f6cb 100644 --- a/timelock/timelock-contract/Cargo.toml +++ b/timelock/timelock-contract/Cargo.toml @@ -1,4 +1,4 @@ -[project] +[package] name = "timelock-contract" version = "0.0.0" authors = ["Fuel Labs "] @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.62.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/timelock/timelock-contract/tests/utils/setup.rs b/timelock/timelock-contract/tests/utils/setup.rs index 33a98df6f..bdf64d3a3 100644 --- a/timelock/timelock-contract/tests/utils/setup.rs +++ b/timelock/timelock-contract/tests/utils/setup.rs @@ -11,7 +11,7 @@ use fuels::{ // Load abi from json abigen!(Contract( name = "Timelock", - abi = "./timelock-contract/out/debug/timelock-contract-abi.json" + abi = "./timelock/timelock-contract/out/debug/timelock-contract-abi.json" )); const TIMELOCK_CONTRACT_BINARY_PATH: &str = "./out/debug/timelock-contract.bin"; const TIMELOCK_CONTRACT_STORAGE_PATH: &str = "./out/debug/timelock-contract-storage_slots.json"; From 211a2313c6bf44c3938925ccd7f72513bd938d92 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Fri, 12 Jul 2024 13:01:26 +0530 Subject: [PATCH 02/23] change ci --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1822e4ecb..06f8dabc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,7 +85,6 @@ jobs: - name: Check Rust formatting run: | - cd ${{ matrix.project }} cargo fmt --verbose --check - name: Build Sway @@ -95,17 +94,14 @@ jobs: - name: Build Rust files run: | - cd ${{ matrix.project }} cargo build --locked - name: Check Clippy Linter run: | - cd ${{ matrix.project }} cargo clippy --all-features --all-targets -- -D warnings - name: Run Rust tests run: | - cd ${{ matrix.project }} cargo test --locked - name: Run Sway tests From 9ec68c32d435328c793264f928c65c73f4e685ed Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Fri, 12 Jul 2024 13:10:26 +0530 Subject: [PATCH 03/23] fix devops template --- .devops/.template/.gitignore | 2 +- .devops/.template/Cargo.toml | 6 ------ .devops/.template/Forc.lock | 4 ++-- .devops/.template/fuel-toolchain.toml | 6 ------ .devops/.template/template-contract/Cargo.toml | 4 ++-- .devops/.template/template-contract/tests/utils/setup.rs | 2 +- Cargo.lock | 8 ++++++++ Cargo.toml | 2 ++ 8 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 .devops/.template/Cargo.toml delete mode 100644 .devops/.template/fuel-toolchain.toml diff --git a/.devops/.template/.gitignore b/.devops/.template/.gitignore index 03a4f8bfc..e9fb3e876 100644 --- a/.devops/.template/.gitignore +++ b/.devops/.template/.gitignore @@ -1,2 +1,2 @@ target -project/contracts/template-contract/out +template-contract/out diff --git a/.devops/.template/Cargo.toml b/.devops/.template/Cargo.toml deleted file mode 100644 index 4f5f19493..000000000 --- a/.devops/.template/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[workspace] -resolver = "2" -members = [ - "./template-contract", -] - diff --git a/.devops/.template/Forc.lock b/.devops/.template/Forc.lock index f6c5dc442..b025e4e63 100644 --- a/.devops/.template/Forc.lock +++ b/.devops/.template/Forc.lock @@ -1,10 +1,10 @@ [[package]] name = "core" -source = "path+from-root-C3992B43B72ADB8C" +source = "path+from-root-CC22FE9C5CBB0084" [[package]] name = "std" -source = "git+https://github.com/fuellabs/sway?tag=v0.49.1#2ac7030570f22510b0ac2a7b5ddf7baa20bdc0e1" +source = "git+https://github.com/fuellabs/sway?tag=v0.61.2#e1b1c2bee73e0ba825e07736cefa6c0abd079595" dependencies = ["core"] [[package]] diff --git a/.devops/.template/fuel-toolchain.toml b/.devops/.template/fuel-toolchain.toml deleted file mode 100644 index e75c0bb58..000000000 --- a/.devops/.template/fuel-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-01-24" - -[components] -forc = "0.49.1" -fuel-core = "0.22.0" diff --git a/.devops/.template/template-contract/Cargo.toml b/.devops/.template/template-contract/Cargo.toml index 57a1eb907..edd49a727 100644 --- a/.devops/.template/template-contract/Cargo.toml +++ b/.devops/.template/template-contract/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -fuels = { version = "0.53.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true diff --git a/.devops/.template/template-contract/tests/utils/setup.rs b/.devops/.template/template-contract/tests/utils/setup.rs index 182c29ca5..d47a30044 100644 --- a/.devops/.template/template-contract/tests/utils/setup.rs +++ b/.devops/.template/template-contract/tests/utils/setup.rs @@ -2,7 +2,7 @@ use fuels::prelude::*; abigen!(Contract( name = "Template", - abi = "./template-contract/out/debug/template-contract-abi.json" + abi = "./.devops/.template/template-contract/out/debug/template-contract-abi.json" )); const TEMPLATE_CONTRACT_BINARY_PATH: &str = "./out/debug/template-contract.bin"; diff --git a/Cargo.lock b/Cargo.lock index 0a9e42977..a036022a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5515,6 +5515,14 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "template-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "termtree" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index 7bc63b3ee..97fc50d2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,8 @@ [workspace] resolver = "2" members = [ + # .devops + "./.devops/.template/template-contract", # airdrop "./airdrop/airdrop-contract", # AMM From addbf3ad0142aef7776a5b93beec895ab7b03398 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Fri, 12 Jul 2024 13:15:16 +0530 Subject: [PATCH 04/23] add exclude to workspace --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 97fc50d2a..1edfd5925 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,6 +41,9 @@ members = [ # timelock "./timelock/timelock-contract", ] +exclude = [ + ".devops/aurora", +] [workspace.dependencies] fuels = { version= "0.62.0", features = ["fuel-core-lib"] } From b84461012d6e15c0b36739367fe321eb4686dd4f Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Fri, 12 Jul 2024 13:17:20 +0530 Subject: [PATCH 05/23] remove multisig from ci --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06f8dabc1..5d7ed4db5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,6 @@ jobs: "escrow", "fundraiser", "TicTacToe", - "multisig-wallet", "name-registry", "NFT", "native-asset", From 3f0c58f5937d899afd07d070b88d19b924e138e8 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Fri, 12 Jul 2024 13:29:05 +0530 Subject: [PATCH 06/23] only test specific packages in ci --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d7ed4db5..61694c1b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: - name: Check Rust formatting run: | - cargo fmt --verbose --check + cargo fmt --verbose --check --package ${{ matrix.project }} - name: Build Sway run: | @@ -93,15 +93,15 @@ jobs: - name: Build Rust files run: | - cargo build --locked + cargo build --locked --package ${{ matrix.project }} - name: Check Clippy Linter run: | - cargo clippy --all-features --all-targets -- -D warnings + cargo clippy --all-features --all-targets -- -D warnings --package ${{ matrix.project }} - name: Run Rust tests run: | - cargo test --locked + cargo test --locked --package ${{ matrix.project }} - name: Run Sway tests run: | From 2b4d785571c555fb92675a215578f4687d0faeec Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:39:03 +0530 Subject: [PATCH 07/23] rearrange AMM project --- .github/workflows/ci.yml | 8 +- AMM/{AMM-contract => }/Cargo.toml | 13 +- AMM/Forc.toml | 2 +- AMM/atomic-add-liquidity/Cargo.toml | 16 - AMM/exchange-contract/Cargo.toml | 16 - .../malicious-implementation/Forc.toml | 2 +- .../malicious-implementation/src/main.sw | 0 AMM/swap-exact-input/Cargo.toml | 16 - AMM/swap-exact-output/Cargo.toml | 16 - AMM/test-utils/Cargo.toml | 12 - AMM/test-utils/src/paths.rs | 14 - .../amm_contract}/functions/add_pool.rs | 8 +- .../amm_contract}/functions/initialize.rs | 8 +- .../amm_contract}/functions/mod.rs | 0 .../amm_contract}/functions/pool.rs | 4 +- .../harness.rs => tests/amm_contract/mod.rs} | 0 .../tests => tests/amm_contract}/utils/mod.rs | 2 +- .../atomic_add_liquidity}/cases/mod.rs | 0 .../atomic_add_liquidity}/cases/revert.rs | 2 +- .../atomic_add_liquidity}/cases/success.rs | 2 +- .../atomic_add_liquidity/mod.rs} | 0 .../atomic_add_liquidity}/utils/mod.rs | 2 +- .../functions/add_liquidity.rs | 10 +- .../exchange_contract}/functions/balance.rs | 8 +- .../functions/constructor.rs | 6 +- .../exchange_contract}/functions/deposit.rs | 8 +- .../exchange_contract}/functions/mod.rs | 0 .../exchange_contract}/functions/pool_info.rs | 8 +- .../functions/preview_add_liquidity.rs | 8 +- .../functions/preview_swap_exact_input.rs | 8 +- .../functions/preview_swap_exact_output.rs | 8 +- .../functions/remove_liquidity.rs | 10 +- .../functions/swap_exact_input.rs | 10 +- .../functions/swap_exact_output.rs | 10 +- .../exchange_contract}/functions/withdraw.rs | 8 +- .../exchange_contract/mod.rs} | 0 .../exchange_contract}/utils/mod.rs | 2 +- AMM/tests/harness.rs | 5 + .../swap_exact_input}/cases/mod.rs | 0 .../swap_exact_input}/cases/revert.rs | 2 +- .../swap_exact_input}/cases/success.rs | 2 +- .../swap_exact_input/mod.rs} | 0 .../swap_exact_input}/utils/mod.rs | 2 +- .../swap_exact_output}/cases/mod.rs | 0 .../swap_exact_output}/cases/revert.rs | 2 +- .../swap_exact_output}/cases/success.rs | 2 +- .../swap_exact_output/mod.rs} | 0 .../swap_exact_output}/utils/mod.rs | 2 +- .../test_utils}/data_structures.rs | 0 .../src => tests/test_utils}/interface.rs | 0 .../src/lib.rs => tests/test_utils/mod.rs} | 0 AMM/tests/test_utils/paths.rs | 14 + .../src => tests/test_utils}/setup.rs | 4 +- Cargo.lock | 346 +----------------- Cargo.toml | 55 +-- airdrop/airdrop-contract/Cargo.toml | 2 +- 56 files changed, 127 insertions(+), 558 deletions(-) rename AMM/{AMM-contract => }/Cargo.toml (66%) delete mode 100644 AMM/atomic-add-liquidity/Cargo.toml delete mode 100644 AMM/exchange-contract/Cargo.toml rename AMM/{test-utils/test-artifacts => }/malicious-implementation/Forc.toml (76%) rename AMM/{test-utils/test-artifacts => }/malicious-implementation/src/main.sw (100%) delete mode 100644 AMM/swap-exact-input/Cargo.toml delete mode 100644 AMM/swap-exact-output/Cargo.toml delete mode 100644 AMM/test-utils/Cargo.toml delete mode 100644 AMM/test-utils/src/paths.rs rename AMM/{AMM-contract/tests => tests/amm_contract}/functions/add_pool.rs (97%) rename AMM/{AMM-contract/tests => tests/amm_contract}/functions/initialize.rs (90%) rename AMM/{AMM-contract/tests => tests/amm_contract}/functions/mod.rs (100%) rename AMM/{AMM-contract/tests => tests/amm_contract}/functions/pool.rs (95%) rename AMM/{AMM-contract/tests/harness.rs => tests/amm_contract/mod.rs} (100%) rename AMM/{AMM-contract/tests => tests/amm_contract}/utils/mod.rs (97%) rename AMM/{atomic-add-liquidity/tests => tests/atomic_add_liquidity}/cases/mod.rs (100%) rename AMM/{atomic-add-liquidity/tests => tests/atomic_add_liquidity}/cases/revert.rs (99%) rename AMM/{atomic-add-liquidity/tests => tests/atomic_add_liquidity}/cases/success.rs (99%) rename AMM/{atomic-add-liquidity/tests/harness.rs => tests/atomic_add_liquidity/mod.rs} (100%) rename AMM/{atomic-add-liquidity/tests => tests/atomic_add_liquidity}/utils/mod.rs (99%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/add_liquidity.rs (98%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/balance.rs (87%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/constructor.rs (88%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/deposit.rs (94%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/mod.rs (100%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/pool_info.rs (90%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/preview_add_liquidity.rs (97%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/preview_swap_exact_input.rs (92%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/preview_swap_exact_output.rs (95%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/remove_liquidity.rs (98%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/swap_exact_input.rs (96%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/swap_exact_output.rs (97%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/functions/withdraw.rs (94%) rename AMM/{exchange-contract/tests/harness.rs => tests/exchange_contract/mod.rs} (100%) rename AMM/{exchange-contract/tests => tests/exchange_contract}/utils/mod.rs (99%) create mode 100644 AMM/tests/harness.rs rename AMM/{swap-exact-input/tests => tests/swap_exact_input}/cases/mod.rs (100%) rename AMM/{swap-exact-input/tests => tests/swap_exact_input}/cases/revert.rs (96%) rename AMM/{swap-exact-input/tests => tests/swap_exact_input}/cases/success.rs (95%) rename AMM/{swap-exact-input/tests/harness.rs => tests/swap_exact_input/mod.rs} (100%) rename AMM/{swap-exact-input/tests => tests/swap_exact_input}/utils/mod.rs (99%) rename AMM/{swap-exact-output/tests => tests/swap_exact_output}/cases/mod.rs (100%) rename AMM/{swap-exact-output/tests => tests/swap_exact_output}/cases/revert.rs (99%) rename AMM/{swap-exact-output/tests => tests/swap_exact_output}/cases/success.rs (95%) rename AMM/{swap-exact-output/tests/harness.rs => tests/swap_exact_output/mod.rs} (100%) rename AMM/{swap-exact-output/tests => tests/swap_exact_output}/utils/mod.rs (99%) rename AMM/{test-utils/src => tests/test_utils}/data_structures.rs (100%) rename AMM/{test-utils/src => tests/test_utils}/interface.rs (100%) rename AMM/{test-utils/src/lib.rs => tests/test_utils/mod.rs} (100%) create mode 100644 AMM/tests/test_utils/paths.rs rename AMM/{test-utils/src => tests/test_utils}/setup.rs (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61694c1b6..733b378d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: - name: Check Rust formatting run: | - cargo fmt --verbose --check --package ${{ matrix.project }} + cargo fmt --verbose --check - name: Build Sway run: | @@ -93,15 +93,15 @@ jobs: - name: Build Rust files run: | - cargo build --locked --package ${{ matrix.project }} + cargo build --locked --package "${{ matrix.project }}*" - name: Check Clippy Linter run: | - cargo clippy --all-features --all-targets -- -D warnings --package ${{ matrix.project }} + cargo clippy --all-features --all-targets -- -D warnings --package "${{ matrix.project }}*" - name: Run Rust tests run: | - cargo test --locked --package ${{ matrix.project }} + cargo test --locked - name: Run Sway tests run: | diff --git a/AMM/AMM-contract/Cargo.toml b/AMM/Cargo.toml similarity index 66% rename from AMM/AMM-contract/Cargo.toml rename to AMM/Cargo.toml index ee16eee35..b4ee84578 100644 --- a/AMM/AMM-contract/Cargo.toml +++ b/AMM/Cargo.toml @@ -1,16 +1,15 @@ [package] -name = "AMM-contract" +name = "AMM" version = "0.0.0" authors = ["Fuel Labs "] edition = "2021" license = "Apache-2.0" -[dependencies] -fuels = { workspace = true } -test-utils = { path = "../test-utils" } -tokio = { workspace = true } - [[test]] harness = true -name = "tests" +name = "AMM_tests" path = "tests/harness.rs" + +[dependencies] +fuels = { workspace = true } +tokio = { workspace = true } \ No newline at end of file diff --git a/AMM/Forc.toml b/AMM/Forc.toml index e2ccced2c..b0133db3c 100644 --- a/AMM/Forc.toml +++ b/AMM/Forc.toml @@ -2,7 +2,7 @@ members = [ "./AMM-contract", "./exchange-contract", - "./test-utils/test-artifacts/malicious-implementation", + "./malicious-implementation", "./atomic-add-liquidity", "./swap-exact-input", "./swap-exact-output", diff --git a/AMM/atomic-add-liquidity/Cargo.toml b/AMM/atomic-add-liquidity/Cargo.toml deleted file mode 100644 index d49fc931d..000000000 --- a/AMM/atomic-add-liquidity/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "atomic-add-liquidity" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dev-dependencies] -fuels = { workspace = true } -test-utils = { path = "../test-utils" } -tokio = { workspace = true } - -[[test]] -harness = true -name = "tests" -path = "tests/harness.rs" diff --git a/AMM/exchange-contract/Cargo.toml b/AMM/exchange-contract/Cargo.toml deleted file mode 100644 index 198ac15ab..000000000 --- a/AMM/exchange-contract/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "exchange-contract" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dependencies] -fuels = { workspace = true } -test-utils = { path = "../test-utils" } -tokio = { workspace = true } - -[[test]] -harness = true -name = "tests" -path = "tests/harness.rs" diff --git a/AMM/test-utils/test-artifacts/malicious-implementation/Forc.toml b/AMM/malicious-implementation/Forc.toml similarity index 76% rename from AMM/test-utils/test-artifacts/malicious-implementation/Forc.toml rename to AMM/malicious-implementation/Forc.toml index 4b413acd3..05e5507e7 100644 --- a/AMM/test-utils/test-artifacts/malicious-implementation/Forc.toml +++ b/AMM/malicious-implementation/Forc.toml @@ -5,4 +5,4 @@ license = "Apache-2.0" name = "malicious-implementation" [dependencies] -libraries = { path = "../../../libraries" } +libraries = { path = "../libraries" } diff --git a/AMM/test-utils/test-artifacts/malicious-implementation/src/main.sw b/AMM/malicious-implementation/src/main.sw similarity index 100% rename from AMM/test-utils/test-artifacts/malicious-implementation/src/main.sw rename to AMM/malicious-implementation/src/main.sw diff --git a/AMM/swap-exact-input/Cargo.toml b/AMM/swap-exact-input/Cargo.toml deleted file mode 100644 index c2986bf19..000000000 --- a/AMM/swap-exact-input/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "swap-exact-input" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dev-dependencies] -fuels = { workspace = true } -test-utils = { path = "../test-utils" } -tokio = { workspace = true } - -[[test]] -harness = true -name = "tests" -path = "tests/harness.rs" diff --git a/AMM/swap-exact-output/Cargo.toml b/AMM/swap-exact-output/Cargo.toml deleted file mode 100644 index 44caa2334..000000000 --- a/AMM/swap-exact-output/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "swap-exact-output" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dev-dependencies] -fuels = { workspace = true } -test-utils = { path = "../test-utils" } -tokio = { workspace = true } - -[[test]] -harness = true -name = "tests" -path = "tests/harness.rs" diff --git a/AMM/test-utils/Cargo.toml b/AMM/test-utils/Cargo.toml deleted file mode 100644 index b8e88976c..000000000 --- a/AMM/test-utils/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "test-utils" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dependencies] -fuels = { workspace = true } - -[lib] -doctest = false diff --git a/AMM/test-utils/src/paths.rs b/AMM/test-utils/src/paths.rs deleted file mode 100644 index 2351b668b..000000000 --- a/AMM/test-utils/src/paths.rs +++ /dev/null @@ -1,14 +0,0 @@ -pub const AMM_CONTRACT_BINARY_PATH: &str = "../AMM-contract/out/debug/AMM-contract.bin"; -pub const AMM_CONTRACT_STORAGE_PATH: &str = - "../AMM-contract/out/debug/AMM-contract-storage_slots.json"; -pub const ATOMIC_ADD_LIQUIDITY_SCRIPT_BINARY_PATH: &str = "./out/debug/atomic-add-liquidity.bin"; -pub const EXCHANGE_CONTRACT_BINARY_PATH: &str = - "../exchange-contract/out/debug/exchange-contract.bin"; -pub const EXCHANGE_CONTRACT_STORAGE_PATH: &str = - "../exchange-contract/out/debug/exchange-contract-storage_slots.json"; -pub const MALICIOUS_EXCHANGE_CONTRACT_BINARY_PATH: &str = - "../test-utils/test-artifacts/malicious-implementation/out/debug/malicious-implementation.bin"; -pub const MALICIOUS_EXCHANGE_CONTRACT_STORAGE_PATH: &str = - "../test-utils/test-artifacts/malicious-implementation/out/debug/malicious-implementation-storage_slots.json"; -pub const SWAP_EXACT_INPUT_SCRIPT_BINARY_PATH: &str = "./out/debug/swap-exact-input.bin"; -pub const SWAP_EXACT_OUTPUT_SCRIPT_BINARY_PATH: &str = "./out/debug/swap-exact-output.bin"; diff --git a/AMM/AMM-contract/tests/functions/add_pool.rs b/AMM/tests/amm_contract/functions/add_pool.rs similarity index 97% rename from AMM/AMM-contract/tests/functions/add_pool.rs rename to AMM/tests/amm_contract/functions/add_pool.rs index f9d2e2d0a..3b319aff4 100644 --- a/AMM/AMM-contract/tests/functions/add_pool.rs +++ b/AMM/tests/amm_contract/functions/add_pool.rs @@ -1,13 +1,13 @@ -use crate::utils::setup; -use test_utils::{ +use crate::amm_contract::utils::setup; +use crate::test_utils::{ data_structures::ExchangeContractConfiguration, interface::amm::add_pool, setup::common::deploy_and_construct_exchange, }; mod success { use super::*; - use crate::utils::ordered_pair; - use test_utils::interface::{amm::pool, RegisterPoolEvent}; + use crate::amm_contract::utils::ordered_pair; + use crate::test_utils::interface::{amm::pool, RegisterPoolEvent}; #[tokio::test] async fn adds_when_asset_pair_is_in_same_order() { diff --git a/AMM/AMM-contract/tests/functions/initialize.rs b/AMM/tests/amm_contract/functions/initialize.rs similarity index 90% rename from AMM/AMM-contract/tests/functions/initialize.rs rename to AMM/tests/amm_contract/functions/initialize.rs index a357df227..cff08b726 100644 --- a/AMM/AMM-contract/tests/functions/initialize.rs +++ b/AMM/tests/amm_contract/functions/initialize.rs @@ -1,10 +1,10 @@ -use crate::utils::setup; -use test_utils::interface::amm::initialize; +use crate::amm_contract::utils::setup; +use crate::test_utils::interface::amm::initialize; mod success { use super::*; use fuels::types::Bits256; - use test_utils::{ + use crate::test_utils::{ interface::SetExchangeBytecodeRootEvent, setup::common::exchange_bytecode_root, }; @@ -31,7 +31,7 @@ mod success { mod revert { use super::*; - use test_utils::{ + use crate::test_utils::{ data_structures::ExchangeContractConfiguration, setup::common::deploy_and_construct_exchange, }; diff --git a/AMM/AMM-contract/tests/functions/mod.rs b/AMM/tests/amm_contract/functions/mod.rs similarity index 100% rename from AMM/AMM-contract/tests/functions/mod.rs rename to AMM/tests/amm_contract/functions/mod.rs diff --git a/AMM/AMM-contract/tests/functions/pool.rs b/AMM/tests/amm_contract/functions/pool.rs similarity index 95% rename from AMM/AMM-contract/tests/functions/pool.rs rename to AMM/tests/amm_contract/functions/pool.rs index 15f1b05f1..d5b699092 100644 --- a/AMM/AMM-contract/tests/functions/pool.rs +++ b/AMM/tests/amm_contract/functions/pool.rs @@ -1,6 +1,6 @@ mod success { - use crate::utils::setup; - use test_utils::{ + use crate::amm_contract::utils::setup; + use crate::test_utils::{ data_structures::ExchangeContractConfiguration, interface::amm::{add_pool, pool}, setup::common::deploy_and_construct_exchange, diff --git a/AMM/AMM-contract/tests/harness.rs b/AMM/tests/amm_contract/mod.rs similarity index 100% rename from AMM/AMM-contract/tests/harness.rs rename to AMM/tests/amm_contract/mod.rs diff --git a/AMM/AMM-contract/tests/utils/mod.rs b/AMM/tests/amm_contract/utils/mod.rs similarity index 97% rename from AMM/AMM-contract/tests/utils/mod.rs rename to AMM/tests/amm_contract/utils/mod.rs index 88161c05e..cedb6b6bd 100644 --- a/AMM/AMM-contract/tests/utils/mod.rs +++ b/AMM/tests/amm_contract/utils/mod.rs @@ -1,5 +1,5 @@ use fuels::prelude::{AssetId, WalletUnlocked}; -use test_utils::{ +use crate::test_utils::{ data_structures::WalletAssetConfiguration, interface::AMM, setup::common::{deploy_amm, deploy_and_initialize_amm, setup_wallet_and_provider}, diff --git a/AMM/atomic-add-liquidity/tests/cases/mod.rs b/AMM/tests/atomic_add_liquidity/cases/mod.rs similarity index 100% rename from AMM/atomic-add-liquidity/tests/cases/mod.rs rename to AMM/tests/atomic_add_liquidity/cases/mod.rs diff --git a/AMM/atomic-add-liquidity/tests/cases/revert.rs b/AMM/tests/atomic_add_liquidity/cases/revert.rs similarity index 99% rename from AMM/atomic-add-liquidity/tests/cases/revert.rs rename to AMM/tests/atomic_add_liquidity/cases/revert.rs index 6c781b597..11ef41d64 100644 --- a/AMM/atomic-add-liquidity/tests/cases/revert.rs +++ b/AMM/tests/atomic_add_liquidity/cases/revert.rs @@ -1,5 +1,5 @@ use crate::utils::{expected_liquidity, setup}; -use test_utils::interface::{ +use crate::test_utils::interface::{ abigen_bindings::shared_types::{Asset, AssetPair}, LiquidityParameters, }; diff --git a/AMM/atomic-add-liquidity/tests/cases/success.rs b/AMM/tests/atomic_add_liquidity/cases/success.rs similarity index 99% rename from AMM/atomic-add-liquidity/tests/cases/success.rs rename to AMM/tests/atomic_add_liquidity/cases/success.rs index 5704be442..a2d151b46 100644 --- a/AMM/atomic-add-liquidity/tests/cases/success.rs +++ b/AMM/tests/atomic_add_liquidity/cases/success.rs @@ -1,5 +1,5 @@ use crate::utils::{expected_liquidity, setup}; -use test_utils::{ +use crate::test_utils::{ data_structures::LiquidityParameters as TestLiquidityParameters, interface::{ abigen_bindings::shared_types::{Asset, AssetPair}, diff --git a/AMM/atomic-add-liquidity/tests/harness.rs b/AMM/tests/atomic_add_liquidity/mod.rs similarity index 100% rename from AMM/atomic-add-liquidity/tests/harness.rs rename to AMM/tests/atomic_add_liquidity/mod.rs diff --git a/AMM/atomic-add-liquidity/tests/utils/mod.rs b/AMM/tests/atomic_add_liquidity/utils/mod.rs similarity index 99% rename from AMM/atomic-add-liquidity/tests/utils/mod.rs rename to AMM/tests/atomic_add_liquidity/utils/mod.rs index e4a2832b2..0b2691215 100644 --- a/AMM/atomic-add-liquidity/tests/utils/mod.rs +++ b/AMM/tests/atomic_add_liquidity/utils/mod.rs @@ -1,5 +1,5 @@ use fuels::prelude::WalletUnlocked; -use test_utils::{ +use crate::test_utils::{ data_structures::{ ExchangeContract, ExchangeContractConfiguration, LiquidityParameters, TransactionParameters, WalletAssetConfiguration, diff --git a/AMM/exchange-contract/tests/functions/add_liquidity.rs b/AMM/tests/exchange_contract/functions/add_liquidity.rs similarity index 98% rename from AMM/exchange-contract/tests/functions/add_liquidity.rs rename to AMM/tests/exchange_contract/functions/add_liquidity.rs index 6a1231641..dba22eec9 100644 --- a/AMM/exchange-contract/tests/functions/add_liquidity.rs +++ b/AMM/tests/exchange_contract/functions/add_liquidity.rs @@ -1,14 +1,14 @@ -use crate::utils::setup_and_construct; -use test_utils::{ +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::{ data_structures::LiquidityParameters, interface::exchange::add_liquidity, setup::common::deposit_and_add_liquidity, }; mod success { use super::*; - use crate::utils::{contract_balances, wallet_balances}; + use crate::exchange_contract::utils::{contract_balances, wallet_balances}; use fuels::{prelude::ContractId, tx::ContractIdExt, types::Bytes32}; - use test_utils::{ + use crate::test_utils::{ interface::{ exchange::{deposit, pool_info}, AddLiquidityEvent, Asset, AssetPair, @@ -320,7 +320,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/balance.rs b/AMM/tests/exchange_contract/functions/balance.rs similarity index 87% rename from AMM/exchange-contract/tests/functions/balance.rs rename to AMM/tests/exchange_contract/functions/balance.rs index d6af5a0c7..4b24ee6c2 100644 --- a/AMM/exchange-contract/tests/functions/balance.rs +++ b/AMM/tests/exchange_contract/functions/balance.rs @@ -1,9 +1,9 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::balance; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::balance; mod success { use super::*; - use test_utils::interface::exchange::deposit; + use crate::test_utils::interface::exchange::deposit; #[tokio::test] async fn returns_zero() { @@ -34,7 +34,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/constructor.rs b/AMM/tests/exchange_contract/functions/constructor.rs similarity index 88% rename from AMM/exchange-contract/tests/functions/constructor.rs rename to AMM/tests/exchange_contract/functions/constructor.rs index 25abd4b20..07860f262 100644 --- a/AMM/exchange-contract/tests/functions/constructor.rs +++ b/AMM/tests/exchange_contract/functions/constructor.rs @@ -1,9 +1,9 @@ -use crate::utils::setup; -use test_utils::interface::exchange::constructor; +use crate::exchange_contract::utils::setup; +use crate::test_utils::interface::exchange::constructor; mod success { use super::*; - use test_utils::interface::{exchange::pool_info, DefineAssetPairEvent}; + use crate::test_utils::interface::{exchange::pool_info, DefineAssetPairEvent}; #[tokio::test] async fn constructs() { diff --git a/AMM/exchange-contract/tests/functions/deposit.rs b/AMM/tests/exchange_contract/functions/deposit.rs similarity index 94% rename from AMM/exchange-contract/tests/functions/deposit.rs rename to AMM/tests/exchange_contract/functions/deposit.rs index 8edf1351f..138f7628b 100644 --- a/AMM/exchange-contract/tests/functions/deposit.rs +++ b/AMM/tests/exchange_contract/functions/deposit.rs @@ -1,10 +1,10 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::deposit; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::deposit; mod success { use super::*; use fuels::accounts::ViewOnlyAccount; - use test_utils::interface::{exchange::balance, Asset, DepositEvent}; + use crate::test_utils::interface::{exchange::balance, Asset, DepositEvent}; #[tokio::test] async fn deposits() { @@ -86,7 +86,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/mod.rs b/AMM/tests/exchange_contract/functions/mod.rs similarity index 100% rename from AMM/exchange-contract/tests/functions/mod.rs rename to AMM/tests/exchange_contract/functions/mod.rs diff --git a/AMM/exchange-contract/tests/functions/pool_info.rs b/AMM/tests/exchange_contract/functions/pool_info.rs similarity index 90% rename from AMM/exchange-contract/tests/functions/pool_info.rs rename to AMM/tests/exchange_contract/functions/pool_info.rs index 2aad285f1..016604ec1 100644 --- a/AMM/exchange-contract/tests/functions/pool_info.rs +++ b/AMM/tests/exchange_contract/functions/pool_info.rs @@ -1,9 +1,9 @@ -use test_utils::interface::exchange::pool_info; +use crate::test_utils::interface::exchange::pool_info; mod success { use super::*; - use crate::utils::setup_and_construct; - use test_utils::setup::common::deposit_and_add_liquidity; + use crate::exchange_contract::utils::setup_and_construct; + use crate::test_utils::setup::common::deposit_and_add_liquidity; #[tokio::test] async fn returns_empty_pool_info() { @@ -53,7 +53,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/preview_add_liquidity.rs b/AMM/tests/exchange_contract/functions/preview_add_liquidity.rs similarity index 97% rename from AMM/exchange-contract/tests/functions/preview_add_liquidity.rs rename to AMM/tests/exchange_contract/functions/preview_add_liquidity.rs index 6972c03a0..fd52963b3 100644 --- a/AMM/exchange-contract/tests/functions/preview_add_liquidity.rs +++ b/AMM/tests/exchange_contract/functions/preview_add_liquidity.rs @@ -1,9 +1,9 @@ -use test_utils::interface::exchange::preview_add_liquidity; +use crate::test_utils::interface::exchange::preview_add_liquidity; mod success { use super::*; - use crate::utils::setup_and_construct; - use test_utils::{ + use crate::exchange_contract::utils::setup_and_construct; + use crate::test_utils::{ data_structures::LiquidityParameters, setup::common::deposit_and_add_liquidity, }; @@ -180,7 +180,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; use fuels::prelude::AssetId; #[tokio::test] diff --git a/AMM/exchange-contract/tests/functions/preview_swap_exact_input.rs b/AMM/tests/exchange_contract/functions/preview_swap_exact_input.rs similarity index 92% rename from AMM/exchange-contract/tests/functions/preview_swap_exact_input.rs rename to AMM/tests/exchange_contract/functions/preview_swap_exact_input.rs index b5716df8a..e25902059 100644 --- a/AMM/exchange-contract/tests/functions/preview_swap_exact_input.rs +++ b/AMM/tests/exchange_contract/functions/preview_swap_exact_input.rs @@ -1,9 +1,9 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::preview_swap_exact_input; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::preview_swap_exact_input; mod success { use super::*; - use crate::utils::minimum_output_given_exact_input; + use crate::exchange_contract::utils::minimum_output_given_exact_input; use fuels::prelude::AssetId; #[tokio::test] @@ -74,7 +74,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/preview_swap_exact_output.rs b/AMM/tests/exchange_contract/functions/preview_swap_exact_output.rs similarity index 95% rename from AMM/exchange-contract/tests/functions/preview_swap_exact_output.rs rename to AMM/tests/exchange_contract/functions/preview_swap_exact_output.rs index f9155fdb6..2ac824f3b 100644 --- a/AMM/exchange-contract/tests/functions/preview_swap_exact_output.rs +++ b/AMM/tests/exchange_contract/functions/preview_swap_exact_output.rs @@ -1,9 +1,9 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::preview_swap_exact_output; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::preview_swap_exact_output; mod success { use super::*; - use crate::utils::maximum_input_for_exact_output; + use crate::exchange_contract::utils::maximum_input_for_exact_output; use fuels::prelude::AssetId; #[tokio::test] @@ -141,7 +141,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/remove_liquidity.rs b/AMM/tests/exchange_contract/functions/remove_liquidity.rs similarity index 98% rename from AMM/exchange-contract/tests/functions/remove_liquidity.rs rename to AMM/tests/exchange_contract/functions/remove_liquidity.rs index cf1c0231b..a82dc39ef 100644 --- a/AMM/exchange-contract/tests/functions/remove_liquidity.rs +++ b/AMM/tests/exchange_contract/functions/remove_liquidity.rs @@ -1,14 +1,14 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::{pool_info, remove_liquidity}; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::{pool_info, remove_liquidity}; mod success { use super::*; - use crate::utils::wallet_balances; + use crate::exchange_contract::utils::wallet_balances; use fuels::{ tx::ContractIdExt, types::{AssetId, Bytes32}, }; - use test_utils::interface::{Asset, AssetPair, RemoveLiquidityEvent}; + use crate::test_utils::interface::{Asset, AssetPair, RemoveLiquidityEvent}; #[tokio::test] async fn removes_all_liquidity_passing_exact_a_and_b_values() { @@ -381,7 +381,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; use fuels::{tx::ContractIdExt, types::AssetId}; #[tokio::test] diff --git a/AMM/exchange-contract/tests/functions/swap_exact_input.rs b/AMM/tests/exchange_contract/functions/swap_exact_input.rs similarity index 96% rename from AMM/exchange-contract/tests/functions/swap_exact_input.rs rename to AMM/tests/exchange_contract/functions/swap_exact_input.rs index 51aab76e7..3488f8656 100644 --- a/AMM/exchange-contract/tests/functions/swap_exact_input.rs +++ b/AMM/tests/exchange_contract/functions/swap_exact_input.rs @@ -1,10 +1,10 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::{preview_swap_exact_input, swap_exact_input}; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::{preview_swap_exact_input, swap_exact_input}; mod success { use super::*; - use crate::utils::wallet_balances; - use test_utils::interface::{exchange::pool_info, Asset, SwapEvent}; + use crate::exchange_contract::utils::wallet_balances; + use crate::test_utils::interface::{exchange::pool_info, Asset, SwapEvent}; #[tokio::test] async fn swaps_a_for_b() { @@ -203,7 +203,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/swap_exact_output.rs b/AMM/tests/exchange_contract/functions/swap_exact_output.rs similarity index 97% rename from AMM/exchange-contract/tests/functions/swap_exact_output.rs rename to AMM/tests/exchange_contract/functions/swap_exact_output.rs index a7e59d8b6..083a62926 100644 --- a/AMM/exchange-contract/tests/functions/swap_exact_output.rs +++ b/AMM/tests/exchange_contract/functions/swap_exact_output.rs @@ -1,10 +1,10 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::{preview_swap_exact_output, swap_exact_output}; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::{preview_swap_exact_output, swap_exact_output}; mod success { use super::*; - use crate::utils::wallet_balances; - use test_utils::interface::{exchange::pool_info, Asset, SwapEvent}; + use crate::exchange_contract::utils::wallet_balances; + use crate::test_utils::interface::{exchange::pool_info, Asset, SwapEvent}; #[tokio::test] async fn swaps_a_for_b_without_refund() { @@ -273,7 +273,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/functions/withdraw.rs b/AMM/tests/exchange_contract/functions/withdraw.rs similarity index 94% rename from AMM/exchange-contract/tests/functions/withdraw.rs rename to AMM/tests/exchange_contract/functions/withdraw.rs index 9953c8673..7b9342f32 100644 --- a/AMM/exchange-contract/tests/functions/withdraw.rs +++ b/AMM/tests/exchange_contract/functions/withdraw.rs @@ -1,10 +1,10 @@ -use crate::utils::setup_and_construct; -use test_utils::interface::exchange::{deposit, withdraw}; +use crate::exchange_contract::utils::setup_and_construct; +use crate::test_utils::interface::exchange::{deposit, withdraw}; mod success { use super::*; use fuels::accounts::ViewOnlyAccount; - use test_utils::interface::{exchange::balance, Asset, WithdrawEvent}; + use crate::test_utils::interface::{exchange::balance, Asset, WithdrawEvent}; #[tokio::test] async fn withdraws_entire_deposit_of_asset_a() { @@ -87,7 +87,7 @@ mod success { mod revert { use super::*; - use crate::utils::setup; + use crate::exchange_contract::utils::setup; #[tokio::test] #[should_panic(expected = "AssetPairNotSet")] diff --git a/AMM/exchange-contract/tests/harness.rs b/AMM/tests/exchange_contract/mod.rs similarity index 100% rename from AMM/exchange-contract/tests/harness.rs rename to AMM/tests/exchange_contract/mod.rs diff --git a/AMM/exchange-contract/tests/utils/mod.rs b/AMM/tests/exchange_contract/utils/mod.rs similarity index 99% rename from AMM/exchange-contract/tests/utils/mod.rs rename to AMM/tests/exchange_contract/utils/mod.rs index a61eff2d7..dc5217b00 100644 --- a/AMM/exchange-contract/tests/utils/mod.rs +++ b/AMM/tests/exchange_contract/utils/mod.rs @@ -4,7 +4,7 @@ use fuels::{ tx::ContractIdExt, types::Bytes32, }; -use test_utils::{ +use crate::test_utils::{ data_structures::{ ExchangeContract, ExchangeContractConfiguration, LiquidityParameters, WalletAssetConfiguration, diff --git a/AMM/tests/harness.rs b/AMM/tests/harness.rs new file mode 100644 index 000000000..723f85f29 --- /dev/null +++ b/AMM/tests/harness.rs @@ -0,0 +1,5 @@ +mod amm_contract; +mod exchange_contract; +mod swap_exact_input; +mod swap_exact_output; +mod test_utils; \ No newline at end of file diff --git a/AMM/swap-exact-input/tests/cases/mod.rs b/AMM/tests/swap_exact_input/cases/mod.rs similarity index 100% rename from AMM/swap-exact-input/tests/cases/mod.rs rename to AMM/tests/swap_exact_input/cases/mod.rs diff --git a/AMM/swap-exact-input/tests/cases/revert.rs b/AMM/tests/swap_exact_input/cases/revert.rs similarity index 96% rename from AMM/swap-exact-input/tests/cases/revert.rs rename to AMM/tests/swap_exact_input/cases/revert.rs index f9e37a824..e7cfb6337 100644 --- a/AMM/swap-exact-input/tests/cases/revert.rs +++ b/AMM/tests/swap_exact_input/cases/revert.rs @@ -1,6 +1,6 @@ use crate::utils::{expected_and_actual_output, expected_swap_output, setup}; use fuels::prelude::AssetId; -use test_utils::{data_structures::{SwapParameters, NUMBER_OF_ASSETS}, setup::scripts::contract_instances}; +use crate::test_utils::{data_structures::{SwapParameters, NUMBER_OF_ASSETS}, setup::scripts::contract_instances}; #[tokio::test] #[should_panic(expected = "RouteTooShort")] diff --git a/AMM/swap-exact-input/tests/cases/success.rs b/AMM/tests/swap_exact_input/cases/success.rs similarity index 95% rename from AMM/swap-exact-input/tests/cases/success.rs rename to AMM/tests/swap_exact_input/cases/success.rs index 2484b4add..7be55366e 100644 --- a/AMM/swap-exact-input/tests/cases/success.rs +++ b/AMM/tests/swap_exact_input/cases/success.rs @@ -1,5 +1,5 @@ use crate::utils::expected_and_actual_output; -use test_utils::data_structures::{SwapParameters, NUMBER_OF_ASSETS}; +use crate::test_utils::data_structures::{SwapParameters, NUMBER_OF_ASSETS}; #[tokio::test] async fn can_swap_exact_input_along_route_small_input() { diff --git a/AMM/swap-exact-input/tests/harness.rs b/AMM/tests/swap_exact_input/mod.rs similarity index 100% rename from AMM/swap-exact-input/tests/harness.rs rename to AMM/tests/swap_exact_input/mod.rs diff --git a/AMM/swap-exact-input/tests/utils/mod.rs b/AMM/tests/swap_exact_input/utils/mod.rs similarity index 99% rename from AMM/swap-exact-input/tests/utils/mod.rs rename to AMM/tests/swap_exact_input/utils/mod.rs index fcb60af3f..e39a35346 100644 --- a/AMM/swap-exact-input/tests/utils/mod.rs +++ b/AMM/tests/swap_exact_input/utils/mod.rs @@ -1,7 +1,7 @@ use fuels::{ core::codec::EncoderConfig, prelude::{AssetId, WalletUnlocked}, types::Bits256 }; -use test_utils::{ +use crate::test_utils::{ data_structures::{ AMMContract, SwapParameters, SwapResult, TransactionParameters, WalletAssetConfiguration, }, diff --git a/AMM/swap-exact-output/tests/cases/mod.rs b/AMM/tests/swap_exact_output/cases/mod.rs similarity index 100% rename from AMM/swap-exact-output/tests/cases/mod.rs rename to AMM/tests/swap_exact_output/cases/mod.rs diff --git a/AMM/swap-exact-output/tests/cases/revert.rs b/AMM/tests/swap_exact_output/cases/revert.rs similarity index 99% rename from AMM/swap-exact-output/tests/cases/revert.rs rename to AMM/tests/swap_exact_output/cases/revert.rs index 08ee7aa0e..10efc69c0 100644 --- a/AMM/swap-exact-output/tests/cases/revert.rs +++ b/AMM/tests/swap_exact_output/cases/revert.rs @@ -1,6 +1,6 @@ use crate::utils::{expected_and_actual_input, expected_swap_input, setup}; use fuels::prelude::AssetId; -use test_utils::{ +use crate::test_utils::{ data_structures::{SwapParameters, NUMBER_OF_ASSETS}, setup::scripts::contract_instances, }; diff --git a/AMM/swap-exact-output/tests/cases/success.rs b/AMM/tests/swap_exact_output/cases/success.rs similarity index 95% rename from AMM/swap-exact-output/tests/cases/success.rs rename to AMM/tests/swap_exact_output/cases/success.rs index 26ab974ec..6d4198e25 100644 --- a/AMM/swap-exact-output/tests/cases/success.rs +++ b/AMM/tests/swap_exact_output/cases/success.rs @@ -1,5 +1,5 @@ use crate::utils::expected_and_actual_input; -use test_utils::data_structures::{SwapParameters, NUMBER_OF_ASSETS}; +use crate::test_utils::data_structures::{SwapParameters, NUMBER_OF_ASSETS}; #[tokio::test] async fn can_swap_exact_output_along_route_small_input() { diff --git a/AMM/swap-exact-output/tests/harness.rs b/AMM/tests/swap_exact_output/mod.rs similarity index 100% rename from AMM/swap-exact-output/tests/harness.rs rename to AMM/tests/swap_exact_output/mod.rs diff --git a/AMM/swap-exact-output/tests/utils/mod.rs b/AMM/tests/swap_exact_output/utils/mod.rs similarity index 99% rename from AMM/swap-exact-output/tests/utils/mod.rs rename to AMM/tests/swap_exact_output/utils/mod.rs index 2ca2dfba8..21378059a 100644 --- a/AMM/swap-exact-output/tests/utils/mod.rs +++ b/AMM/tests/swap_exact_output/utils/mod.rs @@ -1,7 +1,7 @@ use fuels::{ core::codec::EncoderConfig, prelude::{AssetId, WalletUnlocked}, types::Bits256 }; -use test_utils::{ +use crate::test_utils::{ data_structures::{ AMMContract, SwapParameters, SwapResult, TransactionParameters, WalletAssetConfiguration, }, diff --git a/AMM/test-utils/src/data_structures.rs b/AMM/tests/test_utils/data_structures.rs similarity index 100% rename from AMM/test-utils/src/data_structures.rs rename to AMM/tests/test_utils/data_structures.rs diff --git a/AMM/test-utils/src/interface.rs b/AMM/tests/test_utils/interface.rs similarity index 100% rename from AMM/test-utils/src/interface.rs rename to AMM/tests/test_utils/interface.rs diff --git a/AMM/test-utils/src/lib.rs b/AMM/tests/test_utils/mod.rs similarity index 100% rename from AMM/test-utils/src/lib.rs rename to AMM/tests/test_utils/mod.rs diff --git a/AMM/tests/test_utils/paths.rs b/AMM/tests/test_utils/paths.rs new file mode 100644 index 000000000..786250306 --- /dev/null +++ b/AMM/tests/test_utils/paths.rs @@ -0,0 +1,14 @@ +pub const AMM_CONTRACT_BINARY_PATH: &str = "./AMM-contract/out/debug/AMM-contract.bin"; +pub const AMM_CONTRACT_STORAGE_PATH: &str = + "./AMM-contract/out/debug/AMM-contract-storage_slots.json"; +pub const ATOMIC_ADD_LIQUIDITY_SCRIPT_BINARY_PATH: &str = "./atomic-add-liquidity/out/debug/atomic-add-liquidity.bin"; +pub const EXCHANGE_CONTRACT_BINARY_PATH: &str = + "./exchange-contract/out/debug/exchange-contract.bin"; +pub const EXCHANGE_CONTRACT_STORAGE_PATH: &str = + "./exchange-contract/out/debug/exchange-contract-storage_slots.json"; +pub const MALICIOUS_EXCHANGE_CONTRACT_BINARY_PATH: &str = + "./malicious-implementation/out/debug/malicious-implementation.bin"; +pub const MALICIOUS_EXCHANGE_CONTRACT_STORAGE_PATH: &str = + "./malicious-implementation/out/debug/malicious-implementation-storage_slots.json"; +pub const SWAP_EXACT_INPUT_SCRIPT_BINARY_PATH: &str = "./swap-exact-input/out/debug/swap-exact-input.bin"; +pub const SWAP_EXACT_OUTPUT_SCRIPT_BINARY_PATH: &str = "./swap-exact-output/out/debug/swap-exact-output.bin"; diff --git a/AMM/test-utils/src/setup.rs b/AMM/tests/test_utils/setup.rs similarity index 98% rename from AMM/test-utils/src/setup.rs rename to AMM/tests/test_utils/setup.rs index 51fb6ba3c..59d63e7e6 100644 --- a/AMM/test-utils/src/setup.rs +++ b/AMM/tests/test_utils/setup.rs @@ -13,7 +13,7 @@ pub mod common { test_helpers::{setup_multiple_assets_coins, setup_test_provider}, }; - use crate::{ + use crate::test_utils::{ data_structures::WalletAssetConfiguration, interface::{ amm::initialize, @@ -182,7 +182,7 @@ pub mod common { pub mod scripts { use super::*; - use crate::{data_structures::TransactionParameters, interface::amm::add_pool}; + use crate::test_utils::{data_structures::TransactionParameters, interface::amm::add_pool}; use common::{deploy_and_construct_exchange, deposit_and_add_liquidity}; use fuels::{ prelude::ResourceFilter, diff --git a/Cargo.lock b/Cargo.lock index a036022a4..49782a1ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,16 +3,7 @@ version = 3 [[package]] -name = "AMM-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "test-utils", - "tokio", -] - -[[package]] -name = "DAO-contract" +name = "AMM" version = "0.0.0" dependencies = [ "fuels", @@ -29,15 +20,6 @@ dependencies = [ "regex", ] -[[package]] -name = "NFT-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "sha2 0.10.8", - "tokio", -] - [[package]] name = "addr2line" version = "0.22.0" @@ -410,15 +392,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "atomic-add-liquidity" -version = "0.0.0" -dependencies = [ - "fuels", - "test-utils", - "tokio", -] - [[package]] name = "atomic-polyfill" version = "1.0.3" @@ -439,14 +412,6 @@ dependencies = [ "url", ] -[[package]] -name = "auction-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "autocfg" version = "1.3.0" @@ -1309,22 +1274,6 @@ dependencies = [ "syn 2.0.70", ] -[[package]] -name = "distributor-contract" -version = "0.0.0" -dependencies = [ - "fuel-merkle 0.33.0", - "fuels", - "sha2 0.10.8", - "tokio", -] - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "downcast" version = "0.11.0" @@ -1470,14 +1419,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "escrow-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "eth-keystore" version = "0.5.0" @@ -1542,24 +1483,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "exchange-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "test-utils", - "tokio", -] - -[[package]] -name = "f-NFT-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "sha2 0.10.8", - "tokio", -] - [[package]] name = "fastrand" version = "2.1.0" @@ -1606,21 +1529,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2013,20 +1921,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fuel-merkle" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69243d1f4b60b3077cadca5474f5c019b1aa6d34e66e07b497b04ca2a3f15cf8" -dependencies = [ - "digest 0.10.7", - "fuel-storage 0.33.0", - "hashbrown 0.13.2", - "hex", - "sha2 0.10.8", - "thiserror", -] - [[package]] name = "fuel-merkle" version = "0.49.0" @@ -2035,19 +1929,13 @@ checksum = "5198b4eab5a19b0034971da88199dae7dd61806ebd8df366d6af1f17cda2e151" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage 0.49.0", + "fuel-storage", "hashbrown 0.13.2", "hex", "serde", "sha2 0.10.8", ] -[[package]] -name = "fuel-storage" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0480dc192e3735de1a8bb0ddaff0bacf20af785529bc585b26e7ac1434e0ba" - [[package]] name = "fuel-storage" version = "0.49.0" @@ -2065,7 +1953,7 @@ dependencies = [ "derive_more", "fuel-asm", "fuel-crypto", - "fuel-merkle 0.49.0", + "fuel-merkle", "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", @@ -2104,8 +1992,8 @@ dependencies = [ "ethnum", "fuel-asm", "fuel-crypto", - "fuel-merkle 0.49.0", - "fuel-storage 0.49.0", + "fuel-merkle", + "fuel-storage", "fuel-tx", "fuel-types", "hashbrown 0.14.5", @@ -2264,14 +2152,6 @@ dependencies = [ "which", ] -[[package]] -name = "fundraiser-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "funty" version = "2.0.0" @@ -2807,19 +2687,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.60" @@ -3043,15 +2910,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -3818,32 +3676,6 @@ dependencies = [ "unsigned-varint 0.7.2", ] -[[package]] -name = "native-asset-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "sha2 0.10.8", - "tokio", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "netlink-packet-core" version = "0.4.2" @@ -4044,75 +3876,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.70", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "oracle-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", - "utils", -] - -[[package]] -name = "oracle-node" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "dotenv", - "fuels", - "futures", - "itertools 0.11.0", - "reqwest", - "serde", - "tokio", - "utils", -] - [[package]] name = "p256" version = "0.13.2" @@ -4248,12 +4017,6 @@ dependencies = [ "spki", ] -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - [[package]] name = "polling" version = "3.7.2" @@ -4661,14 +4424,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "registry-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "reqwest" version = "0.11.27" @@ -4687,12 +4442,10 @@ dependencies = [ "http-body", "hyper", "hyper-rustls 0.24.2", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -4704,7 +4457,6 @@ dependencies = [ "sync_wrapper", "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", "tower-service", "url", @@ -5402,32 +5154,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "swap-exact-input" -version = "0.0.0" -dependencies = [ - "fuels", - "test-utils", - "tokio", -] - -[[package]] -name = "swap-exact-output" -version = "0.0.0" -dependencies = [ - "fuels", - "test-utils", - "tokio", -] - -[[package]] -name = "swap-predicate" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "syn" version = "1.0.109" @@ -5515,35 +5241,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "template-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "termtree" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "test-utils" -version = "0.0.0" -dependencies = [ - "fuels", -] - -[[package]] -name = "tests" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "thiserror" version = "1.0.62" @@ -5564,14 +5267,6 @@ dependencies = [ "syn 2.0.70", ] -[[package]] -name = "tictactoe-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "time" version = "0.3.36" @@ -5603,14 +5298,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "timelock-contract" -version = "0.0.0" -dependencies = [ - "fuels", - "tokio", -] - [[package]] name = "tinyvec" version = "1.8.0" @@ -5666,16 +5353,6 @@ dependencies = [ "syn 2.0.70", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rayon" version = "2.1.0" @@ -5974,13 +5651,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "utils" -version = "0.0.0" -dependencies = [ - "fuels", -] - [[package]] name = "uuid" version = "0.8.2" @@ -6000,12 +5670,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 1edfd5925..3a13d061f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,45 +1,22 @@ [workspace] resolver = "2" members = [ - # .devops - "./.devops/.template/template-contract", - # airdrop - "./airdrop/airdrop-contract", - # AMM - "./AMM/AMM-contract", - "./AMM/exchange-contract", - "./AMM/atomic-add-liquidity", - "./AMM/swap-exact-input", - "./AMM/swap-exact-output", - "./AMM/test-utils", - # counter-script - "./counter-script/interaction_script", - # DAO - "./DAO/DAO-contract", - # english-auction - "./english-auction/auction-contract", - # escrow - "./escrow/escrow-contract", - # fractional-NFT - "./fractional-NFT/f-NFT-contract", - # fundraiser - "./fundraiser/fundraiser-contract", - # name-registry - "./name-registry/registry-contract", - # native-asset - "./native-asset/native-asset-contract", - # NFT - "./NFT/NFT-contract", - # oracle - "./oracle/oracle-contract", - "./oracle/oracle-node", - "./oracle/utils", - # OTC-swap-predicate - "./OTC-swap-predicate/swap-predicate", - # TicTacToe - "./TicTacToe/tictactoe-contract", - # timelock - "./timelock/timelock-contract", + # ".devops.template", + # "airdrop", + "AMM", + # "counter-script", + # "DAO", + # "english-auction", + # "escrow", + # "fractional-NFT", + # "fundraiser", + # "name-registry", + # "native-asset", + # "NFT", + # "oracle", + # "OTC-swap-predicate", + # "TicTacToe", + # "timelock", ] exclude = [ ".devops/aurora", diff --git a/airdrop/airdrop-contract/Cargo.toml b/airdrop/airdrop-contract/Cargo.toml index 0a4fe1f18..e038af8ed 100644 --- a/airdrop/airdrop-contract/Cargo.toml +++ b/airdrop/airdrop-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "distributor-contract" +name = "airdrop-contract" version = "0.0.0" authors = ["Fuel Labs "] edition = "2021" From 97e58ab898febc78a410152877453992cbfc97b5 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:43:14 +0530 Subject: [PATCH 08/23] airdrop reorganisation --- Cargo.lock | 38 +++++++++++++++++-- Cargo.toml | 2 +- airdrop/{airdrop-contract => }/Cargo.toml | 2 +- .../tests/functions/core/claim.rs | 0 .../tests/functions/core/clawback.rs | 0 .../tests/functions/core/constructor.rs | 0 .../tests/functions/core/mod.rs | 0 .../tests/functions/info/admin.rs | 0 .../tests/functions/info/claim_data.rs | 0 .../tests/functions/info/end_block.rs | 0 .../tests/functions/info/is_active.rs | 0 .../tests/functions/info/merkle_root.rs | 0 .../tests/functions/info/mod.rs | 0 .../tests/functions/info/number_of_leaves.rs | 0 .../tests/functions/mod.rs | 0 .../{airdrop-contract => }/tests/harness.rs | 0 .../tests/utils/interface/core.rs | 0 .../tests/utils/interface/info.rs | 0 .../tests/utils/interface/mod.rs | 0 .../{airdrop-contract => }/tests/utils/mod.rs | 0 .../tests/utils/setup.rs | 4 +- 21 files changed, 38 insertions(+), 8 deletions(-) rename airdrop/{airdrop-contract => }/Cargo.toml (90%) rename airdrop/{airdrop-contract => }/tests/functions/core/claim.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/core/clawback.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/core/constructor.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/core/mod.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/admin.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/claim_data.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/end_block.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/is_active.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/merkle_root.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/mod.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/info/number_of_leaves.rs (100%) rename airdrop/{airdrop-contract => }/tests/functions/mod.rs (100%) rename airdrop/{airdrop-contract => }/tests/harness.rs (100%) rename airdrop/{airdrop-contract => }/tests/utils/interface/core.rs (100%) rename airdrop/{airdrop-contract => }/tests/utils/interface/info.rs (100%) rename airdrop/{airdrop-contract => }/tests/utils/interface/mod.rs (100%) rename airdrop/{airdrop-contract => }/tests/utils/mod.rs (100%) rename airdrop/{airdrop-contract => }/tests/utils/setup.rs (97%) diff --git a/Cargo.lock b/Cargo.lock index 49782a1ac..9de343c02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "airdrop-contract" +version = "0.0.0" +dependencies = [ + "fuel-merkle 0.33.0", + "fuels", + "sha2 0.10.8", + "tokio", +] + [[package]] name = "allocator-api2" version = "0.2.18" @@ -1921,6 +1931,20 @@ dependencies = [ "synstructure", ] +[[package]] +name = "fuel-merkle" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69243d1f4b60b3077cadca5474f5c019b1aa6d34e66e07b497b04ca2a3f15cf8" +dependencies = [ + "digest 0.10.7", + "fuel-storage 0.33.0", + "hashbrown 0.13.2", + "hex", + "sha2 0.10.8", + "thiserror", +] + [[package]] name = "fuel-merkle" version = "0.49.0" @@ -1929,13 +1953,19 @@ checksum = "5198b4eab5a19b0034971da88199dae7dd61806ebd8df366d6af1f17cda2e151" dependencies = [ "derive_more", "digest 0.10.7", - "fuel-storage", + "fuel-storage 0.49.0", "hashbrown 0.13.2", "hex", "serde", "sha2 0.10.8", ] +[[package]] +name = "fuel-storage" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f0480dc192e3735de1a8bb0ddaff0bacf20af785529bc585b26e7ac1434e0ba" + [[package]] name = "fuel-storage" version = "0.49.0" @@ -1953,7 +1983,7 @@ dependencies = [ "derive_more", "fuel-asm", "fuel-crypto", - "fuel-merkle", + "fuel-merkle 0.49.0", "fuel-types", "hashbrown 0.14.5", "itertools 0.10.5", @@ -1992,8 +2022,8 @@ dependencies = [ "ethnum", "fuel-asm", "fuel-crypto", - "fuel-merkle", - "fuel-storage", + "fuel-merkle 0.49.0", + "fuel-storage 0.49.0", "fuel-tx", "fuel-types", "hashbrown 0.14.5", diff --git a/Cargo.toml b/Cargo.toml index 3a13d061f..7459a2e2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ # ".devops.template", - # "airdrop", + "airdrop", "AMM", # "counter-script", # "DAO", diff --git a/airdrop/airdrop-contract/Cargo.toml b/airdrop/Cargo.toml similarity index 90% rename from airdrop/airdrop-contract/Cargo.toml rename to airdrop/Cargo.toml index e038af8ed..6b05bfcae 100644 --- a/airdrop/airdrop-contract/Cargo.toml +++ b/airdrop/Cargo.toml @@ -13,5 +13,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "airdrop_integration_tests" path = "tests/harness.rs" diff --git a/airdrop/airdrop-contract/tests/functions/core/claim.rs b/airdrop/tests/functions/core/claim.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/core/claim.rs rename to airdrop/tests/functions/core/claim.rs diff --git a/airdrop/airdrop-contract/tests/functions/core/clawback.rs b/airdrop/tests/functions/core/clawback.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/core/clawback.rs rename to airdrop/tests/functions/core/clawback.rs diff --git a/airdrop/airdrop-contract/tests/functions/core/constructor.rs b/airdrop/tests/functions/core/constructor.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/core/constructor.rs rename to airdrop/tests/functions/core/constructor.rs diff --git a/airdrop/airdrop-contract/tests/functions/core/mod.rs b/airdrop/tests/functions/core/mod.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/core/mod.rs rename to airdrop/tests/functions/core/mod.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/admin.rs b/airdrop/tests/functions/info/admin.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/admin.rs rename to airdrop/tests/functions/info/admin.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/claim_data.rs b/airdrop/tests/functions/info/claim_data.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/claim_data.rs rename to airdrop/tests/functions/info/claim_data.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/end_block.rs b/airdrop/tests/functions/info/end_block.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/end_block.rs rename to airdrop/tests/functions/info/end_block.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/is_active.rs b/airdrop/tests/functions/info/is_active.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/is_active.rs rename to airdrop/tests/functions/info/is_active.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/merkle_root.rs b/airdrop/tests/functions/info/merkle_root.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/merkle_root.rs rename to airdrop/tests/functions/info/merkle_root.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/mod.rs b/airdrop/tests/functions/info/mod.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/mod.rs rename to airdrop/tests/functions/info/mod.rs diff --git a/airdrop/airdrop-contract/tests/functions/info/number_of_leaves.rs b/airdrop/tests/functions/info/number_of_leaves.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/info/number_of_leaves.rs rename to airdrop/tests/functions/info/number_of_leaves.rs diff --git a/airdrop/airdrop-contract/tests/functions/mod.rs b/airdrop/tests/functions/mod.rs similarity index 100% rename from airdrop/airdrop-contract/tests/functions/mod.rs rename to airdrop/tests/functions/mod.rs diff --git a/airdrop/airdrop-contract/tests/harness.rs b/airdrop/tests/harness.rs similarity index 100% rename from airdrop/airdrop-contract/tests/harness.rs rename to airdrop/tests/harness.rs diff --git a/airdrop/airdrop-contract/tests/utils/interface/core.rs b/airdrop/tests/utils/interface/core.rs similarity index 100% rename from airdrop/airdrop-contract/tests/utils/interface/core.rs rename to airdrop/tests/utils/interface/core.rs diff --git a/airdrop/airdrop-contract/tests/utils/interface/info.rs b/airdrop/tests/utils/interface/info.rs similarity index 100% rename from airdrop/airdrop-contract/tests/utils/interface/info.rs rename to airdrop/tests/utils/interface/info.rs diff --git a/airdrop/airdrop-contract/tests/utils/interface/mod.rs b/airdrop/tests/utils/interface/mod.rs similarity index 100% rename from airdrop/airdrop-contract/tests/utils/interface/mod.rs rename to airdrop/tests/utils/interface/mod.rs diff --git a/airdrop/airdrop-contract/tests/utils/mod.rs b/airdrop/tests/utils/mod.rs similarity index 100% rename from airdrop/airdrop-contract/tests/utils/mod.rs rename to airdrop/tests/utils/mod.rs diff --git a/airdrop/airdrop-contract/tests/utils/setup.rs b/airdrop/tests/utils/setup.rs similarity index 97% rename from airdrop/airdrop-contract/tests/utils/setup.rs rename to airdrop/tests/utils/setup.rs index 3f8c465e0..4b133e151 100644 --- a/airdrop/airdrop-contract/tests/utils/setup.rs +++ b/airdrop/tests/utils/setup.rs @@ -52,8 +52,8 @@ impl Node { } } -const DISTRIBUTOR_CONTRACT_BINARY_PATH: &str = "./out/debug/airdrop-contract.bin"; -const DISTRIBUTOR_CONTRACT_STORAGE_PATH: &str = "./out/debug/airdrop-contract-storage_slots.json"; +const DISTRIBUTOR_CONTRACT_BINARY_PATH: &str = "./airdrop-contract/out/debug/airdrop-contract.bin"; +const DISTRIBUTOR_CONTRACT_STORAGE_PATH: &str = "./airdrop-contract/out/debug/airdrop-contract-storage_slots.json"; pub(crate) async fn build_tree( key: u64, From 831015e87bb6686604e94a485c39e49551ed90d1 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:45:03 +0530 Subject: [PATCH 09/23] counterscript reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- counter-script/{interaction_script => }/Cargo.toml | 0 counter-script/{interaction_script => }/tests/harness.rs | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) rename counter-script/{interaction_script => }/Cargo.toml (100%) rename counter-script/{interaction_script => }/tests/harness.rs (92%) diff --git a/Cargo.lock b/Cargo.lock index 9de343c02..6b7017f64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5277,6 +5277,14 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +[[package]] +name = "tests" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "thiserror" version = "1.0.62" diff --git a/Cargo.toml b/Cargo.toml index 7459a2e2a..76d0473af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = [ # ".devops.template", "airdrop", "AMM", - # "counter-script", + "counter-script", # "DAO", # "english-auction", # "escrow", diff --git a/counter-script/interaction_script/Cargo.toml b/counter-script/Cargo.toml similarity index 100% rename from counter-script/interaction_script/Cargo.toml rename to counter-script/Cargo.toml diff --git a/counter-script/interaction_script/tests/harness.rs b/counter-script/tests/harness.rs similarity index 92% rename from counter-script/interaction_script/tests/harness.rs rename to counter-script/tests/harness.rs index b1e36eaa5..e81654ac5 100644 --- a/counter-script/interaction_script/tests/harness.rs +++ b/counter-script/tests/harness.rs @@ -20,9 +20,9 @@ abigen!( ); // File path constants -const STORAGE_CONFIGURATION_PATH: &str = "../counter/out/debug/counter_contract-storage_slots.json"; -const CONTRACT_BIN_PATH: &str = "../counter/out/debug/counter_contract.bin"; -const SCRIPT_BIN_PATH: &str = "../interaction_script/out/debug/interaction_script.bin"; +const STORAGE_CONFIGURATION_PATH: &str = "./counter/out/debug/counter_contract-storage_slots.json"; +const CONTRACT_BIN_PATH: &str = "./counter/out/debug/counter_contract.bin"; +const SCRIPT_BIN_PATH: &str = "./interaction_script/out/debug/interaction_script.bin"; // This function will setup the test environment for you. It will return a tuple containing the contract instance and the script instance. pub async fn setup() -> ( From 9b25ef0da08c7d49b2601359c3a39b8c78972618 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:46:44 +0530 Subject: [PATCH 10/23] DAO reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- DAO/{DAO-contract => }/Cargo.toml | 2 +- .../tests/functions/core/constructor.rs | 0 .../tests/functions/core/create_proposal.rs | 0 DAO/{DAO-contract => }/tests/functions/core/deposit.rs | 0 DAO/{DAO-contract => }/tests/functions/core/execute.rs | 0 DAO/{DAO-contract => }/tests/functions/core/mod.rs | 0 .../tests/functions/core/unlock_votes.rs | 0 DAO/{DAO-contract => }/tests/functions/core/vote.rs | 0 DAO/{DAO-contract => }/tests/functions/core/withdraw.rs | 0 DAO/{DAO-contract => }/tests/functions/info/balance.rs | 0 .../tests/functions/info/governance_asset_id.rs | 0 DAO/{DAO-contract => }/tests/functions/info/mod.rs | 0 DAO/{DAO-contract => }/tests/functions/info/proposal.rs | 0 .../tests/functions/info/proposal_count.rs | 0 .../tests/functions/info/user_balance.rs | 0 DAO/{DAO-contract => }/tests/functions/info/user_votes.rs | 0 DAO/{DAO-contract => }/tests/functions/mod.rs | 0 DAO/{DAO-contract => }/tests/harness.rs | 0 DAO/{DAO-contract => }/tests/utils/interface/core.rs | 0 DAO/{DAO-contract => }/tests/utils/interface/info.rs | 0 DAO/{DAO-contract => }/tests/utils/interface/mod.rs | 0 DAO/{DAO-contract => }/tests/utils/mod.rs | 0 DAO/{DAO-contract => }/tests/utils/setup.rs | 4 ++-- counter-script/Cargo.toml | 2 +- 26 files changed, 13 insertions(+), 5 deletions(-) rename DAO/{DAO-contract => }/Cargo.toml (89%) rename DAO/{DAO-contract => }/tests/functions/core/constructor.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/create_proposal.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/deposit.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/execute.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/mod.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/unlock_votes.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/vote.rs (100%) rename DAO/{DAO-contract => }/tests/functions/core/withdraw.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/balance.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/governance_asset_id.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/mod.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/proposal.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/proposal_count.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/user_balance.rs (100%) rename DAO/{DAO-contract => }/tests/functions/info/user_votes.rs (100%) rename DAO/{DAO-contract => }/tests/functions/mod.rs (100%) rename DAO/{DAO-contract => }/tests/harness.rs (100%) rename DAO/{DAO-contract => }/tests/utils/interface/core.rs (100%) rename DAO/{DAO-contract => }/tests/utils/interface/info.rs (100%) rename DAO/{DAO-contract => }/tests/utils/interface/mod.rs (100%) rename DAO/{DAO-contract => }/tests/utils/mod.rs (100%) rename DAO/{DAO-contract => }/tests/utils/setup.rs (93%) diff --git a/Cargo.lock b/Cargo.lock index 6b7017f64..9277bafb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,6 +10,14 @@ dependencies = [ "tokio", ] +[[package]] +name = "DAO-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "Inflector" version = "0.11.4" diff --git a/Cargo.toml b/Cargo.toml index 76d0473af..807ad01b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "airdrop", "AMM", "counter-script", - # "DAO", + "DAO", # "english-auction", # "escrow", # "fractional-NFT", diff --git a/DAO/DAO-contract/Cargo.toml b/DAO/Cargo.toml similarity index 89% rename from DAO/DAO-contract/Cargo.toml rename to DAO/Cargo.toml index d2301ad39..bbb372812 100644 --- a/DAO/DAO-contract/Cargo.toml +++ b/DAO/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "DAO_integration_tests" path = "tests/harness.rs" diff --git a/DAO/DAO-contract/tests/functions/core/constructor.rs b/DAO/tests/functions/core/constructor.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/constructor.rs rename to DAO/tests/functions/core/constructor.rs diff --git a/DAO/DAO-contract/tests/functions/core/create_proposal.rs b/DAO/tests/functions/core/create_proposal.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/create_proposal.rs rename to DAO/tests/functions/core/create_proposal.rs diff --git a/DAO/DAO-contract/tests/functions/core/deposit.rs b/DAO/tests/functions/core/deposit.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/deposit.rs rename to DAO/tests/functions/core/deposit.rs diff --git a/DAO/DAO-contract/tests/functions/core/execute.rs b/DAO/tests/functions/core/execute.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/execute.rs rename to DAO/tests/functions/core/execute.rs diff --git a/DAO/DAO-contract/tests/functions/core/mod.rs b/DAO/tests/functions/core/mod.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/mod.rs rename to DAO/tests/functions/core/mod.rs diff --git a/DAO/DAO-contract/tests/functions/core/unlock_votes.rs b/DAO/tests/functions/core/unlock_votes.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/unlock_votes.rs rename to DAO/tests/functions/core/unlock_votes.rs diff --git a/DAO/DAO-contract/tests/functions/core/vote.rs b/DAO/tests/functions/core/vote.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/vote.rs rename to DAO/tests/functions/core/vote.rs diff --git a/DAO/DAO-contract/tests/functions/core/withdraw.rs b/DAO/tests/functions/core/withdraw.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/core/withdraw.rs rename to DAO/tests/functions/core/withdraw.rs diff --git a/DAO/DAO-contract/tests/functions/info/balance.rs b/DAO/tests/functions/info/balance.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/balance.rs rename to DAO/tests/functions/info/balance.rs diff --git a/DAO/DAO-contract/tests/functions/info/governance_asset_id.rs b/DAO/tests/functions/info/governance_asset_id.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/governance_asset_id.rs rename to DAO/tests/functions/info/governance_asset_id.rs diff --git a/DAO/DAO-contract/tests/functions/info/mod.rs b/DAO/tests/functions/info/mod.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/mod.rs rename to DAO/tests/functions/info/mod.rs diff --git a/DAO/DAO-contract/tests/functions/info/proposal.rs b/DAO/tests/functions/info/proposal.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/proposal.rs rename to DAO/tests/functions/info/proposal.rs diff --git a/DAO/DAO-contract/tests/functions/info/proposal_count.rs b/DAO/tests/functions/info/proposal_count.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/proposal_count.rs rename to DAO/tests/functions/info/proposal_count.rs diff --git a/DAO/DAO-contract/tests/functions/info/user_balance.rs b/DAO/tests/functions/info/user_balance.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/user_balance.rs rename to DAO/tests/functions/info/user_balance.rs diff --git a/DAO/DAO-contract/tests/functions/info/user_votes.rs b/DAO/tests/functions/info/user_votes.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/info/user_votes.rs rename to DAO/tests/functions/info/user_votes.rs diff --git a/DAO/DAO-contract/tests/functions/mod.rs b/DAO/tests/functions/mod.rs similarity index 100% rename from DAO/DAO-contract/tests/functions/mod.rs rename to DAO/tests/functions/mod.rs diff --git a/DAO/DAO-contract/tests/harness.rs b/DAO/tests/harness.rs similarity index 100% rename from DAO/DAO-contract/tests/harness.rs rename to DAO/tests/harness.rs diff --git a/DAO/DAO-contract/tests/utils/interface/core.rs b/DAO/tests/utils/interface/core.rs similarity index 100% rename from DAO/DAO-contract/tests/utils/interface/core.rs rename to DAO/tests/utils/interface/core.rs diff --git a/DAO/DAO-contract/tests/utils/interface/info.rs b/DAO/tests/utils/interface/info.rs similarity index 100% rename from DAO/DAO-contract/tests/utils/interface/info.rs rename to DAO/tests/utils/interface/info.rs diff --git a/DAO/DAO-contract/tests/utils/interface/mod.rs b/DAO/tests/utils/interface/mod.rs similarity index 100% rename from DAO/DAO-contract/tests/utils/interface/mod.rs rename to DAO/tests/utils/interface/mod.rs diff --git a/DAO/DAO-contract/tests/utils/mod.rs b/DAO/tests/utils/mod.rs similarity index 100% rename from DAO/DAO-contract/tests/utils/mod.rs rename to DAO/tests/utils/mod.rs diff --git a/DAO/DAO-contract/tests/utils/setup.rs b/DAO/tests/utils/setup.rs similarity index 93% rename from DAO/DAO-contract/tests/utils/setup.rs rename to DAO/tests/utils/setup.rs index f958b5855..85c5e8adf 100644 --- a/DAO/DAO-contract/tests/utils/setup.rs +++ b/DAO/tests/utils/setup.rs @@ -16,8 +16,8 @@ pub(crate) struct Metadata { pub(crate) wallet: WalletUnlocked, } -const DAO_CONTRACT_BINARY_PATH: &str = "./out/debug/DAO-contract.bin"; -const DAO_CONTRACT_STORAGE_PATH: &str = "./out/debug/DAO-contract-storage_slots.json"; +const DAO_CONTRACT_BINARY_PATH: &str = "./DAO-contract/out/debug/DAO-contract.bin"; +const DAO_CONTRACT_STORAGE_PATH: &str = "./DAO-contract/out/debug/DAO-contract-storage_slots.json"; pub(crate) fn proposal_transaction(asset_id: AssetId) -> Proposal { let call_data = CallData { diff --git a/counter-script/Cargo.toml b/counter-script/Cargo.toml index 65dd795ba..af294d335 100644 --- a/counter-script/Cargo.toml +++ b/counter-script/Cargo.toml @@ -9,5 +9,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "counter_script_integration_tests" path = "tests/harness.rs" From 3ba7447eadc715e46039c1824ab4cdba16f7a2a2 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:49:45 +0530 Subject: [PATCH 11/23] english-auction reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- english-auction/{auction-contract => }/Cargo.toml | 2 +- .../{auction-contract => }/tests/functions/core/bid.rs | 0 .../{auction-contract => }/tests/functions/core/cancel.rs | 0 .../{auction-contract => }/tests/functions/core/create.rs | 0 .../{auction-contract => }/tests/functions/core/mod.rs | 0 .../tests/functions/core/withdraw.rs | 0 .../tests/functions/info/auction_info.rs | 0 .../tests/functions/info/deposit_balance.rs | 0 .../{auction-contract => }/tests/functions/info/mod.rs | 0 .../tests/functions/info/total_auctions.rs | 0 .../{auction-contract => }/tests/functions/mod.rs | 0 english-auction/{auction-contract => }/tests/harness.rs | 0 .../{auction-contract => }/tests/utils/interface/core.rs | 0 .../{auction-contract => }/tests/utils/interface/info.rs | 0 .../{auction-contract => }/tests/utils/interface/mod.rs | 0 english-auction/{auction-contract => }/tests/utils/mod.rs | 0 .../{auction-contract => }/tests/utils/setup.rs | 4 ++-- 19 files changed, 12 insertions(+), 4 deletions(-) rename english-auction/{auction-contract => }/Cargo.toml (85%) rename english-auction/{auction-contract => }/tests/functions/core/bid.rs (100%) rename english-auction/{auction-contract => }/tests/functions/core/cancel.rs (100%) rename english-auction/{auction-contract => }/tests/functions/core/create.rs (100%) rename english-auction/{auction-contract => }/tests/functions/core/mod.rs (100%) rename english-auction/{auction-contract => }/tests/functions/core/withdraw.rs (100%) rename english-auction/{auction-contract => }/tests/functions/info/auction_info.rs (100%) rename english-auction/{auction-contract => }/tests/functions/info/deposit_balance.rs (100%) rename english-auction/{auction-contract => }/tests/functions/info/mod.rs (100%) rename english-auction/{auction-contract => }/tests/functions/info/total_auctions.rs (100%) rename english-auction/{auction-contract => }/tests/functions/mod.rs (100%) rename english-auction/{auction-contract => }/tests/harness.rs (100%) rename english-auction/{auction-contract => }/tests/utils/interface/core.rs (100%) rename english-auction/{auction-contract => }/tests/utils/interface/info.rs (100%) rename english-auction/{auction-contract => }/tests/utils/interface/mod.rs (100%) rename english-auction/{auction-contract => }/tests/utils/mod.rs (100%) rename english-auction/{auction-contract => }/tests/utils/setup.rs (94%) diff --git a/Cargo.lock b/Cargo.lock index 9277bafb0..fb92d544c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -430,6 +430,14 @@ dependencies = [ "url", ] +[[package]] +name = "auction-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "autocfg" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index 807ad01b9..e792eb3ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "AMM", "counter-script", "DAO", - # "english-auction", + "english-auction", # "escrow", # "fractional-NFT", # "fundraiser", diff --git a/english-auction/auction-contract/Cargo.toml b/english-auction/Cargo.toml similarity index 85% rename from english-auction/auction-contract/Cargo.toml rename to english-auction/Cargo.toml index 168e2d04a..79c3e0d8e 100644 --- a/english-auction/auction-contract/Cargo.toml +++ b/english-auction/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "english_auction_integration_tests" path = "tests/harness.rs" diff --git a/english-auction/auction-contract/tests/functions/core/bid.rs b/english-auction/tests/functions/core/bid.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/core/bid.rs rename to english-auction/tests/functions/core/bid.rs diff --git a/english-auction/auction-contract/tests/functions/core/cancel.rs b/english-auction/tests/functions/core/cancel.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/core/cancel.rs rename to english-auction/tests/functions/core/cancel.rs diff --git a/english-auction/auction-contract/tests/functions/core/create.rs b/english-auction/tests/functions/core/create.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/core/create.rs rename to english-auction/tests/functions/core/create.rs diff --git a/english-auction/auction-contract/tests/functions/core/mod.rs b/english-auction/tests/functions/core/mod.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/core/mod.rs rename to english-auction/tests/functions/core/mod.rs diff --git a/english-auction/auction-contract/tests/functions/core/withdraw.rs b/english-auction/tests/functions/core/withdraw.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/core/withdraw.rs rename to english-auction/tests/functions/core/withdraw.rs diff --git a/english-auction/auction-contract/tests/functions/info/auction_info.rs b/english-auction/tests/functions/info/auction_info.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/info/auction_info.rs rename to english-auction/tests/functions/info/auction_info.rs diff --git a/english-auction/auction-contract/tests/functions/info/deposit_balance.rs b/english-auction/tests/functions/info/deposit_balance.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/info/deposit_balance.rs rename to english-auction/tests/functions/info/deposit_balance.rs diff --git a/english-auction/auction-contract/tests/functions/info/mod.rs b/english-auction/tests/functions/info/mod.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/info/mod.rs rename to english-auction/tests/functions/info/mod.rs diff --git a/english-auction/auction-contract/tests/functions/info/total_auctions.rs b/english-auction/tests/functions/info/total_auctions.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/info/total_auctions.rs rename to english-auction/tests/functions/info/total_auctions.rs diff --git a/english-auction/auction-contract/tests/functions/mod.rs b/english-auction/tests/functions/mod.rs similarity index 100% rename from english-auction/auction-contract/tests/functions/mod.rs rename to english-auction/tests/functions/mod.rs diff --git a/english-auction/auction-contract/tests/harness.rs b/english-auction/tests/harness.rs similarity index 100% rename from english-auction/auction-contract/tests/harness.rs rename to english-auction/tests/harness.rs diff --git a/english-auction/auction-contract/tests/utils/interface/core.rs b/english-auction/tests/utils/interface/core.rs similarity index 100% rename from english-auction/auction-contract/tests/utils/interface/core.rs rename to english-auction/tests/utils/interface/core.rs diff --git a/english-auction/auction-contract/tests/utils/interface/info.rs b/english-auction/tests/utils/interface/info.rs similarity index 100% rename from english-auction/auction-contract/tests/utils/interface/info.rs rename to english-auction/tests/utils/interface/info.rs diff --git a/english-auction/auction-contract/tests/utils/interface/mod.rs b/english-auction/tests/utils/interface/mod.rs similarity index 100% rename from english-auction/auction-contract/tests/utils/interface/mod.rs rename to english-auction/tests/utils/interface/mod.rs diff --git a/english-auction/auction-contract/tests/utils/mod.rs b/english-auction/tests/utils/mod.rs similarity index 100% rename from english-auction/auction-contract/tests/utils/mod.rs rename to english-auction/tests/utils/mod.rs diff --git a/english-auction/auction-contract/tests/utils/setup.rs b/english-auction/tests/utils/setup.rs similarity index 94% rename from english-auction/auction-contract/tests/utils/setup.rs rename to english-auction/tests/utils/setup.rs index 032d3d556..d5d6ea097 100644 --- a/english-auction/auction-contract/tests/utils/setup.rs +++ b/english-auction/tests/utils/setup.rs @@ -12,8 +12,8 @@ abigen!(Contract( abi = "./english-auction/auction-contract/out/debug/auction-contract-abi.json" ),); -const AUCTION_CONTRACT_BINARY_PATH: &str = "./out/debug/auction-contract.bin"; -const AUCTION_CONTRACT_STORAGE_PATH: &str = "./out/debug/auction-contract-storage_slots.json"; +const AUCTION_CONTRACT_BINARY_PATH: &str = "./auction-contract/out/debug/auction-contract.bin"; +const AUCTION_CONTRACT_STORAGE_PATH: &str = "./auction-contract/out/debug/auction-contract-storage_slots.json"; pub(crate) struct Metadata { pub(crate) auction: EnglishAuction, From 26e2a0dc91f02b9e794ce400112674eddbb98238 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:51:07 +0530 Subject: [PATCH 12/23] escrow reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- escrow/{escrow-contract => }/Cargo.toml | 2 +- .../tests/functions/core/accept_arbiter.rs | 0 .../tests/functions/core/create_escrow.rs | 0 .../{escrow-contract => }/tests/functions/core/deposit.rs | 0 .../{escrow-contract => }/tests/functions/core/dispute.rs | 0 escrow/{escrow-contract => }/tests/functions/core/mod.rs | 0 .../tests/functions/core/propose_arbiter.rs | 0 .../tests/functions/core/resolve_dispute.rs | 0 .../tests/functions/core/return_deposit.rs | 0 .../tests/functions/core/take_payment.rs | 0 .../tests/functions/core/transfer_to_seller.rs | 0 .../tests/functions/core/withdraw_collateral.rs | 0 .../tests/functions/info/arbiter_proposal.rs | 0 .../{escrow-contract => }/tests/functions/info/assets.rs | 0 .../tests/functions/info/escrow_count.rs | 0 .../{escrow-contract => }/tests/functions/info/escrows.rs | 0 escrow/{escrow-contract => }/tests/functions/info/mod.rs | 0 escrow/{escrow-contract => }/tests/functions/mod.rs | 0 escrow/{escrow-contract => }/tests/harness.rs | 0 .../{escrow-contract => }/tests/utils/interface/core.rs | 0 .../{escrow-contract => }/tests/utils/interface/info.rs | 0 escrow/{escrow-contract => }/tests/utils/interface/mod.rs | 0 escrow/{escrow-contract => }/tests/utils/mod.rs | 0 escrow/{escrow-contract => }/tests/utils/setup.rs | 4 ++-- 26 files changed, 12 insertions(+), 4 deletions(-) rename escrow/{escrow-contract => }/Cargo.toml (88%) rename escrow/{escrow-contract => }/tests/functions/core/accept_arbiter.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/create_escrow.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/deposit.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/dispute.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/mod.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/propose_arbiter.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/resolve_dispute.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/return_deposit.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/take_payment.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/transfer_to_seller.rs (100%) rename escrow/{escrow-contract => }/tests/functions/core/withdraw_collateral.rs (100%) rename escrow/{escrow-contract => }/tests/functions/info/arbiter_proposal.rs (100%) rename escrow/{escrow-contract => }/tests/functions/info/assets.rs (100%) rename escrow/{escrow-contract => }/tests/functions/info/escrow_count.rs (100%) rename escrow/{escrow-contract => }/tests/functions/info/escrows.rs (100%) rename escrow/{escrow-contract => }/tests/functions/info/mod.rs (100%) rename escrow/{escrow-contract => }/tests/functions/mod.rs (100%) rename escrow/{escrow-contract => }/tests/harness.rs (100%) rename escrow/{escrow-contract => }/tests/utils/interface/core.rs (100%) rename escrow/{escrow-contract => }/tests/utils/interface/info.rs (100%) rename escrow/{escrow-contract => }/tests/utils/interface/mod.rs (100%) rename escrow/{escrow-contract => }/tests/utils/mod.rs (100%) rename escrow/{escrow-contract => }/tests/utils/setup.rs (95%) diff --git a/Cargo.lock b/Cargo.lock index fb92d544c..de4fae386 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1445,6 +1445,14 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "escrow-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "eth-keystore" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index e792eb3ae..dfa9bef7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ "counter-script", "DAO", "english-auction", - # "escrow", + "escrow", # "fractional-NFT", # "fundraiser", # "name-registry", diff --git a/escrow/escrow-contract/Cargo.toml b/escrow/Cargo.toml similarity index 88% rename from escrow/escrow-contract/Cargo.toml rename to escrow/Cargo.toml index eebee3edb..e13a71a28 100644 --- a/escrow/escrow-contract/Cargo.toml +++ b/escrow/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "escrow_integration_tests" path = "tests/harness.rs" diff --git a/escrow/escrow-contract/tests/functions/core/accept_arbiter.rs b/escrow/tests/functions/core/accept_arbiter.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/accept_arbiter.rs rename to escrow/tests/functions/core/accept_arbiter.rs diff --git a/escrow/escrow-contract/tests/functions/core/create_escrow.rs b/escrow/tests/functions/core/create_escrow.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/create_escrow.rs rename to escrow/tests/functions/core/create_escrow.rs diff --git a/escrow/escrow-contract/tests/functions/core/deposit.rs b/escrow/tests/functions/core/deposit.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/deposit.rs rename to escrow/tests/functions/core/deposit.rs diff --git a/escrow/escrow-contract/tests/functions/core/dispute.rs b/escrow/tests/functions/core/dispute.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/dispute.rs rename to escrow/tests/functions/core/dispute.rs diff --git a/escrow/escrow-contract/tests/functions/core/mod.rs b/escrow/tests/functions/core/mod.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/mod.rs rename to escrow/tests/functions/core/mod.rs diff --git a/escrow/escrow-contract/tests/functions/core/propose_arbiter.rs b/escrow/tests/functions/core/propose_arbiter.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/propose_arbiter.rs rename to escrow/tests/functions/core/propose_arbiter.rs diff --git a/escrow/escrow-contract/tests/functions/core/resolve_dispute.rs b/escrow/tests/functions/core/resolve_dispute.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/resolve_dispute.rs rename to escrow/tests/functions/core/resolve_dispute.rs diff --git a/escrow/escrow-contract/tests/functions/core/return_deposit.rs b/escrow/tests/functions/core/return_deposit.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/return_deposit.rs rename to escrow/tests/functions/core/return_deposit.rs diff --git a/escrow/escrow-contract/tests/functions/core/take_payment.rs b/escrow/tests/functions/core/take_payment.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/take_payment.rs rename to escrow/tests/functions/core/take_payment.rs diff --git a/escrow/escrow-contract/tests/functions/core/transfer_to_seller.rs b/escrow/tests/functions/core/transfer_to_seller.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/transfer_to_seller.rs rename to escrow/tests/functions/core/transfer_to_seller.rs diff --git a/escrow/escrow-contract/tests/functions/core/withdraw_collateral.rs b/escrow/tests/functions/core/withdraw_collateral.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/core/withdraw_collateral.rs rename to escrow/tests/functions/core/withdraw_collateral.rs diff --git a/escrow/escrow-contract/tests/functions/info/arbiter_proposal.rs b/escrow/tests/functions/info/arbiter_proposal.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/info/arbiter_proposal.rs rename to escrow/tests/functions/info/arbiter_proposal.rs diff --git a/escrow/escrow-contract/tests/functions/info/assets.rs b/escrow/tests/functions/info/assets.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/info/assets.rs rename to escrow/tests/functions/info/assets.rs diff --git a/escrow/escrow-contract/tests/functions/info/escrow_count.rs b/escrow/tests/functions/info/escrow_count.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/info/escrow_count.rs rename to escrow/tests/functions/info/escrow_count.rs diff --git a/escrow/escrow-contract/tests/functions/info/escrows.rs b/escrow/tests/functions/info/escrows.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/info/escrows.rs rename to escrow/tests/functions/info/escrows.rs diff --git a/escrow/escrow-contract/tests/functions/info/mod.rs b/escrow/tests/functions/info/mod.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/info/mod.rs rename to escrow/tests/functions/info/mod.rs diff --git a/escrow/escrow-contract/tests/functions/mod.rs b/escrow/tests/functions/mod.rs similarity index 100% rename from escrow/escrow-contract/tests/functions/mod.rs rename to escrow/tests/functions/mod.rs diff --git a/escrow/escrow-contract/tests/harness.rs b/escrow/tests/harness.rs similarity index 100% rename from escrow/escrow-contract/tests/harness.rs rename to escrow/tests/harness.rs diff --git a/escrow/escrow-contract/tests/utils/interface/core.rs b/escrow/tests/utils/interface/core.rs similarity index 100% rename from escrow/escrow-contract/tests/utils/interface/core.rs rename to escrow/tests/utils/interface/core.rs diff --git a/escrow/escrow-contract/tests/utils/interface/info.rs b/escrow/tests/utils/interface/info.rs similarity index 100% rename from escrow/escrow-contract/tests/utils/interface/info.rs rename to escrow/tests/utils/interface/info.rs diff --git a/escrow/escrow-contract/tests/utils/interface/mod.rs b/escrow/tests/utils/interface/mod.rs similarity index 100% rename from escrow/escrow-contract/tests/utils/interface/mod.rs rename to escrow/tests/utils/interface/mod.rs diff --git a/escrow/escrow-contract/tests/utils/mod.rs b/escrow/tests/utils/mod.rs similarity index 100% rename from escrow/escrow-contract/tests/utils/mod.rs rename to escrow/tests/utils/mod.rs diff --git a/escrow/escrow-contract/tests/utils/setup.rs b/escrow/tests/utils/setup.rs similarity index 95% rename from escrow/escrow-contract/tests/utils/setup.rs rename to escrow/tests/utils/setup.rs index a1d0709fd..84b5f37f8 100644 --- a/escrow/escrow-contract/tests/utils/setup.rs +++ b/escrow/tests/utils/setup.rs @@ -14,8 +14,8 @@ abigen!(Contract( abi = "./escrow/escrow-contract/out/debug/escrow-contract-abi.json" ),); -const ESCROW_CONTRACT_BINARY_PATH: &str = "./out/debug/escrow-contract.bin"; -const ESCROW_CONTRACT_STORAGE_PATH: &str = "./out/debug/escrow-contract-storage_slots.json"; +const ESCROW_CONTRACT_BINARY_PATH: &str = "./escrow-contract/out/debug/escrow-contract.bin"; +const ESCROW_CONTRACT_STORAGE_PATH: &str = "./escrow-contract/out/debug/escrow-contract-storage_slots.json"; pub(crate) struct Defaults { pub(crate) asset_amount: u64, From 3a6e426a91e58e66b1778467c69cb0b229473cc5 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:52:40 +0530 Subject: [PATCH 13/23] fractional nft reorg --- Cargo.lock | 9 +++++++++ Cargo.toml | 2 +- fractional-NFT/{f-NFT-contract => }/Cargo.toml | 2 +- .../{f-NFT-contract => }/tests/functions/deposit.rs | 0 .../tests/functions/managed_assets.rs | 0 .../tests/functions/max_depositable.rs | 0 .../tests/functions/max_withdrawable.rs | 0 .../{f-NFT-contract => }/tests/functions/mod.rs | 0 .../{f-NFT-contract => }/tests/functions/withdraw.rs | 0 fractional-NFT/{f-NFT-contract => }/tests/harness.rs | 0 .../{f-NFT-contract => }/tests/utils/interface.rs | 0 fractional-NFT/{f-NFT-contract => }/tests/utils/mod.rs | 0 fractional-NFT/{f-NFT-contract => }/tests/utils/setup.rs | 8 ++++---- 13 files changed, 15 insertions(+), 6 deletions(-) rename fractional-NFT/{f-NFT-contract => }/Cargo.toml (87%) rename fractional-NFT/{f-NFT-contract => }/tests/functions/deposit.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/functions/managed_assets.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/functions/max_depositable.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/functions/max_withdrawable.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/functions/mod.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/functions/withdraw.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/harness.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/utils/interface.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/utils/mod.rs (100%) rename fractional-NFT/{f-NFT-contract => }/tests/utils/setup.rs (93%) diff --git a/Cargo.lock b/Cargo.lock index de4fae386..a560cdb2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1517,6 +1517,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "f-NFT-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "sha2 0.10.8", + "tokio", +] + [[package]] name = "fastrand" version = "2.1.0" diff --git a/Cargo.toml b/Cargo.toml index dfa9bef7a..30fa54da1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ "DAO", "english-auction", "escrow", - # "fractional-NFT", + "fractional-NFT", # "fundraiser", # "name-registry", # "native-asset", diff --git a/fractional-NFT/f-NFT-contract/Cargo.toml b/fractional-NFT/Cargo.toml similarity index 87% rename from fractional-NFT/f-NFT-contract/Cargo.toml rename to fractional-NFT/Cargo.toml index 8da5a6824..0f49e8b05 100644 --- a/fractional-NFT/f-NFT-contract/Cargo.toml +++ b/fractional-NFT/Cargo.toml @@ -12,5 +12,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "fractional_NFT_integration_tests" path = "tests/harness.rs" diff --git a/fractional-NFT/f-NFT-contract/tests/functions/deposit.rs b/fractional-NFT/tests/functions/deposit.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/functions/deposit.rs rename to fractional-NFT/tests/functions/deposit.rs diff --git a/fractional-NFT/f-NFT-contract/tests/functions/managed_assets.rs b/fractional-NFT/tests/functions/managed_assets.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/functions/managed_assets.rs rename to fractional-NFT/tests/functions/managed_assets.rs diff --git a/fractional-NFT/f-NFT-contract/tests/functions/max_depositable.rs b/fractional-NFT/tests/functions/max_depositable.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/functions/max_depositable.rs rename to fractional-NFT/tests/functions/max_depositable.rs diff --git a/fractional-NFT/f-NFT-contract/tests/functions/max_withdrawable.rs b/fractional-NFT/tests/functions/max_withdrawable.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/functions/max_withdrawable.rs rename to fractional-NFT/tests/functions/max_withdrawable.rs diff --git a/fractional-NFT/f-NFT-contract/tests/functions/mod.rs b/fractional-NFT/tests/functions/mod.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/functions/mod.rs rename to fractional-NFT/tests/functions/mod.rs diff --git a/fractional-NFT/f-NFT-contract/tests/functions/withdraw.rs b/fractional-NFT/tests/functions/withdraw.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/functions/withdraw.rs rename to fractional-NFT/tests/functions/withdraw.rs diff --git a/fractional-NFT/f-NFT-contract/tests/harness.rs b/fractional-NFT/tests/harness.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/harness.rs rename to fractional-NFT/tests/harness.rs diff --git a/fractional-NFT/f-NFT-contract/tests/utils/interface.rs b/fractional-NFT/tests/utils/interface.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/utils/interface.rs rename to fractional-NFT/tests/utils/interface.rs diff --git a/fractional-NFT/f-NFT-contract/tests/utils/mod.rs b/fractional-NFT/tests/utils/mod.rs similarity index 100% rename from fractional-NFT/f-NFT-contract/tests/utils/mod.rs rename to fractional-NFT/tests/utils/mod.rs diff --git a/fractional-NFT/f-NFT-contract/tests/utils/setup.rs b/fractional-NFT/tests/utils/setup.rs similarity index 93% rename from fractional-NFT/f-NFT-contract/tests/utils/setup.rs rename to fractional-NFT/tests/utils/setup.rs index 5be413e55..7ac40c98d 100644 --- a/fractional-NFT/f-NFT-contract/tests/utils/setup.rs +++ b/fractional-NFT/tests/utils/setup.rs @@ -20,11 +20,11 @@ abigen!( ), ); -const F_NFT_CONTRACT_BINARY_PATH: &str = "./out/debug/f-NFT-contract.bin"; -const NFT_CONTRACT_BINARY_PATH: &str = "../test-artifacts/out/debug/NFT-contract.bin"; -const F_NFT_CONTRACT_STORAGE_PATH: &str = "./out/debug/f-NFT-contract-storage_slots.json"; +const F_NFT_CONTRACT_BINARY_PATH: &str = "./f-NFT-contract/out/debug/f-NFT-contract.bin"; +const NFT_CONTRACT_BINARY_PATH: &str = "./test-artifacts/out/debug/NFT-contract.bin"; +const F_NFT_CONTRACT_STORAGE_PATH: &str = "./f-NFT-contract/out/debug/f-NFT-contract-storage_slots.json"; const NFT_CONTRACT_STORAGE_PATH: &str = - "../test-artifacts/out/debug/NFT-contract-storage_slots.json"; + "./test-artifacts/out/debug/NFT-contract-storage_slots.json"; pub(crate) struct User { pub(crate) f_nft: F_NFT, From 4760acabfc06671fa8f35ed9b67d3ecfaef2c3a4 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:53:49 +0530 Subject: [PATCH 14/23] fundraiser reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- fundraiser/{fundraiser-contract => }/Cargo.toml | 2 +- .../tests/functions/core/cancel_campaign.rs | 0 .../tests/functions/core/claim_pledges.rs | 0 .../tests/functions/core/create_campaign.rs | 0 .../{fundraiser-contract => }/tests/functions/core/mod.rs | 0 .../tests/functions/core/pledge.rs | 0 .../tests/functions/core/unpledge.rs | 0 .../tests/functions/info/asset_count.rs | 0 .../tests/functions/info/asset_info_by_count.rs | 0 .../tests/functions/info/asset_info_by_id.rs | 0 .../tests/functions/info/campaign.rs | 0 .../tests/functions/info/campaign_info.rs | 0 .../{fundraiser-contract => }/tests/functions/info/mod.rs | 0 .../tests/functions/info/pledge_count.rs | 0 .../tests/functions/info/pledged.rs | 0 .../tests/functions/info/total_campaigns.rs | 0 .../tests/functions/info/user_campaign_count.rs | 0 .../{fundraiser-contract => }/tests/functions/mod.rs | 0 fundraiser/{fundraiser-contract => }/tests/harness.rs | 0 .../tests/utils/interface/core.rs | 0 .../tests/utils/interface/info.rs | 0 .../tests/utils/interface/mod.rs | 0 fundraiser/{fundraiser-contract => }/tests/utils/mod.rs | 0 fundraiser/{fundraiser-contract => }/tests/utils/setup.rs | 4 ++-- 26 files changed, 12 insertions(+), 4 deletions(-) rename fundraiser/{fundraiser-contract => }/Cargo.toml (87%) rename fundraiser/{fundraiser-contract => }/tests/functions/core/cancel_campaign.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/core/claim_pledges.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/core/create_campaign.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/core/mod.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/core/pledge.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/core/unpledge.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/asset_count.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/asset_info_by_count.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/asset_info_by_id.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/campaign.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/campaign_info.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/mod.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/pledge_count.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/pledged.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/total_campaigns.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/info/user_campaign_count.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/functions/mod.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/harness.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/utils/interface/core.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/utils/interface/info.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/utils/interface/mod.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/utils/mod.rs (100%) rename fundraiser/{fundraiser-contract => }/tests/utils/setup.rs (93%) diff --git a/Cargo.lock b/Cargo.lock index a560cdb2a..53d4df775 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2215,6 +2215,14 @@ dependencies = [ "which", ] +[[package]] +name = "fundraiser-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "funty" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index 30fa54da1..3859379c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ "english-auction", "escrow", "fractional-NFT", - # "fundraiser", + "fundraiser", # "name-registry", # "native-asset", # "NFT", diff --git a/fundraiser/fundraiser-contract/Cargo.toml b/fundraiser/Cargo.toml similarity index 87% rename from fundraiser/fundraiser-contract/Cargo.toml rename to fundraiser/Cargo.toml index c79b5ba19..d6aa2eb6c 100644 --- a/fundraiser/fundraiser-contract/Cargo.toml +++ b/fundraiser/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "fundraiser_integration_tests" path = "tests/harness.rs" diff --git a/fundraiser/fundraiser-contract/tests/functions/core/cancel_campaign.rs b/fundraiser/tests/functions/core/cancel_campaign.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/core/cancel_campaign.rs rename to fundraiser/tests/functions/core/cancel_campaign.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/core/claim_pledges.rs b/fundraiser/tests/functions/core/claim_pledges.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/core/claim_pledges.rs rename to fundraiser/tests/functions/core/claim_pledges.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/core/create_campaign.rs b/fundraiser/tests/functions/core/create_campaign.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/core/create_campaign.rs rename to fundraiser/tests/functions/core/create_campaign.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/core/mod.rs b/fundraiser/tests/functions/core/mod.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/core/mod.rs rename to fundraiser/tests/functions/core/mod.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/core/pledge.rs b/fundraiser/tests/functions/core/pledge.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/core/pledge.rs rename to fundraiser/tests/functions/core/pledge.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/core/unpledge.rs b/fundraiser/tests/functions/core/unpledge.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/core/unpledge.rs rename to fundraiser/tests/functions/core/unpledge.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/asset_count.rs b/fundraiser/tests/functions/info/asset_count.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/asset_count.rs rename to fundraiser/tests/functions/info/asset_count.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/asset_info_by_count.rs b/fundraiser/tests/functions/info/asset_info_by_count.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/asset_info_by_count.rs rename to fundraiser/tests/functions/info/asset_info_by_count.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/asset_info_by_id.rs b/fundraiser/tests/functions/info/asset_info_by_id.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/asset_info_by_id.rs rename to fundraiser/tests/functions/info/asset_info_by_id.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/campaign.rs b/fundraiser/tests/functions/info/campaign.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/campaign.rs rename to fundraiser/tests/functions/info/campaign.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/campaign_info.rs b/fundraiser/tests/functions/info/campaign_info.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/campaign_info.rs rename to fundraiser/tests/functions/info/campaign_info.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/mod.rs b/fundraiser/tests/functions/info/mod.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/mod.rs rename to fundraiser/tests/functions/info/mod.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/pledge_count.rs b/fundraiser/tests/functions/info/pledge_count.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/pledge_count.rs rename to fundraiser/tests/functions/info/pledge_count.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/pledged.rs b/fundraiser/tests/functions/info/pledged.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/pledged.rs rename to fundraiser/tests/functions/info/pledged.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/total_campaigns.rs b/fundraiser/tests/functions/info/total_campaigns.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/total_campaigns.rs rename to fundraiser/tests/functions/info/total_campaigns.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/info/user_campaign_count.rs b/fundraiser/tests/functions/info/user_campaign_count.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/info/user_campaign_count.rs rename to fundraiser/tests/functions/info/user_campaign_count.rs diff --git a/fundraiser/fundraiser-contract/tests/functions/mod.rs b/fundraiser/tests/functions/mod.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/functions/mod.rs rename to fundraiser/tests/functions/mod.rs diff --git a/fundraiser/fundraiser-contract/tests/harness.rs b/fundraiser/tests/harness.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/harness.rs rename to fundraiser/tests/harness.rs diff --git a/fundraiser/fundraiser-contract/tests/utils/interface/core.rs b/fundraiser/tests/utils/interface/core.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/utils/interface/core.rs rename to fundraiser/tests/utils/interface/core.rs diff --git a/fundraiser/fundraiser-contract/tests/utils/interface/info.rs b/fundraiser/tests/utils/interface/info.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/utils/interface/info.rs rename to fundraiser/tests/utils/interface/info.rs diff --git a/fundraiser/fundraiser-contract/tests/utils/interface/mod.rs b/fundraiser/tests/utils/interface/mod.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/utils/interface/mod.rs rename to fundraiser/tests/utils/interface/mod.rs diff --git a/fundraiser/fundraiser-contract/tests/utils/mod.rs b/fundraiser/tests/utils/mod.rs similarity index 100% rename from fundraiser/fundraiser-contract/tests/utils/mod.rs rename to fundraiser/tests/utils/mod.rs diff --git a/fundraiser/fundraiser-contract/tests/utils/setup.rs b/fundraiser/tests/utils/setup.rs similarity index 93% rename from fundraiser/fundraiser-contract/tests/utils/setup.rs rename to fundraiser/tests/utils/setup.rs index 42abe3c6b..87c141df9 100644 --- a/fundraiser/fundraiser-contract/tests/utils/setup.rs +++ b/fundraiser/tests/utils/setup.rs @@ -12,8 +12,8 @@ abigen!(Contract( abi = "./fundraiser/fundraiser-contract/out/debug/fundraiser-contract-abi.json" ),); -const FUNDRAISER_CONTRACT_BINARY_PATH: &str = "./out/debug/fundraiser-contract.bin"; -const FUNDRAISER_CONTRACT_STORAGE_PATH: &str = "./out/debug/fundraiser-contract-storage_slots.json"; +const FUNDRAISER_CONTRACT_BINARY_PATH: &str = "./fundraiser-contract/out/debug/fundraiser-contract.bin"; +const FUNDRAISER_CONTRACT_STORAGE_PATH: &str = "./fundraiser-contract/out/debug/fundraiser-contract-storage_slots.json"; pub(crate) struct Coin { pub(crate) id: AssetId, From d5967b0a332c8c1a2f54e4061382fdcb203f5789 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:54:29 +0530 Subject: [PATCH 15/23] name registry reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- name-registry/{registry-contract => }/Cargo.toml | 2 +- .../tests/functions/core/extend.rs | 0 .../{registry-contract => }/tests/functions/core/mod.rs | 0 .../tests/functions/core/register.rs | 0 .../tests/functions/core/set_asset.rs | 0 .../tests/functions/core/set_identity.rs | 0 .../tests/functions/core/set_owner.rs | 0 .../tests/functions/info/expiry.rs | 0 .../tests/functions/info/identity.rs | 0 .../{registry-contract => }/tests/functions/info/mod.rs | 0 .../{registry-contract => }/tests/functions/info/owner.rs | 0 .../{registry-contract => }/tests/functions/info/rate.rs | 0 .../{registry-contract => }/tests/functions/mod.rs | 0 name-registry/{registry-contract => }/tests/harness.rs | 0 .../{registry-contract => }/tests/utils/interface/core.rs | 0 .../{registry-contract => }/tests/utils/interface/info.rs | 0 .../{registry-contract => }/tests/utils/interface/mod.rs | 0 name-registry/{registry-contract => }/tests/utils/mod.rs | 0 .../{registry-contract => }/tests/utils/setup.rs | 4 ++-- 21 files changed, 12 insertions(+), 4 deletions(-) rename name-registry/{registry-contract => }/Cargo.toml (86%) rename name-registry/{registry-contract => }/tests/functions/core/extend.rs (100%) rename name-registry/{registry-contract => }/tests/functions/core/mod.rs (100%) rename name-registry/{registry-contract => }/tests/functions/core/register.rs (100%) rename name-registry/{registry-contract => }/tests/functions/core/set_asset.rs (100%) rename name-registry/{registry-contract => }/tests/functions/core/set_identity.rs (100%) rename name-registry/{registry-contract => }/tests/functions/core/set_owner.rs (100%) rename name-registry/{registry-contract => }/tests/functions/info/expiry.rs (100%) rename name-registry/{registry-contract => }/tests/functions/info/identity.rs (100%) rename name-registry/{registry-contract => }/tests/functions/info/mod.rs (100%) rename name-registry/{registry-contract => }/tests/functions/info/owner.rs (100%) rename name-registry/{registry-contract => }/tests/functions/info/rate.rs (100%) rename name-registry/{registry-contract => }/tests/functions/mod.rs (100%) rename name-registry/{registry-contract => }/tests/harness.rs (100%) rename name-registry/{registry-contract => }/tests/utils/interface/core.rs (100%) rename name-registry/{registry-contract => }/tests/utils/interface/info.rs (100%) rename name-registry/{registry-contract => }/tests/utils/interface/mod.rs (100%) rename name-registry/{registry-contract => }/tests/utils/mod.rs (100%) rename name-registry/{registry-contract => }/tests/utils/setup.rs (94%) diff --git a/Cargo.lock b/Cargo.lock index 53d4df775..f237dae16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4495,6 +4495,14 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +[[package]] +name = "registry-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "reqwest" version = "0.11.27" diff --git a/Cargo.toml b/Cargo.toml index 3859379c7..2ff42a0c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ "escrow", "fractional-NFT", "fundraiser", - # "name-registry", + "name-registry", # "native-asset", # "NFT", # "oracle", diff --git a/name-registry/registry-contract/Cargo.toml b/name-registry/Cargo.toml similarity index 86% rename from name-registry/registry-contract/Cargo.toml rename to name-registry/Cargo.toml index ff3b2b383..e7c37e3bb 100644 --- a/name-registry/registry-contract/Cargo.toml +++ b/name-registry/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "name_registry_integration_tests" path = "tests/harness.rs" diff --git a/name-registry/registry-contract/tests/functions/core/extend.rs b/name-registry/tests/functions/core/extend.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/core/extend.rs rename to name-registry/tests/functions/core/extend.rs diff --git a/name-registry/registry-contract/tests/functions/core/mod.rs b/name-registry/tests/functions/core/mod.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/core/mod.rs rename to name-registry/tests/functions/core/mod.rs diff --git a/name-registry/registry-contract/tests/functions/core/register.rs b/name-registry/tests/functions/core/register.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/core/register.rs rename to name-registry/tests/functions/core/register.rs diff --git a/name-registry/registry-contract/tests/functions/core/set_asset.rs b/name-registry/tests/functions/core/set_asset.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/core/set_asset.rs rename to name-registry/tests/functions/core/set_asset.rs diff --git a/name-registry/registry-contract/tests/functions/core/set_identity.rs b/name-registry/tests/functions/core/set_identity.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/core/set_identity.rs rename to name-registry/tests/functions/core/set_identity.rs diff --git a/name-registry/registry-contract/tests/functions/core/set_owner.rs b/name-registry/tests/functions/core/set_owner.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/core/set_owner.rs rename to name-registry/tests/functions/core/set_owner.rs diff --git a/name-registry/registry-contract/tests/functions/info/expiry.rs b/name-registry/tests/functions/info/expiry.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/info/expiry.rs rename to name-registry/tests/functions/info/expiry.rs diff --git a/name-registry/registry-contract/tests/functions/info/identity.rs b/name-registry/tests/functions/info/identity.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/info/identity.rs rename to name-registry/tests/functions/info/identity.rs diff --git a/name-registry/registry-contract/tests/functions/info/mod.rs b/name-registry/tests/functions/info/mod.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/info/mod.rs rename to name-registry/tests/functions/info/mod.rs diff --git a/name-registry/registry-contract/tests/functions/info/owner.rs b/name-registry/tests/functions/info/owner.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/info/owner.rs rename to name-registry/tests/functions/info/owner.rs diff --git a/name-registry/registry-contract/tests/functions/info/rate.rs b/name-registry/tests/functions/info/rate.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/info/rate.rs rename to name-registry/tests/functions/info/rate.rs diff --git a/name-registry/registry-contract/tests/functions/mod.rs b/name-registry/tests/functions/mod.rs similarity index 100% rename from name-registry/registry-contract/tests/functions/mod.rs rename to name-registry/tests/functions/mod.rs diff --git a/name-registry/registry-contract/tests/harness.rs b/name-registry/tests/harness.rs similarity index 100% rename from name-registry/registry-contract/tests/harness.rs rename to name-registry/tests/harness.rs diff --git a/name-registry/registry-contract/tests/utils/interface/core.rs b/name-registry/tests/utils/interface/core.rs similarity index 100% rename from name-registry/registry-contract/tests/utils/interface/core.rs rename to name-registry/tests/utils/interface/core.rs diff --git a/name-registry/registry-contract/tests/utils/interface/info.rs b/name-registry/tests/utils/interface/info.rs similarity index 100% rename from name-registry/registry-contract/tests/utils/interface/info.rs rename to name-registry/tests/utils/interface/info.rs diff --git a/name-registry/registry-contract/tests/utils/interface/mod.rs b/name-registry/tests/utils/interface/mod.rs similarity index 100% rename from name-registry/registry-contract/tests/utils/interface/mod.rs rename to name-registry/tests/utils/interface/mod.rs diff --git a/name-registry/registry-contract/tests/utils/mod.rs b/name-registry/tests/utils/mod.rs similarity index 100% rename from name-registry/registry-contract/tests/utils/mod.rs rename to name-registry/tests/utils/mod.rs diff --git a/name-registry/registry-contract/tests/utils/setup.rs b/name-registry/tests/utils/setup.rs similarity index 94% rename from name-registry/registry-contract/tests/utils/setup.rs rename to name-registry/tests/utils/setup.rs index 5cd7d7fd8..f15ba73d0 100644 --- a/name-registry/registry-contract/tests/utils/setup.rs +++ b/name-registry/tests/utils/setup.rs @@ -21,8 +21,8 @@ abigen!(Contract( pub(crate) const REGISTER_DURATION: u64 = 10000; pub(crate) const EXTEND_DURATION: u64 = 2500; -const CONTRACT_BINARY_PATH: &str = "./out/debug/registry-contract.bin"; -const CONTRACT_STORAGE_PATH: &str = "./out/debug/registry-contract-storage_slots.json"; +const CONTRACT_BINARY_PATH: &str = "./registry-contract/out/debug/registry-contract.bin"; +const CONTRACT_STORAGE_PATH: &str = "./registry-contract/out/debug/registry-contract-storage_slots.json"; pub(crate) struct Account { pub(crate) wallet: WalletUnlocked, From c46b92de28ae5834df5c9de2189324029c2587c9 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:55:50 +0530 Subject: [PATCH 16/23] native asset reorg --- Cargo.lock | 9 +++++++++ Cargo.toml | 2 +- native-asset/{native-asset-contract => }/Cargo.toml | 2 +- .../{native-asset-contract => }/tests/functions/burn.rs | 0 .../tests/functions/constructor.rs | 0 .../tests/functions/decimals.rs | 0 .../{native-asset-contract => }/tests/functions/mint.rs | 0 .../{native-asset-contract => }/tests/functions/mod.rs | 0 .../{native-asset-contract => }/tests/functions/name.rs | 0 .../{native-asset-contract => }/tests/functions/owner.rs | 0 .../tests/functions/set_decimals.rs | 0 .../tests/functions/set_name.rs | 0 .../tests/functions/set_symbol.rs | 0 .../tests/functions/symbol.rs | 0 .../tests/functions/total_assets.rs | 0 .../tests/functions/total_supply.rs | 0 .../{native-asset-contract => }/tests/harness.rs | 0 .../{native-asset-contract => }/tests/utils/interface.rs | 0 .../{native-asset-contract => }/tests/utils/mod.rs | 0 .../{native-asset-contract => }/tests/utils/setup.rs | 2 +- 20 files changed, 12 insertions(+), 3 deletions(-) rename native-asset/{native-asset-contract => }/Cargo.toml (88%) rename native-asset/{native-asset-contract => }/tests/functions/burn.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/constructor.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/decimals.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/mint.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/mod.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/name.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/owner.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/set_decimals.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/set_name.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/set_symbol.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/symbol.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/total_assets.rs (100%) rename native-asset/{native-asset-contract => }/tests/functions/total_supply.rs (100%) rename native-asset/{native-asset-contract => }/tests/harness.rs (100%) rename native-asset/{native-asset-contract => }/tests/utils/interface.rs (100%) rename native-asset/{native-asset-contract => }/tests/utils/mod.rs (100%) rename native-asset/{native-asset-contract => }/tests/utils/setup.rs (96%) diff --git a/Cargo.lock b/Cargo.lock index f237dae16..1663b4662 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3747,6 +3747,15 @@ dependencies = [ "unsigned-varint 0.7.2", ] +[[package]] +name = "native-asset-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "sha2 0.10.8", + "tokio", +] + [[package]] name = "netlink-packet-core" version = "0.4.2" diff --git a/Cargo.toml b/Cargo.toml index 2ff42a0c2..eb145adbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ "fractional-NFT", "fundraiser", "name-registry", - # "native-asset", + "native-asset", # "NFT", # "oracle", # "OTC-swap-predicate", diff --git a/native-asset/native-asset-contract/Cargo.toml b/native-asset/Cargo.toml similarity index 88% rename from native-asset/native-asset-contract/Cargo.toml rename to native-asset/Cargo.toml index 78df5ec19..234baa7aa 100644 --- a/native-asset/native-asset-contract/Cargo.toml +++ b/native-asset/Cargo.toml @@ -12,5 +12,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "native_asset_integration_tests" path = "tests/harness.rs" diff --git a/native-asset/native-asset-contract/tests/functions/burn.rs b/native-asset/tests/functions/burn.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/burn.rs rename to native-asset/tests/functions/burn.rs diff --git a/native-asset/native-asset-contract/tests/functions/constructor.rs b/native-asset/tests/functions/constructor.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/constructor.rs rename to native-asset/tests/functions/constructor.rs diff --git a/native-asset/native-asset-contract/tests/functions/decimals.rs b/native-asset/tests/functions/decimals.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/decimals.rs rename to native-asset/tests/functions/decimals.rs diff --git a/native-asset/native-asset-contract/tests/functions/mint.rs b/native-asset/tests/functions/mint.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/mint.rs rename to native-asset/tests/functions/mint.rs diff --git a/native-asset/native-asset-contract/tests/functions/mod.rs b/native-asset/tests/functions/mod.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/mod.rs rename to native-asset/tests/functions/mod.rs diff --git a/native-asset/native-asset-contract/tests/functions/name.rs b/native-asset/tests/functions/name.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/name.rs rename to native-asset/tests/functions/name.rs diff --git a/native-asset/native-asset-contract/tests/functions/owner.rs b/native-asset/tests/functions/owner.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/owner.rs rename to native-asset/tests/functions/owner.rs diff --git a/native-asset/native-asset-contract/tests/functions/set_decimals.rs b/native-asset/tests/functions/set_decimals.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/set_decimals.rs rename to native-asset/tests/functions/set_decimals.rs diff --git a/native-asset/native-asset-contract/tests/functions/set_name.rs b/native-asset/tests/functions/set_name.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/set_name.rs rename to native-asset/tests/functions/set_name.rs diff --git a/native-asset/native-asset-contract/tests/functions/set_symbol.rs b/native-asset/tests/functions/set_symbol.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/set_symbol.rs rename to native-asset/tests/functions/set_symbol.rs diff --git a/native-asset/native-asset-contract/tests/functions/symbol.rs b/native-asset/tests/functions/symbol.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/symbol.rs rename to native-asset/tests/functions/symbol.rs diff --git a/native-asset/native-asset-contract/tests/functions/total_assets.rs b/native-asset/tests/functions/total_assets.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/total_assets.rs rename to native-asset/tests/functions/total_assets.rs diff --git a/native-asset/native-asset-contract/tests/functions/total_supply.rs b/native-asset/tests/functions/total_supply.rs similarity index 100% rename from native-asset/native-asset-contract/tests/functions/total_supply.rs rename to native-asset/tests/functions/total_supply.rs diff --git a/native-asset/native-asset-contract/tests/harness.rs b/native-asset/tests/harness.rs similarity index 100% rename from native-asset/native-asset-contract/tests/harness.rs rename to native-asset/tests/harness.rs diff --git a/native-asset/native-asset-contract/tests/utils/interface.rs b/native-asset/tests/utils/interface.rs similarity index 100% rename from native-asset/native-asset-contract/tests/utils/interface.rs rename to native-asset/tests/utils/interface.rs diff --git a/native-asset/native-asset-contract/tests/utils/mod.rs b/native-asset/tests/utils/mod.rs similarity index 100% rename from native-asset/native-asset-contract/tests/utils/mod.rs rename to native-asset/tests/utils/mod.rs diff --git a/native-asset/native-asset-contract/tests/utils/setup.rs b/native-asset/tests/utils/setup.rs similarity index 96% rename from native-asset/native-asset-contract/tests/utils/setup.rs rename to native-asset/tests/utils/setup.rs index 88c45d7f1..f6f47ac79 100644 --- a/native-asset/native-asset-contract/tests/utils/setup.rs +++ b/native-asset/tests/utils/setup.rs @@ -13,7 +13,7 @@ abigen!(Contract( abi = "./native-asset/native-asset-contract/out/debug/native-asset-contract-abi.json" ),); -const NATIVE_ASSET_CONTRACT_BINARY_PATH: &str = "./out/debug/native-asset-contract.bin"; +const NATIVE_ASSET_CONTRACT_BINARY_PATH: &str = "./native-asset-contract/out/debug/native-asset-contract.bin"; pub(crate) fn defaults( contract_id: ContractId, From b48f4f9592674bbe6e66c41e956d793e5a5b5387 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 11:56:33 +0530 Subject: [PATCH 17/23] NFT reorg --- Cargo.lock | 9 +++++++++ Cargo.toml | 2 +- NFT/{NFT-contract => }/Cargo.toml | 2 +- NFT/{NFT-contract => }/tests/functions/burn.rs | 0 NFT/{NFT-contract => }/tests/functions/constructor.rs | 0 NFT/{NFT-contract => }/tests/functions/decimals.rs | 0 NFT/{NFT-contract => }/tests/functions/is_paused.rs | 0 NFT/{NFT-contract => }/tests/functions/metadata.rs | 0 NFT/{NFT-contract => }/tests/functions/mint.rs | 0 NFT/{NFT-contract => }/tests/functions/mod.rs | 0 NFT/{NFT-contract => }/tests/functions/name.rs | 0 NFT/{NFT-contract => }/tests/functions/owner.rs | 0 NFT/{NFT-contract => }/tests/functions/pause.rs | 0 NFT/{NFT-contract => }/tests/functions/set_decimals.rs | 0 NFT/{NFT-contract => }/tests/functions/set_metadata.rs | 0 NFT/{NFT-contract => }/tests/functions/set_name.rs | 0 NFT/{NFT-contract => }/tests/functions/set_symbol.rs | 0 NFT/{NFT-contract => }/tests/functions/symbol.rs | 0 NFT/{NFT-contract => }/tests/functions/total_assets.rs | 0 NFT/{NFT-contract => }/tests/functions/total_supply.rs | 0 NFT/{NFT-contract => }/tests/functions/unpause.rs | 0 NFT/{NFT-contract => }/tests/harness.rs | 0 NFT/{NFT-contract => }/tests/utils/interface.rs | 0 NFT/{NFT-contract => }/tests/utils/mod.rs | 0 NFT/{NFT-contract => }/tests/utils/setup.rs | 2 +- 25 files changed, 12 insertions(+), 3 deletions(-) rename NFT/{NFT-contract => }/Cargo.toml (90%) rename NFT/{NFT-contract => }/tests/functions/burn.rs (100%) rename NFT/{NFT-contract => }/tests/functions/constructor.rs (100%) rename NFT/{NFT-contract => }/tests/functions/decimals.rs (100%) rename NFT/{NFT-contract => }/tests/functions/is_paused.rs (100%) rename NFT/{NFT-contract => }/tests/functions/metadata.rs (100%) rename NFT/{NFT-contract => }/tests/functions/mint.rs (100%) rename NFT/{NFT-contract => }/tests/functions/mod.rs (100%) rename NFT/{NFT-contract => }/tests/functions/name.rs (100%) rename NFT/{NFT-contract => }/tests/functions/owner.rs (100%) rename NFT/{NFT-contract => }/tests/functions/pause.rs (100%) rename NFT/{NFT-contract => }/tests/functions/set_decimals.rs (100%) rename NFT/{NFT-contract => }/tests/functions/set_metadata.rs (100%) rename NFT/{NFT-contract => }/tests/functions/set_name.rs (100%) rename NFT/{NFT-contract => }/tests/functions/set_symbol.rs (100%) rename NFT/{NFT-contract => }/tests/functions/symbol.rs (100%) rename NFT/{NFT-contract => }/tests/functions/total_assets.rs (100%) rename NFT/{NFT-contract => }/tests/functions/total_supply.rs (100%) rename NFT/{NFT-contract => }/tests/functions/unpause.rs (100%) rename NFT/{NFT-contract => }/tests/harness.rs (100%) rename NFT/{NFT-contract => }/tests/utils/interface.rs (100%) rename NFT/{NFT-contract => }/tests/utils/mod.rs (100%) rename NFT/{NFT-contract => }/tests/utils/setup.rs (97%) diff --git a/Cargo.lock b/Cargo.lock index 1663b4662..5e4903afe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,6 +28,15 @@ dependencies = [ "regex", ] +[[package]] +name = "NFT-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "sha2 0.10.8", + "tokio", +] + [[package]] name = "addr2line" version = "0.22.0" diff --git a/Cargo.toml b/Cargo.toml index eb145adbf..c69f75b16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ "fundraiser", "name-registry", "native-asset", - # "NFT", + "NFT", # "oracle", # "OTC-swap-predicate", # "TicTacToe", diff --git a/NFT/NFT-contract/Cargo.toml b/NFT/Cargo.toml similarity index 90% rename from NFT/NFT-contract/Cargo.toml rename to NFT/Cargo.toml index 26ef4db5d..80e6f8fbf 100644 --- a/NFT/NFT-contract/Cargo.toml +++ b/NFT/Cargo.toml @@ -12,5 +12,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "NFT_integration_tests" path = "tests/harness.rs" diff --git a/NFT/NFT-contract/tests/functions/burn.rs b/NFT/tests/functions/burn.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/burn.rs rename to NFT/tests/functions/burn.rs diff --git a/NFT/NFT-contract/tests/functions/constructor.rs b/NFT/tests/functions/constructor.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/constructor.rs rename to NFT/tests/functions/constructor.rs diff --git a/NFT/NFT-contract/tests/functions/decimals.rs b/NFT/tests/functions/decimals.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/decimals.rs rename to NFT/tests/functions/decimals.rs diff --git a/NFT/NFT-contract/tests/functions/is_paused.rs b/NFT/tests/functions/is_paused.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/is_paused.rs rename to NFT/tests/functions/is_paused.rs diff --git a/NFT/NFT-contract/tests/functions/metadata.rs b/NFT/tests/functions/metadata.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/metadata.rs rename to NFT/tests/functions/metadata.rs diff --git a/NFT/NFT-contract/tests/functions/mint.rs b/NFT/tests/functions/mint.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/mint.rs rename to NFT/tests/functions/mint.rs diff --git a/NFT/NFT-contract/tests/functions/mod.rs b/NFT/tests/functions/mod.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/mod.rs rename to NFT/tests/functions/mod.rs diff --git a/NFT/NFT-contract/tests/functions/name.rs b/NFT/tests/functions/name.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/name.rs rename to NFT/tests/functions/name.rs diff --git a/NFT/NFT-contract/tests/functions/owner.rs b/NFT/tests/functions/owner.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/owner.rs rename to NFT/tests/functions/owner.rs diff --git a/NFT/NFT-contract/tests/functions/pause.rs b/NFT/tests/functions/pause.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/pause.rs rename to NFT/tests/functions/pause.rs diff --git a/NFT/NFT-contract/tests/functions/set_decimals.rs b/NFT/tests/functions/set_decimals.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/set_decimals.rs rename to NFT/tests/functions/set_decimals.rs diff --git a/NFT/NFT-contract/tests/functions/set_metadata.rs b/NFT/tests/functions/set_metadata.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/set_metadata.rs rename to NFT/tests/functions/set_metadata.rs diff --git a/NFT/NFT-contract/tests/functions/set_name.rs b/NFT/tests/functions/set_name.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/set_name.rs rename to NFT/tests/functions/set_name.rs diff --git a/NFT/NFT-contract/tests/functions/set_symbol.rs b/NFT/tests/functions/set_symbol.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/set_symbol.rs rename to NFT/tests/functions/set_symbol.rs diff --git a/NFT/NFT-contract/tests/functions/symbol.rs b/NFT/tests/functions/symbol.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/symbol.rs rename to NFT/tests/functions/symbol.rs diff --git a/NFT/NFT-contract/tests/functions/total_assets.rs b/NFT/tests/functions/total_assets.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/total_assets.rs rename to NFT/tests/functions/total_assets.rs diff --git a/NFT/NFT-contract/tests/functions/total_supply.rs b/NFT/tests/functions/total_supply.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/total_supply.rs rename to NFT/tests/functions/total_supply.rs diff --git a/NFT/NFT-contract/tests/functions/unpause.rs b/NFT/tests/functions/unpause.rs similarity index 100% rename from NFT/NFT-contract/tests/functions/unpause.rs rename to NFT/tests/functions/unpause.rs diff --git a/NFT/NFT-contract/tests/harness.rs b/NFT/tests/harness.rs similarity index 100% rename from NFT/NFT-contract/tests/harness.rs rename to NFT/tests/harness.rs diff --git a/NFT/NFT-contract/tests/utils/interface.rs b/NFT/tests/utils/interface.rs similarity index 100% rename from NFT/NFT-contract/tests/utils/interface.rs rename to NFT/tests/utils/interface.rs diff --git a/NFT/NFT-contract/tests/utils/mod.rs b/NFT/tests/utils/mod.rs similarity index 100% rename from NFT/NFT-contract/tests/utils/mod.rs rename to NFT/tests/utils/mod.rs diff --git a/NFT/NFT-contract/tests/utils/setup.rs b/NFT/tests/utils/setup.rs similarity index 97% rename from NFT/NFT-contract/tests/utils/setup.rs rename to NFT/tests/utils/setup.rs index 2b67c63eb..f2e672b39 100644 --- a/NFT/NFT-contract/tests/utils/setup.rs +++ b/NFT/tests/utils/setup.rs @@ -13,7 +13,7 @@ abigen!(Contract( abi = "./NFT/NFT-contract/out/debug/NFT-contract-abi.json" ),); -const NFT_CONTRACT_BINARY_PATH: &str = "./out/debug/NFT-contract.bin"; +const NFT_CONTRACT_BINARY_PATH: &str = "./NFT-contract/out/debug/NFT-contract.bin"; pub(crate) fn defaults( contract_id: ContractId, From dcf5ee6946c1806ba902c81f4dfb23eb0f06ab6d Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 12:14:14 +0530 Subject: [PATCH 18/23] oracle reorg --- Cargo.lock | 138 ++++++++++++++++++ Cargo.toml | 2 +- oracle/{oracle-node => }/Cargo.toml | 14 +- oracle/oracle-contract/Cargo.toml | 16 -- oracle/oracle-contract/tests/harness.rs | 1 - oracle/oracle-node/src/lib.rs | 9 +- oracle/oracle-node/src/main.rs | 3 +- oracle/oracle-node/tests/harness.rs | 1 - oracle/tests/harness.rs | 3 + .../oracle_contract_tests}/mod.rs | 0 .../oracle_contract_tests}/owner.rs | 2 +- .../oracle_contract_tests}/price.rs | 2 +- .../oracle_contract_tests}/set_price.rs | 4 +- .../oracle_node_tests}/mod.rs | 0 .../oracle_node_tests}/run.rs | 2 +- oracle/{utils/src/lib.rs => tests/utils.rs} | 2 +- oracle/utils/Cargo.toml | 13 -- 17 files changed, 166 insertions(+), 46 deletions(-) rename oracle/{oracle-node => }/Cargo.toml (75%) delete mode 100644 oracle/oracle-contract/Cargo.toml delete mode 100644 oracle/oracle-contract/tests/harness.rs delete mode 100644 oracle/oracle-node/tests/harness.rs create mode 100644 oracle/tests/harness.rs rename oracle/{oracle-contract/tests/functions => tests/oracle_contract_tests}/mod.rs (100%) rename oracle/{oracle-contract/tests/functions => tests/oracle_contract_tests}/owner.rs (85%) rename oracle/{oracle-contract/tests/functions => tests/oracle_contract_tests}/price.rs (96%) rename oracle/{oracle-contract/tests/functions => tests/oracle_contract_tests}/set_price.rs (94%) rename oracle/{oracle-node/tests/functions => tests/oracle_node_tests}/mod.rs (100%) rename oracle/{oracle-node/tests/functions => tests/oracle_node_tests}/run.rs (96%) rename oracle/{utils/src/lib.rs => tests/utils.rs} (96%) delete mode 100644 oracle/utils/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 5e4903afe..818b5199e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1309,6 +1309,12 @@ dependencies = [ "syn 2.0.70", ] +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + [[package]] name = "downcast" version = "0.11.0" @@ -1581,6 +1587,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2767,6 +2788,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -2990,6 +3024,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -3765,6 +3808,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "netlink-packet-core" version = "0.4.2" @@ -3965,12 +4025,65 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl" +version = "0.10.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2823eb4c6453ed64055057ea8bd416eda38c71018723869dd043a3b1186115e" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.70", +] + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "oracle-node" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "dotenv", + "fuels", + "futures", + "itertools 0.11.0", + "reqwest", + "serde", + "tokio", +] + [[package]] name = "p256" version = "0.13.2" @@ -4106,6 +4219,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + [[package]] name = "polling" version = "3.7.2" @@ -4539,10 +4658,12 @@ dependencies = [ "http-body", "hyper", "hyper-rustls 0.24.2", + "hyper-tls", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -4554,6 +4675,7 @@ dependencies = [ "sync_wrapper", "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.24.1", "tower-service", "url", @@ -5458,6 +5580,16 @@ dependencies = [ "syn 2.0.70", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-rayon" version = "2.1.0" @@ -5775,6 +5907,12 @@ dependencies = [ "getrandom", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index c69f75b16..e333764f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ members = [ "name-registry", "native-asset", "NFT", - # "oracle", + "oracle", # "OTC-swap-predicate", # "TicTacToe", # "timelock", diff --git a/oracle/oracle-node/Cargo.toml b/oracle/Cargo.toml similarity index 75% rename from oracle/oracle-node/Cargo.toml rename to oracle/Cargo.toml index 064248d20..50cb0fa4f 100644 --- a/oracle/oracle-node/Cargo.toml +++ b/oracle/Cargo.toml @@ -1,6 +1,5 @@ [package] name = "oracle-node" -version = "0.0.0" authors = ["Fuel Labs "] edition = "2021" license = "Apache-2.0" @@ -15,9 +14,16 @@ itertools = "0.11" reqwest = { version = "0.11.18", features = ["json"] } serde = { version = "1.0", features = ["derive"] } tokio = { workspace = true } -utils = { path = "../utils" } + +[[bin]] +name = "oracle-node" +path = "oracle-node/src/main.rs" + +[lib] +name = "oracle_node" +path = "oracle-node/src/lib.rs" [[test]] -harness = true -name = "integration_tests" +name = "harness" path = "tests/harness.rs" + diff --git a/oracle/oracle-contract/Cargo.toml b/oracle/oracle-contract/Cargo.toml deleted file mode 100644 index f82238a69..000000000 --- a/oracle/oracle-contract/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "oracle-contract" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dependencies] -fuels = { workspace = true } -tokio = { workspace = true } -utils = { path = "../utils" } - -[[test]] -harness = true -name = "integration_tests" -path = "tests/harness.rs" diff --git a/oracle/oracle-contract/tests/harness.rs b/oracle/oracle-contract/tests/harness.rs deleted file mode 100644 index 7c2b21b87..000000000 --- a/oracle/oracle-contract/tests/harness.rs +++ /dev/null @@ -1 +0,0 @@ -mod functions; diff --git a/oracle/oracle-node/src/lib.rs b/oracle/oracle-node/src/lib.rs index ec114a1a8..d4819003c 100644 --- a/oracle/oracle-node/src/lib.rs +++ b/oracle/oracle-node/src/lib.rs @@ -1,11 +1,16 @@ use async_trait::async_trait; -use fuels::{accounts::wallet::WalletUnlocked, tx::Receipt}; +use fuels::{accounts::wallet::WalletUnlocked, macros::abigen, tx::Receipt}; use futures::executor::block_on; use reqwest::{Client, Url}; use serde::Deserialize; use std::time::Duration; use tokio::{sync::mpsc::Receiver, task::JoinHandle, time::sleep}; +abigen!(Contract( + name = "Oracle", + abi = "./oracle/oracle-contract/out/debug/oracle-contract-abi.json" +)); + // Decimal precision of the asset we are pushing prices to const DECIMAL_PRECISION: f64 = 1e9; @@ -91,7 +96,7 @@ pub trait PriceUpdater { fn set_price(&self, price: u64) -> anyhow::Result>; } -impl PriceUpdater for utils::Oracle { +impl PriceUpdater for Oracle { /// Set the price for the oracle contract and return the log receipts fn set_price(&self, price: u64) -> anyhow::Result> { let methods = self.methods(); diff --git a/oracle/oracle-node/src/main.rs b/oracle/oracle-node/src/main.rs index 9f858ed04..de79a25fb 100644 --- a/oracle/oracle-node/src/main.rs +++ b/oracle/oracle-node/src/main.rs @@ -4,10 +4,9 @@ use fuels::{ crypto::SecretKey, prelude::{Bech32ContractId, ContractId, Provider}, }; -use oracle_node::{spawn_oracle_updater_job, NetworkPriceProvider}; +use oracle_node::{spawn_oracle_updater_job, NetworkPriceProvider, Oracle}; use reqwest::Url; use std::{env, str::FromStr, time::Duration}; -use utils::Oracle; #[tokio::main] async fn main() { diff --git a/oracle/oracle-node/tests/harness.rs b/oracle/oracle-node/tests/harness.rs deleted file mode 100644 index 7c2b21b87..000000000 --- a/oracle/oracle-node/tests/harness.rs +++ /dev/null @@ -1 +0,0 @@ -mod functions; diff --git a/oracle/tests/harness.rs b/oracle/tests/harness.rs new file mode 100644 index 000000000..2cdcca645 --- /dev/null +++ b/oracle/tests/harness.rs @@ -0,0 +1,3 @@ +mod utils; +mod oracle_contract_tests; +mod oracle_node_tests; diff --git a/oracle/oracle-contract/tests/functions/mod.rs b/oracle/tests/oracle_contract_tests/mod.rs similarity index 100% rename from oracle/oracle-contract/tests/functions/mod.rs rename to oracle/tests/oracle_contract_tests/mod.rs diff --git a/oracle/oracle-contract/tests/functions/owner.rs b/oracle/tests/oracle_contract_tests/owner.rs similarity index 85% rename from oracle/oracle-contract/tests/functions/owner.rs rename to oracle/tests/oracle_contract_tests/owner.rs index f91ecf339..12903352c 100644 --- a/oracle/oracle-contract/tests/functions/owner.rs +++ b/oracle/tests/oracle_contract_tests/owner.rs @@ -1,5 +1,5 @@ use fuels::{prelude::Address, types::Identity}; -use utils::{abi_calls::owner, test_helpers::setup}; +use crate::utils::{abi_calls::owner, test_helpers::setup}; mod success { use super::*; diff --git a/oracle/oracle-contract/tests/functions/price.rs b/oracle/tests/oracle_contract_tests/price.rs similarity index 96% rename from oracle/oracle-contract/tests/functions/price.rs rename to oracle/tests/oracle_contract_tests/price.rs index ed6dae4ed..d7ef98bcf 100644 --- a/oracle/oracle-contract/tests/functions/price.rs +++ b/oracle/tests/oracle_contract_tests/price.rs @@ -1,4 +1,4 @@ -use utils::{ +use crate::utils::{ abi_calls::{price, set_price}, test_helpers::setup, }; diff --git a/oracle/oracle-contract/tests/functions/set_price.rs b/oracle/tests/oracle_contract_tests/set_price.rs similarity index 94% rename from oracle/oracle-contract/tests/functions/set_price.rs rename to oracle/tests/oracle_contract_tests/set_price.rs index 45cbc3784..5a386ca68 100644 --- a/oracle/oracle-contract/tests/functions/set_price.rs +++ b/oracle/tests/oracle_contract_tests/set_price.rs @@ -1,11 +1,11 @@ -use utils::{ +use crate::utils::{ abi_calls::{price, set_price}, test_helpers::setup, }; mod success { use super::*; - use utils::PriceUpdateEvent; + use crate::utils::PriceUpdateEvent; #[tokio::test] async fn can_set_price() { diff --git a/oracle/oracle-node/tests/functions/mod.rs b/oracle/tests/oracle_node_tests/mod.rs similarity index 100% rename from oracle/oracle-node/tests/functions/mod.rs rename to oracle/tests/oracle_node_tests/mod.rs diff --git a/oracle/oracle-node/tests/functions/run.rs b/oracle/tests/oracle_node_tests/run.rs similarity index 96% rename from oracle/oracle-node/tests/functions/run.rs rename to oracle/tests/oracle_node_tests/run.rs index e7027b3fe..a4f6a62e2 100644 --- a/oracle/oracle-node/tests/functions/run.rs +++ b/oracle/tests/oracle_node_tests/run.rs @@ -1,4 +1,4 @@ -use crate::functions::{HardcodedPriceProvider, LoggingPriceUpdater}; +use crate::oracle_node_tests::{HardcodedPriceProvider, LoggingPriceUpdater}; use fuels::tx::Receipt; use itertools::Itertools; use oracle_node::spawn_oracle_updater_job; diff --git a/oracle/utils/src/lib.rs b/oracle/tests/utils.rs similarity index 96% rename from oracle/utils/src/lib.rs rename to oracle/tests/utils.rs index 1dcf8c2e5..46f911549 100644 --- a/oracle/utils/src/lib.rs +++ b/oracle/tests/utils.rs @@ -20,7 +20,7 @@ pub struct Metadata { pub mod paths { pub const ORACLE_CONTRACT_BINARY_PATH: &str = - "../oracle-contract/out/debug/oracle-contract.bin"; + "./oracle-contract/out/debug/oracle-contract.bin"; } pub mod abi_calls { diff --git a/oracle/utils/Cargo.toml b/oracle/utils/Cargo.toml deleted file mode 100644 index e4ddd3ee3..000000000 --- a/oracle/utils/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "utils" -version = "0.0.0" -authors = ["Fuel Labs "] -edition = "2021" -license = "Apache-2.0" - -[dependencies] -fuels = { workspace = true } - -[lib] -test = false -doctest = false From 6d25be7229fdde34c05c9f788ec232d38f4a15f3 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 12:16:29 +0530 Subject: [PATCH 19/23] OTC swap predicate reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- OTC-swap-predicate/{swap-predicate => }/Cargo.toml | 2 +- OTC-swap-predicate/{swap-predicate => }/tests/harness.rs | 0 .../{swap-predicate => }/tests/utils/mod.rs | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) rename OTC-swap-predicate/{swap-predicate => }/Cargo.toml (84%) rename OTC-swap-predicate/{swap-predicate => }/tests/harness.rs (100%) rename OTC-swap-predicate/{swap-predicate => }/tests/utils/mod.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index 818b5199e..46528bd8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5373,6 +5373,14 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "swap-predicate" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "syn" version = "1.0.109" diff --git a/Cargo.toml b/Cargo.toml index e333764f6..bcb0765e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ members = [ "native-asset", "NFT", "oracle", - # "OTC-swap-predicate", + "OTC-swap-predicate", # "TicTacToe", # "timelock", ] diff --git a/OTC-swap-predicate/swap-predicate/Cargo.toml b/OTC-swap-predicate/Cargo.toml similarity index 84% rename from OTC-swap-predicate/swap-predicate/Cargo.toml rename to OTC-swap-predicate/Cargo.toml index 97583f288..4eeabb18b 100644 --- a/OTC-swap-predicate/swap-predicate/Cargo.toml +++ b/OTC-swap-predicate/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "OTC_swap_predicate_integration_tests" path = "tests/harness.rs" diff --git a/OTC-swap-predicate/swap-predicate/tests/harness.rs b/OTC-swap-predicate/tests/harness.rs similarity index 100% rename from OTC-swap-predicate/swap-predicate/tests/harness.rs rename to OTC-swap-predicate/tests/harness.rs diff --git a/OTC-swap-predicate/swap-predicate/tests/utils/mod.rs b/OTC-swap-predicate/tests/utils/mod.rs similarity index 99% rename from OTC-swap-predicate/swap-predicate/tests/utils/mod.rs rename to OTC-swap-predicate/tests/utils/mod.rs index eb655c58d..485b03cf5 100644 --- a/OTC-swap-predicate/swap-predicate/tests/utils/mod.rs +++ b/OTC-swap-predicate/tests/utils/mod.rs @@ -22,7 +22,7 @@ abigen!(Predicate( const BASE_ASSET: AssetId = AssetId::new([0u8; 32]); // Offered asset is the asset that will be locked behind the predicate const OFFERED_ASSET: AssetId = AssetId::new([2u8; 32]); -const PREDICATE_BINARY: &str = "../swap-predicate/out/debug/swap-predicate.bin"; +const PREDICATE_BINARY: &str = "./swap-predicate/out/debug/swap-predicate.bin"; // Get the balance of a given asset of an address async fn get_balance(provider: &Provider, address: &Bech32Address, asset: AssetId) -> u64 { From a581856c74f296750b7cba3c90e3ecbe2256782a Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 12:18:35 +0530 Subject: [PATCH 20/23] tictactoe reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- TicTacToe/{tictactoe-contract => }/Cargo.toml | 2 +- .../{tictactoe-contract => }/tests/functions/make_move.rs | 0 TicTacToe/{tictactoe-contract => }/tests/functions/mod.rs | 0 .../{tictactoe-contract => }/tests/functions/new_game.rs | 0 TicTacToe/{tictactoe-contract => }/tests/harness.rs | 0 .../{tictactoe-contract => }/tests/utils/interface.rs | 0 TicTacToe/{tictactoe-contract => }/tests/utils/mod.rs | 0 TicTacToe/{tictactoe-contract => }/tests/utils/setup.rs | 4 ++-- 10 files changed, 12 insertions(+), 4 deletions(-) rename TicTacToe/{tictactoe-contract => }/Cargo.toml (87%) rename TicTacToe/{tictactoe-contract => }/tests/functions/make_move.rs (100%) rename TicTacToe/{tictactoe-contract => }/tests/functions/mod.rs (100%) rename TicTacToe/{tictactoe-contract => }/tests/functions/new_game.rs (100%) rename TicTacToe/{tictactoe-contract => }/tests/harness.rs (100%) rename TicTacToe/{tictactoe-contract => }/tests/utils/interface.rs (100%) rename TicTacToe/{tictactoe-contract => }/tests/utils/mod.rs (100%) rename TicTacToe/{tictactoe-contract => }/tests/utils/setup.rs (89%) diff --git a/Cargo.lock b/Cargo.lock index 46528bd8e..f8d34a12b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5502,6 +5502,14 @@ dependencies = [ "syn 2.0.70", ] +[[package]] +name = "tictactoe-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "time" version = "0.3.36" diff --git a/Cargo.toml b/Cargo.toml index bcb0765e5..affd30623 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ "NFT", "oracle", "OTC-swap-predicate", - # "TicTacToe", + "TicTacToe", # "timelock", ] exclude = [ diff --git a/TicTacToe/tictactoe-contract/Cargo.toml b/TicTacToe/Cargo.toml similarity index 87% rename from TicTacToe/tictactoe-contract/Cargo.toml rename to TicTacToe/Cargo.toml index 34ce83fdc..c9dc565af 100644 --- a/TicTacToe/tictactoe-contract/Cargo.toml +++ b/TicTacToe/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "Tic_Tac_Toe_integration_tests" path = "tests/harness.rs" diff --git a/TicTacToe/tictactoe-contract/tests/functions/make_move.rs b/TicTacToe/tests/functions/make_move.rs similarity index 100% rename from TicTacToe/tictactoe-contract/tests/functions/make_move.rs rename to TicTacToe/tests/functions/make_move.rs diff --git a/TicTacToe/tictactoe-contract/tests/functions/mod.rs b/TicTacToe/tests/functions/mod.rs similarity index 100% rename from TicTacToe/tictactoe-contract/tests/functions/mod.rs rename to TicTacToe/tests/functions/mod.rs diff --git a/TicTacToe/tictactoe-contract/tests/functions/new_game.rs b/TicTacToe/tests/functions/new_game.rs similarity index 100% rename from TicTacToe/tictactoe-contract/tests/functions/new_game.rs rename to TicTacToe/tests/functions/new_game.rs diff --git a/TicTacToe/tictactoe-contract/tests/harness.rs b/TicTacToe/tests/harness.rs similarity index 100% rename from TicTacToe/tictactoe-contract/tests/harness.rs rename to TicTacToe/tests/harness.rs diff --git a/TicTacToe/tictactoe-contract/tests/utils/interface.rs b/TicTacToe/tests/utils/interface.rs similarity index 100% rename from TicTacToe/tictactoe-contract/tests/utils/interface.rs rename to TicTacToe/tests/utils/interface.rs diff --git a/TicTacToe/tictactoe-contract/tests/utils/mod.rs b/TicTacToe/tests/utils/mod.rs similarity index 100% rename from TicTacToe/tictactoe-contract/tests/utils/mod.rs rename to TicTacToe/tests/utils/mod.rs diff --git a/TicTacToe/tictactoe-contract/tests/utils/setup.rs b/TicTacToe/tests/utils/setup.rs similarity index 89% rename from TicTacToe/tictactoe-contract/tests/utils/setup.rs rename to TicTacToe/tests/utils/setup.rs index 57ecb681f..2e4e49900 100644 --- a/TicTacToe/tictactoe-contract/tests/utils/setup.rs +++ b/TicTacToe/tests/utils/setup.rs @@ -12,8 +12,8 @@ abigen!(Contract( abi = "./TicTacToe/tictactoe-contract/out/debug/tictactoe-contract-abi.json" )); -const TICTACTOE_CONTRACT_BINARY_PATH: &str = "./out/debug/tictactoe-contract.bin"; -const TICTACTOE_CONTRACT_STORAGE_PATH: &str = "./out/debug/tictactoe-contract-storage_slots.json"; +const TICTACTOE_CONTRACT_BINARY_PATH: &str = "./tictactoe-contract/out/debug/tictactoe-contract.bin"; +const TICTACTOE_CONTRACT_STORAGE_PATH: &str = "./tictactoe-contract/out/debug/tictactoe-contract-storage_slots.json"; pub(crate) struct Player { pub(crate) contract: TicTacToe, From 183bd61ea8879b87ce199eadd73ea92d9189c99f Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 12:20:30 +0530 Subject: [PATCH 21/23] timelock reorg --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- timelock/{timelock-contract => }/Cargo.toml | 2 +- .../tests/functions/core/cancel.rs | 0 .../tests/functions/core/execute.rs | 0 .../{timelock-contract => }/tests/functions/core/mod.rs | 0 .../{timelock-contract => }/tests/functions/core/queue.rs | 0 .../tests/functions/info/balance.rs | 0 .../tests/functions/info/delays.rs | 0 .../{timelock-contract => }/tests/functions/info/mod.rs | 0 .../tests/functions/info/queued.rs | 0 .../tests/functions/info/transaction_hash.rs | 0 timelock/{timelock-contract => }/tests/functions/mod.rs | 0 timelock/{timelock-contract => }/tests/harness.rs | 0 .../{timelock-contract => }/tests/utils/interface/core.rs | 0 .../{timelock-contract => }/tests/utils/interface/info.rs | 0 .../{timelock-contract => }/tests/utils/interface/mod.rs | 0 timelock/{timelock-contract => }/tests/utils/mod.rs | 0 timelock/{timelock-contract => }/tests/utils/setup.rs | 4 ++-- 19 files changed, 12 insertions(+), 4 deletions(-) rename timelock/{timelock-contract => }/Cargo.toml (87%) rename timelock/{timelock-contract => }/tests/functions/core/cancel.rs (100%) rename timelock/{timelock-contract => }/tests/functions/core/execute.rs (100%) rename timelock/{timelock-contract => }/tests/functions/core/mod.rs (100%) rename timelock/{timelock-contract => }/tests/functions/core/queue.rs (100%) rename timelock/{timelock-contract => }/tests/functions/info/balance.rs (100%) rename timelock/{timelock-contract => }/tests/functions/info/delays.rs (100%) rename timelock/{timelock-contract => }/tests/functions/info/mod.rs (100%) rename timelock/{timelock-contract => }/tests/functions/info/queued.rs (100%) rename timelock/{timelock-contract => }/tests/functions/info/transaction_hash.rs (100%) rename timelock/{timelock-contract => }/tests/functions/mod.rs (100%) rename timelock/{timelock-contract => }/tests/harness.rs (100%) rename timelock/{timelock-contract => }/tests/utils/interface/core.rs (100%) rename timelock/{timelock-contract => }/tests/utils/interface/info.rs (100%) rename timelock/{timelock-contract => }/tests/utils/interface/mod.rs (100%) rename timelock/{timelock-contract => }/tests/utils/mod.rs (100%) rename timelock/{timelock-contract => }/tests/utils/setup.rs (85%) diff --git a/Cargo.lock b/Cargo.lock index f8d34a12b..6136d0599 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5541,6 +5541,14 @@ dependencies = [ "time-core", ] +[[package]] +name = "timelock-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "tinyvec" version = "1.8.0" diff --git a/Cargo.toml b/Cargo.toml index affd30623..d001639a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ "oracle", "OTC-swap-predicate", "TicTacToe", - # "timelock", + "timelock", ] exclude = [ ".devops/aurora", diff --git a/timelock/timelock-contract/Cargo.toml b/timelock/Cargo.toml similarity index 87% rename from timelock/timelock-contract/Cargo.toml rename to timelock/Cargo.toml index 16822f6cb..129c65d06 100644 --- a/timelock/timelock-contract/Cargo.toml +++ b/timelock/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "timelock_integration_tests" path = "tests/harness.rs" diff --git a/timelock/timelock-contract/tests/functions/core/cancel.rs b/timelock/tests/functions/core/cancel.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/core/cancel.rs rename to timelock/tests/functions/core/cancel.rs diff --git a/timelock/timelock-contract/tests/functions/core/execute.rs b/timelock/tests/functions/core/execute.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/core/execute.rs rename to timelock/tests/functions/core/execute.rs diff --git a/timelock/timelock-contract/tests/functions/core/mod.rs b/timelock/tests/functions/core/mod.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/core/mod.rs rename to timelock/tests/functions/core/mod.rs diff --git a/timelock/timelock-contract/tests/functions/core/queue.rs b/timelock/tests/functions/core/queue.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/core/queue.rs rename to timelock/tests/functions/core/queue.rs diff --git a/timelock/timelock-contract/tests/functions/info/balance.rs b/timelock/tests/functions/info/balance.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/info/balance.rs rename to timelock/tests/functions/info/balance.rs diff --git a/timelock/timelock-contract/tests/functions/info/delays.rs b/timelock/tests/functions/info/delays.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/info/delays.rs rename to timelock/tests/functions/info/delays.rs diff --git a/timelock/timelock-contract/tests/functions/info/mod.rs b/timelock/tests/functions/info/mod.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/info/mod.rs rename to timelock/tests/functions/info/mod.rs diff --git a/timelock/timelock-contract/tests/functions/info/queued.rs b/timelock/tests/functions/info/queued.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/info/queued.rs rename to timelock/tests/functions/info/queued.rs diff --git a/timelock/timelock-contract/tests/functions/info/transaction_hash.rs b/timelock/tests/functions/info/transaction_hash.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/info/transaction_hash.rs rename to timelock/tests/functions/info/transaction_hash.rs diff --git a/timelock/timelock-contract/tests/functions/mod.rs b/timelock/tests/functions/mod.rs similarity index 100% rename from timelock/timelock-contract/tests/functions/mod.rs rename to timelock/tests/functions/mod.rs diff --git a/timelock/timelock-contract/tests/harness.rs b/timelock/tests/harness.rs similarity index 100% rename from timelock/timelock-contract/tests/harness.rs rename to timelock/tests/harness.rs diff --git a/timelock/timelock-contract/tests/utils/interface/core.rs b/timelock/tests/utils/interface/core.rs similarity index 100% rename from timelock/timelock-contract/tests/utils/interface/core.rs rename to timelock/tests/utils/interface/core.rs diff --git a/timelock/timelock-contract/tests/utils/interface/info.rs b/timelock/tests/utils/interface/info.rs similarity index 100% rename from timelock/timelock-contract/tests/utils/interface/info.rs rename to timelock/tests/utils/interface/info.rs diff --git a/timelock/timelock-contract/tests/utils/interface/mod.rs b/timelock/tests/utils/interface/mod.rs similarity index 100% rename from timelock/timelock-contract/tests/utils/interface/mod.rs rename to timelock/tests/utils/interface/mod.rs diff --git a/timelock/timelock-contract/tests/utils/mod.rs b/timelock/tests/utils/mod.rs similarity index 100% rename from timelock/timelock-contract/tests/utils/mod.rs rename to timelock/tests/utils/mod.rs diff --git a/timelock/timelock-contract/tests/utils/setup.rs b/timelock/tests/utils/setup.rs similarity index 85% rename from timelock/timelock-contract/tests/utils/setup.rs rename to timelock/tests/utils/setup.rs index bdf64d3a3..a3e5595a5 100644 --- a/timelock/timelock-contract/tests/utils/setup.rs +++ b/timelock/tests/utils/setup.rs @@ -13,8 +13,8 @@ abigen!(Contract( name = "Timelock", abi = "./timelock/timelock-contract/out/debug/timelock-contract-abi.json" )); -const TIMELOCK_CONTRACT_BINARY_PATH: &str = "./out/debug/timelock-contract.bin"; -const TIMELOCK_CONTRACT_STORAGE_PATH: &str = "./out/debug/timelock-contract-storage_slots.json"; +const TIMELOCK_CONTRACT_BINARY_PATH: &str = "./timelock-contract/out/debug/timelock-contract.bin"; +const TIMELOCK_CONTRACT_STORAGE_PATH: &str = "./timelock-contract/out/debug/timelock-contract-storage_slots.json"; pub async fn setup() -> (Timelock, WalletUnlocked, WalletUnlocked) { // Launch a local network and deploy the contract From 3ddbbfcbfbe4537d10805df7a684872a65206cc1 Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 12:21:43 +0530 Subject: [PATCH 22/23] template contract reorg --- .devops/.template/{template-contract => }/Cargo.toml | 2 +- .../{template-contract => }/tests/functions/core/mod.rs | 0 .../{template-contract => }/tests/functions/core/template.rs | 0 .../{template-contract => }/tests/functions/info/mod.rs | 0 .../.template/{template-contract => }/tests/functions/mod.rs | 0 .devops/.template/{template-contract => }/tests/harness.rs | 0 .../{template-contract => }/tests/utils/interface/core.rs | 0 .../{template-contract => }/tests/utils/interface/info.rs | 0 .../{template-contract => }/tests/utils/interface/mod.rs | 0 .devops/.template/{template-contract => }/tests/utils/mod.rs | 0 .../.template/{template-contract => }/tests/utils/setup.rs | 4 ++-- Cargo.toml | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename .devops/.template/{template-contract => }/Cargo.toml (85%) rename .devops/.template/{template-contract => }/tests/functions/core/mod.rs (100%) rename .devops/.template/{template-contract => }/tests/functions/core/template.rs (100%) rename .devops/.template/{template-contract => }/tests/functions/info/mod.rs (100%) rename .devops/.template/{template-contract => }/tests/functions/mod.rs (100%) rename .devops/.template/{template-contract => }/tests/harness.rs (100%) rename .devops/.template/{template-contract => }/tests/utils/interface/core.rs (100%) rename .devops/.template/{template-contract => }/tests/utils/interface/info.rs (100%) rename .devops/.template/{template-contract => }/tests/utils/interface/mod.rs (100%) rename .devops/.template/{template-contract => }/tests/utils/mod.rs (100%) rename .devops/.template/{template-contract => }/tests/utils/setup.rs (84%) diff --git a/.devops/.template/template-contract/Cargo.toml b/.devops/.template/Cargo.toml similarity index 85% rename from .devops/.template/template-contract/Cargo.toml rename to .devops/.template/Cargo.toml index edd49a727..c98d5e878 100644 --- a/.devops/.template/template-contract/Cargo.toml +++ b/.devops/.template/Cargo.toml @@ -11,5 +11,5 @@ tokio = { workspace = true } [[test]] harness = true -name = "integration_tests" +name = "template_contract_integration_tests" path = "tests/harness.rs" diff --git a/.devops/.template/template-contract/tests/functions/core/mod.rs b/.devops/.template/tests/functions/core/mod.rs similarity index 100% rename from .devops/.template/template-contract/tests/functions/core/mod.rs rename to .devops/.template/tests/functions/core/mod.rs diff --git a/.devops/.template/template-contract/tests/functions/core/template.rs b/.devops/.template/tests/functions/core/template.rs similarity index 100% rename from .devops/.template/template-contract/tests/functions/core/template.rs rename to .devops/.template/tests/functions/core/template.rs diff --git a/.devops/.template/template-contract/tests/functions/info/mod.rs b/.devops/.template/tests/functions/info/mod.rs similarity index 100% rename from .devops/.template/template-contract/tests/functions/info/mod.rs rename to .devops/.template/tests/functions/info/mod.rs diff --git a/.devops/.template/template-contract/tests/functions/mod.rs b/.devops/.template/tests/functions/mod.rs similarity index 100% rename from .devops/.template/template-contract/tests/functions/mod.rs rename to .devops/.template/tests/functions/mod.rs diff --git a/.devops/.template/template-contract/tests/harness.rs b/.devops/.template/tests/harness.rs similarity index 100% rename from .devops/.template/template-contract/tests/harness.rs rename to .devops/.template/tests/harness.rs diff --git a/.devops/.template/template-contract/tests/utils/interface/core.rs b/.devops/.template/tests/utils/interface/core.rs similarity index 100% rename from .devops/.template/template-contract/tests/utils/interface/core.rs rename to .devops/.template/tests/utils/interface/core.rs diff --git a/.devops/.template/template-contract/tests/utils/interface/info.rs b/.devops/.template/tests/utils/interface/info.rs similarity index 100% rename from .devops/.template/template-contract/tests/utils/interface/info.rs rename to .devops/.template/tests/utils/interface/info.rs diff --git a/.devops/.template/template-contract/tests/utils/interface/mod.rs b/.devops/.template/tests/utils/interface/mod.rs similarity index 100% rename from .devops/.template/template-contract/tests/utils/interface/mod.rs rename to .devops/.template/tests/utils/interface/mod.rs diff --git a/.devops/.template/template-contract/tests/utils/mod.rs b/.devops/.template/tests/utils/mod.rs similarity index 100% rename from .devops/.template/template-contract/tests/utils/mod.rs rename to .devops/.template/tests/utils/mod.rs diff --git a/.devops/.template/template-contract/tests/utils/setup.rs b/.devops/.template/tests/utils/setup.rs similarity index 84% rename from .devops/.template/template-contract/tests/utils/setup.rs rename to .devops/.template/tests/utils/setup.rs index d47a30044..167400c91 100644 --- a/.devops/.template/template-contract/tests/utils/setup.rs +++ b/.devops/.template/tests/utils/setup.rs @@ -5,8 +5,8 @@ abigen!(Contract( abi = "./.devops/.template/template-contract/out/debug/template-contract-abi.json" )); -const TEMPLATE_CONTRACT_BINARY_PATH: &str = "./out/debug/template-contract.bin"; -const TEMPLATE_CONTRACT_STORAGE_PATH: &str = "./out/debug/template-contract-storage_slots.json"; +const TEMPLATE_CONTRACT_BINARY_PATH: &str = "./template-contract/out/debug/template-contract.bin"; +const TEMPLATE_CONTRACT_STORAGE_PATH: &str = "./template-contract/out/debug/template-contract-storage_slots.json"; pub async fn setup() -> (Template, WalletUnlocked) { let number_of_wallets = 1; diff --git a/Cargo.toml b/Cargo.toml index d001639a9..4e99fcef3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - # ".devops.template", + ".devops.template", "airdrop", "AMM", "counter-script", From 3a9e05a42ef7ebc056f297a54dadd7006a930fbb Mon Sep 17 00:00:00 2001 From: SwayStar123 Date: Sun, 21 Jul 2024 12:36:23 +0530 Subject: [PATCH 23/23] fix devops template path in cargotoml --- Cargo.lock | 8 ++++++++ Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 6136d0599..6f134d943 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5468,6 +5468,14 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "template-contract" +version = "0.0.0" +dependencies = [ + "fuels", + "tokio", +] + [[package]] name = "termtree" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index 4e99fcef3..27df34a47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - ".devops.template", + ".devops/.template", "airdrop", "AMM", "counter-script",