0bb8c69 · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

contracts: add naive contract deployment

0bb8c69yosoyubik5 years ago

contracts/Naive.solnew file+15

compare with master

unifiedsplit

@@ -0,0 +1,15 @@

1+pragma solidity 0.4.24;

3+contract Naive {

4+ event Batch();

6+ // This function is called for all messages sent to

7+ // this contract (there is no other function).

8+ // Sending Ether to this contract will cause an exception,

9+ // because the fallback function does not have the `payable`

10+ // modifier.

11+ //

12+ function() external {

13+ emit Batch();

14+ }

15+}

migrations/1_migration.js+38

@@ -6,6 +6,8 @@ var Ecliptic = artifacts.require('azimuth-solidity/Ecliptic');

6var DelegatedSending = artifacts.require('azimuth-solidity/DelegatedSending');

7var LSR = artifacts.require('azimuth-solidity/LinearStarRelease');

8var CSR = artifacts.require('azimuth-solidity/ConditionalStarRelease');

9+// TODO: replace when https://github.com/urbit/azimuth/pull/43 is merged

10+var Naive = artifacts.require('Naive');

10const user1 = '0xD53208cf45fC9bd7938B200BFf8814A26146688f';

12const user1 = '0xD53208cf45fC9bd7938B200BFf8814A26146688f';

11const rateUnit = 50;

13const rateUnit = 50;

@@ -87,6 +89,9 @@ module.exports = async function(deployer) {

88 const lsr = await deployer.deploy(LSR, azimuth.address);

90 const lsr = await deployer.deploy(LSR, azimuth.address);

92+ // deploy naive contract

93+ const naive = await deployer.deploy(Naive);

94+

90 const own = await ecliptic.owner();

95 const own = await ecliptic.owner();

91 switch (process.env.WITH_TEST_STATE) {

96 switch (process.env.WITH_TEST_STATE) {

92 case 'STAR_RELEASE':

97 case 'STAR_RELEASE':

@@ -138,6 +143,39 @@ module.exports = async function(deployer) {

138 await ecliptic.transferPoint(offset + 256, user1, false);

143 await ecliptic.transferPoint(offset + 256, user1, false);

139 }

144 }

140 break;

145 break;

146+ case 'L2':

147+ // all ships will have as owner:

148+ // 0x6deffb0cafdb11d175f123f6891aa64f01c24f7d

149+ //

150+ // ~zod -> L1

151+ await ecliptic.createGalaxy(0, own);

152+ await ecliptic.configureKeys(0, '0xffff', '0xffff', 1, false);

153+ // ~marzod -> L1

154+ await ecliptic.spawn(256, own);

155+ await ecliptic.configureKeys(256, '0xffff', '0xffff', 1, false);

156+ // ~wanzod -> L1

157+ await ecliptic.spawn(768, own);

158+ await ecliptic.configureKeys(768, '0xffff', '0xffff', 1, false);

159+ // ~wanzod sets spawn-proxy to L2

160+ await ecliptic.setSpawnProxy(

161+ 768,

162+ '0x1111111111111111111111111111111111111111'

163+ );

164+ // ~wicdev-wisryt -> L1

165+ await ecliptic.spawn(65792, own);

166+ // ~panret-tocsel -> L1

167+ await ecliptic.spawn(131328, own);

168+ // ~binzod -> L1

169+ await ecliptic.spawn(512, own);

170+ // ~norsyr-torryn -> L1

171+ await ecliptic.spawn(99549440, own);

172+ // ~norsyr-torryn -> L2

173+ await ecliptic.transferPoint(

174+ 99549440,

175+ '0x1111111111111111111111111111111111111111',

176+ true

177+ );

178+ break;

141

179

142 default:

180 default:

143 return;

181 return;

package.json+1

@@ -115,6 +115,7 @@

115 "pilot-mainnet": "REACT_APP_MAINNET=true HTTPS=true npm-run-all start --continue-on-error",

116 "pilot-release": "WITH_TEST_STATE=STAR_RELEASE npm run pilot",

117 "pilot-residents": "WITH_TEST_STATE=RESIDENTS npm run pilot",

118+ "pilot-l2": "WITH_TEST_STATE=L2 HTTPS=false NODE_ENV=development npm run pilot",

118 "pilot-ropsten": "REACT_APP_ROPSTEN=true HTTPS=true npm-run-all start --continue-on-error",

119 "pilot-ropsten": "REACT_APP_ROPSTEN=true HTTPS=true npm-run-all start --continue-on-error",

119 "pilot:cleanup": "pkill -f ganache-cli",

120 "pilot:cleanup": "pkill -f ganache-cli",

120 "lint:check": "eslint 'src/**/*.{js,jsx,ts,tsx}'",

121 "lint:check": "eslint 'src/**/*.{js,jsx,ts,tsx}'",