diff --git a/package.json b/package.json index 7a9dc13..5f85108 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "precommit": "lint-staged && flow", "serve-poly-docs": "run-s documentation-copy-babel-ignored documentation-serve", "start": "run-p babel:watchsrc babel:watchtest", - "test": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit", + "test": "mocha lib/test/**/*_test.js --timeout 20000 --bail --exit", "testrpc": "ganache-cli -p 8545 --networkId 50 --gasLimit 15000000 -m \"${npm_package_config_mnemonic}\"", "truffle:compile": "truffle compile", "watch-lint": "esw -w --fix src test", diff --git a/src/artifacts/Compliance.json b/src/artifacts/Compliance.json index 74faa0a..54ef3d8 100644 --- a/src/artifacts/Compliance.json +++ b/src/artifacts/Compliance.json @@ -600,13 +600,7 @@ "type": "event" } ], - "networks": { - "50": { - "events": {}, - "links": {}, - "address": "0x74e6bdf40c8c15f5f78f4855e3db1ed2ffef0753" - } - }, + "networks": {}, "bytecode": "0x606060405260408051908101604052600181527f3100000000000000000000000000000000000000000000000000000000000000602082015260009080516200004d92916020019062000097565b5034156200005a57600080fd5b604051602080620025518339810160405280805160078054600160a060020a031916600160a060020a0392909216919091179055506200013c9050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10620000da57805160ff19168380011785556200010a565b828001600101855582156200010a579182015b828111156200010a578251825591602001919060010190620000ed565b50620001189291506200011c565b5090565b6200013991905b8082111562000118576000815560010162000123565b90565b612405806200014c6000396000f3006060604052600436106200010d5763ffffffff60e060020a60003504166306903e3e8114620001125780630c68f917146200015357806320a99bd0146200018c57806336fc75ee14620001eb5780633f74a3b7146200020d57806348a7f1f914620002355780634e317ead146200025d578063520eb6201462000282578063526cb80314620002aa5780635447c05d14620003215780635aa451e9146200034957806363ad0bbe14620003715780636424550214620003965780637137e07214620003ac578063a14c1c4f14620003ce578063a5d5ca5414620003fc578063bf1031d91462000412578063cb040e0b146200043a578063f7ab6ec614620004c7578063ffa1ad74146200052c575b600080fd5b34156200011e57600080fd5b62000137600160a060020a0360043516602435620005bc565b604051600160a060020a03909116815260200160405180910390f35b34156200015f57600080fd5b62000178600160a060020a0360043516602435620005f4565b604051901515815260200160405180910390f35b34156200019857600080fd5b620001ae600160a060020a036004351662000796565b6040518085600160a060020a0316600160a060020a0316815260200184815260200183815260200182815260200194505050505060405180910390f35b3415620001f757600080fd5b62000178600160a060020a0360043516620007c9565b34156200021957600080fd5b6200022362000808565b60405190815260200160405180910390f35b34156200024157600080fd5b62000178600160a060020a03600435811690602435166200080f565b34156200026957600080fd5b62000178600160a060020a036004351660243562000b29565b34156200028e57600080fd5b62000137600160a060020a036004351660ff6024351662000ccb565b3415620002b657600080fd5b620002cc600160a060020a036004351662000d0f565b60405160208082528190810183818151815260200191508051906020019060200280838360005b838110156200030d578082015183820152602001620002f3565b505050509050019250505060405180910390f35b34156200032d57600080fd5b62000178600160a060020a036004351660ff6024351662000da0565b34156200035557600080fd5b62000178600160a060020a036004351660ff6024351662000e49565b34156200037d57600080fd5b62000137600160a060020a036004351660243562000ec4565b3415620003a257600080fd5b6200013762000ee0565b3415620003b857600080fd5b620002cc600160a060020a036004351662000eef565b3415620003da57600080fd5b62000178600160a060020a036004351660243560443560ff6064351662000f7e565b34156200040857600080fd5b620001376200105b565b34156200041e57600080fd5b62000178600160a060020a03600435811690602435166200106a565b34156200044657600080fd5b620004c560046024813581810190830135806020601f8201819004810201604051908101604052818152929190602084018383808284375094965050843594602081013515159450600160a060020a036040820135169350606081013592506080810135915060a08101359060ff60c0820135169060e00135620012da565b005b3415620004d357600080fd5b620004ef600160a060020a036004351660ff602435166200157c565b604051600160a060020a03958616815293909416602084015260408084019290925260ff166060830152608082019290925260a001905180910390f35b34156200053857600080fd5b6200054262001601565b60405160208082528190810183818151815260200191508051906020019080838360005b838110156200058057808201518382015260200162000566565b50505050905090810190601f168015620005ae5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b600660205281600052604060002081815481101515620005d857fe5b600091825260209091200154600160a060020a03169150829050565b600160a060020a0382166000908152600660205260408120805482918291859081106200061d57fe5b6000918252602080832090910154600160a060020a039081168084526005909252604090922054909350811633909116146200065857600080fd5b84600160a060020a031663ff332ab7600060405160a001526040518163ffffffff1660e060020a02815260040160a060405180830381600087803b15156200069f57600080fd5b6102c65a03f11515620006b157600080fd5b5050506040518051906020018051906020018051906020018051906020018051905094505050505081600160a060020a031681600160a060020a031614151515620006fb57600080fd5b600160a060020a03851660009081526006602052604081208054869081106200072057fe5b60009182526020909120018054600160a060020a031916600160a060020a0392831617905585167f80d563d72c3c87450916133d7d74b48e1f9dfe7e5bc544d75fc44452ae51ea548386604051600160a060020a03909216825260208201526040908101905180910390a2506001949350505050565b60036020819052600091825260409091208054600182015460028301549290930154600160a060020a0390911692919084565b600254600090600160a060020a031615620007e357600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b6283d60081565b60025460009081908190819081908190600160a060020a0316638f9bbf16898360405160a0015260405160e060020a63ffffffff8416028152600160a060020a03909116600482015260240160a060405180830381600087803b15156200087557600080fd5b6102c65a03f115156200088757600080fd5b5050506040518051906020018051906020018051906020018051906020018051905050505094509450600085118015620008c95750600160a060020a03841615155b1515620008d557600080fd5b87600160a060020a031663ff332ab7600060405160a001526040518163ffffffff1660e060020a02815260040160a060405180830381600087803b15156200091c57600080fd5b6102c65a03f115156200092e57600080fd5b5050506040518051906020018051906020018051906020018051906020018051600754600160a060020a038e811660009081526005602052604080822054949c5092821698506313bdbb1997508b9650921693509091505160c0015260405160e060020a63ffffffff8516028152600160a060020a0392831660048201529116602482015260440160c060405180830381600087803b1515620009d057600080fd5b6102c65a03f11515620009e257600080fd5b5050506040518051906020018051906020018051906020018051906020018051906020018051600160a060020a038e8116600090815260056020526040902054939950909750338116921691909114945062000a42935050505057600080fd5b81151562000a4f57600080fd5b42811162000a5c57600080fd5b600160a060020a038816600090815260066020526040902080546001810162000a868382620016a3565b5060009182526020808320919091018054600160a060020a031916600160a060020a038b8116919091179091558a1680835260069091526040918290205490917fd620c7c8365e5ec2ce8805963b09c2b4026ae85291bdef77ecc5eed38fd4bccf918a913391600019019051600160a060020a039384168152919092166020820152604080820192909252606001905180910390a2506001979650505050505050565b600160a060020a03821660009081526004602052604081208054829182918590811062000b5257fe5b6000918252602080832090910154600160a060020a0390811680845260039092526040909220549093508116339091161462000b8d57600080fd5b84600160a060020a031663ff332ab7600060405160a001526040518163ffffffff1660e060020a02815260040160a060405180830381600087803b151562000bd457600080fd5b6102c65a03f1151562000be657600080fd5b5050506040518051906020018051906020018051906020018051906020018051905050505050905081600160a060020a031681600160a060020a03161415151562000c3057600080fd5b600160a060020a038516600090815260046020526040812080548690811062000c5557fe5b60009182526020909120018054600160a060020a031916600160a060020a0392831617905585167fb769e4c5428802890514f8d7bb0b898bc9b974bdd22764c602e14a1083768a9d8386604051600160a060020a03909216825260208201526040908101905180910390a2506001949350505050565b600160a060020a0382166000908152600460205260408120805460ff841690811062000cf357fe5b600091825260209091200154600160a060020a03169392505050565b62000d19620016cf565b6006600083600160a060020a0316600160a060020a0316815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801562000d9457602002820191906000526020600020905b8154600160a060020a0316815260019091019060200180831162000d75575b50505050509050919050565b600160a060020a0333811660009081526004602052604081208054919285169160ff851690811062000dce57fe5b600091825260209091200154600160a060020a03161462000dee57600080fd5b600160a060020a038316600090815260036020526040902060040180546001810162000e1b8382620016a3565b5060009182526020909120018054600160a060020a03191633600160a060020a031617905550600192915050565b600160a060020a0333811660009081526006602052604081208054919285169160ff851690811062000e7757fe5b600091825260209091200154600160a060020a03161462000e9757600080fd5b600160a060020a038316600090815260056020526040902060040180546001810162000e1b8382620016a3565b600460205281600052604060002081815481101515620005d857fe5b600254600160a060020a031681565b62000ef9620016cf565b6004600083600160a060020a0316600160a060020a0316815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801562000d9457602002820191906000526020600020908154600160a060020a0316815260019091019060200180831162000d755750505050509050919050565b600160a060020a038481166000908152600560205260408120549091161562000fa657600080fd5b600160a060020a038516151562000fbc57600080fd5b60008260ff1611801562000fd4575060648260ff1611155b151562000fe057600080fd5b6283d60083101562000ff157600080fd5b6000841162000fff57600080fd5b50600160a060020a0393841660009081526005602052604090208054600160a060020a0319163390951694909417845560018085019390935560028401919091556003909201805460ff191660ff939093169290921790915590565b600754600160a060020a031681565b600254600090819081908190600160a060020a0316638f9bbf16878360405160a0015260405160e060020a63ffffffff8416028152600160a060020a03909116600482015260240160a060405180830381600087803b1515620010cc57600080fd5b6102c65a03f11515620010de57600080fd5b5050506040518051906020018051906020018051906020018051906020018051905050505092509250600083118015620011205750600160a060020a03821615155b15156200112c57600080fd5b600160a060020a038516600090815260036020819052604090912001544290116200115657600080fd5b600160a060020a038581166000908152600360205260409020543382169116146200118057600080fd5b60018054600160a060020a031916600160a060020a0387811691909117918290551663bc54f56f6000604051604001526040518163ffffffff1660e060020a0281526004016040805180830381600087803b1515620011de57600080fd5b6102c65a03f11515620011f057600080fd5b5050506040518051906020018051925050508015156200120f57600080fd5b600160a060020a0386166000908152600460205260409020805460018101620012398382620016a3565b5060009182526020808320919091018054600160a060020a031916600160a060020a0389811691909117909155881680835260049091526040918290205490917f7dc7363b57021a88aeaddf9a723471f646bb340108bd9818b570f220705d64959188913391600019019051600160a060020a039384168152919092166020820152604080820192909252606001905180910390a250600195945050505050565b6000600160a060020a0387161515620012f257600080fd5b6283d6008210156200130357600080fd5b338a8a8a8a8a8a8a8a8a62001317620016e1565b600160a060020a03808c168252604082018a905288151560608301528716608082015260a0810186905260c0810185905260e0810184905260ff83166101008201526101208101829052610140602082018181529082018b818151815260200191508051906020019080838360005b83811015620013a057808201518382015260200162001386565b50505050905090810190601f168015620013ce5780820380516001836020036101000a031916815260200191505b509b505050505050505050505050604051809103906000f0801515620013f357600080fd5b905060a06040519081016040528033600160a060020a0316815260200160008152602001600081526020018681526020016000604051805910620014345750595b90808252806020026020018201604052509052600160a060020a038216600090815260036020526040902081518154600160a060020a031916600160a060020a0391909116178155602082015181600101556040820151816002015560608201518160030155608082015181600401908051620014b6929160200190620016f2565b5090505033600160a060020a03167fc6638df9e2d426dfeade9e7dc116866d55c8c92e34e159eb7b670b2cf7700279828c604051600160a060020a038316815260406020820181815290820183818151815260200191508051906020019080838360005b83811015620015345780820151838201526020016200151a565b50505050905090810190601f168015620015625780820380516001836020036101000a031916815260200191505b50935050505060405180910390a250505050505050505050565b600160a060020a03821660009081526006602052604081208054829182918291829182919060ff8916908110620015af57fe5b600091825260208083209190910154600160a060020a0390811680845260059092526040909220805460028201546003830154600190930154939d919094169b5092995060ff16975095509350505050565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156200169b5780601f106200166f576101008083540402835291602001916200169b565b820191906000526020600020905b8154815290600101906020018083116200167d57829003601f168201915b505050505081565b815481835581811511620016ca57600083815260209020620016ca9181019083016200175e565b505050565b60206040519081016040526000815290565b604051610c3480620017a683390190565b8280548282559060005260206000209081019282156200174c579160200282015b828111156200174c5782518254600160a060020a031916600160a060020a03919091161782556020929092019160019091019062001713565b506200175a9291506200177e565b5090565b6200177b91905b808211156200175a576000815560010162001765565b90565b6200177b91905b808211156200175a578054600160a060020a0319168155600101620017855600606060405260408051908101604052600181527f31000000000000000000000000000000000000000000000000000000000000006020820152600090805161004b9291602001906101c9565b50341561005757600080fd5b604051610c34380380610c34833981016040528080519190602001805182019190602001805191906020018051919060200180519190602001805191906020018051919060200180519190602001805191906020018051915050600160a060020a038616158015906100d15750600160a060020a038a1615155b15156100dc57600080fd5b600083116100e957600080fd5b42841180156100f6575060015b151561010157600080fd5b60008260ff16118015610118575060648260ff1611155b151561012357600080fd5b6000811161013057600080fd5b60018054600160a060020a031916600160a060020a038c16179055600289805161015e9291602001906101c9565b506003979097556007805460ff199081169715159790971761010060a860020a031916610100600160a060020a039790971696909602959095179094556008929092556009805485169055600a55600b55600c805490921660ff909116179055600d55506102649050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061020a57805160ff1916838001178555610237565b82800160010185558215610237579182015b8281111561023757825182559160200191906001019061021c565b50610243929150610247565b5090565b61026191905b80821115610243576000815560010161024d565b90565b6109c1806102736000396000f3006060604052600436106100fb5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318037b788114610100578063219fd0101461012557806329dbdd771461014c578063506dc7e1146101625780638862d26a146101b45780638da5cb5b1461023e578063a12a6bb01461026d578063a23d20f414610280578063abb4108e14610296578063ae3d81b8146102e7578063b1cb0db3146102fd578063b20cc59014610310578063b74a326614610329578063bc54f56f1461033c578063c574a53c14610369578063d2f80c15146103f8578063f8d970b614610487578063ffa1ad74146104ab575b600080fd5b341561010b57600080fd5b6101136104be565b60405190815260200160405180910390f35b341561013057600080fd5b6101386104c4565b604051901515815260200160405180910390f35b341561015757600080fd5b6101386004356104cd565b341561016d57600080fd5b610175610550565b60405194855260ff9093166020850152604080850192909252600160a060020a03908116606085015291909116608083015260a0909101905180910390f35b34156101bf57600080fd5b6101c761057f565b60405160208082528190810183818151815260200191508051906020019080838360005b838110156102035780820151838201526020016101eb565b50505050905090810190601f1680156102305780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561024957600080fd5b61025161061d565b604051600160a060020a03909116815260200160405180910390f35b341561027857600080fd5b61025161062c565b341561028b57600080fd5b610138600435610640565b34156102a157600080fd5b6102e5600460248135818101908301358060208181020160405190810160405280939291908181526020018383602002808284375094965061065595505050505050565b005b34156102f257600080fd5b6101386004356106da565b341561030857600080fd5b6101136106ef565b341561031b57600080fd5b61013860ff600435166106f5565b341561033457600080fd5b61013861070a565b341561034757600080fd5b61034f61073c565b604051918252151560208201526040908101905180910390f35b341561037457600080fd5b6102e560046024813581810190830135806020818102016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375094965061075e95505050505050565b341561040357600080fd5b6102e560046024813581810190830135806020818102016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375094965061080395505050505050565b341561049257600080fd5b610138600435602435604435151560ff606435166108a3565b34156104b657600080fd5b6101c761092a565b60035481565b60075460ff1681565b6000808215156104dc57600080fd5b60015433600160a060020a039081169116146104f757600080fd5b5060088054908390557f36ea8189911f562dab2c41b38f706d6d0ccb80d135b0873b1ad84674dd2d2c9981844260405192835260208301919091526040808301919091526060909101905180910390a150600192915050565b600b54600c54600d5460015460075460ff90931692600160a060020a0391821691610100909104169091929394565b60028054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106155780601f106105ea57610100808354040283529160200191610615565b820191906000526020600020905b8154815290600101906020018083116105f857829003601f168201915b505050505081565b600154600160a060020a031681565b6007546101009004600160a060020a031681565b60056020526000908152604090205460ff1681565b60015460009033600160a060020a0390811691161461067357600080fd5b60095460ff161561068357600080fd5b5060005b81518110156106d6576001600660008484815181106106a257fe5b9060200190602002015160ff1681526020810191909152604001600020805460ff1916911515919091179055600101610687565b5050565b60046020526000908152604090205460ff1681565b600a5481565b60066020526000908152604090205460ff1681565b60015460009033600160a060020a0390811691161461072857600080fd5b506009805460ff1916600190811790915590565b60008042600a5411151561074f57600080fd5b505060085460095460ff169091565b60015460009033600160a060020a0390811691161461077c57600080fd5b815183511461078a57600080fd5b60095460ff161561079a57600080fd5b5060005b82518110156107fe578181815181106107b357fe5b90602001906020020151600460008584815181106107cd57fe5b9060200190602002015181526020810191909152604001600020805460ff191691151591909117905560010161079e565b505050565b60015460009033600160a060020a0390811691161461082157600080fd5b815183511461082f57600080fd5b60095460ff161561083f57600080fd5b5060005b82518110156107fe5781818151811061085857fe5b906020019060200201516005600085848151811061087257fe5b9060200190602002015181526020810191909152604001600020805460ff1916911515919091179055600101610843565b60008415156108b157600080fd5b60008581526004602052604090205460ff16806108dd575060008481526005602052604090205460ff16155b15156108e857600080fd5b60ff80831660009081526006602052604090205416151561090857600080fd5b60075460ff161561091f5782151561091f57600080fd5b506001949350505050565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106155780601f106105ea576101008083540402835291602001916106155600a165627a7a72305820b50e8cb2e127bbf53a49352345364fdb4194e6cc7e903d7b459a8e9929d6ee000029a165627a7a72305820641b574e73dc6d1039f7d835586d44b45f00c6ed6951a4b49b207edf70cbf0e20029", "sourceHash": "0x73112b4d942ca6e3bff5cddaf15a46fe7ecf522a1a4da28d35b285d421d4ecbd" } \ No newline at end of file diff --git a/src/artifacts/Customers.json b/src/artifacts/Customers.json index ffdc5a2..d87ac46 100644 --- a/src/artifacts/Customers.json +++ b/src/artifacts/Customers.json @@ -316,13 +316,7 @@ "type": "event" } ], - "networks": { - "50": { - "events": {}, - "links": {}, - "address": "0x78fad8e05b7e7f74fe26c35af4157bd83ed36066" - } - }, - "bytecode": "0x606060405260408051908101604052600181527f31000000000000000000000000000000000000000000000000000000000000006020820152600090805161004b929160200190610092565b50341561005757600080fd5b604051602080610c188339810160405280805160018054600160a060020a031916600160a060020a03929092169190911790555061012d9050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100d357805160ff1916838001178555610100565b82800160010185558215610100579182015b828111156101005782518255916020019190600101906100e5565b5061010c929150610110565b5090565b61012a91905b8082111561010c5760008155600101610116565b90565b610adc8061013c6000396000f30060606040526004361061008d5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416630787bc2781146100925780630ba24e4c1461015157806313bdbb19146101c15780631f54d80d1461022757806355f21eb71461026e57806362ad9bda1461031c5780636a1db1bf14610382578063ffa1ad7414610398575b600080fd5b341561009d57600080fd5b6100b1600160a060020a0360043516610422565b6040516020810184905260408101839052606081018290526080808252855460026101006001831615026000190190911604908201819052819060a08201908790801561013f5780601f106101145761010080835404028352916020019161013f565b820191906000526020600020905b81548152906001019060200180831161012257829003601f168201915b50509550505050505060405180910390f35b341561015c57600080fd5b610176600160a060020a0360043581169060243516610448565b604051978852602088019690965260408088019590955260ff90931660608701529015156080860152151560a085015260c084015260e0830191909152610100909101905180910390f35b34156101cc57600080fd5b6101e6600160a060020a036004358116906024351661049c565b604051958652602086019490945291151560408086019190915260ff9091166060850152901515608084015260a083019190915260c0909101905180910390f35b341561023257600080fd5b61025a600160a060020a036004351660243560443560ff60643516608435151560a4356104f4565b604051901515815260200160405180910390f35b341561027957600080fd5b61028d600160a060020a03600435166106ba565b60405160208101849052604081018390526060810182905260808082528190810186818151815260200191508051906020019080838360005b838110156102de5780820151838201526020016102c6565b50505050905090810190601f16801561030b5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b341561032757600080fd5b61025a60048035600160a060020a03169060446024803590810190830135806020601f82018190048102016040519081016040528181529291906020840183838082843750949650508435946020013593506107a492505050565b341561038d57600080fd5b61025a60043561091b565b34156103a357600080fd5b6103ab610965565b60405160208082528190810183818151815260200191508051906020019080838360005b838110156103e75780820151838201526020016103cf565b50505050905090810190601f1680156104145780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b600360208190526000918252604090912060018101546002820154928201549192909184565b60026020818152600093845260408085209091529183529120805460018201549282015460038301546004840154600590940154929493919260ff8083169361010084048216936201000090049091169188565b600160a060020a03918216600090815260026020908152604080832093909416825291909152208054600182015460038301546005909301549193909260ff6201000082048116938183169361010090930490911691565b600160a060020a033316600090815260036020526040812060020154151561051b57600080fd5b42821161052757600080fd5b600154600160a060020a033381811660009081526003602081905260408083209091015493909416936323b872dd938c9392909151602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a0393841660048201529190921660248201526044810191909152606401602060405180830381600087803b15156105c857600080fd5b6102c65a03f115156105d957600080fd5b5050506040518051905015156105ee57600080fd5b33600160a060020a038181166000908152600260209081526040808320938c16835292905281902088815560018101889055600381018054600590920186905561010060ff1990921660ff89161762ff0000191662010000881515021761ff0019169190911790557ff7f59b0f319f2c9b602cfadacf86ba70810de82e157ceb8a5c0ef1a977eb2c28918991879051600160a060020a03938416815291909216602082015260ff9091166040808301919091526060909101905180910390a15060019695505050505050565b6106c2610a03565b600160a060020a038216600090815260036020818152604080842060018082015460028084015496840154845489988998969794969095929488949383161561010002600019019092169290920491601f83018190048102019051908101604052809291908181526020018280546001816001161561010002031660029004801561078e5780601f106107635761010080835404028352916020019161078e565b820191906000526020600020905b81548152906001019060200180831161077157829003601f168201915b5050505050935093509350935093509193509193565b6000600160a060020a03851615156107bb57600080fd5b8215156107c757600080fd5b600160a060020a038516600090815260036020526040902060020154156107ed57600080fd5b608060405190810160409081528582524260208084019190915281830186905260608301859052600160a060020a038816600090815260039091522081518190805161083d929160200190610a15565b5060208201518160010155604082015160028201556060820151600390910155507f53ed589b931f3eef8f960ebedca42e6fd5943e9c28f6e5b35ac2e9b9dce97dff858585604051600160a060020a03841681526040810182905260606020820181815290820184818151815260200191508051906020019080838360005b838110156108d45780820151838201526020016108bc565b50505050905090810190601f1680156109015780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a1506001949350505050565b600160a060020a033316600090815260036020526040812060020154151561094257600080fd5b5033600160a060020a031660009081526003602081905260409091200155600190565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156109fb5780601f106109d0576101008083540402835291602001916109fb565b820191906000526020600020905b8154815290600101906020018083116109de57829003601f168201915b505050505081565b60206040519081016040526000815290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610a5657805160ff1916838001178555610a83565b82800160010185558215610a83579182015b82811115610a83578251825591602001919060010190610a68565b50610a8f929150610a93565b5090565b610aad91905b80821115610a8f5760008155600101610a99565b905600a165627a7a72305820985d03b8c4f824d44be2f72cfbcdeba05af39ed24571c4591e19c446a57df2200029", + "networks": {}, + "bytecode": "0x606060405260408051908101604052600181527f31000000000000000000000000000000000000000000000000000000000000006020820152600090805161004b929160200190610092565b50341561005757600080fd5b604051602080610c188339810160405280805160018054600160a060020a031916600160a060020a03929092169190911790555061012d9050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100d357805160ff1916838001178555610100565b82800160010185558215610100579182015b828111156101005782518255916020019190600101906100e5565b5061010c929150610110565b5090565b61012a91905b8082111561010c5760008155600101610116565b90565b610adc8061013c6000396000f30060606040526004361061008d5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416630787bc2781146100925780630ba24e4c1461015157806313bdbb19146101c15780631f54d80d1461022757806355f21eb71461026e57806362ad9bda1461031c5780636a1db1bf14610382578063ffa1ad7414610398575b600080fd5b341561009d57600080fd5b6100b1600160a060020a0360043516610422565b6040516020810184905260408101839052606081018290526080808252855460026101006001831615026000190190911604908201819052819060a08201908790801561013f5780601f106101145761010080835404028352916020019161013f565b820191906000526020600020905b81548152906001019060200180831161012257829003601f168201915b50509550505050505060405180910390f35b341561015c57600080fd5b610176600160a060020a0360043581169060243516610448565b604051978852602088019690965260408088019590955260ff90931660608701529015156080860152151560a085015260c084015260e0830191909152610100909101905180910390f35b34156101cc57600080fd5b6101e6600160a060020a036004358116906024351661049c565b604051958652602086019490945291151560408086019190915260ff9091166060850152901515608084015260a083019190915260c0909101905180910390f35b341561023257600080fd5b61025a600160a060020a036004351660243560443560ff60643516608435151560a4356104f4565b604051901515815260200160405180910390f35b341561027957600080fd5b61028d600160a060020a03600435166106ba565b60405160208101849052604081018390526060810182905260808082528190810186818151815260200191508051906020019080838360005b838110156102de5780820151838201526020016102c6565b50505050905090810190601f16801561030b5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b341561032757600080fd5b61025a60048035600160a060020a03169060446024803590810190830135806020601f82018190048102016040519081016040528181529291906020840183838082843750949650508435946020013593506107a492505050565b341561038d57600080fd5b61025a60043561091b565b34156103a357600080fd5b6103ab610965565b60405160208082528190810183818151815260200191508051906020019080838360005b838110156103e75780820151838201526020016103cf565b50505050905090810190601f1680156104145780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b600360208190526000918252604090912060018101546002820154928201549192909184565b60026020818152600093845260408085209091529183529120805460018201549282015460038301546004840154600590940154929493919260ff8083169361010084048216936201000090049091169188565b600160a060020a03918216600090815260026020908152604080832093909416825291909152208054600182015460038301546005909301549193909260ff6201000082048116938183169361010090930490911691565b600160a060020a033316600090815260036020526040812060020154151561051b57600080fd5b42821161052757600080fd5b600154600160a060020a033381811660009081526003602081905260408083209091015493909416936323b872dd938c9392909151602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a0393841660048201529190921660248201526044810191909152606401602060405180830381600087803b15156105c857600080fd5b6102c65a03f115156105d957600080fd5b5050506040518051905015156105ee57600080fd5b33600160a060020a038181166000908152600260209081526040808320938c16835292905281902088815560018101889055600381018054600590920186905561010060ff1990921660ff89161762ff0000191662010000881515021761ff0019169190911790557ff7f59b0f319f2c9b602cfadacf86ba70810de82e157ceb8a5c0ef1a977eb2c28918991879051600160a060020a03938416815291909216602082015260ff9091166040808301919091526060909101905180910390a15060019695505050505050565b6106c2610a03565b600160a060020a038216600090815260036020818152604080842060018082015460028084015496840154845489988998969794969095929488949383161561010002600019019092169290920491601f83018190048102019051908101604052809291908181526020018280546001816001161561010002031660029004801561078e5780601f106107635761010080835404028352916020019161078e565b820191906000526020600020905b81548152906001019060200180831161077157829003601f168201915b5050505050935093509350935093509193509193565b6000600160a060020a03851615156107bb57600080fd5b8215156107c757600080fd5b600160a060020a038516600090815260036020526040902060020154156107ed57600080fd5b608060405190810160409081528582524260208084019190915281830186905260608301859052600160a060020a038816600090815260039091522081518190805161083d929160200190610a15565b5060208201518160010155604082015160028201556060820151600390910155507f53ed589b931f3eef8f960ebedca42e6fd5943e9c28f6e5b35ac2e9b9dce97dff858585604051600160a060020a03841681526040810182905260606020820181815290820184818151815260200191508051906020019080838360005b838110156108d45780820151838201526020016108bc565b50505050905090810190601f1680156109015780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a1506001949350505050565b600160a060020a033316600090815260036020526040812060020154151561094257600080fd5b5033600160a060020a031660009081526003602081905260409091200155600190565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156109fb5780601f106109d0576101008083540402835291602001916109fb565b820191906000526020600020905b8154815290600101906020018083116109de57829003601f168201915b505050505081565b60206040519081016040526000815290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610a5657805160ff1916838001178555610a83565b82800160010185558215610a83579182015b82811115610a83578251825591602001919060010190610a68565b50610a8f929150610a93565b5090565b610aad91905b80821115610a8f5760008155600101610a99565b905600a165627a7a723058208c307ea6148755345cb5cf00c56af0b577af2cc91c63f85da8bedc7fa77901e50029", "sourceHash": "0x6d8a2cfd14da0c247f55ba645a650f1efcecd28ba36f7ff1044a8ff920bce3cf" } \ No newline at end of file diff --git a/src/artifacts/PolyTokenMock.json b/src/artifacts/PolyTokenMock.json index bd34441..a7ce1a6 100644 --- a/src/artifacts/PolyTokenMock.json +++ b/src/artifacts/PolyTokenMock.json @@ -240,13 +240,7 @@ "type": "event" } ], - "networks": { - "50": { - "events": {}, - "links": {}, - "address": "0xf46a4e110b8f07d2a97b98884c7e3270d1bba2cb" - } - }, + "networks": {}, "bytecode": "0x6060604052620f424060005560408051908101604052601081527f506f6c796d617468204e6574776f726b00000000000000000000000000000000602082015260019080516100529291602001906100b8565b506002805460ff1916601217905560408051908101604052600481527f504f4c5900000000000000000000000000000000000000000000000000000000602082015260039080516100a79291602001906100b8565b5034156100b357600080fd5b610153565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100f957805160ff1916838001178555610126565b82800160010185558215610126579182015b8281111561012657825182559160200191906001019061010b565b50610132929150610136565b5090565b61015091905b80821115610132576000815560010161013c565b90565b610701806101626000396000f3006060604052600436106100a35763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100a8578063095ea7b31461013257806318160ddd1461016857806323b872dd1461018d5780632570e31e146101b5578063313ce567146101d757806370a082311461020057806395d89b411461021f578063a9059cbb14610232578063dd62ed3e14610254575b600080fd5b34156100b357600080fd5b6100bb610279565b60405160208082528190810183818151815260200191508051906020019080838360005b838110156100f75780820151838201526020016100df565b50505050905090810190601f1680156101245780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561013d57600080fd5b610154600160a060020a0360043516602435610317565b604051901515815260200160405180910390f35b341561017357600080fd5b61017b610383565b60405190815260200160405180910390f35b341561019857600080fd5b610154600160a060020a0360043581169060243516604435610389565b34156101c057600080fd5b610154600435600160a060020a036024351661050b565b34156101e257600080fd5b6101ea610534565b60405160ff909116815260200160405180910390f35b341561020b57600080fd5b61017b600160a060020a036004351661053d565b341561022a57600080fd5b6100bb610558565b341561023d57600080fd5b610154600160a060020a03600435166024356105c3565b341561025f57600080fd5b61017b600160a060020a0360043581169060243516610682565b60018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561030f5780601f106102e45761010080835404028352916020019161030f565b820191906000526020600020905b8154815290600101906020018083116102f257829003601f168201915b505050505081565b600160a060020a03338116600081815260056020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60005481565b6000600160a060020a03831615156103a057600080fd5b600160a060020a0384166000908152600460205260409020548211156103c557600080fd5b600160a060020a03808516600090815260056020908152604080832033909416835292905220548211156103f857600080fd5b600160a060020a038416600090815260046020526040902054610421908363ffffffff6106ad16565b600160a060020a038086166000908152600460205260408082209390935590851681522054610456908363ffffffff6106bf16565b600160a060020a0380851660009081526004602090815260408083209490945587831682526005815283822033909316825291909152205461049e908363ffffffff6106ad16565b600160a060020a03808616600081815260056020908152604080832033861684529091529081902093909355908516917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a0316600090815260046020526040812080548301905580549091019055600190565b60025460ff1681565b600160a060020a031660009081526004602052604090205490565b60038054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561030f5780601f106102e45761010080835404028352916020019161030f565b600160a060020a0333166000908152600460205260408120546105ec908363ffffffff6106ad16565b600160a060020a033381166000908152600460205260408082209390935590851681522054610621908363ffffffff6106bf16565b600160a060020a0380851660008181526004602052604090819020939093559133909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260056020908152604080832093909416825291909152205490565b6000828211156106b957fe5b50900390565b6000828201838110156106ce57fe5b93925050505600a165627a7a7230582012fb3bc46ef2acef2c2c76f2937cff2fa9948a8e916246c91c81e948d6996f6d0029", "sourceHash": "0x3885ea26b961c0fe1d3f805f07d80024bb638f51ba420f1a92e03a06c800d938" } \ No newline at end of file diff --git a/src/artifacts/SecurityTokenRegistrar.json b/src/artifacts/SecurityTokenRegistrar.json index 9ad9e99..6afa7a2 100644 --- a/src/artifacts/SecurityTokenRegistrar.json +++ b/src/artifacts/SecurityTokenRegistrar.json @@ -222,13 +222,7 @@ "type": "event" } ], - "networks": { - "50": { - "events": {}, - "links": {}, - "address": "0xf0c61dcc2501336a4f5d1b89b4762f5500e1c1ea" - } - }, + "networks": {}, "bytecode": "0x606060405260408051908101604052600181527f31000000000000000000000000000000000000000000000000000000000000006020820152600090805161004b929160200190610152565b50341561005757600080fd5b604051606080620036bd83398101604052808051919060200180519190602001805160028054600160a060020a03808816600160a060020a031992831617909255600380548784169083161790556004805483851692169190911790819055919350169050806336fc75ee306000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff8416028152600160a060020a039091166004820152602401602060405180830381600087803b151561012357600080fd5b6102c65a03f1151561013457600080fd5b50505060405180519050151561014957600080fd5b505050506101ed565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061019357805160ff19168380011785556101c0565b828001600101855582156101c0579182015b828111156101c05782518255916020019190600101906101a5565b506101cc9291506101d0565b5090565b6101ea91905b808211156101cc57600081556001016101d6565b90565b6134c080620001fd6000396000f3006060604052600436106200008a5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416630ab763d081146200008f5780638f9bbf1614620000c157806395a13ff31462000187578063e4be782a146200019d578063eb5ba3b41462000203578063fb621f141462000219578063ffa1ad74146200026d575b600080fd5b34156200009b57600080fd5b620000a5620002fd565b604051600160a060020a03909116815260200160405180910390f35b3415620000cd57600080fd5b620000e3600160a060020a03600435166200030c565b604051858152600160a060020a038516602082015260ff80851660408301528216608082015260a06060820181815290820184818151815260200191508051906020019080838360005b83811015620001475780820151838201526020016200012d565b50505050905090810190601f168015620001755780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390f35b34156200019357600080fd5b620000a562000426565b3415620001a957600080fd5b62000201602460048035828101929082013591813591820191013560443560ff606435811690600160a060020a0360843581169160a4359160c435169060e43590610104358116906101243590610144351662000435565b005b34156200020f57600080fd5b620000a5620006a9565b34156200022557600080fd5b620000a560046024813581810190830135806020601f82018190048102016040519081016040528181529291906020840183838082843750949650620006b895505050505050565b34156200027957600080fd5b6200028362000732565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015620002c1578082015183820152602001620002a7565b50505050905090810190601f168015620002ef5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b600354600160a060020a031681565b60008060006200031b62000ad9565b600160a060020a038581166000908152600560209081526040808320805460018083015460038401546002948501805498999498948316977401000000000000000000000000000000000000000090930460ff9081169791969216948694610100908216150260001901169190910491601f8301819004810201905190810160405280929190818152602001828054600181600116156101000203166002900480156200040c5780601f10620003e0576101008083540402835291602001916200040c565b820191906000526020600020905b815481529060010190602001808311620003ee57829003601f168201915b505050505091509450945094509450945091939590929450565b600454600160a060020a031681565b60008060008b118015620004495750600088115b8015620004565750600086115b15156200046257600080fd5b60068d8d6040518083838082843782019150509250505090815260200160405190819003902054600160a060020a0316156200049d57600080fd5b42841015620004ab57600080fd5b600160a060020a03891615801590620004cc5750600160a060020a03871615155b1515620004d857600080fd5b60008e118015620004e9575060008c115b1515620004f557600080fd5b600254600160a060020a03169150816323b872dd3389896000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a0393841660048201529190921660248201526044810191909152606401602060405180830381600087803b15156200057e57600080fd5b6102c65a03f115156200059057600080fd5b5050506040518051905050620006108f8f8080601f01602080910402602001604051908101604052818152929190602084018383808284378201915050505050508e8e8080601f01602080910402602001604051908101604052818152929190602084018383808284378201915050505050508d8d8d8d8b8b8b620007d4565b90507fc3eb07233a5473892e6071fd19c4aee5bc262fc797cf4503f35d1d368b9a076a8d8d838c8b8b8b604051600160a060020a0380871660208301528581166040830152841660608201526080810183905260ff821660a082015260c080825281018790528060e0810189898082843782019150509850505050505050505060405180910390a1505050505050505050505050505050565b600254600160a060020a031681565b60006006826040518082805190602001908083835b60208310620006ee5780518252601f199092019160209182019101620006cd565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405190819003902054600160a060020a031692915050565b60008054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015620007cc5780601f10620007a057610100808354040283529160200191620007cc565b820191906000526020600020905b815481529060010190602001808311620007ae57829003601f168201915b505050505081565b60025460035460045460009283928d928d928d928d928d928d928c928c92600160a060020a0390811692811691166200080c62000aeb565b604081018a905260ff808a166060830152600160a060020a03808a16608084015260a0830189905260c0830188905290861660e083015284811661010083015283811661012083015282166101408201526101608082528190602082019082018e818151815260200191508051906020019080838360005b838110156200089e57808201518382015260200162000884565b50505050905090810190601f168015620008cc5780820380516001836020036101000a031916815260200191505b5083810382528d818151815260200191508051906020019080838360005b8381101562000904578082015183820152602001620008ea565b50505050905090810190601f168015620009325780820380516001836020036101000a031916815260200191505b509d5050505050505050505050505050604051809103906000f08015156200095957600080fd5b90508060068b6040518082805190602001908083835b60208310620009905780518252601f1990920191602091820191016200096f565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051908190039020805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905560a060405190810160409081528a8252600160a060020a03808a1660208085019190915260ff808d1684860152606085018f905289166080850152908416600090815260059091522081518155602082015160018201805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905560408201518160010160146101000a81548160ff021916908360ff16021790555060608201518160020190805162000aad92916020019062000afc565b506080820151600391909101805460ff191660ff909216919091179055509a9950505050505050505050565b60206040519081016040526000815290565b6040516128f38062000ba283390190565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1062000b3f57805160ff191683800117855562000b6f565b8280016001018555821562000b6f579182015b8281111562000b6f57825182559160200191906001019062000b52565b5062000b7d92915062000b81565b5090565b62000b9e91905b8082111562000b7d576000815560010162000b88565b905600606060405260408051908101604052600181527f3100000000000000000000000000000000000000000000000000000000000000602082015260009080516200004d92916020019062000261565b506011805461ffff19169055600060185534156200006a57600080fd5b604051620028f3380380620028f38339810160405280805182019190602001805182019190602001805191906020018051919060200180519190602001805191906020018051919060200180519190602001805191906020018051919060200180516007805460ff191660ff8c161790559150600690508b8051620000f492916020019062000261565b5060088a80516200010a92916020019062000261565b5060098054600160a060020a03808a16600160a060020a031992831681179093556012899055600a8c90556000928352600c6020526040928390208c90556001805487831690841617905560048054868316908416179055600280549185169190921617905560c0905190810160409081526000808352602080840189905260ff881683850152606084018290526080840182905260a08401829052600954600160a060020a0316825260169052208151815560208201518160010155604082015160028201805460ff191660ff92909216919091179055606082015181600301556080820151816004015560a0820151600591909101805460ff191691151591909117905550600160a060020a03871660007fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8b60405190815260200160405180910390a3505050505050505050505062000306565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10620002a457805160ff1916838001178555620002d4565b82800160010185558215620002d4579182015b82811115620002d4578251825591602001919060010190620002b7565b50620002e2929150620002e6565b5090565b6200030391905b80821115620002e25760008155600101620002ed565b90565b6125dd80620003166000396000f3006060604052600436106101c95763ffffffff60e060020a60003504166306fdde0381146101ce578063095ea7b3146102585780631402f80d1461028e57806318160ddd146102a757806323b872dd146102cc5780632eb4a7ab146102f45780632f3fecaa14610307578063313ce5671461031a5780633e045845146103435780633e127ab714610368578063424a89931461037b57806344337ea11461039457806344598c11146103b3578063475c5ed1146103c657806352a9039c146103e55780635c2930ad14610447578063682e1bb01461049757806370a08231146104aa578063764c6dd3146104c957806388026706146104e8578063881fae6c146105175780638da5cb5b1461052a5780638f59c0661461053d57806395d89b4114610562578063a12a6bb014610575578063a5d5ca5414610588578063a9059cbb1461059b578063ad5cd9e7146105bd578063b2ad3d44146105d0578063c89e4361146105e9578063d2871105146105fc578063d44343871461060f578063dd62ed3e14610622578063e2723a9214610647578063e43252d71461065a578063e4bbb4b014610679578063fc1eb4d11461068c578063ff332ab71461069f578063ffa1ad74146106ee575b600080fd5b34156101d957600080fd5b6101e1610701565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561021d578082015183820152602001610205565b50505050905090810190601f16801561024a5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561026357600080fd5b61027a600160a060020a036004351660243561079f565b604051901515815260200160405180910390f35b341561029957600080fd5b61027a60ff60043516610817565b34156102b257600080fd5b6102ba610bc5565b60405190815260200160405180910390f35b34156102d757600080fd5b61027a600160a060020a0360043581169060243516604435610bcb565b34156102ff57600080fd5b6102ba610d94565b341561031257600080fd5b61027a610d9a565b341561032557600080fd5b61032d610f2b565b60405160ff909116815260200160405180910390f35b341561034e57600080fd5b61027a600160a060020a0360043516602435604435610f34565b341561037357600080fd5b6102ba611242565b341561038657600080fd5b61027a60ff60043516611248565b341561039f57600080fd5b61027a600160a060020a03600435166118d1565b34156103be57600080fd5b61027a6119a2565b34156103d157600080fd5b6102ba600160a060020a03600435166119b0565b34156103f057600080fd5b610404600160a060020a03600435166119c2565b604051808781526020018681526020018560ff1660ff16815260200184815260200183815260200182151515158152602001965050505050505060405180910390f35b341561045257600080fd5b610466600160a060020a03600435166119fc565b604051600160a060020a039093168352901515602083015260ff166040808301919091526060909101905180910390f35b34156104a257600080fd5b61027a611a3f565b34156104b557600080fd5b6102ba600160a060020a0360043516611a48565b34156104d457600080fd5b61027a600160a060020a0360043516611a63565b34156104f357600080fd5b6104fb611cb1565b604051600160a060020a03909116815260200160405180910390f35b341561052257600080fd5b6102ba611cc0565b341561053557600080fd5b6104fb611cc6565b341561054857600080fd5b61027a600160a060020a0360043581169060243516611cd5565b341561056d57600080fd5b6101e1611cf5565b341561058057600080fd5b6104fb611d60565b341561059357600080fd5b6104fb611d6f565b34156105a657600080fd5b61027a600160a060020a0360043516602435611d7e565b34156105c857600080fd5b6102ba611eb6565b34156105db57600080fd5b61027a600435602435611ebc565b34156105f457600080fd5b6104fb611f3d565b341561060757600080fd5b6102ba611f4c565b341561061a57600080fd5b6104fb611f52565b341561062d57600080fd5b6102ba600160a060020a0360043581169060243516611f61565b341561065257600080fd5b6104fb611f8c565b341561066557600080fd5b61027a600160a060020a0360043516611f9b565b341561068457600080fd5b6104fb612255565b341561069757600080fd5b61027a612264565b34156106aa57600080fd5b6106b261249a565b604051600160a060020a03958616815293851660208501526040808501939093529084166060840152909216608082015260a001905180910390f35b34156106f957600080fd5b6101e16124c3565b60068054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107975780601f1061076c57610100808354040283529160200191610797565b820191906000526020600020905b81548152906001019060200180831161077a57829003601f168201915b505050505081565b60008115156107ad57600080fd5b600160a060020a033381166000818152600b6020908152604080832094881680845294909152908190208590557f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a35060015b92915050565b60095460009081908190819081908190819033600160a060020a0390811691161461084157600080fd5b60115460ff161561085157600080fd5b600254600160a060020a031663520eb620308a60006040516020015260405160e060020a63ffffffff8516028152600160a060020a03909216600483015260ff166024820152604401602060405180830381600087803b15156108b357600080fd5b6102c65a03f115156108c457600080fd5b5050506040518051965050600160a060020a03861615156108e457600080fd5b6003805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0388811691909117918290551663506dc7e1600060405160a001526040518163ffffffff1660e060020a02815260040160a060405180830381600087803b151561094f57600080fd5b6102c65a03f1151561096057600080fd5b5050506040518051906020018051906020018051906020018051906020018051600154959a5093985091965094509092508691600160a060020a031690506370a082313060006040516020015260405160e060020a63ffffffff8416028152600160a060020a039091166004820152602401602060405180830381600087803b15156109eb57600080fd5b6102c65a03f115156109fc57600080fd5b5050506040518051905010151515610a1357600080fd5b60c06040519081016040908152868252602080830186905260ff8716828401526000606084018190526080840181905260a08401819052600160a060020a03861681526016909152208151815560208201518160010155604082015160028201805460ff191660ff92909216919091179055606082015181600301556080820151816004015560a08201516005909101805491151560ff1990921691909117905550600d8054600160a060020a0380851673ffffffffffffffffffffffffffffffffffffffff1992831617909255600f8054848416921691909117905560025416635447c05d878a60006040516020015260405160e060020a63ffffffff8516028152600160a060020a03909216600483015260ff166024820152604401602060405180830381600087803b1515610b4a57600080fd5b6102c65a03f11515610b5b57600080fd5b505050604051805190505080600160a060020a031682600160a060020a03167fcef7a4d027af73bec668ac893bb66fc614c345b379e087731ad95a0fa56b576c88604051600160a060020a03909116815260200160405180910390a3506001979650505050505050565b600a5481565b600160a060020a038216600090815260106020526040812054819060a060020a900460ff168015610c1b5750600160a060020a03851660009081526010602052604090205460a060020a900460ff165b8015610c405750600160a060020a0385166000908152600c6020526040902054839010155b8015610c735750600160a060020a038086166000908152600b602090815260408083203390941683529290522054839010155b8015610c7f5750600083115b15610d875750600160a060020a038085166000818152600b6020908152604080832033909516835293815283822054928252600c90529190912054610cca908463ffffffff61252e16565b600160a060020a0386166000908152600c6020526040902055610cf3818463ffffffff61252e16565b600160a060020a038087166000908152600b6020908152604080832033851684528252808320949094559187168152600c9091522054610d39908463ffffffff61254016565b600160a060020a038086166000818152600c6020526040908190209390935591908716906000805160206125928339815191529086905190815260200160405180910390a360019150610d8c565b600091505b509392505050565b600e5481565b600954600090819033600160a060020a03908116911614610dba57600080fd5b60115460ff161515610dcb57600080fd5b601154610100900460ff1615610de057600080fd5b30600160a060020a03166370a082313360006040516020015260405160e060020a63ffffffff8416028152600160a060020a039091166004820152602401602060405180830381600087803b1515610e3757600080fd5b6102c65a03f11515610e4857600080fd5b5050506040518051600a5490925082149050610e6357600080fd5b600554600160a060020a03166000908152600c6020526040902054610e8e908263ffffffff61254016565b600554600160a060020a039081166000908152600c6020526040808220939093553390911681522054610ec7908263ffffffff61252e16565b600160a060020a033381166000908152600c602052604090819020929092556011805461ff001916610100179055600554600954908216929116906000805160206125928339815191529084905190815260200160405180910390a3600191505090565b60075460ff1681565b60055460009033600160a060020a03908116911614610f5257600080fd5b601154610100900460ff161515610f6857600080fd5b600160a060020a03841660009081526010602052604090205460a060020a900460ff161515610f9657600080fd5b6013544210158015610faa57506014544211155b1515610fb557600080fd5b600154600160a060020a03166323b872dd85308560006040516020015260405160e060020a63ffffffff8616028152600160a060020a0393841660048201529190921660248201526044810191909152606401602060405180830381600087803b151561102157600080fd5b6102c65a03f1151561103257600080fd5b50505060405180519050151561104757600080fd5b600a5460185461105d908563ffffffff61254016565b111561106857600080fd5b600954600160a060020a0316600090815260166020526040902054611093908363ffffffff61254016565b60125410156110a157600080fd5b600554600160a060020a03166000908152600c60205260409020546110cc908463ffffffff61252e16565b600554600160a060020a039081166000908152600c60205260408082209390935590861681522054611104908463ffffffff61254016565b600160a060020a038086166000818152600c6020526040908190209390935560055490929116906000805160206125928339815191529086905190815260200160405180910390a360185461115f908463ffffffff61254016565b601855600160a060020a03841660009081526017602052604090205461118b908363ffffffff61254016565b600160a060020a038086166000908152601760209081526040808320949094556009549092168152601690915220546111ca908363ffffffff61254016565b600954600160a060020a0390811660009081526016602052604090819020929092558516907feec71bead39c1146e3b882d2cac84a2510d46f95d646da6be6058e0652195627908590859042905180848152602001838152602001828152602001935050505060405180910390a25060019392505050565b60125481565b600d546000908190819081908190819033600160a060020a0390811691161461127057600080fd5b60115460ff161561128057600080fd5b600254600160a060020a031663f7ab6ec63089600060405160a0015260405160e060020a63ffffffff8516028152600160a060020a03909216600483015260ff16602482015260440160a060405180830381600087803b15156112e257600080fd5b6102c65a03f115156112f357600080fd5b5050506040518051906020018051906020018051906020018051906020018051949950929750909550935090915050600160a060020a038516151561133757600080fd5b600e54151561134557600080fd5b600d54600160a060020a0316151561135c57600080fd5b600d54600160a060020a0316600090815260166020526040902054611387908263ffffffff61254016565b600154600160a060020a03166370a082313060006040516020015260405160e060020a63ffffffff8416028152600160a060020a039091166004820152602401602060405180830381600087803b15156113e057600080fd5b6102c65a03f115156113f157600080fd5b505050604051805190501015151561140857600080fd5b6005805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0387811691909117918290554291166378e979256000604051602001526040518163ffffffff1660e060020a028152600401602060405180830381600087803b151561147557600080fd5b6102c65a03f1151561148657600080fd5b505050604051805190501180156115615750600554600160a060020a03166378e979256000604051602001526040518163ffffffff1660e060020a028152600401602060405180830381600087803b15156114e057600080fd5b6102c65a03f115156114f157600080fd5b5050506040518051600554909150600160a060020a0316633197cbb66000604051602001526040518163ffffffff1660e060020a028152600401602060405180830381600087803b151561154457600080fd5b6102c65a03f1151561155557600080fd5b50505060405180519050115b151561156c57600080fd5b60c06040519081016040908152828252602080830186905260ff8516828401526000606084018190526080840181905260a08401819052600160a060020a03881681526016909152208151815560208201518160010155604082015160028201805460ff191660ff92909216919091179055606082015181600301556080820151816004015560a0820151600591909101805460ff19169115159190911790555060606040519081016040908152600160a060020a033081168352600160208085019190915260058385018190525490911660009081526010909152208151815473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03919091161781556020820151815490151560a060020a0274ff0000000000000000000000000000000000000000199091161781556040820151815460ff9190911675010000000000000000000000000000000000000000000275ff0000000000000000000000000000000000000000001990911617905550600554600160a060020a03166378e979256000604051602001526040518163ffffffff1660e060020a028152600401602060405180830381600087803b151561172c57600080fd5b6102c65a03f1151561173d57600080fd5b505050604051805160135550600554600160a060020a0316633197cbb66000604051602001526040518163ffffffff1660e060020a028152600401602060405180830381600087803b151561179157600080fd5b6102c65a03f115156117a257600080fd5b5050506040518051601455506011805460ff19811660ff90911615179055600254600160a060020a0316635aa451e9868960006040516020015260405160e060020a63ffffffff8516028152600160a060020a03909216600483015260ff166024820152604401602060405180830381600087803b151561182257600080fd5b6102c65a03f1151561183357600080fd5b505050604051805190505083600160a060020a031685600160a060020a03167fe03c151e6a38ff8c4454a0b0c00da0f95ba9f92d329643cbcb3fdd5be1f1ca2c600560009054906101000a9004600160a060020a03166013546014546040518084600160a060020a0316600160a060020a03168152602001838152602001828152602001935050505060405180910390a35060019695505050505050565b60095460009033600160a060020a039081169116146118ef57600080fd5b600160a060020a03821660009081526010602052604090205460a060020a900460ff16151561191d57600080fd5b600160a060020a03821660009081526010602052604090819020805474ff0000000000000000000000000000000000000000191690557ffb3ba9b33ab51c752b3f64c3d60dbcbb3acb2b69834580594d2d3c39f0f13d3f903390849051600160a060020a039283168152911660208201526040908101905180910390a1506001919050565b601154610100900460ff1681565b60176020526000908152604090205481565b6016602052600090815260409020805460018201546002830154600384015460048501546005909501549394929360ff9283169391921686565b601060205260009081526040902054600160a060020a0381169060ff60a060020a8204811691750100000000000000000000000000000000000000000090041683565b60115460ff1681565b600160a060020a03166000908152600c602052604090205490565b33600160a060020a031660009081526010602052604081205460a060020a900460ff161515611a9157600080fd5b600d54600160a060020a03161515611aa857600080fd5b6014544211611ab657600080fd5b600160a060020a038216600090815260166020526040902060010154601454611ae49163ffffffff61254016565b4210611aef57600080fd5b600160a060020a0333811660009081526015602090815260408083209386168352929052205460ff1615611b2257600080fd5b600160a060020a033381166000818152601560209081526040808320948716808452948252808320805460ff191660011790559282526017815282822054938252601690522060030154611b7b9163ffffffff61254016565b600160a060020a038084166000818152601660205260408082206003018590556009549093168152918220549152611bca91611bbe90606463ffffffff61255616565b9063ffffffff61257a16565b600160a060020a0383166000908152601660205260409020600481018290556002015460ff169010611c1d57600160a060020a0382166000908152601660205260409020600501805460ff191660011790555b600160a060020a03821660009081526016602052604090819020600481015460028201546005909201547f32aae34dc20e1ddbf72ba489a7a2b73b82695d37f79d52a18f4ac93a68a0871393869360ff90811692169051600160a060020a039094168452602084019290925260ff1660408084019190915290151560608301526080909101905180910390a1506001919050565b600354600160a060020a031681565b60145481565b600954600160a060020a031681565b601560209081526000928352604080842090915290825290205460ff1681565b60088054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107975780601f1061076c57610100808354040283529160200191610797565b600f54600160a060020a031681565b600454600160a060020a031681565b600160a060020a03821660009081526010602052604081205460a060020a900460ff168015611dcc575033600160a060020a031660009081526010602052604090205460a060020a900460ff165b8015611df15750600160a060020a0333166000908152600c6020526040902054829010155b8015611dfd5750600082115b15611eae57600160a060020a0333166000908152600c6020526040902054611e2b908363ffffffff61252e16565b600160a060020a033381166000908152600c60205260408082209390935590851681522054611e60908363ffffffff61254016565b600160a060020a038085166000818152600c602052604090819020939093559133909116906000805160206125928339815191529085905190815260200160405180910390a3506001610811565b506000610811565b60135481565b600d5460009033600160a060020a0390811691161480611eea575060095433600160a060020a039081169116145b1515611ef557600080fd5b600e8390557f27d3a8ad107a1634478f1f2fab84ae66121aef6afee6231e4bb07921505361b3838360405191825260208201526040908101905180910390a150600192915050565b600d54600160a060020a031681565b60185481565b600254600160a060020a031681565b600160a060020a039182166000908152600b6020908152604080832093909416825291909152205490565b600554600160a060020a031681565b60095460009081908190819081908190819033600160a060020a03908116911614611fc557600080fd5b600454600f54600160a060020a03918216916313bdbb1991168a600060405160c0015260405160e060020a63ffffffff8516028152600160a060020a0392831660048201529116602482015260440160c060405180830381600087803b151561202d57600080fd5b6102c65a03f1151561203e57600080fd5b5050506040518051906020018051906020018051906020018051906020018051906020018051905095509550955095509550955081801561207e57504281115b151561208957600080fd5b600354600160a060020a031663f8d970b68787878760006040516020015260405160e060020a63ffffffff8716028152600481019490945260248401929092521515604483015260ff166064820152608401602060405180830381600087803b15156120f457600080fd5b6102c65a03f1151561210557600080fd5b50505060405180519050151561211a57600080fd5b60606040519081016040908152600160a060020a033381168352600160208085019190915260ff871683850152908b1660009081526010909152208151815473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03919091161781556020820151815490151560a060020a0274ff0000000000000000000000000000000000000000199091161781556040820151815460ff9190911675010000000000000000000000000000000000000000000275ff00000000000000000000000000000000000000000019909116179055507f224f127dbfee6923bf0b835148eb27199e5f8766952f7d2b34bce0c718298b07338985604051600160a060020a03938416815291909216602082015260ff9091166040808301919091526060909101905180910390a1506001979650505050505050565b600154600160a060020a031681565b600d54600090600160a060020a0316151561236957600154600954600160a060020a039182169163a9059cbb9116826370a082313060006040516020015260405160e060020a63ffffffff8416028152600160a060020a039091166004820152602401602060405180830381600087803b15156122e057600080fd5b6102c65a03f115156122f157600080fd5b5050506040518051905060006040516020015260405160e060020a63ffffffff8516028152600160a060020a0390921660048301526024820152604401602060405180830381600087803b151561234757600080fd5b6102c65a03f1151561235857600080fd5b505050604051805190509050612497565b600160a060020a03331660009081526016602052604090206001015460145401421161239457600080fd5b600160a060020a03331660009081526016602052604090206005015460ff16156123bd57600080fd5b600160a060020a033316600090815260166020526040812054116123e057600080fd5b600154600160a060020a033381811660009081526016602052604080822054939094169363a9059cbb939190516020015260405160e060020a63ffffffff8516028152600160a060020a0390921660048301526024820152604401602060405180830381600087803b151561245457600080fd5b6102c65a03f1151561246557600080fd5b50505060405180519050151561247a57600080fd5b50600160a060020a03331660009081526016602052604081205560015b90565b600354600d54600e54600554600f54600160a060020a0394851695938516949293918316921690565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107975780601f1061076c57610100808354040283529160200191610797565b60008282111561253a57fe5b50900390565b60008282018381101561254f57fe5b9392505050565b6000828202831580612572575082848281151561256f57fe5b04145b151561254f57fe5b600080828481151561258857fe5b049493505050505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a723058201921266f607f84fe27a20856d795094b356f4d76563a73751e6ad7d5c43776ad0029a165627a7a723058208d0d80272743dadaaff07e3f42ae2c6173b202213b7b1bc883764d84f67a684a0029", "sourceHash": "0xa3ec81f816a5035084734602ca368b97ceb8a51319080d996694ee7568ffce80" } \ No newline at end of file diff --git a/test/Compliance_test.js b/test/Compliance_test.js index aa21386..aa6f4d1 100644 --- a/test/Compliance_test.js +++ b/test/Compliance_test.js @@ -57,6 +57,7 @@ describe('Compliance wrapper', () => { securityToken, accounts[0], accounts[1], + expiryTime, ); @@ -234,13 +235,9 @@ describe('Compliance wrapper', () => { // STO variables const auditor = accounts[4]; - const startTime = new BigNumber( - Math.floor(new Date().getTime() / 1000) - ).plus(200); + const startTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(200); + const endTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(2592000); - const endTime = new BigNumber(Math.floor(new Date().getTime() / 1000)).plus( - 2592000, - ); // 1 Month duration await makeKYCProvider(customers, kycProvider); @@ -272,7 +269,7 @@ describe('Compliance wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(10000), + new BigNumber(15163975079), ); //this make example does setSTO and proposeSTO, and we will test below diff --git a/test/SecurityTokenRegistrar_test.js b/test/SecurityTokenRegistrar_test.js index a78aa04..9604005 100644 --- a/test/SecurityTokenRegistrar_test.js +++ b/test/SecurityTokenRegistrar_test.js @@ -9,13 +9,15 @@ import { makeSecurityToken, makeSecurityTokenRegistrar, } from './util/make_examples'; -import { makeWeb3Wrapper } from './util/web3'; +import { makeWeb3Wrapper, makeWeb3 } from './util/web3'; import SecurityToken from '../src/contract_wrappers/SecurityToken'; const { assert } = chai; describe('Registrar wrapper', () => { const web3Wrapper = makeWeb3Wrapper(); + const web3 = makeWeb3(); + const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000); let accounts; let polyToken; @@ -74,7 +76,7 @@ describe('Registrar wrapper', () => { const fee = 1000; const type = 1; const maxPoly = 100000; - const lockupPeriod = 1516397507 + 31557600; // one year from jan 19 2017 + const lockupPeriod = expiryTime + 31557600; // one year plus const quorum = 75; await polyToken.approve(owner, registrar.address, fee); @@ -171,7 +173,7 @@ describe('Registrar wrapper', () => { const fee = 1000; const type = 1; const maxPoly = 100000; - const lockupPeriod = 1516397507 + 31557600; // one year from jan 19 2017 + const lockupPeriod = expiryTime + 31557600; // one year from jan 19 2017 const quorum = 75; await polyToken.approve(owner, registrar.address, fee); diff --git a/test/SecurityToken_test.js b/test/SecurityToken_test.js index 2ada488..98e6c84 100644 --- a/test/SecurityToken_test.js +++ b/test/SecurityToken_test.js @@ -37,6 +37,7 @@ describe('SecurityToken wrapper', () => { let customers: Customers; let compliance: Compliance; let securityToken: SecurityToken; + const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000); before(async () => { accounts = await web3Wrapper.getAvailableAddressesAsync(); @@ -55,6 +56,7 @@ describe('SecurityToken wrapper', () => { securityToken, accounts[0], accounts[1], + expiryTime, ); // Fund four accounts. @@ -62,22 +64,27 @@ describe('SecurityToken wrapper', () => { new BigNumber(10).toPower(18).times(100000), accounts[0], ); + await polyToken.generateNewTokens( new BigNumber(10).toPower(18).times(100000), accounts[1], ); + await polyToken.generateNewTokens( new BigNumber(10).toPower(18).times(100000), accounts[2], ); + await polyToken.generateNewTokens( new BigNumber(10).toPower(18).times(100000), accounts[3], ); + await polyToken.generateNewTokens( new BigNumber(10).toPower(18).times(100000), accounts[4], ); + }); it('getName, getDecimals', async () => { @@ -93,6 +100,7 @@ describe('SecurityToken wrapper', () => { ); }); + it('getSymbol, getOwnerAddress, getTotalSupply', async () => { assert.equal( await securityToken.getSymbol(), @@ -145,8 +153,8 @@ describe('SecurityToken wrapper', () => { const legalDelegate = accounts[2]; const kycProvider = accounts[1]; const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000); - await makeKYCProvider(customers, kycProvider, expiryTime); + await makeKYCProvider(customers, kycProvider, expiryTime); await makeLegalDelegate(polyToken, customers, kycProvider, legalDelegate, expiryTime); const templateAddress = await makeTemplateWithFinalized( compliance, @@ -178,7 +186,7 @@ describe('SecurityToken wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(100), + new BigNumber(15163975079), ); await securityToken.addToWhitelist(owner, investor); @@ -274,7 +282,7 @@ describe('SecurityToken wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(10000), + new BigNumber(15163975079), ); const offering = await makeSecurityTokenOffering( @@ -343,7 +351,7 @@ describe('SecurityToken wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(50000), + new BigNumber(15163975079), ); // addToWhiteList @@ -448,7 +456,7 @@ describe('SecurityToken wrapper', () => { ); // Start the offering await securityToken.startSecurityTokenOffering(owner); - + assert.equal( await securityToken.getBalanceOf(offering.address), 1234567, @@ -679,7 +687,7 @@ describe('SecurityToken wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(100), + new BigNumber(15163975079), ); await securityToken.addToWhitelist(owner, investor); @@ -766,17 +774,13 @@ describe('SecurityToken wrapper', () => { const owner = accounts[0]; const legalDelegate = accounts[2]; const kycProvider = accounts[1]; - const investor = accounts[4]; + const investor = accounts[3]; const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000); // STO variables const auditor = accounts[4]; - const startTime = new BigNumber( - Math.floor(new Date().getTime() / 1000) - ).plus(200); + const startTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(200); + const endTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(2592000); - const endTime = new BigNumber(Math.floor(new Date().getTime() / 1000)).plus( - 2592000, - ); // 1 Month duration await makeKYCProvider(customers, kycProvider, expiryTime); @@ -808,7 +812,7 @@ describe('SecurityToken wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(10000), + new BigNumber(15163975079), ); const offering = await makeSecurityTokenOffering( @@ -845,7 +849,7 @@ describe('SecurityToken wrapper', () => { let subscriptionID7 = null; const eventName7 = 'LogTokenIssued'; const indexedFilterValues7 = null; - + // The callback is passed into the filter.watch function, and is operated on when a new event comes in const logTokenIssuedArgsPromise = new Promise((resolve, reject) => { subscriptionID7 = securityToken.subscribe( @@ -878,7 +882,7 @@ describe('SecurityToken wrapper', () => { 'CA', 'investor', true, - new BigNumber(Math.floor(new Date().getTime() / 1000)).plus(100), + new BigNumber(15163975079), ); await securityToken.addToWhitelist(owner, investor); diff --git a/test/Template_test.js b/test/Template_test.js index 8e748cd..e2398ae 100644 --- a/test/Template_test.js +++ b/test/Template_test.js @@ -1,14 +1,18 @@ import chai from 'chai'; import 'mocha'; +import BigNumber from 'bignumber.js'; + import { makeTemplateDirectCall } from './util/make_examples'; -import { makeWeb3Wrapper } from './util/web3'; +import { makeWeb3Wrapper, makeWeb3 } from './util/web3'; import { fakeBytes32, fakeAddress } from './util/fake'; const { assert } = chai; describe('Template wrapper', () => { const web3Wrapper = makeWeb3Wrapper(); + const web3 = makeWeb3(); + const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000); let accounts; let template; @@ -25,10 +29,12 @@ describe('Template wrapper', () => { const accredited = false; const KYC = accounts[1]; const details = 'this would be hashes'; - const expires = 1602288000; + const expires = expiryTime.toNumber()// + 1000000; + const fee = 1000; const quorum = 10; const vestingPeriod = 8888888; + const expiryTime2 = new BigNumber(web3.eth.getBlock('latest').timestamp); template = await makeTemplateDirectCall( web3Wrapper, @@ -38,7 +44,7 @@ describe('Template wrapper', () => { accredited, KYC, details, - expires, + expires + 10000, fee, quorum, vestingPeriod, @@ -305,10 +311,9 @@ describe('Template wrapper', () => { it('getTemplateExpiry', async () => { const expiry = await template.getTemplateExpiry(); - const expireTime = 1602288000; - assert.equal( + assert.isAbove( expiry, - expireTime, + 0, 'Expiry was not correctly checked and compared', ); }); diff --git a/test/util/make_examples.js b/test/util/make_examples.js index 1d24c1e..5a9c83b 100644 --- a/test/util/make_examples.js +++ b/test/util/make_examples.js @@ -217,7 +217,7 @@ export async function makeTemplateDirectCall( accredited, KYC, details, - expires, + expires + 15067386, fee, quorum, vestingPeriod, @@ -317,6 +317,7 @@ export async function makeSecurityTokenThroughRegistrar( securityToken: SecurityToken, account: string, hostAccount: string, + currentBlockTime: number, ) { const contractTemplate = contract(securityTokenRegistrarArtifact); contractTemplate.setProvider(web3Wrapper.getCurrentProvider()); @@ -345,7 +346,7 @@ export async function makeSecurityTokenThroughRegistrar( const fee = 1000; const type = 1; const maxPoly = 100000; - const lockupPeriod = 1516397507 + 31557600; // one year from jan 19 2017 + const lockupPeriod = currentBlockTime + 31557600; // plus one year const quorum = 75; // Fund two accounts.