aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions/index.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/scripts/controllers/transactions/index.js')
-rw-r--r--app/scripts/controllers/transactions/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 718dd20e..e8ef5595 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -190,7 +190,7 @@ class TransactionController extends EventEmitter {
try {
// check whether recipient account is blacklisted
- recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+ recipientBlacklistChecker.checkAccount(txMeta.dekusanNetworkId, normalizedTxParams.to)
// add default tx params
txMeta = await this.addTxGasDefaults(txMeta)
} catch (error) {
@@ -619,7 +619,7 @@ class TransactionController extends EventEmitter {
const unapprovedTxs = this.txStateManager.getUnapprovedTxList()
const selectedAddressTxList = this.txStateManager.getFilteredTxList({
from: this.getSelectedAddress(),
- metamaskNetworkId: this.getNetwork(),
+ dekusanNetworkId: this.getNetwork(),
})
this.memStore.updateState({ unapprovedTxs, selectedAddressTxList })
}
46ced9'>swarm/storage/netstore: add fetcher cancellation on shutdown (#19049)Elad2019-02-193-120/+144 * swarm/network: Saturation check for healthy networks (#19071)holisticode2019-02-194-29/+179 * swarm/storage: fix influxdb gc metrics report (#19102)Elad2019-02-191-5/+3 * swarm: fix network/stream data races (#19051)Janoš Guljaš2019-02-1913-196/+273 * swarm: fix uptime gauge update goroutine leak by introducing cleanup function...Elad2019-02-191-21/+32 * swarm/storage: fix HashExplore concurrency bug ethersphere#1211 (#19028)holisticode2019-02-191-9/+17 * swarm/pss: mutex lifecycle fixed (#19045)gluk2562019-02-191-4/+7 * swarm/docker: add global-store and split docker images (#19038)Rafael Matias2019-02-191-6/+15 * cmd/swarm/global-store: global store cmd (#19014)Janoš Guljaš2019-02-191-0/+1 * swarm: CI race detector test adjustments (#19017)Ferenc Szabo2019-02-196-84/+60 * swarm/network: refactor simulation tests bootstrap (#18975)Anton Evangelatov2019-02-199-247/+156 * swarm: GetPeerSubscriptions RPC (#18972)holisticode2019-02-193-1/+257 * swarm/pss: transition to whisper v6 (#19023)gluk2562019-02-196-8/+8 * swarm/network, swarm/storage: Preserve opentracing contexts (#19022)lash2019-02-1910-107/+122 * swarm/network: fix data race in fetcher_test.go (#18469)Ferenc Szabo2019-02-192-25/+25 * swarm/pss: Remove pss service leak in test (#18992)lash2019-02-192-0/+11 * swarm/storage: fix test timeout with -race by increasing mget timeoutFerenc Szabo2019-02-192-5/+3 * swarm/storage/localstore: new localstore package (#19015)Janoš Guljaš2019-02-1917-0/+4244 * swarm: Debug API and HasChunks() API endpoint (#18980)holisticode2019-02-1911-36/+144 * cmd/swarm: hashes command (#19008)holisticode2019-02-192-14/+10 * swarm/storage: Get all chunk references for a given file (#19002)holisticode2019-02-192-0/+76 * swarm/network: Remove extra random peer, connect test sanity, comments (#18964)lash2019-02-191-11/+49 * swarm: fix flaky delivery tests (#18971)Janoš Guljaš2019-02-192-8/+1 * p2p/testing, swarm: remove unused testing.T in protocol tester (#18500)Elad2019-02-195-31/+31 * swarm/version: commit version added (#18510)gluk2562019-02-192-0/+7 * swarm: fix a data race on startTime (#18511)Janoš Guljaš2019-02-191-3/+3 * swarm: bootnode-mode, new bootnodes and no p2p package discovery (#18498)Anton Evangelatov2019-02-198-22/+40 * swarm/network: fix data race warning on TestBzzHandshakeLightNode (#18459)Elad2019-02-192-6/+13 * swarm/network: rewrite of peer suggestion engine, fix skipped tests (#18404)Viktor Trón2019-02-193-667/+287 * cmd/swarm/swarm-snapshot: swarm snapshot generator (#18453)Elad2019-02-192-76/+11 * swarm/network: fix data race in TestNetworkID test (#18460)Janoš Guljaš2019-02-191-5/+4 * swarm/storage: fix mockNetFetcher data races (#18462)Janoš Guljaš2019-02-191-0/+4 * params, swarm/version: Geth 1.8.22-stable, Swarm 0.3.10-stableFelix Lange2019-01-311-1/+1 * params, swarm: release Geth v1.8.21 and Swarm v0.3.9Péter Szilágyi2019-01-161-4/+4 * swarm/pot: each() functions refactored (#18452)gluk2562019-01-153-82/+58 * swarm/pot: pot.remove fixed (#18431)gluk2562019-01-123-20/+86 * Stream subscriptions (#18355)holisticode2019-01-115-320/+234 * p2p/simulations: eliminate concept of pivot (#18426)Ferenc Szabo2019-01-113-60/+1 * swarm/network: Rename minproxbinsize, add as member of simulation (#18408)lash2019-01-1019-84/+93 * swarm/network: remove isproxbin bool from kad.Each* iterfunc (#18239)Viktor Trón2019-01-1010-35/+25 * swarm: Fix T.Fatal inside a goroutine in tests (#18409)Janoš Guljaš2019-01-097-68/+167 * swarm, p2p/protocols: Stream accounting (#18337)holisticode2019-01-082-30/+111 * swarm/storage/mock/test: fix T.Fatal inside a goroutine (#18399)Janoš Guljaš2019-01-071-3/+8 * swarm: Shed Index and Uint64Field additions (#18398)Janoš Guljaš2019-01-076-130/+671 * A few minor code inspection fixes (#18393)Ferenc Szabo2019-01-068-27/+27 * vendor, crypto, swarm: switch over to upstream sha3 packageDave McGregor2019-01-0410-38/+38 * swarm/docker: Dockerfile for swarm:edge docker image (#18386)Anton Evangelatov2019-01-034-1/+57 * swarm/storage: change Proximity function and add TestProximity test (#18379)Janoš Guljaš2019-01-032-3/+186 * swarm: remove unused/dead code (#18351)Anton Evangelatov2018-12-2424-396/+19 * swarm/network: Revised depth and health for Kademlia (#18354)lash2018-12-2215-273/+413 * p2p/protocols: accounting metrics rpc (#18336)Jerzy Lasyk2018-12-221-0/+6 * swarm/pss: forwarding function refactoring (#18353)gluk2562018-12-222-51/+436 * p2p/simulation: Test snapshot correctness and minimal benchmark (#18287)lash2018-12-211-26/+9 * swarm/storage: remove unused methods from Chunk interface (#18283)Javier Peletier2018-12-183-21/+4 * swarm/pss: Reduce input vulnerabilities (#18304)lash2018-12-186-60/+116 * swarm/network/simulation:commented out unreachable code-avoid vet errors (#18...Javier Peletier2018-12-181-7/+4 * Update visualized snapshot test (#18286)holisticode2018-12-181-53/+214 * p2p/simulation: move connection methods from swarm/network/simulation (#18323)Elad2018-12-1711-535/+37 * swarm/storage/feed: remove unused code (#18324)Anton Evangelatov2018-12-173-30/+4 * swarm/storage: simplify ChunkValidator interface (#18285)Javier Peletier2018-12-127-18/+20 * swarm/shed: add metrics to each shed db (#18277)Anton Evangelatov2018-12-123-7/+206 * params, swarm: begin Geth v1.9.0 family, Swarm v0.3.9 cyclePéter Szilágyi2018-12-111-4/+4 * params, swarm: release Geth v1.8.20 and Swarm v0.3.8Péter Szilágyi2018-12-111-4/+4 * cmd/swarm, metrics, swarm/api/client, swarm/storage, swarm/metrics, swarm/api...Elad2018-12-114-20/+107 * swarm/network: Correct ambiguity in compared addresses (#18251)lash2018-12-101-2/+1 * swarm: snapshot load improvement (#18220)Janoš Guljaš2018-12-072-2/+1 * swarm/api/http: add resetting timer metrics to requests (#18249)Elad2018-12-051-0/+5 * swarm/network/stream: Debug log instead of Warn for retrieval failure (#18246)holisticode2018-12-051-1/+3 * swarm/pss: Add same api interface for all Send* methods (#18218)lash2018-12-012-2/+6 * cmd/swarm: add flag for application name (swarm or swarm-private) (#18189)Anton Evangelatov2018-11-302-5476/+0 * params, swarm: start Geth v1.8.20 and Swarm v0.3.8 release cyclePéter Szilágyi2018-11-281-4/+4 * params, swarm: release Geth v1.8.19 and Swarm v0.3.7Péter Szilágyi2018-11-281-4/+4 * Increase bzz version (#18184)holisticode2018-11-273-3/+170 * swarm: add database abstractions (shed package) (#18183)Janoš Guljaš2018-11-2718-0/+2287 * swarm/network: Correct neighborhood depth (#18066)lash2018-11-2712-37/+209 * Accounting metrics reporter (#18136)holisticode2018-11-272-20/+38 * Remove multihash from Swarm bzz:// for Feeds (#18175)Javier Peletier2018-11-266-222/+165 * swarm/pss: Message handler refactor (#18169)lash2018-11-2610-109/+644 * swarm/api: improve not found error msg (#18171)Elad2018-11-261-1/+1 * swarm/network/simulation: fix New function for-loop scope (#18161)Janoš Guljaš2018-11-264-1/+56 * swarm/network/stream: use swarm/mock/mem as mock global store (#18157)Janoš Guljaš2018-11-223-53/+11 * swarm/state: refactor InmemoryStore (#18143)Anton Evangelatov2018-11-215-123/+24 * swarm/storage: move 'running migrations for' log line (#18120)Ferenc Szabo2018-11-201-3/+4 * swarm/storage: speed up garbage collection and rpc tests (#18128)Anton Evangelatov2018-11-192-5/+6 * swarm/api/http: change request served msg log level (#18127)Elad2018-11-181-1/+1 * Swarm accounting (#18050)holisticode2018-11-1610-38/+353 * swarm/network/simulation: use simulations.Event instead p2p.PeerEvent (#18098)Janoš Guljaš2018-11-166-55/+101 * swarm/storage: Batched database migration (#18113)lash2018-11-152-28/+127 * params, swarm: begin Geth v1.8.19 and Swarm v0.3.7 cyclePéter Szilágyi2018-11-141-4/+4 * params, swarm: release Geth v1.8.18 and Swarm v0.3.6Péter Szilágyi2018-11-141-4/+4 * cmd/swarm, swarm/api/http, swarm/bmt, swarm/fuse, swarm/network/stream, swarm...Alexey Sharov2018-11-1418-283/+173 * swarm/storage: fix garbage collector index skew (#18080)Ferenc Szabo2018-11-134-54/+268 * swarm/storage: fix access count on dbstore after cache hit (#17978)Ferenc Szabo2018-11-134-17/+138 * p2p/simulations, swarm/network: Custom services in snapshot (#17991)lash2018-11-121-6/+25 * swarm, cmd/swarm: address ineffectual assignments (#18048)Anton Evangelatov2018-11-0817-22/+51 * swarm/network: light nodes are not dialed, saved and requested from (#17975)Mark Vujevits2018-11-084-13/+153 * swarm/api: Fix #18007, missing signature should return HTTP 400 (#18008)Javier Peletier2018-11-072-6/+38 * swarm: Better syncing and retrieval option definition (#17986)holisticode2018-11-079-58/+147 * swarm/api: unexport Respond methods (#18037)Anton Evangelatov2018-11-063-52/+51 * swarm: modify context key (#17925)KimMachineGun2018-11-062-16/+10 * swarm: clean up unused private types and functions (#17989)Ferenc Szabo2018-10-2710-108/+13 * swarm/network/stream: disambiguate chunk delivery messages (retrieval… (#17...holisticode2018-10-214-12/+47 * swarm/api/http: remove ModTime=now for direct and multipart uploads (#17945)Elad2018-10-191-2/+0 * swarm/network: disallow historical retrieval requests (#17936)Elad2018-10-195-7/+11 * swarm: Lightnode mode: disable sync, retrieve, subscription (#17899)Attila Gazso2018-10-187-15/+260 * swarm/tracing: disable stdout logging for opentracing (#17931)Anton Evangelatov2018-10-171-3/+2 * swarm/network/stream: generalise setting of next batch (#17818)Viktor Trón2018-10-127-77/+89 * swarm/storage: Add accessCnt for GC (#17845)lash2018-10-122-143/+358 * p2p/simulations: fix a deadlock and clean up adapters (#17891)Felix Lange2018-10-121-18/+1 * swarm, swarm/storage: lower constants for faster tests (#17876)Anton Evangelatov2018-10-096-21/+18 * params, swarm: begin Geth v1.8.18, Swarm v0.3.6 cyclePéter Szilágyi2018-10-091-4/+4 * params, swarm: release Geth v1.8.17 and Swar v0.3.5Péter Szilágyi2018-10-091-4/+4 * Fix retrieval tests and simulation backends (#17723)holisticode2018-10-094-221/+388 * swarm/storage/feed: Expose MaxUpdateDataLength constant (#17858)Javier Peletier2018-10-082-4/+6 * swarm/storage: extract isValid. correctly remove invalid chunks from store on...Anton Evangelatov2018-10-041-21/+21 * Merge pull request #17796 from epiclabs-io/mru-feedsViktor Trón2018-10-0340-720/+648 |\ | * swarm/storage/feed: Renamed packageJavier Peletier2018-10-0336-110/+110 | * swarm/storage/feeds: renamed vars that can conflict with package nameJavier Peletier2018-10-033-15/+15 | * swarm/storage/feeds: removed capital Feed throughoutJavier Peletier2018-10-0317-54/+54 | * swarm: Changed owners.Javier Peletier2018-10-031-1/+1 | * swarm/storage/feeds: Final package rename and moved filesJavier Peletier2018-10-0336-114/+115 | * swarm/storage/mru: Renamed rest of MRU referencesJavier Peletier2018-10-0316-306/+239 | * swarm/storage/mru: Renamed all comments to FeedsJavier Peletier2018-10-0314-102/+96 | * swarm/storage/mru: Renamed all identifiers to FeedsJavier Peletier2018-10-0322-231/+231 * | swarm: schemas and migrations (#17813)Anton Evangelatov2018-10-035-11/+81 |/ * cmd/swarm, swarm: cross-platform Content-Type detection (#17782)Alexey Sharov2018-10-018-67/+1419 * swarm/storage: ensure 64bit hasherStore struct alignment (#17766)Janoš Guljaš2018-09-291-1/+4 * swarm/storage: make linter happyAnton Evangelatov2018-09-283-7/+5 * Swarm MRUs: Adaptive frequency / Predictable lookups / API simplification (#1...Javier Peletier2018-09-2840-2910/+3006 * Merge branch 'master' into max-stream-peer-serversJanos Guljas2018-09-2710-36/+161 |\ | * Merge pull request #17757 from ethersphere/retrieve-request-ttl-prViktor Trón2018-09-277-27/+79 | |\ | | * swarm: prevent forever running retrieve request loopsBalint Gabor2018-09-267-27/+79 | * | Merge pull request #17734 from frncmx/fix-dos-attack-invalid-hash-lengthViktor Trón2018-09-262-9/+82 | |\ \ | | * | swarm/network/stream: fix DoS invalid hash length (#927)Ferenc Szabo2018-09-212-9/+82 | * | | [ImgBot] optimizes images (#17741)Alpay Yildirim2018-09-261-0/+0 | | |/ | |/| * | | swarm/network/stream: fix a typo in test commentJanos Guljas2018-09-261-1/+1 * | | Merge branch 'master' into max-stream-peer-serversJanos Guljas2018-09-2566-814/+486 |\| | | * | all: new p2p node representation (#17643)Felix Lange2018-09-2563-799/+469 | * | params, swarm: begin Geth v1.8.17, Swarm v0.3.5 cyclePéter Szilágyi2018-09-241-4/+4 | * | params, swarm: release Geth v1.8.16, Swarm v0.3.4Péter Szilágyi2018-09-241-4/+4 | |/ | * all: fix various comment typos (#17591)HackyMiner2018-09-203-4/+4 | * swarm/storage: Implement global timeout for fetcher (#17702)Balint Gabor2018-09-191-1/+3 * | swarm/api: fix TestDumpConfigJanos Guljas2018-09-251-14/+15 * | cmd/swarm, swarm: add stream peer servers limitJanos Guljas2018-09-248-39/+220 |/ * swarm/network: downgrade fetcher unable to request log message severity (#17692)Janoš Guljaš2018-09-181-1/+1 * swarm: Chunk refactor improvements (#17683)Balint Gabor2018-09-183-6/+6 * all: simplify s[:] to s where s is a slice (#17673)Emil2018-09-155-15/+15 * swarm: Chunk refactor (#17659)Balint Gabor2018-09-1352-1868/+3136 * swarm/storage: remove redundant increments for dataIdx and entryCnt (#17484)Anton Evangelatov2018-09-122-31/+35 * Kademlia refactor (#17641)Viktor Trón2018-09-1216-421/+260 * Encryption async api (#17603)Viktor Trón2018-09-114-125/+170 * swarm/api/http: bzz-immutable wrong handler bug (#17602)Elad2018-09-072-2/+2 * cmd/swarm: added password to ACT (#17598)Elad2018-09-072-41/+152 * swarm/storage: added metrics for db entry count (#17589)Elad2018-09-062-20/+25 * swarm/api/http: added a regression test for resolver bug from #17483 (#17502)Elad2018-09-064-23/+148 * params, swarm: begin geth v1.8.16 and swarm v0.3.4 cyclePéter Szilágyi2018-08-291-4/+4 * params, swarm: release geth v1.8.15 and swarm 0.3.3Péter Szilágyi2018-08-291-4/+4 * swarm/api: fix typo (#17500)Geon Kim2018-08-271-1/+1 * all: remove the duplicate 'the' in annotations (#17509)Wenbiao Zheng2018-08-274-4/+4 * swarm/api/http: fixed resolver bug (#17483)Elad2018-08-221-1/+1 * params, swarm: begin geth v1.8.15 and swarm v0.3.3 cyclePéter Szilágyi2018-08-221-4/+4 * params, swarm: release Geth v1.8.14 and Swarm v0.3.2Péter Szilágyi2018-08-221-4/+4 * swarm: fix typos (#17473)Geon Kim2018-08-221-3/+3 * swarm/network: bump bzz protocol version (#17449)Anton Evangelatov2018-08-212-2/+2 * swarm, swarm/network, swarm/pss: log error and fix logs (#17410)Anton Evangelatov2018-08-213-22/+21 * swarm/storage: cleanup task - remove bigger chunks (#17424)Anton Evangelatov2018-08-201-22/+45 * cmd/swarm: added swarm bootnodes (#17414)Elad2018-08-201-2/+0 * cmd/swarm, swarm: added access control functionality (#17404)Elad2018-08-1520-150/+897 * swarm/network, swarm/storage: validate chunk size (#17397)Anton Evangelatov2018-08-14