Merge remote-tracking branch 'origin/dev' into stk-type-ap56

# Conflicts: # packages/actus-solidity/build/contracts/ANNEngine.json # packages/actus-solidity/build/contracts/ANNSTF.json # packages/actus-solidity/build/contracts/TestANNSTF.json
atpar · Oct 9, 2020 · 89bd1cf · 89bd1cf
2 parents ca66fe4 + f70f54c
commit 89bd1cf
Show file tree

Hide file tree

Showing 27 changed files with 1,893 additions and 161 deletions.
diff --git a/packages/actus-solidity/build/contracts/TestANNSTF.json b/packages/actus-solidity/build/contracts/TestANNSTF.json
@@ -7037,16 +7037,6 @@
               "internalType": "int256",
               "name": "adjustmentFactor",
               "type": "int256"
-            },
-            {
-              "internalType": "int256",
-              "name": "dividendPaymentAmount",
-              "type": "int256"
-            },
-            {
-              "internalType": "int256",
-              "name": "splitRatio",
-              "type": "int256"
             }
           ],
           "internalType": "struct State",

diff --git a/packages/actus-solidity/contracts/Engines/ANN/ANNSTF.sol b/packages/actus-solidity/contracts/Engines/ANN/ANNSTF.sol
@@ -503,7 +503,7 @@ contract ANNSTF is Core {
         returns (State memory)
     {
         // riskFactor not supported
-        int256 rate = int256(externalData).mul(terms.rateMultiplier).add(terms.rateSpread);
+        int256 rate = int256(uint256(externalData)).floatMult(terms.rateMultiplier).add(terms.rateSpread);
         int256 deltaRate = rate.sub(state.nominalInterestRate);
 
         // apply period cap/floor

diff --git a/packages/ap-contracts/ap-chain-snapshot.tar.gz b/packages/ap-contracts/ap-chain-snapshot.tar.gz
diff --git a/packages/ap-contracts/ap-chain/addresses.json b/packages/ap-contracts/ap-chain/addresses.json
@@ -0,0 +1,21 @@
+{
+  "ANNEngine": "0x0c662f6Cf73d547EdBF6f19be14665a050062Cc4",
+  "CECEngine": "0xdC73265D46b7a36263499ef042880AC2e804BD7b",
+  "CEGEngine": "0xCA386B0fD4f446aA61957f87d0A1630042255b37",
+  "CERTFEngine": "0x1725b9c802415a25202B3Da4A33E0631f44BBbf2",
+  "PAMEngine": "0xAC68a00bB798C3923210909244Eb900E76D4726A",
+  "ANNRegistry": "0x54aF1553Ea0D564E1B45FFe3EB1Bca85F0703331",
+  "CECRegistry": "0x1B3B145d4234Cd48EA33ABdD333F6E62767960A2",
+  "CEGRegistry": "0xE82F1D585DBC1D3B2068487206d39CdAe3590e4A",
+  "CERTFRegistry": "0xA240Ee48f8dD44CdEeAC513C6fd6739F0C6bE46c",
+  "PAMRegistry": "0x89E5C5d824F63add4Bb7E17cA7B9BA462CD51A70",
+  "DataRegistry": "0x77A94244ED2F9137ee2BB6A71D79C3188f86c3Cd",
+  "ANNActor": "0xCD4359f9AB7070d825fe0311d86Abc689c09A6fC",
+  "CECActor": "0x456458C2Ae55a573E54B120Ff2BFe04655a20C78",
+  "CEGActor": "0xf8a1BfCC2d1d5FaD14B04BE317bf84C272560a62",
+  "CERTFActor": "0x0B84EcC3cb862E82e6F6A687BBeEdC8866B8DebD",
+  "PAMActor": "0x5f1bC4808153b95aed8537C0ba57bc1034a97196",
+  "Custodian": "0x5DB04e348C343027993618A15Ae7Ba285dda1708",
+  "FDTFactory": "0x48AB3b2Fc6D667BC89Ab7f078C99CC707059023E",
+  "DvPSettlement": "0x309F3F86051E1589f7d662A2F9D49d92dF1F4B16"
+}
diff --git a/packages/ap-contracts/ap-chain/snapshot.tar.gz b/packages/ap-contracts/ap-chain/snapshot.tar.gz
diff --git a/packages/ap-contracts/build/contracts/ANNActor.json b/packages/ap-contracts/build/contracts/ANNActor.json
diff --git a/packages/ap-contracts/build/contracts/ANNEngine.json b/packages/ap-contracts/build/contracts/ANNEngine.json
diff --git a/packages/ap-contracts/build/contracts/ANNSTF.json b/packages/ap-contracts/build/contracts/ANNSTF.json
diff --git a/packages/ap-contracts/build/contracts/CECActor.json b/packages/ap-contracts/build/contracts/CECActor.json
diff --git a/packages/ap-contracts/build/contracts/CEGActor.json b/packages/ap-contracts/build/contracts/CEGActor.json
diff --git a/packages/ap-contracts/build/contracts/CERTFActor.json b/packages/ap-contracts/build/contracts/CERTFActor.json
diff --git a/packages/ap-contracts/build/contracts/Dependencies.json b/packages/ap-contracts/build/contracts/Dependencies.json
@@ -1,8 +1,8 @@
 {
   "contractName": "Dependencies",
   "abi": [],
-  "bytecode": "0x6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212202ff482f12a39a86dbf793de8c7b99afae427f34f14ee5278ebb2472a269ceb2564736f6c634300060b0033",
-  "deployedBytecode": "0x6080604052600080fdfea26469706673582212202ff482f12a39a86dbf793de8c7b99afae427f34f14ee5278ebb2472a269ceb2564736f6c634300060b0033",
+  "bytecode": "0x6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212204550622570ea3f7ddb891a5a0f9ba7d2c99a1fd03c0eae26c6cfdfd146be4dd264736f6c634300060b0033",
+  "deployedBytecode": "0x6080604052600080fdfea26469706673582212204550622570ea3f7ddb891a5a0f9ba7d2c99a1fd03c0eae26c6cfdfd146be4dd264736f6c634300060b0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/packages/ap-contracts/build/contracts/PAMActor.json b/packages/ap-contracts/build/contracts/PAMActor.json