Skip to content
This repository has been archived by the owner on Aug 6, 2021. It is now read-only.

Commit

Permalink
dvp bugfix and deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
joeb000 committed Aug 6, 2020
1 parent 7547c50 commit d4a04a3
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/ap-contracts/contracts/DvPSettlement.sol
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ contract DvPSettlement {
"DvPSettlement.expireSettlement - settlement is not expired"
);
require(
settlements[id].status != SettlementStatus.EXPIRED,
"DvPSettlement.expireSettlement - function already called"
settlements[id].status == SettlementStatus.INITIALIZED,
"DvPSettlement.expireSettlement - only INITIALIZED settlements can be expired"
);

// refund creator
Expand Down
25 changes: 23 additions & 2 deletions packages/ap-contracts/deployments.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,28 @@
"PAMActor": "0xE8651Ef03e16D48478818EeCfc89bC60C50ba6e3",
"PAMEngine": "0x3F966c43A58900c7c68504d5Ca377e48465183f4",
"PAMRegistry": "0xedB26D8E5128555a349c367fEF83F66760B1c3bd",
"DvPSettlement": "0x51ed12942AF71cc738C1B56Ba7523697f4160bcb"
"DvPSettlement": "0x995aa179611e317d74e6a889a17021A329999E43"
},
"4": {
"ANNActor": "0x5366f7dA18787e06c5403ff61B785CfcBe2cE66F",
"ANNEngine": "0xa5EE57D57CA023F78837721b69601c3875985213",
"ANNRegistry": "0xBFf5262823f7880A8dF8B725dbaFe065CE42480D",
"CECActor": "0xcE479FDd9DF0bb9B173e9041eA2DFbbCcA1f3920",
"CECEngine": "0x20767474E075B98D41583DaFe7A70DB00794D199",
"CECRegistry": "0x3c227d8C0d613a3e3E9251af4e7D6171cfe92c75",
"CEGActor": "0x0a2be82c12D70cc7E03cd9EF61930D2A113337E2",
"CEGEngine": "0xdCcFd5bbCffE2098be1f0E2195CeEb1B7379D47f",
"CEGRegistry": "0x38572283015D7A81Bf64D9BF8d5Ea636A1e548b6",
"CERTFActor": "0x8Cc49b07f914764b338456Af20109Dd44F010D51",
"CERTFEngine": "0x69E38468a41DF870b870A53e28CF5486dC60925e",
"CERTFRegistry": "0x0E56Cd6268A240756b8AB3Ef8955664B2d5D3824",
"Custodian": "0xAB0beBD0c21a84eaEAB2AF22B580DEC6AbF8073B",
"FDTFactory": "0x9eFaDb5dB1517C3E41b467246a1b160ED80eDC8E",
"DataRegistry": "0xD90177e01916F76ee636E900A56df53512331103",
"PAMActor": "0x0618FAD7dfCD04465aCdFdB6C83EF22F5D70dbA4",
"PAMEngine": "0x51dFF00FA525356C4F679b2eF3054c580B88ea71",
"PAMRegistry": "0x3f44387a67D1A5964AD71e53A50B6DD58b68DA8d",
"DvPSettlement": "0xCadcB1a58bb32a5626B4138F19B0d60a3c56F911"
},
"5": {
"ANNActor": "0xcBAdbc25f026507bB0F112dA6Ab5CC211B56dA3a",
Expand All @@ -39,7 +60,7 @@
"PAMActor": "0xe3704979Aa8cB6b9e9cF8203869c856e5Eb4554D",
"PAMEngine": "0x8D9717B6F4D9c4a3F48dF775d2FA82EA73a36D2b",
"PAMRegistry": "0x150BA440C64fb76cf2315A1B12D34b1D300F4E32",
"DvPSettlement": "0x51ed12942AF71cc738C1B56Ba7523697f4160bcb"
"DvPSettlement": "0x995aa179611e317d74e6a889a17021A329999E43"
},
"1994": {
"ANNActor": "0xf8a1BfCC2d1d5FaD14B04BE317bf84C272560a62",
Expand Down
3 changes: 3 additions & 0 deletions packages/ap-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
"migrate:rinkeby": "node --max-old-space-size=4096 ./node_modules/.bin/truffle migrate --network rinkeby",
"migrate:ropsten": "node --max-old-space-size=4096 ./node_modules/.bin/truffle migrate --network ropsten",
"migrate:testnets": "npm run migrate:goerli && npm run migrate:kovan && npm run migrate:rinkeby && npm run migrate:ropsten",
"dvp:goerli": "node --max-old-space-size=4096 ./node_modules/.bin/truffle exec ./deployDvPSettlement.js --network goerli",
"dvp:rinkeby": "node --max-old-space-size=4096 ./node_modules/.bin/truffle exec ./deployDvPSettlement.js --network rinkeby",
"dvp:ropsten": "node --max-old-space-size=4096 ./node_modules/.bin/truffle exec ./deployDvPSettlement.js --network ropsten",
"test": "buidler test"
},
"resolutions": {
Expand Down

0 comments on commit d4a04a3

Please sign in to comment.