Enable EIP 1559 on ropsten

status-im · Aug 19, 2021 · c0db96e · c0db96e
1 parent f031d2b
commit c0db96e
Show file tree

Hide file tree

Showing 19 changed files with 405 additions and 193 deletions.
diff --git a/.env b/.env
@@ -29,4 +29,4 @@ APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
-EIP1559_ENABLED=0
+EIP1559_ENABLED=1
diff --git a/.env.e2e b/.env.e2e
@@ -30,3 +30,4 @@ DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
+EIP1559_ENABLED=1
diff --git a/.env.jenkins b/.env.jenkins
@@ -30,3 +30,4 @@ DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
+EIP1559_ENABLED=1
diff --git a/.env.nightly b/.env.nightly
@@ -23,3 +23,4 @@ BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
+EIP1559_ENABLED=1
diff --git a/.env.release b/.env.release
@@ -19,3 +19,4 @@ ENABLE_ROOT_ALERT=1
 MAX_IMAGES_BATCH=1
 ENABLE_REFERRAL_INVITE=0
 METRICS_ENABLED=0
+EIP1559_ENABLED=1
diff --git a/src/status_im/ethereum/json_rpc.cljs b/src/status_im/ethereum/json_rpc.cljs
@@ -28,6 +28,7 @@
    "eth_newFilter" {:subscription? true}
    "eth_getCode" {}
    "eth_syncing" {}
+   "eth_feeHistory" {}
    "net_version" {}
    "web3_clientVersion" {}
    "shh_generateSymKeyFromPassword" {}

