Skip to content

Commit

Permalink
Rinkeby redeployment
Browse files Browse the repository at this point in the history
  • Loading branch information
@protinam
protinam committed Jan 22, 2018
1 parent e20e8ed commit 87da7ae
Show file tree
Hide file tree
Showing 31 changed files with 6,487 additions and 6,171 deletions.
14 changes: 7 additions & 7 deletions build/contracts/ArrayUtils.json
View file
@@ -1,11 +1,11 @@
{
"contractName": "ArrayUtils",
"abi": [],
"bytecode": "0x60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a7230582033305b3e283bee6bec3607306d89142e15c68720184304ca7a1e60c51882abe10029",
"deployedBytecode": "0x6060604052600080fd00a165627a7a7230582033305b3e283bee6bec3607306d89142e15c68720184304ca7a1e60c51882abe10029",
"bytecode": "0x60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a7230582030df2041929e76104e1d5ededfcbdef1bc42654f4d851e6bcca2bd2fb5a336d80029",
"deployedBytecode": "0x6060604052600080fd00a165627a7a7230582030df2041929e76104e1d5ededfcbdef1bc42654f4d851e6bcca2bd2fb5a336d80029",
"sourceMap": "238:2124:8:-;;;;;;;;;;;;;;;;;",
"deployedSourceMap": "238:2124:8:-;;;;;",
"source": "/*\n\n Various functions for manipulating arrays in Solidity.\n This library is completely inlined and does not need to be deployed or linked.\n\n*/\n\npragma solidity 0.4.18;\n\n/**\n * @title ArrayUtils\n * @author Project Wyvern Developers\n */\nlibrary ArrayUtils {\n\n /**\n * Replace bytes in an array with bytes in another array, guarded by a \"bytemask\"\n * \n * @dev Mask must be 1/8th the size of the byte array. A 1-bit means the byte array can be changed.\n * @param array The original array\n * @param desired The target array\n * @param mask The mask specifying which bytes can be changed\n * @return The updated byte array (the parameter will be modified inplace)\n */\n function guardedArrayReplace(bytes array, bytes desired, bytes mask)\n pure\n internal\n returns (bytes)\n {\n byte[8] memory bitmasks = [byte(2 ** 7), byte(2 ** 6), byte(2 ** 5), byte(2 ** 4), byte(2 ** 3), byte(2 ** 2), byte(2 ** 1), byte(2 ** 0)];\n require(array.length == desired.length);\n require(mask.length == array.length / 8);\n for (uint i = 0; i < array.length; i++ ) {\n /* 1-bit means value can be changed. */\n bool masked = (mask[i / 8] & bitmasks[i % 8]) == 0;\n array[i] = masked ? array[i] : desired[i];\n }\n return array;\n }\n\n /**\n * Test if two arrays are equal\n * \n * @dev Arrays must be of equal length, otherwise will return false\n * @param a First array\n * @param b Second array\n * @return Whether or not all bytes in the arrays are equal\n */\n function arrayEq(bytes a, bytes b)\n pure\n internal\n returns (bool)\n {\n if (a.length != b.length) {\n return false;\n }\n for (uint i = 0; i < a.length; i++) {\n if (a[i] != b[i]) {\n return false;\n }\n }\n return true;\n }\n\n /**\n * Convert an address to bytes\n *\n * @param a Address to convert\n * @return The address as a byte array\n */\n function toBytes(address a)\n pure\n internal\n returns (bytes b)\n {\n assembly {\n let m := mload(0x40)\n mstore(add(m, 20), xor(0x140000000000000000000000000000000000000000, a))\n mstore(0x40, add(m, 52))\n b := m\n }\n }\n\n}\n",
"source": "/*\n\n Various functions for manipulating arrays in Solidity.\n This library is completely inlined and does not need to be deployed or linked.\n\n*/\n\npragma solidity 0.4.18;\n\n/**\n * @title ArrayUtils\n * @author Project Wyvern Developers\n */\nlibrary ArrayUtils {\n\n /**\n * Replace bytes in an array with bytes in another array, guarded by a \"bytemask\"\n * \n * @dev Mask must be 1/8th the size of the byte array. A 1-bit means the byte array can be changed.\n * @param array The original array\n * @param desired The target array\n * @param mask The mask specifying which bytes can be changed\n * @return The updated byte array (the parameter will be modified inplace)\n */\n function guardedArrayReplace(bytes array, bytes desired, bytes mask)\n pure\n internal\n returns (bytes)\n {\n byte[8] memory bitmasks = [byte(2 ** 7), byte(2 ** 6), byte(2 ** 5), byte(2 ** 4), byte(2 ** 3), byte(2 ** 2), byte(2 ** 1), byte(2 ** 0)];\n require(array.length == desired.length);\n require(mask.length >= array.length / 8);\n for (uint i = 0; i < array.length; i++ ) {\n /* 1-bit means value can be changed. */\n bool masked = (mask[i / 8] & bitmasks[i % 8]) == 0;\n array[i] = masked ? array[i] : desired[i];\n }\n return array;\n }\n\n /**\n * Test if two arrays are equal\n * \n * @dev Arrays must be of equal length, otherwise will return false\n * @param a First array\n * @param b Second array\n * @return Whether or not all bytes in the arrays are equal\n */\n function arrayEq(bytes a, bytes b)\n pure\n internal\n returns (bool)\n {\n if (a.length != b.length) {\n return false;\n }\n for (uint i = 0; i < a.length; i++) {\n if (a[i] != b[i]) {\n return false;\n }\n }\n return true;\n }\n\n /**\n * Convert an address to bytes\n *\n * @param a Address to convert\n * @return The address as a byte array\n */\n function toBytes(address a)\n pure\n internal\n returns (bytes b)\n {\n assembly {\n let m := mload(0x40)\n mstore(add(m, 20), xor(0x140000000000000000000000000000000000000000, a))\n mstore(0x40, add(m, 52))\n b := m\n }\n }\n\n}\n",
"sourcePath": "/home/cwgoes/working/crypto/wyvern/wyvern-ethereum/contracts/common/ArrayUtils.sol",
"ast": {
"attributes": {
Expand Down Expand Up @@ -1036,7 +1036,7 @@
"overloadedDeclarations": [
null
],
"referencedDeclaration": 5127,
"referencedDeclaration": 5146,
"type": "function (bool) pure",
"value": "require"
},
Expand Down Expand Up @@ -1164,7 +1164,7 @@
"overloadedDeclarations": [
null
],
"referencedDeclaration": 5127,
"referencedDeclaration": 5146,
"type": "function (bool) pure",
"value": "require"
},
Expand All @@ -1183,7 +1183,7 @@
"isLValue": false,
"isPure": false,
"lValueRequested": false,
"operator": "==",
"operator": ">=",
"type": "bool"
},
"children": [
Expand Down Expand Up @@ -2693,5 +2693,5 @@
},
"networks": {},
"schemaVersion": "1.0.1",
"updatedAt": "2018-01-21T05:02:46.003Z"
"updatedAt": "2018-01-22T02:41:10.303Z"
}
30 changes: 15 additions & 15 deletions build/contracts/AssetRegistry.json
View file
Expand Up @@ -58,7 +58,7 @@
"absolutePath": "/home/cwgoes/working/crypto/wyvern/wyvern-ethereum/contracts/registry/AssetRegistry.sol",
"exportedSymbols": {
"AssetRegistry": [
3724
3743
]
}
},
Expand All @@ -71,42 +71,42 @@
".18"
]
},
"id": 3720,
"id": 3739,
"name": "PragmaDirective",
"src": "159:23:17"
},
{
"attributes": {
"SourceUnit": 4654,
"SourceUnit": 4673,
"absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
"file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
"scope": 3725,
"scope": 3744,
"symbolAliases": [
null
],
"unitAlias": ""
},
"id": 3721,
"id": 3740,
"name": "ImportDirective",
"src": "184:59:17"
},
{
"attributes": {
"contractDependencies": [
4653
4672
],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"linearizedBaseContracts": [
3724,
4653
3743,
4672
],
"name": "AssetRegistry",
"nodes": [
null
],
"scope": 3725
"scope": 3744
},
"children": [
{
Expand All @@ -120,25 +120,25 @@
"attributes": {
"contractScope": null,
"name": "Ownable",
"referencedDeclaration": 4653,
"referencedDeclaration": 4672,
"type": "contract Ownable"
},
"id": 3722,
"id": 3741,
"name": "UserDefinedTypeName",
"src": "271:7:17"
}
],
"id": 3723,
"id": 3742,
"name": "InheritanceSpecifier",
"src": "271:7:17"
}
],
"id": 3724,
"id": 3743,
"name": "ContractDefinition",
"src": "245:37:17"
}
],
"id": 3725,
"id": 3744,
"name": "SourceUnit",
"src": "159:124:17"
},
Expand All @@ -148,5 +148,5 @@
},
"networks": {},
"schemaVersion": "1.0.1",
"updatedAt": "2018-01-21T05:02:46.011Z"
"updatedAt": "2018-01-22T02:41:10.313Z"
}

0 comments on commit 87da7ae

Please sign in to comment.