Merge xgtvm

.vimrc

@@ -0,0 +1,6 @@
+set tabstop=3
+set expandtab
+set shiftwidth=3
+"set autoindent
+"set smartindent
+"set cindent

Rakefile

@@ -5,6 +5,8 @@ require 'json'
 require 'bigdecimal'
 require 'shellwords'
 require 'rake/testtask'
+import 'tasks/contracts.rake'
+import 'tasks/lazy_wallets.rake'
 autoload :Xgt, 'xgt/ruby'
 autoload :Etc, 'etc'
 
@@ -19,8 +21,12 @@ end
 
 directory "../xgt-build"
 
+def from_genesis?
+  ENV['FROM_GENESIS']&.upcase == 'TRUE'
+end
+
 def mining_disabled?
-  ENV['MINING_DISABLED']&.upcase == 'TRUE'
+  ENV['MINING_DISABLED']&.upcase == 'FALSE'
 end
 
 def mining_threads
@@ -74,6 +80,10 @@ def instance_index
   ENV['XGT_INSTANCE_INDEX'].to_i
 end
 
+def port_offset
+  ENV['XGT_PORT_OFFSET'].to_i
+end
+
 def config
   rpc.call('database_api.get_config', {})
 end
@@ -114,7 +124,12 @@ end
 
 desc 'Runs CMake to prepare the project'
 task :configure => "../xgt-build" do
-  sh %( cmake -G Ninja -B ../xgt-build -S . -D CMAKE_BUILD_TYPE=RelWithDebInfo )
+  sh %( cmake -G Ninja -B ../xgt-build -S . -D CMAKE_BUILD_TYPE=debug )
+end
+
+desc 'Runs CMake to prepare the project for testnet'
+task :configure_testnet => "../xgt-build" do
+  sh %( cmake -G Ninja -B ../xgt-build -S . -D CMAKE_BUILD_TYPE=debug -D BUILD_XGT_TESTNET=ON )
 end
 
 task :test do
@@ -280,8 +295,8 @@ task :run do
 
       shared-file-size = 12G
 
-      p2p-endpoint = #{my_host}:#{2001 + instance_index}
-      webserver-http-endpoint = #{my_host}:#{8751 + instance_index * 2}
+      p2p-endpoint = #{my_host}:#{2001 + port_offset + instance_index}
+      webserver-http-endpoint = #{my_host}:#{8751 + port_offset + instance_index * 2}
 
       miner = ["#{wallet}","#{wif}"]
       mining-threads = #{mining_threads}
@@ -291,251 +306,105 @@ task :run do
 
       enable-stale-production = #{mining_disabled? ? 'false' : 'true'}
     )))
-    if seed_hosts && seed_hosts.any?
+    if from_genesis?
+      f.puts "p2p-seed-node = "
+    elsif seed_hosts && seed_hosts.any?
       f.puts "p2p-seed-node = #{seed_hosts.join(" ")}"
     end
+    f.puts "p2p-seed-node = "
   end
   $stderr.puts(File.read("#{data_dir}/config.ini"))
 
