Fix out of memory (#220)

* gitignore add .python-version * add temporary district.server.smart-contracts * make it faster * chunks range coll generation inprovement * update infura id * will it work for UI? * try with :contracts-build-path * Revert "try with :contracts-build-path" This reverts commit 0c6a4b8. * debug * more debug * fix dockerfile * fix dockerfiles * remove debug * missing :path ? * add debug * upgrade ver district0x/district-server-smart-contracts * Revert "missing :path ?" This reverts commit 9bb2480. * Revert "Revert "missing :path ?"" This reverts commit 38b4416. * add debug * fix debug * remove debugs * revert :path change * add debugs * more debugs * upgrade org.clojure/core.async * change ENS address for contract * remove debugs * try different address for ENS * Revert "try different address for ENS" This reverts commit 496ce1a. * try old addresses * Revert "try old addresses" This reverts commit 7c16fe0. * some of addresses are old, some new. Will it work? * change contract addresses once again * try different addresses aftert deploying in different way * once more * and once more * upgrade version district-server-smart-contracts * try to fix ModuleNotFoundError: No module named 'setuptools' * pip3->pip * another try * try with python3-dev * try with pysha3 * new python version * another try * upgrade nvm version * try with wheel * update Dockerfile FE * remove debug * back contract addresses to production (from QA) * try with [io.github.district0x/cljs-web3-next 0.2.0-SNAPSHOT] * district0x/district-server-web3 * overwrite district.server.smart-contracts because ver. upgrade in cosequence trigger more dependencies issues * add comment * add preprod config * fix typo * add debugs * more debug * remove new line on the beginnign of the docker-compose * fix debug * update district.server.smart-contracts
district0x · Nov 4, 2022 · e378808 · e378808
1 parent e2f78dd
commit e378808
Show file tree

Hide file tree

Showing 10 changed files with 411 additions and 61 deletions.
diff --git a/docker-builds/server/Dockerfile b/docker-builds/server/Dockerfile
@@ -5,18 +5,19 @@ RUN apt-get update && \
         build-essential \
         curl \
         git \
-        python3.7 python3-pip && \
+        python3.7 python3-pip python3-dev && \
     rm -rf /var/lib/apt/lists/*
 
 FROM env AS env-with-extra-deps
 ENV NODE_VERSION 10.23.1
 ENV NODE_VERSION_FOR_TRUFFLE v18.1.0
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
 RUN . /root/.nvm/nvm.sh \
     && nvm install "${NODE_VERSION}" \
     && nvm install "${NODE_VERSION_FOR_TRUFFLE}" \
     && nvm alias default "v${NODE_VERSION}"
 ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+RUN pip3 install -U --no-cache-dir pip wheel
 RUN pip3 install --no-cache-dir solc-select
 RUN solc-select install 0.8.4 && solc-select use 0.8.4
 RUN . /root/.nvm/nvm.sh \

diff --git a/docker-builds/ui/Dockerfile b/docker-builds/ui/Dockerfile
@@ -5,18 +5,19 @@ RUN apt-get update && \
         build-essential \
         curl \
         git \
-        python3.7 python3-pip && \
+        python3.7 python3-pip python3-dev && \
     rm -rf /var/lib/apt/lists/*
 
 FROM env AS env-with-extra-deps
 ENV NODE_VERSION 10.23.1
 ENV NODE_VERSION_FOR_TRUFFLE v18.1.0
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
 RUN . /root/.nvm/nvm.sh \
     && nvm install "${NODE_VERSION}" \
     && nvm install "${NODE_VERSION_FOR_TRUFFLE}" \
     && nvm alias default "v${NODE_VERSION}"
 ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+RUN pip3 install -U --no-cache-dir pip wheel
 RUN pip3 install --no-cache-dir solc-select
 RUN solc-select install 0.8.4 && solc-select use 0.8.4
 RUN . /root/.nvm/nvm.sh \
@@ -48,4 +49,4 @@ EXPOSE 80
 COPY --from=builder /app/docker-builds/ui/nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /app/docker-builds/ui/default /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/docker-builds/ui/namebazaar.io.conf /etc/nginx/conf.d/namebazaar.io.conf
-COPY --from=builder /app/resources/public /namebazaar/resources/public
+COPY --from=builder /app/resources/public /namebazaar/resources/public
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-
 version: '3'
 services:
   # parity:

diff --git a/project.clj b/project.clj
@@ -4,10 +4,11 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[cljs-http "0.1.46"]
+                 [org.clojure/core.async "1.5.648"]
                  ;; TODO migration from cljs-web3 to cljs-web3-next can be completed
                  ;; only when the latter contains all so far missing functionality
                  [cljs-web3 "0.19.0-0-11"]
-                 [cljs-web3-next "0.1.3"]
+                 [cljs-web3-next "0.1.3"]   ; TODO after upgrade to "0.2.0-SNAPSHOT" remove district.server.smart-contracts in this project
                  [cljsjs/filesaverjs "1.3.3-0"]
                  [cljsjs/prop-types "15.6.0-0"]
                  [cljsjs/react "16.4.1-0"]
@@ -41,7 +42,7 @@
                  ;; Version 1.0.2 splits the package into two separate modules.
                  [district0x/district-server-endpoints "1.0.1"]
                  [district0x/district-server-logging "1.0.6"]
-                 [district0x/district-server-smart-contracts "1.2.6"]
+                 [district0x/district-server-smart-contracts "1.2.9"]
                  [district0x/district-server-web3 "1.2.6"]
                  [district0x/district-server-web3-events "1.1.10"]
                  [district0x/district-ui-logging "1.1.0"]

diff --git a/src/district/server/smart_contracts.cljs b/src/district/server/smart_contracts.cljs
diff --git a/src/name_bazaar/server/core.cljs b/src/name_bazaar/server/core.cljs
@@ -37,11 +37,11 @@
                                                              #'district.server.web3-events/web3-events
                                                              #'name-bazaar.server.syncer/syncer
                                                              #'name-bazaar.server.emailer/emailer))}
-                            :web3-events {:events {:ens/new-owner                      [:ens :NewOwner]
-                                                   :ens/transfer                       [:ens :Transfer]
-                                                   :offering-registry/offering-added   [:offering-registry :on-offering-added]
+                            :web3-events {:events {:ens/new-owner [:ens :NewOwner]
+                                                   :ens/transfer [:ens :Transfer]
+                                                   :offering-registry/offering-added [:offering-registry :on-offering-added]
                                                    :offering-registry/offering-changed [:offering-registry :on-offering-changed]
-                                                   :registrar/transfer                 [:eth-registrar :Transfer]}
+                                                   :registrar/transfer [:eth-registrar :Transfer]}
                                           :from-block "latest"
                                           :block-step 1000}
                             :ui {:reveal-period {:hours 48}

diff --git a/src/name_bazaar/server/dev.cljs b/src/name_bazaar/server/dev.cljs
@@ -46,36 +46,36 @@
 (defn -main [& _]
   (async-helpers/extend-promises-as-channels!)
   (-> (mount/with-args
-        {:config          {:default {:logging     {:level    "info"
-                                                   :console? true}
-                                     :endpoints   {:port        6200
-                                                   :middlewares [logging-middlewares]}
-                                     :web3        {:url "ws://127.0.0.1:8549"
-                                                   :on-online (fn []
-                                                                (log/warn "Ethereum node went online again")
-                                                                (mount/start #'name-bazaar.server.db/name-bazaar-db
-                                                                             #'district.server.web3-events/web3-events
-                                                                             #'name-bazaar.server.syncer/syncer
-                                                                             #'name-bazaar.server.emailer/emailer))
-                                                   :on-offline (fn []
-                                                                 (log/warn "Ethereum node went offline")
-                                                                 (mount/stop #'name-bazaar.server.db/name-bazaar-db
-                                                                             #'district.server.web3-events/web3-events
-                                                                             #'name-bazaar.server.syncer/syncer
-                                                                             #'name-bazaar.server.emailer/emailer))}
-                                     :web3-events {:events {:ens/new-owner                      [:ens :NewOwner]
-                                                            :ens/transfer                       [:ens :Transfer]
-                                                            :offering-registry/offering-added   [:offering-registry :on-offering-added]
-                                                            :offering-registry/offering-changed [:offering-registry :on-offering-changed]
-                                                            :registrar/transfer                 [:eth-registrar :Transfer]}
-                                                   :from-block "latest"
-                                                   :block-step 1000}
-                                     :db          {:opts {:memory true}}
-                                     :emailer     {:print-mode? true
-                                                   :private-key "1925a0d3085e4d43a577b1adcaed60c08ece1570a151988dc41"}
-                                     :ui          {:public-key             "192eb918a8a9996cf0233023b4d6b8d8071b7df392535ef72622136569abd4b8c009f302d9884d4ea54fd4714764fb44387"
-                                                   :use-instant-registrar? true
-                                                   :reveal-period          {:hours 48}}}}
+        {:config {:default {:logging {:level "info"
+                                      :console? true}
+                            :endpoints {:port 6200
+                                        :middlewares [logging-middlewares]}
+                            :web3 {:url "ws://127.0.0.1:8549"
+                                   :on-online (fn []
+                                                (log/warn "Ethereum node went online again")
+                                                (mount/start #'name-bazaar.server.db/name-bazaar-db
+                                                             #'district.server.web3-events/web3-events
+                                                             #'name-bazaar.server.syncer/syncer
+                                                             #'name-bazaar.server.emailer/emailer))
+                                   :on-offline (fn []
+                                                 (log/warn "Ethereum node went offline")
+                                                 (mount/stop #'name-bazaar.server.db/name-bazaar-db
+                                                             #'district.server.web3-events/web3-events
+                                                             #'name-bazaar.server.syncer/syncer
+                                                             #'name-bazaar.server.emailer/emailer))}
+                            :web3-events {:events {:ens/new-owner [:ens :NewOwner]
+                                                   :ens/transfer [:ens :Transfer]
+                                                   :offering-registry/offering-added [:offering-registry :on-offering-added]
+                                                   :offering-registry/offering-changed [:offering-registry :on-offering-changed]
+                                                   :registrar/transfer [:eth-registrar :Transfer]}
+                                          :from-block "latest"
+                                          :block-step 1000}
+                            :db {:opts {:memory true}}
+                            :emailer {:print-mode? true
+                                      :private-key "1925a0d3085e4d43a577b1adcaed60c08ece1570a151988dc41"}
+                            :ui {:public-key "192eb918a8a9996cf0233023b4d6b8d8071b7df392535ef72622136569abd4b8c009f302d9884d4ea54fd4714764fb44387"
+                                 :use-instant-registrar? true
+                                 :reveal-period {:hours 48}}}}
          :smart-contracts {:contracts-build-path "./resources/public/contracts-build/"
                            :contracts-var #'name-bazaar.shared.smart-contracts/smart-contracts
                            :print-gas-usage? true

diff --git a/src/name_bazaar/shared/smart_contracts.cljs b/src/name_bazaar/shared/smart_contracts.cljs
@@ -1,14 +1,13 @@
 (ns name-bazaar.shared.smart-contracts)
-    (def smart-contracts
-      {:ens {:name "ENSRegistry" :address "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"}
-       :eth-registrar {:name "NameBazaarDevRegistrar" :address "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85"}
-       :offering-registry {:name "OfferingRegistry" :address "0x5B5B2B386a84546Fa75E9472e3096C26576B6d24"}
-       :buy-now-offering {:name "BuyNowOffering" :address "0x45141Ef2E09412eAd94793617507A0F487249fB0"}
-       :buy-now-offering-factory {:name "BuyNowOfferingFactory" :address "0xF9Bc1b1bBC9C91864e68D861038282ebdcf2449A"}
-       :auction-offering {:name "AuctionOffering" :address "0x9cf308c1d04AeD7eEA994f029cA2E39517C6372f"}
-       :auction-offering-factory {:name "AuctionOfferingFactory" :address "0xF787200012f8d3EA6Ee686577aA73Ed4a3e3ee0C"}
-       :district0x-emails {:name "District0xEmails" :address "0x02441d5dd828CccB3F81ae702eeEccc2142a192e"}
-       :reverse-name-resolver {:name "NamebazaarDevNameResolver" :address "0xA2C122BE93b0074270ebeE7f6b7292C7deB45047"}
-       :public-resolver {:name "NamebazaarDevPublicResolver" :address "0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41"}
-       :reverse-registrar {:name "NamebazaarDevReverseRegistrar" :address "0x084b1c3C81545d370f3634392De611CaaBFf8148"}
-       })
+(def smart-contracts
+  {:ens {:name "ENSRegistry" :address "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"}
+   :eth-registrar {:name "NameBazaarDevRegistrar" :address "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85"}
+   :offering-registry {:name "OfferingRegistry" :address "0x5B5B2B386a84546Fa75E9472e3096C26576B6d24"}
+   :buy-now-offering {:name "BuyNowOffering" :address "0x45141Ef2E09412eAd94793617507A0F487249fB0"}
+   :buy-now-offering-factory {:name "BuyNowOfferingFactory" :address "0xF9Bc1b1bBC9C91864e68D861038282ebdcf2449A"}
+   :auction-offering {:name "AuctionOffering" :address "0x9cf308c1d04AeD7eEA994f029cA2E39517C6372f"}
+   :auction-offering-factory {:name "AuctionOfferingFactory" :address "0xF787200012f8d3EA6Ee686577aA73Ed4a3e3ee0C"}
+   :district0x-emails {:name "District0xEmails" :address "0x02441d5dd828CccB3F81ae702eeEccc2142a192e"}
+   :reverse-name-resolver {:name "NamebazaarDevNameResolver" :address "0xA2C122BE93b0074270ebeE7f6b7292C7deB45047"}
+   :public-resolver {:name "NamebazaarDevPublicResolver" :address "0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41"}
+   :reverse-registrar {:name "NamebazaarDevReverseRegistrar" :address "0x084b1c3C81545d370f3634392De611CaaBFf8148"}})
diff --git a/src/name_bazaar/ui/config.cljs b/src/name_bazaar/ui/config.cljs
@@ -22,12 +22,21 @@
    :logging {:level :warn
              :console? true}
    :pushroute-hosts "namebazaar.qa.district0x.io"
-   :infura-id "874e0519ba33487f89ef854b0179906c" ;; this is for wallet-connect only, which will not work when running with ganache
+   :infura-id "fd0074468fd64e36b495c846a26a3f9d" ;; this is for wallet-connect only, which will not work when running with ganache
    :fallback-web3-url "https://ropsten.infura.io/"
    :load-node-addresses? true
    :root-url "https://namebazaar.qa.district0x.io"
    :server-url "https://api.namebazaar.qa.district0x.io"})
 
+(def preprod-config
+  {:logging {:level :debug}
+   :pushroute-hosts "namebazaar.io"
+   :infura-id "0ff2cb560e864d078290597a29e2505d"
+   :fallback-web3-url "https://mainnet.infura.io/"
+   :load-node-addresses? true
+   :root-url "https://namebazaar.preprod.district0x.io"
+   :server-url "https://api.namebazaar.preprod.district0x.io"})
+
 (def production-config
   {:logging {:level :warn
             ;;  :sentry {:dsn "https://597ef71a10a240b0949c3b482fe4b9a4@sentry.io/1364232"}
@@ -45,5 +54,6 @@
 (def config
   (condp = environment
     "prod" production-config
+    "preprod" preprod-config
     "qa"  qa-config
     "dev" development-config))
diff --git a/test/server/name_bazaar/utils.cljs b/test/server/name_bazaar/utils.cljs
@@ -35,12 +35,12 @@
   (async done
     (go
       (-> (mount/with-args
-            {:web3            {:url        "ws://127.0.0.1:8549"
-                               :on-online  #(log/warn "Ethereum node went online")
-                               :on-offline #(log/warn "Ethereum node went offline")}
+            {:web3 {:url "ws://127.0.0.1:8549"
+                    :on-online #(log/warn "Ethereum node went online")
+                    :on-offline #(log/warn "Ethereum node went offline")}
              :smart-contracts {:contracts-build-path "./resources/public/contracts-build/"
-                               :contracts-var        #'name-bazaar.shared.smart-contracts/smart-contracts
-                               :auto-mining?         true}})
+                               :contracts-var #'name-bazaar.shared.smart-contracts/smart-contracts
+                               :auto-mining? true}})
           (mount/only [#'district.server.web3
                        #'district.server.smart-contracts/smart-contracts])
           (mount/start))