move server

cartridge-gg · Oct 15, 2024 · 788790a · 788790a
1 parent 2f7811b
commit 788790a
Show file tree

Hide file tree

Showing 22 changed files with 63 additions and 191 deletions.
diff --git a/README.md b/README.md
@@ -1,39 +1,3 @@
-## Run server
+## Documentation
 
-`cargo run`
-
-## Get server's public key
-
-`GET http://0.0.0.0:3000/info`
-
-## Get random numbers
-
-```js
-const response = await fetch("http://0.0.0.0:3000/stark_vrf", {
-  method: "POST",
-  headers: {
-    "Content-Type": "application/json",
-  },
-  body: JSON.stringify({ seed: ["0x5733e5c2c8030bc06888747525b1a1f0242ca770c9387b58a4529df0ca55499"] }),
-});
-const json = await response.json();
-```
-
-which will return:
-
-```js
-{
-    "result": {
-        "gamma_x": "0x6ac32f9b3c0bef88e4e1ba77d2f77fa603bbd4b42cca6405c5bdf7a16821d75",
-        "gamma_y": "0x50e3875635d84cb0038dbccb309b1134e101aee38c02001e456d5988b39fd43",
-        "c": "0x111fd321fb9b48c651a871fcfeea71a0f521ba04fe54f81caf2f407cba0979f",
-        "s": "0x437d280a8eb8e1e57c291af359738118c5b64b00ff5bd209d86ef83b051a2c6",
-        "sqrt_ratio": "0xa99242633a4f2a7b31c4c7d3bee93dad3bd946a68cfac753dbd4bbd837d8c0",
-        "rnd": "0x41c6b570b6720f205da6ef692021fe3625bbbab1ef5ea0ecea470e2d93b7982"
-    }
-}
-```
-
-## Verify proof in Cairo
-
-See https://github.com/dojoengine/stark-vrf
+[Cartridge VRF Documentation](https://docs.cartridge.gg/vrf/overview)
diff --git a/Scarb.toml b/Scarb.toml
@@ -1,12 +1,22 @@
-[workspace]
-members = ["contracts"]
-
-[workspace.package]
+[package]
+name = "cartridge_vrf"
 version = "0.1.0"
+edition = "2023_10"
 
-[workspace.dependencies]
+[dependencies]
 starknet = "2.7.0"
 stark_vrf = { git = "https://github.com/dojoengine/stark-vrf.git" }
 openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", rev = "a13bae3" }
 snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.26.0" }
-# Scripts are not supported for virtual workspaces.
+
+[dev-dependencies]
+openzeppelin_testing = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", rev = "a13bae3" }
+openzeppelin_utils = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", rev = "a13bae3" }
+
+[[target.starknet-contract]]
+allowed-libfuncs-list.name = "experimental"
+
+[lib]
+
+[script]
+test = "snforge test"
diff --git a/contracts/README.md b/contracts/README.md
diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
diff --git a/contracts/dojo/buildVrfCalls.ts → dojo/buildVrfCalls.ts b/contracts/dojo/buildVrfCalls.ts → dojo/buildVrfCalls.ts
diff --git a/contracts/dojo/vrf_provider_mock.cairo → dojo/vrf_provider_mock.cairo b/contracts/dojo/vrf_provider_mock.cairo → dojo/vrf_provider_mock.cairo
diff --git a/.dockerignore → server/.dockerignore b/.dockerignore → server/.dockerignore
diff --git a/Cargo.lock → server/Cargo.lock b/Cargo.lock → server/Cargo.lock
diff --git a/Cargo.toml → server/Cargo.toml b/Cargo.toml → server/Cargo.toml
diff --git a/Dockerfile → server/Dockerfile b/Dockerfile → server/Dockerfile
diff --git a/Oracle.lock → server/Oracle.lock b/Oracle.lock → server/Oracle.lock
diff --git a/server/README.md b/server/README.md
@@ -0,0 +1,39 @@
+## Run server
+
+`cargo run`
+
+## Get server's public key
+
+`GET http://0.0.0.0:3000/info`
+
+## Get random numbers
+
+```js
+const response = await fetch("http://0.0.0.0:3000/stark_vrf", {
+  method: "POST",
+  headers: {
+    "Content-Type": "application/json",
+  },
+  body: JSON.stringify({ seed: ["0x5733e5c2c8030bc06888747525b1a1f0242ca770c9387b58a4529df0ca55499"] }),
+});
+const json = await response.json();
+```
+
+which will return:
+
+```js
+{
+    "result": {
+        "gamma_x": "0x6ac32f9b3c0bef88e4e1ba77d2f77fa603bbd4b42cca6405c5bdf7a16821d75",
+        "gamma_y": "0x50e3875635d84cb0038dbccb309b1134e101aee38c02001e456d5988b39fd43",
+        "c": "0x111fd321fb9b48c651a871fcfeea71a0f521ba04fe54f81caf2f407cba0979f",
+        "s": "0x437d280a8eb8e1e57c291af359738118c5b64b00ff5bd209d86ef83b051a2c6",
+        "sqrt_ratio": "0xa99242633a4f2a7b31c4c7d3bee93dad3bd946a68cfac753dbd4bbd837d8c0",
+        "rnd": "0x41c6b570b6720f205da6ef692021fe3625bbbab1ef5ea0ecea470e2d93b7982"
+    }
+}
+```
+
+## Verify proof in Cairo
+
+See https://github.com/dojoengine/stark-vrf
diff --git a/src/main.rs → server/src/main.rs b/src/main.rs → server/src/main.rs
diff --git a/src/oracle.rs → server/src/oracle.rs b/src/oracle.rs → server/src/oracle.rs
diff --git a/contracts/src/lib.cairo → src/lib.cairo b/contracts/src/lib.cairo → src/lib.cairo
@@ -7,6 +7,10 @@ pub mod vrf_consumer {
     pub mod vrf_consumer_component;
 }
 
+pub mod mocks {
+    pub mod vrf_consumer_mock;
+}
+
 pub use vrf_provider::vrf_provider_component::{
     IVrfProvider, IVrfProviderDispatcher, IVrfProviderDispatcherTrait, PublicKey, Source
 };
@@ -16,5 +20,4 @@ pub use vrf_consumer::vrf_consumer_component::VrfConsumerComponent;
 pub mod tests {
     pub mod common;
     pub mod test_dice;
-    pub mod vrf_consumer_mock;
 }
diff --git a/contracts/src/tests/vrf_consumer_mock.cairo → src/mocks/vrf_consumer_mock.cairo b/contracts/src/tests/vrf_consumer_mock.cairo → src/mocks/vrf_consumer_mock.cairo
diff --git a/contracts/src/tests/common.cairo → src/tests/common.cairo b/contracts/src/tests/common.cairo → src/tests/common.cairo
@@ -10,7 +10,7 @@ use cartridge_vrf::vrf_provider::vrf_provider_component::{
     IVrfProvider, IVrfProviderDispatcher, IVrfProviderDispatcherTrait, PublicKey,
 };
 
-use super::vrf_consumer_mock::{
+use cartridge_vrf::mocks::vrf_consumer_mock::{
     VrfConsumer, IVrfConsumerMock, IVrfConsumerMockDispatcher,
     IVrfConsumerMockDispatcherTrait
 };

diff --git a/contracts/src/tests/test_dice.cairo → src/tests/test_dice.cairo b/contracts/src/tests/test_dice.cairo → src/tests/test_dice.cairo
@@ -13,7 +13,7 @@ use cartridge_vrf::{
     IVrfProvider, IVrfProviderDispatcher, IVrfProviderDispatcherTrait, PublicKey, Source
 };
 
-use super::vrf_consumer_mock::{
+use cartridge_vrf::mocks::vrf_consumer_mock::{
     VrfConsumer, IVrfConsumerMock, IVrfConsumerMockDispatcher,
     IVrfConsumerMockDispatcherTrait
 };

diff --git a/...vrf_consumer/vrf_consumer_component.cairo → ...vrf_consumer/vrf_consumer_component.cairo b/...vrf_consumer/vrf_consumer_component.cairo → ...vrf_consumer/vrf_consumer_component.cairo
diff --git a/...racts/src/vrf_provider/vrf_provider.cairo → src/vrf_provider/vrf_provider.cairo b/...racts/src/vrf_provider/vrf_provider.cairo → src/vrf_provider/vrf_provider.cairo
diff --git a/...vrf_provider/vrf_provider_component.cairo → ...vrf_provider/vrf_provider_component.cairo b/...vrf_provider/vrf_provider_component.cairo → ...vrf_provider/vrf_provider_component.cairo