Merge pull request #133 from blend-capital/fix-interfaces

Fix interfaces

.github/workflows/pull_request.yml

@@ -0,0 +1,36 @@
+name: pull_request
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+
+  complete:
+    if: always()
+    needs: [fmt, build-and-test]
+    runs-on: ubuntu-latest
+    steps:
+    - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+      run: exit 1
+
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - run: rustup update
+    - run: cargo fmt --all --check
+
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: stellar/actions/rust-cache@main
+    - run: rustup update
+    - run: rustup target add wasm32-unknown-unknown
+    - run: cargo install --locked --version 20.0.0-rc4 soroban-cli --features opt
+    - run: make test

README.md

@@ -4,8 +4,7 @@ This repository contains the smart contacts for an implementation of the Blend P
 
 ## Documentation
 
-To learn more about the Blend Protocol, visit the whitepaper or the docs:
-* [Whitepaper](https://github.com/blend-capital/blend-whitepaper)
+To learn more about the Blend Protocol, visit the docs:
 * [Blend Docs](https://docs.blend.capital/)
 
 ## Audits

backstop/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "backstop"
-version = "0.0.0"
+version = "0.0.1"
 authors = ["Blend Capital <[email protected]>"]
 license = "AGPL-3.0"
 edition = "2021"

blend-interfaces/Cargo.toml

@@ -4,18 +4,14 @@ version = "0.0.1"
 description = "Traits, clients, and types for the Blend Protocol"
 homepage = "https://github.com/blend-capital/blend-contracts"
 repository = "https://github.com/blend-capital/blend-contracts"
-authors = ["Blend Capital <[email protected]>"]
 license = "MIT"
 edition = "2021"
 readme = "README.md"
+keywords = ["no_std", "wasm", "soroban"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [dependencies]
-soroban-sdk = { workspace = true }
-pool = { path = "../pool" }
-backstop = { path = "../backstop" } 
-pool-factory = { path = "../pool-factory" }
-emitter = { path = "../emitter" }
+soroban-sdk = { workspace = true }

blend-interfaces/README.md

@@ -0,0 +1,8 @@
+# Blend Interfaces
+
+This repository contains interfaces, clients, and WASM blobs for the Blend Protocol as implemented in the [Blend Contracts](https://github.com/blend-capital/blend-contracts) repository.
+
+## Documentation
+
+To learn more about the Blend Protocol, visit the the docs:
+* [Blend Docs](https://docs.blend.capital/)

blend-interfaces/src/backstop.rs

@@ -1,6 +1,8 @@
-pub use backstop::{Backstop, BackstopClient, BackstopError, PoolBackstopData, UserBalance, Q4W};
-
 mod wasm {
-    soroban_sdk::contractimport!(file = "../target/wasm32-unknown-unknown/optimized/backstop.wasm");
+    soroban_sdk::contractimport!(file = "./wasm/backstop.wasm");
 }
-pub use wasm::WASM as BackstopWASM;
+pub use wasm::{
+    BackstopDataKey, BackstopError, Client as BackstopClient, Contract as Backstop,
+    PoolBackstopData, PoolBalance, PoolUserKey, UserBalance, UserEmissionData, Q4W,
+    WASM as BackstopWASM,
+};

blend-interfaces/src/emitter.rs

@@ -1,6 +1,6 @@
-pub use emitter::{Emitter, EmitterClient, EmitterContract, EmitterError};
-
 mod wasm {
-    soroban_sdk::contractimport!(file = "../target/wasm32-unknown-unknown/optimized/emitter.wasm");
+    soroban_sdk::contractimport!(file = "./wasm/emitter.wasm");
 }
-pub use wasm::WASM as EmitterWASM;
+pub use wasm::{
+    Client as EmitterClient, Contract as Emitter, EmitterDataKey, EmitterError, WASM as EmitterWASM,
+};

blend-interfaces/src/pool.rs

@@ -1,9 +1,9 @@
-pub use pool::{
-    Pool, PoolClient, PoolConfig, PoolDataKey, PoolError, Positions, Request, ReserveConfig,
-    ReserveData, ReserveEmissionMetadata, ReserveEmissionsConfig, ReserveEmissionsData,
-};
-
 mod wasm {
-    soroban_sdk::contractimport!(file = "../target/wasm32-unknown-unknown/optimized/pool.wasm");
+    soroban_sdk::contractimport!(file = "./wasm/pool.wasm");
 }
-pub use wasm::WASM as PoolWASM;
+pub use wasm::{
+    AuctionData, AuctionKey, Client as PoolClient, Contract as Pool, PoolConfig, PoolDataKey,
+    PoolError, Positions, Request, ReserveConfig, ReserveData, ReserveEmissionMetadata,
+    ReserveEmissionsConfig, ReserveEmissionsData, UserEmissionData, UserReserveKey,
+    WASM as PoolWASM,
+};

blend-interfaces/src/pool_factory.rs

@@ -1,8 +1,7 @@
-pub use pool_factory::{PoolFactory, PoolFactoryClient, PoolFactoryError, PoolInitMeta};
-
 mod wasm {
-    soroban_sdk::contractimport!(
-        file = "../target/wasm32-unknown-unknown/optimized/pool_factory.wasm"
-    );
+    soroban_sdk::contractimport!(file = "./wasm/pool_factory.wasm");
 }
-pub use wasm::WASM as PoolFactoryWASM;
+pub use wasm::{
+    Client as PoolFactoryClient, Contract as PoolFactory, PoolFactoryDataKey, PoolFactoryError,
+    PoolInitMeta, WASM as PoolFactoryWASM,
+};

emitter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "emitter"
-version = "0.0.0"
+version = "0.0.1"
 authors = ["Blend Capital <[email protected]>"]
 license = "AGPL-3.0"
 edition = "2021"

pool-factory/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pool-factory"
-version = "0.0.0"
+version = "0.0.1"
 authors = ["Blend Capital <[email protected]>"]
 license = "AGPL-3.0"
 edition = "2021"

pool/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "pool"
-version = "0.0.0"
-authors = ["Blend Capital <[email protected]>"]
+version = "0.0.1"
 license = "AGPL-3.0"
 edition = "2021"
 publish = false