diff --git a/src/status_im/ethereum/transactions/core.cljs b/src/status_im/ethereum/transactions/core.cljs
@@ -50,7 +50,8 @@
 (defn enrich-transfer
   [chain-tokens
    {:keys [address blockNumber timestamp from txStatus txHash gasPrice
-           gasUsed contract value gasLimit input nonce to type id]}]
+           gasUsed contract value gasLimit input nonce to type id
+           maxFeePerGas maxPriorityFeePerGas]}]
   (let [erc20?  (= type "erc20")
         failed? (= txStatus "0x0")]
     (merge {:address   (eip55/address->checksum address)
@@ -59,6 +60,8 @@
             :timestamp (* (decode/uint timestamp) 1000)
             :gas-used  (str (decode/uint gasUsed))
             :gas-price (str (decode/uint gasPrice))
+            :fee-cap   (str (decode/uint maxFeePerGas))
+            :tip-cap   (str (decode/uint maxPriorityFeePerGas))
             :gas-limit (str (decode/uint gasLimit))
             :nonce     (str (decode/uint nonce))
             :hash      txHash

diff --git a/src/status_im/signing/core.cljs b/src/status_im/signing/core.cljs
@@ -103,17 +103,20 @@
                                   (when gasPrice
                                     {:gasPrice (str "0x" (abi-spec/number-to-hex gasPrice))})
                                   (when maxPriorityFeePerGas
-                                    {:maxPriorityFeePerGas (str "0x" (abi-spec/number-to-hex (.decimalPlaces maxPriorityFeePerGas 0)))})
+                                    {:maxPriorityFeePerGas (str "0x" (abi-spec/number-to-hex
+                                                                      (js/parseInt maxPriorityFeePerGas)))})
                                   (when maxFeePerGas
-                                    {:maxFeePerGas (str "0x" (abi-spec/number-to-hex (.decimalPlaces maxFeePerGas 0)))}))]
+                                    {:maxFeePerGas (str "0x" (abi-spec/number-to-hex
+                                                              (js/parseInt maxFeePerGas)))}))]
         (when-not in-progress?
           {:db                          (update db :signing/sign assoc :error nil :in-progress? true)
            :signing/send-transaction-fx {:tx-obj   tx-obj-to-send
                                          :hashed-password hashed-password
                                          :cb       #(re-frame/dispatch [:signing/transaction-completed % tx-obj-to-send hashed-password])}})))))
 
 (fx/defn prepare-unconfirmed-transaction
-  [{:keys [db now]} new-tx-hash {:keys [value gasPrice gas data to from hash]} symbol amount]
+  [{:keys [db now]} new-tx-hash
+   {:keys [value gasPrice maxFeePerGas maxPriorityFeePerGas gas data to from hash]} symbol amount]
   (let [token (tokens/symbol->token (:wallet/all-tokens db) symbol)
         from  (eip55/address->checksum from)
         ;;if there is a hash in the tx object that means we resending transaction
@@ -132,6 +135,8 @@
                          (money/to-fixed (money/unit->token amount (:decimals token)))
                          (money/to-fixed (money/bignumber value)))
             :gas-price gas-price
+            :fee-cap   maxFeePerGas
+            :tip-cap   maxPriorityFeePerGas
             :gas-limit gas-limit}]
     (log/info "[signing] prepare-unconfirmed-transaction" tx)
     {:db (-> db
@@ -246,15 +251,25 @@
        (prices/update-prices)
        #(when-not gas
           {:db (assoc-in (:db %) [:signing/edit-fee :gas-loading?] true)
-           :signing/update-estimated-gas {:obj           (dissoc tx-obj :gasPrice)
+           :signing/update-estimated-gas {:obj           (-> tx-obj
+                                                             (dissoc :gasPrice)
+                                                             (update :maxFeePerGas
+                                                                     (fn [fee]
+                                                                       (some-> fee
+                                                                               money/bignumber
+                                                                               (money/mul 2)
+                                                                               money/to-hex))))
                                           :success-event :signing/update-estimated-gas-success
                                           :error-event :signing/update-estimated-gas-error}})
-       #(when-not (or maxFeePerGas gasPrice)
-          {:db (assoc-in (:db %) [:signing/edit-fee :gas-price-loading?] true)
-           :signing/update-gas-price {:success-event :signing/update-gas-price-success
-                                      :error-event :signing/update-gas-price-error
-                                      :network-id  (get-in (ethereum/current-network db)
-                                                           [:config :NetworkId])}})))))
+       (fn [cofx]
+         (when-not (or maxFeePerGas gasPrice)
+           {:db (assoc-in (:db cofx) [:signing/edit-fee :gas-price-loading?] true)
+            :signing/update-gas-price
+            {:success-callback #(re-frame/dispatch
+                                 [:wallet.send/update-gas-price-success :signing/tx %])
+             :error-callback   #(re-frame/dispatch [:signing/update-gas-price-error %])
+             :network-id       (get-in (ethereum/current-network db)
+                                       [:config :NetworkId])}}))))))
 
 (fx/defn check-queue [{:keys [db] :as cofx}]
   (let [{:signing/keys [tx queue]} db]
@@ -436,7 +451,7 @@
         to-norm (ethereum/normalized-hex (if (string? to) to (:address to)))
         from-address (:address from)
         identity (:current-chat-id db)
-        db (dissoc db :wallet/prepare-transaction)]
+        db (dissoc db :wallet/prepare-transaction :signing/edit-fee)]
     (if to-norm
       (fx/merge
        cofx
@@ -474,7 +489,7 @@
         to-norm (:address request-parameters)
         from-address (:address from)]
     (fx/merge cofx
-              {:db (dissoc db :wallet/prepare-transaction)}
+              {:db (dissoc db :wallet/prepare-transaction :signing/edit-fee)}
               (fn [cofx]
                 (sign
                  cofx
@@ -502,7 +517,7 @@
         to-norm      (ethereum/normalized-hex (if (string? to) to (:address to)))
         from-address (:address from)]
     (fx/merge cofx
-              {:db (dissoc db :wallet/prepare-transaction)}
+              {:db (dissoc db :wallet/prepare-transaction :signing/edit-fee)}
               (sign
                {:tx-obj (merge (if (eip1559/sync-enabled?)
                                  {:from                 from-address

diff --git a/src/status_im/signing/eip1559.cljs b/src/status_im/signing/eip1559.cljs
@@ -34,11 +34,10 @@
     :on-error   #(callback nil)}))
 
 (defn sync-enabled? []
-  (and config/eip1559-enabled?
-       @activated-on-current-network?))
+  config/eip1559-enabled?)
 
 (defn enabled? [network-id enabled-callback disabled-callback]
-  (let [london-activated? (get @activated? network-id)]
+  (let [london-activated? true]
     (cond
       (not config/eip1559-enabled?)
       (disabled-callback)