Skip to content

Commit 8fd65ee

Browse files
szerintedmiszerintedmi
authored
Merge pull request #216 from Augmint/staging
release 1.0.11
2 parents b0d3598 + 0cc182d commit 8fd65ee

File tree

11 files changed

+132
-15
lines changed

11 files changed

+132
-15
lines changed

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ We are seeking for great minds to extend our core team. Contribution in any area
9999

100100
**[Development environment setup](docs/developmentEnvironment.md)**
101101

102+
## Publish NPM package
103+
104+
When the abiniser directory changed:
105+
- bump the version property in the package.json
106+
- `npm publish --access public`
107+
102108
## Get in touch
103109

104110
Drop us an email: [email protected]

‎abiniser/deployments/999/Exchange_DEPLOYS.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
"bytecodeHash": "4947ce8b998f71a612b657747a3ba83e",
1717
"deployedBytecodeHash": "92c3e1905f3cf3fb824b4648a048905d",
1818
"sourceHash": "d6ff57acb1b45199b5dd08357978d8c2"
19+
},
20+
"0xef49d863bd9179da0e96fab02dd498efa149dbdc": {
21+
"generatedAt": "2019-04-04T18:31:39.082Z",
22+
"truffleContractFileUpdatedAt": "2019-04-04T18:20:16.617Z",
23+
"deployTransactionHash": "0xef5a953fa6e48b32f149e1c72527af9e336d13e239b9eee9ebb22e80ececc380",
24+
"compiler": {
25+
"name": "solc",
26+
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
27+
},
28+
"bytecodeHash": "4947ce8b998f71a612b657747a3ba83e",
29+
"deployedBytecodeHash": "92c3e1905f3cf3fb824b4648a048905d",
30+
"sourceHash": "d6ff57acb1b45199b5dd08357978d8c2"
1931
}
2032
}
2133
}

‎abiniser/deployments/999/LoanManager_DEPLOYS.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
"bytecodeHash": "4f80cc451be48e4d62a17dbc3895a91d",
1717
"deployedBytecodeHash": "bc0eea72e35030fc44549a2a0064bf73",
1818
"sourceHash": "234fd5848af85ca2444c888fd6ba61aa"
19+
},
20+
"0xf7b8384c392fc333d3858a506c4f1506af44d53c": {
21+
"generatedAt": "2019-04-04T18:31:39.018Z",
22+
"truffleContractFileUpdatedAt": "2019-04-04T18:20:16.642Z",
23+
"deployTransactionHash": "0x23d5906de7ecfe9595bb8cfd7080a0e06eccee34ef92f017a3b4b657855e3619",
24+
"compiler": {
25+
"name": "solc",
26+
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
27+
},
28+
"bytecodeHash": "4f80cc451be48e4d62a17dbc3895a91d",
29+
"deployedBytecodeHash": "bc0eea72e35030fc44549a2a0064bf73",
30+
"sourceHash": "234fd5848af85ca2444c888fd6ba61aa"
1931
}
2032
}
2133
}

‎abiniser/deployments/999/Locker_DEPLOYS.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
"bytecodeHash": "0e7939b3e41166c23c6ec93d178ecbc4",
1717
"deployedBytecodeHash": "2af90203e1dd333de5a21f16c893b946",
1818
"sourceHash": "5fb19771489eecebfa02e95214887146"
19+
},
20+
"0x9f5420ec1348df8de8c85dab8d240ace122204c5": {
21+
"generatedAt": "2019-04-04T18:31:39.059Z",
22+
"truffleContractFileUpdatedAt": "2019-04-04T18:20:16.577Z",
23+
"deployTransactionHash": "0x02cb10db8450be080391e0f077c8f42290d562226618b4fe13d1d7850de7e39a",
24+
"compiler": {
25+
"name": "solc",
26+
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
27+
},
28+
"bytecodeHash": "0e7939b3e41166c23c6ec93d178ecbc4",
29+
"deployedBytecodeHash": "2af90203e1dd333de5a21f16c893b946",
30+
"sourceHash": "5fb19771489eecebfa02e95214887146"
1931
}
2032
}
2133
}

