merge new rockminer typedef