fixed deploy and deployed to v2

boost node memory for integration tests
AugurProject · Mar 8, 2021 · 73265e4 · 73265e4
1 parent c1f5bc2
commit 73265e4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -326,6 +326,8 @@ jobs:
             (cd packages/augur-core && yarn test:unit $(TESTS))
           fi
         displayName: integration tests
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
 
   - job: Docker_populated_geth_images
     dependsOn:

diff --git a/packages/augur-artifacts/src/environments/v2.json b/packages/augur-artifacts/src/environments/v2.json
@@ -119,12 +119,13 @@
     "AccountLoader": "0x8953852710001CfF9884234D0c9d3c7f6e65881a",
     "OINexus": "0x8afae9ad3362Efa569E919e4907D2eB6758Ed0D7",
     "HotLoadingUniversal": "0xb16e90e03F86250688DE907083B5B141B6dF6789",
-    "AMMFactory": "0x764AF87735ffF22b4B1e391B77e04424d511f26f",
+    "AMMFactory": "0xC6791b28cBC37EFd6e290dc5238a14b8bAC4301e",
     "ERC20Proxy1155Nexus": "0xC0e95BEef0f4E943E9eD0D0C71BE43c07A864755",
     "ParaDeployer": "0x4DEb88CF839450464F4fB2Bc1d7e07d399CAa15b",
-    "WethWrapperForAMMExchange": "0x06a0B3bbD6D58C8fDb10a3412A7D6FF70EF85363",
-    "BFactory": "0xD4Be42c3e10c52FB07ed47AB51A30b3152EC8A8B",
-    "WrappedShareTokenFactoryFactory": "0xa1f5dA68aC6c4Fc5130587A3819f1D5E73c01D84"
+    "WethWrapperForAMMExchange": "0x0E34ef8A20A1b2550cDF7d0C5dE8192b5E7fD313",
+    "BFactory": "0x7C2018082B378eB69f3A506f68AAA15c239dc4DD",
+    "WrappedShareTokenFactoryFactory": "0xa1f5dA68aC6c4Fc5130587A3819f1D5E73c01D84",
+    "WrappedShareTokenFactory": "0xf1E7786D20a1dCFEbc7191b5dAd6cC0a2dee7062"
   },
   "server": {
     "httpPort": 9003,

diff --git a/packages/augur-core/src/libraries/ContractDeployer.ts b/packages/augur-core/src/libraries/ContractDeployer.ts
@@ -549,7 +549,7 @@ Deploying to: ${env}
         const tokenTemplate = this.contracts.get('WrappedShareToken');
 
         tokenTemplate.address = await this.construct(tokenTemplate, []);
-        factory.address = await this.construct(factory, []);
+        factory.address = await this.construct(factory, [tokenTemplate.address]);
         return factory.address;
     }
 

diff --git a/packages/augur-core/src/libraries/constants.ts b/packages/augur-core/src/libraries/constants.ts
@@ -149,7 +149,6 @@ export const EXTERNAL_CONTRACTS = [
     'AMMFactory',
     'WethWrapperForAMMExchange',
     // WrappedShareToken
-    'WrappedShareTokenFactoryFactory',
     'WrappedShareTokenFactory',
     'WrappedShareToken',
     // Balancer

diff --git a/packages/augur-core/tests/test_amm_weth.py b/packages/augur-core/tests/test_amm_weth.py
@@ -44,6 +44,9 @@ def weth_amm(sessionFixture, factory, para_weth_share_token):
 
 
 def test_amm_create_with_initial_liquidity(sessionFixture, market, weth_amm, account0):
+    if not sessionFixture.paraAugur:
+        return skip("Test is only for para augur")
+
     initialLiquidity = 5 * ATTO
     numticks = 1000
     (address, lpTokens) = weth_amm.addAMMWithLiquidity(market.address, FEE, ATTO, False, account0,

diff --git a/packages/augur-tools/src/flash/amm.ts b/packages/augur-tools/src/flash/amm.ts
@@ -24,13 +24,13 @@ export function addAMMScripts(flash: FlashSession) {
       {
         name: 'skipShareWrapper',
         abbr: 'S',
-        description: 'Do NOT deploy the eth wrapper.',
+        description: 'Do NOT deploy the share token wrapper.',
         flag: true
       },
       {
         name: 'skipBFactory',
         abbr: 'B',
-        description: 'Do NOT deploy the eth wrapper.',
+        description: 'Do NOT deploy the balancer factory.',
         flag: true
       },
     ],
@@ -60,14 +60,14 @@ export function addAMMScripts(flash: FlashSession) {
 
       const shareWrapper = deployShareWrapper
         ? await contractDeployer.uploadWrappedShareTokenFactory()
-        : this.config.addresses.WrappedShareTokenFactoryFactory
-      if (!shareWrapper) return console.error('Must deploy WrappedShareTokenFactoryFactory: omit -skipShareWrapper (-S).');
+        : this.config.addresses.WrappedShareTokenFactory
+      if (!shareWrapper) return console.error('Must deploy WrappedShareTokenFactory: omit -skipShareWrapper (-S).');
 
       const factory = await contractDeployer.uploadAMMContracts(bFactory, shareWrapper);
       const addresses: Partial<ContractAddresses> = {
         AMMFactory: factory,
         BFactory: bFactory,
-        WrappedShareTokenFactoryFactory: shareWrapper
+        WrappedShareTokenFactory: shareWrapper
       }
 
       if (deployETHWrapper) {

diff --git a/packages/augur-tools/src/flash/para.ts b/packages/augur-tools/src/flash/para.ts
@@ -67,7 +67,7 @@ export function addParaScripts(flash: FlashSession) {
   });
 
   flash.addScript({
-    name: 'deploy-WrappedShareTokenFactoryFactory',
+    name: 'deploy-WrappedShareTokenFactory',
     async call(this: FlashSession) {
       if (this.noProvider()) return;
 
@@ -86,7 +86,7 @@ export function addParaScripts(flash: FlashSession) {
 
       const factory = await contractDeployer.uploadWrappedShareTokenFactory();
       const addresses: Partial<ContractAddresses> = {
-        WrappedShareTokenFactoryFactory: factory
+        WrappedShareTokenFactory: factory
       }
 
       await updateConfig(this.network, {

diff --git a/packages/augur-utils/src/configuration.ts b/packages/augur-utils/src/configuration.ts
@@ -212,7 +212,7 @@ export interface ContractAddresses extends TradingAddresses {
   WethWrapperForAMMExchange?: string;
 
   // Wrapped Share Tokens
-  WrappedShareTokenFactoryFactory?: string;
+  WrappedShareTokenFactory?: string;
 
   // Balancer
   BFactory?: string;