From 87b818badf0334b7745edfb5d1c360a2b87c279a Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 10 Jul 2014 16:08:42 -0300
Subject: [PATCH] remove soop exports

---
 browser/build.js            |  2 --
 browser/testdata.js         | 62 +++----------------------------------
 lib/Address.js              |  2 +-
 lib/BIP39.js                |  2 +-
 lib/BIP39WordlistEn.js      |  2 +-
 lib/Block.js                |  2 +-
 lib/Bloom.js                |  2 +-
 lib/Connection.js           |  2 +-
 lib/Curve.js                |  2 +-
 lib/ECIES.js                |  2 +-
 lib/HierarchicalKey.js      |  2 +-
 lib/Message.js              |  2 +-
 lib/Opcode.js               |  2 +-
 lib/PayPro.js               |  2 +-
 lib/Peer.js                 |  2 +-
 lib/PeerManager.js          |  2 +-
 lib/Point.js                |  2 +-
 lib/PrivateKey.js           |  2 +-
 lib/RpcClient.js            |  2 +-
 lib/SIN.js                  |  2 +-
 lib/SINKey.js               |  2 +-
 lib/Script.js               |  2 +-
 lib/ScriptInterpreter.js    |  2 +-
 lib/SecureRandom.js         |  2 +-
 lib/Transaction.js          |  2 +-
 lib/TransactionBuilder.js   |  2 +-
 lib/Wallet.js               |  2 +-
 lib/WalletKey.js            |  2 +-
 lib/browser/ECIES.js        |  2 +-
 lib/browser/Point.js        |  2 +-
 lib/browser/SecureRandom.js |  2 +-
 lib/common/ECIES.js         |  2 +-
 lib/common/SecureRandom.js  |  2 +-
 33 files changed, 35 insertions(+), 91 deletions(-)

diff --git a/browser/build.js b/browser/build.js
index f96b358..ffd62b9 100644
--- a/browser/build.js
+++ b/browser/build.js
@@ -2,7 +2,6 @@
 
 var fs = require('fs');
 var browserify = require('browserify');