-  sh %(cd #{data_dir} && ../xgt-build/programs/xgtd/xgtd --data-dir=.)
+  flags = ['--data-dir=.']
+  if from_genesis?
+    flags << '--from-genesis'
+  end
+  sh %(cd #{data_dir} && ../xgt-build/programs/xgtd/xgtd #{flags.join(' ')})
 end
 
 desc 'Get approximate C++ LoC'
 task :wc do
   sh %(wc -l #{Dir.glob('**/*.{c,h}pp').join(' ')})
 end
 
-namespace :lazy_wallets do
-  task :name_test do
-    generate_keys = ->() {
-      master = Xgt::Ruby::Auth.random_wif
-      ks = { 'master' => master }
-      %w(recovery money social memo).each do |role|
-        private_key = Xgt::Ruby::Auth.generate_wif(wallet, master, 'recovery')
-        public_key = Xgt::Ruby::Auth.wif_to_public_key(private_key, address_prefix)
-        ks["#{role}_private"] = private_key
-        ks["#{role}_public"] = public_key
-      end
-      ks
-    }
-
-    master = Xgt::Ruby::Auth.random_wif
+def generate_keys
+  master = Xgt::Ruby::Auth.random_wif
+  ks = { 'master' => master }
+  %w(recovery money social memo).each do |role|
     private_key = Xgt::Ruby::Auth.generate_wif(wallet, master, 'recovery')
     public_key = Xgt::Ruby::Auth.wif_to_public_key(private_key, address_prefix)
-
-    response = rpc.call('wallet_by_key_api.generate_wallet_name', {
-      'recovery_keys' => [public_key]
-    })
-    wallet_name = response['wallet_name']
-
-    txn = {
-      'extensions' => [],
-      'operations' => [
-         {
-           'type' => 'transfer_operation',
-           'value' => {
-             'amount' => {
-               'amount' => '1',
-               'precision' =>  8,
-               'nai' => '@@000000021'
-             },
-             'from' => 'XGT0000000000000000000000000000000000000000',
-             'to' => wallet_name,
-             'json_metadata' => '',
-             'extensions' => []
-           }
-        }
-      ]
-    }
-
-    id = rpc.broadcast_transaction(txn, [wif], chain_id)
-    (puts 'Waiting...' or sleep 1) until rpc.transaction_ready?(id)
-
-    keys = generate_keys.call
-    txn = {
-      'extensions' => [],
-      'operations' => [
-        {
-          'type' => 'wallet_update_operation',
-          'value' => {
-            'wallet' => wallet_name,
-            'recovery' => {
-              'weight_threshold' => 1,
-              'account_auths' => [],
-              'key_auths' => [[keys['recovery_public'], 1]]
-            },
-            'money' => {
-              'weight_threshold' => 1,
-              'account_auths' => [],
-              'key_auths' => [[keys['money_public'], 1]]
-            },
-            'social' => {
-              'weight_threshold' => 1,
-              'account_auths' => [],
-              'key_auths' => [[keys['social_public'], 1]]
-            },
-            'memo_key' => keys['memo_public'],
-            'json_metadata' => '',
-            'extensions' => []
-          }
-        }
-      ]
-    }
-
-    p txn
-    id = rpc.broadcast_transaction(txn, [private_key], chain_id)
-    (puts 'Waiting...' or sleep 1) until rpc.transaction_ready?(id)
+    ks["#{role}_private"] = private_key
+    ks["#{role}_public"] = public_key
   end
-end
-
-namespace :catalyst do
-  generate_keys = ->() {
-    FileUtils.mkdir_p('out')
-    File.open('out/keys.json', 'w') do |f|
-      master = Xgt::Ruby::Auth.random_wif
-      ks = { 'master' => master }
-      %w(recovery money social memo witness).each do |role|
-        private_key = Xgt::Ruby::Auth.generate_wif(wallet, master, role)
-        public_key = Xgt::Ruby::Auth.wif_to_public_key(private_key, address_prefix)
-        ks["#{role}_private"] = private_key
-        ks["#{role}_public"] = public_key
-      end
-      response = rpc.call('wallet_by_key_api.generate_wallet_name', {
-        'recovery_keys' => [ks['recovery_public']]
-      })
-      ks['wallet_name'] = response['wallet_name']
-      f.puts(JSON.pretty_generate(ks))
-    end
-  }
 
-  keys = ->() {
-    JSON.load(File.open('out/keys.json'))
-  }
+  response = rpc.call('wallet_by_key_api.generate_wallet_name', {
+    'recovery_keys' => [ks['recovery_public']]
+  })
+  wallet_name = response['wallet_name']
+  ks['wallet_name'] = wallet_name
 
-  does_witness_exist = ->() {
-    name = wallet_name.call
-    response = rpc.call('database_api.list_witnesses', { 'start' => name, 'limit' => 1, 'order' => 'by_name'}) || {}
-    witnesses = response['witnesses'] || []
-    witness = witnesses.first || {}
-    (name == witness['owner'])
-  }
-
-  desc 'Generate the keys for the witness'
-  task :generate_keys do
-    generate_keys.call
-  end
-
-  desc 'Create a wallet for the witness'
-  task :create_wallet do
-    name = keys.call['wallet_name']
-
-    txn = {
-      'extensions' => [],
-      'operations' => [
-        {
-          'type' => 'wallet_create_operation',
-          'value' => {
-            'fee' => {
-              'amount' => '0',
-              'precision' =>  8,
-              'nai' => '@@000000021'
-            },
-            'creator' => wallet,
-            'recovery' => {
-              'weight_threshold' => 1,
-              'account_auths' => [],
-              'key_auths' => [[keys.call['recovery_public'], 1]]
-            },
-            'money' => {
-              'weight_threshold' => 1,
-              'account_auths' => [],
-              'key_auths' => [[keys.call['money_public'], 1]]
-            },
-            'social' => {
-              'weight_threshold' => 1,
-              'account_auths' => [],
-              'key_auths' => [[keys.call['social_public'], 1]]
-            },
-            'memo_key' => keys.call['memo_public'],
-            'json_metadata' => '',
-            'extensions' => []
-          }
-        }
-      ]
-    }
-
-    $stderr.puts(%(Creator is "#{wallet}" with wif "#{wif}"...))
-    $stderr.puts(%(Creating wallet with master key "#{keys.call['master']}"...))
-    signed = Xgt::Ruby::Auth.sign_transaction(rpc, txn, [wif], chain_id)
-    rpc.call('transaction_api.broadcast_transaction', [signed])
-  end
-
-  desc 'Register the witness'
-  task :register do
-    name = keys.call['wallet_name']
-
-    components = fee.split(' ')
-    decimal = BigDecimal(components.first) * 1
-    final_fee = decimal.truncate.to_s + '.' + sprintf('%03d', (decimal.frac * 1000).truncate) + ' ' + components.last
+  ks
+end
 
-    # raise 'Witness already registered!' if does_witness_exist.call
+def create_wallet!(keys)
+  name = keys['wallet_name']
 
-    txn = {
-      'extensions' => [],
-      'operations' => [{
-        'type' => 'witness_update_operation',
+  txn = {
+    'extensions' => [],
+    'operations' => [
+      {
+        'type' => 'wallet_create_operation',
         'value' => {
-          'owner' => name,
-          'url' => 'http://witness-category/my-witness',
-          'block_signing_key' => keys.call['witness_public'],
-          'props' => {
-            'account_creation_fee' => {'amount'=>'0','precision'=>8,'nai'=>'@@000000021'}
+          'fee' => {
+            'amount' => '0',
+            'precision' =>  8,
+            'nai' => '@@000000021'
+          },
+          'creator' => wallet,
+          'recovery' => {
+            'weight_threshold' => 1,
+            'account_auths' => [],
+            'key_auths' => [[keys['recovery_public'], 1]]
+          },
+          'money' => {
+            'weight_threshold' => 1,
+            'account_auths' => [],
+            'key_auths' => [[keys['money_public'], 1]]
+          },
+          'social' => {
+            'weight_threshold' => 1,
+            'account_auths' => [],
+            'key_auths' => [[keys['social_public'], 1]]
           },
-          'fee' => {'amount'=>'0','precision'=>8,'nai'=>'@@000000021'}
+          'memo_key' => keys['memo_public'],
+          'json_metadata' => '',
+          'extensions' => []
         }
-      }]
-    }
+      }
+    ]
+  }
 
+  $stderr.puts(%(Creator is "#{wallet}" with wif "#{wif}"...))
+  $stderr.puts(%(Creating wallet with master key "#{keys['master']}"...))
+  signed = Xgt::Ruby::Auth.sign_transaction(rpc, txn, [wif], chain_id)
+  rpc.call('transaction_api.broadcast_transaction', [signed])
+  name
+end
 
-    signing_keys = keys.call['recovery_private']
-    signed = Xgt::Ruby::Auth.sign_transaction(rpc, txn, [signing_keys], chain_id)
-    $stderr.puts(%(Registering witness with recovery private WIF "#{keys.call['recovery_private']}"...))
-    $stderr.puts(%(Signing keypair is #{keys.call['witness_private']} (private) and #{keys.call['witness_public']} (public)...))
-    response = rpc.call('transaction_api.broadcast_transaction', [signed])
-    $stderr.puts(%(Registered witness #{name}))
-  end
+namespace :machine do
+  src_dir = File.join(File.dirname(__FILE__), %(../xgtvm))
+  dest_dir = File.join(File.dirname(__FILE__), %(libraries/vendor/xgtvm))
+  dest_git_dir = File.join(dest_dir, '.git')
 
-  desc 'Assuming keys were generated, do everything else'
-  task :all => [:create_wallet, :register]
-
-  desc 'Regenerate keys and do everything else'
-  task :really_all => [:generate_keys, :create_wallet, :register]
-end
-
-namespace :contracts do
-  desc 'Generate a sample contract'
-  task :generate do
-    txn = {
-      'extensions' => [],
-      'operations' => [
-        {
-          'type' => 'contract_create_operation',
-          'value' => {
-            'owner' => wallet,
-            'code' => "600260030100",
-          }
-        }
-      ]
-    }
-    signed = Xgt::Ruby::Auth.sign_transaction(rpc, txn, [wif], chain_id)
-    $stderr.puts(%(Registering contract... #{signed.to_json}))
-    response = rpc.call('transaction_api.broadcast_transaction', [signed])
-    $stderr.puts(%(Received response contract... #{response}))
+  desc 'Remove machine-related files'
+  task :clean do
+    FileUtils.rm_r(dest_dir) if Dir.exist?(dest_dir)
   end
 
-  desc 'View sample contracts'
-  task :list do
-    response = rpc.call('contract_api.list_owner_contracts', { 'owner' => wallet }) || {}
-    p response
+  desc 'Vendor machine-related files'
+  task :vendor => [:clean] do
+    raise %(Directory #{src_dir} doesn't exist!) unless Dir.exist?(src_dir)
+    FileUtils.cp_r(src_dir, dest_dir)
+    FileUtils.rm_r(dest_git_dir) if File.exists?(dest_git_dir)
   end
 end