‎abiniser/deployments/999/TokenAEur_DEPLOYS.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
"bytecodeHash": "ed40773118be68131fcf5abcf36d21c7",
1717
"deployedBytecodeHash": "604fd8ddaf6012bd2f2f2e5b8ebf76c8",
1818
"sourceHash": "04025a37ea64acbc6f0ea2ec8a6f3e4d"
19+
},
20+
"0x5d77f09a3703be84d84810379067a6d9ad759582": {
21+
"generatedAt": "2019-04-04T18:31:38.849Z",
22+
"truffleContractFileUpdatedAt": "2019-04-04T18:20:16.536Z",
23+
"deployTransactionHash": "0x1e7c77e5115c7491aa497564b678448f7811e5a0622aecff0bdac50bcf499962",
24+
"compiler": {
25+
"name": "solc",
26+
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
27+
},
28+
"bytecodeHash": "ed40773118be68131fcf5abcf36d21c7",
29+
"deployedBytecodeHash": "604fd8ddaf6012bd2f2f2e5b8ebf76c8",
30+
"sourceHash": "04025a37ea64acbc6f0ea2ec8a6f3e4d"
1931
}
2032
}
2133
}

‎contracts/SB_scripts/mainnet/Main0024_disableOneYearProducts.sol

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/* Disable the one year lock and loan products */
2+
3+
pragma solidity 0.4.24;
4+
5+
import "../../StabilityBoardProxy.sol";
6+
import "../../LoanManager.sol";
7+
import "../../Locker.sol";
8+
9+
contract Main0024_disableOneYearProducts {
10+
11+
StabilityBoardProxy public constant STABILITY_BOARD_PROXY = StabilityBoardProxy(0xde36a8773531406dCBefFdfd3C7b89fCed7A9F84);
12+
LoanManager public constant LOAN_MANAGER = LoanManager(0x1cABc34618ecf2949F0405A86353e7705E01C38b);
13+
Locker public constant LOCKER = Locker(0x5Cc161482E82f20840A4AAEB582beCBCC4b539D7);
14+
15+
function execute(Main0024_disableOneYearProducts /* self, not used */) external {
16+
// called via StabilityBoardProxy
17+
require(address(this) == address(STABILITY_BOARD_PROXY), "only execute via StabilityBoardProxy");
18+
19+
LOAN_MANAGER.setLoanProductActiveState(0, false);
20+
LOCKER.setLockProductActiveState(0, false);
21+
}
22+
}

‎contracts/SB_scripts/rinkeby/Rinkeby_0008_reviveTestProducts.sol

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* Re-enable extra short-term test loan & lock products on rinkeby testnetwork */
2+
3+
pragma solidity 0.4.24;
4+
5+
import "../../StabilityBoardProxy.sol";
6+
import "../../LoanManager.sol";
7+
import "../../Locker.sol";
8+
9+
contract Rinkeby_0008_reviveTestProducts {
10+
11+
StabilityBoardProxy public constant STABILITY_BOARD_PROXY = StabilityBoardProxy(0xa612de13B629a1FF790c1f4E41d0422d2bB50a30);
12+
13+
LoanManager public constant LOAN_MANAGER = LoanManager(0x3792c5a5077DacfE331B81837ef73bC0Ea721d90);
14+
Locker public constant LOCKER = Locker(0xc0B97fE5CAD0d43D0c974C4E9A00312dc661f8Ab);
15+
16+
function execute(Rinkeby_0008_reviveTestProducts /* self, not used */) external {
17+
// called via StabilityBoardProxy
18+
require(address(this) == address(STABILITY_BOARD_PROXY), "only execute via StabilityBoardProxy");
19+
20+
LOCKER.setLockProductActiveState(6, true);
21+
LOCKER.setLockProductActiveState(7, true);
22+
23+
LOAN_MANAGER.setLoanProductActiveState(6, true);
24+
LOAN_MANAGER.setLoanProductActiveState(7, true);
25+
}
26+
}