-var browserPack = require('browser-pack');
 var exec = require('child_process').exec;
 var sys = require('sys');
 var puts = function(error, stdout, stderr) {
@@ -134,7 +133,6 @@ var createBitcore = function(opts) {
 
 var createTestData = function() {
   var bopts = {
-    pack: pack,
     debug: true,
     standalone: 'testdata',
     insertGlobals: true
diff --git a/browser/testdata.js b/browser/testdata.js
index 5922dfd..1520dc5 100644
--- a/browser/testdata.js
+++ b/browser/testdata.js
@@ -1,57 +1,4 @@
-require=
-// modules are defined as an array
-// [ module function, map of requireuires ]
-//
-// map of requireuires is short require name -> numeric require
-//
-// anything defined in a previous bundle is accessed via the
-// orig method which is the requireuire for previous bundles
-(function outer (modules, cache, entry) {
-    // Save the require from previous bundle to this closure if any
-    var previousRequire = typeof require == "function" && require;
-
-    function newRequire(name, jumped, inSkipCache){
-
-        var m, skipCache = inSkipCache; 
-        if (typeof name === 'string') {
-          if (name.charAt(0) === '!' ) {
-            name = name.substr(1);
-            skipCache=true;
-          }
-        }
-        if(skipCache || !cache[name]) {
-            if(!modules[name]) {
-                // if we cannot find the the module within our internal map or
-                // cache jump to the current global require ie. the last bundle
-                // that was added to the page.
-                var currentRequire = typeof require == "function" && require;
-                if (!jumped && currentRequire) return currentRequire(name, true);
-
-                // If there are other bundles on this page the require from the
-                // previous one is saved to 'previousRequire'. Repeat this as
-                // many times as there are bundles until the module is found or
-                // we exhaust the require chain.
-                if (previousRequire) return previousRequire(name, true);
-                throw new Error('Cannot find module \'' + name + '\'');
-            }
-
-            m = {exports:{}};
-            var nextSkipCache = inSkipCache ? false : skipCache;
-            if (!skipCache) cache[name] = m; 
-            skipCache = false;
-            modules[name][0].call(m.exports, function(x){
-                var id = modules[name][1][x];
-                return newRequire(id ? id : x, false, nextSkipCache);
-            },m,m.exports,outer,modules,cache,entry);
-        } 
-        return m ? m.exports:cache[name].exports;
-    }
-    for(var i=0;i<entry.length;i++) newRequire(entry[i]);
-
-    // Override the current require with this new one
-    return newRequire;
-})
-({1:[function(require,module,exports){
+require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 
 },{}],2:[function(require,module,exports){
 /*!
@@ -1174,7 +1121,6 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
     ? Uint8Array
     : Array
 
-	var ZERO   = '0'.charCodeAt(0)
 	var PLUS   = '+'.charCodeAt(0)
 	var SLASH  = '/'.charCodeAt(0)
 	var NUMBER = '0'.charCodeAt(0)
@@ -1283,9 +1229,9 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 		return output
 	}
 
-	module.exports.toByteArray = b64ToByteArray
-	module.exports.fromByteArray = uint8ToBase64
-}())
+	exports.toByteArray = b64ToByteArray
+	exports.fromByteArray = uint8ToBase64
+}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))
 
 },{}],4:[function(require,module,exports){
 exports.read = function(buffer, offset, isLE, mLen, nBytes) {
diff --git a/lib/Address.js b/lib/Address.js
index 58bc639..6614d23 100644
--- a/lib/Address.js
+++ b/lib/Address.js
@@ -188,4 +188,4 @@ Address.prototype.getScriptPubKey = function() {
 };
 
 
-module.exports = require('soop')(Address);
+module.exports = Address;
diff --git a/lib/BIP39.js b/lib/BIP39.js
index ff4120a..cf831dc 100644
--- a/lib/BIP39.js
+++ b/lib/BIP39.js
@@ -81,4 +81,4 @@ BIP39.mnemonic2seed = function(mnemonic, passphrase) {
   return buf;
 }
 
-module.exports = require('soop')(BIP39);
+module.exports = BIP39;
diff --git a/lib/BIP39WordlistEn.js b/lib/BIP39WordlistEn.js
index d669261..b6d834a 100644
--- a/lib/BIP39WordlistEn.js
+++ b/lib/BIP39WordlistEn.js
@@ -1,2 +1,2 @@
 var BIP39WordlistEn = ["abandon", "ability", "able", "about", "above", "absent", "absorb", "abstract", "absurd", "abuse", "access", "accident", "account", "accuse", "achieve", "acid", "acoustic", "acquire", "across", "act", "action", "actor", "actress", "actual", "adapt", "add", "addict", "address", "adjust", "admit", "adult", "advance", "advice", "aerobic", "affair", "afford", "afraid", "again", "age", "agent", "agree", "ahead", "aim", "air", "airport", "aisle", "alarm", "album", "alcohol", "alert", "alien", "all", "alley", "allow", "almost", "alone", "alpha", "already", "also", "alter", "always", "amateur", "amazing", "among", "amount", "amused", "analyst", "anchor", "ancient", "anger", "angle", "angry", "animal", "ankle", "announce", "annual", "another", "answer", "antenna", "antique", "anxiety", "any", "apart", "apology", "appear", "apple", "approve", "april", "arch", "arctic", "area", "arena", "argue", "arm", "armed", "armor", "army", "around", "arrange", "arrest", "arrive", "arrow", "art", "artefact", "artist", "artwork", "ask", "aspect", "assault", "asset", "assist", "assume", "asthma", "athlete", "atom", "attack", "attend", "attitude", "attract", "auction", "audit", "august", "aunt", "author", "auto", "autumn", "average", "avocado", "avoid", "awake", "aware", "away", "awesome", "awful", "awkward", "axis", "baby", "bachelor", "bacon", "badge", "bag", "balance", "balcony", "ball", "bamboo", "banana", "banner", "bar", "barely", "bargain", "barrel", "base", "basic", "basket", "battle", "beach", "bean", "beauty", "because", "become", "beef", "before", "begin", "behave", "behind", "believe", "below", "belt", "bench", "benefit", "best", "betray", "better", "between", "beyond", "bicycle", "bid", "bike", "bind", "biology", "bird", "birth", "bitter", "black", "blade", "blame", "blanket", "blast", "bleak", "bless", "blind", "blood", "blossom", "blouse", "blue", "blur", "blush", "board", "boat", "body", "boil", "bomb", "bone", "bonus", "book", "boost", "border", "boring", "borrow", "boss", "bottom", "bounce", "box", "boy", "bracket", "brain", "brand", "brass", "brave", "bread", "breeze", "brick", "bridge", "brief", "bright", "bring", "brisk", "broccoli", "broken", "bronze", "broom", "brother", "brown", "brush", "bubble", "buddy", "budget", "buffalo", "build", "bulb", "bulk", "bullet", "bundle", "bunker", "burden", "burger", "burst", "bus", "business", "busy", "butter", "buyer", "buzz", "cabbage", "cabin", "cable", "cactus", "cage", "cake", "call", "calm", "camera", "camp", "can", "canal", "cancel", "candy", "cannon", "canoe", "canvas", "canyon", "capable", "capital", "captain", "car", "carbon", "card", "cargo", "carpet", "carry", "cart", "case", "cash", "casino", "castle", "casual", "cat", "catalog", "catch", "category", "cattle", "caught", "cause", "caution", "cave", "ceiling", "celery", "cement", "census", "century", "cereal", "certain", "chair", "chalk", "champion", "change", "chaos", "chapter", "charge", "chase", "chat", "cheap", "check", "cheese", "chef", "cherry", "chest", "chicken", "chief", "child", "chimney", "choice", "choose", "chronic", "chuckle", "chunk", "churn", "cigar", "cinnamon", "circle", "citizen", "city", "civil", "claim", "clap", "clarify", "claw", "clay", "clean", "clerk", "clever", "click", "client", "cliff", "climb", "clinic", "clip", "clock", "clog", "close", "cloth", "cloud", "clown", "club", "clump", "cluster", "clutch", "coach", "coast", "coconut", "code", "coffee", "coil", "coin", "collect", "color", "column", "combine", "come", "comfort", "comic", "common", "company", "concert", "conduct", "confirm", "congress", "connect", "consider", "control", "convince", "cook", "cool", "copper", "copy", "coral", "core", "corn", "correct", "cost", "cotton", "couch", "country", "couple", "course", "cousin", "cover", "coyote", "crack", "cradle", "craft", "cram", "crane", "crash", "crater", "crawl", "crazy", "cream", "credit", "creek", "crew", "cricket", "crime", "crisp", "critic", "crop", "cross", "crouch", "crowd", "crucial", "cruel", "cruise", "crumble", "crunch", "crush", "cry", "crystal", "cube", "culture", "cup", "cupboard", "curious", "current", "curtain", "curve", "cushion", "custom", "cute", "cycle", "dad", "damage", "damp", "dance", "danger", "daring", "dash", "daughter", "dawn", "day", "deal", "debate", "debris", "decade", "december", "decide", "decline", "decorate", "decrease", "deer", "defense", "define", "defy", "degree", "delay", "deliver", "demand", "demise", "denial", "dentist", "deny", "depart", "depend", "deposit", "depth", "deputy", "derive", "describe", "desert", "design", "desk", "despair", "destroy", "detail", "detect", "develop", "device", "devote", "diagram", "dial", "diamond", "diary", "dice", "diesel", "diet", "differ", "digital", "dignity", "dilemma", "dinner", "dinosaur", "direct", "dirt", "disagree", "discover", "disease", "dish", "dismiss", "disorder", "display", "distance", "divert", "divide", "divorce", "dizzy", "doctor", "document", "dog", "doll", "dolphin", "domain", "donate", "donkey", "donor", "door", "dose", "double", "dove", "draft", "dragon", "drama", "drastic", "draw", "dream", "dress", "drift", "drill", "drink", "drip", "drive", "drop", "drum", "dry", "duck", "dumb", "dune", "during", "dust", "dutch", "duty", "dwarf", "dynamic", "eager", "eagle", "early", "earn", "earth", "easily", "east", "easy", "echo", "ecology", "economy", "edge", "edit", "educate", "effort", "egg", "eight", "either", "elbow", "elder", "electric", "elegant", "element", "elephant", "elevator", "elite", "else", "embark", "embody", "embrace", "emerge", "emotion", "employ", "empower", "empty", "enable", "enact", "end", "endless", "endorse", "enemy", "energy", "enforce", "engage", "engine", "enhance", "enjoy", "enlist", "enough", "enrich", "enroll", "ensure", "enter", "entire", "entry", "envelope", "episode", "equal", "equip", "era", "erase", "erode", "erosion", "error", "erupt", "escape", "essay", "essence", "estate", "eternal", "ethics", "evidence", "evil", "evoke", "evolve", "exact", "example", "excess", "exchange", "excite", "exclude", "excuse", "execute", "exercise", "exhaust", "exhibit", "exile", "exist", "exit", "exotic", "expand", "expect", "expire", "explain", "expose", "express", "extend", "extra", "eye", "eyebrow", "fabric", "face", "faculty", "fade", "faint", "faith", "fall", "false", "fame", "family", "famous", "fan", "fancy", "fantasy", "farm", "fashion", "fat", "fatal", "father", "fatigue", "fault", "favorite", "feature", "february", "federal", "fee", "feed", "feel", "female", "fence", "festival", "fetch", "fever", "few", "fiber", "fiction", "field", "figure", "file", "film", "filter", "final", "find", "fine", "finger", "finish", "fire", "firm", "first", "fiscal", "fish", "fit", "fitness", "fix", "flag", "flame", "flash", "flat", "flavor", "flee", "flight", "flip", "float", "flock", "floor", "flower", "fluid", "flush", "fly", "foam", "focus", "fog", "foil", "fold", "follow", "food", "foot", "force", "forest", "forget", "fork", "fortune", "forum", "forward", "fossil", "foster", "found", "fox", "fragile", "frame", "frequent", "fresh", "friend", "fringe", "frog", "front", "frost", "frown", "frozen", "fruit", "fuel", "fun", "funny", "furnace", "fury", "future", "gadget", "gain", "galaxy", "gallery", "game", "gap", "garage", "garbage", "garden", "garlic", "garment", "gas", "gasp", "gate", "gather", "gauge", "gaze", "general", "genius", "genre", "gentle", "genuine", "gesture", "ghost", "giant", "gift", "giggle", "ginger", "giraffe", "girl", "give", "glad", "glance", "glare", "glass", "glide", "glimpse", "globe", "gloom", "glory", "glove", "glow", "glue", "goat", "goddess", "gold", "good", "goose", "gorilla", "gospel", "gossip", "govern", "gown", "grab", "grace", "grain", "grant", "grape", "grass", "gravity", "great", "green", "grid", "grief", "grit", "grocery", "group", "grow", "grunt", "guard", "guess", "guide", "guilt", "guitar", "gun", "gym", "habit", "hair", "half", "hammer", "hamster", "hand", "happy", "harbor", "hard", "harsh", "harvest", "hat", "have", "hawk", "hazard", "head", "health", "heart", "heavy", "hedgehog", "height", "hello", "helmet", "help", "hen", "hero", "hidden", "high", "hill", "hint", "hip", "hire", "history", "hobby", "hockey", "hold", "hole", "holiday", "hollow", "home", "honey", "hood", "hope", "horn", "horror", "horse", "hospital", "host", "hotel", "hour", "hover", "hub", "huge", "human", "humble", "humor", "hundred", "hungry", "hunt", "hurdle", "hurry", "hurt", "husband", "hybrid", "ice", "icon", "idea", "identify", "idle", "ignore", "ill", "illegal", "illness", "image", "imitate", "immense", "immune", "impact", "impose", "improve", "impulse", "inch", "include", "income", "increase", "index", "indicate", "indoor", "industry", "infant", "inflict", "inform", "inhale", "inherit", "initial", "inject", "injury", "inmate", "inner", "innocent", "input", "inquiry", "insane", "insect", "inside", "inspire", "install", "intact", "interest", "into", "invest", "invite", "involve", "iron", "island", "isolate", "issue", "item", "ivory", "jacket", "jaguar", "jar", "jazz", "jealous", "jeans", "jelly", "jewel", "job", "join", "joke", "journey", "joy", "judge", "juice", "jump", "jungle", "junior", "junk", "just", "kangaroo", "keen", "keep", "ketchup", "key", "kick", "kid", "kidney", "kind", "kingdom", "kiss", "kit", "kitchen", "kite", "kitten", "kiwi", "knee", "knife", "knock", "know", "lab", "label", "labor", "ladder", "lady", "lake", "lamp", "language", "laptop", "large", "later", "latin", "laugh", "laundry", "lava", "law", "lawn", "lawsuit", "layer", "lazy", "leader", "leaf", "learn", "leave", "lecture", "left", "leg", "legal", "legend", "leisure", "lemon", "lend", "length", "lens", "leopard", "lesson", "letter", "level", "liar", "liberty", "library", "license", "life", "lift", "light", "like", "limb", "limit", "link", "lion", "liquid", "list", "little", "live", "lizard", "load", "loan", "lobster", "local", "lock", "logic", "lonely", "long", "loop", "lottery", "loud", "lounge", "love", "loyal", "lucky", "luggage", "lumber", "lunar", "lunch", "luxury", "lyrics", "machine", "mad", "magic", "magnet", "maid", "mail", "main", "major", "make", "mammal", "man", "manage", "mandate", "mango", "mansion", "manual", "maple", "marble", "march", "margin", "marine", "market", "marriage", "mask", "mass", "master", "match", "material", "math", "matrix", "matter", "maximum", "maze", "meadow", "mean", "measure", "meat", "mechanic", "medal", "media", "melody", "melt", "member", "memory", "mention", "menu", "mercy", "merge", "merit", "merry", "mesh", "message", "metal", "method", "middle", "midnight", "milk", "million", "mimic", "mind", "minimum", "minor", "minute", "miracle", "mirror", "misery", "miss", "mistake", "mix", "mixed", "mixture", "mobile", "model", "modify", "mom", "moment", "monitor", "monkey", "monster", "month", "moon", "moral", "more", "morning", "mosquito", "mother", "motion", "motor", "mountain", "mouse", "move", "movie", "much", "muffin", "mule", "multiply", "muscle", "museum", "mushroom", "music", "must", "mutual", "myself", "mystery", "myth", "naive", "name", "napkin", "narrow", "nasty", "nation", "nature", "near", "neck", "need", "negative", "neglect", "neither", "nephew", "nerve", "nest", "net", "network", "neutral", "never", "news", "next", "nice", "night", "noble", "noise", "nominee", "noodle", "normal", "north", "nose", "notable", "note", "nothing", "notice", "novel", "now", "nuclear", "number", "nurse", "nut", "oak", "obey", "object", "oblige", "obscure", "observe", "obtain", "obvious", "occur", "ocean", "october", "odor", "off", "offer", "office", "often", "oil", "okay", "old", "olive", "olympic", "omit", "once", "one", "onion", "online", "only", "open", "opera", "opinion", "oppose", "option", "orange", "orbit", "orchard", "order", "ordinary", "organ", "orient", "original", "orphan", "ostrich", "other", "outdoor", "outer", "output", "outside", "oval", "oven", "over", "own", "owner", "oxygen", "oyster", "ozone", "pact", "paddle", "page", "pair", "palace", "palm", "panda", "panel", "panic", "panther", "paper", "parade", "parent", "park", "parrot", "party", "pass", "patch", "path", "patient", "patrol", "pattern", "pause", "pave", "payment", "peace", "peanut", "pear", "peasant", "pelican", "pen", "penalty", "pencil", "people", "pepper", "perfect", "permit", "person", "pet", "phone", "photo", "phrase", "physical", "piano", "picnic", "picture", "piece", "pig", "pigeon", "pill", "pilot", "pink", "pioneer", "pipe", "pistol", "pitch", "pizza", "place", "planet", "plastic", "plate", "play", "please", "pledge", "pluck", "plug", "plunge", "poem", "poet", "point", "polar", "pole", "police", "pond", "pony", "pool", "popular", "portion", "position", "possible", "post", "potato", "pottery", "poverty", "powder", "power", "practice", "praise", "predict", "prefer", "prepare", "present", "pretty", "prevent", "price", "pride", "primary", "print", "priority", "prison", "private", "prize", "problem", "process", "produce", "profit", "program", "project", "promote", "proof", "property", "prosper", "protect", "proud", "provide", "public", "pudding", "pull", "pulp", "pulse", "pumpkin", "punch", "pupil", "puppy", "purchase", "purity", "purpose", "purse", "push", "put", "puzzle", "pyramid", "quality", "quantum", "quarter", "question", "quick", "quit", "quiz", "quote", "rabbit", "raccoon", "race", "rack", "radar", "radio", "rail", "rain", "raise", "rally", "ramp", "ranch", "random", "range", "rapid", "rare", "rate", "rather", "raven", "raw", "razor", "ready", "real", "reason", "rebel", "rebuild", "recall", "receive", "recipe", "record", "recycle", "reduce", "reflect", "reform", "refuse", "region", "regret", "regular", "reject", "relax", "release", "relief", "rely", "remain", "remember", "remind", "remove", "render", "renew", "rent", "reopen", "repair", "repeat", "replace", "report", "require", "rescue", "resemble", "resist", "resource", "response", "result", "retire", "retreat", "return", "reunion", "reveal", "review", "reward", "rhythm", "rib", "ribbon", "rice", "rich", "ride", "ridge", "rifle", "right", "rigid", "ring", "riot", "ripple", "risk", "ritual", "rival", "river", "road", "roast", "robot", "robust", "rocket", "romance", "roof", "rookie", "room", "rose", "rotate", "rough", "round", "route", "royal", "rubber", "rude", "rug", "rule", "run", "runway", "rural", "sad", "saddle", "sadness", "safe", "sail", "salad", "salmon", "salon", "salt", "salute", "same", "sample", "sand", "satisfy", "satoshi", "sauce", "sausage", "save", "say", "scale", "scan", "scare", "scatter", "scene", "scheme", "school", "science", "scissors", "scorpion", "scout", "scrap", "screen", "script", "scrub", "sea", "search", "season", "seat", "second", "secret", "section", "security", "seed", "seek", "segment", "select", "sell", "seminar", "senior", "sense", "sentence", "series", "service", "session", "settle", "setup", "seven", "shadow", "shaft", "shallow", "share", "shed", "shell", "sheriff", "shield", "shift", "shine", "ship", "shiver", "shock", "shoe", "shoot", "shop", "short", "shoulder", "shove", "shrimp", "shrug", "shuffle", "shy", "sibling", "sick", "side", "siege", "sight", "sign", "silent", "silk", "silly", "silver", "similar", "simple", "since", "sing", "siren", "sister", "situate", "six", "size", "skate", "sketch", "ski", "skill", "skin", "skirt", "skull", "slab", "slam", "sleep", "slender", "slice", "slide", "slight", "slim", "slogan", "slot", "slow", "slush", "small", "smart", "smile", "smoke", "smooth", "snack", "snake", "snap", "sniff", "snow", "soap", "soccer", "social", "sock", "soda", "soft", "solar", "soldier", "solid", "solution", "solve", "someone", "song", "soon", "sorry", "sort", "soul", "sound", "soup", "source", "south", "space", "spare", "spatial", "spawn", "speak", "special", "speed", "spell", "spend", "sphere", "spice", "spider", "spike", "spin", "spirit", "split", "spoil", "sponsor", "spoon", "sport", "spot", "spray", "spread", "spring", "spy", "square", "squeeze", "squirrel", "stable", "stadium", "staff", "stage", "stairs", "stamp", "stand", "start", "state", "stay", "steak", "steel", "stem", "step", "stereo", "stick", "still", "sting", "stock", "stomach", "stone", "stool", "story", "stove", "strategy", "street", "strike", "strong", "struggle", "student", "stuff", "stumble", "style", "subject", "submit", "subway", "success", "such", "sudden", "suffer", "sugar", "suggest", "suit", "summer", "sun", "sunny", "sunset", "super", "supply", "supreme", "sure", "surface", "surge", "surprise", "surround", "survey", "suspect", "sustain", "swallow", "swamp", "swap", "swarm", "swear", "sweet", "swift", "swim", "swing", "switch", "sword", "symbol", "symptom", "syrup", "system", "table", "tackle", "tag", "tail", "talent", "talk", "tank", "tape", "target", "task", "taste", "tattoo", "taxi", "teach", "team", "tell", "ten", "tenant", "tennis", "tent", "term", "test", "text", "thank", "that", "theme", "then", "theory", "there", "they", "thing", "this", "thought", "three", "thrive", "throw", "thumb", "thunder", "ticket", "tide", "tiger", "tilt", "timber", "time", "tiny", "tip", "tired", "tissue", "title", "toast", "tobacco", "today", "toddler", "toe", "together", "toilet", "token", "tomato", "tomorrow", "tone", "tongue", "tonight", "tool", "tooth", "top", "topic", "topple", "torch", "tornado", "tortoise", "toss", "total", "tourist", "toward", "tower", "town", "toy", "track", "trade", "traffic", "tragic", "train", "transfer", "trap", "trash", "travel", "tray", "treat", "tree", "trend", "trial", "tribe", "trick", "trigger", "trim", "trip", "trophy", "trouble", "truck", "true", "truly", "trumpet", "trust", "truth", "try", "tube", "tuition", "tumble", "tuna", "tunnel", "turkey", "turn", "turtle", "twelve", "twenty", "twice", "twin", "twist", "two", "type", "typical", "ugly", "umbrella", "unable", "unaware", "uncle", "uncover", "under", "undo", "unfair", "unfold", "unhappy", "uniform", "unique", "unit", "universe", "unknown", "unlock", "until", "unusual", "unveil", "update", "upgrade", "uphold", "upon", "upper", "upset", "urban", "urge", "usage", "use", "used", "useful", "useless", "usual", "utility", "vacant", "vacuum", "vague", "valid", "valley", "valve", "van", "vanish", "vapor", "various", "vast", "vault", "vehicle", "velvet", "vendor", "venture", "venue", "verb", "verify", "version", "very", "vessel", "veteran", "viable", "vibrant", "vicious", "victory", "video", "view", "village", "vintage", "violin", "virtual", "virus", "visa", "visit", "visual", "vital", "vivid", "vocal", "voice", "void", "volcano", "volume", "vote", "voyage", "wage", "wagon", "wait", "walk", "wall", "walnut", "want", "warfare", "warm", "warrior", "wash", "wasp", "waste", "water", "wave", "way", "wealth", "weapon", "wear", "weasel", "weather", "web", "wedding", "weekend", "weird", "welcome", "west", "wet", "whale", "what", "wheat", "wheel", "when", "where", "whip", "whisper", "wide", "width", "wife", "wild", "will", "win", "window", "wine", "wing", "wink", "winner", "winter", "wire", "wisdom", "wise", "wish", "witness", "wolf", "woman", "wonder", "wood", "wool", "word", "work", "world", "worry", "worth", "wrap", "wreck", "wrestle", "wrist", "write", "wrong", "yard", "year", "yellow", "you", "young", "youth", "zebra", "zero", "zone", "zoo"];
-module.exports = require('soop')(BIP39WordlistEn);
+module.exports = (BIP39WordlistEn);
diff --git a/lib/Block.js b/lib/Block.js
index abbf0d8..b129440 100644
--- a/lib/Block.js
+++ b/lib/Block.js
@@ -297,4 +297,4 @@ Block.prototype.getStandardizedObject =
     return block;
 };
 
-module.exports = require('soop')(Block);
+module.exports = Block;
diff --git a/lib/Bloom.js b/lib/Bloom.js
index f291467..484de33 100644
--- a/lib/Bloom.js
+++ b/lib/Bloom.js
@@ -111,4 +111,4 @@ Bloom.prototype.init = function(elements, FPRate) {
 };
 
 
-module.exports = require('soop')(Bloom);
+module.exports = Bloom;
diff --git a/lib/Connection.js b/lib/Connection.js
index 9698037..4c43148 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -563,4 +563,4 @@ Connection.prototype.parseMessage = function(command, payload) {
   return data;
 };
 
-module.exports = require('soop')(Connection);
+module.exports = (Connection);
diff --git a/lib/Curve.js b/lib/Curve.js
index 0e7ef35..9d45227 100644
--- a/lib/Curve.js
+++ b/lib/Curve.js
@@ -29,4 +29,4 @@ Curve.getN = function() {
   return n;
 };
 
-module.exports = require('soop')(Curve);
+module.exports = (Curve);
diff --git a/lib/ECIES.js b/lib/ECIES.js
index 7403fb6..b9f89e5 100644
--- a/lib/ECIES.js
+++ b/lib/ECIES.js
@@ -20,4 +20,4 @@ ECIES.symmetricDecrypt = function(key, encrypted) {
   return r;
 };
 
-module.exports = require('soop')(ECIES);
+module.exports = (ECIES);
diff --git a/lib/HierarchicalKey.js b/lib/HierarchicalKey.js
index 86f7258..728b9c2 100644
--- a/lib/HierarchicalKey.js
+++ b/lib/HierarchicalKey.js
@@ -354,4 +354,4 @@ function u64(f) {
   return uint(f, 8);
 }
 
-module.exports = require('soop')(HierarchicalKey);
+module.exports = HierarchicalKey;
diff --git a/lib/Message.js b/lib/Message.js
index 36b1982..f983e49 100644
--- a/lib/Message.js
+++ b/lib/Message.js
@@ -37,4 +37,4 @@ Message.magicHash = function(str) {
   return hash;
 };
 
-module.exports = require('soop')(Message);
+module.exports = (Message);
diff --git a/lib/Opcode.js b/lib/Opcode.js
index 0f9037c..c995385 100644
--- a/lib/Opcode.js
+++ b/lib/Opcode.js
@@ -163,4 +163,4 @@ Opcode.asList = function() {
   return keys;
 };
 
-module.exports = require('soop')(Opcode);
+module.exports = (Opcode);
diff --git a/lib/PayPro.js b/lib/PayPro.js
index fb1ed28..ed68806 100644
--- a/lib/PayPro.js
+++ b/lib/PayPro.js
@@ -242,4 +242,4 @@ PayPro.prototype.sinVerify = function() {
   return Message.verifyWithPubKey(pubkey, buf, sig);
 };
 
-module.exports = require('soop')(PayPro);
+module.exports = (PayPro);
diff --git a/lib/Peer.js b/lib/Peer.js
index c0528b3..dc5a8eb 100644
--- a/lib/Peer.js
+++ b/lib/Peer.js
@@ -53,4 +53,4 @@ Peer.prototype.toBuffer = function() {
   return put.buffer();
 };
 
-module.exports = require('soop')(Peer);
+module.exports = (Peer);
diff --git a/lib/PeerManager.js b/lib/PeerManager.js
index 4f8c7b3..0f8abb0 100644
--- a/lib/PeerManager.js
+++ b/lib/PeerManager.js
@@ -311,4 +311,4 @@ PeerManager.prototype.discover = function(options, callback) {
   return self;
 };
 
-module.exports = require('soop')(PeerManager);
+module.exports = (PeerManager);
diff --git a/lib/Point.js b/lib/Point.js
index aec5e65..8549a1c 100644
--- a/lib/Point.js
+++ b/lib/Point.js
@@ -49,4 +49,4 @@ Point.prototype.toUncompressedPubKey = function() {
   return pubkey;
 };
 
-module.exports = require('soop')(Point);
+module.exports = (Point);
diff --git a/lib/PrivateKey.js b/lib/PrivateKey.js
index 3f41c19..409ca1e 100644
--- a/lib/PrivateKey.js
+++ b/lib/PrivateKey.js
@@ -79,4 +79,4 @@ PrivateKey.prototype.network = function() {
   return answer;
 };
 
-module.exports = require('soop')(PrivateKey);
+module.exports = (PrivateKey);
diff --git a/lib/RpcClient.js b/lib/RpcClient.js
index 65f3139..220c5fb 100644
--- a/lib/RpcClient.js
+++ b/lib/RpcClient.js
@@ -218,4 +218,4 @@ function rpc(request, callback) {
 
 generateRPCMethods(RpcClient, callspec, rpc);
 
-module.exports = require('soop')(RpcClient);
+module.exports = (RpcClient);
diff --git a/lib/SIN.js b/lib/SIN.js
index 9b48bd7..1fb9998 100644
--- a/lib/SIN.js
+++ b/lib/SIN.js
@@ -60,4 +60,4 @@ SIN.prototype.validate = function() {
     if (this.data.length != 22) throw new Error('invalid data length');
   });
 };
-module.exports = require('soop')(SIN);
+module.exports = (SIN);
diff --git a/lib/SINKey.js b/lib/SINKey.js
index 989b4a6..ad80fb7 100644
--- a/lib/SINKey.js
+++ b/lib/SINKey.js
@@ -34,4 +34,4 @@ SINKey.prototype.storeObj = function() {
   return obj;
 };
 
-module.exports = require('soop')(SINKey);
+module.exports = (SINKey);
diff --git a/lib/Script.js b/lib/Script.js
index b1f8f1a..aef3380 100644
--- a/lib/Script.js
+++ b/lib/Script.js
@@ -640,4 +640,4 @@ Script.chunksToBuffer = function(chunks) {
 
 
 
-module.exports = require('soop')(Script);
+module.exports = (Script);
diff --git a/lib/ScriptInterpreter.js b/lib/ScriptInterpreter.js
index 8bbe45c..48bfc69 100644
--- a/lib/ScriptInterpreter.js
+++ b/lib/ScriptInterpreter.js
@@ -1082,4 +1082,4 @@ ScriptInterpreter.prototype.isCanonicalSignature = function(sig) {
   return true;
 };
 
-module.exports = require('soop')(ScriptInterpreter);
+module.exports = (ScriptInterpreter);
diff --git a/lib/SecureRandom.js b/lib/SecureRandom.js
index b24c7de..232ec2d 100644
--- a/lib/SecureRandom.js
+++ b/lib/SecureRandom.js
@@ -6,4 +6,4 @@ SecureRandom.getRandomBuffer = function(size) {
   return crypto.randomBytes(size);
 }
 
-module.exports = require('soop')(SecureRandom);
+module.exports = (SecureRandom);
diff --git a/lib/Transaction.js b/lib/Transaction.js
index 75f4607..fcc4333 100644
--- a/lib/Transaction.js
+++ b/lib/Transaction.js
@@ -627,4 +627,4 @@ Transaction.prototype.isComplete = function() {
 };
 
 
-module.exports = require('soop')(Transaction);
+module.exports = (Transaction);
diff --git a/lib/TransactionBuilder.js b/lib/TransactionBuilder.js
index 8227b1c..263e49c 100644
--- a/lib/TransactionBuilder.js
+++ b/lib/TransactionBuilder.js
@@ -1031,4 +1031,4 @@ TransactionBuilder.prototype.merge = function(b) {
   }
 };
 
-module.exports = require('soop')(TransactionBuilder);
+module.exports = (TransactionBuilder);
diff --git a/lib/Wallet.js b/lib/Wallet.js
index 93e2851..4c74c0b 100644
--- a/lib/Wallet.js
+++ b/lib/Wallet.js
@@ -136,4 +136,4 @@ Wallet.prototype.addScript = function(script) {
   return addrStr;
 };
 
-module.exports = require('soop')(Wallet);
+module.exports = (Wallet);
diff --git a/lib/WalletKey.js b/lib/WalletKey.js
index b7bf76f..6834f8c 100644
--- a/lib/WalletKey.js
+++ b/lib/WalletKey.js
@@ -47,4 +47,4 @@ WalletKey.prototype.fromObj = function(obj) {
   this.privKey.regenerateSync();
 };
 
-module.exports = require('soop')(WalletKey);
+module.exports = (WalletKey);
diff --git a/lib/browser/ECIES.js b/lib/browser/ECIES.js
index f83c577..657091b 100644
--- a/lib/browser/ECIES.js
+++ b/lib/browser/ECIES.js
@@ -33,4 +33,4 @@ ECIES.symmetricDecrypt = function(key, encrypted) {
   return decbuf;
 };
 
-module.exports = require('soop')(ECIES);
+module.exports = (ECIES);
diff --git a/lib/browser/Point.js b/lib/browser/Point.js
index d18c5bd..4e6aee3 100644
--- a/lib/browser/Point.js
+++ b/lib/browser/Point.js
@@ -118,4 +118,4 @@ Point.prototype.toUncompressedPubKey = function() {
   return pub;
 };
 
-module.exports = require('soop')(Point);
+module.exports = (Point);
diff --git a/lib/browser/SecureRandom.js b/lib/browser/SecureRandom.js
index 508efc3..b102d72 100644
--- a/lib/browser/SecureRandom.js
+++ b/lib/browser/SecureRandom.js
@@ -18,4 +18,4 @@ SecureRandom.getRandomBuffer = function(size) {
   return buf;
 };
 
-module.exports = require('soop')(SecureRandom);
+module.exports = (SecureRandom);
diff --git a/lib/common/ECIES.js b/lib/common/ECIES.js
index adbef15..e20641f 100644
--- a/lib/common/ECIES.js
+++ b/lib/common/ECIES.js
@@ -114,4 +114,4 @@ ECIES.prototype.getSfromPrivkey = function() {
   return S;
 };
 
-module.exports = require('soop')(ECIES);
+module.exports = (ECIES);
diff --git a/lib/common/SecureRandom.js b/lib/common/SecureRandom.js
index c49ce3c..a14908f 100644
--- a/lib/common/SecureRandom.js
+++ b/lib/common/SecureRandom.js
@@ -22,4 +22,4 @@ SecureRandom.getPseudoRandomBuffer = function(size) {
   return b;
 };
 
-module.exports = require('soop')(SecureRandom);
+module.exports = (SecureRandom);