status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade geth and add add london code 

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2021-06-30 13:42:08 +02:00
parent fe07d52fae
commit baa96ed22e
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
9 changed files with 13 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -29,4 +29,4 @@ APN_TOPIC=im.status.ethereum.pr
COMMUNITIES_ENABLED=1
DATABASE_MANAGEMENT_ENABLED=1
METRICS_ENABLED=0
EIP1559_ENABLED=1
EIP1559_ENABLED=0

41
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -1280,26 +1280,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
@ReactMethod
public void chaosModeUpdate(final boolean on, final Callback callback) {
Log.d(TAG, "chaosModeUpdate");
if (!checkAvailability()) {
callback.invoke(false);
return;
}
Runnable r = new Runnable() {
@Override
public void run() {
String res = Statusgo.chaosModeUpdate(on);
callback.invoke(res);
}
};
StatusThreadPoolExecutor.getInstance().execute(r);
}
@ReactMethod
public void deleteMultiaccount(final String keyUID, final Callback callback) {
Log.d(TAG, "deleteMultiaccount");
@ -1396,27 +1376,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
StatusThreadPoolExecutor.getInstance().execute(r);
}
@ReactMethod
public void getNodesFromContract(final String rpcEndpoint, final String contractAddress, final Callback callback) {
Log.d(TAG, "getNodesFromContract");
if (!checkAvailability()) {
callback.invoke(false);
return;
}
Runnable r = new Runnable() {
@Override
public void run() {
String res = Statusgo.getNodesFromContract(rpcEndpoint, contractAddress);
Log.d(TAG, res);
callback.invoke(res);
}
};
StatusThreadPoolExecutor.getInstance().execute(r);
}
@Override
public @Nullable
Map<String, Object> getConstants() {

21
modules/react-native-status/ios/RCTStatus/RCTStatus.m
View File

@ -200,27 +200,6 @@ RCT_EXPORT_METHOD(addPeer:(NSString *)enode
#endif
}
//////////////////////////////////////////////////////////////////// getNodesFromContract
RCT_EXPORT_METHOD(getNodesFromContract:(NSString *)url
address:(NSString *) address
callback:(RCTResponseSenderBlock)callback) {
NSString* result = StatusgoGetNodesFromContract(url, address);
callback(@[result]);
#if DEBUG
NSLog(@"GetNodesFromContract() method called");
#endif
}
//////////////////////////////////////////////////////////////////// chaosModeUpdate
RCT_EXPORT_METHOD(chaosModeUpdate:(BOOL)on
callback:(RCTResponseSenderBlock)callback) {
NSString* result = StatusgoChaosModeUpdate(on);
callback(@[result]);
#if DEBUG
NSLog(@"ChaosModeUpdate() method called");
#endif
}
//////////////////////////////////////////////////////////////////// multiAccountImportPrivateKey
RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
callback:(RCTResponseSenderBlock)callback) {

5
src/status_im/native_module/core.cljs
View File

@ -334,11 +334,6 @@
(log/debug "[native-module] toggle-webview-debug" on)
(.toggleWebviewDebug ^js (status) on))
(defn get-nodes-from-contract
[rpc-endpoint contract-address on-result]
(log/debug "[native-module] get-nodes-from-contract")
(.getNodesFromContract ^js (status) rpc-endpoint contract-address on-result))
(defn rooted-device? [callback]
(log/debug "[native-module] rooted-device?")
(cond

4
src/status_im/node/core.cljs
View File

@ -19,9 +19,13 @@
(defn- add-log-level [config log-level]
(if (empty? log-level)
(assoc config
:MaxPeers 20
:MaxPendingPeers 20
:LogLevel "ERROR"
:LogEnabled false)
(assoc config
:MaxPeers 20
:MaxPendingPeers 20
:LogLevel log-level
:LogEnabled true)))

4
src/status_im/signing/core.cljs
View File

@ -103,9 +103,9 @@
(when gasPrice
{:gasPrice (str "0x" (abi-spec/number-to-hex gasPrice))})
(when maxPriorityFeePerGas
{:maxPriorityFeePerGas (str "0x" (abi-spec/number-to-hex maxPriorityFeePerGas))})
{:maxPriorityFeePerGas (str "0x" (abi-spec/number-to-hex (.decimalPlaces maxPriorityFeePerGas 0)))})
(when maxFeePerGas
{:maxFeePerGas (str "0x" (abi-spec/number-to-hex maxFeePerGas))}))]
{:maxFeePerGas (str "0x" (abi-spec/number-to-hex (.decimalPlaces maxFeePerGas 0)))}))]
(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

2
src/status_im/signing/eip1559.cljs
View File

@ -5,7 +5,7 @@
[status-im.utils.money :as money]))
(def activation-blocks
{"123" (money/bignumber 0)})
{"3" (money/bignumber 10499401)})
(defonce activated? (atom {}))

4
src/status_im/ui/screens/signing/sheets.cljs
View File

@ -162,7 +162,7 @@
:color (quo-colors/get-color :text-02)}}
(str (money/to-fixed fee-eth 6) " " fee-currency)]
[quo/text
(money/to-fixed (money/mul fee-eth (money/bignumber price)) 2)
(money/to-fixed (money/mul fee-eth (money/bignumber (or price 0))) 2)
" "
fiat-currency]]]
[react/text {:style {:color (quo-colors/get-color :text-02)
@ -218,7 +218,7 @@
[(money/to-fixed fee-eth 6)
fee-currency
"•"
(money/to-fixed (money/mul fee-eth (money/bignumber price)) 2)
(money/to-fixed (money/mul fee-eth (money/bignumber (or price 0))) 2)
fiat-currency])]
[slider/animated-slider
{:style {:margin-horizontal 5

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im",
"repo": "status-go",
"version": "v0.81.0",
"commit-sha1": "58e39adf0389da0f222b91b0f20a3aa2b3b14f94",
"src-sha256": "1wh2vv216jjpk9a229m0kqkxw1bwihfkwlvc96015bm3v9a2ffhn"
"version": "v0.82.0",
"commit-sha1": "2f6b32b1f54de5802882c0177bb0b16924d04271",
"src-sha256": "1nlslsbibwnb7s6mbxqsijxrsw3lrs1dqvqy6bhfxsvwi5x97a28"
}