remove transit
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana
parent
0ed19efbb3
commit
5da861d91f
1
deps.edn
1
deps.edn
|
|
@ -12,7 +12,6 @@
|
|||
com.taoensso/encore {:mvn/version "2.94.0"}
|
||||
hickory {:mvn/version "0.7.1"}
|
||||
cljs-bean {:mvn/version "1.3.0"}
|
||||
com.cognitect/transit-cljs {:mvn/version "0.8.248"}
|
||||
mvxcvi/alphabase {:mvn/version "1.0.0"}
|
||||
rasom/cljs-react-navigation {:mvn/version "0.1.4"}}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,10 +9,9 @@
|
|||
status-im/timbre {:mvn/version "4.10.0-2-status"}
|
||||
com.taoensso/encore {:mvn/version "2.94.0"}
|
||||
hickory {:mvn/version "0.7.1"}
|
||||
com.cognitect/transit-cljs {:mvn/version "0.8.248"}
|
||||
cljs-bean {:mvn/version "1.3.0"}}
|
||||
|
||||
:paths ["src" "../src" "resources" "target" "../resources"]
|
||||
|
||||
:aliases {:dev {:extra-deps {re-frisk {:mvn/version "0.5.4.1"}}
|
||||
:main-opts ["-m" "figwheel.main" "-b" "dev" "-r"]}}}
|
||||
:main-opts ["-m" "figwheel.main" "-b" "dev" "-r"]}}}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,28 @@
|
|||
https://repo.clojars.org/binaryage/devtools/0.9.10/devtools-0.9.10
|
||||
https://repo.clojars.org/binaryage/env-config/0.2.2/env-config-0.2.2
|
||||
https://repo.clojars.org/cheshire/cheshire/5.4.0/cheshire-5.4.0
|
||||
https://repo.clojars.org/clj-http/clj-http/1.1.0/clj-http-1.1.0
|
||||
https://repo.clojars.org/clj-http/clj-http/3.7.0/clj-http-3.7.0
|
||||
https://repo.clojars.org/cider/cider-nrepl/0.14.0/cider-nrepl-0.14.0
|
||||
https://repo.clojars.org/clj-stacktrace/clj-stacktrace/0.2.5/clj-stacktrace-0.2.5
|
||||
https://repo.clojars.org/clj-time/clj-time/0.11.0/clj-time-0.11.0
|
||||
https://repo.clojars.org/clj-time/clj-time/0.6.0/clj-time-0.6.0
|
||||
https://repo.clojars.org/clj-time/clj-time/0.9.0/clj-time-0.9.0
|
||||
https://repo.clojars.org/clj-tuple/clj-tuple/0.1.7/clj-tuple-0.1.7
|
||||
https://repo.clojars.org/clj-tuple/clj-tuple/0.2.2/clj-tuple-0.2.2
|
||||
https://repo.clojars.org/cljfmt/cljfmt/0.5.7/cljfmt-0.5.7
|
||||
https://repo.clojars.org/cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0
|
||||
https://repo.clojars.org/cljsbuild/cljsbuild/1.1.7/cljsbuild-1.1.7
|
||||
https://repo.clojars.org/cljsjs/create-react-class/15.5.3-0/create-react-class-15.5.3-0
|
||||
https://repo.clojars.org/cljsjs/create-react-class/15.6.3-0/create-react-class-15.6.3-0
|
||||
https://repo.clojars.org/cljsjs/highlight/9.6.0-0/highlight-9.6.0-0
|
||||
https://repo.clojars.org/cljsjs/prop-types/15.6.0-0/prop-types-15.6.0-0
|
||||
https://repo.clojars.org/cljsjs/react-dom-server/15.2.1-0/react-dom-server-15.2.1-0
|
||||
https://repo.clojars.org/cljsjs/react-dom-server/15.5.4-0/react-dom-server-15.5.4-0
|
||||
https://repo.clojars.org/cljsjs/react-dom-server/16.3.2-0/react-dom-server-16.3.2-0
|
||||
https://repo.clojars.org/cljsjs/react-dom/15.2.1-0/react-dom-15.2.1-0
|
||||
https://repo.clojars.org/cljsjs/react-dom/15.5.4-0/react-dom-15.5.4-0
|
||||
https://repo.clojars.org/cljsjs/react-dom/16.3.2-0/react-dom-16.3.2-0
|
||||
https://repo.clojars.org/cljsjs/react-flip-move/2.9.17-0/react-flip-move-2.9.17-0
|
||||
https://repo.clojars.org/cljsjs/react-highlight/1.0.7-1/react-highlight-1.0.7-1
|
||||
https://repo.clojars.org/cljsjs/react/15.2.1-0/react-15.2.1-0
|
||||
https://repo.clojars.org/cljsjs/react/15.5.4-0/react-15.5.4-0
|
||||
https://repo.clojars.org/cljsjs/react/15.6.1-2/react-15.6.1-2
|
||||
https://repo.clojars.org/cljsjs/react/16.3.2-0/react-16.3.2-0
|
||||
https://repo.clojars.org/clout/clout/2.1.2/clout-2.1.2
|
||||
https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.4.0/cljs-time-0.4.0
|
||||
https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2
|
||||
https://repo.clojars.org/com/jakemccrary/lein-test-refresh/0.21.1/lein-test-refresh-0.21.1
|
||||
https://repo.clojars.org/com/jakemccrary/lein-test-refresh/0.20.0/lein-test-refresh-0.20.0
|
||||
https://repo.clojars.org/com/taoensso/encore/2.79.1/encore-2.79.1
|
||||
https://repo.clojars.org/com/taoensso/encore/2.84.2/encore-2.84.2
|
||||
https://repo.clojars.org/com/taoensso/encore/2.91.0/encore-2.91.0
|
||||
|
|
@ -42,13 +33,10 @@ https://repo.clojars.org/com/taoensso/truss/1.3.5/truss-1.3.5
|
|||
https://repo.clojars.org/com/taoensso/truss/1.3.6/truss-1.3.6
|
||||
https://repo.clojars.org/com/taoensso/truss/1.5.0/truss-1.5.0
|
||||
https://repo.clojars.org/compojure/compojure/1.5.2/compojure-1.5.2
|
||||
https://repo.clojars.org/crouton/crouton/0.1.2/crouton-0.1.2
|
||||
https://repo.clojars.org/crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0
|
||||
https://repo.clojars.org/crypto-random/crypto-random/1.2.0/crypto-random-1.2.0
|
||||
https://repo.clojars.org/day8/re-frame/re-frame-10x/0.3.2/re-frame-10x-0.3.2
|
||||
https://repo.clojars.org/doric/doric/0.9.0/doric-0.9.0
|
||||
https://repo.clojars.org/fs/fs/1.1.2/fs-1.1.2
|
||||
https://repo.clojars.org/gntp/gntp/0.6.0/gntp-0.6.0
|
||||
https://repo.clojars.org/hiccup/hiccup/1.0.5/hiccup-1.0.5
|
||||
https://repo.clojars.org/hickory/hickory/0.7.1/hickory-0.7.1
|
||||
https://repo.clojars.org/http-kit/http-kit/2.2.0/http-kit-2.2.0
|
||||
|
|
@ -56,41 +44,35 @@ https://repo.clojars.org/instaparse/instaparse/1.4.0/instaparse-1.4.0
|
|||
https://repo.clojars.org/io/aviso/pretty/0.1.30/pretty-0.1.30
|
||||
https://repo.clojars.org/io/aviso/pretty/0.1.33/pretty-0.1.33
|
||||
https://repo.clojars.org/jakemcc/clojure-gntp/0.1.1/clojure-gntp-0.1.1
|
||||
https://repo.clojars.org/lein-ancient/lein-ancient/0.6.14/lein-ancient-0.6.14
|
||||
https://repo.clojars.org/lein-autoexpect/lein-autoexpect/1.9.0/lein-autoexpect-1.9.0
|
||||
https://repo.clojars.org/jonase/eastwood/0.2.5/eastwood-0.2.5
|
||||
https://repo.clojars.org/jonase/kibit/0.1.5/kibit-0.1.5
|
||||
https://repo.clojars.org/lein-cljfmt/lein-cljfmt/0.5.7/lein-cljfmt-0.5.7
|
||||
https://repo.clojars.org/lein-cljsbuild/lein-cljsbuild/1.1.7/lein-cljsbuild-1.1.7
|
||||
https://repo.clojars.org/lein-count/lein-count/1.0.3/lein-count-1.0.3
|
||||
https://repo.clojars.org/lein-plz/lein-plz/0.4.0-SNAPSHOT/lein-plz-0.4.0-20150409.161059-1
|
||||
https://repo.clojars.org/lein-pprint/lein-pprint/1.1.2/lein-pprint-1.1.2
|
||||
https://repo.clojars.org/lein-kibit/lein-kibit/0.1.5/lein-kibit-0.1.5
|
||||
https://repo.clojars.org/lein-re-frisk/lein-re-frisk/0.5.8/lein-re-frisk-0.5.8
|
||||
https://repo.clojars.org/leinjacker/leinjacker/0.4.2/leinjacker-0.4.2
|
||||
https://repo.clojars.org/medley/medley/0.8.2/medley-0.8.2
|
||||
https://repo.clojars.org/meta-merge/meta-merge/1.0.0/meta-merge-1.0.0
|
||||
https://repo.clojars.org/mvxcvi/alphabase/1.0.0/alphabase-1.0.0
|
||||
https://repo.clojars.org/net/cgrand/macrovich/0.2.0/macrovich-0.2.0
|
||||
https://repo.clojars.org/org/clojars/jgrocho/digest/1.5.0/digest-1.5.0
|
||||
https://repo.clojars.org/potemkin/potemkin/0.3.12/potemkin-0.3.12
|
||||
https://repo.clojars.org/potemkin/potemkin/0.4.3/potemkin-0.4.3
|
||||
https://repo.clojars.org/org/clojars/brenton/google-diff-match-patch/0.1/google-diff-match-patch-0.1
|
||||
https://repo.clojars.org/quoin/quoin/0.1.2/quoin-0.1.2
|
||||
https://repo.clojars.org/rasom/cljs-react-navigation/0.1.4/cljs-react-navigation-0.1.4
|
||||
https://repo.clojars.org/rasom/lein-githooks/0.1.5/lein-githooks-0.1.5
|
||||
https://repo.clojars.org/re-com/re-com/2.1.0/re-com-2.1.0
|
||||
https://repo.clojars.org/re-frame/re-frame/0.10.1/re-frame-0.10.1
|
||||
https://repo.clojars.org/re-frame/re-frame/0.10.4/re-frame-0.10.4
|
||||
https://repo.clojars.org/re-frame/re-frame/0.10.6/re-frame-0.10.6
|
||||
https://repo.clojars.org/re-frisk-shell/re-frisk-shell/0.5.2/re-frisk-shell-0.5.2
|
||||
https://repo.clojars.org/re-frisk-sidecar/re-frisk-sidecar/0.5.7/re-frisk-sidecar-0.5.7
|
||||
https://repo.clojars.org/re-frisk/re-frisk/0.5.4/re-frisk-0.5.4
|
||||
https://repo.clojars.org/reagent/reagent/0.6.0/reagent-0.6.0
|
||||
https://repo.clojars.org/reagent/reagent/0.7.0/reagent-0.7.0
|
||||
https://repo.clojars.org/reagent/reagent/0.8.1/reagent-0.8.1
|
||||
https://repo.clojars.org/refactor-nrepl/refactor-nrepl/2.3.0-SNAPSHOT/refactor-nrepl-2.3.0-20170531.195417-17
|
||||
https://repo.clojars.org/rewrite-clj/rewrite-clj/0.4.12/rewrite-clj-0.4.12
|
||||
https://repo.clojars.org/rewrite-clj/rewrite-clj/0.5.2/rewrite-clj-0.5.2
|
||||
https://repo.clojars.org/rewrite-clj/rewrite-clj/0.6.0/rewrite-clj-0.6.0
|
||||
https://repo.clojars.org/rewrite-cljs/rewrite-cljs/0.4.3/rewrite-cljs-0.4.3
|
||||
https://repo.clojars.org/rewrite-cljs/rewrite-cljs/0.4.4/rewrite-cljs-0.4.4
|
||||
https://repo.clojars.org/riddley/riddley/0.1.12/riddley-0.1.12
|
||||
https://repo.clojars.org/riddley/riddley/0.1.7/riddley-0.1.7
|
||||
https://repo.clojars.org/ring-cors/ring-cors/0.1.8/ring-cors-0.1.8
|
||||
https://repo.clojars.org/ring/ring-anti-forgery/1.0.0/ring-anti-forgery-1.0.0
|
||||
https://repo.clojars.org/ring/ring-codec/1.0.0/ring-codec-1.0.0
|
||||
|
|
@ -104,58 +86,24 @@ https://repo.clojars.org/ring/ring-headers/0.1.3/ring-headers-0.1.3
|
|||
https://repo.clojars.org/ring/ring-ssl/0.2.1/ring-ssl-0.2.1
|
||||
https://repo.clojars.org/status-im/re-frame/0.10.5/re-frame-0.10.5
|
||||
https://repo.clojars.org/status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status
|
||||
https://repo.clojars.org/table/table/0.4.0/table-0.4.0
|
||||
https://repo.clojars.org/tigris/tigris/0.1.1/tigris-0.1.1
|
||||
https://repo.clojars.org/viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1
|
||||
https://repo.clojars.org/zprint/zprint/0.4.7/zprint-0.4.7
|
||||
https://repo1.maven.org/maven2/args4j/args4j-site/2.0.26/args4j-site-2.0.26
|
||||
https://repo1.maven.org/maven2/args4j/args4j-site/2.33/args4j-site-2.33
|
||||
https://repo1.maven.org/maven2/args4j/args4j/2.0.26/args4j-2.0.26
|
||||
https://repo1.maven.org/maven2/args4j/args4j/2.33/args4j-2.33
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-core/1.11.28/aws-java-sdk-core-1.11.28
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-core/1.9.0/aws-java-sdk-core-1.9.0
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-kms/1.11.28/aws-java-sdk-kms-1.11.28
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-pom/1.11.28/aws-java-sdk-pom-1.11.28
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-pom/1.9.0/aws-java-sdk-pom-1.9.0
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-s3/1.11.28/aws-java-sdk-s3-1.11.28
|
||||
https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-s3/1.9.0/aws-java-sdk-s3-1.9.0
|
||||
https://repo1.maven.org/maven2/com/amazonaws/jmespath-java/1.0/jmespath-java-1.0
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-clj/0.8.269/transit-clj-0.8.269
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-clj/0.8.290/transit-clj-0.8.290
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-clj/0.8.309/transit-clj-0.8.309
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-cljs/0.8.239/transit-cljs-0.8.239
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-cljs/0.8.243/transit-cljs-0.8.243
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-cljs/0.8.248/transit-cljs-0.8.248
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-java/0.8.276/transit-java-0.8.276
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-java/0.8.316/transit-java-0.8.316
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-java/0.8.332/transit-java-0.8.332
|
||||
https://repo1.maven.org/maven2/com/cognitect/transit-js/0.8.846/transit-js-0.8.846
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.1.1/jackson-annotations-2.1.1
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.6.0/jackson-annotations-2.6.0
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.1.1/jackson-core-2.1.1
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.3.2/jackson-core-2.3.2
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.4/jackson-core-2.4.4
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.6.6/jackson-core-2.6.6
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.1.1/jackson-databind-2.1.1
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.3.2/jackson-databind-2.3.2
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.6.6/jackson-databind-2.6.6
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.4.4/jackson-dataformat-cbor-2.4.4
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.6/jackson-dataformat-cbor-2.6.6
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.4.4/jackson-dataformat-smile-2.4.4
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-json-org/2.3.2/jackson-datatype-json-org-2.3.2
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-parent/2.6.1/jackson-parent-2.6.1
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-parent/2.6.2/jackson-parent-2.6.2
|
||||
https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-parent/2.8/jackson-parent-2.8
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/11/oss-parent-11
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/12/oss-parent-12
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/16/oss-parent-16
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/23/oss-parent-23
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/24/oss-parent-24
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/27/oss-parent-27
|
||||
https://repo1.maven.org/maven2/com/fasterxml/oss-parent/4/oss-parent-4
|
||||
https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9
|
||||
https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1
|
||||
https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2
|
||||
|
|
@ -187,7 +135,6 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v2
|
|||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170521/closure-compiler-externs-v20170521
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170806/closure-compiler-externs-v20170806
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170910/closure-compiler-externs-v20170910
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20180805/closure-compiler-externs-v20180805
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20190325/closure-compiler-externs-v20190325
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20160315/closure-compiler-main-v20160315
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20160911/closure-compiler-main-v20160911
|
||||
|
|
@ -195,7 +142,6 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v2016
|
|||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170521/closure-compiler-main-v20170521
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170806/closure-compiler-main-v20170806
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170910/closure-compiler-main-v20170910
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20180805/closure-compiler-main-v20180805
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20190325/closure-compiler-main-v20190325
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20150126/closure-compiler-parent-v20150126
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20151216/closure-compiler-parent-v20151216
|
||||
|
|
@ -205,7 +151,6 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20
|
|||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170521/closure-compiler-parent-v20170521
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170806/closure-compiler-parent-v20170806
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170910/closure-compiler-parent-v20170910
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20180805/closure-compiler-parent-v20180805
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20190325/closure-compiler-parent-v20190325
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20160315/closure-compiler-unshaded-v20160315
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20160911/closure-compiler-unshaded-v20160911
|
||||
|
|
@ -213,7 +158,6 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v
|
|||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170521/closure-compiler-unshaded-v20170521
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170806/closure-compiler-unshaded-v20170806
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170910/closure-compiler-unshaded-v20170910
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20180805/closure-compiler-unshaded-v20180805
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20190325/closure-compiler-unshaded-v20190325
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20150126/closure-compiler-v20150126
|
||||
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20151216/closure-compiler-v20151216
|
||||
|
|
@ -230,25 +174,19 @@ https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1.1/json
|
|||
https://repo1.maven.org/maven2/com/yahoo/platform/yui/yuicompressor/2.4.8/yuicompressor-2.4.8
|
||||
https://repo1.maven.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10
|
||||
https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6
|
||||
https://repo1.maven.org/maven2/commons-codec/commons-codec/1.8/commons-codec-1.8
|
||||
https://repo1.maven.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9
|
||||
https://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.3.1/commons-fileupload-1.3.1
|
||||
https://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3
|
||||
https://repo1.maven.org/maven2/commons-io/commons-io/2.2/commons-io-2.2
|
||||
https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4
|
||||
https://repo1.maven.org/maven2/commons-io/commons-io/2.5/commons-io-2.5
|
||||
https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1
|
||||
https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2
|
||||
https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/servlet-api-2.5
|
||||
https://repo1.maven.org/maven2/joda-time/joda-time/2.2/joda-time-2.2
|
||||
https://repo1.maven.org/maven2/joda-time/joda-time/2.6/joda-time-2.6
|
||||
https://repo1.maven.org/maven2/joda-time/joda-time/2.8.2/joda-time-2.8.2
|
||||
https://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10
|
||||
https://repo1.maven.org/maven2/org/apache/apache/11/apache-11
|
||||
https://repo1.maven.org/maven2/org/apache/apache/13/apache-13
|
||||
https://repo1.maven.org/maven2/org/apache/apache/15/apache-15
|
||||
https://repo1.maven.org/maven2/org/apache/apache/16/apache-16
|
||||
https://repo1.maven.org/maven2/org/apache/apache/4/apache-4
|
||||
https://repo1.maven.org/maven2/org/apache/apache/9/apache-9
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.3/commons-compress-1.3
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/22/commons-parent-22
|
||||
|
|
@ -256,41 +194,11 @@ https://repo1.maven.org/maven2/org/apache/commons/commons-parent/24/commons-pare
|
|||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/25/commons-parent-25
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/28/commons-parent-28
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/32/commons-parent-32
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/35/commons-parent-35
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39
|
||||
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/5/commons-parent-5
|
||||
https://repo1.maven.org/maven2/org/apache/directory/project/project/31/project-31
|
||||
https://repo1.maven.org/maven2/org/apache/directory/studio/org.apache.commons.codec/1.8/org.apache.commons.codec-1.8
|
||||
https://repo1.maven.org/maven2/org/apache/directory/studio/parent-libraries/2.0.0.v20130628/parent-libraries-2.0.0.v20130628
|
||||
https://repo1.maven.org/maven2/org/apache/directory/studio/parent/2.0.0.v20130628/parent-2.0.0.v20130628
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpasyncclient/4.1.3/httpasyncclient-4.1.3
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2/httpclient-4.2
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.4/httpclient-4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-asyncclient/4.1.3/httpcomponents-asyncclient-4.1.3
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.2/httpcomponents-client-4.2
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.4/httpcomponents-client-4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.2/httpcomponents-client-4.5.2
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.3/httpcomponents-client-4.5.3
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.2/httpcomponents-core-4.2
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.1/httpcomponents-core-4.4.1
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.4/httpcomponents-core-4.4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.6/httpcomponents-core-4.4.6
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4/httpcomponents-core-4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore-nio/4.4.6/httpcore-nio-4.4.6
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2/httpcore-4.2
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4/httpcore-4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.4/httpmime-4.4
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.5.3/httpmime-4.5.3
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/project/5/project-5
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/project/6/project-6
|
||||
https://repo1.maven.org/maven2/org/apache/httpcomponents/project/7/project-7
|
||||
https://repo1.maven.org/maven2/org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0
|
||||
https://repo1.maven.org/maven2/org/clojure/clojure/1.10.0/clojure-1.10.0
|
||||
https://repo1.maven.org/maven2/org/clojure/clojure/1.2.0/clojure-1.2.0
|
||||
https://repo1.maven.org/maven2/org/clojure/clojure/1.2.1/clojure-1.2.1
|
||||
https://repo1.maven.org/maven2/org/clojure/clojure/1.3.0/clojure-1.3.0
|
||||
https://repo1.maven.org/maven2/org/clojure/clojure/1.4.0/clojure-1.4.0
|
||||
|
|
@ -303,7 +211,6 @@ https://repo1.maven.org/maven2/org/clojure/clojure/1.8.0/clojure-1.8.0
|
|||
https://repo1.maven.org/maven2/org/clojure/clojure/1.9.0-RC1/clojure-1.9.0-RC1
|
||||
https://repo1.maven.org/maven2/org/clojure/clojure/1.9.0/clojure-1.9.0
|
||||
https://repo1.maven.org/maven2/org/clojure/clojurescript/0.0-3211/clojurescript-0.0-3211
|
||||
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.10.516/clojurescript-1.10.516
|
||||
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.10.520/clojurescript-1.10.520
|
||||
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.7.228/clojurescript-1.7.228
|
||||
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.8.51/clojurescript-1.8.51
|
||||
|
|
@ -318,6 +225,7 @@ https://repo1.maven.org/maven2/org/clojure/core.async/0.2.395/core.async-0.2.395
|
|||
https://repo1.maven.org/maven2/org/clojure/core.async/0.4.474/core.async-0.4.474
|
||||
https://repo1.maven.org/maven2/org/clojure/core.cache/0.6.5/core.cache-0.6.5
|
||||
https://repo1.maven.org/maven2/org/clojure/core.contracts/0.0.1/core.contracts-0.0.1
|
||||
https://repo1.maven.org/maven2/org/clojure/core.logic/0.8.11/core.logic-0.8.11
|
||||
https://repo1.maven.org/maven2/org/clojure/core.memoize/0.5.9/core.memoize-0.5.9
|
||||
https://repo1.maven.org/maven2/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24
|
||||
https://repo1.maven.org/maven2/org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44
|
||||
|
|
@ -345,12 +253,14 @@ https://repo1.maven.org/maven2/org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176
|
|||
https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.6.10/tools.analyzer.jvm-0.6.10
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.7.0/tools.analyzer.jvm-0.7.0
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.analyzer/0.6.9/tools.analyzer-0.6.9
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.cli/0.3.5/tools.cli-0.3.5
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.logging/0.3.1/tools.logging-0.3.1
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.macro/0.1.5/tools.macro-0.1.5
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.namespace/0.2.11/tools.namespace-0.2.11
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.nrepl/0.2.12/tools.nrepl-0.2.12
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/0.10.0/tools.reader-0.10.0
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.1/tools.reader-0.8.1
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.16/tools.reader-0.8.16
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.13/tools.reader-0.8.13
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/0.9.1/tools.reader-0.9.1
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/1.0.0-alpha1/tools.reader-1.0.0-alpha1
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/1.0.0-alpha3/tools.reader-1.0.0-alpha3
|
||||
|
|
@ -364,7 +274,6 @@ https://repo1.maven.org/maven2/org/clojure/tools.reader/1.0.5/tools.reader-1.0.5
|
|||
https://repo1.maven.org/maven2/org/clojure/tools.reader/1.1.0/tools.reader-1.1.0
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/1.2.1/tools.reader-1.2.1
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/1.3.0/tools.reader-1.3.0
|
||||
https://repo1.maven.org/maven2/org/clojure/tools.reader/1.3.2/tools.reader-1.3.2
|
||||
https://repo1.maven.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4
|
||||
https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14
|
||||
https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14/animal-sniffer-parent-1.14
|
||||
|
|
@ -372,13 +281,10 @@ https://repo1.maven.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent-34
|
|||
https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1
|
||||
https://repo1.maven.org/maven2/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1
|
||||
https://repo1.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA
|
||||
https://repo1.maven.org/maven2/org/json/json/20090211/json-20090211
|
||||
https://repo1.maven.org/maven2/org/jsoup/jsoup/1.7.1/jsoup-1.7.1
|
||||
https://repo1.maven.org/maven2/org/jsoup/jsoup/1.9.2/jsoup-1.9.2
|
||||
https://repo1.maven.org/maven2/org/kohsuke/pom/14/pom-14
|
||||
https://repo1.maven.org/maven2/org/kohsuke/pom/6/pom-6
|
||||
https://repo1.maven.org/maven2/org/mozilla/rhino/1.7R5/rhino-1.7R5
|
||||
https://repo1.maven.org/maven2/org/msgpack/msgpack/0.6.10/msgpack-0.6.10
|
||||
https://repo1.maven.org/maven2/org/msgpack/msgpack/0.6.12/msgpack-0.6.12
|
||||
https://repo1.maven.org/maven2/org/ow2/asm/asm-all/4.2/asm-all-4.2
|
||||
https://repo1.maven.org/maven2/org/ow2/asm/asm-parent/4.2/asm-parent-4.2
|
||||
|
|
@ -387,3 +293,4 @@ https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4
|
|||
https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5
|
||||
https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7
|
||||
https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9
|
||||
https://repo1.maven.org/maven2/org/tcrawley/dynapath/0.2.4/dynapath-0.2.4
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -19,7 +19,6 @@
|
|||
[com.taoensso/encore "2.94.0"]
|
||||
[hickory "0.7.1"]
|
||||
[cljs-bean "1.3.0"]
|
||||
[com.cognitect/transit-cljs "0.8.248"]
|
||||
[mvxcvi/alphabase "1.0.0"]
|
||||
[rasom/cljs-react-navigation "0.1.4"]]
|
||||
:plugins [[rasom/lein-githooks "0.1.5"]
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
[status-im.mailserver.core :as mailserver]
|
||||
[status-im.native-module.core :as status]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[status-im.transport.message.transit :as transit]
|
||||
[status-im.transport.utils :as transport.utils]
|
||||
[status-im.ui.components.react :as react]
|
||||
[status-im.utils.clocks :as utils.clocks]
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
[status-im.ethereum.json-rpc :as json-rpc]
|
||||
[status-im.data-store.contacts :as contacts-store]
|
||||
[status-im.mailserver.core :as mailserver]
|
||||
[status-im.transport.message.contact :as message.contact]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[status-im.tribute-to-talk.db :as tribute-to-talk]
|
||||
[status-im.tribute-to-talk.whitelist :as whitelist]
|
||||
|
|
|
|||
|
|
@ -6,20 +6,26 @@
|
|||
[taoensso.timbre :as log]
|
||||
[status-im.utils.types :as types]))
|
||||
|
||||
(defn deserialize-tribute-to-talk [t]
|
||||
(if (seq t)
|
||||
(types/deserialize t)
|
||||
{}))
|
||||
|
||||
(defn <-rpc [contact]
|
||||
(-> contact
|
||||
(update :tributeToTalk types/deserialize)
|
||||
(update :tributeToTalk deserialize-tribute-to-talk)
|
||||
(update :systemTags
|
||||
#(reduce (fn [acc s]
|
||||
(conj acc (keyword (subs s 1))))
|
||||
#{}
|
||||
%)) (clojure.set/rename-keys {:id :public-key
|
||||
:photoPath :photo-path
|
||||
:tributeToTalk :tribute-to-talk
|
||||
:ensVerifiedAt :ens-verified-at
|
||||
:ensVerified :ens-verified
|
||||
:systemTags :system-tags
|
||||
:lastUpdated :last-updated})))
|
||||
%))
|
||||
(clojure.set/rename-keys {:id :public-key
|
||||
:photoPath :photo-path
|
||||
:tributeToTalk :tribute-to-talk
|
||||
:ensVerifiedAt :ens-verified-at
|
||||
:ensVerified :ens-verified
|
||||
:systemTags :system-tags
|
||||
:lastUpdated :last-updated})))
|
||||
|
||||
(defn ->rpc [contact]
|
||||
(-> contact
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
(def maximum-number-of-attempts 2)
|
||||
(def request-timeout 30)
|
||||
(def min-limit 100)
|
||||
(def max-limit 2000)
|
||||
(def max-limit 1000)
|
||||
(def backoff-interval-ms 3000)
|
||||
(def default-limit max-limit)
|
||||
(def connection-timeout
|
||||
|
|
|
|||
|
|
@ -827,7 +827,8 @@
|
|||
;; on, rather then keep asking for the same data, say after n amounts of attempts
|
||||
(fx/defn handle-request-error
|
||||
[{:keys [db]} error]
|
||||
{:db (-> db
|
||||
{:mailserver/decrease-limit []
|
||||
:db (-> db
|
||||
(assoc :mailserver/request-error error)
|
||||
(dissoc :mailserver/current-request
|
||||
:mailserver/pending-requests))})
|
||||
|
|
|
|||
|
|
@ -158,12 +158,6 @@
|
|||
:fetched-network-id fetched-network-id})
|
||||
#(re-frame/dispatch [::close-app-confirmed]))))}]})
|
||||
|
||||
(defn deserialize-config
|
||||
[{:keys [multiaccount current-network networks]}]
|
||||
[(types/deserialize multiaccount)
|
||||
current-network
|
||||
(types/deserialize networks)])
|
||||
|
||||
(re-frame/reg-fx
|
||||
;;TODO: this could be replaced by a single API call on status-go side
|
||||
::initialize-wallet
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
(ns status-im.multiaccounts.update.core
|
||||
(:require [status-im.contact.db :as contact.db]
|
||||
[status-im.ethereum.json-rpc :as json-rpc]
|
||||
[status-im.transport.message.contact :as message.contact]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[status-im.utils.fx :as fx]
|
||||
[status-im.utils.types :as types]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
[status-im.i18n :as i18n]
|
||||
[status-im.multiaccounts.model :as multiaccounts.model]
|
||||
[status-im.multiaccounts.update.core :as multiaccounts.update]
|
||||
[status-im.transport.message.pairing :as transport.pairing]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[status-im.ui.screens.navigation :as navigation]
|
||||
[status-im.utils.config :as config]
|
||||
|
|
@ -70,24 +69,6 @@
|
|||
:params []
|
||||
:on-success #(log/info "sent pair installation message")}]})
|
||||
|
||||
(defn merge-contact [local remote]
|
||||
;;TODO we don't sync contact/blocked for now, it requires more complex handling
|
||||
(let [remove (update remote :system-tags disj :contact/blocked)
|
||||
[old-contact new-contact] (sort-by :last-updated [remote local])]
|
||||
(-> local
|
||||
(merge new-contact)
|
||||
(assoc ;; we only take system tags from the newest contact version
|
||||
:system-tags (:system-tags new-contact)))))
|
||||
|
||||
(def merge-contacts (partial merge-with merge-contact))
|
||||
|
||||
(def multiaccount-mergeable-keys [:name :photo-path :last-updated])
|
||||
|
||||
(defn merge-multiaccount [local remote]
|
||||
(if (> (:last-updated remote) (:last-updated local))
|
||||
(merge local (select-keys remote multiaccount-mergeable-keys))
|
||||
local))
|
||||
|
||||
(fx/defn prompt-dismissed [{:keys [db]}]
|
||||
{:db (assoc-in db [:pairing/prompt-user-pop-up] false)})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
(ns ^{:doc "Contact request and update API"}
|
||||
status-im.transport.message.contact
|
||||
(:require [cljs.spec.alpha :as spec]
|
||||
[status-im.transport.message.protocol :as protocol]))
|
||||
|
||||
(defrecord ContactRequest [name profile-image address fcm-token device-info]
|
||||
protocol/StatusMessage
|
||||
(validate [this]
|
||||
(when (spec/valid? :message/contact-request this)
|
||||
this)))
|
||||
|
||||
(defrecord ContactRequestConfirmed [name profile-image address fcm-token device-info]
|
||||
protocol/StatusMessage
|
||||
(validate [this]
|
||||
(when (spec/valid? :message/contact-request-confirmed this)
|
||||
this)))
|
||||
|
||||
(defrecord ContactUpdate [name profile-image address fcm-token device-info]
|
||||
protocol/StatusMessage
|
||||
(validate [this]
|
||||
(when (spec/valid? :message/contact-update this)
|
||||
this)))
|
||||
|
|
@ -14,40 +14,12 @@
|
|||
[status-im.ethereum.json-rpc :as json-rpc]
|
||||
[status-im.ethereum.core :as ethereum]
|
||||
[status-im.native-module.core :as status]
|
||||
[status-im.transport.message.contact :as contact]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[status-im.transport.message.transit :as transit]
|
||||
[status-im.transport.utils :as transport.utils]
|
||||
[status-im.tribute-to-talk.whitelist :as whitelist]
|
||||
[status-im.ens.core :as ens]
|
||||
[cljs-bean.core :as clj-bean]
|
||||
[status-im.utils.config :as config]
|
||||
[status-im.utils.fx :as fx]
|
||||
[taoensso.timbre :as log]
|
||||
[status-im.ethereum.json-rpc :as json-rpc]))
|
||||
|
||||
(fx/defn handle-raw-message
|
||||
"Receive message handles a new status-message.
|
||||
dedup-id is passed by status-go and is used to deduplicate messages at that layer.
|
||||
Once a message has been successfuly processed, that id needs to be sent back
|
||||
in order to stop receiving that message"
|
||||
[{:keys [db] :as cofx} raw-message-js]
|
||||
(let [timestamp (.-timestamp raw-message-js)
|
||||
sig (.-from raw-message-js)
|
||||
payload (.-payload raw-message-js)]
|
||||
(let [status-message (transit/deserialize payload)]
|
||||
(when (and sig
|
||||
status-message)
|
||||
(try
|
||||
(when-let [valid-message (protocol/validate status-message)]
|
||||
(protocol/receive
|
||||
valid-message
|
||||
sig
|
||||
sig
|
||||
timestamp
|
||||
cofx))
|
||||
(catch :default e nil)))))) ; ignore unknown message types
|
||||
|
||||
(defn- js-obj->seq [obj]
|
||||
;; Sometimes the filter will return a single object instead of a collection
|
||||
(if (array? obj)
|
||||
|
|
@ -91,18 +63,6 @@
|
|||
(fx/merge cofx
|
||||
{:dispatch-later [{:ms 20 :dispatch [::process response-js]}]}
|
||||
(handle-chat (-> chat (clj-bean/->clj) (data-store.chats/<-rpc)))))
|
||||
(seq raw-messages)
|
||||
(let [first-filter (aget raw-messages 0)
|
||||
messages (.-messages first-filter)
|
||||
first-message (.pop messages)]
|
||||
;; Pop the empty array
|
||||
(when (= (.-length messages) 0)
|
||||
(.pop raw-messages))
|
||||
(when first-message
|
||||
(fx/merge cofx
|
||||
{:dispatch-later [{:ms 20 :dispatch [::process response-js]}]}
|
||||
(handle-raw-message first-message))))
|
||||
|
||||
(seq messages)
|
||||
(let [message (.pop messages)]
|
||||
(fx/merge cofx
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
(ns status-im.transport.message.pairing
|
||||
(:require [cljs.spec.alpha :as spec]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[taoensso.timbre :as log]))
|
||||
|
||||
(defrecord PairInstallation
|
||||
[installation-id device-type name _]
|
||||
protocol/StatusMessage
|
||||
(validate [this]
|
||||
(if (spec/valid? :message/pair-installation this)
|
||||
this
|
||||
(log/warn "failed sync installation validation" (spec/explain :message/pair-installation this)))))
|
||||
|
||||
(defrecord SyncInstallation
|
||||
[contacts account chat]
|
||||
protocol/StatusMessage
|
||||
(validate [this]
|
||||
(if (spec/valid? :message/sync-installation this)
|
||||
this
|
||||
(log/warn "failed sync installation validation" (spec/explain :message/sync-installation this)))))
|
||||
|
|
@ -1,49 +1,10 @@
|
|||
(ns ^{:doc "Protocol API and protocol utils"}
|
||||
status-im.transport.message.protocol
|
||||
(:require [cljs.spec.alpha :as spec]
|
||||
[status-im.multiaccounts.model :as multiaccounts.model]
|
||||
[re-frame.core :as re-frame]
|
||||
[status-im.data-store.messages :as data-store.messages]
|
||||
(:require [re-frame.core :as re-frame]
|
||||
[status-im.ethereum.json-rpc :as json-rpc]
|
||||
[status-im.constants :as constants]
|
||||
[status-im.ethereum.core :as ethereum]
|
||||
[status-im.transport.db :as transport.db]
|
||||
[status-im.utils.pairing :as pairing.utils]
|
||||
[status-im.transport.utils :as transport.utils]
|
||||
[status-im.tribute-to-talk.whitelist :as whitelist]
|
||||
[status-im.utils.fx :as fx]
|
||||
[taoensso.timbre :as log]))
|
||||
|
||||
(defprotocol StatusMessage
|
||||
"Protocol for the messages that are sent through the transport layer"
|
||||
(send [this chat-id cofx] "Method producing all effects necessary for sending the message record")
|
||||
(receive [this chat-id signature timestamp cofx] "Method producing all effects necessary for receiving the message record")
|
||||
(validate [this] "Method returning the message if it is valid or nil if it is not"))
|
||||
|
||||
(defn send-public-message
|
||||
"Sends the payload to topic"
|
||||
[cofx chat-id success-event payload]
|
||||
{:shh/send-public-message [{:success-event success-event
|
||||
:src (multiaccounts.model/current-public-key cofx)
|
||||
:chat chat-id
|
||||
:payload payload}]})
|
||||
|
||||
(fx/defn send-direct-message
|
||||
"Sends the payload using to dst"
|
||||
[cofx dst success-event payload]
|
||||
{:shh/send-direct-message [{:success-event success-event
|
||||
:src (multiaccounts.model/current-public-key cofx)
|
||||
:dst dst
|
||||
:payload payload}]})
|
||||
|
||||
(fx/defn send-with-pubkey
|
||||
"Sends the payload using asymetric key (multiaccount `:public-key` in db) and fixed discovery topic"
|
||||
[cofx {:keys [payload chat-id success-event]}]
|
||||
(send-direct-message cofx
|
||||
chat-id
|
||||
success-event
|
||||
payload))
|
||||
|
||||
(fx/defn send-chat-message [_ {:keys [chat-id
|
||||
text
|
||||
response-to
|
||||
|
|
@ -62,11 +23,3 @@
|
|||
:on-success
|
||||
#(re-frame/dispatch [:transport/message-sent % 1])
|
||||
:on-failure #(log/error "failed to send a message" %)}]})
|
||||
|
||||
(defrecord Message [content content-type message-type clock-value timestamp]
|
||||
StatusMessage
|
||||
(send [this chat-id {:keys [message] :as cofx}])
|
||||
(validate [this]
|
||||
(if (spec/valid? :message/message this)
|
||||
this
|
||||
(log/warn "failed to validate Message" (spec/explain-str :message/message this)))))
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
(ns ^{:doc "Transit custom readers and writers, required when adding a new record implementing StatusMessage protocol"}
|
||||
status-im.transport.message.transit
|
||||
(:require [status-im.transport.message.contact :as contact]
|
||||
[status-im.transport.message.protocol :as protocol]
|
||||
[status-im.transport.message.pairing :as pairing]
|
||||
[status-im.constants :as constants]
|
||||
[cognitect.transit :as transit]))
|
||||
|
||||
;; When adding a new reccord implenting the StatusMessage protocol it is required to implement:
|
||||
;; - a handler that will turn the clojure record into a javascript datastructure.
|
||||
;; - a reader that will turn the javascript datastructure back into a clojure record.
|
||||
|
||||
;; Use the existing types as exemples of how this is done
|
||||
|
||||
;;
|
||||
;; Writer handlers
|
||||
;;
|
||||
|
||||
;; Each writer defines a tag and a representation
|
||||
;; The tag will determine which reader is used to recreate the clojure record
|
||||
;; When migrating a particular record, it is important to use a different type and still handle the previous
|
||||
;; gracefully for compatibility
|
||||
|
||||
(deftype ContactRequestHandler []
|
||||
Object
|
||||
(tag [this v] "c2")
|
||||
(rep [this {:keys [name profile-image address]}]
|
||||
#js [name profile-image address nil nil]))
|
||||
|
||||
(deftype ContactRequestConfirmedHandler []
|
||||
Object
|
||||
(tag [this v] "c3")
|
||||
(rep [this {:keys [name profile-image address]}]
|
||||
#js [name profile-image address nil nil]))
|
||||
|
||||
(deftype ContactUpdateHandler []
|
||||
Object
|
||||
(tag [this v] "c6")
|
||||
(rep [this {:keys [name profile-image address]}]
|
||||
#js [name profile-image address nil nil]))
|
||||
|
||||
(deftype MessageHandler []
|
||||
Object
|
||||
(tag [this v] "c4")
|
||||
(rep [this {:keys [content content-type message-type clock-value timestamp]}]
|
||||
(condp = content-type
|
||||
constants/content-type-text ;; append new content add the end, still pass content the old way at the old index
|
||||
#js [(:text content) content-type message-type clock-value timestamp content]
|
||||
;; no need for legacy conversions for rest of the content types
|
||||
#js [content content-type message-type clock-value timestamp])))
|
||||
|
||||
(deftype SyncInstallationHandler []
|
||||
Object
|
||||
(tag [this v] "p1")
|
||||
(rep [this {:keys [contacts account chat]}]
|
||||
#js [contacts account chat]))
|
||||
|
||||
(deftype PairInstallationHandler []
|
||||
Object
|
||||
(tag [this v] "p2")
|
||||
(rep [this {:keys [name installation-id device-type]}]
|
||||
#js [installation-id device-type name nil]))
|
||||
|
||||
(def writer (transit/writer :json
|
||||
{:handlers
|
||||
{contact/ContactRequest (ContactRequestHandler.)
|
||||
contact/ContactRequestConfirmed (ContactRequestConfirmedHandler.)
|
||||
contact/ContactUpdate (ContactUpdateHandler.)
|
||||
protocol/Message (MessageHandler.)
|
||||
pairing/SyncInstallation (SyncInstallationHandler.)
|
||||
pairing/PairInstallation (PairInstallationHandler.)}}))
|
||||
|
||||
;;
|
||||
;; Reader handlers
|
||||
;;
|
||||
|
||||
(defn- legacy->new-message-data [content content-type]
|
||||
;; handling only the text content case
|
||||
(cond
|
||||
(= content-type constants/content-type-text)
|
||||
(if (and (map? content) (string? (:text content)))
|
||||
;; correctly formatted map
|
||||
[content content-type]
|
||||
;; create safe `{:text string-content}` value from anything else
|
||||
[{:text (str content)} content-type])
|
||||
:else
|
||||
[content content-type]))
|
||||
|
||||
;; Here we only need to call the record with the arguments parsed from the clojure datastructures
|
||||
(def reader (transit/reader :json
|
||||
{:handlers
|
||||
{"c2" (fn [[name profile-image address _ _]]
|
||||
(contact/ContactRequest. name profile-image address nil nil))
|
||||
"c3" (fn [[name profile-image address _ _]]
|
||||
(contact/ContactRequestConfirmed. name profile-image address nil nil))
|
||||
"c4" (fn [[legacy-content content-type message-type clock-value timestamp content]]
|
||||
(let [[new-content new-content-type] (legacy->new-message-data (or content legacy-content) content-type)]
|
||||
(protocol/Message. new-content new-content-type message-type clock-value timestamp)))
|
||||
"c7" (fn [[content content-type message-type clock-value timestamp]]
|
||||
(protocol/Message. content content-type message-type clock-value timestamp))
|
||||
"c5" (fn [])
|
||||
"c6" (fn [[name profile-image address _ _]]
|
||||
(contact/ContactUpdate. name profile-image address nil nil))
|
||||
"p1" (fn [[contacts account chat]]
|
||||
(pairing/SyncInstallation. contacts account chat))
|
||||
"p2" (fn [[installation-id device-type name _]]
|
||||
(pairing/PairInstallation. installation-id device-type name nil))}}))
|
||||
|
||||
(defn serialize
|
||||
"Serializes a record implementing the StatusMessage protocol using the custom writers"
|
||||
[o]
|
||||
(transit/write writer o))
|
||||
|
||||
(defn deserialize
|
||||
"Deserializes a record implementing the StatusMessage protocol using the custom readers"
|
||||
[o]
|
||||
(try (transit/read reader o) (catch :default e nil)))
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
status-im.transport.shh
|
||||
(:require [re-frame.core :as re-frame]
|
||||
[status-im.ethereum.core :as ethereum]
|
||||
[status-im.transport.message.transit :as transit]
|
||||
[status-im.transport.utils :as transport.utils]
|
||||
[taoensso.timbre :as log]
|
||||
[status-im.ethereum.json-rpc :as json-rpc]))
|
||||
|
|
@ -14,83 +13,6 @@
|
|||
:on-success on-success
|
||||
:on-error on-error}))
|
||||
|
||||
(defn send-direct-message!
|
||||
[direct-message success-event error-event messages-count]
|
||||
(json-rpc/call {:method "shhext_sendDirectMessage"
|
||||
:params [(update direct-message :payload (comp ethereum/utf8-to-hex
|
||||
transit/serialize))]
|
||||
:on-success #(if success-event
|
||||
(re-frame/dispatch (conj success-event % messages-count))
|
||||
(log/debug :shh/post-success))
|
||||
:on-error #(re-frame/dispatch [error-event %])}))
|
||||
|
||||
(re-frame/reg-fx
|
||||
:shh/send-direct-message
|
||||
(fn [post-calls]
|
||||
(doseq [{:keys [payload src dst success-event error-event]
|
||||
:or {error-event :transport/send-status-message-error}} post-calls]
|
||||
(let [direct-message {:pubKey dst
|
||||
:sig src
|
||||
:payload payload}]
|
||||
(send-direct-message! direct-message success-event error-event 1)))))
|
||||
|
||||
(re-frame/reg-fx
|
||||
:shh/send-pairing-message
|
||||
(fn [params]
|
||||
(let [{:keys [payload src success-event error-event]
|
||||
:or {error-event :transport/send-status-message-error}} params]
|
||||
(json-rpc/call {:method "shhext_sendDirectMessage"
|
||||
:params [{:sig src
|
||||
:pubKey src
|
||||
;; Send to any device
|
||||
:DH true
|
||||
:payload (-> payload
|
||||
transit/serialize
|
||||
ethereum/utf8-to-hex)}]
|
||||
:on-success #(if success-event
|
||||
(re-frame/dispatch (conj success-event % 1))
|
||||
(log/debug :shh/post-success))
|
||||
:on-error #(re-frame/dispatch [error-event %])}))))
|
||||
|
||||
(re-frame/reg-fx
|
||||
:shh/send-group-message
|
||||
(fn [params]
|
||||
(let [{:keys [payload src dsts success-event error-event]
|
||||
:or {error-event :transport/send-status-message-error}} params
|
||||
payload (-> payload
|
||||
transit/serialize
|
||||
ethereum/utf8-to-hex)]
|
||||
(doseq [{:keys [public-key chat]} dsts]
|
||||
(let [message {:pubKey public-key
|
||||
:sig src
|
||||
:payload payload}]
|
||||
(json-rpc/call {:method "shhext_sendDirectMessage"
|
||||
:params [message]
|
||||
:on-success #(if success-event
|
||||
(re-frame/dispatch (conj success-event % (count dsts)))
|
||||
(log/debug :shh/post-success))
|
||||
:on-error #(re-frame/dispatch [error-event %])}))))))
|
||||
|
||||
(defn send-public-message! [message success-event error-event]
|
||||
(json-rpc/call {:method "shhext_sendPublicMessage"
|
||||
:params [message]
|
||||
:on-success #(if success-event
|
||||
(re-frame/dispatch (conj success-event % 1))
|
||||
(log/debug :shh/post-success))
|
||||
:on-error #(re-frame/dispatch [error-event %])}))
|
||||
|
||||
(re-frame/reg-fx
|
||||
:shh/send-public-message
|
||||
(fn [post-calls]
|
||||
(doseq [{:keys [payload src chat success-event error-event]
|
||||
:or {error-event :transport/send-status-message-error}} post-calls]
|
||||
(let [message {:chat chat
|
||||
:sig src
|
||||
:payload (-> payload
|
||||
transit/serialize
|
||||
ethereum/utf8-to-hex)}]
|
||||
(send-public-message! message success-event error-event)))))
|
||||
|
||||
(defn get-sym-key
|
||||
[{:keys [sym-key-id on-success on-error]}]
|
||||
(json-rpc/call {:method "shh_getSymKey"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
(ns status-im.utils.types
|
||||
(:require
|
||||
[cljs-bean.core :as clj-bean]
|
||||
[cognitect.transit :as transit]))
|
||||
[cljs-bean.core :as clj-bean]))
|
||||
|
||||
(defn to-string [s]
|
||||
(if (keyword? s)
|
||||
|
|
@ -17,8 +16,5 @@
|
|||
(js->clj (.parse js/JSON json) :keywordize-keys true)
|
||||
(catch js/Error _ (when (string? json) json)))))
|
||||
|
||||
(def reader (transit/reader :json))
|
||||
(def writer (transit/writer :json))
|
||||
|
||||
(defn serialize [o] (transit/write writer o))
|
||||
(defn deserialize [o] (try (transit/read reader o) (catch :default e nil)))
|
||||
(def serialize clj->json)
|
||||
(defn deserialize [o] (try (json->clj o) (catch :default e nil)))
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
:address "address"
|
||||
:name "name"
|
||||
:photoPath "photo-path"
|
||||
:tributeToTalk "[\"~#'\",\"tribute-to-talk\"]"
|
||||
:tributeToTalk "\"tribute-to-talk\""
|
||||
|
||||
:lastUpdated 1
|
||||
:systemTags #{":a" ":b"}}]
|
||||
|
|
@ -29,7 +29,8 @@
|
|||
:address "address"
|
||||
:name "name"
|
||||
:photoPath "photo-path"
|
||||
:tributeToTalk "[\"~#'\",\"tribute-to-talk\"]" :lastUpdated 1
|
||||
:tributeToTalk "\"tribute-to-talk\""
|
||||
:lastUpdated 1
|
||||
:systemTags [":a" ":b"]}
|
||||
expected-contact {:public-key "pk"
|
||||
:address "address"
|
||||
|
|
|
|||
Loading…
Reference in New Issue