‎mainnet_migrations/36_deploy_disable_products.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const Main0024_disableOneYearProducts = artifacts.require("./Main0024_disableOneYearProducts.sol");
2+
3+
module.exports = function(deployer) {
4+
deployer.then(async () => {
5+
await deployer.deploy(Main0024_disableOneYearProducts);
6+
});
7+
};

‎package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "augmint-contracts",
3-
"version": "1.0.9",
4-
"description": "Augmint Stable Tokens - Solidity contracts",
2+
"name": "@augmint/contracts",
3+
"version": "1.0.10",
4+
"description": "Augmint Stable Tokens - Solidity contract's abi and deployment descriptors",
55
"author": "“Augmint”",
66
"homepage": "https://github.com/Augmint/augmint-contracts#readme",
77
"license": "AGPL-3.0-only",
@@ -51,21 +51,22 @@
5151
"babel-register": "6.26.0",
5252
"bignumber.js": "5.0.0",
5353
"coveralls": "3.0.3",
54-
"dotenv": "7.0.0",
54+
"dotenv": "8.0.0",
5555
"eslint": "5.16.0",
5656
"ganache-cli": "6.4.3",
5757
"moment": "2.22.2",
5858
"random-seed": "0.3.0",
5959
"solidity-coverage": "0.5.11",
6060
"stringifier": "2.0.0",
6161
"truffle": "4.1.14",
62-
"truffle-hdwallet-provider": "1.0.7",
62+
"truffle-hdwallet-provider": "1.0.8",
6363
"wait-on": "3.2.0",
6464
"web3v1": "npm:[email protected]"
6565
},
6666
"greenkeeper": {
6767
"ignore": [
6868
"bignumber.js"
6969
]
70-
}
71-
}
70+
},
71+
"files": ["abiniser"]
72+
}

‎rinkeby_migrations/6_deploy_revive_test_products.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const Rinkeby_0008_reviveTestProducts = artifacts.require("./Rinkeby_0008_reviveTestProducts.sol");
2+
3+
module.exports = function(deployer) {
4+
deployer.then(async () => {
5+
await deployer.deploy(Rinkeby_0008_reviveTestProducts);
6+
});
7+
};

‎yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -968,10 +968,10 @@ dom-walk@^0.1.0:
968968
resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
969969
integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
970970

971-
dotenv@7.0.0:
972-
version "7.0.0"
973-
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
974-
integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
971+
dotenv@8.0.0:
972+
version "8.0.0"
973+
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
974+
integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
975975

976976
duplexer3@^0.1.4:
977977
version "0.1.4"
@@ -3672,10 +3672,10 @@ trim-right@^1.0.1:
36723672
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
36733673
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
36743674

3675-
[email protected].7:
3676-
version "1.0.7"
3677-
resolved "https://registry.yarnpkg.com/truffle-hdwallet-provider/-/truffle-hdwallet-provider-1.0.7.tgz#e3368dc4141692e402ff1bb1e99790dcb1ad5bca"
3678-
integrity sha512-+UK4FEU38b3/vKdno8ieV9Lj+2e4hOXM7sjgiJrsqeAFp2VUhlA3Ypp8MIlKHM2Wbs2Vo8YFi0WhUtq1BhVilg==
3675+
[email protected].8:
3676+
version "1.0.8"
3677+
resolved "https://registry.yarnpkg.com/truffle-hdwallet-provider/-/truffle-hdwallet-provider-1.0.8.tgz#76ab28e08b4c84dc8b3c98c9c2b4bba9c9d834e0"
3678+
integrity sha512-kG/WSEvwWSRuFbyEnoNgGQtKrKJMr/MwKoZfiPeT6L6d2gS2QnH2xbJbWxV+LtENjERSodjI9bbO/TN73CXWSQ==
36793679
dependencies:
36803680
any-promise "^1.3.0"
36813681
bindings "^1.3.1"

0 commit comments

Comments
 (0)