diff --git a/Cargo.lock b/Cargo.lock index 47a75828..b6c05ae6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -755,7 +755,7 @@ dependencies = [ "serde", "serde_json", "webpki", - "webpki-roots", + "webpki-roots 0.22.6", "winapi", ] @@ -2688,6 +2688,8 @@ dependencies = [ "once_cell", "paste", "percent-encoding", + "rustls", + "rustls-pemfile", "serde", "serde_json", "sha2", @@ -2700,6 +2702,7 @@ dependencies = [ "tracing", "url", "uuid 1.8.0", + "webpki-roots 0.25.4", ] [[package]] @@ -3509,6 +3512,12 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "whoami" version = "1.5.1" diff --git a/mercury-server-deployment.yaml b/mercury-server-deployment.yaml deleted file mode 100644 index c3d4b92f..00000000 --- a/mercury-server-deployment.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: mercury-server - labels: - app: mercury-server -spec: - selector: - matchLabels: - app: mercury-server - replicas: 1 - template: - metadata: - labels: - app: mercury-server - spec: - containers: - - name: mercury-server - image: commerceblockx/mercury-server:latest - ports: - - containerPort: 8000 - command: ["cargo", "run", "--bin", "mercury-server"] - env: - - name: LOCKBOX - value: "http://78.141.209.195:18080" - - name: NETWORK - value: "testnet" - - name: LOCKHEIGHT_INIT - value: "1000" - - name: LH_DECREMENT - value: "10" - - name: CONNECTION_STRING - value: "postgresql://postgres:password1@45.76.136.11/mercury_token2" diff --git a/mercury-server-service.yaml b/mercury-server-service.yaml deleted file mode 100644 index 25118d0c..00000000 --- a/mercury-server-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: mercury-server-service -spec: - ports: - - port: 8000 - nodePort: 32450 - protocol: TCP - targetPort: 8000 - selector: - app: mercury-server - type: NodePort diff --git a/nginx-deployment.yaml b/nginx-deployment.yaml deleted file mode 100644 index 726169eb..00000000 --- a/nginx-deployment.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx - labels: - app: nginx -spec: - replicas: 1 - selector: - matchLabels: - app: nginx - template: - metadata: - labels: - app: nginx - spec: - containers: - - name: nginx - image: nginx - ports: - - containerPort: 80 diff --git a/nginx-service.yaml b/nginx-service.yaml deleted file mode 100644 index 59f597f8..00000000 --- a/nginx-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ngnix-service -spec: - selector: - app: nginx - type: NodePort - ports: - - protocol: TCP - port: 80 - targetPort: 80 \ No newline at end of file diff --git a/server/src/endpoints/utils.rs b/server/src/endpoints/utils.rs index 2c42a14e..0a8853cc 100644 --- a/server/src/endpoints/utils.rs +++ b/server/src/endpoints/utils.rs @@ -43,7 +43,7 @@ pub async fn validate_signature(pool: &sqlx::PgPool, signed_message_hex: &str, s secp.verify_schnorr(&signed_message, &msg, &auth_key).is_ok() } -#[get("/info/config", format = "json")] +#[get("/info/config")] pub async fn info_config(statechain_entity: &State) -> status::Custom> { let statechain_entity = statechain_entity.inner(); @@ -57,7 +57,7 @@ pub async fn info_config(statechain_entity: &State) -> status: return status::Custom(Status::Ok, Json(response_body)); } -#[get("/info/keylist", format = "json")] +#[get("/info/keylist")] pub async fn info_keylist(statechain_entity: &State) -> status::Custom> { let query = "\ diff --git a/token-server-deployment.yaml b/token-server-deployment.yaml deleted file mode 100644 index d198dec5..00000000 --- a/token-server-deployment.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: token-server -spec: - selector: - matchLabels: - app: token-server - replicas: 1 - template: - metadata: - labels: - app: token-server - spec: - containers: - - name: token-server - image: commerceblockx/token-server:latest - ports: - - containerPort: 8001 - command: ["cargo", "run", "--bin", "token-server"] - env: - - name: PROCESSOR_URL - value: "https://api.swiss-bitcoin-pay.ch" - - name: API_KEY - value: "684e8697137644bf9a97f6a5d2132349" - - name: FEE - value: "0.001" - - name: DELAY - value: "60" - - name: CONNECTION_STRING - value: "postgresql://postgres:password1@45.76.136.11/mercury_token2" diff --git a/token-server-service.yaml b/token-server-service.yaml deleted file mode 100644 index 3fa5721f..00000000 --- a/token-server-service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: token-server - name: token-server -spec: - ports: - - port: 80 - nodePort: 32451 - protocol: TCP - targetPort: 8001 - selector: - app: token-server - type: NodePort